chatup 0.2.12__tar.gz → 0.2.13__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatup
-Version: 0.2.12
+Version: 0.2.13
 Summary: ChatArch setup CLI extracted from ChatTool
 Author-email: rexwzh <1073853456@qq.com>
 License-Expression: MIT
@@ -15,7 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click<9.0,>=8.0
 Requires-Dist: chatstyle<0.3.0,>=0.2.0
-Requires-Dist: chatenv<0.3.0,>=0.2.10
+Requires-Dist: chatenv<0.3.0,>=0.2.11
 Requires-Dist: colorama
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"

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

@@ -12,7 +12,7 @@ license = "MIT"
 dependencies = [
     "click>=8.0,<9.0",
     "chatstyle>=0.2.0,<0.3.0",
-    "chatenv>=0.2.10,<0.3.0",
+    "chatenv>=0.2.11,<0.3.0",
     "colorama",
 ]
 authors = [{name = "rexwzh", email = "1073853456@qq.com"}]

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

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

{chatup-0.2.12 → 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.12 → chatup-0.2.13/src/chatup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatup
-Version: 0.2.12
+Version: 0.2.13
 Summary: ChatArch setup CLI extracted from ChatTool
 Author-email: rexwzh <1073853456@qq.com>
 License-Expression: MIT
@@ -15,7 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click<9.0,>=8.0
 Requires-Dist: chatstyle<0.3.0,>=0.2.0
-Requires-Dist: chatenv<0.3.0,>=0.2.10
+Requires-Dist: chatenv<0.3.0,>=0.2.11
 Requires-Dist: colorama
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"

{chatup-0.2.12 → 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.12 → chatup-0.2.13}/src/chatup.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click<9.0,>=8.0
 chatstyle<0.3.0,>=0.2.0
-chatenv<0.3.0,>=0.2.10
+chatenv<0.3.0,>=0.2.11
 colorama
 
 [dev]

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.12 → chatup-0.2.13}/tests/test_pyproject_metadata.py

@@ -23,7 +23,7 @@ def test_chatup_depends_on_chatenv_and_registers_cursor_agent_config_provider():
     assert data["project"]["requires-python"] == ">=3.10"
     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.10,<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"

{chatup-0.2.12 → chatup-0.2.13}/tests/test_version.py

@@ -5,7 +5,7 @@ from chatup.cli import main
 
 
 def test_version_present():
-    assert __version__ == "0.2.12"
+    assert __version__ == "0.2.13"
 
 
 def test_cli_help():
@@ -61,4 +61,4 @@ def test_cli_doctor():
     result = CliRunner().invoke(main, ["doctor"])
 
     assert result.exit_code == 0
-    assert "chatup 0.2.12 ok" in result.output
+    assert "chatup 0.2.13 ok" in result.output