ai-code-switcher 0.1.5__tar.gz → 0.1.7__tar.gz

{ai_code_switcher-0.1.5 → ai_code_switcher-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ai-code-switcher
-Version: 0.1.5
+Version: 0.1.7
 Summary: Switch AI coding tool profiles and launch the correct CLI
 License-Expression: MIT
 Requires-Python: >=3.8

{ai_code_switcher-0.1.5 → ai_code_switcher-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ai-code-switcher"
-version = "0.1.5"
+version = "0.1.7"
 description = "Switch AI coding tool profiles and launch the correct CLI"
 license = "MIT"
 requires-python = ">=3.8"

{ai_code_switcher-0.1.5 → ai_code_switcher-0.1.7}/src/ai_code_switcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ai-code-switcher
-Version: 0.1.5
+Version: 0.1.7
 Summary: Switch AI coding tool profiles and launch the correct CLI
 License-Expression: MIT
 Requires-Python: >=3.8

ai_code_switcher-0.1.7/src/code_ai/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.6"

{ai_code_switcher-0.1.5 → ai_code_switcher-0.1.7}/src/code_ai/launcher.py

@@ -32,12 +32,25 @@ def prepare_environment(profile):
 
     # Handle authentication based on profile type
     if isinstance(profile, LoginProfile):
-        # Login mode: clear API environment variables and set CLAUDE_CONFIG_DIR
+        # Login mode: clear API environment variables and set CONFIG_DIR
         for env_var in spec["env"]:
             env.pop(env_var, None)
         # Expand ~ to home directory
         credentials_path = os.path.expanduser(profile.credentials_path)
-        env["CLAUDE_CONFIG_DIR"] = credentials_path
+        # Set the appropriate config dir env var based on profile type
+        # Claude uses CLAUDE_CONFIG_DIR, Codex uses CODEX_HOME
+        config_dir_vars = {"claude": "CLAUDE_CONFIG_DIR", "codex": "CODEX_HOME"}
+        config_dir_var = config_dir_vars.get(ptype)
+        if config_dir_var:
+            os.makedirs(credentials_path, exist_ok=True)
+            # For codex: ensure config.toml exists with default openai provider
+            # to prevent inheriting custom providers from ~/.codex/config.toml
+            if ptype == "codex":
+                config_toml = os.path.join(credentials_path, "config.toml")
+                if not os.path.exists(config_toml):
+                    with open(config_toml, "w") as f:
+                        f.write('model_provider = "openai"\n')
+            env[config_dir_var] = credentials_path
     elif isinstance(profile, ApiProfile):
         # API mode: set API environment variables
         for env_var, config_key in spec["env"].items():

{ai_code_switcher-0.1.5 → ai_code_switcher-0.1.7}/src/code_ai/models.py

@@ -22,7 +22,7 @@ class ApiProfile(BaseProfile):
 
 @dataclass
 class LoginProfile(BaseProfile):
-    """Login mode: authenticate via OAuth credentials directory (Claude only)"""
+    """Login mode: authenticate via OAuth credentials directory (Claude/Codex)"""
     credentials_path: str = ""       # Path to existing OAuth credentials
 
 
@@ -33,7 +33,7 @@ def profile_from_dict(data: dict) -> BaseProfile:
     mode = data.get("mode", "api")  # Default to api for backward compatibility
     proxy = data.get("proxy")
 
-    if ptype == "claude" and mode == "login":
+    if (ptype == "claude" or ptype == "codex") and mode == "login":
         return LoginProfile(
             name=name,
             type=ptype,

{ai_code_switcher-0.1.5 → ai_code_switcher-0.1.7}/src/code_ai/profiles.py

@@ -66,8 +66,8 @@ def add_profile(config):
         "type": ptype,
     }
 
-    # Handle mode for Claude
-    if ptype == "claude":
+    # Handle mode for Claude and Codex
+    if ptype in ("claude", "codex"):
         mode = input("Mode (api/login) [api]: ").strip().lower() or "api"
         if mode not in ("api", "login"):
             print("Error: mode must be 'api' or 'login'.")
@@ -77,17 +77,22 @@ def add_profile(config):
         if mode == "login":
             credentials_path = input("Credentials path (optional, auto-generate if empty): ").strip()
             if not credentials_path:
-                credentials_path = f"~/.claude-profiles/{name}"
+                credentials_path = f"~/.{ptype}-profiles/{name}"
             profile_data["credentials_path"] = credentials_path
         else:  # api mode
             base_url = input("Base URL: ").strip()
             if not base_url:
                 print("Error: base URL cannot be empty.")
                 sys.exit(1)
-            token = input("Auth token: ").strip()
-            profile_data["base_url"] = base_url
-            profile_data["token"] = token
-    else:  # gemini or codex - API mode only
+            if ptype == "claude":
+                token = input("Auth token: ").strip()
+                profile_data["base_url"] = base_url
+                profile_data["token"] = token
+            else:  # codex
+                api_key = input("API key: ").strip()
+                profile_data["base_url"] = base_url
+                profile_data["api_key"] = api_key
+    else:  # gemini - API mode only
         base_url = input("Base URL: ").strip()
         if not base_url:
             print("Error: base URL cannot be empty.")
@@ -117,8 +122,8 @@ def show_profile(config, name):
     print(f"Profile: {name}")
     print(f"Type: {profile.type}")
 
-    # Display mode for Claude type
-    if profile.type == "claude":
+    # Display mode for Claude and Codex types
+    if profile.type in ("claude", "codex"):
         mode = profile_dict.get("mode", "api")
         print(f"Mode: {mode}")
 
@@ -127,10 +132,15 @@ def show_profile(config, name):
             print(f"Credentials Path: {credentials_path}")
         else:  # api mode
             base_url = profile_dict.get("base_url", "N/A")
-            token = profile_dict.get("token", "N/A")
-            print(f"Base URL: {base_url}")
-            print(f"Token: {token}")
-    else:  # gemini or codex
+            if profile.type == "claude":
+                token = profile_dict.get("token", "N/A")
+                print(f"Base URL: {base_url}")
+                print(f"Token: {token}")
+            else:  # codex
+                api_key = profile_dict.get("api_key", "N/A")
+                print(f"Base URL: {base_url}")
+                print(f"API Key: {api_key}")
+    else:  # gemini
         base_url = profile_dict.get("base_url", "N/A")
         api_key = profile_dict.get("api_key", "N/A")
         print(f"Base URL: {base_url}")

{ai_code_switcher-0.1.5 → ai_code_switcher-0.1.7}/tests/test_integration.py

@@ -218,3 +218,94 @@ class TestBackwardCompatibility:
             env = prepare_environment(profile)
             assert env["GOOGLE_GEMINI_BASE_URL"] == "https://generativelanguage.googleapis.com"
             assert env["GEMINI_API_KEY"] == "AIza-test-key"
+
+
+class TestCodexProfiles:
+    """Test codex profile workflows"""
+
+    def test_codex_api_profile(self, tmp_path):
+        """Test codex API mode profile"""
+        config_file = tmp_path / "config.yaml"
+
+        with patch("src.code_ai.config.CONFIG_FILE", config_file):
+            # Initialize config
+            config = {"profiles": {}}
+            save_config(config)
+
+            # Add codex API profile
+            inputs = [
+                "my-codex-api",            # Profile name
+                "codex",                   # Type
+                "api",                     # Mode
+                "https://api.openai.com/v1",  # Base URL
+                "sk-test-key",             # API key
+                "",                        # No proxy
+            ]
+
+            with patch("builtins.input", side_effect=inputs):
+                config = load_config()
+                config = add_profile(config)
+                save_config(config)
+
+            # Verify profile was added
+            config = load_config()
+            assert "my-codex-api" in config["profiles"]
+            profile_dict = config["profiles"]["my-codex-api"]
+            assert profile_dict["type"] == "codex"
+            assert profile_dict["mode"] == "api"
+
+            # Convert to profile object
+            profile = profile_from_dict(profile_dict)
+            assert isinstance(profile, ApiProfile)
+            assert profile.type == "codex"
+
+            # Test environment preparation
+            env = prepare_environment(profile)
+            # Should have both OPENAI_API_KEY and OPENAI_BASE_URL
+            assert env["OPENAI_API_KEY"] == "sk-test-key"
+            assert env["OPENAI_BASE_URL"] == "https://api.openai.com/v1"
+
+    def test_codex_login_profile(self, tmp_path):
+        """Test codex login mode profile"""
+        config_file = tmp_path / "config.yaml"
+
+        with patch("src.code_ai.config.CONFIG_FILE", config_file):
+            # Initialize config
+            config = {"profiles": {}}
+            save_config(config)
+
+            # Add codex login profile
+            inputs = [
+                "my-codex-login",          # Profile name
+                "codex",                   # Type
+                "login",                   # Mode
+                "~/.codex-profiles/account-a",  # Credentials path
+                "",                        # No proxy
+            ]
+
+            with patch("builtins.input", side_effect=inputs):
+                config = load_config()
+                config = add_profile(config)
+                save_config(config)
+
+            # Verify profile was added
+            config = load_config()
+            assert "my-codex-login" in config["profiles"]
+            profile_dict = config["profiles"]["my-codex-login"]
+            assert profile_dict["type"] == "codex"
+            assert profile_dict["mode"] == "login"
+            assert profile_dict["credentials_path"] == "~/.codex-profiles/account-a"
+
+            # Convert to profile object
+            profile = profile_from_dict(profile_dict)
+            assert isinstance(profile, LoginProfile)
+            assert profile.type == "codex"
+
+            # Test environment preparation
+            env = prepare_environment(profile)
+            # Login mode should NOT have API environment variables
+            assert "OPENAI_API_KEY" not in env
+            # Should have CODEX_HOME with expanded path
+            import os
+            expected_path = os.path.expanduser("~/.codex-profiles/account-a")
+            assert env["CODEX_HOME"] == expected_path

{ai_code_switcher-0.1.5 → ai_code_switcher-0.1.7}/tests/test_launcher.py

@@ -72,3 +72,36 @@ def test_prepare_env_login_clears_api_vars():
         # Should be cleared
         assert "ANTHROPIC_BASE_URL" not in env
         assert "ANTHROPIC_AUTH_TOKEN" not in env
+
+
+def test_prepare_env_codex_api_mode():
+    """Test environment preparation for codex API mode"""
+    profile = ApiProfile(
+        name="test-codex-api",
+        type="codex",
+        base_url="https://api.openai.com/v1",
+        api_key="sk-test"
+    )
+
+    env = prepare_environment(profile)
+
+    # Should have both OPENAI_API_KEY and OPENAI_BASE_URL
+    assert env["OPENAI_API_KEY"] == "sk-test"
+    assert env["OPENAI_BASE_URL"] == "https://api.openai.com/v1"
+
+
+def test_prepare_env_codex_login_mode():
+    """Test environment preparation for codex login mode"""
+    profile = LoginProfile(
+        name="test-codex-login",
+        type="codex",
+        credentials_path="~/.codex-profiles/account-a"
+    )
+
+    env = prepare_environment(profile)
+
+    # Should NOT have API environment variables
+    assert "OPENAI_API_KEY" not in env
+    # Should have CODEX_HOME with expanded path
+    expected_path = os.path.expanduser("~/.codex-profiles/account-a")
+    assert env["CODEX_HOME"] == expected_path

ai_code_switcher-0.1.5/src/code_ai/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.5"