From 5d0ac66f6560f97eadcbea29a036584d7dd60aa5 Mon Sep 17 00:00:00 2001
From: Grimmer Kang <k@grimmer.io>
Date: Mon, 6 Jul 2026 14:02:47 +0800
Subject: [PATCH 01/10] feat(multi-account): codev account CLI + Vitest + CI
 (Batch 2a)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a `codev account` CLI that manages ~/.config/codev/accounts.json and
regenerates accounts.sh from ONE shared generator, replacing Batch 1's
hand-editing. Run in dev via `yarn account <cmd>`.

- src/cli/account-manager.ts: shared registry read/write + accounts.sh
  generator (the 2b Settings UI will reuse the same generator)
- src/cli/codev-account.ts: CLI — list/add/default/remove/regenerate/
  show/install/uninstall
- src/cli/account-manager.test.ts: Vitest suite for the generator
  (default -> no env, extra -> CLAUDE_CONFIG_DIR, dispatcher * ->
  defaultAccount, whoami mapping, bash -n validity)
- Replace the placeholder CI with a real test workflow (yarn test)
- Bump 1.0.77 + CHANGELOG + design-doc §6.A/§7

Verified: generated accounts.sh is functionally equivalent to the
hand-written one (diff) and passes `zsh -n`; 9/9 tests green.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017kCK4t5JSVynVZxGcrTGGp
---
 .github/workflows/test_ci.yaml       |  27 +-
 CHANGELOG.md                         |   7 +
 docs/multi-account-support-design.md |  24 +-
 package.json                         |   6 +-
 src/cli/account-manager.test.ts      | 100 ++++++
 src/cli/account-manager.ts           | 350 ++++++++++++++++++++
 src/cli/codev-account.ts             | 157 +++++++++
 vitest.config.ts                     |  11 +
 yarn.lock                            | 478 ++++++++++++++++++++++++++-
 9 files changed, 1140 insertions(+), 20 deletions(-)
 create mode 100644 src/cli/account-manager.test.ts
 create mode 100644 src/cli/account-manager.ts
 create mode 100644 src/cli/codev-account.ts
 create mode 100644 vitest.config.ts

diff --git a/.github/workflows/test_ci.yaml b/.github/workflows/test_ci.yaml
index d83fce1..316905f 100644
--- a/.github/workflows/test_ci.yaml
+++ b/.github/workflows/test_ci.yaml
@@ -1,19 +1,22 @@
-name: hello-world
+name: test
 
 on:
-  workflow_dispatch:
   pull_request:
-    branches:
-      - master
-      - staging
-      - main
-    paths:
-      - README.md
-
+    branches: [main]
+  push:
+    branches: [main]
+  workflow_dispatch:
 
 jobs:
-  my-job:
+  test:
     runs-on: ubuntu-latest
     steps:
-      - name: my-step
-        run: echo "Hello World!"
\ No newline at end of file
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: yarn
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+      - name: Run tests
+        run: yarn test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85a231b..e8bf219 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.0.77
+
+- Feat: multi-account Batch 2a — `codev account` CLI to manage the registry
+  - `codev account list | add <label> [--dir D] | default <label> | remove <label> | regenerate | show | install | uninstall`
+  - One shared generator (`src/cli/account-manager.ts`) produces both `~/.config/codev/accounts.json` and `accounts.sh`, replacing Batch 1's hand-editing; run in dev via `yarn account <cmd>` (PATH install + Settings UI land in Batch 2b)
+  - Adds Vitest + a generator test suite, and a real CI workflow (replacing the placeholder)
+
 ## 1.0.76
 
 - Feat: multi-account support (Batch 1) — run multiple Claude Code accounts (e.g. personal + work) from one machine
diff --git a/docs/multi-account-support-design.md b/docs/multi-account-support-design.md
index 241feac..0027bb4 100644
--- a/docs/multi-account-support-design.md
+++ b/docs/multi-account-support-design.md
@@ -249,6 +249,14 @@ lists all. These ship in Batch 1 (they make the imminent smoke-test legible and
 first-arg would be swallowed by the dispatcher / passed to real `claude`; use distinct
 function names. Batch 2 folds them into `codev account current | list | default`.
 
+**Implemented (Batch 2a):** the `codev account` CLI (`src/cli/codev-account.ts`, run
+via `yarn account <cmd>`) now generates **both** `accounts.json` and `accounts.sh` from
+one shared generator (`src/cli/account-manager.ts`) — no more hand-editing. Commands:
+`list`, `add <label> [--dir D]`, `default <label>`, `remove <label>`, `regenerate`,
+`show` (dry-run), `install`/`uninstall` (the marker-guarded `~/.zshrc` source block).
+A Vitest generator suite + CI guard the shell output. A real `codev` binary on PATH and
+the Settings UI are Batch 2b.
+
 ### 6.B Account registry (source of truth)
 
 - **`~/.config/codev/accounts.json`** (plain JSON), owned/written by CodeV, readable
@@ -372,11 +380,17 @@ and **(d)** for CodeV, backed by the same `projectMap` in the registry so both a
     only) + account-aware resume/launch (§6.E); active-dot + title/branch enrichment per
     account; same-cwd cross-ref per account; hooks registered per config dir (§6.F).
   - *Deferred:* VS Code (`claude-vscode`) sessions can't be account-switched (URI-handler
-    launch) — tracked in grimmerk/codev#121. Setup UI/CLI is Batch 2 (registry +
-    `accounts.sh` are hand-created for now).
-- **Batch 2 — after Batch 1, revisit:** account picker / per-launch override (§6.G, 4.2);
-  manage-accounts Settings tab — list/add/rename/remove + shell-integration toggle
-  (§6.D); pyenv-style folder auto-switch + terminal-side resume-to-right-account (§6.H).
+    launch) — tracked in grimmerk/codev#121. (Setup is no longer hand-made — see
+    Batch 2a below.)
+- **Batch 2 — in progress (order 2a→2e):**
+  - *2a — ✅ Done* (branch `feat/codev-account-cli`): `codev account` CLI generates the
+    registry + `accounts.sh` from one shared generator (§6.A/B); Vitest + CI added.
+  - *2b:* manage-accounts Settings tab — list/add/rename/remove + shell-integration
+    toggle (§6.D), plus a real `codev` binary on PATH.
+  - *2c:* account picker / per-launch override (§6.G, 4.2).
+  - *2d:* pyenv-style folder auto-switch + terminal-side resume-to-right-account (§6.H).
+  - *2e:* configurable global-default (bare `claude` → chosen account) — last, since it
+    also needs the CLI/UI to manage.
 - **Batch 3 — later:** cross-account symlink reuse of global files
   (CLAUDE.md / skills / commands / plugins / settings, §5).
 
diff --git a/package.json b/package.json
index 23477d3..0e00ef2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "CodeV",
   "productName": "CodeV",
