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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multi-codex
-Version: 0.8.0
+Version: 0.9.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
@@ -142,6 +142,7 @@ Without a name, the account is named after the e-mail address in `~/.codex/auth.
 | Set up all accounts on a new machine | `curl -fsSL https://raw.githubusercontent.com/jakoes-wu/multi-codex/main/install.sh \| sh -s -- --config accounts.json` | [Declarative setup](#declarative-setup-with-apply) |
 | Get tab completion | `eval "$(multi-codex completion zsh)"` | [Shell completion](#shell-completion) |
 | See what a command would change | add `--dry-run` | [Commands](#commands) |
+| Rename an account | `multi-codex rename work client-a` (the directory and login stay) | [Renaming accounts](#renaming-accounts) |
 | Remove an account | `multi-codex remove work` (the directory is kept) | [Commands](#commands) |
 
 More questions are answered in the [FAQ](#faq).
@@ -159,8 +160,9 @@ More questions are answered in the [FAQ](#faq).
 | ---- | ---- |
 | `multi-codex init [--root DIR] [--bin-dir DIR] [--shared-dir DIR] [--shared-items A,B]` | Create or change global settings. |
 | `multi-codex migrate-default [NAME] [--source DIR] [--copy] [--keep-backup] [--proxy P] [--skip-process-check] [--accept-relogin]` | Turn the default directory into an account. Without NAME, the e-mail address in its `auth.json` is used. |
-| `multi-codex add NAME [--proxy P] [--shared [DIR] \| --no-shared] [--adopt] [--config-from OTHER]` | Add an account, adopt an existing directory, or change its options. `--config-from` copies `config.toml` from another account once. |
-| `multi-codex set NAME [--proxy P] [--shared [DIR] \| --no-shared] [--adopt] [--config-from OTHER]` | Change an existing account; same options as `add`, but never creates one. |
+| `multi-codex add NAME [--proxy P] [--shared [DIR] \| --no-shared] [--shared-exclude ITEM] [--shared-include ITEM] [--adopt] [--config-from OTHER]` | Add an account, adopt an existing directory, or change its options. `--config-from` copies `config.toml` from another account once. |
+| `multi-codex set NAME [same options as add]` | Change an existing account; same options as `add`, but never creates one. |
+| `multi-codex rename OLD NEW` | Rename an account and its launcher; the directory, login and links stay. |
 | `multi-codex login NAME [-- ARGS]` | Run `codex login` with an account's environment; arguments after `--` go to `codex login`. Does not need `~/.local/bin` on `PATH`. |
 | `multi-codex proxy NAME PORT\|URL\|off\|inherit` | Set an account's proxy. |
 | `multi-codex remove NAME` | Unregister an account and delete its launcher. **The account directory is kept.** |
@@ -178,7 +180,7 @@ More questions are answered in the [FAQ](#faq).
 | `multi-codex restore NAME [--skip-process-check] [--accept-relogin]` | Undo `migrate-default`: move the account back to `~/.codex`. |
 | `multi-codex completion bash\|zsh\|fish` | Print a shell completion script. |
 
-Every write command accepts `--dry-run`. `init`, `add`, `set`, `proxy`, `remove`, `apply`, `bind`, `unbind` and `env` print only the items they change (or `already up to date`); `-v` / `--verbose` also prints unchanged items. For `list`, `-v` means the full table instead. `list`, `usage` and `doctor` never change anything; with `--json` they print a single JSON object on stdout (with a `"version": 1` field) and keep warnings on stderr. Use `--json` in scripts: the table layout is not guaranteed to stay the same.
+Every write command accepts `--dry-run`. `init`, `add`, `set`, `rename`, `proxy`, `remove`, `apply`, `bind`, `unbind` and `env` print only the items they change (or `already up to date`); `-v` / `--verbose` also prints unchanged items. For `list`, `-v` means the full table instead. `list`, `usage` and `doctor` never change anything; with `--json` they print a single JSON object on stdout (with a `"version": 1` field) and keep warnings on stderr. Use `--json` in scripts: the table layout is not guaranteed to stay the same.
 
 ### Login and usage
 
@@ -233,6 +235,14 @@ multi-codex unbind                             # remove the binding of the curre
 
 `multi-codex add new --config-from work` copies `config.toml` from `work` into `new` once; afterwards the two files are independent. An existing `config.toml` with different content is a conflict (nothing is written), and so is copying into an account that shares `config.toml`. The copy includes everything in the file, such as `cli_auth_credentials_store` or absolute paths that point into the other account.
 
+### Renaming accounts
+
+```sh
+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`.
+
 ### Per-account environment variables
 
 ```sh
@@ -242,6 +252,8 @@ multi-codex env work --unset TERM_PROGRAM
 multi-codex env work --clear
 ```
 
+Launchers (and `run`, `login`, `code` and `usage --live`, which use the same environment) clear `CODEX_API_KEY`, `CODEX_ACCESS_TOKEN` and `CODEX_SQLITE_HOME` inherited from your shell, so one exported API key or database location does not leak into every account. An account that needs an API key sets it here, for example `multi-codex env work CODEX_API_KEY=sk-…`; per-account variables are applied after the clearing.
+
 The variables are stored in `config.json` (`accounts.<name>.env`) and written into the launcher. Values are used literally (no `$VAR` expansion). `CODEX_HOME` and the proxy variables are reserved: use `multi-codex proxy` for proxies. A launcher with environment variables is readable only by you (mode 0700), and `list --json` shows only the variable names; still, the values are stored in plain text, so do not put secrets there that need stronger protection. Older versions of multi-codex ignore the `env` field and drop it on their next write; run `multi-codex env NAME --clear` before downgrading.
 
 ### VS Code and the desktop app (experimental)
@@ -327,7 +339,7 @@ Progress is recorded in `~/.config/multi-codex/migrate-journal.json`. If the mig
 
 Sockets and FIFOs (runtime files such as `ipc.sock`) are not copied in copy mode. On macOS, copy mode does not preserve extended attributes.
 
-If `CODEX_HOME`, `CODEX_SQLITE_HOME`, `CODEX_API_KEY` or `CODEX_ACCESS_TOKEN` is set in your environment, multi-codex warns you: these variables override or bypass per-account isolation.
+If `CODEX_HOME`, `CODEX_SQLITE_HOME`, `CODEX_API_KEY` or `CODEX_ACCESS_TOKEN` is set in your environment, multi-codex warns you: launchers set or clear them, but plain `codex` still uses them.
 
 ### Undoing a migration
 
@@ -361,6 +373,10 @@ multi-codex creates the missing links and remembers which links it created. Turn
 
 If you already linked an account to the shared directory by hand, `multi-codex set NAME --shared --adopt` takes those links over without recreating them: from then on, turning sharing off removes them as well. Only links that already point to the matching shared item are adopted.
 
+One account can opt out of some shared items: `multi-codex set work --shared-exclude skills` removes the `skills` link multi-codex created in `work` (as if sharing were off for that item) and no longer creates it; `--shared-include skills` undoes that. Both options can be repeated, names match `shared.items` exactly, and `list` shows the exclusions as `yes (not: skills)`. To exclude `config.toml` and then copy another account's settings into it, run `--shared-exclude config.toml` and `--config-from` as two separate commands.
+
+Items that hold one account's own state can never be shared: `shared.items` must not contain the entries marked "No" in the table below. A configuration that lists one fails to load and names the item; remove it from `config.json`.
+
 ### What can be shared
 
 Based on the Codex source code (openai/codex at `6b4daafd`):
@@ -375,7 +391,7 @@ Based on the Codex source code (openai/codex at `6b4daafd`):
 | `history.jsonl` | Prompt history | Yes | Reads and writes are file-locked; the histories of the accounts are merged. |
 | `auth.json`, `secrets/`, `.credentials.json`, `.env` | Credentials | **No** | They are the account. |
 | `installation_id` | Installation identifier | No | Sent with requests; sharing makes several accounts look like one installation. |
-| `*.sqlite` (`state_5.sqlite`, …) | Threads, logs, memories | **No** | `state_5.sqlite` records account IDs. |
+| `*.sqlite`, `*.sqlite-wal`, `*.sqlite-shm` (`state_5.sqlite`, …), `sqlite/` | Threads, logs, memories | **No** | `state_5.sqlite` records account IDs. |
 | `sessions/`, `archived_sessions/`, `session_index.jsonl` | Session logs | No | The index has only an in-process lock; sessions record the account that created them. |
 | `models_cache.json`, `cache/` | Caches | Not needed | Keyed by the account; a mismatch is a cache miss. |
 | `app-server-control/`, `app-server-daemon/`, `packages/`, `tmp/`, `.tmp/`, `log/`, `shell_snapshots/` | Runtime state | No | Per process or per session. |
@@ -438,8 +454,11 @@ Run the installer again; configuration, accounts and launchers are not touched:
 ```sh
 curl -fsSL https://raw.githubusercontent.com/jakoes-wu/multi-codex/main/install.sh | sh
 multi-codex --version
+multi-codex apply      # after upgrading from 0.8 or older: rewrites the launchers
 ```
 
+0.9 changed what the launchers contain. Until `multi-codex apply` (or any other write command) rewrites them, `list` shows `launcher stale` and `usage --live` refuses to run; the old launchers keep working.
+
 ## Exit codes
 
 | Code | Meaning |

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

@@ -118,6 +118,7 @@ Without a name, the account is named after the e-mail address in `~/.codex/auth.
 | Set up all accounts on a new machine | `curl -fsSL https://raw.githubusercontent.com/jakoes-wu/multi-codex/main/install.sh \| sh -s -- --config accounts.json` | [Declarative setup](#declarative-setup-with-apply) |
 | Get tab completion | `eval "$(multi-codex completion zsh)"` | [Shell completion](#shell-completion) |
 | See what a command would change | add `--dry-run` | [Commands](#commands) |
+| Rename an account | `multi-codex rename work client-a` (the directory and login stay) | [Renaming accounts](#renaming-accounts) |
 | Remove an account | `multi-codex remove work` (the directory is kept) | [Commands](#commands) |
 
 More questions are answered in the [FAQ](#faq).
@@ -135,8 +136,9 @@ More questions are answered in the [FAQ](#faq).
 | ---- | ---- |
 | `multi-codex init [--root DIR] [--bin-dir DIR] [--shared-dir DIR] [--shared-items A,B]` | Create or change global settings. |
 | `multi-codex migrate-default [NAME] [--source DIR] [--copy] [--keep-backup] [--proxy P] [--skip-process-check] [--accept-relogin]` | Turn the default directory into an account. Without NAME, the e-mail address in its `auth.json` is used. |
-| `multi-codex add NAME [--proxy P] [--shared [DIR] \| --no-shared] [--adopt] [--config-from OTHER]` | Add an account, adopt an existing directory, or change its options. `--config-from` copies `config.toml` from another account once. |
-| `multi-codex set NAME [--proxy P] [--shared [DIR] \| --no-shared] [--adopt] [--config-from OTHER]` | Change an existing account; same options as `add`, but never creates one. |
+| `multi-codex add NAME [--proxy P] [--shared [DIR] \| --no-shared] [--shared-exclude ITEM] [--shared-include ITEM] [--adopt] [--config-from OTHER]` | Add an account, adopt an existing directory, or change its options. `--config-from` copies `config.toml` from another account once. |
+| `multi-codex set NAME [same options as add]` | Change an existing account; same options as `add`, but never creates one. |
+| `multi-codex rename OLD NEW` | Rename an account and its launcher; the directory, login and links stay. |
 | `multi-codex login NAME [-- ARGS]` | Run `codex login` with an account's environment; arguments after `--` go to `codex login`. Does not need `~/.local/bin` on `PATH`. |
 | `multi-codex proxy NAME PORT\|URL\|off\|inherit` | Set an account's proxy. |
 | `multi-codex remove NAME` | Unregister an account and delete its launcher. **The account directory is kept.** |
@@ -154,7 +156,7 @@ More questions are answered in the [FAQ](#faq).
 | `multi-codex restore NAME [--skip-process-check] [--accept-relogin]` | Undo `migrate-default`: move the account back to `~/.codex`. |
 | `multi-codex completion bash\|zsh\|fish` | Print a shell completion script. |
 
-Every write command accepts `--dry-run`. `init`, `add`, `set`, `proxy`, `remove`, `apply`, `bind`, `unbind` and `env` print only the items they change (or `already up to date`); `-v` / `--verbose` also prints unchanged items. For `list`, `-v` means the full table instead. `list`, `usage` and `doctor` never change anything; with `--json` they print a single JSON object on stdout (with a `"version": 1` field) and keep warnings on stderr. Use `--json` in scripts: the table layout is not guaranteed to stay the same.
+Every write command accepts `--dry-run`. `init`, `add`, `set`, `rename`, `proxy`, `remove`, `apply`, `bind`, `unbind` and `env` print only the items they change (or `already up to date`); `-v` / `--verbose` also prints unchanged items. For `list`, `-v` means the full table instead. `list`, `usage` and `doctor` never change anything; with `--json` they print a single JSON object on stdout (with a `"version": 1` field) and keep warnings on stderr. Use `--json` in scripts: the table layout is not guaranteed to stay the same.
 
 ### Login and usage
 
@@ -209,6 +211,14 @@ multi-codex unbind                             # remove the binding of the curre
 
 `multi-codex add new --config-from work` copies `config.toml` from `work` into `new` once; afterwards the two files are independent. An existing `config.toml` with different content is a conflict (nothing is written), and so is copying into an account that shares `config.toml`. The copy includes everything in the file, such as `cli_auth_credentials_store` or absolute paths that point into the other account.
 
+### Renaming accounts
+
+```sh
+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`.
+
 ### Per-account environment variables
 
 ```sh
@@ -218,6 +228,8 @@ multi-codex env work --unset TERM_PROGRAM
 multi-codex env work --clear
 ```
 
+Launchers (and `run`, `login`, `code` and `usage --live`, which use the same environment) clear `CODEX_API_KEY`, `CODEX_ACCESS_TOKEN` and `CODEX_SQLITE_HOME` inherited from your shell, so one exported API key or database location does not leak into every account. An account that needs an API key sets it here, for example `multi-codex env work CODEX_API_KEY=sk-…`; per-account variables are applied after the clearing.
+
 The variables are stored in `config.json` (`accounts.<name>.env`) and written into the launcher. Values are used literally (no `$VAR` expansion). `CODEX_HOME` and the proxy variables are reserved: use `multi-codex proxy` for proxies. A launcher with environment variables is readable only by you (mode 0700), and `list --json` shows only the variable names; still, the values are stored in plain text, so do not put secrets there that need stronger protection. Older versions of multi-codex ignore the `env` field and drop it on their next write; run `multi-codex env NAME --clear` before downgrading.
 
 ### VS Code and the desktop app (experimental)
@@ -303,7 +315,7 @@ Progress is recorded in `~/.config/multi-codex/migrate-journal.json`. If the mig
 
 Sockets and FIFOs (runtime files such as `ipc.sock`) are not copied in copy mode. On macOS, copy mode does not preserve extended attributes.
 
-If `CODEX_HOME`, `CODEX_SQLITE_HOME`, `CODEX_API_KEY` or `CODEX_ACCESS_TOKEN` is set in your environment, multi-codex warns you: these variables override or bypass per-account isolation.
+If `CODEX_HOME`, `CODEX_SQLITE_HOME`, `CODEX_API_KEY` or `CODEX_ACCESS_TOKEN` is set in your environment, multi-codex warns you: launchers set or clear them, but plain `codex` still uses them.
 
 ### Undoing a migration
 
@@ -337,6 +349,10 @@ multi-codex creates the missing links and remembers which links it created. Turn
 
 If you already linked an account to the shared directory by hand, `multi-codex set NAME --shared --adopt` takes those links over without recreating them: from then on, turning sharing off removes them as well. Only links that already point to the matching shared item are adopted.
 
+One account can opt out of some shared items: `multi-codex set work --shared-exclude skills` removes the `skills` link multi-codex created in `work` (as if sharing were off for that item) and no longer creates it; `--shared-include skills` undoes that. Both options can be repeated, names match `shared.items` exactly, and `list` shows the exclusions as `yes (not: skills)`. To exclude `config.toml` and then copy another account's settings into it, run `--shared-exclude config.toml` and `--config-from` as two separate commands.
+
+Items that hold one account's own state can never be shared: `shared.items` must not contain the entries marked "No" in the table below. A configuration that lists one fails to load and names the item; remove it from `config.json`.
+
 ### What can be shared
 
 Based on the Codex source code (openai/codex at `6b4daafd`):
@@ -351,7 +367,7 @@ Based on the Codex source code (openai/codex at `6b4daafd`):
 | `history.jsonl` | Prompt history | Yes | Reads and writes are file-locked; the histories of the accounts are merged. |
 | `auth.json`, `secrets/`, `.credentials.json`, `.env` | Credentials | **No** | They are the account. |
 | `installation_id` | Installation identifier | No | Sent with requests; sharing makes several accounts look like one installation. |
-| `*.sqlite` (`state_5.sqlite`, …) | Threads, logs, memories | **No** | `state_5.sqlite` records account IDs. |
+| `*.sqlite`, `*.sqlite-wal`, `*.sqlite-shm` (`state_5.sqlite`, …), `sqlite/` | Threads, logs, memories | **No** | `state_5.sqlite` records account IDs. |
 | `sessions/`, `archived_sessions/`, `session_index.jsonl` | Session logs | No | The index has only an in-process lock; sessions record the account that created them. |
 | `models_cache.json`, `cache/` | Caches | Not needed | Keyed by the account; a mismatch is a cache miss. |
 | `app-server-control/`, `app-server-daemon/`, `packages/`, `tmp/`, `.tmp/`, `log/`, `shell_snapshots/` | Runtime state | No | Per process or per session. |
@@ -414,8 +430,11 @@ Run the installer again; configuration, accounts and launchers are not touched:
 ```sh
 curl -fsSL https://raw.githubusercontent.com/jakoes-wu/multi-codex/main/install.sh | sh
 multi-codex --version
+multi-codex apply      # after upgrading from 0.8 or older: rewrites the launchers
 ```
 
+0.9 changed what the launchers contain. Until `multi-codex apply` (or any other write command) rewrites them, `list` shows `launcher stale` and `usage --live` refuses to run; the old launchers keep working.
+
 ## Exit codes
 
 | Code | Meaning |

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

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

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

@@ -32,7 +32,27 @@ NO_ORPHANS: FrozenSet[str] = frozenset()
 
 
 def account_dir(config: Config, name: str) -> str:
-    return os.path.join(expand(config.root), name)
+    """账号目录。用账号记录的目录名（rename 后与账号名不同）；未登记的名字按名字本身拼。"""
+    account = config.find(name)
+    return os.path.join(expand(config.root), account.dir_name if account is not None else name)
+
+
+def dir_conflicts(config: Config) -> List[str]:
+    """两个账号会落到同一个目录时的说明文字（规则同 config._check_dir_names）。
+
+    parse_config 只检查读入的文件；这里检查命令算出的新配置，典型是 rename work job 之后 add work。
+    """
+    problems = []
+    for account in config.accounts.values():
+        for other in config.accounts.values():
+            if other is account:
+                continue
+            if account.dir_name.casefold() == other.dir_name.casefold() or \
+                    account.name.casefold() == other.dir_name.casefold():
+                problems.append("account {!r} would use the directory of account {!r}".format(
+                    account.name, other.name))
+                break
+    return problems
 
 
 def plan(old: Config, new: Config, *, config_exists: bool = True,
@@ -60,6 +80,9 @@ def plan(old: Config, new: Config, *, config_exists: bool = True,
                               "cannot change root from {} to {} while accounts are registered".format(
                                   old_root, new_root)))
 
+    for problem in dir_conflicts(new):
+        actions.append(Action(CONFLICT, "config", config_path(), problem))
+
     planned_deletes: Set[str] = set()
     for account in new.accounts.values():
         old_account = old.find(account.name)
@@ -70,7 +93,7 @@ def plan(old: Config, new: Config, *, config_exists: bool = True,
                                   "account {!r} is registered as {!r}; renaming is not supported".format(
                                       account.name, old_account.name)))
             continue
-        directory = os.path.join(new_root, account.name)
+        directory = os.path.join(new_root, account.dir_name)
         actions.extend(_plan_account_dir(directory, assumed))
         actions.extend(_plan_launcher(new_bin, account.name, directory, account.proxy, account.env))
         if old_account is not None and old_bin != new_bin:
@@ -79,11 +102,15 @@ def plan(old: Config, new: Config, *, config_exists: bool = True,
         actions.extend(shared.plan_shared(new, account, directory, old.shared_dir,
                                           adopt=account.name.casefold() in adopt_accounts))
 
+    new_dirs = {account.dir_name.casefold() for account in new.accounts.values()}
     for old_account in old.accounts.values():
         if new.find(old_account.name) is None:
             actions.extend(_plan_launcher_delete(old_bin, old_account.name, planned_deletes,
                                                  "account removed"))
-            actions.extend(shared.plan_remove_links(old_account, os.path.join(old_root, old_account.name),
+            # rename：旧名字从配置里消失，但目录由新名字接着用，共享链接必须留着。
+            if old_account.dir_name.casefold() in new_dirs:
+                continue
+            actions.extend(shared.plan_remove_links(old_account, os.path.join(old_root, old_account.dir_name),
                                                     old.shared_dir))
 
     if orphan_scope:
@@ -121,7 +148,7 @@ def plan_config_copy(config: Config, account: Account, content: str, source_name
     已有不同内容时不覆盖：那可能是用户已经改过的配置。
     """
     target = os.path.join(account_dir(config, account.name), "config.toml")
-    if account.shared and "config.toml" in config.shared_items:
+    if account.shared and "config.toml" in config.shared_items and "config.toml" not in account.shared_exclude:
         return [Action(CONFLICT, "config-file", target,
                        "config.toml is shared for this account and does not need copying")]
     kind = entry_kind(target)

{multi_codex-0.8.0 → multi_codex-0.9.0}/src/multi_codex/apps.py

@@ -33,15 +33,18 @@ def _private_dir(path: str) -> str:
     return path
 
 
-def gui_data_dir(config: Config, name: str, kind: str) -> str:
-    """返回并创建 <root>/.apps/<名>/<kind>（kind 为 vscode 或 desktop），各级目录都只允许本人访问。"""
+def gui_data_dir(config: Config, dir_name: str, kind: str) -> str:
+    """返回并创建 <root>/.apps/<账号目录名>/<kind>（kind 为 vscode 或 desktop），各级目录都只允许本人访问。
+
+    按目录名而不是账号名存放：rename 后 VS Code 与桌面端的登录状态、窗口与扩展数据都还在原处。
+    """
     apps_root = _private_dir(os.path.join(expand(config.root), ".apps"))
-    account_root = _private_dir(os.path.join(apps_root, name))
+    account_root = _private_dir(os.path.join(apps_root, dir_name))
     return _private_dir(os.path.join(account_root, kind))
 
 
-def desktop_log(config: Config, name: str) -> str:
-    path = os.path.join(expand(config.root), ".apps", name, "desktop.log")
+def desktop_log(config: Config, dir_name: str) -> str:
+    path = os.path.join(expand(config.root), ".apps", dir_name, "desktop.log")
     fd = os.open(path, os.O_CREAT | os.O_APPEND | os.O_WRONLY, 0o600)
     os.close(fd)
     os.chmod(path, 0o600)

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

@@ -16,8 +16,10 @@ from typing import List, Optional, Tuple
 from . import (__version__, accounts, apps, binding, completion, doctor, identity, launcher, migrate, platform,
                shellpath, switch, usage)
 from .actions import CREATE, DELETE, UNCHANGED, UPDATE, Action, error, hint, info, print_action, warn
-from .config import (DEFAULT_SHARED_DIR, DEFAULT_SHARED_ITEMS, Account, Config, ConfigError, is_socks, load_config,
-                     normalize_proxy, parse_config, validate_env_key, validate_env_value, validate_name)
+from .config import (DEFAULT_SHARED_DIR, DEFAULT_SHARED_ITEMS, Account, Config, ConfigError, is_socks,
+                     is_unshareable, load_config, normalize_proxy, parse_config, unique_items, validate_env_key,
+                     validate_env_value, validate_name)
+from .config import _valid_item as valid_shared_item  # 与配置解析用同一条名称规则
 from .fsutil import KIND_DIR, KIND_MISSING, display_path, entry_kind, expand
 from .lock import LockBusyError, WriteLock
 
@@ -53,6 +55,7 @@ COMMAND_GROUPS = (
     ("Advanced", (
         ("env", "list or change an account's extra environment variables"),
         ("remove", "unregister an account (its directory is kept)"),
+        ("rename", "rename an account and its launcher (the directory stays)"),
         ("restore", "undo migrate-default: move an account back to ~/.codex"),
         ("apply", "converge all accounts to the configuration"),
         ("init", "create or update the global settings"),
@@ -128,6 +131,12 @@ def build_parser() -> argparse.ArgumentParser:
     _add_dry_run(p_proxy)
     _add_verbose(p_proxy)
 
+    p_rename = sub.add_parser("rename", description=COMMAND_SUMMARY["rename"])
+    p_rename.add_argument("old", metavar="OLD")
+    p_rename.add_argument("new", metavar="NEW")
+    _add_dry_run(p_rename)
+    _add_verbose(p_rename)
+
     p_remove = sub.add_parser("remove", description=COMMAND_SUMMARY["remove"])
     p_remove.add_argument("name")
     _add_dry_run(p_remove)
@@ -239,6 +248,11 @@ def _add_account_options(parser: argparse.ArgumentParser) -> None:
     parser.add_argument("--adopt", action="store_true",
                         help="take over existing links that already point to the shared items, "
                              "so that turning sharing off later removes them too")
+    # 按账号退出 / 恢复全局共享清单中的某些项；都可重复。退出只删本工具建的链接，与关闭共享一致。
+    parser.add_argument("--shared-exclude", action="append", metavar="ITEM",
+                        help="do not link this shared item into this account (repeatable)")
+    parser.add_argument("--shared-include", action="append", metavar="ITEM",
+                        help="undo --shared-exclude for this item (repeatable)")
     _add_dry_run(parser)
     _add_verbose(parser)
 
@@ -434,6 +448,10 @@ def dispatch(args: argparse.Namespace) -> int:
             items = [item.strip() for item in args.shared_items.split(",") if item.strip()]
             if any(item in (".", "..") or "/" in item for item in items):
                 raise UsageError("--shared-items must be plain names without '/'")
+            for item in items:
+                if is_unshareable(item):
+                    raise UsageError("--shared-items must not include {!r}: it holds account-specific "
+                                     "state".format(item))
             new.shared_items = items
     elif args.command in ("add", "set"):
         # add 对已登记的账号也是“修改选项”（保持兼容）；set 只改已登记的账号，不会新建。
@@ -460,6 +478,9 @@ def dispatch(args: argparse.Namespace) -> int:
             account.shared = True
         elif args.no_shared:
             account.shared = False
+        # 放在 --config-from 之前，plan_config_copy 才能看到排除项。注意同一条命令里排除 config.toml 并复制
+        # 仍会判冲突：计划按当前文件判断，那时 config.toml 还是链到共享内容的软链；要分两条命令。
+        _apply_shared_exclude(account, args)
         if args.adopt:
             # 接管只对开启了共享的账号有意义；关闭状态下工具本来就不管这些软链。
             if not account.shared:
@@ -475,6 +496,11 @@ def dispatch(args: argparse.Namespace) -> int:
             error(new.not_registered(args.name))
             return accounts.EXIT_ERROR
         account.proxy = _checked_proxy(args.value)
+    elif args.command == "rename":
+        prepared = _rename_config(new, args)
+        if isinstance(prepared, int):
+            return prepared
+        new, orphan_scope = prepared
     elif args.command == "remove":
         name = _checked_name(args.name)
         account = new.find(name)
@@ -537,6 +563,10 @@ def dispatch(args: argparse.Namespace) -> int:
             info("binding not changed because of the errors above")
     if args.command in ("add", "set") and code == accounts.EXIT_OK and not args.dry_run:
         _hint_shared_dir(old, new, args)
+        _hint_shared_exclude(new, args)
+    if args.command == "rename" and code == accounts.EXIT_OK and not args.dry_run:
+        info("renamed {} to {}; directory {} is unchanged".format(
+            args.old, args.new, display_path(accounts.account_dir(new, args.new))))
     # set 不新建账号，不需要“下一步登录”的提示。
     if args.command == "add" and code == accounts.EXIT_OK and not args.dry_run:
         _hint_after_setup(new, args.name, check_login=True)
@@ -545,7 +575,68 @@ def dispatch(args: argparse.Namespace) -> int:
 
 def _any_account_option(args: argparse.Namespace) -> bool:
     return (args.proxy is not None or args.shared_to is not None or args.no_shared or args.adopt
-            or bool(args.config_from))
+            or bool(args.config_from) or bool(args.shared_exclude) or bool(args.shared_include))
+
+
+def _apply_shared_exclude(account: Account, args: argparse.Namespace) -> None:
+    """--shared-include 先撤销，--shared-exclude 再追加；同一名称同时出现在两边是用法错误。
+
+    只改配置：链接的增删由收敛计划完成（shared.plan_shared 跳过被排除的项，原来的受管链接按关闭共享删除）。
+    """
+    exclude = args.shared_exclude or []
+    include = args.shared_include or []
+    for item in exclude + include:
+        if not valid_shared_item(item):
+            raise UsageError("shared item names must be plain names without '/', got {!r}".format(item))
+    both = sorted(set(exclude) & set(include))
+    if both:
+        raise UsageError("{} given to both --shared-exclude and --shared-include".format(", ".join(both)))
+    kept = [item for item in account.shared_exclude if item not in include]
+    account.shared_exclude = unique_items(kept + exclude)
+
+
+def _hint_shared_exclude(config: Config, args: argparse.Namespace) -> None:
+    """退出项暂时不起作用的两种情况：名称不在共享清单里（精确匹配，与 plan_shared 相同），或账号没开共享。"""
+    exclude = args.shared_exclude or []
+    if not exclude:
+        return
+    account = config.find(args.name)
+    for item in exclude:
+        if item not in config.shared_items:
+            info("note: {} is not in shared.items; the exclusion takes effect only if it is added there".format(
+                item))
+    if account is not None and not account.shared:
+        info("note: sharing is off for {}; the exclusion applies once it is turned on".format(account.name))
+
+
+def _rename_config(new: Config, args: argparse.Namespace):
+    """rename 的新配置：返回 (新配置, orphan_scope)，或直接返回退出码。
+
+    新账号是旧账号的完整副本（代理、共享、受管链接、环境变量、退出项、目录名），只改名字；
+    目录名保持不变，所以目录、登录与共享链接都不动。旧启动命令由收敛计划按“账号移除”删除，
+    accounts.plan 会因目录仍被新名字使用而跳过删除共享链接。
+    """
+    old_name = _checked_name(args.old)
+    new_name = _checked_name(args.new)
+    account = new.find(old_name)
+    if account is None:
+        error(new.not_registered(old_name), phase="rename")
+        return accounts.EXIT_ERROR
+    if new_name.casefold() == account.name.casefold():
+        # 大小写不敏感的文件系统上 codex-Work 与 codex-work 是同一个文件，删旧建新会互相覆盖。
+        raise UsageError("only the letter case differs; renaming that way is not supported")
+    if new.find(new_name) is not None:
+        error("account {!r} already exists".format(new.find(new_name).name), phase="rename")
+        return accounts.EXIT_CONFLICT
+    renamed = account.copy()
+    renamed.name = new_name
+    # 按原顺序重建字典，config.json 里账号的顺序不变。
+    new.accounts = {(new_name if key == account.name else key): (renamed if key == account.name else value)
+                    for key, value in new.accounts.items()}
+    for path, bound in list(new.bindings.items()):
+        if bound.casefold() == account.name.casefold():
+            new.bindings[path] = new_name
+    return new, frozenset([account.name.casefold()])
 
 
 def _not_registered_for_set(config: Config, name: str) -> str:
@@ -749,10 +840,19 @@ def _load_apply_file(path: str, old: Config) -> Config:
     except OSError as exc:
         raise ConfigError("cannot read {}: {}".format(path, exc))
     new = parse_config(raw, path)
+    # parse_config 会给省略的 dir 填默认值，要判断文件里是否显式写了，只能看原始 JSON。
+    raw_accounts = json.loads(raw).get("accounts", {})
     for account in new.accounts.values():
         _warn_if_socks(account.proxy, account.name)
         current = old.find(account.name)
         account.managed_links = list(current.managed_links) if current else []
+        if current is not None:
+            # 目录名是工具内部状态：改了已登记账号的目录名，就等于让它指向另一个目录。
+            written = raw_accounts.get(account.name, {})
+            if isinstance(written, dict) and "dir" in written and written["dir"] != current.dir_name:
+                warn("'dir' of {!r} in {} is ignored for a registered account; it keeps using {}".format(
+                    account.name, path, display_path(accounts.account_dir(old, current.name))))
+            account.dir_name = current.dir_name
     # 绑定是本机状态，沿用当前值；文件中已删除的账号，它的绑定一并删除。
     new.bindings = dict(old.bindings)
     for name in set(new.bindings.values()):
@@ -829,6 +929,7 @@ def cmd_list(as_json: bool = False, verbose: bool = False) -> int:
                 "dir_status": "ok" if is_dir else "missing-dir",
                 "proxy": account.proxy,
                 "shared": account.shared,
+                "shared_exclude": list(account.shared_exclude),
                 "launcher": accounts.launcher_status(config, name),
                 "credentials_store": found.store if found else None,
                 # 只给键名：值里可能有密钥。
@@ -856,7 +957,7 @@ def cmd_list(as_json: bool = False, verbose: bool = False) -> int:
     rows = [("NAME", "DIR", "PROXY", "SHARED", "LAUNCHER", "LOGIN", "PLAN")]
     for name, account, directory, is_dir, found in entries:
         rows.append((name, "ok" if is_dir else "missing-dir", account.proxy,
-                     "yes" if account.shared else "no", accounts.launcher_status(config, name),
+                     _shared_cell(account), accounts.launcher_status(config, name),
                      identity.display_login(found) if found else "-",
                      (found.plan if found and found.plan else "-")))
     widths = [max(len(row[index]) for row in rows) for index in range(len(rows[0]))]
@@ -899,7 +1000,7 @@ def _print_list_summary(config: Config, entries, duplicates: List[List[str]]) ->
             problems.append("not logged in")
         has_problem = has_problem or bool(problems)
         rows.append((name, identity.display_login(found) if found else "-", account.proxy,
-                     "yes" if account.shared else "no", cell, ", ".join(problems) or "ok"))
+                     _shared_cell(account), cell, ", ".join(problems) or "ok"))
     widths = [max(len(row[index]) for row in rows) for index in range(len(rows[0]))]
     for row in rows:
         print("  ".join(cell.ljust(width) for cell, width in zip(row, widths)).rstrip())
@@ -911,6 +1012,15 @@ def _print_list_summary(config: Config, entries, duplicates: List[List[str]]) ->
     return accounts.EXIT_OK
 
 
+def _shared_cell(account: Account) -> str:
+    """SHARED 列：共享开启且有退出项时写出退出的项；没有退出项时与 0.8 相同（yes / no）。"""
+    if not account.shared:
+        return "no"
+    if account.shared_exclude:
+        return "yes (not: {})".format(", ".join(account.shared_exclude))
+    return "yes"
+
+
 def _usage_cell(result: usage.UsageResult, now: float) -> str:
     """简表的 USAGE 单元格，如 `5h 23%, 7d 41%`；没有快照时为 `-`。
 
@@ -1074,7 +1184,7 @@ def cmd_code(args: argparse.Namespace, extra: List[str]) -> int:
         error("VS Code's `code` command was not found{}; install it from VS Code (\"Shell Command: Install "
               "'code' command in PATH\") or pass --bin".format(" at " + args.bin if args.bin else ""))
         return accounts.EXIT_ERROR
-    data_dir = apps.gui_data_dir(config, account.name, "vscode")
+    data_dir = apps.gui_data_dir(config, account.dir_name, "vscode")
     if sys.platform == "darwin":
         if len(data_dir) > apps.SOCKET_DIR_WARN_LENGTH:
             warn("{} is long; VS Code's socket path inside it may exceed the 104-byte limit".format(data_dir))
@@ -1107,8 +1217,8 @@ def cmd_app(args: argparse.Namespace) -> int:
     if problem:
         error(problem)
         return accounts.EXIT_ERROR
-    data_dir = apps.gui_data_dir(config, account.name, "desktop")
-    log = apps.desktop_log(config, account.name)
+    data_dir = apps.gui_data_dir(config, account.dir_name, "desktop")
+    log = apps.desktop_log(config, account.dir_name)
     argv = [apps.open_command(), "-n",
             "--env", "CODEX_HOME=" + accounts.account_dir(config, account.name),
             "--env", "CODEX_ELECTRON_USER_DATA_PATH=" + data_dir,

{multi_codex-0.8.0 → multi_codex-0.9.0}/src/multi_codex/completion.py

@@ -13,8 +13,8 @@ import argparse
 from typing import Dict, List, Tuple
 
 # 第一个位置参数是账号名的子命令；usage 的每个位置参数都是账号名。
-ACCOUNT_COMMANDS = ("add", "set", "login", "proxy", "remove", "migrate-default", "run", "path", "env", "usage", "use",
-                    "restore", "bind", "code", "app")
+ACCOUNT_COMMANDS = ("add", "set", "rename", "login", "proxy", "remove", "migrate-default", "run", "path", "env",
+                    "usage", "use", "restore", "bind", "code", "app")
 MULTI_ACCOUNT_COMMANDS = ("usage",)
 SHELLS = ("bash", "zsh", "fish")