claude-session-sync-cli 0.1.3__tar.gz → 0.2.0__tar.gz

{claude_session_sync_cli-0.1.3 → claude_session_sync_cli-0.2.0}/CHANGELOG.md

@@ -4,6 +4,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 ## [Unreleased]
 
+## [0.2.0] - 2026-11-11
+
+### Added
+- Account names in the output: the account the CLI is signed in to is recognized from `~/.claude.json`, every `--apply` remembers it in `~/.claude-desktop-sync/accounts.json`, and `--set-alias <id>=<name>` names any account. Emails are always masked.
+- `--account` accepts an ID prefix (such as the 8 characters shown in the output) and an optional `/<org-id-prefix>`; ambiguous prefixes are rejected.
+
 ## [0.1.3] - 2026-11-11
 
 ### Added
@@ -32,7 +38,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 - `--version` and `--help` with examples.
 - English and Chinese output, chosen from the locale; override with `CLAUDE_SESSION_SYNC_LANG=en|zh`.
 
-[Unreleased]: https://github.com/xushenjie/claude-session-sync/compare/v0.1.3...HEAD
+[Unreleased]: https://github.com/xushenjie/claude-session-sync/compare/v0.2.0...HEAD
+[0.2.0]: https://github.com/xushenjie/claude-session-sync/compare/v0.1.3...v0.2.0
 [0.1.3]: https://github.com/xushenjie/claude-session-sync/compare/v0.1.2...v0.1.3
 [0.1.2]: https://github.com/xushenjie/claude-session-sync/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/xushenjie/claude-session-sync/compare/v0.1.0...v0.1.1

