chatup 0.2.11__tar.gz → 0.2.13__tar.gz

{chatup-0.2.11/src/chatup.egg-info → chatup-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatup
-Version: 0.2.11
+Version: 0.2.13
 Summary: ChatArch setup CLI extracted from ChatTool
 Author-email: rexwzh <1073853456@qq.com>
 License-Expression: MIT
@@ -13,15 +13,19 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: click>=8.0
-Requires-Dist: chatstyle<0.2.0,>=0.1.1
-Requires-Dist: chatenv<0.3.0,>=0.2.0
+Requires-Dist: click<9.0,>=8.0
+Requires-Dist: chatstyle<0.3.0,>=0.2.0
+Requires-Dist: chatenv<0.3.0,>=0.2.11
 Requires-Dist: colorama
+Provides-Extra: dev
+Requires-Dist: build; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs<2.0,>=1.6; extra == "docs"
-Requires-Dist: mkdocs-material<10.0,>=9.5; extra == "docs"
-Requires-Dist: mkdocs-static-i18n<2.0,>=1.3; extra == "docs"
-Requires-Dist: mike<3.0,>=2.1; extra == "docs"
+Requires-Dist: mkdocs-material<9.7,>=9.5; extra == "docs"
+Requires-Dist: mkdocs-static-i18n<2.0,>=1.2; extra == "docs"
+Requires-Dist: mike<3.0,>=2.0; extra == "docs"
 Dynamic: license-file
 
 # ChatUp
@@ -47,6 +51,9 @@ ChatUp 是 ChatArch 的独立环境与工具安装 CLI。它承接原来 `chatto
 
 ```bash
 chatup --help
+chatup --version
+chatup --tree
+chatup --tree-brief
 chatup doctor
 chatup uv
 chatup chrome-for-testing install --channel stable -I
@@ -75,7 +82,7 @@ chatup crs --install-dir ~/.chatarch/crs/local --port 12392 --redis-port 6379
 | 本地服务安装 | `gitea`、`discourse`、`zulip`、`mysql`、`nginx`、`crs` |
 | Agent 工具链 | `cc-connect`、`claude`、`codex`、`cursor-agent`、`opencode`、`hermes`、`lark-cli` |
 
-所有新增安装项默认目录都收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置。更完整的能力边界见 `docs/capability-map.md`。
+所有新增安装项默认目录都收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置；显式选择 profile 时不会混入进程环境中的其他账号凭据。CLI 树由 ChatStyle 的注册表渲染。更完整的能力边界见 `docs/capability-map.md`。
 
 ## 开发
 
@@ -84,6 +91,9 @@ python -m pytest -q
 python -m build
 python -m twine check dist/*
 mkdocs build --strict
+chatup --version
+chatup --tree
+chatup --tree-brief
 ```
 
 更多使用说明见文档站的 [快速开始](https://arch.gh.wzhecnu.cn/ChatUp/quickstart/)、[命令参考](https://arch.gh.wzhecnu.cn/ChatUp/commands/) 和 [CLI 能力地图](https://arch.gh.wzhecnu.cn/ChatUp/capability-map/)。

{chatup-0.2.11 → chatup-0.2.13}/README.md

@@ -21,6 +21,9 @@ ChatUp 是 ChatArch 的独立环境与工具安装 CLI。它承接原来 `chatto
 
 ```bash
 chatup --help
+chatup --version
+chatup --tree
+chatup --tree-brief
 chatup doctor
 chatup uv
 chatup chrome-for-testing install --channel stable -I
@@ -49,7 +52,7 @@ chatup crs --install-dir ~/.chatarch/crs/local --port 12392 --redis-port 6379
 | 本地服务安装 | `gitea`、`discourse`、`zulip`、`mysql`、`nginx`、`crs` |
 | Agent 工具链 | `cc-connect`、`claude`、`codex`、`cursor-agent`、`opencode`、`hermes`、`lark-cli` |
 
-所有新增安装项默认目录都收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置。更完整的能力边界见 `docs/capability-map.md`。
+所有新增安装项默认目录都收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置；显式选择 profile 时不会混入进程环境中的其他账号凭据。CLI 树由 ChatStyle 的注册表渲染。更完整的能力边界见 `docs/capability-map.md`。
 
 ## 开发
 
@@ -58,6 +61,9 @@ python -m pytest -q
 python -m build
 python -m twine check dist/*
 mkdocs build --strict
+chatup --version
+chatup --tree
+chatup --tree-brief
 ```
 
 更多使用说明见文档站的 [快速开始](https://arch.gh.wzhecnu.cn/ChatUp/quickstart/)、[命令参考](https://arch.gh.wzhecnu.cn/ChatUp/commands/) 和 [CLI 能力地图](https://arch.gh.wzhecnu.cn/ChatUp/capability-map/)。

{chatup-0.2.11 → chatup-0.2.13}/pyproject.toml

@@ -10,9 +10,9 @@ readme = "README.md"
 requires-python = ">=3.10"
 license = "MIT"
 dependencies = [
-    "click>=8.0",
-    "chatstyle>=0.1.1,<0.2.0",
-    "chatenv>=0.2.0,<0.3.0",
+    "click>=8.0,<9.0",
+    "chatstyle>=0.2.0,<0.3.0",
+    "chatenv>=0.2.11,<0.3.0",
     "colorama",
 ]
 authors = [{name = "rexwzh", email = "1073853456@qq.com"}]
@@ -28,11 +28,16 @@ Source = "https://github.com/ChatArch/ChatUp"
 Issues = "https://github.com/ChatArch/ChatUp/issues"
 
 [project.optional-dependencies]
+dev = [
+    "build",
+    "pytest",
+    "twine",
+]
 docs = [
     "mkdocs>=1.6,<2.0",
-    "mkdocs-material>=9.5,<10.0",
-    "mkdocs-static-i18n>=1.3,<2.0",
-    "mike>=2.1,<3.0",
+    "mkdocs-material>=9.5,<9.7",
+    "mkdocs-static-i18n>=1.2,<2.0",
+    "mike>=2.0,<3.0",
 ]
 
 [project.scripts]

{chatup-0.2.11 → chatup-0.2.13}/src/chatup/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.2.11"
+__version__ = "0.2.13"

chatup-0.2.13/src/chatup/cli.py

@@ -0,0 +1,38 @@
+from __future__ import annotations
+
+import click
+from chatstyle import add_tree_option
+
+from chatup import __version__
+from chatup.commands.chrome_for_testing import cli as chrome_for_testing_cli
+from chatup.commands.chromedriver import cli as chromedriver_cli
+from chatup.commands.playwright import cli as playwright_cli
+from chatup.setup.cli import register_setup_commands
+
+
+@click.group(
+    name="chatup",
+    context_settings={"help_option_names": ["-h", "--help"]},
+    invoke_without_command=True,
+    no_args_is_help=True,
+)
+@click.version_option(__version__, prog_name="chatup")
+@add_tree_option(renderer_options={"root_name": "chatup"})
+def main() -> None:
+    """ChatUp CLI for ChatArch bootstrap workflows."""
+
+
+@main.command(name="doctor")
+def doctor() -> None:
+    """Check that ChatUp is installed and callable."""
+    click.echo(f"chatup {__version__} ok")
+
+
+register_setup_commands(main)
+main.add_command(chrome_for_testing_cli)
+main.add_command(chromedriver_cli)
+main.add_command(playwright_cli)
+
+
+if __name__ == "__main__":
+    main()

{chatup-0.2.11 → chatup-0.2.13}/src/chatup/setup/codex.py

@@ -7,6 +7,7 @@ import click
 from chatenv.configs import OpenAIConfig
 from chatenv.fields import BaseEnvConfig
 from chatenv.source_chain import split_config_sources
+from chatenv.store import EnvStore
 from chatup.const import CHATARCH_ENV_DIR, CHATARCH_ENV_FILE
 from chatup.interaction import (
     BACK_VALUE,
@@ -25,7 +26,7 @@ from chatup.setup.nodejs import (
 )
 from chatup.utils.custom_logger import setup_logger
 
-DEFAULT_MODEL = "gpt-5.4"
+DEFAULT_MODEL = "gpt-5.5"
 DEFAULT_BASE_URL = "https://api.openai.com/v1"
 DEFAULT_AUTH_METHOD = "apikey"
 logger = setup_logger("setup_codex")
@@ -264,17 +265,24 @@ def _resolve_openai_env_path(env_ref: str) -> Path:
     )
 
 
+def _openai_values_from_mapping(values: dict[str, str]) -> dict[str, str | None]:
+    return {
+        "openai_api_key": values.get("OPENAI_API_KEY"),
+        "base_url": values.get("OPENAI_API_BASE"),
+        "model": values.get("OPENAI_API_MODEL"),
+    }
+
+
 def _load_openai_values_from_env_ref(env_ref: str) -> dict[str, str | None]:
-    current_values = _snapshot_openai_values()
-    try:
-        env_path = _resolve_openai_env_path(env_ref)
-        BaseEnvConfig.load_all_with_override(
-            CHATARCH_ENV_DIR,
-            override_env_file=env_path,
-        )
-        return _snapshot_openai_values()
-    finally:
-        _restore_openai_values(current_values)
+    """Load only the explicitly selected OpenAI env file/profile.
+
+    `chatup codex -e PROFILE` is an account-selection boundary. Do not merge
+    the selected profile with the active/default ChatEnv profile or process
+    environment, otherwise a profile missing `OPENAI_API_KEY` can silently write
+    a different account's key into `~/.codex/auth.json`.
+    """
+    env_path = _resolve_openai_env_path(env_ref)
+    return _openai_values_from_mapping(EnvStore(CHATARCH_ENV_DIR).load_path(env_path))
 
 
 def setup_codex(
@@ -302,13 +310,19 @@ def setup_codex(
     if isinstance(model, str) and not model.strip():
         model = None
 
-    api_key = resolve_value(
-        api_key,
-        env_config.get("openai_api_key"),
-        existing_api_key,
-        env_values.get("OPENAI_API_KEY"),
-        typed_env_values.get("OPENAI_API_KEY"),
-    )
+    if env_ref:
+        api_key = resolve_value(
+            api_key,
+            env_config.get("openai_api_key"),
+        )
+    else:
+        api_key = resolve_value(
+            api_key,
+            env_config.get("openai_api_key"),
+            existing_api_key,
+            env_values.get("OPENAI_API_KEY"),
+            typed_env_values.get("OPENAI_API_KEY"),
+        )
     missing_required = not api_key
     has_existing_config = any(
         value for key, value in existing.items() if key != "openai_api_key"
@@ -421,22 +435,34 @@ def setup_codex(
                 click.echo(result.stderr.strip(), err=True)
             raise click.Abort()
 
-    base_url = resolve_value(
-        base_url,
-        env_config.get("base_url"),
-        existing.get("base_url"),
-        env_values.get("OPENAI_API_BASE"),
-        typed_env_values.get("OPENAI_API_BASE"),
-        DEFAULT_BASE_URL,
-    )
-    model = resolve_value(
-        model,
-        env_config.get("model"),
-        existing.get("model"),
-        env_values.get("OPENAI_API_MODEL"),
-        typed_env_values.get("OPENAI_API_MODEL"),
-        DEFAULT_MODEL,
-    )
+    if env_ref:
+        base_url = resolve_value(
+            base_url,
+            env_config.get("base_url"),
+            DEFAULT_BASE_URL,
+        )
+        model = resolve_value(
+            model,
+            env_config.get("model"),
+            DEFAULT_MODEL,
+        )
+    else:
+        base_url = resolve_value(
+            base_url,
+            env_config.get("base_url"),
+            existing.get("base_url"),
+            env_values.get("OPENAI_API_BASE"),
+            typed_env_values.get("OPENAI_API_BASE"),
+            DEFAULT_BASE_URL,
+        )
+        model = resolve_value(
+            model,
+            env_config.get("model"),
+            existing.get("model"),
+            env_values.get("OPENAI_API_MODEL"),
+            typed_env_values.get("OPENAI_API_MODEL"),
+            DEFAULT_MODEL,
+        )
 
     codex_dir.mkdir(parents=True, exist_ok=True)
 

{chatup-0.2.11 → chatup-0.2.13}/src/chatup/setup/service_credentials.py

@@ -29,16 +29,19 @@ def load_chatenv_values(
 ) -> tuple[dict[str, str], str]:
     """Load service setup values without printing secrets.
 
-    Precedence is current environment > explicit env file/profile values.
     The env_ref option mirrors Cursor Agent's `-e/--env`: an existing path is
     parsed as a dotenv-style file; otherwise it is treated as a ChatEnv profile.
+    Explicit files/profiles are isolated from process-environment credentials;
+    the process environment is used only when no explicit source is selected.
     """
 
     values: dict[str, str] = {}
     source = "environment"
     store = EnvStore(get_paths().envs_dir)
+    explicit_source = False
 
     if env_ref:
+        explicit_source = True
         candidate = Path(env_ref).expanduser()
         if candidate.exists():
             values.update(parse_env_file(candidate))
@@ -48,14 +51,15 @@ def load_chatenv_values(
             source = f"ChatEnv profile {env_ref}"
 
     if env_profile:
+        explicit_source = True
         values.update(store.load_profile(config_cls, env_profile))
         source = f"ChatEnv profile {env_profile}"
 
-    for key in config_cls.get_fields():
-        env_value = os.getenv(key)
-        if env_value:
-            values[key] = env_value
-            source = "environment"
+    if not explicit_source:
+        for key in config_cls.get_fields():
+            env_value = os.getenv(key)
+            if env_value:
+                values[key] = env_value
     return values, source
 
 

{chatup-0.2.11 → chatup-0.2.13/src/chatup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatup
-Version: 0.2.11
+Version: 0.2.13
 Summary: ChatArch setup CLI extracted from ChatTool
 Author-email: rexwzh <1073853456@qq.com>
 License-Expression: MIT
@@ -13,15 +13,19 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: click>=8.0
-Requires-Dist: chatstyle<0.2.0,>=0.1.1
-Requires-Dist: chatenv<0.3.0,>=0.2.0
+Requires-Dist: click<9.0,>=8.0
+Requires-Dist: chatstyle<0.3.0,>=0.2.0
+Requires-Dist: chatenv<0.3.0,>=0.2.11
 Requires-Dist: colorama
+Provides-Extra: dev
+Requires-Dist: build; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs<2.0,>=1.6; extra == "docs"
-Requires-Dist: mkdocs-material<10.0,>=9.5; extra == "docs"
-Requires-Dist: mkdocs-static-i18n<2.0,>=1.3; extra == "docs"
-Requires-Dist: mike<3.0,>=2.1; extra == "docs"
+Requires-Dist: mkdocs-material<9.7,>=9.5; extra == "docs"
+Requires-Dist: mkdocs-static-i18n<2.0,>=1.2; extra == "docs"
+Requires-Dist: mike<3.0,>=2.0; extra == "docs"
 Dynamic: license-file
 
 # ChatUp
@@ -47,6 +51,9 @@ ChatUp 是 ChatArch 的独立环境与工具安装 CLI。它承接原来 `chatto
 
 ```bash
 chatup --help
+chatup --version
+chatup --tree
+chatup --tree-brief
 chatup doctor
 chatup uv
 chatup chrome-for-testing install --channel stable -I
@@ -75,7 +82,7 @@ chatup crs --install-dir ~/.chatarch/crs/local --port 12392 --redis-port 6379
 | 本地服务安装 | `gitea`、`discourse`、`zulip`、`mysql`、`nginx`、`crs` |
 | Agent 工具链 | `cc-connect`、`claude`、`codex`、`cursor-agent`、`opencode`、`hermes`、`lark-cli` |
 
-所有新增安装项默认目录都收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置。更完整的能力边界见 `docs/capability-map.md`。
+所有新增安装项默认目录都收敛到 `~/.chatarch/...`，例如 `~/.chatarch/chrome-for-testing`、`~/.chatarch/chromedriver`、`~/.chatarch/playwright`、`~/.chatarch/chattea`、`~/.chatarch/discourse`、`~/.chatarch/zulip`、`~/.chatarch/chatdata`、`~/.chatarch/nginx` 和 `~/.chatarch/crs/local`。`cursor-agent` 额外注册 ChatEnv `CursorAgent` profile，`discourse`/`zulip` 注册管理员凭据 profile，并支持 `-e/--env` 从 env 文件或 profile 快速配置；显式选择 profile 时不会混入进程环境中的其他账号凭据。CLI 树由 ChatStyle 的注册表渲染。更完整的能力边界见 `docs/capability-map.md`。
 
 ## 开发
 
@@ -84,6 +91,9 @@ python -m pytest -q
 python -m build
 python -m twine check dist/*
 mkdocs build --strict
+chatup --version
+chatup --tree
+chatup --tree-brief
 ```
 
 更多使用说明见文档站的 [快速开始](https://arch.gh.wzhecnu.cn/ChatUp/quickstart/)、[命令参考](https://arch.gh.wzhecnu.cn/ChatUp/commands/) 和 [CLI 能力地图](https://arch.gh.wzhecnu.cn/ChatUp/capability-map/)。

{chatup-0.2.11 → chatup-0.2.13}/src/chatup.egg-info/SOURCES.txt

@@ -73,6 +73,7 @@ tests/test_browser_backend_cli.py
 tests/test_chrome_for_testing.py
 tests/test_chromedriver.py
 tests/test_cli_tree_docs.py
+tests/test_codex_setup.py
 tests/test_crs_setup.py
 tests/test_cursor_agent_setup.py
 tests/test_playwright.py

chatup-0.2.13/src/chatup.egg-info/requires.txt

@@ -0,0 +1,15 @@
+click<9.0,>=8.0
+chatstyle<0.3.0,>=0.2.0
+chatenv<0.3.0,>=0.2.11
+colorama
+
+[dev]
+build
+pytest
+twine
+
+[docs]
+mkdocs<2.0,>=1.6
+mkdocs-material<9.7,>=9.5
+mkdocs-static-i18n<2.0,>=1.2
+mike<3.0,>=2.0

{chatup-0.2.11 → chatup-0.2.13}/tests/test_cli_tree_docs.py

@@ -58,6 +58,8 @@ def test_cli_tree_is_in_mkdocs_nav_and_backend_contracts_are_complete():
         "remove",
         "gc",
         "--version",
+        "--tree",
+        "--tree-brief",
         "--channel",
         "--home",
         "--platform",

chatup-0.2.13/tests/test_codex_setup.py

@@ -0,0 +1,151 @@
+from __future__ import annotations
+
+import json
+
+import click
+import pytest
+
+
+def _write_env(path, values):
+    path.parent.mkdir(parents=True, exist_ok=True)
+    lines = [f"{key}='{value}'" for key, value in values.items()]
+    path.write_text("\n".join(lines) + "\n", encoding="utf-8")
+
+
+def test_codex_env_profile_does_not_backfill_missing_key_from_active_or_process_env(
+    tmp_path, monkeypatch
+):
+    import chatup.setup.codex as codex_setup
+
+    home = tmp_path / "home"
+    envs_dir = tmp_path / "chatarch" / "envs"
+    openai_dir = envs_dir / "OpenAI"
+    monkeypatch.setenv("HOME", str(home))
+    monkeypatch.setenv("OPENAI_API_KEY", "process-key-should-not-be-used")
+    monkeypatch.setenv("OPENAI_API_BASE", "https://process.example/v1")
+    monkeypatch.setenv("OPENAI_API_MODEL", "process-model")
+    monkeypatch.setattr(codex_setup, "CHATARCH_ENV_DIR", envs_dir)
+    monkeypatch.setattr(codex_setup, "CHATARCH_ENV_FILE", envs_dir / ".env")
+    monkeypatch.setattr(codex_setup, "ensure_nodejs_requirement", lambda **kwargs: None)
+    monkeypatch.setattr(
+        codex_setup,
+        "should_install_global_npm_package",
+        lambda *args, **kwargs: False,
+    )
+
+    _write_env(
+        openai_dir / ".env",
+        {
+            "OPENAI_API_KEY": "active-key-should-not-be-used",
+            "OPENAI_API_BASE": "https://active.example/v1",
+            "OPENAI_API_MODEL": "active-model",
+        },
+    )
+    _write_env(
+        openai_dir / "apple.env",
+        {
+            "OPENAI_API_BASE": "https://crs.example/openai/v1",
+            "OPENAI_API_MODEL": "gpt-5.5",
+        },
+    )
+
+    with pytest.raises(click.Abort):
+        codex_setup.setup_codex(env_ref="apple", interactive=False)
+
+    auth_path = home / ".codex" / "auth.json"
+    if auth_path.exists():
+        auth_data = json.loads(auth_path.read_text(encoding="utf-8"))
+        assert auth_data.get("OPENAI_API_KEY") not in {
+            "active-key-should-not-be-used",
+            "process-key-should-not-be-used",
+        }
+
+
+def test_codex_env_profile_writes_exact_named_profile_values(tmp_path, monkeypatch):
+    import chatup.setup.codex as codex_setup
+
+    home = tmp_path / "home"
+    envs_dir = tmp_path / "chatarch" / "envs"
+    openai_dir = envs_dir / "OpenAI"
+    monkeypatch.setenv("HOME", str(home))
+    monkeypatch.setenv("OPENAI_API_KEY", "process-key-should-not-be-used")
+    monkeypatch.setattr(codex_setup, "CHATARCH_ENV_DIR", envs_dir)
+    monkeypatch.setattr(codex_setup, "CHATARCH_ENV_FILE", envs_dir / ".env")
+    monkeypatch.setattr(codex_setup, "ensure_nodejs_requirement", lambda **kwargs: None)
+    monkeypatch.setattr(
+        codex_setup,
+        "should_install_global_npm_package",
+        lambda *args, **kwargs: False,
+    )
+
+    _write_env(
+        openai_dir / ".env",
+        {
+            "OPENAI_API_KEY": "active-key-should-not-be-used",
+            "OPENAI_API_BASE": "https://active.example/v1",
+            "OPENAI_API_MODEL": "active-model",
+        },
+    )
+    _write_env(
+        openai_dir / "apple.env",
+        {
+            "OPENAI_API_KEY": "apple-key",
+            "OPENAI_API_BASE": "https://crs.example/openai/v1",
+            "OPENAI_API_MODEL": "gpt-5.5",
+        },
+    )
+
+    codex_setup.setup_codex(env_ref="apple", interactive=False)
+
+    auth_path = home / ".codex" / "auth.json"
+    auth_data = json.loads(auth_path.read_text(encoding="utf-8"))
+    assert auth_data == {"OPENAI_API_KEY": "apple-key"}
+    assert auth_path.stat().st_mode & 0o777 == 0o600
+
+    config_text = (home / ".codex" / "config.toml").read_text(encoding="utf-8")
+    assert 'model = "gpt-5.5"' in config_text
+    assert 'base_url = "https://crs.example/openai/v1"' in config_text
+    assert "active-key-should-not-be-used" not in config_text
+    assert "process-key-should-not-be-used" not in config_text
+
+
+def test_codex_env_dotenv_ref_loads_active_openai_profile(tmp_path, monkeypatch):
+    import chatup.setup.codex as codex_setup
+
+    home = tmp_path / "home"
+    envs_dir = tmp_path / "chatarch" / "envs"
+    openai_dir = envs_dir / "OpenAI"
+    monkeypatch.setenv("HOME", str(home))
+    monkeypatch.setenv("OPENAI_API_KEY", "process-key-should-not-be-used")
+    monkeypatch.setattr(codex_setup, "CHATARCH_ENV_DIR", envs_dir)
+    monkeypatch.setattr(codex_setup, "CHATARCH_ENV_FILE", envs_dir / ".env")
+    monkeypatch.setattr(codex_setup, "ensure_nodejs_requirement", lambda **kwargs: None)
+    monkeypatch.setattr(
+        codex_setup,
+        "should_install_global_npm_package",
+        lambda *args, **kwargs: False,
+    )
+    _write_env(
+        openai_dir / ".env",
+        {
+            "OPENAI_API_KEY": "active-key",
+            "OPENAI_API_BASE": "https://active.example/v1",
+            "OPENAI_API_MODEL": "gpt-5.5",
+        },
+    )
+
+    codex_setup.setup_codex(env_ref=".env", interactive=False)
+
+    auth_data = json.loads((home / ".codex" / "auth.json").read_text(encoding="utf-8"))
+    assert auth_data == {"OPENAI_API_KEY": "active-key"}
+    config_text = (home / ".codex" / "config.toml").read_text(encoding="utf-8")
+    assert 'model = "gpt-5.5"' in config_text
+    assert 'base_url = "https://active.example/v1"' in config_text
+    assert "process-key-should-not-be-used" not in config_text
+
+
+def test_codex_default_model_matches_shared_openai_default():
+    from chatenv.configs import OpenAIConfig
+    import chatup.setup.codex as codex_setup
+
+    assert codex_setup.DEFAULT_MODEL == OpenAIConfig.OPENAI_API_MODEL.default

{chatup-0.2.11 → chatup-0.2.13}/tests/test_publish_workflow.py

@@ -11,6 +11,9 @@ def test_publish_workflow_matches_active_any_environment_publisher():
     assert "id-token: write" in workflow
     assert "pypa/gh-action-pypi-publish@release/v1" in workflow
     assert "environment: pypi" not in workflow
+    assert "git merge-base --is-ancestor" in workflow
+    assert "refs/remotes/origin/main" in workflow
+    assert "workflow_dispatch" not in workflow
     assert "Release workflow must run from a tag ref" in workflow
     assert "GITHUB_REF_TYPE" in workflow
     assert "GITHUB_REF_NAME" in workflow

{chatup-0.2.11 → chatup-0.2.13}/tests/test_pyproject_metadata.py

@@ -21,8 +21,9 @@ def test_chatup_depends_on_chatenv_and_registers_cursor_agent_config_provider():
     data = _pyproject()
 
     assert data["project"]["requires-python"] == ">=3.10"
-    assert "chatstyle>=0.1.1,<0.2.0" in data["project"]["dependencies"]
-    assert "chatenv>=0.2.0,<0.3.0" in data["project"]["dependencies"]
+    assert "click>=8.0,<9.0" in data["project"]["dependencies"]
+    assert "chatstyle>=0.2.0,<0.3.0" in data["project"]["dependencies"]
+    assert "chatenv>=0.2.11,<0.3.0" in data["project"]["dependencies"]
     entry_points = data["project"]["entry-points"]["chatenv.configs"]
     assert entry_points["cursor-agent"] == "chatup.config:CursorAgentConfig"
     assert entry_points["discourse"] == "chatup.config:DiscourseAdminConfig"
@@ -82,4 +83,5 @@ def test_project_metadata_points_to_chatup_docs_site():
 
     assert data["project"]["urls"]["Documentation"] == "https://arch.gh.wzhecnu.cn/ChatUp/"
     assert data["project"]["urls"]["Source"] == "https://github.com/ChatArch/ChatUp"
-    assert "mkdocs-static-i18n>=1.3,<2.0" in data["project"]["optional-dependencies"]["docs"]
+    assert "mkdocs-material>=9.5,<9.7" in data["project"]["optional-dependencies"]["docs"]
+    assert "mkdocs-static-i18n>=1.2,<2.0" in data["project"]["optional-dependencies"]["docs"]

{chatup-0.2.11 → chatup-0.2.13}/tests/test_service_installers.py

@@ -1,10 +1,13 @@
 from __future__ import annotations
 
 from click.testing import CliRunner
+from chatenv.paths import get_paths
+from chatenv.store import EnvStore
 
 from chatup.cli import main
 from chatup.config import DiscourseAdminConfig, ZulipAdminConfig
 from chatup.setup.discourse import setup_discourse
+from chatup.setup.service_credentials import load_chatenv_values
 from chatup.setup.zulip import setup_zulip
 
 
@@ -36,6 +39,43 @@ def test_zulip_admin_config_schema_supports_email_and_mail_alias():
     ZulipAdminConfig.test()
 
 
+def test_explicit_chatenv_profile_isolated_from_process_credentials(tmp_path, monkeypatch):
+    monkeypatch.setenv("CHATARCH_HOME", str(tmp_path / "chatarch"))
+    monkeypatch.setenv("DISCOURSE_ADMIN_USERNAME", "process-admin")
+    monkeypatch.setenv("DISCOURSE_ADMIN_EMAIL", "process@example.com")
+    monkeypatch.setenv("DISCOURSE_ADMIN_PASSWORD", "process-password")
+    EnvStore(get_paths().envs_dir).save_profile(
+        DiscourseAdminConfig,
+        "selected",
+        {
+            "DISCOURSE_ADMIN_USERNAME": "profile-admin",
+            "DISCOURSE_ADMIN_PASSWORD": "profile-password",
+        },
+    )
+
+    values, source = load_chatenv_values(DiscourseAdminConfig, env_profile="selected")
+
+    assert source == "ChatEnv profile selected"
+    assert values["DISCOURSE_ADMIN_USERNAME"] == "profile-admin"
+    assert values["DISCOURSE_ADMIN_PASSWORD"] == "profile-password"
+    assert "DISCOURSE_ADMIN_EMAIL" not in values
+
+
+def test_process_credentials_are_used_without_explicit_source(monkeypatch):
+    monkeypatch.setenv("DISCOURSE_ADMIN_USERNAME", "process-admin")
+    monkeypatch.setenv("DISCOURSE_ADMIN_EMAIL", "process@example.com")
+    monkeypatch.setenv("DISCOURSE_ADMIN_PASSWORD", "process-password")
+
+    values, source = load_chatenv_values(DiscourseAdminConfig)
+
+    assert source == "environment"
+    assert values == {
+        "DISCOURSE_ADMIN_USERNAME": "process-admin",
+        "DISCOURSE_ADMIN_EMAIL": "process@example.com",
+        "DISCOURSE_ADMIN_PASSWORD": "process-password",
+    }
+
+
 def test_discourse_setup_writes_admin_env_and_chatarc_internal_app_yml(tmp_path):
     env = tmp_path / "discourse.env"
     env.write_text(

chatup-0.2.13/tests/test_version.py

@@ -0,0 +1,64 @@
+from click.testing import CliRunner
+
+from chatup import __version__
+from chatup.cli import main
+
+
+def test_version_present():
+    assert __version__ == "0.2.13"
+
+
+def test_cli_help():
+    result = CliRunner().invoke(main, ["--help"])
+
+    assert result.exit_code == 0
+    assert main.name == "chatup"
+    assert "ChatUp CLI" in result.output
+    assert "doctor" in result.output
+    assert "--tree" in result.output
+    assert "--tree-brief" in result.output
+
+
+def test_cli_tree_lists_registered_command_surface_with_signatures():
+    result = CliRunner().invoke(main, ["--tree"])
+
+    assert result.exit_code == 0, result.output
+    lines = result.output.splitlines()
+    assert lines[0] == "chatup"
+    assert lines.count("chatup") == 1
+    assert all("  # " in line for line in lines[1:])
+    assert "--version" in result.output
+    assert "--tree" in result.output
+    assert "--tree-brief" in result.output
+    for command in main.commands:
+        assert command in result.output
+    for leaf in ("install", "list", "show", "path", "doctor", "remove", "gc"):
+        assert leaf in result.output
+    assert "[--match-browser MATCH-BROWSER]" in result.output
+    assert "[--minimum-age-hours MINIMUM-AGE-HOURS]" in result.output
+    assert "Remove one exact managed installation." in result.output
+    assert "Install/configure Cursor Agent CLI auth and config files." in result.output
+
+
+def test_cli_tree_brief_keeps_registered_nodes_and_omits_signatures():
+    result = CliRunner().invoke(main, ["--tree-brief"])
+
+    assert result.exit_code == 0, result.output
+    lines = result.output.splitlines()
+    assert lines[0] == "chatup"
+    assert lines.count("chatup") == 1
+    assert all("  # " in line for line in lines[1:])
+    for command in main.commands:
+        assert command in result.output
+    for expected in ("--version", "--tree", "--tree-brief", "install", "remove", "gc"):
+        assert expected in result.output
+    assert "[--match-browser MATCH-BROWSER]" not in result.output
+    assert "[--minimum-age-hours MINIMUM-AGE-HOURS]" not in result.output
+    assert "[VERSION]" not in result.output
+
+
+def test_cli_doctor():
+    result = CliRunner().invoke(main, ["doctor"])
+
+    assert result.exit_code == 0
+    assert "chatup 0.2.13 ok" in result.output

chatup-0.2.11/src/chatup/cli.py

@@ -1,111 +0,0 @@
-from __future__ import annotations
-
-import inspect
-
-import click
-
-from chatup import __version__
-from chatup.commands.chrome_for_testing import cli as chrome_for_testing_cli
-from chatup.commands.chromedriver import cli as chromedriver_cli
-from chatup.commands.playwright import cli as playwright_cli
-from chatup.setup.cli import register_setup_commands
-
-
-def _purpose(command: click.Command) -> str:
-    text = command.short_help or inspect.getdoc(command.callback) or ""
-    return " ".join(text.strip().split()).rstrip(".")
-
-
-def _parameter_piece(parameter: click.Parameter) -> str | None:
-    if getattr(parameter, "hidden", False) or parameter.name == "help":
-        return None
-    if isinstance(parameter, click.Argument):
-        piece = parameter.name.upper().replace("_", "-")
-        if not parameter.required:
-            piece = f"[{piece}]"
-        if parameter.nargs == -1:
-            piece = f"{piece}..."
-        return piece
-    if not isinstance(parameter, click.Option):
-        return None
-    option_names = [name for name in (*parameter.opts, *parameter.secondary_opts) if name.startswith("--")]
-    if not option_names:
-        option_names = [name for name in (*parameter.opts, *parameter.secondary_opts) if name.startswith("-")]
-    if not option_names:
-        return None
-    if parameter.is_flag or parameter.flag_value is not None:
-        piece = "/".join(option_names)
-    else:
-        metavar = parameter.metavar or parameter.name.upper().replace("_", "-")
-        piece = f"{'/'.join(option_names)} {metavar}"
-    if not parameter.required:
-        piece = f"[{piece}]"
-    return piece
-
-
-def _command_signature(name: str, command: click.Command) -> str:
-    pieces = [piece for piece in (_parameter_piece(parameter) for parameter in command.params) if piece]
-    return " ".join([name, *pieces])
-
-
-def _render_command_tree(command: click.Command, name: str, prefix: str, is_last: bool, lines: list[str]) -> None:
-    connector = "└── " if is_last else "├── "
-    line = f"{prefix}{connector}{_command_signature(name, command)}"
-    purpose = _purpose(command)
-    if purpose:
-        line = f"{line}  # {purpose}"
-    lines.append(line)
-    if not isinstance(command, click.Group):
-        return
-    children = [(child_name, child) for child_name, child in command.commands.items() if not child.hidden]
-    child_prefix = prefix + ("    " if is_last else "│   ")
-    for index, (child_name, child) in enumerate(children):
-        _render_command_tree(child, child_name, child_prefix, index == len(children) - 1, lines)
-
-
-def _render_cli_tree(root: click.Group) -> str:
-    children = [(name, command) for name, command in root.commands.items() if not command.hidden]
-    lines = [f"chatup  # {_purpose(root)}"]
-    root_options = [
-        ("--help", "Show help for the current command."),
-        ("--version", "Show package version."),
-        ("--tree", "Print the registered CLI tree."),
-    ]
-    for index, (option, purpose) in enumerate(root_options):
-        is_last = not children and index == len(root_options) - 1
-        lines.append(f"{'└──' if is_last else '├──'} {option}  # {purpose}")
-    for index, (child_name, child) in enumerate(children):
-        _render_command_tree(child, child_name, "", index == len(children) - 1, lines)
-    return "\n".join(lines)
-
-
-@click.group(
-    context_settings={"help_option_names": ["-h", "--help"]},
-    invoke_without_command=True,
-    no_args_is_help=True,
-)
-@click.version_option(__version__, prog_name="chatup")
-@click.option("--tree", "show_tree", is_flag=True, is_eager=True, help="Print the registered CLI tree.")
-@click.pass_context
-def main(ctx: click.Context, show_tree: bool) -> None:
-    """ChatUp CLI for ChatArch bootstrap workflows."""
-
-    if show_tree:
-        click.echo(_render_cli_tree(ctx.command))
-        ctx.exit()
-
-
-@main.command(name="doctor")
-def doctor() -> None:
-    """Check that ChatUp is installed and callable."""
-    click.echo(f"chatup {__version__} ok")
-
-
-register_setup_commands(main)
-main.add_command(chrome_for_testing_cli)
-main.add_command(chromedriver_cli)
-main.add_command(playwright_cli)
-
-
-if __name__ == "__main__":
-    main()

chatup-0.2.11/src/chatup.egg-info/requires.txt

@@ -1,10 +0,0 @@
-click>=8.0
-chatstyle<0.2.0,>=0.1.1
-chatenv<0.3.0,>=0.2.0
-colorama
-
-[docs]
-mkdocs<2.0,>=1.6
-mkdocs-material<10.0,>=9.5
-mkdocs-static-i18n<2.0,>=1.3
-mike<3.0,>=2.1

chatup-0.2.11/tests/test_version.py

@@ -1,45 +0,0 @@
-from click.testing import CliRunner
-
-from chatup import __version__
-from chatup.cli import main
-
-
-def test_version_present():
-    assert __version__ == "0.2.11"
-
-
-def test_cli_help():
-    result = CliRunner().invoke(main, ["--help"])
-
-    assert result.exit_code == 0
-    assert "ChatUp CLI" in result.output
-    assert "doctor" in result.output
-    assert "--tree" in result.output
-
-
-def test_cli_tree_lists_registered_command_surface():
-    result = CliRunner().invoke(main, ["--tree"])
-
-    assert result.exit_code == 0, result.output
-    assert "chatup  # ChatUp CLI for ChatArch bootstrap workflows" in result.output
-    assert "├── --help  # Show help for the current command." in result.output
-    assert "├── --version  # Show package version." in result.output
-    assert "├── --tree  # Print the registered CLI tree." in result.output
-    for command in [
-        "doctor",
-        "workspace",
-        "chrome-for-testing",
-        "chromedriver",
-        "playwright",
-    ]:
-        assert command in result.output
-    assert "chrome-for-testing" in result.output
-    assert "│   ├── install" in result.output
-    assert "│   └── gc" in result.output
-
-
-def test_cli_doctor():
-    result = CliRunner().invoke(main, ["doctor"])
-
-    assert result.exit_code == 0
-    assert "chatup 0.2.11 ok" in result.output