-  "version": "1.0.76",
+  "version": "1.0.77",
   "description": "Quick switcher for VS Code, Cursor, and Claude Code sessions",
   "repository": {
     "type": "git",
@@ -12,6 +12,9 @@
     "db": "prisma migrate dev",
     "start": "cross-env NODE_ENV=development electron-forge start",
     "dev": "npm run start",
+    "account": "ts-node src/cli/codev-account.ts",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "package": "electron-forge package",
     "package_mas": "npm run prebuild && cross-env BUILD_TYPE=prod electron-forge package --platform=mas && npm run postbuild",
     "prebuild": "sh prebuild.sh",
@@ -61,6 +64,7 @@
     "ts-loader": "^9.5.4",
     "ts-node": "^10.9.2",
     "typescript": "~5.7.0",
+    "vitest": "^4.1.9",
     "webpack-node-externals": "^3.0.0"
   },
   "dependencies": {
diff --git a/src/cli/account-manager.test.ts b/src/cli/account-manager.test.ts
new file mode 100644
index 0000000..e9c2c2e
--- /dev/null
+++ b/src/cli/account-manager.test.ts
@@ -0,0 +1,100 @@
+import { execFileSync } from 'child_process';
+import { writeFileSync } from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { describe, it, expect } from 'vitest';
+
+import {
+  generateAccountsSh,
+  resolveDefaultLabel,
+  type Registry,
+} from './account-manager';
+
+const HOME = os.homedir();
+
+/** A representative two-account registry (personal default + work extra). */
+function reg(overrides: Partial<Registry> = {}): Registry {
+  return {
+    version: 1,
+    defaultAccount: 'personal',
+    accounts: [
+      {
+        label: 'personal',
+        dir: path.join(HOME, '.claude'),
+        identityFile: path.join(HOME, '.claude.json'),
+        configDirEnv: null,
+        isDefault: true,
+      },
+      {
+        label: 'work',
+        dir: path.join(HOME, '.claude-work'),
+        identityFile: path.join(HOME, '.claude-work', '.claude.json'),
+        configDirEnv: path.join(HOME, '.claude-work'),
+        isDefault: false,
+      },
+    ],
+    ...overrides,
+  };
+}
+
+describe('generateAccountsSh', () => {
+  it('launches the default account with NO CLAUDE_CONFIG_DIR', () => {
+    const sh = generateAccountsSh(reg());
+    expect(sh).toContain('claude-personal() { command claude "$@"; }');
+  });
+
+  it('launches an extra account with CLAUDE_CONFIG_DIR ($HOME-relative)', () => {
+    const sh = generateAccountsSh(reg());
+    expect(sh).toContain(
+      'claude-work() { CLAUDE_CONFIG_DIR="$HOME/.claude-work" command claude "$@"; }',
+    );
+  });
+
+  it('adds a dispatcher case per account', () => {
+    const sh = generateAccountsSh(reg());
+    expect(sh).toContain('personal) shift; command claude "$@" ;;');
+    expect(sh).toContain(
+      'work) shift; CLAUDE_CONFIG_DIR="$HOME/.claude-work" command claude "$@" ;;',
+    );
+  });
+
+  it('routes the dispatcher fallback (*) to the current defaultAccount', () => {
+    // defaultAccount = personal (the no-env anchor)
+    expect(generateAccountsSh(reg())).toContain('*) command claude "$@" ;;');
+    // defaultAccount = work -> bare `claude` must set work's config dir
+    expect(generateAccountsSh(reg({ defaultAccount: 'work' }))).toContain(
+      '*) CLAUDE_CONFIG_DIR="$HOME/.claude-work" command claude "$@" ;;',
+    );
+  });
+
+  it('maps each account dir back to its label in claude-whoami', () => {
+    const sh = generateAccountsSh(reg());
+    expect(sh).toContain('"$HOME/.claude") label="personal (default)" ;;');
+    expect(sh).toContain('"$HOME/.claude-work") label="work" ;;');
+  });
+
+  it('emits syntactically valid shell (bash -n)', () => {
+    const sh = generateAccountsSh(reg());
+    const file = path.join(os.tmpdir(), `codev-accounts-${process.pid}.sh`);
+    writeFileSync(file, sh);
+    expect(() => execFileSync('bash', ['-n', file])).not.toThrow();
+  });
+});
+
+describe('resolveDefaultLabel', () => {
+  it('returns defaultAccount when it names a real account', () => {
+    expect(resolveDefaultLabel(reg({ defaultAccount: 'work' }))).toBe('work');
+  });
+
+  it('falls back to the isDefault anchor when defaultAccount is missing', () => {
+    expect(resolveDefaultLabel(reg({ defaultAccount: undefined }))).toBe(
+      'personal',
+    );
+  });
+
+  it('falls back to the isDefault anchor when defaultAccount is unknown', () => {
+    expect(resolveDefaultLabel(reg({ defaultAccount: 'ghost' }))).toBe(
+      'personal',
+    );
+  });
+});
diff --git a/src/cli/account-manager.ts b/src/cli/account-manager.ts
new file mode 100644
index 0000000..9c0fa67
--- /dev/null
+++ b/src/cli/account-manager.ts
@@ -0,0 +1,350 @@
+/**
+ * CodeV multi-account registry manager (shared).
+ *
+ * The SINGLE source of truth for:
+ *   1. reading/writing  ~/.config/codev/accounts.json  (the registry), and
+ *   2. generating       ~/.config/codev/accounts.sh    (the shell integration).
+ *
+ * Consumed by BOTH the standalone `codev account` CLI (src/cli/codev-account.ts)
+ * and — later — CodeV's Electron main process (Accounts UI, Batch 2b). Keeping
+ * one generator here avoids two implementations drifting apart. The reader in
+ * src/accounts.ts consumes the same accounts.json.
+ *
+ * Account model (docs/multi-account-support-design.md §3.4):
+ *   - DEFAULT account = ~/.claude, launched with NO CLAUDE_CONFIG_DIR
+ *                       (its .claude.json is at ~/.claude.json, HOME level).
+ *   - EXTRA accounts   = ~/.claude-<label>, launched with CLAUDE_CONFIG_DIR=<dir>
+ *                       (self-contained, <dir>/.claude.json).
+ */
+
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+
+export interface RegistryAccount {
+  label: string;
+  dir: string; // config dir (session data lives under <dir>/projects, /sessions)
+  identityFile: string; // .claude.json path
+  configDirEnv: string | null; // CLAUDE_CONFIG_DIR at launch; null => default account
+  isDefault: boolean; // the anchor ~/.claude account (HOME .claude.json)
+  email?: string;
+  org?: string;
+  subscription?: string;
+  loggedIn?: boolean;
+}
+
+export interface Registry {
+  version: number;
+  defaultAccount?: string; // label bare `claude` resolves to
+  accounts: RegistryAccount[];
+}
+
+type Identity = Partial<Pick<RegistryAccount, 'email' | 'org' | 'loggedIn'>>;
+
+export const CONFIG_DIR = path.join(os.homedir(), '.config', 'codev');
+export const REGISTRY_PATH = path.join(CONFIG_DIR, 'accounts.json');
+export const ACCOUNTS_SH_PATH = path.join(CONFIG_DIR, 'accounts.sh');
+export const ZSHRC_PATH = path.join(os.homedir(), '.zshrc');
+
+const ZSHRC_BEGIN = '# >>> codev accounts >>>';
+const ZSHRC_END = '# <<< codev accounts <<<';
+
+// Labels become shell function names + case branches, so keep them safe.
+const LABEL_RE = /^[a-zA-Z][a-zA-Z0-9_-]*$/;
+
+export const expandHome = (p: string): string =>
+  typeof p === 'string' && p.startsWith('~')
+    ? path.join(os.homedir(), p.slice(1))
+    : p;
+
+const defaultDir = (): string => path.join(os.homedir(), '.claude');
+
+/** Absolute path under $HOME → `$HOME/…` for generated shell (expands at runtime). */
+const toShellPath = (p: string): string => {
+  const home = os.homedir();
+  return p === home || p.startsWith(home + path.sep)
+    ? '$HOME' + p.slice(home.length)
+    : p;
+};
+
+/** Absolute path under $HOME → `~/…` for human-readable display. */
+const toTildePath = (p: string): string => {
+  const home = os.homedir();
+  return p === home || p.startsWith(home + path.sep)
+    ? '~' + p.slice(home.length)
+    : p;
+};
+
+/** Is this dir the special DEFAULT account (~/.claude, HOME .claude.json)? */
+const isDefaultDir = (dir: string): boolean =>
+  path.resolve(expandHome(dir)) === defaultDir();
+
+function stripUndefined<T extends object>(obj: T): Partial<T> {
+  const out: Partial<T> = {};
+  for (const [k, v] of Object.entries(obj)) {
+    if (v !== undefined) (out as Record<string, unknown>)[k] = v;
+  }
+  return out;
+}
+
+// ---------------------------------------------------------------------------
+// registry read / write
+// ---------------------------------------------------------------------------
+
+export function readRegistry(): Registry {
+  if (!fs.existsSync(REGISTRY_PATH)) {
+    return { version: 1, defaultAccount: 'personal', accounts: [] };
+  }
+  const raw = JSON.parse(fs.readFileSync(REGISTRY_PATH, 'utf-8')) as Registry;
+  if (!raw.version) raw.version = 1;
+  if (!Array.isArray(raw.accounts)) raw.accounts = [];
+  return raw;
+}
+
+export function writeRegistry(reg: Registry): void {
+  fs.mkdirSync(CONFIG_DIR, { recursive: true });
+  fs.writeFileSync(REGISTRY_PATH, JSON.stringify(reg, null, 2) + '\n', 'utf-8');
+}
+
+/** Best-effort identity from an account's .claude.json (email/org/loggedIn). */
+export function readIdentity(identityFile: string): Identity {
+  try {
+    const j = JSON.parse(fs.readFileSync(expandHome(identityFile), 'utf-8'));
+    const o = j.oauthAccount || {};
+    return stripUndefined({
+      email: o.emailAddress,
+      org: o.organizationName,
+      loggedIn: o.emailAddress ? true : undefined,
+    });
+  } catch {
+    return {};
+  }
+}
+
+/** Label bare `claude` maps to (defaultAccount if valid, else the anchor). */
+export function resolveDefaultLabel(reg: Registry): string | undefined {
+  const accounts = reg.accounts || [];
+  if (
+    reg.defaultAccount &&
+    accounts.some((a) => a.label === reg.defaultAccount)
+  ) {
+    return reg.defaultAccount;
+  }
+  const anchor = accounts.find((a) => a.isDefault) || accounts[0];
+  return anchor ? anchor.label : undefined;
+}
+
+// ---------------------------------------------------------------------------
+// accounts.sh generation (the ONE generator)
+// ---------------------------------------------------------------------------
+
+/** Shell prefix that launches an account (empty for the default account). */
+function launchPrefix(account: RegistryAccount | undefined): string {
+  if (!account || !account.configDirEnv) return '';
+  return `CLAUDE_CONFIG_DIR="${toShellPath(expandHome(account.configDirEnv))}" `;
+}
+
+/** Render the accounts.sh contents from a registry object. Pure function. */
+export function generateAccountsSh(reg: Registry): string {
+  const accounts = reg.accounts || [];
+  const defaultLabel = resolveDefaultLabel(reg);
+  const defaultAccount = accounts.find((a) => a.label === defaultLabel);
+  const pad = Math.max(0, ...accounts.map((a) => a.label.length));
+
+  const L: string[] = [];
+  L.push('# CodeV multi-account shell integration — GENERATED FILE (safe to delete).');
+  L.push('# Source of truth: ~/.config/codev/accounts.json');
+  L.push('# Regenerated by `codev account` / CodeV — manual edits here will be lost.');
+  L.push('# To uninstall: `codev account uninstall` (removes the ~/.zshrc block).');
+  L.push('#');
+  L.push('# Model: one Claude Code config dir per account (CLAUDE_CONFIG_DIR).');
+  L.push('#   - DEFAULT account: NO CLAUDE_CONFIG_DIR (config at ~/.claude.json + ~/.claude/).');
+  L.push('#   - EXTRA accounts:  CLAUDE_CONFIG_DIR=<dir>, fully self-contained.');
+  L.push('#');
+  L.push('# Usage:');
+  L.push(`#   claude              -> ${defaultLabel || '(none)'} (default account)`);
+  L.push('#   claude <account> …  -> that account   (e.g. claude work -r)');
+  L.push('#   claude-<account> …  -> equivalent function form');
+  L.push('#   claude-whoami       -> which account bare `claude` resolves to here');
+  L.push('#   claude-accounts     -> list configured accounts');
+  L.push('# All native flags pass through, e.g. `claude work -r`, `claude-work mcp list`.');
+  L.push('');
+  L.push('# --- per-account launchers (full passthrough via "$@") ---');
+  for (const a of accounts) {
+    L.push(`claude-${a.label}() { ${launchPrefix(a)}command claude "$@"; }`);
+  }
+  L.push('');
+  L.push('# --- dispatcher: `claude <account> [args...]`, else the default account ---');
+  L.push('# `command claude` bypasses this function (no recursion) and any claude alias.');
+  L.push('claude() {');
+  L.push('  case "$1" in');
+  for (const a of accounts) {
+    L.push(`    ${a.label}) shift; ${launchPrefix(a)}command claude "$@" ;;`);
+  }
+  L.push(`    *) ${launchPrefix(defaultAccount)}command claude "$@" ;;`);
+  L.push('  esac');
+  L.push('}');
+  L.push('');
+  L.push('# claude-whoami: which account THIS shell resolves to (via CLAUDE_CONFIG_DIR).');
+  L.push('claude-whoami() {');
+  L.push('  local dir="${CLAUDE_CONFIG_DIR:-$HOME/.claude}" label');
+  L.push('  case "$dir" in');
+  for (const a of accounts) {
+    const marker = a.label === defaultLabel ? ' (default)' : '';
+    L.push(`    "${toShellPath(expandHome(a.dir))}") label="${a.label}${marker}" ;;`);
+  }
+  L.push('    *) label="(unregistered)" ;;');
+  L.push('  esac');
+  L.push('  echo "codev account     : $label"');
+  L.push('  echo "CLAUDE_CONFIG_DIR : ${CLAUDE_CONFIG_DIR:-<unset → ~/.claude>}"');
+  L.push('  command claude auth status 2>/dev/null');
+  L.push('}');
+  L.push('');
+  L.push('# claude-accounts: list configured accounts.');
+  L.push('claude-accounts() {');
+  L.push(`  echo "codev accounts (bare 'claude' = ${defaultLabel || 'none'}):"`);
+  for (const a of accounts) {
+    const star = a.label === defaultLabel ? '*' : ' ';
+    L.push(`  echo "  ${star} ${a.label.padEnd(pad)}   ${toTildePath(a.dir)}"`);
+  }
+  L.push('  echo "  identity: run claude-whoami, or claude <acct> auth status"');
+  L.push('}');
+  L.push('');
+  return L.join('\n');
+}
+
+export function regenerate(reg?: Registry): string {
+  const r = reg || readRegistry();
+  fs.mkdirSync(CONFIG_DIR, { recursive: true });
+  fs.writeFileSync(ACCOUNTS_SH_PATH, generateAccountsSh(r), 'utf-8');
+  return ACCOUNTS_SH_PATH;
+}
+
+// ---------------------------------------------------------------------------
+// mutations
+// ---------------------------------------------------------------------------
+
+export function addAccount(
+  label: string,
+  opts: { dir?: string } = {},
+): RegistryAccount {
+  if (!label) throw new Error('add: <label> is required');
+  if (!LABEL_RE.test(label)) {
+    throw new Error(
+      `Invalid label "${label}" — use a letter followed by letters/digits/-/_`,
+    );
+  }
+  const reg = readRegistry();
+  if (reg.accounts.some((a) => a.label === label)) {
+    throw new Error(`Account "${label}" already exists`);
+  }
+  const dir = expandHome(
+    opts.dir || path.join(os.homedir(), `.claude-${label}`),
+  );
+  const isDefault = isDefaultDir(dir);
+  const identityFile = isDefault
+    ? path.join(os.homedir(), '.claude.json')
+    : path.join(dir, '.claude.json');
+  const entry: RegistryAccount = {
+    label,
+    dir,
+    identityFile,
+    configDirEnv: isDefault ? null : dir,
+    isDefault,
+    loggedIn: false,
+    ...readIdentity(identityFile),
+  };
+  reg.accounts.push(entry);
+  if (!reg.defaultAccount) reg.defaultAccount = label;
+  writeRegistry(reg);
+  regenerate(reg);
+  return entry;
+}
+
+export function removeAccount(label: string): string | undefined {
+  const reg = readRegistry();
+  const idx = reg.accounts.findIndex((a) => a.label === label);
+  if (idx < 0) throw new Error(`No account "${label}"`);
+  if (reg.accounts.length === 1) {
+    throw new Error('Refusing to remove the only configured account');
+  }
+  if (reg.accounts[idx].isDefault) {
+    throw new Error(
+      `"${label}" is the anchor (~/.claude) account and can't be unregistered`,
+    );
+  }
+  reg.accounts.splice(idx, 1);
+  if (reg.defaultAccount === label) {
+    const anchor = reg.accounts.find((a) => a.isDefault) || reg.accounts[0];
+    reg.defaultAccount = anchor.label;
+  }
+  writeRegistry(reg);
+  regenerate(reg);
+  return reg.defaultAccount;
+}
+
+export function setDefault(label: string): void {
+  const reg = readRegistry();
+  if (!reg.accounts.some((a) => a.label === label)) {
+    throw new Error(`No account "${label}"`);
+  }
+  reg.defaultAccount = label;
+  writeRegistry(reg);
+  regenerate(reg);
+}
+
+export interface ListedAccount extends RegistryAccount {
+  isCurrentDefault: boolean;
+}
+
+/** Registry accounts enriched with live identity + a current-default flag. */
+export function listAccounts(): ListedAccount[] {
+  const reg = readRegistry();
+  const defaultLabel = resolveDefaultLabel(reg);
+  return reg.accounts.map((a) => ({
+    ...a,
+    ...readIdentity(a.identityFile),
+    isCurrentDefault: a.label === defaultLabel,
+  }));
+}
+
+// ---------------------------------------------------------------------------
+// shell hook install / uninstall (the ~/.zshrc source block)
+// ---------------------------------------------------------------------------
+
+export function isShellHookInstalled(): boolean {
+  try {
+    return fs.readFileSync(ZSHRC_PATH, 'utf-8').includes(ZSHRC_BEGIN);
+  } catch {
+    return false;
+  }
+}
+
+export function installShellHook(): { changed: boolean; path: string } {
+  regenerate();
+  if (isShellHookInstalled()) return { changed: false, path: ZSHRC_PATH };
+  const block = [
+    '',
+    ZSHRC_BEGIN,
+    '[ -f "$HOME/.config/codev/accounts.sh" ] && source "$HOME/.config/codev/accounts.sh"',
+    ZSHRC_END,
+    '',
+  ].join('\n');
+  fs.appendFileSync(ZSHRC_PATH, block, 'utf-8');
+  return { changed: true, path: ZSHRC_PATH };
+}
+
+export function uninstallShellHook(): { changed: boolean; path: string } {
+  let content: string;
+  try {
+    content = fs.readFileSync(ZSHRC_PATH, 'utf-8');
+  } catch {
+    return { changed: false, path: ZSHRC_PATH };
+  }
+  if (!content.includes(ZSHRC_BEGIN)) {
+    return { changed: false, path: ZSHRC_PATH };
+  }
+  const re = new RegExp(`\\n?${ZSHRC_BEGIN}[\\s\\S]*?${ZSHRC_END}\\n?`, 'g');
+  fs.writeFileSync(ZSHRC_PATH, content.replace(re, '\n'), 'utf-8');
+  return { changed: true, path: ZSHRC_PATH };
+}
diff --git a/src/cli/codev-account.ts b/src/cli/codev-account.ts
new file mode 100644
index 0000000..8a31cff
--- /dev/null
+++ b/src/cli/codev-account.ts
@@ -0,0 +1,157 @@
+#!/usr/bin/env node
+/**
+ * `codev account` — manage CodeV's multi-account registry from the terminal.
+ *
+ * Run (dev):  yarn account <cmd> [args]
+ * e.g.        yarn account list
+ *             yarn account add work
+ *             yarn account default work
+ *             yarn account remove work
+ *
+ * It mutates ~/.config/codev/accounts.json and regenerates
+ * ~/.config/codev/accounts.sh via the shared manager (src/cli/account-manager.ts),
+ * so the shell integration and CodeV stay in sync. Distribution as a real
+ * `codev account` binary on PATH is wired up in Batch 2b.
+ */
+
+import * as manager from './account-manager';
+
+const USAGE = `codev account — manage CodeV multi-account registry
+
+Usage:
+  codev account list                 List configured accounts
+  codev account add <label> [--dir D] Register a new account (default dir ~/.claude-<label>)
+  codev account default <label>      Set which account bare \`claude\` resolves to
+  codev account remove <label>       Unregister an account (leaves its dir on disk)
+  codev account regenerate           Rewrite ~/.config/codev/accounts.sh from the registry
+  codev account show                 Print the generated accounts.sh (dry run, writes nothing)
+  codev account install              Add the source line to ~/.zshrc (idempotent)
+  codev account uninstall            Remove the ~/.zshrc block (keeps registry + dir)
+  codev account help                 Show this help
+
+After add/default/remove: open a new shell or \`source ~/.zshrc\` to pick up changes.`;
+
+function reloadHint(): void {
+  console.log('  → open a new shell or run: source ~/.zshrc');
+}
+
+function getFlag(args: string[], name: string): string | undefined {
+  const i = args.indexOf(name);
+  return i >= 0 ? args[i + 1] : undefined;
+}
+
+function printList(): void {
+  const accounts = manager.listAccounts();
+  if (accounts.length === 0) {
+    console.log('No accounts configured yet. Add one with: codev account add <label>');
+    return;
+  }
+  const pad = Math.max(...accounts.map((a) => a.label.length), 5);
+  console.log(`codev accounts (registry: ${manager.REGISTRY_PATH})`);
+  for (const a of accounts) {
+    const star = a.isCurrentDefault ? '*' : ' ';
+    const who = a.loggedIn
+      ? a.email || '(logged in)'
+      : '(not logged in — run: claude ' + a.label + ')';
+    const tags = [
+      a.isDefault ? 'anchor ~/.claude' : `CLAUDE_CONFIG_DIR=${a.dir}`,
+    ];
+    console.log(`  ${star} ${a.label.padEnd(pad)}  ${who}`);
+    console.log(`      ${tags.join('  ')}`);
+  }
+  console.log("  ('*' = bare 'claude' resolves here)");
+}
+
+function main(): number {
+  const [cmd, ...rest] = process.argv.slice(2);
+  switch (cmd) {
+    case 'list':
+    case 'ls':
+      printList();
+      return 0;
+
+    case 'add': {
+      const label = rest.find((a) => !a.startsWith('-'));
+      const dir = getFlag(rest, '--dir');
+      const a = manager.addAccount(label as string, { dir });
+      console.log(`✓ Added "${a.label}"  (${a.dir})`);
+      if (!a.loggedIn) {
+        console.log(`  Log in with:  claude ${a.label}   (or claude-${a.label})`);
+      }
+      reloadHint();
+      return 0;
+    }
+
+    case 'default': {
+      const label = rest[0];
+      manager.setDefault(label);
+      console.log(`✓ bare 'claude' now resolves to "${label}"`);
+      reloadHint();
+      return 0;
+    }
+
+    case 'remove':
+    case 'rm': {
+      const label = rest[0];
+      const newDefault = manager.removeAccount(label);
+      console.log(`✓ Unregistered "${label}" (its dir is left on disk)`);
+      if (newDefault) console.log(`  default account is now "${newDefault}"`);
+      reloadHint();
+      return 0;
+    }
+
+    case 'regenerate':
+    case 'regen': {
+      const p = manager.regenerate();
+      console.log(`✓ Regenerated ${p}`);
+      reloadHint();
+      return 0;
+    }
+
+    case 'show':
+    case 'preview':
+      // Print what accounts.sh WOULD contain — a dry run, writes nothing.
+      process.stdout.write(manager.generateAccountsSh(manager.readRegistry()));
+      return 0;
+
+    case 'install': {
+      const r = manager.installShellHook();
+      console.log(
+        r.changed
+          ? `✓ Added CodeV source block to ${r.path}`
+          : `• ${r.path} already sources CodeV accounts (no change)`,
+      );
+      reloadHint();
+      return 0;
+    }
+
+    case 'uninstall': {
+      const r = manager.uninstallShellHook();
+      console.log(
+        r.changed
+          ? `✓ Removed CodeV block from ${r.path} (registry + dirs kept)`
+          : `• No CodeV block found in ${r.path} (no change)`,
+      );
+      return 0;
+    }
+
+    case 'help':
+    case '--help':
+    case '-h':
+    case undefined:
+      console.log(USAGE);
+      return 0;
+
+    default:
+      console.error(`Unknown command: ${cmd}\n`);
+      console.log(USAGE);
+      return 1;
+  }
+}
+
+try {
+  process.exit(main());
+} catch (e) {
+  console.error(`✗ ${(e as Error).message}`);
+  process.exit(1);
+}
diff --git a/vitest.config.ts b/vitest.config.ts
new file mode 100644
index 0000000..6cd7849
--- /dev/null
+++ b/vitest.config.ts
@@ -0,0 +1,11 @@
+import { defineConfig } from 'vitest/config';
+
+// Scoped to *.test.ts so Vitest never has to load the Electron/webpack entry
+// points (which pull in native modules and JSX). Node environment — the units
+// under test are pure Node logic (fs/os/path).
+export default defineConfig({
+  test: {
+    environment: 'node',
+    include: ['src/**/*.test.ts'],
+  },
+});
diff --git a/yarn.lock b/yarn.lock
index 313be52..9da8cca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -758,6 +758,28 @@
     minimist "^1.2.8"
     postject "^1.0.0-alpha.6"
 
+"@emnapi/core@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.11.1.tgz#b9e1064f3a6b1631e241e638eb48d736bfd372a6"
+  integrity sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==
+  dependencies:
+    "@emnapi/wasi-threads" "1.2.2"
+    tslib "^2.4.0"
+
+"@emnapi/runtime@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.11.1.tgz#58f1f3d5d81a9b12f793ab688c96371901027c24"
+  integrity sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==
+  dependencies:
+    tslib "^2.4.0"
+
+"@emnapi/wasi-threads@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz#4c93becf5bfa3b13d1bbdcc06aee38321ad8139a"
+  integrity sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==
+  dependencies:
+    tslib "^2.4.0"
+
 "@emotion/babel-plugin@^11.10.5":
   version "11.10.5"
   resolved "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz"
@@ -1247,7 +1269,7 @@
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0", "@jridgewell/sourcemap-codec@^1.5.5":
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
   integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
@@ -1320,6 +1342,13 @@
     semver "^7.5.3"
     tar "^7.4.0"
 
+"@napi-rs/wasm-runtime@^1.1.6":
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz#ed33806d0f9be98dc76d0c3d4fd872fda701b5d5"
+  integrity sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==
+  dependencies:
+    "@tybys/wasm-util" "^0.10.3"
+
 "@nestjs/common@^10.0.3":
   version "10.0.3"
   resolved "https://registry.npmjs.org/@nestjs/common/-/common-10.0.3.tgz"
@@ -1398,6 +1427,11 @@
     consola "^2.15.0"
     node-fetch "^2.6.1"
 
+"@oxc-project/types@=0.138.0":
+  version "0.138.0"
+  resolved "https://registry.yarnpkg.com/@oxc-project/types/-/types-0.138.0.tgz#ce9690ec80144b4c38dfed44e76a67b911df9aca"
+  integrity sha512-1a7ZKmrRTCoN1XMZ4L0PyyqrMnrNlLyPuOkdSX2MZg7IiIGRUyurNhAm73ptDOraoBcIordsIGKNPKUzy3ZmfA==
+
 "@pkgr/core@^0.2.9":
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.9.tgz#d229a7b7f9dac167a156992ef23c7f023653f53b"
@@ -1425,6 +1459,90 @@
   resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.16.1.tgz#ee487620dc5135fd175ac7494b1c60c9f12c1e4b"
   integrity sha512-gpZG0kGGxfemgvK/LghHdBIz+crHkZjzszja94xp4oytpsXrgt/Ice82MvPsWMleVIniKuARrowtsIsim0PFJQ==
 
+"@rolldown/binding-android-arm64@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.4.tgz#6c31f378f42d5ea75b37970d2add539682264792"
+  integrity sha512-EZLpf/8y7GXkkra90ML47kzik/GMP3EMcE9bPyHmRfxLC6z9+aW5A8poCsoxjrT5GfEcNAAvWwUHjvP1pUQkfw==
+
+"@rolldown/binding-darwin-arm64@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.4.tgz#1dbbbbaf2b00d13b32127cbf3a379d6ef69fd647"
+  integrity sha512-aUi+HBvmYb7j8krl1+qJgkG8C17fO79gk3c+jPw4S8glRFc1DTija9S3EyaTSQUm5GJXYKDAsugBEhFHH2vYiQ==
+
+"@rolldown/binding-darwin-x64@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.4.tgz#3b8f76dfd462e28e8914e7ded63647194866329f"
+  integrity sha512-F7hHC3gwY11+vByKPRWqwGbeXWVgKmL+pTGCinaEhdihzBV2aQ0fvZOch9cXYUOKuKKq429HeYXOqQLc7wFCEg==
+
+"@rolldown/binding-freebsd-x64@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.4.tgz#7f3f82c6a7b9fcec4e24c29e89d8343c9c72d403"
+  integrity sha512-sI5yw+7s92SK6odiEhD5lKCBlWcpjHS5qyqpVQbZAJ0fIzEUXrmbl3DH2ybR3PZogulNJF+COLtmA8hUfvkCCQ==
+
+"@rolldown/binding-linux-arm-gnueabihf@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.4.tgz#baee435c7addf84e58fee72c70e98acc603aba3e"
+  integrity sha512-mCi0OKgEieFircrtVYmQAFGszRtMnZ6fpZAXrxanXAu7lqZcsK1E1RAaZNG0uKAnxox3B1f4EyQNnoyMfN1vAA==
+
+"@rolldown/binding-linux-arm64-gnu@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.4.tgz#cc8c63913bac68bf1f49a0d095634e09008741ce"
+  integrity sha512-B9Ial3Kv5sh0SHnB1g/QWcUQCEvCF6QKGAl4zXypYj65mVI+B4AhFBwPtSN7pDrJeIx8Z7zdy4ntx+wQABom7w==
+
+"@rolldown/binding-linux-arm64-musl@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.4.tgz#aaa1d02f5ee705bd6812ff84ab1f7752ba4e4497"
+  integrity sha512-lZVym0PuHE1KZ22gmFTC15lAkrg9iTszR617oYRB/iPY1A56ywoJzVKOJBKaot5RiikCObmur6pogpse3gRcng==
+
+"@rolldown/binding-linux-ppc64-gnu@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.4.tgz#9e26bb9ba2a846039902270b778d1d3ba0b62033"
+  integrity sha512-t2DNiLJWNTbnEHyUzTumldML6ET4/g16467LZoDDJ3tSxGvguL5/NyC2lCsNKuyRycg9XeDQF5SSv+TNOhQEXg==
+
+"@rolldown/binding-linux-s390x-gnu@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.4.tgz#d9ec4d5b1bd6f8029072670da9f0d58e728e8c44"
+  integrity sha512-0WIRnL1Uw4BvTZRLQt+PVgo6ZKTJadlC2btP+/EOXv2f/DWbY0rEgl+y834mIVwP1FkTlWVTrGGJXf12lru7EQ==
+
+"@rolldown/binding-linux-x64-gnu@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.4.tgz#6cc9cad61ea020ac2191037755a36f8fcfa11434"
+  integrity sha512-JWtGshGfX+oENAKonoNkqEJX+7hC8yfhi9GUyPX1VX4mdh1y5r+ZiJLR5XzAB0aoP6s/PcILsGjKq8O0mm24bw==
+
+"@rolldown/binding-linux-x64-musl@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.4.tgz#d23df39a184be427877da934fc3c30e3f25cd686"
+  integrity sha512-rT6yQcxUuXs4CnbofqwHRRV0iem349rLMYpTjkgQGLjrY4ado/eDzwPZPTCgTOlF6Nkp8NEv70yLMTn6qkWxsQ==
+
+"@rolldown/binding-openharmony-arm64@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.4.tgz#189d1a062624f57f9b0a52f94163d51b6aa692ab"
+  integrity sha512-KXMGoboq5cyaCQjDA4GLuRiOwBQ0EyFnJoVViLeZ45/3rFItRODEr+NdsBcVpll40hhNArlm/speWGRvj08LzA==
+
+"@rolldown/binding-wasm32-wasi@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.4.tgz#98c634b91a9abf5de74b8402aa8063fb5044efd4"
+  integrity sha512-5K83rb36oJiY7BCyE9zLZtGcPV4g5wvq+xwdO0XPIwDVZI8cyB/AUjkNXGb92/rnmezEkjMOpgY61rtwjQtFwg==
+  dependencies:
+    "@emnapi/core" "1.11.1"
+    "@emnapi/runtime" "1.11.1"
+    "@napi-rs/wasm-runtime" "^1.1.6"
+
+"@rolldown/binding-win32-arm64-msvc@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.4.tgz#1c8c8515c811ae28fc26355079b80f617fdddb0b"
+  integrity sha512-PnWBtw3TV5KOg69HQQDR0mnQuyCmSGR2pAB4DC1rPF808fgKeTUMj2EOEyKATpgiuxuR5APQmiDO7PDgEjTFSA==
+
+"@rolldown/binding-win32-x64-msvc@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.4.tgz#e14b1ef53473f51a4180d9b46c5f0cea9f1713cb"
+  integrity sha512-M1lpniBePobTfsa7Ks9a199e1akxsXn+GYBUKsEzv3YFzOm1HJAMNwKI3qr0Zq+mxwx9gOZoTdP1yXRYsZUocQ==
+
+"@rolldown/pluginutils@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz#e3fcee093fbb5ce765e1ad088ff4de2889f6f9be"
+  integrity sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==
+
 "@rtsao/scc@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
@@ -1435,6 +1553,11 @@
   resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz"
   integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
+"@standard-schema/spec@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@standard-schema/spec/-/spec-1.1.0.tgz#a79b55dbaf8604812f52d140b2c9ab41bc150bb8"
+  integrity sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==
+
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.6"
   resolved "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"
@@ -1467,6 +1590,13 @@
   resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz"
   integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
 
+"@tybys/wasm-util@^0.10.3":
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.3.tgz#015cba9e9dd47ce14d03d2a8c5d547bfb169665d"
+  integrity sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==
+  dependencies:
+    tslib "^2.4.0"
+
 "@types/body-parser@*":
   version "1.19.2"
   resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"
@@ -1492,6 +1622,14 @@
     "@types/node" "*"
     "@types/responselike" "^1.0.0"
 
+"@types/chai@^5.2.2":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-5.2.3.tgz#8e9cd9e1c3581fa6b341a5aed5588eb285be0b4a"
+  integrity sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==
+  dependencies:
+    "@types/deep-eql" "*"
+    assertion-error "^2.0.1"
+
 "@types/connect-history-api-fallback@^1.3.5":
   version "1.3.5"
   resolved "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz"
@@ -1514,6 +1652,11 @@
   dependencies:
     "@types/ms" "*"
 
+"@types/deep-eql@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/deep-eql/-/deep-eql-4.0.2.tgz#334311971d3a07121e7eb91b684a605e7eea9cbd"
+  integrity sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==
+
 "@types/eslint-scope@^3.7.7":
   version "3.7.7"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
@@ -1535,6 +1678,11 @@
   resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz"
   integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
 
+"@types/estree@^1.0.0":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.9.tgz#cf3f0e876d7bee15a93ab925b82bf570a3904a24"
+  integrity sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==
+
 "@types/estree@^1.0.8":
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e"
@@ -1932,6 +2080,66 @@
     rollup-pluginutils "^2.8.2"
     sourcemap-codec "^1.4.4"
 
+"@vitest/expect@4.1.9":
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-4.1.9.tgz#ba1af73ae53262e3dc9b518cb7b76fb614e0ef53"
+  integrity sha512-vl/rYsUKcBr3SnQn166+XR5ZQcgMx3DQhFWdfli/cWpLnLUmbxZvyrJZotLFUryib+LtArYMSTJ5RbQ57ZqrlA==
+  dependencies:
+    "@standard-schema/spec" "^1.1.0"
+    "@types/chai" "^5.2.2"
+    "@vitest/spy" "4.1.9"
+    "@vitest/utils" "4.1.9"
+    chai "^6.2.2"
+    tinyrainbow "^3.1.0"
+
+"@vitest/mocker@4.1.9":
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/mocker/-/mocker-4.1.9.tgz#a483de79b358aba3dd8f319a0d8ab17c89f5c75d"
+  integrity sha512-EVkXzBjrPGM+cK8/ANWgBrkUCfJfb38/EfTSO8h7pWvKkyPkpWxvR7BkD2MyItMF62C97zAEoqdpUixwR/e+Rw==
+  dependencies:
+    "@vitest/spy" "4.1.9"
+    estree-walker "^3.0.3"
+    magic-string "^0.30.21"
+
+"@vitest/pretty-format@4.1.9":
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-4.1.9.tgz#885cfe9fcb6ff3df4409ea66192cc1fb23d62fae"
+  integrity sha512-s0iufns3iIFitdgm+YR7g1whCAaGtXz459VS9/PqyKDEEFgYIhsHOQmXgIgDuYCt7DeQmiZT0Qe2OA2p4ZPu5A==
+  dependencies:
+    tinyrainbow "^3.1.0"
+
+"@vitest/runner@4.1.9":
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-4.1.9.tgz#bb742947ce4841dfb2d8984a2f9014850be10f51"
+  integrity sha512-KXLMDtc7oe70+3mJfGrPUWPesswH+3sTxAMAMl8DG7I8IUQT4XW718dY5ID3vPUcmlu27CcKfY4P3h3I29SLJg==
+  dependencies:
+    "@vitest/utils" "4.1.9"
+    pathe "^2.0.3"
+
+"@vitest/snapshot@4.1.9":
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-4.1.9.tgz#bdfb670ae5617613ea8776e93d0666a66defeeb7"
+  integrity sha512-Jc7RKGNBo8Z28WYIm0Niej4xdSPByRf6mU58VpHQkd6Zh05rlnA+twjbK5HyeIGHxrzsc3mJgS43uM0CZKzaIA==
+  dependencies:
+    "@vitest/pretty-format" "4.1.9"
+    "@vitest/utils" "4.1.9"
+    magic-string "^0.30.21"
+    pathe "^2.0.3"
+
+"@vitest/spy@4.1.9":
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-4.1.9.tgz#bfc40d48fb9bd1a1228bfbfde7f5555e7f6b3867"
+  integrity sha512-fHpsS6mIi+PiEW+vcRVOMkX1oSaPKne3VOclSFICPcGOmfKgXPU5iAah+wcNcj2xPrCCmfq99IDGf+EojhhvhA==
+
+"@vitest/utils@4.1.9":
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-4.1.9.tgz#0184c7e6eb3234739b2b6b3b985f78d1ed823ee1"
+  integrity sha512-A51o8ymO5PpqlWNnBP9ZHPXDIpuMtTLlGSjN7la4US+LJzoUMyhwjA5QXlm39JexgwHKW4Xjs8Z2d3dLCXOeuA==
+  dependencies:
+    "@vitest/pretty-format" "4.1.9"
+    convert-source-map "^2.0.0"
+    tinyrainbow "^3.1.0"
+
 "@vscode/sudo-prompt@^9.3.1":
   version "9.3.2"
   resolved "https://registry.yarnpkg.com/@vscode/sudo-prompt/-/sudo-prompt-9.3.2.tgz#692ba38df40bd3502ccc4e9f099fbbaedbd5f04e"
@@ -2419,6 +2627,11 @@ asar@^3.0.0:
   optionalDependencies:
     "@types/glob" "^7.1.1"
 
+assertion-error@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-2.0.1.tgz#f641a196b335690b1070bf00b6e7593fec190bf7"
+  integrity sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==
+
 async-function@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
@@ -2779,6 +2992,11 @@ ccount@^2.0.0:
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5"
   integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
 
+chai@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-6.2.2.tgz#ae41b52c9aca87734505362717f3255facda360e"
+  integrity sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==
+
 chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
@@ -3125,6 +3343,11 @@ convert-source-map@^1.5.0:
   dependencies:
     safe-buffer "~5.1.1"
 
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
@@ -3437,6 +3660,11 @@ detect-libc@^2.0.1:
   resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz"
   integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
 
+detect-libc@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
+  integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
+
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"
@@ -4200,6 +4428,13 @@ estree-walker@^0.6.1:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
   integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
 
+estree-walker@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
+  integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
@@ -4263,6 +4498,11 @@ expand-template@^2.0.3:
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
+expect-type@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-1.4.0.tgz#24edf7f0cc69a44d008567ba4594ab96f3c3a3d6"
+  integrity sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==
+
 exponential-backoff@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.2.tgz#a8f26adb96bf78e8cd8ad1037928d5e5c0679d91"
@@ -4401,6 +4641,11 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
+fdir@^6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350"
+  integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
@@ -4652,6 +4897,11 @@ fsevents@~2.3.2:
   resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
+fsevents@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
@@ -5855,6 +6105,80 @@ libphonenumber-js@^1.10.14:
   resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.10.37.tgz#185264130c9375f17d0c487a288223294579929c"
   integrity sha512-Z10PCaOCiAxbUxLyR31DNeeNugSVP6iv/m7UrSKS5JHziEMApJtgku4e9Q69pzzSC9LnQiM09sqsGf2ticZnMw==
 
+lightningcss-android-arm64@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz#f033885116dfefd9c6f54787523e3514b61e1968"
+  integrity sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==
+
+lightningcss-darwin-arm64@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz#50b71871b01c8199584b649e292547faea7af9b5"
+  integrity sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==
+
+lightningcss-darwin-x64@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz#35f3e97332d130b9ca181e11b568ded6aebc6d5e"
+  integrity sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==
+
+lightningcss-freebsd-x64@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz#9777a76472b64ed6ff94342ad64c7bafd794a575"
+  integrity sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==
+
+lightningcss-linux-arm-gnueabihf@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz#13ae652e1ab73b9135d7b7da172f666c410ad53d"
+  integrity sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==
+
+lightningcss-linux-arm64-gnu@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz#417858795a94592f680123a1b1f9da8a0e1ef335"
+  integrity sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==
+
+lightningcss-linux-arm64-musl@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz#6be36692e810b718040802fd809623cffe732133"
+  integrity sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==
+
+lightningcss-linux-x64-gnu@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz#0b7803af4eb21cfd38dd39fe2abbb53c7dd091f6"
+  integrity sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==
+
+lightningcss-linux-x64-musl@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz#88dc8ba865ddddb1ac5ef04b0f161804418c163b"
+  integrity sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==
+
+lightningcss-win32-arm64-msvc@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz#4f30ba3fa5e925f5b79f945e8cc0d176c3b1ab38"
+  integrity sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==
+
+lightningcss-win32-x64-msvc@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz#141aa5605645064928902bb4af045fa7d9f4220a"
+  integrity sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==
+
+lightningcss@^1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.32.0.tgz#b85aae96486dcb1bf49a7c8571221273f4f1e4a9"
+  integrity sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==
+  dependencies:
+    detect-libc "^2.0.3"
+  optionalDependencies:
+    lightningcss-android-arm64 "1.32.0"
+    lightningcss-darwin-arm64 "1.32.0"
+    lightningcss-darwin-x64 "1.32.0"
+    lightningcss-freebsd-x64 "1.32.0"
+    lightningcss-linux-arm-gnueabihf "1.32.0"
+    lightningcss-linux-arm64-gnu "1.32.0"
+    lightningcss-linux-arm64-musl "1.32.0"
+    lightningcss-linux-x64-gnu "1.32.0"
+    lightningcss-linux-x64-musl "1.32.0"
+    lightningcss-win32-arm64-msvc "1.32.0"
+    lightningcss-win32-x64-msvc "1.32.0"
+
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
@@ -6005,6 +6329,13 @@ magic-string@^0.25.1:
   dependencies:
     sourcemap-codec "^1.4.8"
 
+magic-string@^0.30.21:
+  version "0.30.21"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91"
+  integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.5"
+
 make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"
@@ -6751,6 +7082,11 @@ mute-stream@^1.0.0:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
   integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
 
+nanoid@^3.3.12:
+  version "3.3.15"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.15.tgz#36c490fad8c6e86c824c940dfdde999b69ed4316"
+  integrity sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==
+
 nanoid@^3.3.4:
   version "3.3.4"
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"
@@ -6995,6 +7331,11 @@ obuf@^1.0.0, obuf@^1.1.2:
   resolved "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
+obug@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/obug/-/obug-2.1.3.tgz#c02c60f95abd603409330e767db7f2823193331e"
+  integrity sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg==
+
 on-finished@2.4.1:
   version "2.4.1"
   resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"
@@ -7255,6 +7596,11 @@ path-type@^4.0.0:
   resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+pathe@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-2.0.3.tgz#3ecbec55421685b70a9da872b2cff3e1cbed1716"
+  integrity sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==
+
 pe-library@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/pe-library/-/pe-library-1.0.1.tgz#02735430885a622576a53cd8827658b7d2fada0e"
@@ -7280,6 +7626,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+picomatch@^4.0.3, picomatch@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.5.tgz#51ea57a17d86f605f81039595fbc40ed06a55fab"
+  integrity sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==
+
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
@@ -7357,6 +7708,15 @@ postcss@^8.4.7:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.5.16:
+  version "8.5.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.16.tgz#1230ce0b5df354c24c0ea45f99ce5f6a88279d28"
+  integrity sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==
+  dependencies:
+    nanoid "^3.3.12"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
 postject@^1.0.0-alpha.6:
   version "1.0.0-alpha.6"
   resolved "https://registry.yarnpkg.com/postject/-/postject-1.0.0-alpha.6.tgz#9d022332272e2cfce8dea4cfce1ee6dd1b2ee135"
@@ -7980,6 +8340,30 @@ roarr@^2.15.3:
     semver-compare "^1.0.0"
     sprintf-js "^1.1.2"
 
+rolldown@~1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/rolldown/-/rolldown-1.1.4.tgz#7e15fb26997353808330109ef6bffda274aaa027"
+  integrity sha512-IjZYiLxZwpnhwhdBH2ugdTGVSdhCQUmLxLoqyjiL0JxYjyRst+5a0P3xfrTxJ5F638j4Mvvw5FAX5XE6eHpXbA==
+  dependencies:
+    "@oxc-project/types" "=0.138.0"
+    "@rolldown/pluginutils" "^1.0.0"
+  optionalDependencies:
+    "@rolldown/binding-android-arm64" "1.1.4"
+    "@rolldown/binding-darwin-arm64" "1.1.4"
+    "@rolldown/binding-darwin-x64" "1.1.4"
+    "@rolldown/binding-freebsd-x64" "1.1.4"
+    "@rolldown/binding-linux-arm-gnueabihf" "1.1.4"
+    "@rolldown/binding-linux-arm64-gnu" "1.1.4"
+    "@rolldown/binding-linux-arm64-musl" "1.1.4"
+    "@rolldown/binding-linux-ppc64-gnu" "1.1.4"
+    "@rolldown/binding-linux-s390x-gnu" "1.1.4"
+    "@rolldown/binding-linux-x64-gnu" "1.1.4"
+    "@rolldown/binding-linux-x64-musl" "1.1.4"
+    "@rolldown/binding-openharmony-arm64" "1.1.4"
+    "@rolldown/binding-wasm32-wasi" "1.1.4"
+    "@rolldown/binding-win32-arm64-msvc" "1.1.4"
+    "@rolldown/binding-win32-x64-msvc" "1.1.4"
+
 rollup-pluginutils@^2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
@@ -8313,6 +8697,11 @@ side-channel@^1.1.0:
     side-channel-map "^1.0.1"
     side-channel-weakmap "^1.0.2"
 
+siginfo@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz#32e76c70b79724e3bb567cb9d543eb858ccfaf30"
+  integrity sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==
+
 signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.7"
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
@@ -8391,6 +8780,11 @@ source-map-js@^1.0.2:
   resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
+source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
+
 source-map-support@^0.5.13, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
@@ -8490,6 +8884,11 @@ ssri@^9.0.0:
   dependencies:
     minipass "^3.1.1"
 
+stackback@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b"
+  integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==
+
 statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
@@ -8500,6 +8899,11 @@ statuses@2.0.1:
   resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
+std-env@^4.0.0-rc.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-4.1.0.tgz#45899abc590d86d682e87f0acd1033a75084cd3f"
+  integrity sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==
+
 stop-iteration-iterator@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
@@ -8846,6 +9250,29 @@ tiny-invariant@^1.2.0:
   resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz"
   integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
+tinybench@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.9.0.tgz#103c9f8ba6d7237a47ab6dd1dcff77251863426b"
+  integrity sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==
+
+tinyexec@^1.0.2:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-1.2.4.tgz#ae45bb2edebda94c70f4ea897e0f1243e470db71"
+  integrity sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==
+
+tinyglobby@^0.2.15, tinyglobby@^0.2.17:
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.17.tgz#562a9a6c9eb2b3b123d39719f9af5bb44fcd7631"
+  integrity sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==
+  dependencies:
+    fdir "^6.5.0"
+    picomatch "^4.0.4"
+
+tinyrainbow@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/tinyrainbow/-/tinyrainbow-3.1.0.tgz#1d8a623893f95cf0a2ddb9e5d11150e191409421"
+  integrity sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==
+
 tmp-promise@^3.0.2:
   version "3.0.3"
   resolved "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz"
@@ -8956,7 +9383,7 @@ tslib@2.5.3, tslib@^2.0.0, tslib@^2.0.3:
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz"
   integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==
 
-tslib@^2.1.0:
+tslib@^2.1.0, tslib@^2.4.0:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
@@ -9299,6 +9726,45 @@ vfile@^5.0.0:
     unist-util-stringify-position "^3.0.0"
     vfile-message "^3.0.0"
 
+"vite@^6.0.0 || ^7.0.0 || ^8.0.0":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-8.1.3.tgz#ce05b445b501014a10e5a8073811759c223e8ac2"
+  integrity sha512-Ds+gBRbj0lwRO2Y5hwnUBdxSwlAve9LeRyU4sNnAr0ewW0gWF0n5bgXgUzbgZ49MV9BVUAQUFYVcDUcilUExMA==
+  dependencies:
+    lightningcss "^1.32.0"
+    picomatch "^4.0.4"
+    postcss "^8.5.16"
+    rolldown "~1.1.3"
+    tinyglobby "^0.2.17"
+  optionalDependencies:
+    fsevents "~2.3.3"
+
+vitest@^4.1.9:
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-4.1.9.tgz#98f22fbd70e2a18c4a92bb20624bc92e5dfac5f3"
+  integrity sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==
+  dependencies:
+    "@vitest/expect" "4.1.9"
+    "@vitest/mocker" "4.1.9"
+    "@vitest/pretty-format" "4.1.9"
+    "@vitest/runner" "4.1.9"
+    "@vitest/snapshot" "4.1.9"
+    "@vitest/spy" "4.1.9"
+    "@vitest/utils" "4.1.9"
+    es-module-lexer "^2.0.0"
+    expect-type "^1.3.0"
+    magic-string "^0.30.21"
+    obug "^2.1.1"
+    pathe "^2.0.3"
+    picomatch "^4.0.3"
+    std-env "^4.0.0-rc.1"
+    tinybench "^2.9.0"
+    tinyexec "^1.0.2"
+    tinyglobby "^0.2.15"
+    tinyrainbow "^3.1.0"
+    vite "^6.0.0 || ^7.0.0 || ^8.0.0"
+    why-is-node-running "^2.3.0"
+
 warning@^4.0.2:
   version "4.0.3"
   resolved "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz"
@@ -9539,6 +10005,14 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
+why-is-node-running@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/why-is-node-running/-/why-is-node-running-2.3.0.tgz#a3f69a97107f494b3cdc3bdddd883a7d65cebf04"
+  integrity sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==
+  dependencies:
+    siginfo "^2.0.0"
+    stackback "0.0.2"
+
 wildcard@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz"

From d77f2f9e9a64f93a428e872695c9378f71adf480 Mon Sep 17 00:00:00 2001
From: Grimmer Kang <k@grimmer.io>
Date: Mon, 6 Jul 2026 14:35:43 +0800
Subject: [PATCH 02/10] feat(multi-account): global-default resume routing
 (Batch 2e)

buildResumeCommand now emits `command claude` (bypassing the accounts.sh
`claude` dispatcher) so a configured non-anchor global-default can't
re-route an anchor-account resume to the wrong account. Behavior is
unchanged when the default IS the anchor; a no-op for single-account
users (command claude == claude).

2e's shell + CLI side already shipped in 2a (`codev account default`
plus the dispatcher `*)` -> defaultAccount). Also documents the
2c <-> Batch 3 coupling (cross-account resume needs shared session data).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017kCK4t5JSVynVZxGcrTGGp
---
 CHANGELOG.md                         |  3 ++-
 docs/multi-account-support-design.md |  5 +++++
 src/claude-session-utility.ts        | 12 +++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8bf219..6ed630e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,10 @@
 
 ## 1.0.77
 
