claude-dev-env 8.33.2 → 8.35.0

package/bin/install.transaction.test.mjs

@@ -84,6 +84,7 @@ test('capture and restore recover settings, manifest, files, and hooksPath', ()
     const env = {
         ...process.env,
         CDE_INSTALL_PSTACK: '0',
+        CDE_INSTALL_USAGE_WRAPUP: '0',
         HOME: box.root,
         USERPROFILE: box.root,
         GIT_CONFIG_GLOBAL: gitConfigPath,
@@ -145,6 +146,7 @@ test('capture and restore recover an additional host settings file', () => {
         env: {
             ...process.env,
             CDE_INSTALL_PSTACK: '0',
+            CDE_INSTALL_USAGE_WRAPUP: '0',
             HOME: box.root,
             USERPROFILE: box.root,
             GIT_CONFIG_GLOBAL: gitConfigPath,
@@ -179,6 +181,7 @@ test('runWithInstallTransaction restores prior state on injected fault', () => {
     const env = {
         ...process.env,
         CDE_INSTALL_PSTACK: '0',
+        CDE_INSTALL_USAGE_WRAPUP: '0',
         HOME: box.root,
         USERPROFILE: box.root,
         GIT_CONFIG_GLOBAL: gitConfigPath,
@@ -232,6 +235,7 @@ test('runWithInstallTransaction commits and discards journal on success', () =>
         env: {
             ...process.env,
             CDE_INSTALL_PSTACK: '0',
+            CDE_INSTALL_USAGE_WRAPUP: '0',
             HOME: box.root,
             USERPROFILE: box.root,
             GIT_CONFIG_GLOBAL: gitConfigPath,
@@ -274,6 +278,7 @@ function runInstaller(homeDirectory, extraArguments, options = {}) {
     const childEnvironment = {
         ...process.env,
         CDE_INSTALL_PSTACK: '0',
+        CDE_INSTALL_USAGE_WRAPUP: '0',
         HOME: homeDirectory,
         USERPROFILE: homeDirectory,
         GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),
@@ -308,6 +313,7 @@ test('a later install fault removes newly seeded Codex pstack files', () => {
             faultPhase: FAULT_PHASES.AFTER_MANIFEST_WRITE,
             environment: {
                 CDE_INSTALL_PSTACK: '1',
+                CDE_INSTALL_USAGE_WRAPUP: '0',
                 CDE_CODEX_EXECUTABLE: codexCommandPath,
             },
         });
@@ -450,6 +456,7 @@ test('installer fault after_git_config restores prior core.hooksPath', () => {
             env: {
                 ...process.env,
                 CDE_INSTALL_PSTACK: '0',
+                CDE_INSTALL_USAGE_WRAPUP: '0',
                 HOME: homeDirectory,
                 USERPROFILE: homeDirectory,
                 GIT_CONFIG_GLOBAL: gitConfigPath,
@@ -466,6 +473,7 @@ test('installer fault after_git_config restores prior core.hooksPath', () => {
             env: {
                 ...process.env,
                 CDE_INSTALL_PSTACK: '0',
+                CDE_INSTALL_USAGE_WRAPUP: '0',
                 HOME: homeDirectory,
                 USERPROFILE: homeDirectory,
                 GIT_CONFIG_GLOBAL: gitConfigPath,

package/bin/install.uninstall-transaction.test.mjs

@@ -72,6 +72,7 @@ function runInstaller(homeDirectory, extraArguments, options = {}) {
     const childEnvironment = {
         ...process.env,
         CDE_INSTALL_PSTACK: '0',
+        CDE_INSTALL_USAGE_WRAPUP: '0',
         HOME: homeDirectory,
         USERPROFILE: homeDirectory,
         GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),
@@ -305,6 +306,7 @@ test('uninstall fault after_git_config restores prior core.hooksPath', () => {
             env: {
                 ...process.env,
                 CDE_INSTALL_PSTACK: '0',
+                CDE_INSTALL_USAGE_WRAPUP: '0',
                 HOME: homeDirectory,
                 USERPROFILE: homeDirectory,
                 GIT_CONFIG_GLOBAL: gitConfigPath,

package/docs/codex-accounts.md

@@ -1,24 +1,31 @@
 # Codex accounts
 
-The codex_account_choice picker spreads agent work across up to four Codex
-accounts on one machine. Each account signs in under
-its own Codex home, and every home shares the same Codex setup: config, rules,
-skills, plugins and prompts. A job asks the picker which account to use.
+The codex_account_choice picker spreads agent work across the Codex accounts
+on one machine. Each account signs in under its own Codex home, and every home
+shares the same Codex setup: config, rules, skills, plugins, prompts and agents.
+A job asks the picker which account to use.
 
 ## Pieces
 
 | File | What it does |
 |---|---|
-| `scripts/codex_account_choice.py` | `choose` names the account and tier a job runs on, `check` tells a running job whether its account is still above a floor, `sync` links the shared setup into every account's home |
+| `scripts/codex_account_choice.py` | `choose` names the account and tier a job runs on, `check` tells a running job whether its account is still above a floor, `sync` links the shared setup into every account's home, `setup` and `install` write one launcher per account |
 | `scripts/codex_account_meters.py` | Reads one account's rate-limit windows through `codex app-server` with `CODEX_HOME` set to that account's home |
-| `scripts/dev_env_scripts_constants/codex_account_constants.py` | The account names in try order, the shared entry names, the 10% bar, the 1% Luna stop, and the 20% 5-hour floor for Luna |
+| `scripts/dev_env_scripts_constants/codex_account_constants.py` | The fallback account names, the roster variable and file, the launcher template, the shared entry names, the 10% bar, the 1% Luna stop, and the 20% 5-hour floor for Luna |
 
 ## Names and order
 
-The accounts are `codex-1`, `codex-2`, `codex-3` and `codex-4`. Their homes are
-`~/.codex-profiles/codex-1` and so on, or under `CODEX_PROFILES_ROOT` when set.
-Jobs try them in that order. The names say nothing about a plan, so a plan change
-keeps every name. To change the order, sign the accounts into different folders.
+The account roster names the accounts and their order. It comes from the
+`CODEX_ACCOUNT_PROFILES` environment variable, a comma-separated list such as
+`alpha,beta`. When that variable is unset or empty, the roster is the saved list
+in `account-launchers.json` under the profiles root. When neither exists, the
+accounts are `codex-1`, `codex-2`, `codex-3` and `codex-4`.
+
+`choose`, `sync` and `check` all work on that list, in that order. `check`
+accepts only a name on it. Each account's home is `~/.codex-profiles/<name>`, or
+`<name>` under `CODEX_PROFILES_ROOT` when set. `~/.codex` holds the shared setup
+and is never an account. A name uses letters, digits, hyphens or underscores.
+`main`, `wait` and the Windows device names are refused.
 
 ## Sign in once
 
@@ -33,8 +40,54 @@ $env:CODEX_HOME = "$HOME\.codex-profiles\codex-1"; codex login
 ```
 
 The sign-in lives in that folder's `auth.json`. Only the entries in
-`ALL_SHARED_CODEX_HOME_NAMES` link to `~/.codex`. Sign-in, sessions, history,
-logs and state files stay per account.
+`ALL_SHARED_CODEX_HOME_NAMES` link to `~/.codex`. They are `AGENTS.md`, `agents`,
+`config.toml`, `hooks`, `hooks.json`, `plugins`, `prompts`, `rules` and `skills`.
+Sign-in, sessions, history, logs and state files stay per account.
+
+## Named launchers
+
+Each roster account gets a launcher, `codex-<name>.cmd`, in `~/.local/bin`. It
+sets `CODEX_HOME` to that account's home and runs Codex with every argument, so
+`codex-alpha exec "fix the test"` runs on the `alpha` account.
+
+Run the setup once:
+
+```
+python packages/claude-dev-env/scripts/codex_account_choice.py setup
+```
+
+It prints the saved names, then asks for one name per line. A blank line or the
+end of input finishes. An invalid name prints the reason and asks again. A
+repeated name counts once. The setup saves the list to
+`~/.codex-profiles/account-launchers.json`, links each account's home to
+`~/.codex`, and writes each launcher.
+
+Rerun the installer after the shared setup or this package changes:
+
+```
+python packages/claude-dev-env/scripts/codex_account_choice.py install
+```
+
+It reads the roster, links every account's home, and rewrites any launcher that
+differs. A second run changes nothing. With no roster it prints `{}`.
+`CODEX_ACCOUNT_PROFILES` overrides the saved file here too. Both commands take
+`--main-home` and `--launcher-directory`.
+
+The launcher runs `call codex %*`. `codex` is npm's `codex.cmd`, and its last
+line ends the batch scope. Without `call`, that line also drops the launcher's
+`CODEX_HOME`, and Codex runs on the main home.
+
+The names typed in one setup run become the whole roster. A saved name
+left out has its launcher renamed to `codex-<name>.cmd.replaced-<time>`. Its
+folder under the profiles root stays, with its `auth.json`, so typing the name
+again restores it. A blank first line empties the roster and moves every launcher
+aside.
+
+`check <name>` reads a saved name the same way:
+
+```
+python packages/claude-dev-env/scripts/codex_account_choice.py check alpha --floor 1
+```
 
 ## Which account a job uses
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "claude-dev-env",
-    "version": "8.33.2",
+    "version": "8.35.0",
     "description": "Claude Code development standards — rules, hooks, agents, commands, and skills",
     "type": "module",
     "bin": {

package/scripts/claude_account_profile.py

@@ -309,8 +309,60 @@ def sync_profile(
     )
 
 
-def _moved_launcher_name(launcher_file_name: str, now: datetime) -> str:
-    return f"{launcher_file_name}{LAUNCHER_REPLACED_SUFFIX}{_stamp(now)}"
+def sync_report_payload(report: ProfileSyncReport) -> dict[str, object]:
+    """Turn a sync report into its JSON payload.
+
+    Args:
+        report: The entries one sync linked, moved aside, and unlinked.
+
+    Returns:
+        The linked, moved-aside, and unlinked entries as JSON lists.
+    """
+    return {
+        JSON_LINKED_KEY: list(report.all_linked),
+        JSON_MOVED_ASIDE_KEY: list(report.all_moved_aside),
+        JSON_UNLINKED_KEY: list(report.all_unlinked),
+    }
+
+
+def move_launcher_aside(launcher_path: Path, now: datetime) -> Path:
+    """Rename a launcher to ``<name>.replaced-<time>`` beside it.
+
+    Args:
+        launcher_path: The launcher to move.
+        now: The run time that names the moved launcher.
+
+    Returns:
+        The moved launcher's path.
+    """
+    moved_path = launcher_path.with_name(
+        f"{launcher_path.name}{LAUNCHER_REPLACED_SUFFIX}{_stamp(now)}"
+    )
+    os.replace(launcher_path, moved_path)
+    return moved_path
+
+
+def launcher_path(
+    launcher_directory: Path,
+    profile_name: str,
+    launcher_file_name_template: str = LAUNCHER_FILE_NAME_TEMPLATE,
+) -> Path:
+    """Name the launcher file for a profile.
+
+    Args:
+        launcher_directory: The directory on PATH that holds the launcher.
+        profile_name: The name used in the launcher file name.
+        launcher_file_name_template: The launcher file name, with ``{profile_name}``.
+
+    Returns:
+        The launcher path.
+
+    Raises:
+        ValueError: When the profile name is not a valid profile name.
+    """
+    return launcher_directory / launcher_file_name_template.format(
+        profile_name=validate_profile_name(profile_name)
+    )
 
 
 def write_launcher(
@@ -319,6 +371,8 @@ def write_launcher(
     profile_home: Path,
     now: datetime,
     profile_name: str = SECOND_ACCOUNT_PROFILE_NAME,
+    launcher_file_name_template: str = LAUNCHER_FILE_NAME_TEMPLATE,
+    launcher_text_template: str = LAUNCHER_TEXT_TEMPLATE,
 ) -> Path:
     """Write the launcher that runs Claude under a named profile.
 
@@ -333,26 +387,24 @@ def write_launcher(
         profile_home: The named account's Claude home.
         now: The run time that names a moved older launcher.
         profile_name: The name used in the launcher file name.
+        launcher_file_name_template: The launcher file name, with ``{profile_name}``.
+        launcher_text_template: The launcher body, with ``{profile_home}``.
 
     Returns:
         The launcher path.
     """
-    launcher_file_name = LAUNCHER_FILE_NAME_TEMPLATE.format(
-        profile_name=validate_profile_name(profile_name)
+    target_path = launcher_path(
+        launcher_directory, profile_name, launcher_file_name_template
     )
-    launcher_path = launcher_directory / launcher_file_name
-    launcher_text = LAUNCHER_TEXT_TEMPLATE.format(profile_home=profile_home)
+    launcher_text = launcher_text_template.format(profile_home=profile_home)
     launcher_bytes = launcher_text.encode(TEXT_ENCODING)
-    if launcher_path.is_file() and launcher_path.read_bytes() == launcher_bytes:
-        return launcher_path
-    if launcher_path.is_file():
-        os.replace(
-            launcher_path,
-            launcher_path.with_name(_moved_launcher_name(launcher_file_name, now)),
-        )
+    if target_path.is_file() and target_path.read_bytes() == launcher_bytes:
+        return target_path
+    if target_path.is_file():
+        move_launcher_aside(target_path, now)
     launcher_directory.mkdir(parents=True, exist_ok=True)
-    launcher_path.write_bytes(launcher_bytes)
-    return launcher_path
+    target_path.write_bytes(launcher_bytes)
+    return target_path
 
 
 def _build_argument_parser() -> argparse.ArgumentParser:
@@ -403,12 +455,7 @@ def _sync_named_profile(arguments: argparse.Namespace) -> dict[str, object]:
         now=now,
         profile_name=arguments.profile_name,
     )
-    return {
-        JSON_LINKED_KEY: list(report.all_linked),
-        JSON_MOVED_ASIDE_KEY: list(report.all_moved_aside),
-        JSON_UNLINKED_KEY: list(report.all_unlinked),
-        JSON_LAUNCHER_KEY: str(launcher_path),
-    }
+    return {**sync_report_payload(report), JSON_LAUNCHER_KEY: str(launcher_path)}
 
 
 if __name__ == "__main__":