{claude_session_sync_cli-0.1.3 → claude_session_sync_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: claude-session-sync-cli
-Version: 0.1.3
+Version: 0.2.0
 Summary: Sync local Claude Code CLI sessions into the Claude desktop app sidebar (unofficial).
 Project-URL: Homepage, https://github.com/xushenjie/claude-session-sync
 Project-URL: Issues, https://github.com/xushenjie/claude-session-sync/issues
@@ -183,7 +183,8 @@ claude-session-sync --purge-archived --apply   # do it
 | `--apply` | Actually write |
 | `--undo` | Undo the most recent write or deletion |
 | `--show-template` | Print each account's template fields and exit (for troubleshooting) |
-| `--account <account-id>` | Only sync this account; repeatable |
+| `--account <account-id>` | Only sync this account. A prefix such as the 8 characters in the output is enough; add `/<org-id-prefix>` to pick one organization. Repeatable |
+| `--set-alias <id>=<name>` | Give an account a display name (see [Account names](https://github.com/xushenjie/claude-session-sync#account-names)); an empty name removes it. Repeatable; exits after saving |
 | `--project <string>` | Only handle sessions whose working directory contains this string (sync and purge) |
 | `--exclude <session-id>` | Exclude a session from sync and purge; repeatable |
 | `--exclude-file <file>` | Read excluded session IDs from a file, one per line |
@@ -204,7 +205,22 @@ claude-session-sync --account 1a2b3c4d-... --project myapp --apply
 claude-session-sync --exclude-file ~/no-sync.txt --apply
 ```
 
-A session ID is the file name of a `.jsonl` under `~/.claude/projects/<project>/`. An account ID is a top-level directory name under `claude-code-sessions/`; the preview shows the first 8 characters.
+A session ID is the file name of a `.jsonl` under `~/.claude/projects/<project>/`. An account ID is a top-level directory name under `claude-code-sessions/`; the preview shows the first 8 characters, which `--account` and `--set-alias` accept as-is.
+
+### Account names
+
+The desktop app stores accounts by ID only, so the output shows names where it can find them:
+
+```
+[work · Acme Inc · fan***@example.com · current CLI login] (b8073c71…/677f8bdf…) existing 122, to add 1
+[07ac42e2…/00000000…] existing 119, to add 1
+```
+
+- **The account the CLI is signed in to** is recognized from `~/.claude.json` (only the account and organization IDs, email and organization name are read).
+- **Accounts the CLI was signed in to before**: every `--apply` remembers the current CLI account in `~/.claude-desktop-sync/accounts.json`, so it keeps its name after you switch.
+- **Any account**, with an alias you choose: `claude-session-sync --set-alias b8073c71=work`. Use `<account>/<org>` prefixes to name a single organization.
+
+Emails are always shown masked (`fan***@example.com`), because this output often ends up in bug reports. Previews never write `accounts.json`.
 
 ---
 
@@ -234,7 +250,7 @@ Use the package name `claude-session-sync-cli` (not the command name) with your
 Not sure which one you used? `uv tool list` or `pipx list` will show it.
 
 - **Upgrading** replaces the old version in place; the command name stays the same. Running `uv tool install` again does not upgrade — use `upgrade`. Journals and backups in `~/.claude-desktop-sync/` are kept, so `--undo` still works across upgrades. Run `claude-session-sync --version` to confirm.
-- **Uninstalling removes only the program.** Sessions it added to the desktop sidebar and everything in `~/.claude-desktop-sync/` stay. To revert those too, quit the desktop app and run `claude-session-sync --undo` repeatedly *before* uninstalling, until it reports nothing left to undo; then delete `~/.claude-desktop-sync/` if you no longer need the backups.
+- **Uninstalling removes only the program.** Sessions it added to the desktop sidebar and everything in `~/.claude-desktop-sync/` stay. To revert those too, quit the desktop app and run `claude-session-sync --undo` repeatedly *before* uninstalling, until it reports nothing left to undo; then delete `~/.claude-desktop-sync/` if you no longer need the backups and saved account names.
 
 ---
 

{claude_session_sync_cli-0.1.3 → claude_session_sync_cli-0.2.0}/README.md

@@ -154,7 +154,8 @@ claude-session-sync --purge-archived --apply   # do it
 | `--apply` | Actually write |
 | `--undo` | Undo the most recent write or deletion |
 | `--show-template` | Print each account's template fields and exit (for troubleshooting) |
-| `--account <account-id>` | Only sync this account; repeatable |
+| `--account <account-id>` | Only sync this account. A prefix such as the 8 characters in the output is enough; add `/<org-id-prefix>` to pick one organization. Repeatable |
+| `--set-alias <id>=<name>` | Give an account a display name (see [Account names](https://github.com/xushenjie/claude-session-sync#account-names)); an empty name removes it. Repeatable; exits after saving |
 | `--project <string>` | Only handle sessions whose working directory contains this string (sync and purge) |
 | `--exclude <session-id>` | Exclude a session from sync and purge; repeatable |
 | `--exclude-file <file>` | Read excluded session IDs from a file, one per line |
@@ -175,7 +176,22 @@ claude-session-sync --account 1a2b3c4d-... --project myapp --apply
 claude-session-sync --exclude-file ~/no-sync.txt --apply
 ```
 
-A session ID is the file name of a `.jsonl` under `~/.claude/projects/<project>/`. An account ID is a top-level directory name under `claude-code-sessions/`; the preview shows the first 8 characters.
+A session ID is the file name of a `.jsonl` under `~/.claude/projects/<project>/`. An account ID is a top-level directory name under `claude-code-sessions/`; the preview shows the first 8 characters, which `--account` and `--set-alias` accept as-is.
+
+### Account names
+
+The desktop app stores accounts by ID only, so the output shows names where it can find them:
+
+```
+[work · Acme Inc · fan***@example.com · current CLI login] (b8073c71…/677f8bdf…) existing 122, to add 1
+[07ac42e2…/00000000…] existing 119, to add 1
+```
+
+- **The account the CLI is signed in to** is recognized from `~/.claude.json` (only the account and organization IDs, email and organization name are read).
+- **Accounts the CLI was signed in to before**: every `--apply` remembers the current CLI account in `~/.claude-desktop-sync/accounts.json`, so it keeps its name after you switch.
+- **Any account**, with an alias you choose: `claude-session-sync --set-alias b8073c71=work`. Use `<account>/<org>` prefixes to name a single organization.
+
+Emails are always shown masked (`fan***@example.com`), because this output often ends up in bug reports. Previews never write `accounts.json`.
 
 ---
 
@@ -205,7 +221,7 @@ Use the package name `claude-session-sync-cli` (not the command name) with your
 Not sure which one you used? `uv tool list` or `pipx list` will show it.
 
 - **Upgrading** replaces the old version in place; the command name stays the same. Running `uv tool install` again does not upgrade — use `upgrade`. Journals and backups in `~/.claude-desktop-sync/` are kept, so `--undo` still works across upgrades. Run `claude-session-sync --version` to confirm.
-- **Uninstalling removes only the program.** Sessions it added to the desktop sidebar and everything in `~/.claude-desktop-sync/` stay. To revert those too, quit the desktop app and run `claude-session-sync --undo` repeatedly *before* uninstalling, until it reports nothing left to undo; then delete `~/.claude-desktop-sync/` if you no longer need the backups.
+- **Uninstalling removes only the program.** Sessions it added to the desktop sidebar and everything in `~/.claude-desktop-sync/` stay. To revert those too, quit the desktop app and run `claude-session-sync --undo` repeatedly *before* uninstalling, until it reports nothing left to undo; then delete `~/.claude-desktop-sync/` if you no longer need the backups and saved account names.
 
 ---
 

{claude_session_sync_cli-0.1.3 → claude_session_sync_cli-0.2.0}/README.zh-CN.md

@@ -154,7 +154,8 @@ claude-session-sync --purge-archived --apply   # 执行
 | `--apply` | 实际写入 |
 | `--undo` | 撤销最近一次写入或删除 |
 | `--show-template` | 显示每个账号的模板字段后退出（排查用） |
-| `--account <账号ID>` | 只同步指定账号，可以写多次 |
+| `--account <账号ID>` | 只同步指定账号。写输出里显示的前 8 位就够了；加 `/<组织ID前缀>` 可以只选一个组织。可以写多次 |
+| `--set-alias <ID>=<名称>` | 给账号起显示名称（见[账号名称](#账号名称)），名称留空则删除。可以写多次，保存后退出 |
 | `--project <字符串>` | 只处理工作目录里包含这个字符串的会话（同步和清除都生效） |
 | `--exclude <会话ID>` | 排除某个会话，同步和清除都跳过，可以写多次 |
 | `--exclude-file <文件>` | 从文件读取排除列表，每行一个会话 ID |
@@ -175,7 +176,22 @@ claude-session-sync --account 1a2b3c4d-... --project myapp --apply
 claude-session-sync --exclude-file ~/no-sync.txt --apply
 ```
 
-会话 ID 就是 `~/.claude/projects/<项目>/` 下 `.jsonl` 文件的文件名；账号 ID 是 `claude-code-sessions/` 下第一层目录名，预览输出里会显示前 8 位。
+会话 ID 就是 `~/.claude/projects/<项目>/` 下 `.jsonl` 文件的文件名；账号 ID 是 `claude-code-sessions/` 下第一层目录名，预览输出里会显示前 8 位，`--account` 和 `--set-alias` 直接用这 8 位就行。
+
+### 账号名称
+
+桌面端只按 ID 存放账号，所以输出里会尽量把能找到的名称显示出来：
+
+```
+[工作号 · Acme Inc · fan***@example.com · 当前 CLI 登录] (b8073c71…/677f8bdf…) 已有 122，待补 1
+[07ac42e2…/00000000…] 已有 119，待补 1
+```
+
+- **CLI 当前登录的账号**：从 `~/.claude.json` 自动识别（只读取账号和组织 ID、邮箱、组织名）。
+- **CLI 以前登录过的账号**：每次 `--apply` 都会把当前 CLI 账号记到 `~/.claude-desktop-sync/accounts.json`，切换账号后仍然能显示名称。
+- **任意账号**：自己起别名，比如 `claude-session-sync --set-alias b8073c71=工作号`；写成 `<账号>/<组织>` 前缀可以只给某个组织起名。
+
+邮箱始终打码显示（如 `fan***@example.com`），因为这份输出经常会被贴进 issue。预览模式不会写入 `accounts.json`。
 
 ---
 
@@ -205,7 +221,7 @@ claude-session-sync --exclude-file ~/no-sync.txt --apply
 不记得用哪种方式装的，运行 `uv tool list` 或 `pipx list` 看一下。
 
 - **升级**会直接替换旧版本，命令名不变。再运行一次 `uv tool install` 不会升级，要用 `upgrade`。`~/.claude-desktop-sync/` 里的日志和备份会保留，升级后 `--undo` 依然可以撤销以前的操作。升级完可以用 `claude-session-sync --version` 确认版本。
-- **卸载只删除程序本身。** 已经同步到桌面端侧边栏的会话和 `~/.claude-desktop-sync/` 都会保留。想一并撤销，请在**卸载前**退出桌面端，反复运行 `claude-session-sync --undo`，直到提示没有可撤销的记录；不再需要备份的话，再手动删除 `~/.claude-desktop-sync/`。
+- **卸载只删除程序本身。** 已经同步到桌面端侧边栏的会话和 `~/.claude-desktop-sync/` 都会保留。想一并撤销，请在**卸载前**退出桌面端，反复运行 `claude-session-sync --undo`，直到提示没有可撤销的记录；不再需要备份的话，再手动删除 `~/.claude-desktop-sync/`（里面也存着账号名称和别名）。
 
 ---
 

{claude_session_sync_cli-0.1.3 → claude_session_sync_cli-0.2.0}/src/claude_session_sync/cli.py

@@ -33,6 +33,7 @@ import glob
 import json
 import os
 import platform
+import re
 import shutil
 import subprocess
 import sys
@@ -40,7 +41,7 @@ import time
 import uuid
 from pathlib import Path, PurePosixPath, PureWindowsPath
 
-__version__ = "0.1.3"
+__version__ = "0.2.0"
 
 HOME = Path.home()
 JOURNAL_DIR = HOME / ".claude-desktop-sync"
@@ -578,6 +579,160 @@ def purge_archived(indexes, archived_ids, projects, apply, trash, excluded=(), p
     return created, moved
 
 
+# ---------------------------------------------------------------- 账号名称
+#
+# 桌面端只按 ID 存放账号目录，本机没有公开的地方记录其他账号的邮箱或组织名。
+# 名称来源（按优先级）：
+#   1. 用户用 --set-alias 起的别名
+#   2. CLI 当前登录的账号（~/.claude.json 的 oauthAccount）
+#   3. 以前 --apply 时记下的 CLI 账号信息（~/.claude-desktop-sync/accounts.json）
+# 邮箱一律打码后再显示，因为预览输出经常会被贴进 issue。
+
+EMAIL_RE = re.compile(r"([A-Za-z0-9._%+-]+)@([A-Za-z0-9.-]+\.[A-Za-z]{2,})")
+
+
+def mask_email(email):
+    local, _, domain = email.partition("@")
+    keep = min(3, max(1, len(local) // 2))
+    return f"{local[:keep]}***@{domain}"
+
+
+def mask_emails_in(text):
+    return EMAIL_RE.sub(lambda m: mask_email(m.group(0)), text)
+
+
+def accounts_file():
+    return JOURNAL_DIR / "accounts.json"
+
+
+def load_account_book():
+    try:
+        data = json.loads(accounts_file().read_text(encoding="utf-8"))
+    except (OSError, ValueError):
+        data = {}
+    if not isinstance(data, dict):
+        data = {}
+    return {
+        "accounts": data.get("accounts") if isinstance(data.get("accounts"), dict) else {},
+        "aliases": data.get("aliases") if isinstance(data.get("aliases"), dict) else {},
+    }
+
+
+def save_account_book(book):
+    JOURNAL_DIR.mkdir(parents=True, exist_ok=True)
+    p = accounts_file()
+    p.write_text(json.dumps({"version": 1, **book}, ensure_ascii=False, indent=2), encoding="utf-8")
+    try:
+        os.chmod(p, 0o600)  # 里面有邮箱，只让自己读
+    except OSError:
+        pass
+
+
+def cli_login_account():
+    """读取 CLI 当前登录账号，只取识别账号需要的字段。读不到返回 None。"""
+    cfg = os.environ.get("CLAUDE_CONFIG_DIR")
+    candidates = ([Path(cfg).expanduser() / ".claude.json"] if cfg else []) + [HOME / ".claude.json"]
+    for f in candidates:
+        try:
+            a = json.loads(f.read_text(encoding="utf-8")).get("oauthAccount")
+        except (OSError, ValueError, AttributeError):
+            continue
+        if isinstance(a, dict) and isinstance(a.get("accountUuid"), str):
+            return {
+                "account": a["accountUuid"],
+                "org": a.get("organizationUuid") or "",
+                "email": a.get("emailAddress") or "",
+                "org_name": a.get("organizationName") or "",
+            }
+    return None
+
+
+def remember_cli_account(book, cli_acct):
+    """把 CLI 当前账号记进账号簿；有变化返回 True。"""
+    if not cli_acct:
+        return False
+    key = f"{cli_acct['account']}/{cli_acct['org']}"
+    info = {"email": cli_acct["email"], "org_name": cli_acct["org_name"]}
+    old = book["accounts"].get(key) or {}
+    if {k: old.get(k) for k in info} == info:
+        return False
+    book["accounts"][key] = {**info, "seen_at": dt.datetime.now().isoformat(timespec="seconds")}
+    return True
+
+
+def account_label(acct, org, book, cli_acct):
+    """返回账号的可读名称（可能为空）。"""
+    parts = []
+    alias = book["aliases"].get(f"{acct}/{org}") or book["aliases"].get(acct)
+    if alias:
+        parts.append(alias)
+    is_cli = bool(cli_acct and cli_acct["account"] == acct and cli_acct["org"] == org)
+    info = (
+        {"email": cli_acct["email"], "org_name": cli_acct["org_name"]}
+        if is_cli
+        else book["accounts"].get(f"{acct}/{org}") or {}
+    )
+    email = mask_email(info["email"]) if EMAIL_RE.fullmatch(info.get("email") or "") else ""
+    org_name = mask_emails_in(info.get("org_name") or "")
+    if org_name and not (email and email in org_name):  # 个人组织名常常就是"邮箱's Organization"
+        parts.append(org_name)
+    if email:
+        parts.append(email)
+    if is_cli:
+        parts.append(t("current CLI login", "当前 CLI 登录"))
+    return " · ".join(parts)
+
+
+def account_heading(acct, org, book, cli_acct):
+    ids = f"{acct[:8]}…/{org[:8]}…"
+    label = account_label(acct, org, book, cli_acct)
+    return f"[{label}] ({ids})" if label else f"[{ids}]"
+
+
+def resolve_account_key(key, all_accts):
+    """把 <账号ID前缀>[/<组织ID前缀>] 解析成完整 ID。返回 (账号ID, 组织ID或None)；出错时退出。"""
+    acct_part, _, org_part = key.partition("/")
+    if not acct_part:
+        sys.exit(t(f"Invalid account ID: {key!r}", f"账号 ID 无效：{key!r}"))
+    pairs = {(a, o) for _, a, o, _ in all_accts if a.startswith(acct_part) and o.startswith(org_part)}
+    acct_ids = {a for a, _ in pairs}
+    if not pairs:
+        sys.exit(t(f"No account matches {key!r}.", f"没有匹配 {key!r} 的账号。"))
+    if len(acct_ids) > 1:
+        sys.exit(
+            t(
+                f"{key!r} matches several accounts: {', '.join(sorted(x[:8] for x in acct_ids))}. Use a longer prefix.",
+                f"{key!r} 匹配到多个账号：{', '.join(sorted(x[:8] for x in acct_ids))}。请写更长的前缀。",
+            )
+        )
+    acct = acct_ids.pop()
+    if not org_part:
+        return acct, None
+    if len(pairs) > 1:
+        sys.exit(t(f"{key!r} matches several organizations.", f"{key!r} 匹配到多个组织。"))
+    return acct, next(iter(pairs))[1]
+
+
+def set_aliases(specs, all_accts):
+    book = load_account_book()
+    for spec in specs:
+        key, sep, name = spec.partition("=")
+        if not sep:
+            sys.exit(
+                t(f"--set-alias expects ID=NAME, got {spec!r}", f"--set-alias 的格式是 ID=名称，收到的是 {spec!r}")
+            )
+        acct, org = resolve_account_key(key.strip(), all_accts)
+        full = f"{acct}/{org}" if org else acct
+        name = name.strip()
+        if name:
+            book["aliases"][full] = name
+            print(t(f"Alias set: {full} = {name}", f"已设置别名：{full} = {name}"))
+        else:
+            book["aliases"].pop(full, None)
+            print(t(f"Alias removed: {full}", f"已删除别名：{full}"))
+    save_account_book(book)
+
+
 # ---------------------------------------------------------------- 主流程
 
 
@@ -672,7 +827,21 @@ Notes:
     ap.add_argument(
         "--account",
         action="append",
-        help=t("only sync this account ID (repeatable)", "只同步指定账号ID（可多次使用）"),
+        help=t(
+            "only sync this account; an ID prefix such as the 8 characters shown in the output works, "
+            "add /<org-id-prefix> to pick one organization (repeatable)",
+            "只同步指定账号；可以只写输出里显示的前 8 位，加 /<组织ID前缀> 可只选一个组织（可多次使用）",
+        ),
+    )
+    ap.add_argument(
+        "--set-alias",
+        action="append",
+        metavar="ID=NAME",
+        help=t(
+            "give an account a display name, e.g. b8073c71=work (ID prefix, optionally /<org-id-prefix>); "
+            "an empty name removes it; repeatable, then exits",
+            "给账号起显示名称，如 b8073c71=工作号（ID 前缀，可加 /<组织ID前缀>）；名称留空则删除；可多次使用，设置完即退出",
+        ),
     )
     ap.add_argument(
         "--project",
@@ -754,10 +923,17 @@ Notes:
         )
 
     accts = account_dirs(roots)
-    if args.account:
-        accts = [a for a in accts if a[1] in args.account]
     if not accts:
         sys.exit(t("No account directories found.", "没有找到任何账号目录。"))
+    if args.set_alias:
+        set_aliases(args.set_alias, accts)
+        return
+    if args.account:
+        wanted = [resolve_account_key(v, accts) for v in args.account]
+        accts = [a for a in accts if any(a[1] == ac and (og is None or a[2] == og) for ac, og in wanted)]
+
+    book = load_account_book()
+    cli_acct = cli_login_account()
 
     excluded = set(args.exclude)
     if args.exclude_file:
@@ -804,7 +980,14 @@ Notes:
     if args.show_template:
         for _d, (acct, org, entries, _, _) in indexes.items():
             tpl = pick_template(entries)
-            print(t(f"\n[{acct}/{org}] {len(entries)} index file(s)", f"\n[{acct}/{org}] {len(entries)} 个索引文件"))
+            label = account_label(acct, org, book, cli_acct)
+            label = f" {label}" if label else ""
+            print(
+                t(
+                    f"\n[{acct}/{org}]{label} {len(entries)} index file(s)",
+                    f"\n[{acct}/{org}]{label} {len(entries)} 个索引文件",
+                )
+            )
             if tpl:
                 print(
                     json.dumps(
@@ -845,6 +1028,8 @@ Notes:
 
     if args.apply:
         ensure_desktop_stopped(args.force)
+        if remember_cli_account(book, cli_acct):
+            save_account_book(book)
 
     created = []
     for d, (acct, org, entries, known, archived) in indexes.items():
@@ -857,8 +1042,8 @@ Notes:
         ]
         print(
             t(
-                f"[{acct[:8]}…/{org[:8]}…] existing {len(known)}, to add {len(todo)}",
-                f"[{acct[:8]}…/{org[:8]}…] 已有 {len(known)}，待补 {len(todo)}",
+                f"{account_heading(acct, org, book, cli_acct)} existing {len(known)}, to add {len(todo)}",
+                f"{account_heading(acct, org, book, cli_acct)} 已有 {len(known)}，待补 {len(todo)}",
             )
         )
         if not template:

{claude_session_sync_cli-0.1.3 → claude_session_sync_cli-0.2.0}/tests/conftest.py

@@ -11,6 +11,8 @@ def env(tmp_path, monkeypatch):
     monkeypatch.setattr(cli, "JOURNAL_DIR", e.journal)
     # 默认假装桌面端没在运行，避免开发机上开着桌面端时测试失败
     monkeypatch.setattr(cli, "desktop_running", lambda: False)
+    # 不读取开发机上真实的 ~/.claude.json，需要的测试自己设置
+    monkeypatch.setattr(cli, "cli_login_account", lambda: None)
     return e
 
 

{claude_session_sync_cli-0.1.3 → claude_session_sync_cli-0.2.0}/tests/test_sync.py

@@ -444,3 +444,103 @@ def test_invalid_lang_is_rejected(capsys):
         cli.main(["--lang", "fr"])
     assert e.value.code == 2
     assert "invalid choice" in capsys.readouterr().err
+
+
+# ---------------------------------------------------------------- 账号名称、别名、前缀
+
+
+CLI_ACCT = {"account": ACCT, "org": ORG, "email": "alice@example.com", "org_name": "alice@example.com's Organization"}
+
+
+@pytest.mark.parametrize(
+    ("email", "masked"),
+    [("alice@example.com", "al***@example.com"), ("ab@x.io", "a***@x.io"), ("a@x.io", "a***@x.io")],
+)
+def test_mask_email(email, masked):
+    assert cli.mask_email(email) == masked
+
+
+def test_cli_login_account_reads_only_needed_fields(tmp_path, monkeypatch):
+    monkeypatch.setenv("CLAUDE_CONFIG_DIR", str(tmp_path))
+    (tmp_path / ".claude.json").write_text(
+        json.dumps(
+            {
+                "oauthAccount": {
+                    "accountUuid": ACCT,
+                    "organizationUuid": ORG,
+                    "emailAddress": "alice@example.com",
+                    "organizationName": "Acme",
+                    "billingType": "secret-ish",
+                }
+            }
+        )
+    )
+    assert cli.cli_login_account() == {"account": ACCT, "org": ORG, "email": "alice@example.com", "org_name": "Acme"}
+
+
+def test_heading_shows_masked_cli_account(env, monkeypatch, capsys):
+    monkeypatch.setattr(cli, "cli_login_account", lambda: dict(CLI_ACCT))
+    env.add_index("existing")
+    env.org_dir(ACCT, ORG_EMPTY)
+    env.run()
+    out = capsys.readouterr().out
+    assert "[al***@example.com · current CLI login] (aaaaaaaa…/bbbbbbbb…)" in out
+    assert "alice@example.com" not in out  # 完整邮箱不能出现，组织名里的也不行
+    assert "[aaaaaaaa…/bbbbbbbb…] existing 0" in out  # 另一个组织没有名称
+    assert not env.journal.exists()  # 预览不写账号记录
+
+
+def test_apply_remembers_cli_account(env, monkeypatch, capsys):
+    monkeypatch.setattr(cli, "cli_login_account", lambda: dict(CLI_ACCT, org_name="Acme"))
+    env.add_index("existing")
+    env.run("--apply")
+    saved = json.loads((env.journal / "accounts.json").read_text())
+    assert saved["accounts"][f"{ACCT}/{ORG}"]["email"] == "alice@example.com"
+    # 之后切换到别的 CLI 账号，仍然能显示记下来的名称
+    monkeypatch.setattr(cli, "cli_login_account", lambda: None)
+    capsys.readouterr()
+    env.run()
+    assert "[Acme · al***@example.com] (aaaaaaaa…/bbbbbbbb…)" in capsys.readouterr().out
+
+
+def test_set_alias_and_remove(env, capsys):
+    env.add_index("existing")
+    env.org_dir(ACCT, ORG_EMPTY)
+    env.run("--set-alias", "aaaaaaaa=work")  # 只写账号前缀：对该账号的所有组织生效
+    env.run("--set-alias", "aaaaaaaa/bbbbbbbb-0000-4000-8000-000000000002=side")  # 组织级别优先
+    capsys.readouterr()
+    env.run()
+    out = capsys.readouterr().out
+    assert "[work] (aaaaaaaa…/bbbbbbbb…) existing 1" in out
+    assert "[side] (aaaaaaaa…/bbbbbbbb…) existing 0" in out
+    env.run("--set-alias", "aaaaaaaa=")
+    saved = json.loads((env.journal / "accounts.json").read_text())
+    assert ACCT not in saved["aliases"] and f"{ACCT}/{ORG_EMPTY}" in saved["aliases"]
+
+
+def test_set_alias_errors(env):
+    env.add_index("existing")
+    with pytest.raises(SystemExit) as e:
+        env.run("--set-alias", "zzzz=x")
+    assert "No account matches" in str(e.value.code)
+    with pytest.raises(SystemExit) as e:
+        env.run("--set-alias", "aaaaaaaa")
+    assert "ID=NAME" in str(e.value.code)
+
+
+def test_account_prefix_filter(env):
+    other = "cccccccc-0000-4000-8000-000000000001"
+    env.add_index("existing")
+    env.add_index("existing", acct=other)
+    env.add_cli_session("new-1")
+    env.run("--apply", "--account", "cccccccc")
+    assert cli_ids(env.index_entries(other, ORG)) == ["existing", "new-1"]
+    assert cli_ids(env.index_entries(ACCT, ORG)) == ["existing"]
+
+
+def test_ambiguous_account_prefix_is_rejected(env):
+    env.add_index("existing")
+    env.add_index("existing", acct="aaaaaaaa-1111-4000-8000-000000000001")
+    with pytest.raises(SystemExit) as e:
+        env.run("--account", "aaaaaaaa")
+    assert "matches several accounts" in str(e.value.code)