-- Feat: multi-account Batch 2a — `codev account` CLI to manage the registry
+- Feat: multi-account Batch 2a + 2e — `codev account` CLI + configurable global-default
   - `codev account list | add <label> [--dir D] | default <label> | remove <label> | regenerate | show | install | uninstall`
   - One shared generator (`src/cli/account-manager.ts`) produces both `~/.config/codev/accounts.json` and `accounts.sh`, replacing Batch 1's hand-editing; run in dev via `yarn account <cmd>` (PATH install + Settings UI land in Batch 2b)
+  - Batch 2e (global-default): `codev account default <label>` + the shell dispatcher route bare `claude` to a chosen account; CodeV resume now uses `command claude` (bypasses the dispatcher) so a non-anchor global-default can't misroute an anchor-account resume
   - Adds Vitest + a generator test suite, and a real CI workflow (replacing the placeholder)
 
 ## 1.0.76
diff --git a/docs/multi-account-support-design.md b/docs/multi-account-support-design.md
index 0027bb4..8b10c7a 100644
--- a/docs/multi-account-support-design.md
+++ b/docs/multi-account-support-design.md
@@ -351,6 +351,11 @@ good. But the hook must be **registered** in each account's `settings.json`. Opt
 - New-session launch (Projects `⌘+Enter`): allow an account override, e.g. extend the
   planned `>` command mode (`> claude @work myrepo`) or an account segment in the
   expanded project row.
