multi-codex 0.9.0__tar.gz → 0.10.0__tar.gz

{multi_codex-0.9.0/src/multi_codex.egg-info → multi_codex-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multi-codex
-Version: 0.9.0
+Version: 0.10.0
 Summary: Run several Codex CLI accounts side by side: separate CODEX_HOME directories, launchers and proxies.
 License: MIT
 Project-URL: Homepage, https://github.com/jakoes-wu/multi-codex
@@ -134,7 +134,7 @@ Without a name, the account is named after the e-mail address in `~/.codex/auth.
 | Open VS Code with an account | `multi-codex code work ~/src/project` | [VS Code and the desktop app](#vs-code-and-the-desktop-app-experimental) |
 | Open the desktop app with an account (macOS) | `multi-codex app work` | [VS Code and the desktop app](#vs-code-and-the-desktop-app-experimental) |
 | Change the account that plain `codex` and the Dock apps use | `multi-codex use work` (after `migrate-default`) | [Default account](#default-account) |
-| Always use one account inside a project | In the project directory: `multi-codex bind work`, then `multi-codex run` | [Directory bindings](#directory-bindings) |
+| Always use one account inside a project | In the project directory: `multi-codex bind work`, then `codex-auto` | [Directory bindings](#directory-bindings) |
 | Set or change an account's proxy | `multi-codex set work --proxy 7901` | [Proxy values](#proxy-values) |
 | Share `AGENTS.md`, skills and rules between accounts | Put them in `~/.codex-shared`, then run `multi-codex set work --shared` | [Shared resources](#shared-resources) |
 | Start a new account with another account's settings | `multi-codex add new --config-from work` | [Copying settings](#copying-settings-from-another-account) |
@@ -172,6 +172,7 @@ More questions are answered in the [FAQ](#faq).
 | `multi-codex doctor [--json]` | Check the installation, configuration and accounts. Read-only. |
 | `multi-codex run [NAME] [-- COMMAND ...]` | Run a command (default: `codex`) with an account's environment. Without NAME, the account bound to the current directory is used. |
 | `multi-codex bind [NAME [DIR]]` / `unbind [DIR]` | Bind a directory to an account, list bindings, or remove one. |
+| `multi-codex which [DIR]` | Show which account a directory uses (the same one `codex-auto` and `run` pick). |
 | `multi-codex code NAME [PATH] [-- ARGS]` | Open VS Code for an account (experimental). |
 | `multi-codex app NAME` | Open the Codex desktop app for an account (macOS, experimental). |
 | `multi-codex path NAME` | Print an account's directory. |
@@ -218,7 +219,7 @@ Subcommands, options and registered account names (including e-mail addresses) a
 
 ### Running other commands
 
-`multi-codex run NAME -- COMMAND ...` runs any command with exactly the environment of `codex-NAME` (`CODEX_HOME`, proxy, extra variables). Without a command it runs `codex`. Everything after the first `--` is passed through unchanged; the exit code is the command's. `multi-codex path NAME` prints the account directory.
+`multi-codex run NAME -- COMMAND ...` runs any command with exactly the environment of `codex-NAME` (`CODEX_HOME`, proxy, extra variables). Without a command it runs `codex`. Everything after the first `--` is passed through unchanged; the exit code is the command's. `multi-codex path NAME` prints the account directory. For example, to manage an account's MCP servers: `multi-codex run work -- codex mcp list`.
 
 ### Directory bindings
 
@@ -227,8 +228,12 @@ cd ~/work/project && multi-codex bind work     # this directory and everything b
 multi-codex run -- codex resume                # no account name needed here
 multi-codex bind                               # list bindings; * marks the one in effect here
 multi-codex unbind                             # remove the binding of the current directory
+codex-auto                                     # runs codex with the bound account
+multi-codex which                              # prints the account this directory uses
 ```
 
+While at least one binding exists, multi-codex generates `codex-auto` next to the other launchers. It looks up the nearest bound directory exactly like `run` and starts that account's launcher; outside any bound directory it runs plain `codex` (the default account, see [Default account](#default-account)) and says so on stderr. It is updated whenever bindings or accounts change and removed with the last binding. An account named `auto` cannot coexist with bindings: rename it first (`multi-codex rename auto NEW`).
+
 `run` without an account name walks up from the current directory and uses the nearest bound directory. Bindings are stored in `config.json` (not in your project), keyed by the real path of the directory (links resolved, the on-disk letter case used on case-insensitive file systems). `apply -f` keeps the current bindings; removing an account (`remove`, `restore`, `apply -f`) also removes its bindings. Older versions of multi-codex drop the `bindings` field on their next write.
 
 ### Copying settings from another account
@@ -241,7 +246,7 @@ multi-codex unbind                             # remove the binding of the curre
 multi-codex rename work client-a
 ```
 
-The account and its launcher get the new name (`codex-client-a`; `codex-work` is deleted), and directory bindings and the default account follow. The directory stays where it is, so the login, sessions and shared links are kept; `config.json` records it as `"dir": "work"` (in `list --json`, `dir` is the full path instead). A name that is still used as another account's directory, such as `work` after this rename, cannot be given to a new account. Renaming only the letter case is not supported. Before downgrading to a version older than 0.9, rename the account back: older versions ignore `dir` and would use `<root>/client-a`.
+The account and its launcher get the new name (`codex-client-a`; `codex-work` is deleted), and directory bindings, `codex-auto` and the default account follow. The directory stays where it is, so the login, sessions and shared links are kept; `config.json` records it as `"dir": "work"` (in `list --json`, `dir` is the full path instead). A name that is still used as another account's directory, such as `work` after this rename, cannot be given to a new account. Renaming only the letter case is not supported. Before downgrading to a version older than 0.9, rename the account back: older versions ignore `dir` and would use `<root>/client-a`.
 
 ### Per-account environment variables
 
@@ -492,7 +497,7 @@ The tool goes to `~/.local/share/multi-codex` and the `multi-codex` command to `
 curl -fsSL https://raw.githubusercontent.com/jakoes-wu/multi-codex/main/install.sh | sh -s -- --uninstall    # without a clone
 ```
 
-This removes the tool only. Your configuration, account directories and `codex-<name>` launchers stay; the launchers keep working because they do not depend on multi-codex.
+This removes the tool only. Your configuration, account directories, `codex-<name>` launchers and `codex-auto` stay; they keep working because they do not depend on multi-codex.
 
 ## Contributing
 

{multi_codex-0.9.0 → multi_codex-0.10.0}/README.md

@@ -110,7 +110,7 @@ Without a name, the account is named after the e-mail address in `~/.codex/auth.
 | Open VS Code with an account | `multi-codex code work ~/src/project` | [VS Code and the desktop app](#vs-code-and-the-desktop-app-experimental) |
 | Open the desktop app with an account (macOS) | `multi-codex app work` | [VS Code and the desktop app](#vs-code-and-the-desktop-app-experimental) |
 | Change the account that plain `codex` and the Dock apps use | `multi-codex use work` (after `migrate-default`) | [Default account](#default-account) |
-| Always use one account inside a project | In the project directory: `multi-codex bind work`, then `multi-codex run` | [Directory bindings](#directory-bindings) |
+| Always use one account inside a project | In the project directory: `multi-codex bind work`, then `codex-auto` | [Directory bindings](#directory-bindings) |
 | Set or change an account's proxy | `multi-codex set work --proxy 7901` | [Proxy values](#proxy-values) |
 | Share `AGENTS.md`, skills and rules between accounts | Put them in `~/.codex-shared`, then run `multi-codex set work --shared` | [Shared resources](#shared-resources) |
 | Start a new account with another account's settings | `multi-codex add new --config-from work` | [Copying settings](#copying-settings-from-another-account) |
@@ -148,6 +148,7 @@ More questions are answered in the [FAQ](#faq).
 | `multi-codex doctor [--json]` | Check the installation, configuration and accounts. Read-only. |
 | `multi-codex run [NAME] [-- COMMAND ...]` | Run a command (default: `codex`) with an account's environment. Without NAME, the account bound to the current directory is used. |
 | `multi-codex bind [NAME [DIR]]` / `unbind [DIR]` | Bind a directory to an account, list bindings, or remove one. |
+| `multi-codex which [DIR]` | Show which account a directory uses (the same one `codex-auto` and `run` pick). |
 | `multi-codex code NAME [PATH] [-- ARGS]` | Open VS Code for an account (experimental). |
 | `multi-codex app NAME` | Open the Codex desktop app for an account (macOS, experimental). |
 | `multi-codex path NAME` | Print an account's directory. |
@@ -194,7 +195,7 @@ Subcommands, options and registered account names (including e-mail addresses) a
 
 ### Running other commands
 
-`multi-codex run NAME -- COMMAND ...` runs any command with exactly the environment of `codex-NAME` (`CODEX_HOME`, proxy, extra variables). Without a command it runs `codex`. Everything after the first `--` is passed through unchanged; the exit code is the command's. `multi-codex path NAME` prints the account directory.
+`multi-codex run NAME -- COMMAND ...` runs any command with exactly the environment of `codex-NAME` (`CODEX_HOME`, proxy, extra variables). Without a command it runs `codex`. Everything after the first `--` is passed through unchanged; the exit code is the command's. `multi-codex path NAME` prints the account directory. For example, to manage an account's MCP servers: `multi-codex run work -- codex mcp list`.
 
 ### Directory bindings
 
@@ -203,8 +204,12 @@ cd ~/work/project && multi-codex bind work     # this directory and everything b
 multi-codex run -- codex resume                # no account name needed here
 multi-codex bind                               # list bindings; * marks the one in effect here
 multi-codex unbind                             # remove the binding of the current directory
+codex-auto                                     # runs codex with the bound account
+multi-codex which                              # prints the account this directory uses
 ```
 
+While at least one binding exists, multi-codex generates `codex-auto` next to the other launchers. It looks up the nearest bound directory exactly like `run` and starts that account's launcher; outside any bound directory it runs plain `codex` (the default account, see [Default account](#default-account)) and says so on stderr. It is updated whenever bindings or accounts change and removed with the last binding. An account named `auto` cannot coexist with bindings: rename it first (`multi-codex rename auto NEW`).
+
 `run` without an account name walks up from the current directory and uses the nearest bound directory. Bindings are stored in `config.json` (not in your project), keyed by the real path of the directory (links resolved, the on-disk letter case used on case-insensitive file systems). `apply -f` keeps the current bindings; removing an account (`remove`, `restore`, `apply -f`) also removes its bindings. Older versions of multi-codex drop the `bindings` field on their next write.
 
 ### Copying settings from another account
@@ -217,7 +222,7 @@ multi-codex unbind                             # remove the binding of the curre
 multi-codex rename work client-a
 ```
 
-The account and its launcher get the new name (`codex-client-a`; `codex-work` is deleted), and directory bindings and the default account follow. The directory stays where it is, so the login, sessions and shared links are kept; `config.json` records it as `"dir": "work"` (in `list --json`, `dir` is the full path instead). A name that is still used as another account's directory, such as `work` after this rename, cannot be given to a new account. Renaming only the letter case is not supported. Before downgrading to a version older than 0.9, rename the account back: older versions ignore `dir` and would use `<root>/client-a`.
+The account and its launcher get the new name (`codex-client-a`; `codex-work` is deleted), and directory bindings, `codex-auto` and the default account follow. The directory stays where it is, so the login, sessions and shared links are kept; `config.json` records it as `"dir": "work"` (in `list --json`, `dir` is the full path instead). A name that is still used as another account's directory, such as `work` after this rename, cannot be given to a new account. Renaming only the letter case is not supported. Before downgrading to a version older than 0.9, rename the account back: older versions ignore `dir` and would use `<root>/client-a`.
 
 ### Per-account environment variables
 
@@ -468,7 +473,7 @@ The tool goes to `~/.local/share/multi-codex` and the `multi-codex` command to `
 curl -fsSL https://raw.githubusercontent.com/jakoes-wu/multi-codex/main/install.sh | sh -s -- --uninstall    # without a clone
 ```
 
-This removes the tool only. Your configuration, account directories and `codex-<name>` launchers stay; the launchers keep working because they do not depend on multi-codex.
+This removes the tool only. Your configuration, account directories, `codex-<name>` launchers and `codex-auto` stay; they keep working because they do not depend on multi-codex.
 
 ## Contributing
 

{multi_codex-0.9.0 → multi_codex-0.10.0}/src/multi_codex/__init__.py

@@ -1,3 +1,3 @@
 """multi-codex：管理多个 Codex CLI 账号目录、启动命令与代理设置。"""
 
-__version__ = "0.9.0"
+__version__ = "0.10.0"

{multi_codex-0.9.0 → multi_codex-0.10.0}/src/multi_codex/accounts.py

@@ -14,7 +14,7 @@
 import os
 from typing import Dict, FrozenSet, Iterable, List, Optional, Sequence, Set, Union
 
-from . import launcher, shared
+from . import launcher, router, shared
 from .actions import (CONFLICT, CREATE, DELETE, SKIP, UNCHANGED, UPDATE, Action, error,
                       has_conflict, info, print_action)
 from .config import Account, Config, config_path, dump_config, save_config
@@ -121,6 +121,8 @@ def plan(old: Config, new: Config, *, config_exists: bool = True,
                 actions.extend(_plan_launcher_delete(new_bin, name, planned_deletes,
                                                      "orphan launcher", path=path))
 
+    actions.extend(_plan_router(old_bin, new_bin, new, planned_deletes))
+
     config_changed = not config_exists or dump_config(old) != dump_config(new)
     config_action = Action(CREATE if not config_exists else (UPDATE if config_changed else UNCHANGED),
                            "config", config_path())
@@ -191,6 +193,44 @@ def _plan_launcher(bin_dir: str, name: str, directory: str, proxy: str,
     return [Action(UPDATE, "launcher", path, run=_write_launcher(path, content, mode))]
 
 
+def _plan_router(old_bin: str, new_bin: str, new: Config, planned_deletes: Set[str]) -> List[Action]:
+    """codex-auto 入口（feature-auto-launcher §5.1.2）：有目录绑定时生成或更新，没有时删除。
+
+    必须放在账号启动命令的删除（含孤儿清理）之后计算：rename / remove / restore 名为 auto 的账号时，
+    codex-auto 原本是它的启动命令，正被删除，这里要把它当作不存在、重建成入口。
+    """
+    actions: List[Action] = []
+    path = router.router_path(new_bin)
+    if old_bin != new_bin:
+        old_path = router.router_path(old_bin)
+        if router.is_router(old_path):
+            actions.append(Action(DELETE, "launcher", old_path, "bin_dir changed", _unlink_file(old_path)))
+    if not new.bindings:
+        if router.is_router(path):
+            actions.append(Action(DELETE, "launcher", path, "no directory bindings", _unlink_file(path)))
+        return actions
+    owner = new.find(router.ROUTER_NAME)
+    if owner is not None:
+        return actions + [Action(CONFLICT, "launcher", path,
+                                 "codex-auto is generated from directory bindings; rename the account named {!r} "
+                                 "(multi-codex rename {} NEW) or remove the bindings".format(owner.name, owner.name))]
+    content = router.render(new)
+    write = _write_launcher(path, content, router.ROUTER_MODE)
+    if entry_kind(path) == KIND_MISSING or router.same_file(path, planned_deletes):
+        return actions + [Action(CREATE, "launcher", path, run=write)]
+    if not router.is_router(path):
+        return actions + [Action(CONFLICT, "launcher", path, "already exists and is not the multi-codex router")]
+    if launcher.launcher_file_ok(path, content, None):
+        return actions + [Action(UNCHANGED, "launcher", path)]
+    return actions + [Action(UPDATE, "launcher", path, run=write)]
+
+
+def _unlink_file(path: str):
+    def run() -> None:
+        os.unlink(path)
+    return run
+
+
 def _write_launcher(path: str, content: str, mode: int):
     def run() -> None:
         atomic_write(path, content, mode=mode)

{multi_codex-0.9.0 → multi_codex-0.10.0}/src/multi_codex/cli.py

@@ -46,6 +46,7 @@ COMMAND_GROUPS = (
         ("use", "show or change the default account (what ~/.codex points to)"),
         ("bind", "bind a directory to an account (no arguments: list bindings)"),
         ("unbind", "remove the binding of a directory"),
+        ("which", "show which account a directory uses (codex-auto picks the same one)"),
         ("code", "open VS Code for an account (experimental)"),
         ("app", "open the Codex desktop app for an account (macOS, experimental)"),
         ("proxy", "set the proxy of an account"),
@@ -191,6 +192,9 @@ def build_parser() -> argparse.ArgumentParser:
     _add_dry_run(p_unbind)
     _add_verbose(p_unbind)
 
+    p_which = sub.add_parser("which", description=COMMAND_SUMMARY["which"])
+    p_which.add_argument("dir", nargs="?", help="directory to check (default: current directory)")
+
     p_code = sub.add_parser("code", description=COMMAND_SUMMARY["code"],
                             usage="multi-codex code NAME [PATH] [--bin CODE] [-- CODE_ARGS ...]")
     p_code.add_argument("name")
@@ -355,6 +359,8 @@ def main(argv: Optional[List[str]] = None) -> int:
             return cmd_app(args)
         if args.command == "path":
             return cmd_path(args.name)
+        if args.command == "which":
+            return cmd_which(args.dir)
         notice = migrate.pending_journal_notice()
         if notice:
             warn(notice)
@@ -1249,6 +1255,38 @@ def cmd_bind_list() -> int:
     return accounts.EXIT_OK
 
 
+def cmd_which(directory: Optional[str]) -> int:
+    """某目录会用哪个账号（feature-auto-launcher §5.1.3）。只读，不加锁。
+
+    规则与 run 省略账号名、以及 codex-auto 完全相同（binding.resolve）。stdout 只输出一行，便于脚本读取：
+    命中绑定时是账号名（登记时的大小写）；没有绑定时是默认账号的说明（与 `use` 不带参数相同，
+    以 `(` 开头表示没有已登记的默认账号）。依据写 stderr。
+    """
+    target = directory or os.getcwd()
+    if not os.path.isdir(target):
+        error("not a directory: {}".format(target))
+        return accounts.EXIT_ERROR
+    config, exists = load_config()
+    found = binding.resolve(config, target) if exists else None
+    if found is None:
+        print(switch.describe_default(config)[1])
+        hint("no binding for {}; plain codex uses the default account".format(binding.normalize_dir(target)))
+        if os.environ.get("CODEX_HOME"):
+            hint("CODEX_HOME is set in this shell, so plain codex uses {} instead".format(os.environ["CODEX_HOME"]))
+        return accounts.EXIT_OK
+    bound_dir, name = found
+    account = config.find(name)
+    if account is None:
+        error("account {!r} bound to {} is not registered; run `multi-codex unbind {}`".format(
+            name, bound_dir, bound_dir))
+        return accounts.EXIT_ERROR
+    print(account.name)
+    # 依据写 stderr（同 cmd_run）：actions.info 写 stdout，会破坏“stdout 只有一行”的约定。
+    sys.stdout.flush()
+    print("[multi-codex] bound to {}".format(bound_dir), file=sys.stderr)
+    return accounts.EXIT_OK
+
+
 def cmd_path(name: str) -> int:
     config, exists = load_config()
     account = config.find(name) if exists else None

multi_codex-0.10.0/src/multi_codex/router.py

@@ -0,0 +1,121 @@
+"""按目录绑定自动选账号的入口命令 `<bin_dir>/codex-auto`（feature-auto-launcher）。
+
+入口与账号启动命令一样是由 config.json 推导出的产物：有目录绑定时由收敛计划（accounts.plan）生成，
+没有绑定时删除。它只负责选账号，再用绝对路径 exec 该账号的 `codex-<名称>`；代理、隔离变量与
+环境变量都由账号启动命令负责，入口本身不设置任何环境。
+
+选账号的规则必须与 binding.resolve（`multi-codex run` 省略账号名时）完全一致：从当前目录向上找最近的绑定；
+最近的绑定指向未登记账号时报错退出 1，不继续向上找；一条都没有时运行普通 codex（默认账号）。
+"""
+
+import os
+import shlex
+from typing import List
+
+from . import launcher
+from .config import Config
+from .fsutil import KIND_FILE, entry_kind, expand, read_text
+
+ROUTER_NAME = "auto"
+# 不以 launcher.MARKER_PREFIX（`… account=`）开头：managed_account 对入口返回 None，
+# 孤儿清理与 restore 的残留清理都不会把它当成账号启动命令。
+ROUTER_MARKER = "# managed-by: multi-codex router"
+ROUTER_MODE = 0o755  # 入口不含任何密钥，所有人可读
+
+
+def router_path(bin_dir: str) -> str:
+    return launcher.launcher_path(bin_dir, ROUTER_NAME)
+
+
+def is_router(path: str) -> bool:
+    """path 是否是本工具生成的入口：只认普通文件，第 2 行必须完全等于标记（同 launcher.managed_account）。"""
+    if entry_kind(path) != KIND_FILE:
+        return False
+    content = read_text(path)
+    if content is None:
+        return False
+    lines = content.split("\n", 2)
+    return len(lines) >= 2 and lines[1] == ROUTER_MARKER
+
+
+def render(config: Config) -> str:
+    """生成入口脚本。键是 binding.normalize_dir 得到的物理路径，按字典序输出，内容稳定。
+
+    当前目录必须用外部命令 /bin/pwd -P 取：macOS 的 /bin/sh（bash）内建 pwd -P 按继承来的 $PWD 逐段解析，
+    用户换了大小写 cd 进来时会保留输入的大小写，与绑定键（磁盘上的真实大小写）对不上，账号会悄悄选错。
+
+    每段的长度用 Python 算好写成字面数字：多条命中时取最长的键，等价于 resolve 的“最近祖先”；
+    不在 sh 里用 ${#var}，它对多字节字符按字节还是按字符计在不同 shell 里不一致。
+    """
+    bin_dir = expand(config.bin_dir)
+    lines: List[str] = [
+        "#!/bin/sh",
+        ROUTER_MARKER,
+        "# Generated by multi-codex from directory bindings. Do not edit; use `multi-codex bind` / `unbind`.",
+        "here=$(/bin/pwd -P 2>/dev/null || pwd -P) || exit 1",
+        "best=0",
+        "target=''",
+        "stale=''",
+    ]
+    for key in sorted(config.bindings):
+        name = config.bindings[key]
+        account = config.find(name)
+        if account is not None:
+            assign = "target={}; stale=''".format(shlex.quote(launcher.launcher_path(bin_dir, account.name)))
+        else:
+            # 悬空绑定：与 cmd_run 同样报错退出。文字里不放反引号和 $：单引号里出现它们会触发 shellcheck SC2016。
+            message = "account {} bound to {} is not registered; run: multi-codex unbind {}".format(name, key, key)
+            assign = "target=''; stale={}".format(shlex.quote(message))
+        length = len(key)
+        update = 'if [ {0} -gt "$best" ]; then best={0}; {1}; fi'.format(length, assign)
+        if key == "/":
+            # "$here/" 永远以 "/" 开头；写成 case 模式会变成 "//"*，匹配不上，所以根目录无条件命中。
+            lines.append(update)
+            continue
+        lines.extend([
+            'case "$here/" in',
+            "  {}/*)".format(shlex.quote(key)),
+            "    {} ;;".format(update),
+            "esac",
+        ])
+    lines.extend([
+        'if [ -n "$stale" ]; then',
+        "  printf 'multi-codex: %s\\n' \"$stale\" >&2",
+        "  exit 1",
+        "fi",
+        'if [ -n "$target" ]; then',
+        '  if [ ! -x "$target" ]; then',
+        "    printf 'multi-codex: launcher %s is missing; run multi-codex apply\\n' \"$target\" >&2",
+        "    exit 1",
+        "  fi",
+        '  exec "$target" "$@"',
+        "fi",
+        "printf 'multi-codex: no account is bound to %s or its parents; running codex (the default account)\\n' "
+        '"$here" >&2',
+        "if ! command -v codex >/dev/null 2>&1; then",
+        '  echo "multi-codex: codex not found in PATH" >&2',
+        "  exit 127",
+        "fi",
+        'exec codex "$@"',
+        "",
+    ])
+    return "\n".join(lines)
+
+
+def same_file(path: str, others) -> bool:
+    """path 与 others 中任一路径是否是同一个文件（按 st_dev / st_ino）。
+
+    计划里判断“入口位置上的文件是否正要被删”只能按文件身份：macOS 上 codex-Auto 与 codex-auto 是同一个文件，
+    字符串却不同；按 casefold 比较文件名又会在区分大小写的 Linux 上把用户自己的 codex-auto 误当成要删的文件。
+    """
+    try:
+        target = os.lstat(path)
+    except OSError:
+        return False
+    for other in others:
+        try:
+            if os.path.samestat(target, os.lstat(other)):
+                return True
+        except OSError:
+            continue
+    return False

{multi_codex-0.9.0 → multi_codex-0.10.0}/src/multi_codex/switch.py

@@ -241,6 +241,20 @@ def restore_account(config: Config, config_exists: bool, name: str, skip_process
             if code:
                 return code
 
+    if state == STATE_A:
+        # 先移动数据、最后才收敛注销：收敛若冲突（例如 codex-auto 与名为 auto 的账号），会停在“数据已回到
+        # ~/.codex、注销失败”的半完成状态。所以在写标记、动数据之前，用同样的参数先预检一次
+        # （feature-auto-launcher §5.1.4）。A2/B/C 已写标记，配置被锁住，进入前已在状态 A 通过预检。
+        new = _unregistered(config, canonical)
+        conflicts = [action for action in accounts.plan(config, new, config_exists=config_exists,
+                                                        orphan_scope=frozenset([canonical.casefold()]))
+                     if action.status == accounts.CONFLICT]
+        if conflicts:
+            for action in conflicts:
+                error(action.reason, phase="precheck", path=action.path)
+            error("unregistering {} would conflict; nothing was moved".format(canonical), phase="precheck")
+            return accounts.EXIT_CONFLICT
+
     if dry_run:
         if state in (STATE_A, STATE_A2):
             info("(dry-run) would unlink ~/.codex")
@@ -270,11 +284,7 @@ def restore_account(config: Config, config_exists: bool, name: str, skip_process
         migrate._test_hook("restore-renamed")
 
     info("step=unregister {}".format(canonical))
-    new = config.copy()
-    current = new.find(canonical)
-    if current is not None:
-        del new.accounts[current.name]
-    binding.drop_account(new, canonical)
+    new = _unregistered(config, canonical)
     code = accounts.converge(config, new, config_exists=config_exists, dry_run=False,
                              orphan_scope=frozenset([canonical.casefold()]))
     if code != accounts.EXIT_OK:
@@ -288,3 +298,13 @@ def restore_account(config: Config, config_exists: bool, name: str, skip_process
     if relogin_needed:
         info("log in again: codex login")
     return accounts.EXIT_OK
+
+
+def _unregistered(config: Config, canonical: str) -> Config:
+    """注销 canonical 之后的配置：删账号与指向它的绑定。预检与真正注销必须用同一份。"""
+    new = config.copy()
+    current = new.find(canonical)
+    if current is not None:
+        del new.accounts[current.name]
+    binding.drop_account(new, canonical)
+    return new

{multi_codex-0.9.0 → multi_codex-0.10.0/src/multi_codex.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multi-codex
-Version: 0.9.0
+Version: 0.10.0
 Summary: Run several Codex CLI accounts side by side: separate CODEX_HOME directories, launchers and proxies.
 License: MIT
 Project-URL: Homepage, https://github.com/jakoes-wu/multi-codex
@@ -134,7 +134,7 @@ Without a name, the account is named after the e-mail address in `~/.codex/auth.
 | Open VS Code with an account | `multi-codex code work ~/src/project` | [VS Code and the desktop app](#vs-code-and-the-desktop-app-experimental) |
 | Open the desktop app with an account (macOS) | `multi-codex app work` | [VS Code and the desktop app](#vs-code-and-the-desktop-app-experimental) |
 | Change the account that plain `codex` and the Dock apps use | `multi-codex use work` (after `migrate-default`) | [Default account](#default-account) |
-| Always use one account inside a project | In the project directory: `multi-codex bind work`, then `multi-codex run` | [Directory bindings](#directory-bindings) |
+| Always use one account inside a project | In the project directory: `multi-codex bind work`, then `codex-auto` | [Directory bindings](#directory-bindings) |
 | Set or change an account's proxy | `multi-codex set work --proxy 7901` | [Proxy values](#proxy-values) |
 | Share `AGENTS.md`, skills and rules between accounts | Put them in `~/.codex-shared`, then run `multi-codex set work --shared` | [Shared resources](#shared-resources) |
 | Start a new account with another account's settings | `multi-codex add new --config-from work` | [Copying settings](#copying-settings-from-another-account) |
@@ -172,6 +172,7 @@ More questions are answered in the [FAQ](#faq).
 | `multi-codex doctor [--json]` | Check the installation, configuration and accounts. Read-only. |
 | `multi-codex run [NAME] [-- COMMAND ...]` | Run a command (default: `codex`) with an account's environment. Without NAME, the account bound to the current directory is used. |
 | `multi-codex bind [NAME [DIR]]` / `unbind [DIR]` | Bind a directory to an account, list bindings, or remove one. |
+| `multi-codex which [DIR]` | Show which account a directory uses (the same one `codex-auto` and `run` pick). |
 | `multi-codex code NAME [PATH] [-- ARGS]` | Open VS Code for an account (experimental). |
 | `multi-codex app NAME` | Open the Codex desktop app for an account (macOS, experimental). |
 | `multi-codex path NAME` | Print an account's directory. |
@@ -218,7 +219,7 @@ Subcommands, options and registered account names (including e-mail addresses) a
 
 ### Running other commands
 
-`multi-codex run NAME -- COMMAND ...` runs any command with exactly the environment of `codex-NAME` (`CODEX_HOME`, proxy, extra variables). Without a command it runs `codex`. Everything after the first `--` is passed through unchanged; the exit code is the command's. `multi-codex path NAME` prints the account directory.
+`multi-codex run NAME -- COMMAND ...` runs any command with exactly the environment of `codex-NAME` (`CODEX_HOME`, proxy, extra variables). Without a command it runs `codex`. Everything after the first `--` is passed through unchanged; the exit code is the command's. `multi-codex path NAME` prints the account directory. For example, to manage an account's MCP servers: `multi-codex run work -- codex mcp list`.
 
 ### Directory bindings
 
@@ -227,8 +228,12 @@ cd ~/work/project && multi-codex bind work     # this directory and everything b
 multi-codex run -- codex resume                # no account name needed here
 multi-codex bind                               # list bindings; * marks the one in effect here
 multi-codex unbind                             # remove the binding of the current directory
+codex-auto                                     # runs codex with the bound account
+multi-codex which                              # prints the account this directory uses
 ```
 
+While at least one binding exists, multi-codex generates `codex-auto` next to the other launchers. It looks up the nearest bound directory exactly like `run` and starts that account's launcher; outside any bound directory it runs plain `codex` (the default account, see [Default account](#default-account)) and says so on stderr. It is updated whenever bindings or accounts change and removed with the last binding. An account named `auto` cannot coexist with bindings: rename it first (`multi-codex rename auto NEW`).
+
 `run` without an account name walks up from the current directory and uses the nearest bound directory. Bindings are stored in `config.json` (not in your project), keyed by the real path of the directory (links resolved, the on-disk letter case used on case-insensitive file systems). `apply -f` keeps the current bindings; removing an account (`remove`, `restore`, `apply -f`) also removes its bindings. Older versions of multi-codex drop the `bindings` field on their next write.
 
 ### Copying settings from another account
@@ -241,7 +246,7 @@ multi-codex unbind                             # remove the binding of the curre
 multi-codex rename work client-a
 ```
 
-The account and its launcher get the new name (`codex-client-a`; `codex-work` is deleted), and directory bindings and the default account follow. The directory stays where it is, so the login, sessions and shared links are kept; `config.json` records it as `"dir": "work"` (in `list --json`, `dir` is the full path instead). A name that is still used as another account's directory, such as `work` after this rename, cannot be given to a new account. Renaming only the letter case is not supported. Before downgrading to a version older than 0.9, rename the account back: older versions ignore `dir` and would use `<root>/client-a`.
+The account and its launcher get the new name (`codex-client-a`; `codex-work` is deleted), and directory bindings, `codex-auto` and the default account follow. The directory stays where it is, so the login, sessions and shared links are kept; `config.json` records it as `"dir": "work"` (in `list --json`, `dir` is the full path instead). A name that is still used as another account's directory, such as `work` after this rename, cannot be given to a new account. Renaming only the letter case is not supported. Before downgrading to a version older than 0.9, rename the account back: older versions ignore `dir` and would use `<root>/client-a`.
 
 ### Per-account environment variables
 
@@ -492,7 +497,7 @@ The tool goes to `~/.local/share/multi-codex` and the `multi-codex` command to `
 curl -fsSL https://raw.githubusercontent.com/jakoes-wu/multi-codex/main/install.sh | sh -s -- --uninstall    # without a clone
 ```
 
-This removes the tool only. Your configuration, account directories and `codex-<name>` launchers stay; the launchers keep working because they do not depend on multi-codex.
+This removes the tool only. Your configuration, account directories, `codex-<name>` launchers and `codex-auto` stay; they keep working because they do not depend on multi-codex.
 
 ## Contributing
 

{multi_codex-0.9.0 → multi_codex-0.10.0}/src/multi_codex.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ src/multi_codex/launcher.py
 src/multi_codex/lock.py
 src/multi_codex/migrate.py
 src/multi_codex/platform.py
+src/multi_codex/router.py
 src/multi_codex/shared.py
 src/multi_codex/shellpath.py
 src/multi_codex/switch.py
@@ -41,4 +42,5 @@ tests/test_migrate.py
 tests/test_onboarding.py
 tests/test_onboarding_commands.py
 tests/test_platform.py
+tests/test_router.py
 tests/test_switch.py

multi_codex-0.10.0/tests/test_router.py

@@ -0,0 +1,370 @@
+"""feature-auto-launcher §8：codex-auto 入口与 which。"""
+
+import json
+import os
+import shutil
+import subprocess
+import sys
+import unittest
+
+from helpers import SRC, CliTestCase
+from test_binding import case_insensitive
+
+sys.path.insert(0, SRC)
+from multi_codex import cli, completion, router  # noqa: E402
+
+
+class RouterBase(CliTestCase):
+    def setUp(self):
+        super().setUp()
+        self.auto = os.path.join(self.bin, "codex-auto")
+        self.projects = os.path.join(self.tmp, "p")
+        os.makedirs(self.projects)
+
+    def project(self, *parts):
+        path = os.path.join(self.projects, *parts)
+        os.makedirs(path, exist_ok=True)
+        return path
+
+    def config(self):
+        with open(os.path.join(self.state, "config.json")) as handle:
+            return json.load(handle)
+
+    def write_config(self, data):
+        with open(os.path.join(self.state, "config.json"), "w") as handle:
+            json.dump(data, handle)
+
+    def run_auto(self, cwd, *args, env=None):
+        """在 cwd 运行 codex-auto，返回 (退出码, stderr, 假 codex 看到的环境或 None)。"""
+        full_env = dict(self.env)
+        full_env.update(env or {})
+        for suffix in (".args", ".env"):
+            if os.path.exists(self.fake_out + suffix):
+                os.unlink(self.fake_out + suffix)
+        proc = subprocess.run([self.auto] + list(args), cwd=cwd, env=full_env, stdout=subprocess.PIPE,
+                              stderr=subprocess.PIPE, universal_newlines=True)
+        seen = None
+        if os.path.exists(self.fake_out + ".env"):
+            seen = {}
+            with open(self.fake_out + ".env") as handle:
+                for line in handle.read().splitlines():
+                    if "=" in line:
+                        key, value = line.split("=", 1)
+                        seen[key] = value
+        return proc.returncode, proc.stderr, seen
+
+    def account_of(self, seen):
+        """从假 codex 看到的 CODEX_HOME 反推账号名；没有 CODEX_HOME 表示普通 codex。"""
+        if seen is None or "CODEX_HOME" not in seen:
+            return None
+        return os.path.basename(seen["CODEX_HOME"])
+
+    def run_choice(self, cwd):
+        """`run` 省略账号名时选中的账号，或 None（没有绑定 / 报错）。"""
+        result = self.run_cli("run", "--", "codex", cwd=cwd)
+        if result.code != 0:
+            return None
+        with open(self.fake_out + ".env") as handle:
+            for line in handle.read().splitlines():
+                if line.startswith("CODEX_HOME="):
+                    return os.path.basename(line.split("=", 1)[1])
+        return None
+
+
+class GenerateTest(RouterBase):
+    """T1、T2、T9、T12、T13、T14。"""
+
+    def test_lifecycle(self):
+        self.ok("add", "work")
+        self.assertFalse(os.path.lexists(self.auto))
+        result = self.ok("bind", "work", self.project("a"))
+        self.assertIn("create launcher ~/.local/bin/codex-auto", result.out)
+        self.assertTrue(router.is_router(self.auto))
+        self.assertEqual(os.stat(self.auto).st_mode & 0o777, 0o755)
+        self.assertIn("already up to date", self.ok("apply").out)
+        result = self.ok("unbind", self.project("a"))
+        self.assertIn("no directory bindings", result.out)
+        self.assertFalse(os.path.lexists(self.auto))
+
+    def test_bin_dir_change(self):
+        self.ok("add", "work")
+        self.ok("bind", "work", self.project("a"))
+        new_bin = os.path.join(self.home, "bin2")
+        self.ok("init", "--bin-dir", new_bin)
+        self.assertFalse(os.path.lexists(self.auto))
+        self.assertTrue(router.is_router(os.path.join(new_bin, "codex-auto")))
+
+    def test_doctor_drift(self):
+        self.ok("add", "work")
+        self.ok("bind", "work", self.project("a"))
+        os.unlink(self.auto)
+        report = json.loads(self.run_cli("doctor", "--json").out)
+        drift = next(item for item in report["checks"] if item["id"] == "drift")
+        self.assertNotEqual(drift["status"], "ok")
+        self.ok("apply")
+        report = json.loads(self.run_cli("doctor", "--json").out)
+        drift = next(item for item in report["checks"] if item["id"] == "drift")
+        self.assertEqual(drift["status"], "ok")
+
+    def test_user_file_is_a_conflict(self):
+        self.ok("add", "work")
+        self.write(self.auto, "#!/bin/sh\necho mine\n", 0o755)
+        before = self.snapshot()
+        result = self.run_cli("bind", "work", self.project("a"))
+        self.assertEqual(result.code, 3, result)
+        self.assertIn("not the multi-codex router", result.err)
+        self.assertEqual(self.snapshot(), before)
+
+    @unittest.skipUnless(shutil.which("shellcheck"), "shellcheck is not installed")
+    def test_shellcheck(self):
+        self.ok("add", "work")
+        self.ok("add", "home")
+        self.ok("bind", "work", self.project("a"))
+        self.ok("bind", "home", self.project("a", "sub dir"))
+        self.ok("bind", "home", "/")
+        data = self.config()
+        data["bindings"][self.project("gone")] = "gone"
+        self.write_config(data)
+        self.ok("apply")
+        proc = subprocess.run(["shellcheck", self.auto], stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+                              universal_newlines=True)
+        self.assertEqual(proc.returncode, 0, proc.stdout)
+
+
+class MatchTest(RouterBase):
+    """T3–T8：选账号的规则与 run 一致。"""
+
+    def setUp(self):
+        super().setUp()
+        self.ok("add", "work")
+        self.ok("add", "home")
+
+    def test_choose_like_run(self):
+        top = self.project("a")
+        sub = self.project("a", "sub")
+        self.ok("bind", "work", top)
+        self.ok("bind", "home", sub)
+        cases = ((top, "work"), (self.project("a", "other"), "work"), (sub, "home"),
+                 (self.project("a", "sub", "deeper"), "home"))
+        for cwd, expected in cases:
+            with self.subTest(cwd=cwd):
+                code, _, seen = self.run_auto(cwd, "x", env={"CODEX_API_KEY": "leak"})
+                self.assertEqual(code, 0)
+                self.assertEqual(self.account_of(seen), expected)
+                self.assertNotIn("CODEX_API_KEY", seen)  # 经账号启动命令，隔离变量被清除
+                self.assertEqual(self.run_choice(cwd), expected)
+
+    def test_unbound_runs_plain_codex(self):
+        self.ok("bind", "work", self.project("a"))
+        code, err, seen = self.run_auto(self.project("b"), "x")
+        self.assertEqual(code, 0)
+        self.assertIsNone(self.account_of(seen))
+        self.assertIn("no account is bound to", err)
+        self.assertIn("default account", err)
+
+    def test_special_names(self):
+        names = ("with space", "it's", "中文", "a*", "a?b", "[x]")
+        for name in names:
+            self.ok("bind", "work", self.project(name))
+        for name in names:
+            with self.subTest(name=name):
+                self.assertEqual(self.account_of(self.run_auto(self.project(name))[2]), "work")
+        for sibling in ("ab", "axb", "x"):
+            with self.subTest(sibling=sibling):
+                self.assertIsNone(self.account_of(self.run_auto(self.project(sibling))[2]))
+
+    def test_root_binding(self):
+        self.ok("bind", "home", "/")
+        self.ok("bind", "work", self.project("a"))
+        self.assertEqual(self.account_of(self.run_auto(self.project("a", "x"))[2]), "work")
+        self.assertEqual(self.account_of(self.run_auto(self.project("b"))[2]), "home")
+
+    def test_symlink(self):
+        real = self.project("real")
+        self.ok("bind", "work", real)
+        link = os.path.join(self.tmp, "lnk")
+        os.symlink(real, link)
+        self.assertEqual(self.account_of(self.run_auto(link)[2]), "work")
+
+    def test_case_insensitive_cd(self):
+        if not case_insensitive(self.projects):
+            self.skipTest("the file system is case-sensitive")
+        real = self.project("CaseDir")
+        self.ok("bind", "work", real)
+        typed = os.path.join(self.projects, "casedir")
+        # 用 /bin/sh -c 'cd 小写写法 && codex-auto'，模拟用户在 shell 里换了大小写 cd 进来。
+        proc = subprocess.run(["/bin/sh", "-c", 'cd "$1" && exec "$2"', "sh", typed, self.auto], env=self.env,
+                              stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
+        self.assertEqual(proc.returncode, 0, proc.stderr)
+        with open(self.fake_out + ".env") as handle:
+            self.assertIn("CODEX_HOME=" + os.path.join(self.root, "work"), handle.read())
+
+    def test_stale_binding(self):
+        self.ok("bind", "work", self.project("a"))
+        data = self.config()
+        data["bindings"][os.path.realpath(self.project("a", "sub"))] = "gone"
+        self.write_config(data)
+        self.ok("apply")
+        code, err, seen = self.run_auto(self.project("a", "sub"))
+        self.assertEqual(code, 1)
+        self.assertIn("is not registered", err)
+        self.assertIn("multi-codex unbind", err)
+        self.assertIsNone(seen)
+        self.assertEqual(self.run_cli("run", "--", "codex", cwd=self.project("a", "sub")).code, 1)
+
+    def test_missing_launcher(self):
+        self.ok("bind", "work", self.project("a"))
+        os.unlink(os.path.join(self.bin, "codex-work"))
+        code, err, _ = self.run_auto(self.project("a"))
+        self.assertEqual(code, 1)
+        self.assertIn("is missing", err)
+
+
+class AutoAccountTest(RouterBase):
+    """T10–T10f：名为 auto 的账号与入口。"""
+
+    def setUp(self):
+        super().setUp()
+        self.ok("add", "work")
+
+    def test_conflicts(self):
+        self.ok("add", "auto")
+        before = self.snapshot()
+        result = self.run_cli("bind", "work", self.project("a"))
+        self.assertEqual(result.code, 3, result)
+        self.assertIn("multi-codex rename auto", result.err)
+        self.assertEqual(self.snapshot(), before)
+        self.ok("remove", "auto")
+        self.ok("bind", "work", self.project("a"))
+        before = self.snapshot()
+        self.assertEqual(self.run_cli("add", "auto").code, 3)
+        self.assertEqual(self.snapshot(), before)
+
+    def auto_with_binding(self, name="auto"):
+        """手写配置造出“账号 auto + 绑定”：正常命令不允许这种组合。"""
+        self.ok("add", name)
+        data = self.config()
+        data.setdefault("bindings", {})[os.path.realpath(self.project("a"))] = "work"
+        self.write_config(data)
+
+    def test_rename_remove_restore_auto(self):
+        for command in (("rename", "auto", "x"), ("remove", "auto")):
+            with self.subTest(command=command):
+                self.auto_with_binding()
+                self.ok(*command)
+                self.assertTrue(router.is_router(self.auto))
+                self.assertEqual(self.account_of(self.run_auto(self.project("a"))[2]), "work")
+                # 复位：删掉绑定、清理改名后的账号
+                self.ok("unbind", self.project("a"))
+                if command[0] == "rename":
+                    self.ok("remove", "x")
+        self.auto_with_binding()
+        self.ok("use", "auto")
+        self.ok("restore", "auto")
+        self.assertTrue(router.is_router(self.auto))
+
+    def test_restore_other_account_is_refused_before_moving(self):
+        # 绑定指向第三个账号 home：restore work 之后仍有绑定，名为 auto 的账号与入口冲突。
+        self.ok("add", "home")
+        self.ok("add", "auto")
+        data = self.config()
+        data.setdefault("bindings", {})[os.path.realpath(self.project("a"))] = "home"
+        self.write_config(data)
+        self.ok("use", "work")
+        link = os.path.join(self.home, ".codex")
+        result = self.run_cli("restore", "work")
+        self.assertEqual(result.code, 3, result)
+        self.assertIn("nothing was moved", result.err)
+        self.assertTrue(os.path.islink(link))
+        self.assertTrue(os.path.isdir(os.path.join(self.root, "work")))
+        self.assertFalse(os.path.exists(os.path.join(self.state, "restore-journal.json")))
+
+    def test_case_variant_on_case_insensitive_fs(self):
+        if not case_insensitive(self.bin if os.path.isdir(self.bin) else self.tmp):
+            self.skipTest("the file system is case-sensitive")
+        self.auto_with_binding("Auto")
+        self.ok("rename", "Auto", "x")
+        self.assertTrue(router.is_router(self.auto))
+
+
+class FollowTest(RouterBase):
+    """T10d、T10e：rename、remove、apply -f、add 让入口跟着变。"""
+
+    def setUp(self):
+        super().setUp()
+        self.ok("add", "work")
+        self.ok("bind", "work", self.project("a"))
+
+    def test_rename_updates_target(self):
+        result = self.ok("rename", "work", "job")
+        self.assertIn("update launcher ~/.local/bin/codex-auto", result.out)
+        with open(self.auto) as handle:
+            self.assertIn("codex-job", handle.read())
+        self.assertEqual(self.account_of(self.run_auto(self.project("a"))[2]), "work")  # 目录名仍是 work
+        self.assertEqual(self.run_choice(self.project("a")), "work")
+
+    def test_remove_and_apply_file(self):
+        self.ok("remove", "work")
+        self.assertFalse(os.path.lexists(self.auto))
+        self.ok("add", "work")
+        self.ok("bind", "work", self.project("a"))
+        data = self.config()
+        del data["accounts"]["work"]
+        path = os.path.join(self.tmp, "accounts.json")
+        self.write(path, json.dumps(data))
+        self.ok("apply", "-f", path)
+        self.assertFalse(os.path.lexists(self.auto))
+
+    def test_add_makes_stale_binding_valid(self):
+        data = self.config()
+        data["bindings"][os.path.realpath(self.project("b"))] = "home"
+        self.write_config(data)
+        self.ok("apply")
+        self.assertEqual(self.run_auto(self.project("b"))[0], 1)
+        self.ok("add", "home")
+        self.assertEqual(self.account_of(self.run_auto(self.project("b"))[2]), "home")
+
+
+class WhichTest(RouterBase):
+    """T15。"""
+
+    def setUp(self):
+        super().setUp()
+        self.ok("add", "work")
+        self.ok("bind", "work", self.project("a"))
+
+    def test_bound(self):
+        result = self.ok("which", self.project("a", "deep"))
+        self.assertEqual(result.out, "work\n")
+        self.assertIn("bound to", result.err)
+        result = self.ok("which", cwd=self.project("a"))
+        self.assertEqual(result.out, "work\n")
+
+    def test_unbound(self):
+        result = self.ok("which", self.project("b"))
+        self.assertEqual(result.out, self.ok("use").out)
+        self.assertIn("no binding for", result.err)
+        result = self.ok("which", self.project("b"), env={"CODEX_HOME": "/somewhere"})
+        self.assertIn("CODEX_HOME is set", result.err)
+
+    def test_errors(self):
+        data = self.config()
+        data["bindings"][os.path.realpath(self.project("c"))] = "gone"
+        self.write_config(data)
+        result = self.run_cli("which", self.project("c"))
+        self.assertEqual(result.code, 1, result)
+        self.assertIn("is not registered", result.err)
+        self.assertEqual(self.run_cli("which", os.path.join(self.tmp, "nope")).code, 1)
+
+
+class HelpTest(unittest.TestCase):
+    """T17。"""
+
+    def test_help_and_completion(self):
+        everyday = dict(cli.COMMAND_GROUPS)["Everyday"]
+        self.assertIn("which", [name for name, _ in everyday])
+        self.assertIn("which", completion.command_spec(cli.build_parser()))
+
+
+if __name__ == "__main__":
+    unittest.main()

{multi_codex-0.9.0 → multi_codex-0.10.0}/tests/test_switch.py

@@ -228,15 +228,32 @@ class RestoreTest(SwitchBase):
         self.write(self.marker(), json.dumps(data))
         self.assertEqual(self.run_cli("restore", "a").code, 3)
 
-    def test_unregister_failure_keeps_marker(self):
-        # b 的启动命令被换成不受管的文件：converge 判冲突，第 3 步失败。
+    def test_conflict_is_found_before_moving(self):
+        # b 的启动命令被换成不受管的文件：注销时的收敛会冲突。v0.10 起在动数据之前预检（feature-auto-launcher
+        # §5.1.4），所以什么都不动、不留标记。
         launcher_b = os.path.join(self.bin, "codex-b")
         os.unlink(launcher_b)
         self.write(launcher_b, "#!/bin/sh\n", 0o755)
+        before = self.tree(self.dir_of("a"))
         result = self.run_cli("restore", "a")
         self.assertEqual(result.code, 3, result)
-        self.assertTrue(os.path.exists(self.marker()))
+        self.assertIn("nothing was moved", result.err)
+        self.assertFalse(os.path.exists(self.marker()))
+        self.assertTrue(os.path.islink(self.link))
+        self.assertEqual(self.tree(self.dir_of("a")), before)
         os.unlink(launcher_b)
+        self.ok("restore", "a")
+        self.assert_restored()
+
+    @unittest.skipIf(os.geteuid() == 0, "root ignores directory permissions")
+    def test_unregister_failure_keeps_marker(self):
+        # 预检查不出的失败：启动命令目录不可写，删除 codex-a 时 OSError，第 3 步失败，保留标记。
+        os.chmod(self.bin, 0o555)
+        self.addCleanup(os.chmod, self.bin, 0o755)
+        result = self.run_cli("restore", "a")
+        self.assertEqual(result.code, 1, result)
+        self.assertTrue(os.path.exists(self.marker()))
+        os.chmod(self.bin, 0o755)
         self.assertIn("from state C", self.ok("restore", "a").out)
         self.assertFalse(os.path.exists(self.marker()))