claude-dev-env 8.34.0 → 8.35.1

package/scripts/dev_env_scripts_constants/test_claude_account_constants.py

@@ -11,7 +11,6 @@ from dev_env_scripts_constants.claude_account_constants import (
     JSON_SESSION_USED_PERCENT_KEY,
     JSON_WEEKLY_RESETS_AT_KEY,
     JSON_WEEKLY_USED_PERCENT_KEY,
-    LAUNCHER_TEXT_TEMPLATE,
     MAIN_SESSION_USED_CEILING_PERCENT,
     MAIN_WEEKLY_USED_CEILING_PERCENT,
     SECOND_SESSION_USED_CEILING_PERCENT,
@@ -24,11 +23,6 @@ def test_main_ceilings_sit_below_the_second_account_ceilings() -> None:
     assert MAIN_SESSION_USED_CEILING_PERCENT < SECOND_SESSION_USED_CEILING_PERCENT
 
 
-def test_launcher_names_the_profile_and_passes_every_argument() -> None:
-    assert "{profile_home}" in LAUNCHER_TEXT_TEMPLATE
-    assert "claude %*" in LAUNCHER_TEXT_TEMPLATE
-
-
 def test_picker_report_keys_never_collide() -> None:
     all_report_keys = [
         JSON_ACCOUNT_KEY,

package/scripts/test_claude_account_profile.py

@@ -4,12 +4,18 @@ from __future__ import annotations
 
 import json
 import os
+import subprocess
 from datetime import datetime, timezone
 from pathlib import Path
 
 import pytest
 
 import claude_account_profile as profile
+from dev_env_scripts_constants.claude_account_constants import (
+    CLAUDE_LAUNCHER_PROGRAM,
+    LauncherProgram,
+)
+from dev_env_scripts_constants.codex_account_constants import CODEX_LAUNCHER_PROGRAM
 
 NOW = datetime(2026, 9, 22, 21, 0, tzinfo=timezone.utc)
 
@@ -46,6 +52,16 @@ class TestDefaultProfileHome:
         assert profile.default_profile_home() == tmp_path / ".claude-profiles" / "ev"
 
 
+class TestValidateProfileName:
+    def test_should_accept_letters_digits_hyphens_and_underscores(self) -> None:
+        assert profile.validate_profile_name("alpha_2-b") == "alpha_2-b"
+
+    @pytest.mark.parametrize("profile_name", ["bad name", "-alpha", "CON", "main", "wait"])
+    def test_should_refuse_an_unsafe_or_reserved_name(self, profile_name: str) -> None:
+        with pytest.raises(ValueError):
+            profile.validate_profile_name(profile_name)
+
+
 class TestIsAccountLocal:
     def test_should_keep_sign_in_state_and_history_local(self) -> None:
         for each_name in (
@@ -191,11 +207,15 @@ class TestWriteLauncher:
     ) -> None:
         profile_home = tmp_path / "ev"
         launcher_path = profile.write_launcher(
-            launcher_directory=tmp_path / "bin", profile_home=profile_home, now=NOW
+            launcher_directory=tmp_path / "bin",
+            profile_home=profile_home,
+            now=NOW,
+            profile_name="ev",
+            launcher_program=CLAUDE_LAUNCHER_PROGRAM,
         )
         launcher_text = launcher_path.read_text(encoding="utf-8")
         assert f'set "CLAUDE_CONFIG_DIR={profile_home}"' in launcher_text
-        assert "claude %*" in launcher_text
+        assert "call claude %*" in launcher_text
 
     def test_should_move_an_older_launcher_aside(self, tmp_path: Path) -> None:
         launcher_directory = tmp_path / "bin"
@@ -204,13 +224,105 @@ class TestWriteLauncher:
             "old launcher", encoding="utf-8"
         )
         profile.write_launcher(
-            launcher_directory=launcher_directory, profile_home=tmp_path / "ev", now=NOW
+            launcher_directory=launcher_directory,
+            profile_home=tmp_path / "ev",
+            now=NOW,
+            profile_name="ev",
+            launcher_program=CLAUDE_LAUNCHER_PROGRAM,
         )
         moved_launcher = launcher_directory / (
             "claude-ev.cmd.replaced-" + NOW.strftime("%Y%m%dT%H%M%SZ")
         )
         assert moved_launcher.read_text(encoding="utf-8") == "old launcher"
 
+    def test_should_write_the_launcher_for_the_callers_program(
+        self, tmp_path: Path
+    ) -> None:
+        launcher_path = profile.write_launcher(
+            launcher_directory=tmp_path / "bin",
+            profile_home=tmp_path / "alpha",
+            now=NOW,
+            profile_name="alpha",
+            launcher_program=LauncherProgram(
+                program="tool",
+                environment_variable="TOOL_HOME",
+                file_name_template="tool-{profile_name}.cmd",
+            ),
+        )
+        assert launcher_path == tmp_path / "bin" / "tool-alpha.cmd"
+        assert launcher_path.read_bytes() == (
+            "@echo off\r\n"
+            "setlocal\r\n"
+            f'set "TOOL_HOME={tmp_path / "alpha"}"\r\n'
+            "call tool %*\r\n"
+            "exit /b %ERRORLEVEL%\r\n"
+        ).encode()
+
+
+NPM_SHIM_TEXT_TEMPLATE = (
+    "@ECHO off\r\n"
+    "GOTO start\r\n"
+    ":find_dp0\r\n"
+    "SET dp0=%~dp0\r\n"
+    "EXIT /b\r\n"
+    ":start\r\n"
+    "SETLOCAL\r\n"
+    "CALL :find_dp0\r\n"
+    'SET "_prog=cmd"\r\n'
+    "endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% &"
+    ' "%_prog%" /d /c "echo %%{environment_variable}%%"\r\n'
+)
+
+
+class TestNpmShimLauncher:
+    @pytest.mark.skipif(os.name != "nt", reason="runs the launcher through cmd.exe")
+    @pytest.mark.parametrize(
+        "launcher_program",
+        [
+            pytest.param(CLAUDE_LAUNCHER_PROGRAM, id="claude"),
+            pytest.param(CODEX_LAUNCHER_PROGRAM, id="codex"),
+        ],
+    )
+    def should_hand_the_profile_home_to_the_npm_shim(
+        self, tmp_path: Path, launcher_program: LauncherProgram
+    ) -> None:
+        profile_home = tmp_path / "profiles" / "alpha"
+        launcher_path = profile.write_launcher(
+            launcher_directory=tmp_path / "bin",
+            profile_home=profile_home,
+            now=NOW,
+            profile_name="alpha",
+            launcher_program=launcher_program,
+        )
+        fake_directory = tmp_path / "fake"
+        fake_directory.mkdir()
+        (fake_directory / f"{launcher_program.program}.cmd").write_bytes(
+            NPM_SHIM_TEXT_TEMPLATE.format(
+                environment_variable=launcher_program.environment_variable
+            ).encode("utf-8")
+        )
+        environment = dict(os.environ)
+        environment["PATH"] = str(fake_directory) + os.pathsep + environment["PATH"]
+        environment[launcher_program.environment_variable] = str(tmp_path / "decoy")
+        completed = subprocess.run(
+            ["cmd", "/c", str(launcher_path)],
+            env=environment,
+            capture_output=True,
+            text=True,
+            check=False,
+        )
+        assert completed.stdout.strip() == str(profile_home)
+
+
+class TestMoveLauncherAside:
+    def test_should_rename_the_launcher_with_the_run_time(self, tmp_path: Path) -> None:
+        launcher_path = tmp_path / "tool-alpha.cmd"
+        launcher_path.write_text("launcher", encoding="utf-8")
+        moved_path = profile.move_launcher_aside(launcher_path, NOW)
+        assert moved_path == tmp_path / "tool-alpha.cmd.replaced-20260922T210000Z"
+        assert moved_path.read_text(encoding="utf-8") == "launcher"
+        assert not launcher_path.exists()
+
 
 class TestMain:
     def test_should_print_what_the_sync_changed(

package/scripts/test_codex_account_choice.py

@@ -4,15 +4,71 @@ from __future__ import annotations
 
 import json
 import os
+from collections.abc import Callable, Iterator
 from datetime import datetime, timedelta, timezone
 from pathlib import Path
 
 import pytest
 
 import codex_account_choice as choice
+from claude_account_profile import links_to
 from codex_account_meters import CodexAccountMeters, CodexMeterUnreadError, UsageWindow
 
 NOW = datetime(2026, 9, 23, 17, 0, tzinfo=timezone.utc)
+ALL_SHARED_ENTRY_NAMES = (
+    "AGENTS.md",
+    "agents",
+    "config.toml",
+    "hooks",
+    "hooks.json",
+    "plugins",
+    "rules",
+    "skills",
+)
+
+
+@pytest.fixture(autouse=True)
+def clear_account_roster_environment(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.delenv("CODEX_ACCOUNT_PROFILES", raising=False)
+
+
+def build_codex_main_home(tmp_path: Path) -> Path:
+    main_home = tmp_path / "main"
+    for each_directory in ("agents", "hooks", "plugins", "rules", "skills", "sessions"):
+        (main_home / each_directory).mkdir(parents=True)
+    for each_file in ("AGENTS.md", "config.toml", "hooks.json", "auth.json", "history.jsonl"):
+        (main_home / each_file).write_text(each_file, encoding="utf-8")
+    return main_home
+
+
+def save_roster(profiles_root: Path, document: object) -> None:
+    profiles_root.mkdir(parents=True, exist_ok=True)
+    (profiles_root / "account-launchers.json").write_text(
+        json.dumps(document), encoding="utf-8"
+    )
+
+
+def typed_lines(*all_lines: str) -> Callable[[str], str]:
+    remaining_lines: Iterator[str] = iter(all_lines)
+
+    def read_line(prompt: str) -> str:
+        assert prompt == "Name for this Codex account launcher (blank to finish): "
+        try:
+            return next(remaining_lines)
+        except StopIteration as error:
+            raise EOFError from error
+
+    return read_line
+
+
+def install(main_home: Path, tmp_path: Path, *all_names: str) -> dict[str, dict[str, object]]:
+    return choice.install_codex_account_launchers(
+        main_home=main_home,
+        profiles_root=tmp_path / "profiles",
+        launcher_directory=tmp_path / "bin",
+        all_names=all_names,
+        now=NOW,
+    )
 
 
 def reading(
@@ -251,7 +307,7 @@ class TestSync:
 class TestSmallHelpers:
     @pytest.mark.parametrize(
         ("entry_name", "is_local"),
-        [("auth.json", True), ("sessions", True), ("state_5.sqlite", True), ("config.toml", False), ("plugins", False)],
+        [("auth.json", True), ("sessions", True), ("state_5.sqlite", True), ("config.toml", False), ("plugins", False), ("agents", False)],
     )
     def should_keep_every_entry_outside_the_shared_set_per_account(
         self, entry_name: str, is_local: bool
@@ -274,3 +330,280 @@ class TestSmallHelpers:
         payload = choice.reading_payload(reading("codex-1", weekly_used=40.0, short_used=5.0))
         assert payload["percent_left"] == 60.0
         assert [each["minutes"] for each in payload["windows"]] == [300, 10080]
+
+
+class TestAccountRoster:
+    def should_take_the_environment_roster_over_the_saved_file(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        save_roster(tmp_path, ["gamma"])
+        monkeypatch.setenv("CODEX_ACCOUNT_PROFILES", " beta , alpha,, ")
+        assert choice.saved_codex_account_names(tmp_path) == ("beta", "alpha")
+
+    def should_read_the_saved_file_when_the_environment_is_unset(
+        self, tmp_path: Path
+    ) -> None:
+        save_roster(tmp_path, ["gamma", "alpha"])
+        assert choice.saved_codex_account_names(tmp_path) == ("gamma", "alpha")
+
+    def should_name_no_account_when_neither_is_set(self, tmp_path: Path) -> None:
+        assert choice.saved_codex_account_names(tmp_path) == ()
+
+    def should_refuse_an_invalid_name_from_the_environment(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        monkeypatch.setenv("CODEX_ACCOUNT_PROFILES", "alpha,bad name")
+        with pytest.raises(ValueError, match="CODEX_ACCOUNT_PROFILES names 'bad name'"):
+            choice.saved_codex_account_names(tmp_path)
+
+    @pytest.mark.parametrize("document", [["alpha", "con"], ["alpha", 3], {"alpha": 1}])
+    def should_refuse_a_saved_file_with_an_invalid_name(
+        self, tmp_path: Path, document: object
+    ) -> None:
+        save_roster(tmp_path, document)
+        with pytest.raises(ValueError, match="account-launchers.json"):
+            choice.saved_codex_account_names(tmp_path)
+
+    def should_refuse_a_saved_file_that_is_not_json(
+        self, tmp_path: Path, capsys: pytest.CaptureFixture[str]
+    ) -> None:
+        (tmp_path / "account-launchers.json").write_text('["alpha",', encoding="utf-8")
+        with pytest.raises(SystemExit) as exit_info:
+            choice.main(["--profiles-root", str(tmp_path), "check", "alpha"])
+        assert exit_info.value.code == 2
+        assert "account-launchers.json" in capsys.readouterr().err
+
+    def should_drop_duplicates_and_keep_the_first_order(self, tmp_path: Path) -> None:
+        save_roster(tmp_path, ["beta", "alpha", "beta", "gamma", "alpha"])
+        assert choice.saved_codex_account_names(tmp_path) == ("beta", "alpha", "gamma")
+
+    def should_save_the_roster_as_a_json_list_ending_in_a_newline(
+        self, tmp_path: Path
+    ) -> None:
+        profiles_root = tmp_path / "profiles"
+        choice.save_codex_account_names(profiles_root, ("alpha", "beta"))
+        assert (profiles_root / "account-launchers.json").read_bytes() == (
+            b'[\n  "alpha",\n  "beta"\n]\n'
+        )
+        assert choice.saved_codex_account_names(profiles_root) == ("alpha", "beta")
+
+    def should_fall_back_to_the_four_fixed_accounts_without_a_roster(
+        self, tmp_path: Path
+    ) -> None:
+        assert choice.codex_account_names(tmp_path) == (
+            "codex-1",
+            "codex-2",
+            "codex-3",
+            "codex-4",
+        )
+
+
+class TestRosterDrivesTheJobCommands:
+    def should_try_the_roster_in_order_and_skip_the_fixed_accounts(
+        self,
+        tmp_path: Path,
+        monkeypatch: pytest.MonkeyPatch,
+        capsys: pytest.CaptureFixture[str],
+    ) -> None:
+        all_weekly_used = {"beta": 95.0, "alpha": 50.0, "codex-1": 0.0}
+        for each_name in all_weekly_used:
+            (tmp_path / each_name).mkdir()
+            (tmp_path / each_name / "auth.json").write_text("{}")
+        monkeypatch.setenv("CODEX_ACCOUNT_PROFILES", "beta,alpha")
+        monkeypatch.setattr(
+            choice,
+            "_meter_reader",
+            lambda codex_path: (
+                lambda codex_home: CodexAccountMeters(
+                    (UsageWindow(10080, all_weekly_used[codex_home.name], None),)
+                )
+            ),
+        )
+        assert choice.main(["--profiles-root", str(tmp_path), "choose"]) == 0
+        payload = json.loads(capsys.readouterr().out)
+        assert (payload["tier"], payload["account"]) == ("normal", "alpha")
+        assert [each["name"] for each in payload["accounts"]] == ["beta", "alpha"]
+
+    def should_choose_among_the_four_fixed_accounts_without_a_roster(
+        self,
+        tmp_path: Path,
+        monkeypatch: pytest.MonkeyPatch,
+        capsys: pytest.CaptureFixture[str],
+    ) -> None:
+        monkeypatch.setattr(choice, "_meter_reader", lambda codex_path: None)
+        assert choice.main(["--profiles-root", str(tmp_path), "choose"]) == 0
+        payload = json.loads(capsys.readouterr().out)
+        assert [each["name"] for each in payload["accounts"]] == [
+            "codex-1",
+            "codex-2",
+            "codex-3",
+            "codex-4",
+        ]
+
+    def should_sync_only_the_roster_accounts(
+        self,
+        tmp_path: Path,
+        monkeypatch: pytest.MonkeyPatch,
+        capsys: pytest.CaptureFixture[str],
+    ) -> None:
+        main_home = build_codex_main_home(tmp_path)
+        profiles_root = tmp_path / "profiles"
+        monkeypatch.setenv("CODEX_ACCOUNT_PROFILES", "alpha")
+        all_arguments = ["--profiles-root", str(profiles_root), "sync"]
+        assert choice.main([*all_arguments, "--main-home", str(main_home)]) == 0
+        assert list(json.loads(capsys.readouterr().out)) == ["alpha"]
+        assert links_to(profiles_root / "alpha" / "agents", main_home / "agents")
+        assert not (profiles_root / "codex-1").exists()
+
+    def should_check_a_saved_roster_account(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        save_roster(tmp_path, ["alpha"])
+        (tmp_path / "alpha").mkdir()
+        (tmp_path / "alpha" / "auth.json").write_text("{}")
+        monkeypatch.setattr(
+            choice,
+            "_meter_reader",
+            lambda codex_path: (
+                lambda codex_home: CodexAccountMeters((UsageWindow(10080, 40.0, None),))
+            ),
+        )
+        assert choice.main(["--profiles-root", str(tmp_path), "check", "alpha"]) == 0
+
+    @pytest.mark.parametrize("account", ["gamma", "codex-1"])
+    def should_refuse_to_check_an_account_outside_the_roster(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch, account: str
+    ) -> None:
+        save_roster(tmp_path, ["alpha"])
+        monkeypatch.setattr(choice, "_meter_reader", lambda codex_path: None)
+        with pytest.raises(SystemExit) as exit_info:
+            choice.main(["--profiles-root", str(tmp_path), "check", account])
+        assert exit_info.value.code == 2
+
+
+class TestInstallLaunchers:
+    def should_link_the_shared_setup_and_keep_each_sign_in_per_account(
+        self, tmp_path: Path
+    ) -> None:
+        main_home = build_codex_main_home(tmp_path)
+        report = install(main_home, tmp_path, "alpha", "beta")
+        assert list(report) == ["alpha", "beta"]
+        for each_name in ("alpha", "beta"):
+            each_home = tmp_path / "profiles" / each_name
+            for each_entry in ALL_SHARED_ENTRY_NAMES:
+                assert links_to(each_home / each_entry, main_home / each_entry)
+            for each_local_entry in ("auth.json", "history.jsonl", "sessions"):
+                assert not os.path.lexists(each_home / each_local_entry)
+            assert report[each_name]["launcher"] == str(
+                tmp_path / "bin" / f"codex-{each_name}.cmd"
+            )
+
+    def should_change_nothing_on_a_second_run(self, tmp_path: Path) -> None:
+        main_home = build_codex_main_home(tmp_path)
+        install(main_home, tmp_path, "alpha")
+        launcher_path = tmp_path / "bin" / "codex-alpha.cmd"
+        first_launcher_bytes = launcher_path.read_bytes()
+        second_report = install(main_home, tmp_path, "alpha")
+        assert second_report["alpha"]["linked"] == []
+        assert second_report["alpha"]["moved_aside"] == []
+        assert second_report["alpha"]["unlinked"] == []
+        assert launcher_path.read_bytes() == first_launcher_bytes
+        assert sorted(each.name for each in (tmp_path / "bin").iterdir()) == [
+            "codex-alpha.cmd"
+        ]
+
+    def should_set_codex_home_and_call_codex_in_the_launcher(
+        self, tmp_path: Path
+    ) -> None:
+        install(build_codex_main_home(tmp_path), tmp_path, "alpha")
+        launcher_lines = (tmp_path / "bin" / "codex-alpha.cmd").read_bytes().split(b"\r\n")
+        profile_home = tmp_path / "profiles" / "alpha"
+        assert f'set "CODEX_HOME={profile_home}"'.encode() in launcher_lines
+        assert b"call codex %*" in launcher_lines
+
+    def should_install_the_environment_roster_from_the_command_line(
+        self,
+        tmp_path: Path,
+        monkeypatch: pytest.MonkeyPatch,
+        capsys: pytest.CaptureFixture[str],
+    ) -> None:
+        main_home = build_codex_main_home(tmp_path)
+        save_roster(tmp_path / "profiles", ["gamma"])
+        monkeypatch.setenv("CODEX_ACCOUNT_PROFILES", "beta")
+        all_arguments = [
+            "--profiles-root",
+            str(tmp_path / "profiles"),
+            "install",
+            "--main-home",
+            str(main_home),
+            "--launcher-directory",
+            str(tmp_path / "bin"),
+        ]
+        assert choice.main(all_arguments) == 0
+        assert list(json.loads(capsys.readouterr().out)) == ["beta"]
+        assert (tmp_path / "bin" / "codex-beta.cmd").is_file()
+        assert not (tmp_path / "bin" / "codex-gamma.cmd").exists()
+
+    def should_print_an_empty_report_for_an_empty_roster(
+        self, tmp_path: Path, capsys: pytest.CaptureFixture[str]
+    ) -> None:
+        all_arguments = ["--profiles-root", str(tmp_path / "profiles"), "install"]
+        assert choice.main([*all_arguments, "--launcher-directory", str(tmp_path / "bin")]) == 0
+        assert json.loads(capsys.readouterr().out) == {}
+        assert not (tmp_path / "bin").exists()
+
+
+class TestSetupRoster:
+    def should_save_each_valid_name_once_in_typed_order(self, tmp_path: Path) -> None:
+        all_shown: list[str] = []
+        all_names, all_retired = choice.update_codex_account_roster(
+            profiles_root=tmp_path,
+            launcher_directory=tmp_path / "bin",
+            now=NOW,
+            read_line=typed_lines("alpha", "bad name", "alpha", "beta", "", "gamma"),
+            write_line=all_shown.append,
+        )
+        assert (all_names, all_retired) == (("alpha", "beta"), {})
+        assert choice.saved_codex_account_names(tmp_path) == ("alpha", "beta")
+        assert all_shown == [
+            "Saved Codex account launchers: none",
+            "profile name must use letters, digits, hyphens, or underscores",
+        ]
+
+    def should_finish_at_the_end_of_input(self, tmp_path: Path) -> None:
+        all_names, _ = choice.update_codex_account_roster(
+            profiles_root=tmp_path,
+            launcher_directory=tmp_path / "bin",
+            now=NOW,
+            read_line=typed_lines("gamma"),
+            write_line=lambda line: None,
+        )
+        assert all_names == ("gamma",)
+
+    def should_move_a_dropped_launcher_aside_and_keep_its_home(
+        self, tmp_path: Path
+    ) -> None:
+        main_home = build_codex_main_home(tmp_path)
+        profiles_root = tmp_path / "profiles"
+        choice.save_codex_account_names(profiles_root, ("alpha", "beta"))
+        install(main_home, tmp_path, "alpha", "beta")
+        (profiles_root / "beta" / "auth.json").write_text("beta sign-in", encoding="utf-8")
+        all_shown: list[str] = []
+        all_names, all_retired = choice.update_codex_account_roster(
+            profiles_root=profiles_root,
+            launcher_directory=tmp_path / "bin",
+            now=NOW,
+            read_line=typed_lines("alpha", ""),
+            write_line=all_shown.append,
+        )
+        moved_launcher = tmp_path / "bin" / "codex-beta.cmd.replaced-20260923T170000Z"
+        assert all_names == ("alpha",)
+        assert all_retired == {"beta": str(moved_launcher)}
+        assert all_shown == ["Saved Codex account launchers: alpha, beta"]
+        assert moved_launcher.is_file()
+        assert not (tmp_path / "bin" / "codex-beta.cmd").exists()
+        assert (tmp_path / "bin" / "codex-alpha.cmd").is_file()
+        assert (profiles_root / "beta" / "auth.json").read_text(encoding="utf-8") == (
+            "beta sign-in"
+        )
+        assert choice.saved_codex_account_names(profiles_root) == ("alpha",)