+- **Coupled with Batch 3 (§5).** Truly resuming/sharing a *transcript* across accounts
+  only works if the session data (and global config: CLAUDE.md/skills) is shareable
+  across config dirs — i.e. it depends on Batch 3's cross-account reuse. So design 2c
+  and Batch 3 **together**: without sharing, 2c is limited to "new session in this cwd
+  under account Y"; with sharing, genuine cross-account resume becomes possible.
 
 ### 6.H pyenv-style auto-switch by folder (requirement 6, nice-to-have, "reverse" priority)
 
diff --git a/src/claude-session-utility.ts b/src/claude-session-utility.ts
index 196a69f..7e5c89f 100644
--- a/src/claude-session-utility.ts
+++ b/src/claude-session-utility.ts
@@ -1075,8 +1075,8 @@ const getResumeConfigDirEnv = (sessionId: string): string | null => {
 };
 
 /**
- * Build `claude --resume <id>`, prefixed with CLAUDE_CONFIG_DIR when the session
- * belongs to a non-default account so it resumes under the right account.
+ * Build `command claude --resume <id>`, prefixed with CLAUDE_CONFIG_DIR when the
+ * session belongs to a non-default account so it resumes under the right account.
  */
 const buildResumeCommand = (sessionId: string): string => {
   const configDir = getResumeConfigDirEnv(sessionId);
@@ -1084,7 +1084,13 @@ const buildResumeCommand = (sessionId: string): string => {
   // don't escape the command, so a double-quoted prefix would break their
   // AppleScript string. Single quotes are safe across all terminals + handle spaces.
   const prefix = configDir ? `CLAUDE_CONFIG_DIR='${configDir}' ` : '';
-  return `${prefix}claude --resume ${sessionId}`;
+  // `command claude` bypasses the accounts.sh `claude` dispatcher. CodeV has
+  // already resolved the exact account (the prefix, or none for the anchor), so
+  // the shell must NOT re-route a bare `claude` to a configured non-default
+  // global-default (§2e) — that would resume an anchor-account session under the
+  // wrong account. Every terminal here runs the string through a shell, so the
+  // `command` builtin is available.
+  return `${prefix}command claude --resume ${sessionId}`;
 };
 
 /**

From 9b03b9803ed52310d6585b1b1d5625f93e047939 Mon Sep 17 00:00:00 2001
From: Grimmer Kang <k@grimmer.io>
Date: Mon, 6 Jul 2026 15:14:51 +0800
Subject: [PATCH 03/10] fix(multi-account): address CodeRabbit + cubic review
 (Batch 2a/2e)

- add: skip the --dir value when picking the label, so
  `add --dir /foo work` registers `work` (was misread as `/foo`)
- shell safety: assertSafeDir rejects shell-metachar dirs at add time
  AND at generation, so a crafted --dir / hand-edited registry can't
  inject code into the sourced accounts.sh
- default account: launch via `env -u CLAUDE_CONFIG_DIR claude` so a
  stray exported CLAUDE_CONFIG_DIR can't hijack it; extra accounts use
  `env CLAUDE_CONFIG_DIR=... claude` (env also bypasses the dispatcher)
- resume: single-quote-escape configDir so an apostrophe in the path
  can't break buildResumeCommand
- registry: drop the hardcoded defaultAccount='personal'; set it only
  when it doesn't name a real account (no dangling reference)
- prettier-format the new cli files; +1 injection-rejection test (10/10)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017kCK4t5JSVynVZxGcrTGGp
---
 src/claude-session-utility.ts   |   6 +-
 src/cli/account-manager.test.ts |  38 ++++++++---
 src/cli/account-manager.ts      | 110 ++++++++++++++++++++++++--------
 src/cli/codev-account.ts        |  20 ++++--
 4 files changed, 134 insertions(+), 40 deletions(-)

diff --git a/src/claude-session-utility.ts b/src/claude-session-utility.ts
index 7e5c89f..8c351c5 100644
--- a/src/claude-session-utility.ts
+++ b/src/claude-session-utility.ts
@@ -1083,7 +1083,11 @@ const buildResumeCommand = (sessionId: string): string => {
   // Single-quote the value: some terminal injections (Ghostty `initial input`)
   // don't escape the command, so a double-quoted prefix would break their
   // AppleScript string. Single quotes are safe across all terminals + handle spaces.
-  const prefix = configDir ? `CLAUDE_CONFIG_DIR='${configDir}' ` : '';
+  // Escape single quotes (e.g. /Users/O'Brien/…) so the single-quoted prefix
+  // stays well-formed: ' becomes '\'' .
+  const prefix = configDir
+    ? `CLAUDE_CONFIG_DIR='${configDir.replace(/'/g, "'\\''")}' `
+    : '';
   // `command claude` bypasses the accounts.sh `claude` dispatcher. CodeV has
   // already resolved the exact account (the prefix, or none for the anchor), so
   // the shell must NOT re-route a bare `claude` to a configured non-default
diff --git a/src/cli/account-manager.test.ts b/src/cli/account-manager.test.ts
index e9c2c2e..89f17d1 100644
--- a/src/cli/account-manager.test.ts
+++ b/src/cli/account-manager.test.ts
@@ -38,35 +38,57 @@ function reg(overrides: Partial<Registry> = {}): Registry {
 }
 
 describe('generateAccountsSh', () => {
-  it('launches the default account with NO CLAUDE_CONFIG_DIR', () => {
+  it('launches the default account with CLAUDE_CONFIG_DIR unset', () => {
     const sh = generateAccountsSh(reg());
-    expect(sh).toContain('claude-personal() { command claude "$@"; }');
+    expect(sh).toContain(
+      'claude-personal() { env -u CLAUDE_CONFIG_DIR claude "$@"; }',
+    );
   });
 
   it('launches an extra account with CLAUDE_CONFIG_DIR ($HOME-relative)', () => {
     const sh = generateAccountsSh(reg());
     expect(sh).toContain(
-      'claude-work() { CLAUDE_CONFIG_DIR="$HOME/.claude-work" command claude "$@"; }',
+      'claude-work() { env CLAUDE_CONFIG_DIR="$HOME/.claude-work" claude "$@"; }',
     );
   });
 
   it('adds a dispatcher case per account', () => {
     const sh = generateAccountsSh(reg());
-    expect(sh).toContain('personal) shift; command claude "$@" ;;');
     expect(sh).toContain(
-      'work) shift; CLAUDE_CONFIG_DIR="$HOME/.claude-work" command claude "$@" ;;',
+      'personal) shift; env -u CLAUDE_CONFIG_DIR claude "$@" ;;',
+    );
+    expect(sh).toContain(
+      'work) shift; env CLAUDE_CONFIG_DIR="$HOME/.claude-work" claude "$@" ;;',
     );
   });
 
   it('routes the dispatcher fallback (*) to the current defaultAccount', () => {
-    // defaultAccount = personal (the no-env anchor)
-    expect(generateAccountsSh(reg())).toContain('*) command claude "$@" ;;');
+    // defaultAccount = personal (the anchor) -> unset CLAUDE_CONFIG_DIR
+    expect(generateAccountsSh(reg())).toContain(
+      '*) env -u CLAUDE_CONFIG_DIR claude "$@" ;;',
+    );
     // defaultAccount = work -> bare `claude` must set work's config dir
     expect(generateAccountsSh(reg({ defaultAccount: 'work' }))).toContain(
-      '*) CLAUDE_CONFIG_DIR="$HOME/.claude-work" command claude "$@" ;;',
+      '*) env CLAUDE_CONFIG_DIR="$HOME/.claude-work" claude "$@" ;;',
     );
   });
 
+  it('rejects an account dir with shell-unsafe characters', () => {
+    const bad = reg({
+      defaultAccount: 'evil',
+      accounts: [
+        {
+          label: 'evil',
+          dir: '/tmp/$(touch pwned)',
+          identityFile: '/tmp/x/.claude.json',
+          configDirEnv: '/tmp/$(touch pwned)',
+          isDefault: false,
+        },
+      ],
+    });
+    expect(() => generateAccountsSh(bad)).toThrow(/Unsafe shell characters/);
+  });
+
   it('maps each account dir back to its label in claude-whoami', () => {
     const sh = generateAccountsSh(reg());
     expect(sh).toContain('"$HOME/.claude") label="personal (default)" ;;');
diff --git a/src/cli/account-manager.ts b/src/cli/account-manager.ts
index 9c0fa67..b6d9103 100644
--- a/src/cli/account-manager.ts
+++ b/src/cli/account-manager.ts
@@ -79,6 +79,18 @@ const toTildePath = (p: string): string => {
 const isDefaultDir = (dir: string): boolean =>
   path.resolve(expandHome(dir)) === defaultDir();
 
+// Registry dirs get embedded (double-quoted) into the generated accounts.sh and
+// into `case` patterns. Reject shell-dangerous characters so a hand-edited
+// registry or a crafted `--dir` can't inject code when accounts.sh is sourced.
+const SHELL_UNSAFE_DIR = /["`$\\\r\n;|&<>()]/;
+const assertSafeDir = (dir: string): void => {
+  if (SHELL_UNSAFE_DIR.test(dir)) {
+    throw new Error(
+      `Unsafe shell characters in account dir "${dir}" (quotes, $, backticks, ; | & < > ( ) are not allowed)`,
+    );
+  }
+};
+
 function stripUndefined<T extends object>(obj: T): Partial<T> {
   const out: Partial<T> = {};
   for (const [k, v] of Object.entries(obj)) {
@@ -93,7 +105,9 @@ function stripUndefined<T extends object>(obj: T): Partial<T> {
 
 export function readRegistry(): Registry {
   if (!fs.existsSync(REGISTRY_PATH)) {
-    return { version: 1, defaultAccount: 'personal', accounts: [] };
+    // No hardcoded default — the first added account becomes the default, and
+    // resolveDefaultLabel falls back to the anchor. Avoids a dangling reference.
+    return { version: 1, accounts: [] };
   }
   const raw = JSON.parse(fs.readFileSync(REGISTRY_PATH, 'utf-8')) as Registry;
   if (!raw.version) raw.version = 1;
@@ -138,76 +152,117 @@ export function resolveDefaultLabel(reg: Registry): string | undefined {
 // accounts.sh generation (the ONE generator)
 // ---------------------------------------------------------------------------
 
-/** Shell prefix that launches an account (empty for the default account). */
-function launchPrefix(account: RegistryAccount | undefined): string {
-  if (!account || !account.configDirEnv) return '';
-  return `CLAUDE_CONFIG_DIR="${toShellPath(expandHome(account.configDirEnv))}" `;
+/**
+ * Full command that launches an account's claude, bypassing the claude()
+ * dispatcher. `env` runs the real binary (no shell-function recursion) and lets
+ * us set — or explicitly unset — CLAUDE_CONFIG_DIR.
+ */
+function launchCmd(account: RegistryAccount | undefined): string {
+  if (!account || !account.configDirEnv) {
+    // Default/anchor account: unset CLAUDE_CONFIG_DIR so a stray exported value
+    // can't hijack it (§3.4).
+    return 'env -u CLAUDE_CONFIG_DIR claude ';
+  }
+  return `env CLAUDE_CONFIG_DIR="${toShellPath(expandHome(account.configDirEnv))}" claude `;
 }
 
 /** Render the accounts.sh contents from a registry object. Pure function. */
 export function generateAccountsSh(reg: Registry): string {
   const accounts = reg.accounts || [];
+  accounts.forEach((a) => assertSafeDir(expandHome(a.dir)));
   const defaultLabel = resolveDefaultLabel(reg);
   const defaultAccount = accounts.find((a) => a.label === defaultLabel);
   const pad = Math.max(0, ...accounts.map((a) => a.label.length));
 
   const L: string[] = [];
-  L.push('# CodeV multi-account shell integration — GENERATED FILE (safe to delete).');
+  L.push(
+    '# CodeV multi-account shell integration — GENERATED FILE (safe to delete).',
+  );
   L.push('# Source of truth: ~/.config/codev/accounts.json');
-  L.push('# Regenerated by `codev account` / CodeV — manual edits here will be lost.');
-  L.push('# To uninstall: `codev account uninstall` (removes the ~/.zshrc block).');
+  L.push(
+    '# Regenerated by `codev account` / CodeV — manual edits here will be lost.',
+  );
+  L.push(
+    '# To uninstall: `codev account uninstall` (removes the ~/.zshrc block).',
+  );
   L.push('#');
-  L.push('# Model: one Claude Code config dir per account (CLAUDE_CONFIG_DIR).');
-  L.push('#   - DEFAULT account: NO CLAUDE_CONFIG_DIR (config at ~/.claude.json + ~/.claude/).');
-  L.push('#   - EXTRA accounts:  CLAUDE_CONFIG_DIR=<dir>, fully self-contained.');
+  L.push(
+    '# Model: one Claude Code config dir per account (CLAUDE_CONFIG_DIR).',
+  );
+  L.push(
+    '#   - DEFAULT account: NO CLAUDE_CONFIG_DIR (config at ~/.claude.json + ~/.claude/).',
+  );
+  L.push(
+    '#   - EXTRA accounts:  CLAUDE_CONFIG_DIR=<dir>, fully self-contained.',
+  );
   L.push('#');
   L.push('# Usage:');
-  L.push(`#   claude              -> ${defaultLabel || '(none)'} (default account)`);
+  L.push(
+    `#   claude              -> ${defaultLabel || '(none)'} (default account)`,
+  );
   L.push('#   claude <account> …  -> that account   (e.g. claude work -r)');
   L.push('#   claude-<account> …  -> equivalent function form');
-  L.push('#   claude-whoami       -> which account bare `claude` resolves to here');
+  L.push(
+    '#   claude-whoami       -> which account bare `claude` resolves to here',
+  );
   L.push('#   claude-accounts     -> list configured accounts');
-  L.push('# All native flags pass through, e.g. `claude work -r`, `claude-work mcp list`.');
+  L.push(
+    '# All native flags pass through, e.g. `claude work -r`, `claude-work mcp list`.',
+  );
   L.push('');
   L.push('# --- per-account launchers (full passthrough via "$@") ---');
   for (const a of accounts) {
-    L.push(`claude-${a.label}() { ${launchPrefix(a)}command claude "$@"; }`);
+    L.push(`claude-${a.label}() { ${launchCmd(a)}"$@"; }`);
   }
   L.push('');
-  L.push('# --- dispatcher: `claude <account> [args...]`, else the default account ---');
-  L.push('# `command claude` bypasses this function (no recursion) and any claude alias.');
+  L.push(
+    '# --- dispatcher: `claude <account> [args...]`, else the default account ---',
+  );
+  L.push(
+    '# `env` runs the real claude binary, bypassing this function (no recursion).',
+  );
   L.push('claude() {');
   L.push('  case "$1" in');
   for (const a of accounts) {
-    L.push(`    ${a.label}) shift; ${launchPrefix(a)}command claude "$@" ;;`);
+    L.push(`    ${a.label}) shift; ${launchCmd(a)}"$@" ;;`);
   }
-  L.push(`    *) ${launchPrefix(defaultAccount)}command claude "$@" ;;`);
+  L.push(`    *) ${launchCmd(defaultAccount)}"$@" ;;`);
   L.push('  esac');
   L.push('}');
   L.push('');
-  L.push('# claude-whoami: which account THIS shell resolves to (via CLAUDE_CONFIG_DIR).');
+  L.push(
+    '# claude-whoami: which account THIS shell resolves to (via CLAUDE_CONFIG_DIR).',
+  );
   L.push('claude-whoami() {');
   L.push('  local dir="${CLAUDE_CONFIG_DIR:-$HOME/.claude}" label');
   L.push('  case "$dir" in');
   for (const a of accounts) {
     const marker = a.label === defaultLabel ? ' (default)' : '';
-    L.push(`    "${toShellPath(expandHome(a.dir))}") label="${a.label}${marker}" ;;`);
+    L.push(
+      `    "${toShellPath(expandHome(a.dir))}") label="${a.label}${marker}" ;;`,
+    );
   }
   L.push('    *) label="(unregistered)" ;;');
   L.push('  esac');
   L.push('  echo "codev account     : $label"');
-  L.push('  echo "CLAUDE_CONFIG_DIR : ${CLAUDE_CONFIG_DIR:-<unset → ~/.claude>}"');
+  L.push(
+    '  echo "CLAUDE_CONFIG_DIR : ${CLAUDE_CONFIG_DIR:-<unset → ~/.claude>}"',
+  );
   L.push('  command claude auth status 2>/dev/null');
   L.push('}');
   L.push('');
   L.push('# claude-accounts: list configured accounts.');
   L.push('claude-accounts() {');
-  L.push(`  echo "codev accounts (bare 'claude' = ${defaultLabel || 'none'}):"`);
+  L.push(
+    `  echo "codev accounts (bare 'claude' = ${defaultLabel || 'none'}):"`,
+  );
   for (const a of accounts) {
     const star = a.label === defaultLabel ? '*' : ' ';
     L.push(`  echo "  ${star} ${a.label.padEnd(pad)}   ${toTildePath(a.dir)}"`);
   }
-  L.push('  echo "  identity: run claude-whoami, or claude <acct> auth status"');
+  L.push(
+    '  echo "  identity: run claude-whoami, or claude <acct> auth status"',
+  );
   L.push('}');
   L.push('');
   return L.join('\n');
@@ -241,6 +296,7 @@ export function addAccount(
   const dir = expandHome(
     opts.dir || path.join(os.homedir(), `.claude-${label}`),
   );
+  assertSafeDir(dir);
   const isDefault = isDefaultDir(dir);
   const identityFile = isDefault
     ? path.join(os.homedir(), '.claude.json')
@@ -255,7 +311,11 @@ export function addAccount(
     ...readIdentity(identityFile),
   };
   reg.accounts.push(entry);
-  if (!reg.defaultAccount) reg.defaultAccount = label;
+  // Set the global default only if the current one doesn't name a real account
+  // (fresh registry, or a stale/dangling reference) — never clobber a valid one.
+  if (!reg.accounts.some((a) => a.label === reg.defaultAccount)) {
+    reg.defaultAccount = label;
+  }
   writeRegistry(reg);
   regenerate(reg);
   return entry;
diff --git a/src/cli/codev-account.ts b/src/cli/codev-account.ts
index 8a31cff..9ab7aca 100644
--- a/src/cli/codev-account.ts
+++ b/src/cli/codev-account.ts
@@ -43,7 +43,9 @@ function getFlag(args: string[], name: string): string | undefined {
 function printList(): void {
   const accounts = manager.listAccounts();
   if (accounts.length === 0) {
-    console.log('No accounts configured yet. Add one with: codev account add <label>');
+    console.log(
+      'No accounts configured yet. Add one with: codev account add <label>',
+    );
     return;
   }
   const pad = Math.max(...accounts.map((a) => a.label.length), 5);
@@ -71,12 +73,18 @@ function main(): number {
       return 0;
 
     case 'add': {
-      const label = rest.find((a) => !a.startsWith('-'));
       const dir = getFlag(rest, '--dir');
-      const a = manager.addAccount(label as string, { dir });
-      console.log(`✓ Added "${a.label}"  (${a.dir})`);
-      if (!a.loggedIn) {
-        console.log(`  Log in with:  claude ${a.label}   (or claude-${a.label})`);
+      // Skip the token consumed by `--dir` so `add --dir /foo work` still picks
+      // `work` as the label (not `/foo`).
+      const dirIdx = rest.indexOf('--dir');
+      const skipIdx = dirIdx >= 0 ? dirIdx + 1 : -1;
+      const label = rest.find((a, i) => !a.startsWith('-') && i !== skipIdx);
+      const acct = manager.addAccount(label as string, { dir });
+      console.log(`✓ Added "${acct.label}"  (${acct.dir})`);
+      if (!acct.loggedIn) {
+        console.log(
+          `  Log in with:  claude ${acct.label}   (or claude-${acct.label})`,
+        );
       }
       reloadHint();
       return 0;

From 3c9b0a462aa03a564045f6ce7dc0eb26b07cf3bd Mon Sep 17 00:00:00 2001
From: Grimmer Kang <k@grimmer.io>
Date: Mon, 6 Jul 2026 23:36:45 +0800
Subject: [PATCH 04/10] fix(multi-account): validate configDirEnv in
 accounts.sh gen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The dir guard didn't cover configDirEnv, which launchCmd embeds as the
launcher's CLAUDE_CONFIG_DIR — a hand-edited registry could pass a clean
dir but an injectable configDirEnv. Validate both at generation.
(cubic P1 follow-up.) +1 test.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017kCK4t5JSVynVZxGcrTGGp
---
 src/cli/account-manager.test.ts | 16 ++++++++++++++++
 src/cli/account-manager.ts      |  8 +++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/cli/account-manager.test.ts b/src/cli/account-manager.test.ts
index 89f17d1..15863d3 100644
--- a/src/cli/account-manager.test.ts
+++ b/src/cli/account-manager.test.ts
@@ -101,6 +101,22 @@ describe('generateAccountsSh', () => {
     writeFileSync(file, sh);
     expect(() => execFileSync('bash', ['-n', file])).not.toThrow();
   });
+
+  it('rejects an unsafe configDirEnv even when dir is clean', () => {
+    const bad = reg({
+      defaultAccount: 'evil',
+      accounts: [
+        {
+          label: 'evil',
+          dir: '/tmp/clean',
+          identityFile: '/tmp/clean/.claude.json',
+          configDirEnv: '/tmp/$(touch pwned)',
+          isDefault: false,
+        },
+      ],
+    });
+    expect(() => generateAccountsSh(bad)).toThrow(/Unsafe shell characters/);
+  });
 });
 
 describe('resolveDefaultLabel', () => {
diff --git a/src/cli/account-manager.ts b/src/cli/account-manager.ts
index b6d9103..c5ae849 100644
--- a/src/cli/account-manager.ts
+++ b/src/cli/account-manager.ts
@@ -169,7 +169,13 @@ function launchCmd(account: RegistryAccount | undefined): string {
 /** Render the accounts.sh contents from a registry object. Pure function. */
 export function generateAccountsSh(reg: Registry): string {
   const accounts = reg.accounts || [];
-  accounts.forEach((a) => assertSafeDir(expandHome(a.dir)));
+  // Validate EVERY value embedded into the shell: dir (whoami case + list
+  // display) AND configDirEnv (the launcher's CLAUDE_CONFIG_DIR). They usually
+  // match, but a hand-edited registry could diverge them.
+  accounts.forEach((a) => {
+    assertSafeDir(expandHome(a.dir));
+    if (a.configDirEnv) assertSafeDir(expandHome(a.configDirEnv));
+  });
   const defaultLabel = resolveDefaultLabel(reg);
   const defaultAccount = accounts.find((a) => a.label === defaultLabel);
   const pad = Math.max(0, ...accounts.map((a) => a.label.length));

From f7d4b4cdcf4bfdd64c71ec3759ba28723df60fb3 Mon Sep 17 00:00:00 2001
From: Grimmer Kang <k@grimmer.io>
Date: Mon, 6 Jul 2026 23:47:52 +0800
Subject: [PATCH 05/10] fix(multi-account): reject non-string/empty
 configDirEnv in gen

A hand-edited accounts.json with a non-string or empty configDirEnv
slipped past the truthy guard and would crash toShellPath. assertSafeDir
now rejects non-string/empty values, and the loop validates every
non-null configDirEnv. (cubic P2 follow-up.) +1 test.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017kCK4t5JSVynVZxGcrTGGp
---
 src/cli/account-manager.test.ts | 16 ++++++++++++++++
 src/cli/account-manager.ts      | 11 +++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/cli/account-manager.test.ts b/src/cli/account-manager.test.ts
index 15863d3..6b7af01 100644
--- a/src/cli/account-manager.test.ts
+++ b/src/cli/account-manager.test.ts
@@ -117,6 +117,22 @@ describe('generateAccountsSh', () => {
     });
     expect(() => generateAccountsSh(bad)).toThrow(/Unsafe shell characters/);
   });
+
+  it('rejects an empty configDirEnv (hand-edited registry)', () => {
+    const bad = reg({
+      defaultAccount: 'x',
+      accounts: [
+        {
+          label: 'x',
+          dir: '/tmp/x',
+          identityFile: '/tmp/x/.claude.json',
+          configDirEnv: '',
+          isDefault: false,
+        },
+      ],
+    });
+    expect(() => generateAccountsSh(bad)).toThrow(/Invalid account path/);
+  });
 });
 
 describe('resolveDefaultLabel', () => {
diff --git a/src/cli/account-manager.ts b/src/cli/account-manager.ts
index c5ae849..caa7eb7 100644
--- a/src/cli/account-manager.ts
+++ b/src/cli/account-manager.ts
@@ -83,7 +83,12 @@ const isDefaultDir = (dir: string): boolean =>
 // into `case` patterns. Reject shell-dangerous characters so a hand-edited
 // registry or a crafted `--dir` can't inject code when accounts.sh is sourced.
 const SHELL_UNSAFE_DIR = /["`$\\\r\n;|&<>()]/;
-const assertSafeDir = (dir: string): void => {
+const assertSafeDir = (dir: unknown): void => {
+  if (typeof dir !== 'string' || dir.length === 0) {
+    throw new Error(
+      `Invalid account path ${JSON.stringify(dir)} (must be a non-empty string)`,
+    );
+  }
   if (SHELL_UNSAFE_DIR.test(dir)) {
     throw new Error(
       `Unsafe shell characters in account dir "${dir}" (quotes, $, backticks, ; | & < > ( ) are not allowed)`,
@@ -174,7 +179,9 @@ export function generateAccountsSh(reg: Registry): string {
   // match, but a hand-edited registry could diverge them.
   accounts.forEach((a) => {
     assertSafeDir(expandHome(a.dir));
-    if (a.configDirEnv) assertSafeDir(expandHome(a.configDirEnv));
+    // null configDirEnv = the default account (no env); any other value must be
+    // a valid, non-empty, injection-free path.
+    if (a.configDirEnv !== null) assertSafeDir(expandHome(a.configDirEnv));
   });
   const defaultLabel = resolveDefaultLabel(reg);
   const defaultAccount = accounts.find((a) => a.label === defaultLabel);

From 26db4d28fe56bdf2efa064f5eb052a84994dd720 Mon Sep 17 00:00:00 2001
From: Grimmer Kang <k@grimmer.io>
Date: Thu, 9 Jul 2026 02:14:09 +0800
Subject: [PATCH 06/10] fix(multi-account): claude-whoami reports the
 dispatcher default

whoami read the ambient CLAUDE_CONFIG_DIR (unset -> anchor), but bare
`claude` always routes through the dispatcher `*)` to the configured
default. So after `default work`, whoami wrongly showed personal.
Now it reports the default account and runs auth status under that
account's env. +test.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017kCK4t5JSVynVZxGcrTGGp
---
 src/cli/account-manager.test.ts | 13 ++++++++++---
 src/cli/account-manager.ts      | 24 ++++++++++--------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/cli/account-manager.test.ts b/src/cli/account-manager.test.ts
index 6b7af01..7c8ae66 100644
--- a/src/cli/account-manager.test.ts
+++ b/src/cli/account-manager.test.ts
@@ -89,10 +89,17 @@ describe('generateAccountsSh', () => {
     expect(() => generateAccountsSh(bad)).toThrow(/Unsafe shell characters/);
   });
 
-  it('maps each account dir back to its label in claude-whoami', () => {
+  it('reports the default account (not ambient env) in claude-whoami', () => {
+    // default = personal -> whoami reports personal, auth under the anchor
     const sh = generateAccountsSh(reg());
-    expect(sh).toContain('"$HOME/.claude") label="personal (default)" ;;');
-    expect(sh).toContain('"$HOME/.claude-work") label="work" ;;');
+    expect(sh).toContain("bare 'claude' here -> personal");
+    expect(sh).toContain('env -u CLAUDE_CONFIG_DIR claude auth status');
+    // default = work -> whoami reports work + auth under work's env
+    const shWork = generateAccountsSh(reg({ defaultAccount: 'work' }));
+    expect(shWork).toContain("bare 'claude' here -> work");
+    expect(shWork).toContain(
+      'env CLAUDE_CONFIG_DIR="$HOME/.claude-work" claude auth status',
+    );
   });
 
   it('emits syntactically valid shell (bash -n)', () => {
diff --git a/src/cli/account-manager.ts b/src/cli/account-manager.ts
index caa7eb7..c7be586 100644
--- a/src/cli/account-manager.ts
+++ b/src/cli/account-manager.ts
@@ -244,24 +244,20 @@ export function generateAccountsSh(reg: Registry): string {
   L.push('}');
   L.push('');
   L.push(
-    '# claude-whoami: which account THIS shell resolves to (via CLAUDE_CONFIG_DIR).',
+    '# claude-whoami: which account bare `claude` resolves to here (the default).',
   );
+  L.push(
+    '# Bare `claude` always routes through the dispatcher `*)` to the default,',
+  );
+  L.push('# regardless of any CLAUDE_CONFIG_DIR already set in this shell.');
   L.push('claude-whoami() {');
-  L.push('  local dir="${CLAUDE_CONFIG_DIR:-$HOME/.claude}" label');
-  L.push('  case "$dir" in');
-  for (const a of accounts) {
-    const marker = a.label === defaultLabel ? ' (default)' : '';
-    L.push(
-      `    "${toShellPath(expandHome(a.dir))}") label="${a.label}${marker}" ;;`,
-    );
-  }
-  L.push('    *) label="(unregistered)" ;;');
-  L.push('  esac');
-  L.push('  echo "codev account     : $label"');
+  L.push(`  echo "bare 'claude' here -> ${defaultLabel || '(none)'}"`);
+  L.push('  if [ -n "$CLAUDE_CONFIG_DIR" ]; then');
   L.push(
-    '  echo "CLAUDE_CONFIG_DIR : ${CLAUDE_CONFIG_DIR:-<unset → ~/.claude>}"',
+    '    echo "  note: shell exports CLAUDE_CONFIG_DIR=$CLAUDE_CONFIG_DIR (affects command claude, not the dispatcher)"',
   );
-  L.push('  command claude auth status 2>/dev/null');
+  L.push('  fi');
+  L.push(`  ${launchCmd(defaultAccount)}auth status 2>/dev/null`);
   L.push('}');
   L.push('');
   L.push('# claude-accounts: list configured accounts.');

From a7f34a8910ad54821a5117a6ea3d16459b69d195 Mon Sep 17 00:00:00 2001
From: Grimmer Kang <k@grimmer.io>
Date: Thu, 9 Jul 2026 02:33:38 +0800
Subject: [PATCH 07/10] docs(multi-account): shell-snapshot dispatcher caveat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Inside a Claude Code session, Bash/! commands source the shell snapshot
(functions included), so bare `claude` hits the accounts.sh dispatcher
and routes to the global default — not the session's account. Document
the valid probes (command claude / echo CLAUDE_CONFIG_DIR).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017kCK4t5JSVynVZxGcrTGGp
---
 docs/multi-account-support-design.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/multi-account-support-design.md b/docs/multi-account-support-design.md
index 8b10c7a..99aaf7e 100644
--- a/docs/multi-account-support-design.md
+++ b/docs/multi-account-support-design.md
@@ -257,6 +257,16 @@ one shared generator (`src/cli/account-manager.ts`) — no more hand-editing. Co
 A Vitest generator suite + CI guard the shell output. A real `codev` binary on PATH and
 the Settings UI are Batch 2b.
 
+**Caveat — the dispatcher leaks into Claude Code sessions (shell snapshots):** Claude
+Code captures the interactive shell's functions into a snapshot
+(`~/.claude/shell-snapshots/…`) and sources it for Bash-tool / `!` commands. So *inside
+any session*, bare `claude …` resolves to the dispatcher function and routes to the
+**global default** — NOT the session's own account. Consequences: (a) `!claude auth
+status` is not a valid probe of the session's account (it reports the default; use
+`command claude auth status` or `echo $CLAUDE_CONFIG_DIR` instead); (b) nested/scripted
+`claude` invocations from within a session go to the default account — use
+`command claude` or an explicit `claude <label>` when the account matters.
+
 ### 6.B Account registry (source of truth)
 
 - **`~/.config/codev/accounts.json`** (plain JSON), owned/written by CodeV, readable

From f6a1544f2c2c2135c2d57f07547d3490d09b20bb Mon Sep 17 00:00:00 2001
From: Grimmer Kang <k@grimmer.io>
Date: Thu, 9 Jul 2026 02:50:30 +0800
Subject: [PATCH 08/10] fix(multi-account): validate labels in gen +
 remove-message nit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- generateAccountsSh validates labels (LABEL_RE) alongside dirs — labels
  are embedded as function names and case patterns, and add's check is
  bypassable by hand-editing the registry
- removeAccount returns the new default only when the removal actually
  reassigned it, so `remove` of a non-default account no longer prints
  a misleading 'default account is now X'
- docs §5: per-key settings copy note (statusLine et al.)
+1 test (13 total)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017kCK4t5JSVynVZxGcrTGGp
---
 docs/multi-account-support-design.md |  8 ++++++++
 src/cli/account-manager.test.ts      | 16 ++++++++++++++++
 src/cli/account-manager.ts           | 18 +++++++++++++++++-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/docs/multi-account-support-design.md b/docs/multi-account-support-design.md
index 99aaf7e..74954bc 100644
--- a/docs/multi-account-support-design.md
+++ b/docs/multi-account-support-design.md
@@ -222,6 +222,14 @@ CodeV's "Add account" flow (§6.D) offers per-item checkboxes: *Share global CLA
 / skills / commands / plugins / settings with the default account?* → creates the
 symlinks. `.claude.json` is never offered.
 
+**Per-key copy instead of whole-file symlink (`settings.json`):** individual settings
+keys can be shared by copying just that key into the other account's `settings.json` —
+e.g. `statusLine` (done manually for `work`, 2026-07: same
+`bash ~/.claude/statusline-command.sh` command works for every account since the script
+path is HOME-based and Claude Code feeds it the session's own context via stdin).
+Candidates for a future `codev account sync-settings <keys>`: `statusLine`, `model`,
+`effortLevel`, `theme`. Hooks stay per-dir (§6.F installs them per account).
+
 ---
 
 ## 6. Sub-feature designs (approaches, pros/cons, recommendation)
diff --git a/src/cli/account-manager.test.ts b/src/cli/account-manager.test.ts
index 7c8ae66..2b5c4e5 100644
--- a/src/cli/account-manager.test.ts
+++ b/src/cli/account-manager.test.ts
@@ -125,6 +125,22 @@ describe('generateAccountsSh', () => {
     expect(() => generateAccountsSh(bad)).toThrow(/Unsafe shell characters/);
   });
 
+  it('rejects a shell-unsafe label (hand-edited registry)', () => {
+    const bad = reg({
+      defaultAccount: 'x',
+      accounts: [
+        {
+          label: 'x; touch pwned',
+          dir: '/tmp/clean',
+          identityFile: '/tmp/clean/.claude.json',
+          configDirEnv: '/tmp/clean',
+          isDefault: false,
+        },
+      ],
+    });
+    expect(() => generateAccountsSh(bad)).toThrow(/Invalid account label/);
+  });
+
   it('rejects an empty configDirEnv (hand-edited registry)', () => {
     const bad = reg({
       defaultAccount: 'x',
diff --git a/src/cli/account-manager.ts b/src/cli/account-manager.ts
index c7be586..1709006 100644
--- a/src/cli/account-manager.ts
+++ b/src/cli/account-manager.ts
@@ -96,6 +96,17 @@ const assertSafeDir = (dir: unknown): void => {
   }
 };
 
+// Labels are embedded as function names (`claude-<label>`) and `case` patterns.
+// `add` already enforces LABEL_RE, but a hand-edited registry bypasses `add`,
+// so re-validate at generation time too.
+const assertSafeLabel = (label: unknown): void => {
+  if (typeof label !== 'string' || !LABEL_RE.test(label)) {
+    throw new Error(
+      `Invalid account label ${JSON.stringify(label)} — must start with a letter and use only letters/digits/-/_`,
+    );
+  }
+};
+
 function stripUndefined<T extends object>(obj: T): Partial<T> {
   const out: Partial<T> = {};
   for (const [k, v] of Object.entries(obj)) {
@@ -178,6 +189,7 @@ export function generateAccountsSh(reg: Registry): string {
   // display) AND configDirEnv (the launcher's CLAUDE_CONFIG_DIR). They usually
   // match, but a hand-edited registry could diverge them.
   accounts.forEach((a) => {
+    assertSafeLabel(a.label);
     assertSafeDir(expandHome(a.dir));
     // null configDirEnv = the default account (no env); any other value must be
     // a valid, non-empty, injection-free path.
@@ -343,13 +355,17 @@ export function removeAccount(label: string): string | undefined {
     );
   }
   reg.accounts.splice(idx, 1);
+  // Report the new default only when this removal actually reassigned it —
+  // removing a non-default account leaves the default untouched.
+  let reassignedDefault: string | undefined;
   if (reg.defaultAccount === label) {
     const anchor = reg.accounts.find((a) => a.isDefault) || reg.accounts[0];
     reg.defaultAccount = anchor.label;
+    reassignedDefault = anchor.label;
   }
   writeRegistry(reg);
   regenerate(reg);
-  return reg.defaultAccount;
+  return reassignedDefault;
 }
 
 export function setDefault(label: string): void {

From 4f030b3826dc31814e164387d4d835608b01733d Mon Sep 17 00:00:00 2001
From: Grimmer Kang <k@grimmer.io>
Date: Thu, 9 Jul 2026 02:52:56 +0800
Subject: [PATCH 09/10] docs(multi-account): symlink share mechanism verified

Probed a work-account -p session: the symlinked skills/ entry appeared
in its skills list and the symlinked global CLAUDE.md's rules were in
context. Batch 3's remaining work is UX, not feasibility.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017kCK4t5JSVynVZxGcrTGGp
---
 docs/multi-account-support-design.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/multi-account-support-design.md b/docs/multi-account-support-design.md
index 74954bc..c1c878f 100644
--- a/docs/multi-account-support-design.md
+++ b/docs/multi-account-support-design.md
@@ -213,6 +213,12 @@ The registry records `configDirEnv` (null for default, the dir for extras) and
 | Auto-memory (`projects/<path>/memory/`, `MEMORY.md`) | Config dir | No by default | Per-account, or advanced: symlink individual `memory/` subdirs |
 | Session data (`history.jsonl`, `projects/*.jsonl`, `sessions/`) | Config dir | **No — aggregated for display, not shared** | CodeV scans all dirs (§6.E) |
 
+**Verified 2026-07-09:** Claude Code follows symlinks for both `skills/<name>` entries
+and the global `CLAUDE.md` — a work-account `-p` probe listed the symlinked
+`fireflies-repos` skill and had the symlinked CLAUDE.md's rules in context. So the
+symlink mechanism above is confirmed viable; the remaining Batch 3 work is UX
+(share checkboxes / `codev account share`), not feasibility.
+
 Your guess was right: **per-project files are account-independent; only the global
 files need help.** "Reusing" session data across accounts isn't actually desirable —
 each account owns its sessions; what you want is CodeV *showing* them all, which §6.E

From 8a6dee892540a569000ad3a0a44d6f65a5eda052 Mon Sep 17 00:00:00 2001
From: Grimmer Kang <k@grimmer.io>
Date: Thu, 9 Jul 2026 03:00:38 +0800
Subject: [PATCH 10/10] docs(multi-account): collision policy + per-entry vs
 whole-dir links
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Batch 3 share UX: never silently overwrite (.codev-bak or skip);
link/copy/skip per item; symlink-to-dir works (hard links don't) —
per-entry = selective + private skills but new skills need a new link,
whole-dir = zero-maintenance auto-share; plugins untested
(enabledPlugins lives in per-account settings); session data stays
unshared by design — 2c cross-account resume = copy-fork.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017kCK4t5JSVynVZxGcrTGGp
---
 docs/multi-account-support-design.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/multi-account-support-design.md b/docs/multi-account-support-design.md
index c1c878f..7744f4a 100644
--- a/docs/multi-account-support-design.md
+++ b/docs/multi-account-support-design.md
@@ -209,6 +209,7 @@ The registry records `configDirEnv` (null for default, the dir for extras) and
 | Global `~/.claude/CLAUDE.md` (user instructions) | Config dir | No by default → **opt-in symlink** | `ln -s ~/.claude/CLAUDE.md ~/.claude-x/CLAUDE.md` |
 | Global `skills/`, `commands/`, `plugins/` | Config dir | No by default → **opt-in symlink** | symlink the dir |
 | `settings.json` (model, hooks, permissions, env) | Config dir | Optional symlink (careful) | Symlink ⇒ hooks/permissions shared; or install hook per-dir (§6.F) |
+| Single `settings.json` keys (`statusLine`, `model`, `effortLevel`, `theme`) | Config dir | **Yes — per-key copy** | Copy the key into the other account's settings.json (statusLine done for `work` 2026-07; HOME-based script serves all accounts) |
 | `.claude.json` (identity + per-project trust) | Config dir | **No — never symlink** | Holds `oauthAccount`; must stay per-account |
 | Auto-memory (`projects/<path>/memory/`, `MEMORY.md`) | Config dir | No by default | Per-account, or advanced: symlink individual `memory/` subdirs |
 | Session data (`history.jsonl`, `projects/*.jsonl`, `sessions/`) | Config dir | **No — aggregated for display, not shared** | CodeV scans all dirs (§6.E) |
@@ -219,6 +220,24 @@ and the global `CLAUDE.md` — a work-account `-p` probe listed the symlinked
 symlink mechanism above is confirmed viable; the remaining Batch 3 work is UX
 (share checkboxes / `codev account share`), not feasibility.
 
+**Collision & ownership policy (the actual Batch 3 UX work):** sharing must never
+silently overwrite. If the target already exists in the other account: back it up
+(`*.codev-bak`, the convention session-status-hooks already uses) or skip and report —
+never `ln -sf`. Link per **entry** (`skills/<name>`), not whole dirs, so an account
+keeps private skills alongside shared ones. (Note: it's *hard* links that can't target
+directories — a **symlink to a dir works fine** and new files *inside* a linked skill
+are picked up automatically; only a brand-new skill needs a new per-entry link. If an
+account needs no private skills, a whole-`skills/`-dir symlink is the zero-maintenance
+alternative — current and future skills auto-shared, at the cost that anything either
+account adds becomes shared.) A symlink is ONE file both ways — edits
+from either account hit the same inode; offer **link (stay in sync) / copy (fork) /
+skip** per item. `plugins/` is untested: the payload dir may symlink, but enablement
+lives in each account's `settings.json` (`enabledPlugins`) and plugins may keep their
+own state — needs its own experiment. Session data stays unshared by design (it's
+live-written and identity-bound, and §6.E aggregation already provides the union view);
+cross-account "resume" (§6.G/2c) should **copy-fork** a transcript into the target
+account, never link it.
+
 Your guess was right: **per-project files are account-independent; only the global
 files need help.** "Reusing" session data across accounts isn't actually desirable —
 each account owns its sessions; what you want is CodeV *showing* them all, which §6.E