ai-code-switcher 0.1.16__tar.gz → 0.1.18__tar.gz

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/PKG-INFO

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

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/README.md

@@ -4,7 +4,7 @@ Switch AI coding tool profiles and launch the correct CLI.
 
 ## Features
 
-- Manage multiple AI coding tool profiles for Claude, Codex, and Gemini
+- Manage multiple AI coding tool profiles for Claude, Codex, and Grok
 - Switch between API-mode and login-mode profiles
 - Launch the matching CLI through one command entrypoint
 - Per-profile default launch arguments (e.g., always pass `--model ...`)
@@ -39,7 +39,7 @@ code-ai show <profile-name>
 Launch a profile:
 
 ```bash
-code-ai run fox-gemini
+code-ai run fox-grok
 code-ai run 4399
 code-ai run fox-claude -p "hi"
 code-ai run --no-default-args fox-claude --model sonnet  # bypass profile defaults
@@ -102,7 +102,7 @@ This upgrades:
 
 - `@anthropic-ai/claude-code`
 - `@openai/codex`
-- `@google/gemini-cli`
+- `@xai-official/grok`
 
 Version:
 
@@ -120,6 +120,10 @@ code-ai --help
 
 Profiles are stored under `~/.code-ai/config.yaml`.
 
+Grok profiles support both modes. API mode sets `XAI_API_KEY` and optionally
+`GROK_CLI_CHAT_PROXY_BASE_URL`; login mode isolates browser credentials and
+configuration through `GROK_HOME`.
+
 ## Project Layout
 
 ```text
@@ -143,8 +147,9 @@ MIT
 ## Desktop launcher (`code-ai desktop`)
 
 A double-clickable GUI (Windows + macOS) that starts and Steam-style stops the
-Claude, ChatGPT, and Codex desktop apps. Each app has one button that toggles
-between **启动** (launch) and **中止** (stop), with a live running indicator.
+Claude, ChatGPT, and Codex desktop apps. Each detected app shows separate launch
+and stop actions; launch first stops any running instance so the new environment
+is applied cleanly.
 
 ```bash
 pip install ai-code-switcher[desktop]   # one-time: install the GUI deps

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/pyproject.toml

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

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/src/ai_code_switcher.egg-info/PKG-INFO

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

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/src/ai_code_switcher.egg-info/SOURCES.txt

@@ -29,6 +29,7 @@ src/code_ai/desktop/ui/icon.ico
 src/code_ai/desktop/ui/icon.png
 src/code_ai/desktop/ui/index.html
 src/code_ai/desktop/ui/style.css
+tests/test_cli_upgrade.py
 tests/test_desktop_app_import.py
 tests/test_desktop_apps.py
 tests/test_desktop_backend.py

ai_code_switcher-0.1.18/src/code_ai/__init__.py

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

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/src/code_ai/cli.py

@@ -128,7 +128,7 @@ def roll_claude_buddy_command(
 
 @app.command(name="upgrade")
 def upgrade_command():
-    """Upgrade claude, codex, and gemini CLI via npm"""
+    """Upgrade claude, codex, and grok CLI via npm"""
     upgrade()
 
 
@@ -277,7 +277,7 @@ def main(
     Examples:
       code-ai list                      List all profiles
       code-ai show fox-claude           Show profile details
-      code-ai run fox-gemini            Launch Gemini CLI with fox profile
+      code-ai run fox-grok              Launch Grok CLI with fox profile
       code-ai run 4399                  Launch Claude CLI with 4399 profile
       code-ai run fox-claude -p "hi"    Pass extra args to Claude CLI
     """
@@ -287,12 +287,12 @@ def main(
 UPGRADE_PACKAGES = [
     "@anthropic-ai/claude-code",
     "@openai/codex",
-    "@google/gemini-cli",
+    "@xai-official/grok",
 ]
 
 
 def upgrade():
-    typer.echo("Upgrading claude, codex, gemini CLI...")
+    typer.echo("Upgrading claude, codex, grok CLI...")
 
     # On Windows, npm is a .cmd file, need to use shell=True or npm.cmd
     if sys.platform == "win32":

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/src/code_ai/desktop/app.py

@@ -1,15 +1,10 @@
-import json
 import pathlib
 import sys
-import threading
-import time
 
 from .apps import APP_REGISTRY
 from .bridge import LauncherBridge
 from .platforms import get_backend
 
-POLL_SECONDS = 1.5
-
 
 def _ui_asset_path(name: str) -> pathlib.Path:
     return pathlib.Path(__file__).resolve().parent / "ui" / name
@@ -46,15 +41,4 @@ def run_gui():
         "AI Launcher", url=_ui_url(), js_api=bridge, width=760, height=560,
     )
     bridge._attach_window(window, webview.OPEN_DIALOG)
-
-    def poll():
-        while True:
-            time.sleep(POLL_SECONDS)
-            try:
-                payload = json.dumps(bridge._statuses())
-                window.evaluate_js(f"window.updateStatus({payload})")
-            except Exception:
-                break
-
-    threading.Thread(target=poll, daemon=True).start()
     webview.start(icon=_window_icon_path())

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/src/code_ai/desktop/bridge.py

@@ -63,8 +63,10 @@ class LauncherBridge:
         self._status[app_id] = status
         if not status.found:
             return {"ok": False, "error": "未检测到应用，请先配置路径"}
-        if self._backend.is_running(status):
-            return {"ok": False, "error": "应用已在运行，请先中止后再启动以应用环境变量"}
+        try:
+            self._backend.stop(status)
+        except Exception as exc:
+            return {"ok": False, "error": f"中止失败: {exc}"}
         env = merge_env(os.environ,
                         cfg.get_common_env(data),
                         cfg.get_app_env(data, app_id))

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/src/code_ai/desktop/platforms/windows.py

@@ -26,6 +26,8 @@ _IGNORED_PROCESS_NAMES = {
     "claude": ("cowork-svc.exe",),
 }
 
+_DESKTOP_PYTHON_ENV = "CODE_AI_DESKTOP_PYTHON"
+
 
 class WindowsBackend:
     # ---- detection ----
@@ -128,6 +130,15 @@ class WindowsBackend:
             subprocess.Popen([status.launch_target], env=env,
                              creationflags=_NO_WINDOW)
             return
+        if status.app_id == "codex":
+            # Codex's Windows app starts its own sandbox helpers from the MSIX
+            # package. Launching through the OS broker preserves package
+            # activation context and avoids direct WindowsApps process quirks.
+            subprocess.Popen(
+                ["explorer.exe", f"shell:AppsFolder\\{status.launch_target}"],
+                env=env, creationflags=_NO_WINDOW,
+            )
+            return
         # Brokered MSIX: launch the real binary directly when resolvable, so the
         # injected env actually reaches the app. Shell activation (explorer
         # shell:AppsFolder) runs it under an OS broker that strips our custom
@@ -182,10 +193,24 @@ class WindowsBackend:
             return ""
         return str(icon)
 
-    def create_shortcut(self) -> str:
+    @staticmethod
+    def _shortcut_python():
+        override = os.environ.get(_DESKTOP_PYTHON_ENV)
+        if override:
+            candidate = os.path.expandvars(os.path.expanduser(override.strip('"')))
+            if os.path.basename(candidate).lower() == "python.exe":
+                pythonw = os.path.join(os.path.dirname(candidate), "pythonw.exe")
+                if os.path.exists(pythonw):
+                    return pythonw
+            if os.path.exists(candidate):
+                return candidate
         pythonw = os.path.join(os.path.dirname(sys.executable), "pythonw.exe")
         if not os.path.exists(pythonw):
             pythonw = sys.executable
+        return pythonw
+
+    def create_shortcut(self) -> str:
+        pythonw = self._shortcut_python()
         icon = self._icon_path()
         paths = self._shortcut_paths()
         # Idempotent: if any shortcut already exists, do nothing (no shell-out).

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/src/code_ai/desktop/ui/app.js

@@ -29,10 +29,16 @@ function renderApps() {
       `<button class="cfg" title="专有设置">⚙</button>` +
       `<div class="title">${esc(a.display)}</div>` +
       `<div class="status" id="status-${esc(a.id)}"></div>` +
-      `<button class="action" id="btn-${esc(a.id)}"></button>`;
+      `<div class="card-actions">` +
+      `<button class="action" id="btn-launch-${esc(a.id)}" data-mode="launch">启动</button>` +
+      `<button class="action" id="btn-stop-${esc(a.id)}" data-mode="stop">中止</button>` +
+      `<button class="action" id="btn-config-${esc(a.id)}" data-mode="config">配置路径</button>` +
+      `</div>`;
     grid.appendChild(card);
     updateCard(a.id, a.found, a.running);
-    document.getElementById(`btn-${a.id}`).onclick = () => onAction(a.id);
+    document.getElementById(`btn-launch-${a.id}`).onclick = () => onAction(a.id, "launch");
+    document.getElementById(`btn-stop-${a.id}`).onclick = () => onAction(a.id, "stop");
+    document.getElementById(`btn-config-${a.id}`).onclick = () => onAction(a.id, "config");
     card.querySelector(".cfg").onclick = () => openAppSettings(a.id);
   }
 }
@@ -41,22 +47,29 @@ function updateCard(id, found, running) {
   const a = findApp(id);
   if (a) { a.found = found; a.running = running; }
   const s = document.getElementById(`status-${id}`);
-  const b = document.getElementById(`btn-${id}`);
-  if (!s || !b) return;
+  const launch = document.getElementById(`btn-launch-${id}`);
+  const stop = document.getElementById(`btn-stop-${id}`);
+  const config = document.getElementById(`btn-config-${id}`);
+  if (!s || !launch || !stop || !config) return;
   if (!found) {
     s.textContent = "⚠ 未检测到"; s.className = "status warn";
-    b.textContent = "配置路径"; b.dataset.mode = "config";
+    launch.disabled = true;
+    stop.disabled = true;
+    config.hidden = false;
   } else if (running) {
     s.textContent = "● 运行中"; s.className = "status on";
-    b.textContent = "中止"; b.dataset.mode = "stop";
+    launch.disabled = false;
+    stop.disabled = false;
+    config.hidden = true;
   } else {
     s.textContent = "○ 已停止"; s.className = "status off";
-    b.textContent = "启动"; b.dataset.mode = "launch";
+    launch.disabled = false;
+    stop.disabled = false;
+    config.hidden = true;
   }
 }
 
-async function onAction(id) {
-  const mode = document.getElementById(`btn-${id}`).dataset.mode;
+async function onAction(id, mode) {
   if (mode === "config") {
     const r = await api().pick_app_path(id);
     if (r && r.ok) await refresh();
@@ -77,13 +90,6 @@ async function refresh() {
   for (const a of APPS) updateCard(a.id, a.found, a.running);
 }
 
-window.updateStatus = (map) => {
-  for (const id in map) {
-    const a = findApp(id);
-    if (a) updateCard(id, a.found, map[id]);
-  }
-};
-
 function toast(msg) {
   const t = document.getElementById("toast");
   t.textContent = msg;

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/src/code_ai/desktop/ui/style.css

@@ -28,6 +28,12 @@ header h1 { font-size: 16px; margin: 0; letter-spacing: .5px; }
 .status.on { color: #46d27e; }
 .status.off { color: #8a909a; }
 .status.warn { color: #e0a93b; }
+.card-actions {
+  width: 100%;
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 8px;
+}
 .action {
   width: 100%; padding: 9px 0; border-radius: 9px; border: none;
   cursor: pointer; font-size: 14px; font-weight: 600;
@@ -35,7 +41,9 @@ header h1 { font-size: 16px; margin: 0; letter-spacing: .5px; }
 }
 .action:hover { filter: brightness(1.08); }
 .action[data-mode="stop"] { background: #b5453d; }
-.action[data-mode="config"] { background: #4a5160; }
+.action[data-mode="config"] { background: #4a5160; grid-column: 1 / -1; }
+.action:disabled { opacity: .45; cursor: default; filter: none; }
+.action[hidden] { display: none; }
 .panel {
   padding: 18px 20px; border-top: 1px solid #262a31;
 }

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/src/code_ai/launcher.py

@@ -12,9 +12,12 @@ ENV_MAP = {
         "env": {"ANTHROPIC_BASE_URL": "base_url", "ANTHROPIC_AUTH_TOKEN": "token"},
         "cmd": "claude",
     },
-    "gemini": {
-        "env": {"GOOGLE_GEMINI_BASE_URL": "base_url", "GEMINI_API_KEY": "api_key"},
-        "cmd": "gemini",
+    "grok": {
+        "env": {
+            "GROK_CLI_CHAT_PROXY_BASE_URL": "base_url",
+            "XAI_API_KEY": "api_key",
+        },
+        "cmd": "grok",
     },
     "codex": {
         "env": {"OPENAI_BASE_URL": "base_url", "OPENAI_API_KEY": "api_key"},
@@ -24,6 +27,7 @@ ENV_MAP = {
 
 CONFIG_DIR_ENV_VARS = {
     "claude": "CLAUDE_CONFIG_DIR",
+    "grok": "GROK_HOME",
     "codex": "CODEX_HOME",
 }
 
@@ -63,7 +67,7 @@ def prepare_environment(profile):
         # Expand ~ to home directory
         credentials_path = os.path.expanduser(profile.credentials_path)
         # Set the appropriate config dir env var based on profile type
-        # Claude uses CLAUDE_CONFIG_DIR, Codex uses CODEX_HOME
+        # Each supported CLI exposes an environment variable for its home dir.
         config_dir_var = CONFIG_DIR_ENV_VARS.get(ptype)
         if config_dir_var:
             if not credentials_path:

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/src/code_ai/models.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, asdict, field
 from typing import List, Optional, Union
 
-VALID_TYPES = ("claude", "gemini", "codex")
+VALID_TYPES = ("claude", "grok", "codex")
 
 # default_args is stored in either form the user wrote it: a YAML list, or a
 # single command-line string parsed at use-site via shlex.split.
@@ -12,22 +12,22 @@ DefaultArgs = Optional[Union[List[str], str]]
 class BaseProfile:
     """Common fields for all profiles"""
     name: str
-    type: str                            # "claude" | "gemini" | "codex"
+    type: str                            # "claude" | "grok" | "codex"
     proxy: Optional[str] = None          # e.g., "http://127.0.0.1:7890"
     default_args: DefaultArgs = None     # appended after CLI extra_args at launch
 
 
 @dataclass
 class ApiProfile(BaseProfile):
-    """API mode: authenticate via base_url + token/api_key"""
+    """API mode: authenticate with a token/key and an optional endpoint."""
     base_url: str = ""
     token: Optional[str] = None      # Claude only
-    api_key: Optional[str] = None    # Gemini/Codex only
+    api_key: Optional[str] = None    # Grok/Codex only
 
 
 @dataclass
 class LoginProfile(BaseProfile):
-    """Login mode: authenticate via OAuth credentials directory (Claude/Codex)"""
+    """Login mode: authenticate via an isolated credentials directory."""
     credentials_path: str = ""       # Path to existing OAuth credentials
 
 
@@ -39,7 +39,7 @@ def profile_from_dict(data: dict) -> BaseProfile:
     proxy = data.get("proxy")
     default_args = data.get("default_args")
 
-    if (ptype == "claude" or ptype == "codex") and mode == "login":
+    if ptype in VALID_TYPES and mode == "login":
         return LoginProfile(
             name=name,
             type=ptype,

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/src/code_ai/profiles.py

@@ -55,8 +55,8 @@ def add_profile(config):
         "type": ptype,
     }
 
-    # Handle mode for Claude and Codex
-    if ptype in ("claude", "codex"):
+    # All supported CLIs can use either API credentials or isolated login state.
+    if ptype in VALID_TYPES:
         mode = input("Mode (api/login) [api]: ").strip().lower() or "api"
         if mode not in ("api", "login"):
             print("Error: mode must be 'api' or 'login'.")
@@ -69,26 +69,28 @@ def add_profile(config):
                 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:
+            prompt = (
+                "Base URL (optional, leave blank for xAI default): "
+                if ptype == "grok"
+                else "Base URL: "
+            )
+            base_url = input(prompt).strip()
+            if not base_url and ptype != "grok":
                 print("Error: base URL cannot be empty.")
                 sys.exit(1)
             if ptype == "claude":
                 token = input("Auth token: ").strip()
                 profile_data["base_url"] = base_url
                 profile_data["token"] = token
-            else:  # codex
+            elif ptype == "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.")
-            sys.exit(1)
-        api_key = input("API key: ").strip()
-        profile_data["base_url"] = base_url
-        profile_data["api_key"] = api_key
+            else:  # grok
+                api_key = input("API key: ").strip()
+                if base_url:
+                    profile_data["base_url"] = base_url
+                profile_data["api_key"] = api_key
 
     # Optional proxy for all types
     proxy = input("Proxy (optional, e.g., http://127.0.0.1:7890): ").strip()
@@ -119,8 +121,8 @@ def show_profile(config, name):
     print(f"Profile: {name}")
     print(f"Type: {profile.type}")
 
-    # Display mode for Claude and Codex types
-    if profile.type in ("claude", "codex"):
+    # Display authentication mode and its relevant fields.
+    if profile.type in VALID_TYPES:
         mode = profile_dict.get("mode", "api")
         print(f"Mode: {mode}")
 
@@ -133,15 +135,10 @@ def show_profile(config, name):
                 token = profile_dict.get("token", "N/A")
                 print(f"Base URL: {base_url}")
                 print(f"Token: {token}")
-            else:  # codex
+            else:  # codex or grok
                 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}")
-        print(f"API Key: {api_key}")
 
     # Display proxy if set
     if profile.proxy:

ai_code_switcher-0.1.18/tests/test_cli_upgrade.py

@@ -0,0 +1,6 @@
+from src.code_ai.cli import UPGRADE_PACKAGES
+
+
+def test_upgrade_packages_use_official_grok_cli_instead_of_gemini():
+    assert "@xai-official/grok" in UPGRADE_PACKAGES
+    assert "@google/gemini-cli" not in UPGRADE_PACKAGES

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/tests/test_desktop_app_import.py

@@ -22,6 +22,15 @@ def test_ui_assets_are_packaged():
     assert (ui / "app.js").is_file()
 
 
+def test_ui_lists_launch_and_stop_actions_without_status_push_hook():
+    from pathlib import Path
+    script = (Path(app_mod.__file__).parent / "ui" / "app.js").read_text(encoding="utf-8")
+
+    assert 'onAction(a.id, "launch")' in script
+    assert 'onAction(a.id, "stop")' in script
+    assert "window.updateStatus" not in script
+
+
 def test_ui_url_is_file_uri():
     # pywebview must receive a file:// URI (not a bare OS path) so the window
     # actually renders and relative asset links resolve.
@@ -135,3 +144,36 @@ def test_run_gui_exposes_only_js_api_methods_to_pywebview(monkeypatch, tmp_path)
         "save_settings",
         "stop_app",
     }
+
+
+def test_run_gui_does_not_start_background_status_poll(monkeypatch, tmp_path):
+    captured = {"threads": []}
+    fake_window = _FakeWindow()
+
+    def create_window(_title, url, js_api, width, height):
+        return fake_window
+
+    class Thread:
+        def __init__(self, *args, **kwargs):
+            captured["threads"].append((args, kwargs))
+
+        def start(self):
+            raise AssertionError("run_gui must not start a background poll thread")
+
+    fake_webview = types.SimpleNamespace(
+        OPEN_DIALOG=20,
+        create_window=create_window,
+        start=lambda **kwargs: captured.update(start_kwargs=kwargs),
+    )
+
+    monkeypatch.setitem(sys.modules, "webview", fake_webview)
+    monkeypatch.setattr(app_mod, "get_backend", lambda: _FakeBackend())
+    monkeypatch.setattr(app_mod, "threading", types.SimpleNamespace(Thread=Thread), raising=False)
+    monkeypatch.setattr(
+        "src.code_ai.desktop.config.DESKTOP_CONFIG_FILE",
+        tmp_path / "desktop.yaml",
+    )
+
+    app_mod.run_gui()
+
+    assert captured["threads"] == []

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/tests/test_desktop_bridge.py

@@ -26,18 +26,21 @@ class FakeBackend:
         self.running = running
         self.launched = None
         self.stopped = None
+        self.calls = []
 
     def detect(self, app, override):
         return AppStatus(app.id, found=self.found, direct=False,
                          launch_target="t", match_root="r")
 
     def launch(self, status, env):
+        self.calls.append("launch")
         self.launched = (status, env)
 
     def is_running(self, status):
         return self.running
 
     def stop(self, status):
+        self.calls.append("stop")
         self.stopped = status
 
     def proxy_enabled(self):
@@ -103,15 +106,16 @@ def test_launch_merges_env_with_per_app_winning():
             assert env["A_ONLY"] == "2"
 
 
-def test_launch_blocked_when_app_already_running():
+def test_launch_stops_running_app_before_starting():
     with temp_desktop_config() as f:
         with patch("src.code_ai.desktop.config.DESKTOP_CONFIG_FILE", f):
             be = FakeBackend(found=True, proxy=True, running=True)
             b = LauncherBridge(be, APP_REGISTRY)
             result = b.launch_app("claude")
-            assert result["ok"] is False
-            assert "已在运行" in result["error"]
-            assert be.launched is None
+            assert result["ok"] is True
+            assert be.calls == ["stop", "launch"]
+            assert be.stopped is not None
+            assert be.launched is not None
 
 
 def test_stop_app_not_found_returns_error():

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/tests/test_desktop_windows.py

@@ -218,6 +218,33 @@ def test_create_shortcut_quotes_paths_for_powershell(monkeypatch, tmp_path):
     assert captured["creationflags"] == windows._NO_WINDOW
 
 
+def test_create_shortcut_uses_desktop_python_env(monkeypatch, tmp_path):
+    home = tmp_path / "home"
+    home.mkdir()
+    pyhome = tmp_path / "py312"
+    pyhome.mkdir()
+    python = pyhome / "python.exe"
+    pythonw = pyhome / "pythonw.exe"
+    python.write_text("x")
+    pythonw.write_text("x")
+    monkeypatch.setenv("CODE_AI_DESKTOP_PYTHON", str(python))
+    monkeypatch.setattr(windows.os.path, "expanduser",
+                        lambda p: str(home) if p == "~" else p)
+    monkeypatch.delenv("APPDATA", raising=False)
+    monkeypatch.setattr(windows.WindowsBackend, "_icon_path", lambda self: r"C:\nope\icon.ico")
+
+    captured = {}
+    monkeypatch.setattr(windows.subprocess, "run",
+                        lambda argv, check=False, creationflags=0: captured.update(
+                            argv=argv, creationflags=creationflags))
+
+    be = windows.WindowsBackend()
+    be.create_shortcut()
+
+    script = captured["argv"][-1]
+    assert f"$s.TargetPath = '{pythonw}'" in script
+
+
 def _make_fake_msix(tmp_path, app_id="ChatGPT", exe_rel="app\\ChatGPT.exe"):
     """Create a fake MSIX InstallLocation: an AppxManifest.xml + on-disk exe.
 
@@ -326,6 +353,25 @@ def test_launch_brokered_prefers_real_exe_so_env_propagates(monkeypatch, tmp_pat
     assert calls["creationflags"] == windows._NO_WINDOW
 
 
+def test_launch_codex_uses_broker_to_preserve_msix_context(monkeypatch, tmp_path):
+    _make_fake_msix(tmp_path, app_id="App", exe_rel="app\\Codex.exe")
+    calls = {}
+    monkeypatch.setattr(windows.subprocess, "Popen",
+                        lambda argv, env=None, creationflags=0: calls.update(
+                            argv=argv, env=env, creationflags=creationflags))
+    be = windows.WindowsBackend()
+    st = AppStatus("codex", found=True, direct=False,
+                   launch_target="OpenAI.Codex_2p2nqsd0c76g0!App",
+                   match_root=str(tmp_path))
+    be.launch(st, {"INJECTED": "1"})
+    assert calls["argv"] == [
+        "explorer.exe",
+        "shell:AppsFolder\\OpenAI.Codex_2p2nqsd0c76g0!App",
+    ]
+    assert calls["env"] == {"INJECTED": "1"}
+    assert calls["creationflags"] == windows._NO_WINDOW
+
+
 def test_launch_brokered_falls_back_to_explorer_on_popen_oserror(monkeypatch, tmp_path):
     # The exe resolves, but launching it raises OSError (e.g. a TOCTOU delete
     # or permission denial between the isfile check and Popen). launch must

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/tests/test_integration.py

@@ -175,33 +175,6 @@ class TestBackwardCompatibility:
                     list_profiles(config)
                     assert mock_print.called
 
-                gemini_config = {
-                    "profiles": {
-                        "legacy-gemini": {
-                            "type": "gemini",
-                            "base_url": "https://generativelanguage.googleapis.com",
-                            "api_key": "AIza-test-key",
-                        }
-                    }
-                }
-                save_config(gemini_config)
-
-                config = load_config()
-                profile_dict = config["profiles"]["legacy-gemini"]
-                assert profile_dict["name"] == "legacy-gemini"
-                assert profile_dict["mode"] == "api"
-
-                profile = profile_from_dict(profile_dict)
-                assert isinstance(profile, ApiProfile)
-                assert profile.name == "legacy-gemini"
-                assert profile.type == "gemini"
-                assert profile.api_key == "AIza-test-key"
-
-                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"""
 
@@ -305,3 +278,62 @@ class TestCodexProfiles:
                 env = prepare_environment(profile)
                 assert "OPENAI_API_KEY" not in env
                 assert env["CODEX_HOME"] == os.path.expanduser("~/.codex-profiles/account-a")
+
+
+class TestGrokProfiles:
+    """Test official Grok CLI profile workflows."""
+
+    def test_grok_api_profile(self):
+        with temp_config_file() as config_file:
+            with patch("src.code_ai.config.CONFIG_FILE", config_file):
+                save_config({"profiles": {}})
+                inputs = [
+                    "my-grok-api",
+                    "grok",
+                    "api",
+                    "",  # use the official xAI endpoint
+                    "xai-test-key",
+                    "",  # proxy
+                    "",  # default_args
+                ]
+
+                with patch("builtins.input", side_effect=inputs):
+                    config = add_profile(load_config())
+                    save_config(config)
+
+                profile_dict = load_config()["profiles"]["my-grok-api"]
+                assert profile_dict["type"] == "grok"
+                assert profile_dict["mode"] == "api"
+                assert "base_url" not in profile_dict
+                assert profile_dict["api_key"] == "xai-test-key"
+
+                env = prepare_environment(profile_from_dict(profile_dict))
+                assert env["XAI_API_KEY"] == "xai-test-key"
+                assert "GROK_CLI_CHAT_PROXY_BASE_URL" not in env
+
+    def test_grok_login_profile(self):
+        with temp_config_file() as config_file:
+            with patch("src.code_ai.config.CONFIG_FILE", config_file):
+                save_config({"profiles": {}})
+                inputs = [
+                    "my-grok-login",
+                    "grok",
+                    "login",
+                    "~/.grok-profiles/account-a",
+                    "",  # proxy
+                    "",  # default_args
+                ]
+
+                with patch("builtins.input", side_effect=inputs):
+                    config = add_profile(load_config())
+                    save_config(config)
+
+                profile_dict = load_config()["profiles"]["my-grok-login"]
+                assert profile_dict["type"] == "grok"
+                assert profile_dict["mode"] == "login"
+
+                env = prepare_environment(profile_from_dict(profile_dict))
+                assert env["GROK_HOME"] == os.path.expanduser(
+                    "~/.grok-profiles/account-a"
+                )
+                assert "XAI_API_KEY" not in env

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/tests/test_launcher.py

@@ -3,6 +3,7 @@ import pytest
 from unittest.mock import patch, MagicMock
 from src.code_ai.models import ApiProfile, LoginProfile
 from src.code_ai.launcher import (
+    ENV_MAP,
     prepare_environment,
     resolve_default_args,
     merge_launch_args,
@@ -31,6 +32,9 @@ def test_prepare_env_api_mode_clears_stale_managed_vars():
         "ANTHROPIC_AUTH_TOKEN": "old-token",
         "CLAUDE_CONFIG_DIR": "/tmp/old-claude",
         "OPENAI_API_KEY": "old-openai-key",
+        "XAI_API_KEY": "old-xai-key",
+        "GROK_CLI_CHAT_PROXY_BASE_URL": "https://old-grok.url",
+        "GROK_HOME": "/tmp/old-grok",
         "HTTP_PROXY": "http://127.0.0.1:9999",
         "HTTPS_PROXY": "http://127.0.0.1:9999",
     }):
@@ -47,6 +51,9 @@ def test_prepare_env_api_mode_clears_stale_managed_vars():
         assert env["ANTHROPIC_AUTH_TOKEN"] == "sk-ant-test"
         assert "CLAUDE_CONFIG_DIR" not in env
         assert "OPENAI_API_KEY" not in env
+        assert "XAI_API_KEY" not in env
+        assert "GROK_CLI_CHAT_PROXY_BASE_URL" not in env
+        assert "GROK_HOME" not in env
         assert "HTTP_PROXY" not in env
         assert "HTTPS_PROXY" not in env
 
@@ -73,9 +80,9 @@ def test_prepare_env_with_proxy():
     """Test environment preparation with proxy"""
     profile = ApiProfile(
         name="test-proxy",
-        type="gemini",
-        base_url="https://generativelanguage.googleapis.com",
-        api_key="AIza-test",
+        type="grok",
+        base_url="https://api.x.ai/v1",
+        api_key="xai-test",
         proxy="http://127.0.0.1:7890"
     )
 
@@ -85,6 +92,57 @@ def test_prepare_env_with_proxy():
     assert env["HTTPS_PROXY"] == "http://127.0.0.1:7890"
 
 
+def test_gemini_is_not_a_supported_launcher():
+    assert "gemini" not in ENV_MAP
+    assert ENV_MAP["grok"]["cmd"] == "grok"
+
+    with pytest.raises(ValueError, match="Unknown profile type 'gemini'"):
+        prepare_environment(
+            ApiProfile(name="legacy-gemini", type="gemini", api_key="old-key")
+        )
+
+
+def test_prepare_env_grok_api_mode():
+    profile = ApiProfile(
+        name="test-grok-api",
+        type="grok",
+        base_url="https://grok-proxy.example/v1",
+        api_key="xai-test",
+    )
+
+    env = prepare_environment(profile)
+
+    assert env["XAI_API_KEY"] == "xai-test"
+    assert env["GROK_CLI_CHAT_PROXY_BASE_URL"] == "https://grok-proxy.example/v1"
+
+
+def test_prepare_env_grok_api_mode_allows_default_endpoint():
+    profile = ApiProfile(
+        name="test-grok-api",
+        type="grok",
+        api_key="xai-test",
+    )
+
+    env = prepare_environment(profile)
+
+    assert env["XAI_API_KEY"] == "xai-test"
+    assert "GROK_CLI_CHAT_PROXY_BASE_URL" not in env
+
+
+def test_prepare_env_grok_login_mode():
+    profile = LoginProfile(
+        name="test-grok-login",
+        type="grok",
+        credentials_path="~/.grok-profiles/account-a",
+    )
+
+    env = prepare_environment(profile)
+
+    assert "XAI_API_KEY" not in env
+    assert "GROK_CLI_CHAT_PROXY_BASE_URL" not in env
+    assert env["GROK_HOME"] == os.path.expanduser("~/.grok-profiles/account-a")
+
+
 def test_prepare_env_login_clears_api_vars():
     """Test that login mode clears API environment variables"""
     # Set up environment with existing API variables

{ai_code_switcher-0.1.16 → ai_code_switcher-0.1.18}/tests/test_models.py

@@ -33,9 +33,9 @@ def test_profile_with_proxy():
     """Test profile with proxy"""
     profile = ApiProfile(
         name="test-proxy",
-        type="gemini",
-        base_url="https://generativelanguage.googleapis.com",
-        api_key="AIza-test",
+        type="grok",
+        base_url="https://api.x.ai/v1",
+        api_key="xai-test",
         proxy="http://127.0.0.1:7890"
     )
     assert profile.proxy == "http://127.0.0.1:7890"
@@ -69,6 +69,19 @@ def test_profile_from_dict_login_mode():
     assert profile.credentials_path == "~/.claude-profiles/account-a"
     assert profile.proxy == "http://127.0.0.1:7890"
 
+
+def test_profile_from_dict_grok_login_mode():
+    """Grok login profiles isolate browser credentials with GROK_HOME."""
+    data = {
+        "name": "my-grok-login",
+        "type": "grok",
+        "mode": "login",
+        "credentials_path": "~/.grok-profiles/account-a",
+    }
+    profile = profile_from_dict(data)
+    assert isinstance(profile, LoginProfile)
+    assert profile.credentials_path == "~/.grok-profiles/account-a"
+
 def test_profile_from_dict_defaults_to_api():
     """Test that missing mode defaults to api"""
     data = {
@@ -112,7 +125,7 @@ def test_profile_to_dict_login():
 
 def test_valid_types():
     """Test VALID_TYPES constant"""
-    assert VALID_TYPES == ("claude", "gemini", "codex")
+    assert VALID_TYPES == ("claude", "grok", "codex")
 
 
 def test_profile_from_dict_default_args_list():
@@ -146,9 +159,8 @@ def test_profile_from_dict_default_args_missing_is_none():
     """Profiles without default_args default to None (backward-compat)."""
     data = {
         "name": "p",
-        "type": "gemini",
-        "base_url": "https://generativelanguage.googleapis.com",
-        "api_key": "AIza-x",
+        "type": "grok",
+        "api_key": "xai-x",
     }
     profile = profile_from_dict(data)
     assert profile.default_args is None

ai_code_switcher-0.1.16/src/code_ai/__init__.py

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