superqode 0.2.8__tar.gz → 0.2.9__tar.gz

{superqode-0.2.8 → superqode-0.2.9}/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.9] - 2026-07-09
+
+### Added
+
+- **Grok subscription profile (`:connect grok`)** - New connection profile that runs xAI's official Grok Build coding agent through its native ACP server (`grok agent stdio`) on an eligible SuperGrok/X Premium+ account. Includes agent-registry and discovery entries, a `:grok` command surface (`connect`, `status`, `login`, `help`), completion/suggestion wiring, and docs across the provider, CLI-reference, connection-profiles, and TUI pages.
+- **Opt-in direct API on the Grok subscription (`:grok api`)** - Explicitly imports the local `grok login` session token into SuperQode's 0600 auth store and connects the new `grok-cli` provider against the CLI chat proxy xAI documents (`https://cli-chat-proxy.grok.com/v1`), sending the required `X-XAI-Token-Auth` and `x-grok-model-override` headers. `:grok api off` removes the token; `:grok status` reports token state. The default ACP path still never reads the CLI's credentials.
+- **Grok 4.5 in the xAI BYOK catalog** - Added `grok-4.5` (500K context, reasoning efforts, vision), `grok-4.3` (1M context), and `grok-build-0.1` with current pricing; refreshed registry example models, base URL, and docs links.
+- **`ProviderDef.extra_headers`** - Curated providers can now declare required HTTP headers (with a `{model}` placeholder) applied per-request by the LiteLLM gateway, and can opt into per-request `api_base`/`api_key` routing without env mutation.
+
+### Fixed
+
+- **Stale models.dev cache hiding new models** - A months-old on-disk models.dev cache no longer replaces newer curated builtin model lists (it previously hid day-one models like `grok-4.5` and mispriced lookups via fuzzy matching). Live provider lists now only override builtins when they are at least as new by release date.
+- **Retired xAI models removed** - Dropped `grok-3`, `grok-3-mini`, `grok-2`, and `grok-beta` from the BYOK pickers to match xAI's current catalog; video-generation models are now excluded from chat model lists.
+
+### Changed
+
+- **Release metadata** - Bumped the package version, runtime `__version__`, lockfile package entry, and ACP registry metadata to `0.2.9`.
+
 ## [0.2.8] - 2026-07-07
 
 ### Added

{superqode-0.2.8/src/superqode.egg-info → superqode-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superqode
-Version: 0.2.8
+Version: 0.2.9
 Summary: SuperQode: harness engineering framework for coding agents, optimized for local and open models
 Author-email: Shashi Jagtap <info@super-agentic.ai>
 Maintainer-email: Shashi Jagtap <info@super-agentic.ai>
@@ -356,6 +356,7 @@ Inside the TUI, start with `:help` and these commands:
 :connect codex        # Codex SDK with local Codex login
 :connect claude       # Claude Code through ACP
 :connect antigravity  # local Antigravity CLI handoff
+:connect grok         # Grok Build via the official Grok CLI (subscription)
 :connect byok         # hosted provider/API-key path
 :connect local        # local model provider
 :tree                 # saved session branches

{superqode-0.2.8 → superqode-0.2.9}/README.md

@@ -228,6 +228,7 @@ Inside the TUI, start with `:help` and these commands:
 :connect codex        # Codex SDK with local Codex login
 :connect claude       # Claude Code through ACP
 :connect antigravity  # local Antigravity CLI handoff
+:connect grok         # Grok Build via the official Grok CLI (subscription)
 :connect byok         # hosted provider/API-key path
 :connect local        # local model provider
 :tree                 # saved session branches

{superqode-0.2.8 → superqode-0.2.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "superqode"
-version = "0.2.8"
+version = "0.2.9"
 description = "SuperQode: harness engineering framework for coding agents, optimized for local and open models"
 readme = "README.md"
 license = "Apache-2.0"

{superqode-0.2.8 → superqode-0.2.9}/src/superqode/__init__.py

@@ -30,4 +30,4 @@ __all__ = [
     "sidebar",
 ]
 
-__version__ = "0.2.8"
+__version__ = "0.2.9"

{superqode-0.2.8 → superqode-0.2.9}/src/superqode/acp_discovery.py

@@ -212,6 +212,21 @@ KNOWN_AGENTS: List[Dict[str, Any]] = [
         "check_command": ["codex", "--version"],
     },
     # =========================================================================
+    # Grok Build - xAI's official CLI with native ACP support
+    # =========================================================================
+    {
+        "name": "Grok Build",
+        "short_name": "grok",
+        "command": ["grok", "agent", "stdio"],
+        "icon": "G",
+        "color": "#e5e7eb",
+        "description": "xAI's official Grok Build coding agent with native ACP support",
+        "website": "https://x.ai/cli",
+        "requires_api_key": False,
+        "api_key_env_vars": ["XAI_API_KEY", "GROK_CODE_XAI_API_KEY"],
+        "check_command": ["grok", "--version"],
+    },
+    # =========================================================================
     # 4. JetBrains Junie - JetBrains AI Agent
     # =========================================================================
     {
@@ -659,6 +674,39 @@ class ACPDiscovery:
                     id="gpt-4o", name="GPT-4o", provider="openai", description="Multimodal GPT"
                 ),
             ],
+            # Grok Build follows the signed-in account's current default. The
+            # bare "grok-build" id is the CLI's own default-model alias; the
+            # rest are real xAI model ids a user can pin explicitly.
+            "grok": [
+                AgentModel(
+                    id="grok-build",
+                    name="Grok Build (account default)",
+                    provider="xai",
+                    description="Official Grok Build default alias, currently Grok 4.5",
+                    context_window=500000,
+                ),
+                AgentModel(
+                    id="grok-4.5",
+                    name="Grok 4.5",
+                    provider="xai",
+                    description="xAI's flagship model for agentic coding and reasoning",
+                    context_window=500000,
+                ),
+                AgentModel(
+                    id="grok-build-0.1",
+                    name="Grok Build 0.1",
+                    provider="xai",
+                    description="Fast coding model tuned for agentic engineering loops",
+                    context_window=256000,
+                ),
+                AgentModel(
+                    id="grok-4.3",
+                    name="Grok 4.3",
+                    provider="xai",
+                    description="1M-context Grok for document-heavy work",
+                    context_window=1000000,
+                ),
+            ],
             # JetBrains Junie
             "junie": [
                 AgentModel(id="auto", name="Auto", description="Automatic model selection"),

superqode-0.2.9/src/superqode/agents/data/x.ai.toml

@@ -0,0 +1,81 @@
+# Official Grok CLI agent entry.
+# https://x.ai/cli
+
+identity = "x.ai"
+name = "Grok Build"
+short_name = "grok"
+url = "https://x.ai/cli"
+protocol = "acp"
+author_name = "xAI"
+author_url = "https://x.ai"
+publisher_name = "SuperQode"
+publisher_url = "https://github.com/SuperagenticAI/superqode"
+type = "coding"
+description = "xAI's official Grok Build coding agent, connected through its native ACP server."
+tags = ["xai", "grok", "subscription", "byok", "acp"]
+run_command."*" = "grok agent stdio"
+api_key_env_vars = ["XAI_API_KEY", "GROK_CODE_XAI_API_KEY"]
+
+help = '''
+# Grok Build
+
+Grok Build is xAI's official coding agent. SuperQode starts its native ACP server with:
+
+```bash
+grok agent stdio
+```
+
+## Install
+
+```bash
+# macOS / Linux / WSL
+curl -fsSL https://x.ai/cli/install.sh | bash
+
+# Windows PowerShell
+irm https://x.ai/cli/install.ps1 | iex
+```
+
+## Subscription login
+
+Grok Build is available to eligible SuperGrok and X Premium+ accounts.
+Authenticate the official CLI before connecting:
+
+```bash
+grok login
+```
+
+For an SSH or headless machine, use device authentication:
+
+```bash
+grok login --device-auth
+```
+
+Then connect in SuperQode with `:connect grok` or `superqode --connect grok`.
+The official CLI keeps subscription credentials locally (`~/.grok/auth.json`);
+SuperQode does not copy the token. Eligibility and available models are
+determined by xAI for the signed-in account.
+
+## Models
+
+Grok Build defaults to its `grok-build` alias (currently Grok 4.5). Pin a
+specific model from SuperQode with `:grok connect grok-4.5` or
+`:grok connect grok-build-0.1`; the hint is forwarded through ACP.
+
+## Direct API on your subscription (opt-in)
+
+`:grok api [model]` imports the local `grok login` session token into
+SuperQode's own auth store and connects the `grok-cli` provider against the
+CLI chat proxy documented by xAI. Remove it anytime with `:grok api off`.
+CLI sessions last about 7 days; re-run `grok login` when they expire.
+
+## BYOK
+
+For direct xAI API usage, set `XAI_API_KEY` and connect `xai/grok-4.5` through
+the BYOK provider picker. API usage is billed separately from a consumer
+subscription. The CLI itself also accepts `GROK_CODE_XAI_API_KEY` for
+headless, key-based runs.
+'''
+
+[actions."*".install]
+command = "curl -fsSL https://x.ai/cli/install.sh | bash"
+description = "Install the official Grok CLI"

{superqode-0.2.8 → superqode-0.2.9}/src/superqode/app/constants.py

@@ -141,6 +141,7 @@ AGENT_COLORS = {
     "claude": "#d97706",  # Anthropic Orange
     "claude-code": "#d97706",  # Anthropic Orange
     "codex": "#10b981",  # Green
+    "grok": "#e5e7eb",  # xAI neutral, readable on the dark TUI
     "junie": "#fe315d",  # JetBrains Pink
     "goose": "#8b5cf6",  # Block Purple
     "kimi": "#5b21b6",  # Moonshot Deep Purple
@@ -162,6 +163,7 @@ AGENT_ICONS = {
     "claude": "🧡",  # Orange heart - Anthropic's warm AI
     "claude-code": "🧡",  # Orange heart - Anthropic's warm AI
     "codex": "📜",  # Scroll
+    "grok": "G",  # Grok Build
     "junie": "🧠",  # Brain - JetBrains intelligence
     "goose": "🦆",  # Duck - Block's Goose
     "kimi": "🌙",  # Moon - Moonshot AI's Kimi
@@ -251,6 +253,7 @@ COMMANDS = [
     ":connect codex",
     ":connect claude",
     ":connect antigravity",
+    ":connect grok",
     ":connect byok",
     ":connect local",
     ":connect acp",
@@ -266,6 +269,10 @@ COMMANDS = [
     ":antigravity migrate",
     ":antigravity launch",
     ":agy",
+    ":grok",
+    ":grok status",
+    ":grok login",
+    ":grok api",
     ":exit",
     ":quit",
     ":help",

{superqode-0.2.8 → superqode-0.2.9}/src/superqode/app/suggester.py

@@ -71,25 +71,28 @@ class CommandSuggester(Suggester):
                 ":connect": 0,
                 ":connect acp": 1,
                 ":connect antigravity": 2,
-                ":connect byok": 3,
-                ":connect local": 4,
-                ":exit": 5,
-                ":quit": 6,
+                ":connect grok": 3,
+                ":connect byok": 4,
+                ":connect local": 5,
+                ":exit": 6,
+                ":quit": 7,
             },
             ":c": {
                 ":connect": 0,
                 ":connect acp": 1,
                 ":connect antigravity": 2,
-                ":connect byok": 3,
-                ":connect local": 4,
+                ":connect grok": 3,
+                ":connect byok": 4,
+                ":connect local": 5,
                 ":clear": 20,
             },
             ":co": {
                 ":connect": 0,
                 ":connect acp": 1,
                 ":connect antigravity": 2,
-                ":connect byok": 3,
-                ":connect local": 4,
+                ":connect grok": 3,
+                ":connect byok": 4,
+                ":connect local": 5,
             },
             ":q": {
                 ":quit": 0,

{superqode-0.2.8 → superqode-0.2.9}/src/superqode/app_main.py

@@ -5856,6 +5856,8 @@ class SuperQodeApp(App):
             self._codex_cmd(args, log)
         elif c == "claude":
             self._claude_cmd(args, log)
+        elif c in ("grok", "xai-grok"):
+            self._grok_cmd(args, log)
         elif c in ("antigravity", "agy"):
             self._antigravity_cmd(args, log)
         elif c == "approve":
@@ -6027,8 +6029,8 @@ class SuperQodeApp(App):
                         log,
                         "Connect setup",
                     )
-                elif subcmd in ("codex", "claude", "antigravity"):
-                    # Product/runtime connection profiles (Codex, Claude, …).
+                elif subcmd in ("codex", "claude", "antigravity", "grok"):
+                    # Product/runtime connection profiles (Codex, Claude, Grok, …).
                     from superqode.providers.connection_profiles import get_connection_profile
 
                     profile = get_connection_profile(subcmd)
@@ -7806,6 +7808,7 @@ class SuperQodeApp(App):
                 ":connect",
                 ":connect acp",
                 ":connect antigravity",
+                ":connect grok",
                 ":connect byok",
                 ":connect local",
             ]
@@ -7852,25 +7855,28 @@ class SuperQodeApp(App):
                 ":connect": 0,
                 ":connect acp": 1,
                 ":connect antigravity": 2,
-                ":connect byok": 3,
-                ":connect local": 4,
-                ":exit": 5,
-                ":quit": 6,
+                ":connect grok": 3,
+                ":connect byok": 4,
+                ":connect local": 5,
+                ":exit": 6,
+                ":quit": 7,
             },
             ":c": {
                 ":connect": 0,
                 ":connect acp": 1,
                 ":connect antigravity": 2,
-                ":connect byok": 3,
-                ":connect local": 4,
+                ":connect grok": 3,
+                ":connect byok": 4,
+                ":connect local": 5,
                 ":clear": 20,
             },
             ":co": {
                 ":connect": 0,
                 ":connect acp": 1,
                 ":connect antigravity": 2,
-                ":connect byok": 3,
-                ":connect local": 4,
+                ":connect grok": 3,
+                ":connect byok": 4,
+                ":connect local": 5,
             },
             ":q": {
                 ":quit": 0,
@@ -10888,6 +10894,158 @@ class SuperQodeApp(App):
         )
         log.write(t)
 
+    # ---- xAI Grok Build :grok command surface ------------------------------
+    def _grok_cmd(self, args: str, log) -> None:
+        """Handle the official Grok CLI subscription and ACP connection flow."""
+        parts = (args or "").split(maxsplit=1)
+        sub = parts[0].strip().lower() if parts and parts[0].strip() else "connect"
+        rest = parts[1].strip() if len(parts) > 1 else ""
+        if sub in ("connect", "start"):
+            command = "grok" + (f" {rest}" if rest else "")
+            self._connect_acp_cmd(command, log)
+        elif sub == "api":
+            self._grok_api_cmd(rest, log)
+        elif sub in ("status", "doctor"):
+            self._show_grok_status(log)
+        elif sub in ("login", "auth"):
+            self._show_grok_login(log)
+        elif sub in ("help", "?"):
+            self._show_grok_help(log)
+        else:
+            log.add_error(f"Unknown grok command: {sub}")
+            log.add_info("Usage: :grok [connect [model]|api [model|off]|status|login|help]")
+
+    def _grok_api_cmd(self, rest: str, log) -> None:
+        """Opt-in: import the Grok CLI's session token for direct API calls.
+
+        The default `:connect grok` path never touches the CLI's credentials.
+        This command explicitly copies the local `grok login` session token
+        into SuperQode's auth store and connects the `grok-cli` BYOK provider,
+        which targets the CLI chat proxy documented by xAI.
+        """
+        from superqode.providers import grok_cli_auth
+
+        arg = (rest or "").strip()
+        if arg.lower() in ("off", "remove", "logout"):
+            if grok_cli_auth.remove_cli_token():
+                log.add_info("Removed the imported Grok CLI token from SuperQode's auth store.")
+            else:
+                log.add_info("No imported Grok CLI token to remove.")
+            return
+
+        model = arg or "grok-build"
+        for prefix in ("grok-cli/", "xai/", "grok/"):
+            if model.lower().startswith(prefix):
+                model = model[len(prefix) :]
+                break
+
+        auth = grok_cli_auth.import_cli_token()
+        if auth is None:
+            log.add_error("No Grok CLI login found (~/.grok/auth.json).")
+            log.add_info("Run `grok login` first, or use BYOK: :connect byok xai grok-4.5")
+            return
+        if auth.is_expired():
+            grok_cli_auth.remove_cli_token()
+            log.add_error("The Grok CLI session looks expired (CLI sessions last ~7 days).")
+            log.add_info("Run `grok login` again, then re-run :grok api.")
+            return
+
+        log.add_info("Imported the Grok CLI session token (stored in ~/.superqode/auth.json, 0600).")
+        log.add_info(
+            "Direct API calls use the xAI-documented CLI chat proxy on your subscription — "
+            "intended for interactive use. Remove anytime with :grok api off."
+        )
+        self._connect_byok_mode("grok-cli", model, log)
+
+    def _show_grok_status(self, log) -> None:
+        """Show local Grok CLI readiness without reading or displaying credentials."""
+        grok_path = shutil.which("grok")
+        auth_path = Path.home() / ".grok" / "auth.json"
+        has_api_key = bool(os.environ.get("XAI_API_KEY"))
+        t = Text()
+        t.append("\n  Grok Build status\n\n", style=f"bold {THEME['text']}")
+        t.append("    Binary    ", style=THEME["muted"])
+        t.append(
+            f"{grok_path or 'not found'}\n",
+            style=THEME["success" if grok_path else "warning"],
+        )
+        t.append("    CLI auth  ", style=THEME["muted"])
+        t.append(
+            "configured\n" if auth_path.exists() else "not found\n",
+            style=THEME["success" if auth_path.exists() else "dim"],
+        )
+        t.append("    BYOK      ", style=THEME["muted"])
+        t.append(
+            "XAI_API_KEY set\n" if has_api_key else "not set\n",
+            style=THEME["success" if has_api_key else "dim"],
+        )
+        try:
+            from superqode.providers.grok_cli_auth import cli_token_status
+
+            token = cli_token_status()
+        except Exception:  # noqa: BLE001 - status must never crash
+            token = {}
+        t.append("    API token ", style=THEME["muted"])
+        if token.get("imported") and not token.get("imported_expired"):
+            t.append("imported (:grok api off to remove)\n", style=THEME["success"])
+        elif token.get("imported"):
+            t.append("imported but expired — run `grok login`, then :grok api\n", style=THEME["warning"])
+        elif token.get("cli_login"):
+            t.append("available — run :grok api to use it for direct API calls\n", style=THEME["dim"])
+        else:
+            t.append("not imported\n", style=THEME["dim"])
+        t.append("    Default   ", style=THEME["muted"])
+        t.append("Grok Build (currently Grok 4.5)\n", style=THEME["text"])
+        t.append("\n  Commands:\n", style=THEME["muted"])
+        t.append("    grok login                ", style=THEME["cyan"])
+        t.append("sign in to an eligible X/SuperGrok account\n", style=THEME["muted"])
+        t.append("    grok login --device-auth  ", style=THEME["cyan"])
+        t.append("sign in from SSH or a headless host\n", style=THEME["muted"])
+        t.append("    :connect grok             ", style=THEME["cyan"])
+        t.append("start Grok Build through ACP\n", style=THEME["muted"])
+        t.append("    :grok api                 ", style=THEME["cyan"])
+        t.append("reuse the CLI login for direct API calls (opt-in)\n", style=THEME["muted"])
+        log.write(t)
+
+    def _show_grok_login(self, log) -> None:
+        """Give login commands instead of launching an interactive browser flow in the TUI."""
+        t = Text()
+        t.append("\n  Grok subscription login\n\n", style=f"bold {THEME['text']}")
+        t.append("  Run in a terminal:\n", style=THEME["muted"])
+        t.append("    grok login\n", style=THEME["cyan"])
+        t.append("\n  For SSH or a headless machine:\n", style=THEME["muted"])
+        t.append("    grok login --device-auth\n", style=THEME["cyan"])
+        t.append("\n  Then connect with:\n", style=THEME["muted"])
+        t.append("    :connect grok\n", style=THEME["cyan"])
+        t.append(
+            "\n  The official CLI stores and refreshes its own credentials locally. "
+            "SuperQode does not copy them.\n",
+            style=THEME["dim"],
+        )
+        log.write(t)
+
+    def _show_grok_help(self, log) -> None:
+        t = Text()
+        t.append("\n  Grok in SuperQode\n\n", style=f"bold {THEME['text']}")
+        t.append("  :connect grok              ", style=THEME["cyan"])
+        t.append("connect the official Grok Build ACP server\n", style=THEME["muted"])
+        t.append("  :grok connect grok-build   ", style=THEME["cyan"])
+        t.append("request the model advertised by the signed-in CLI\n", style=THEME["muted"])
+        t.append("  :grok api [model]          ", style=THEME["cyan"])
+        t.append("reuse the local `grok login` session for direct API calls\n", style=THEME["muted"])
+        t.append("  :grok api off              ", style=THEME["cyan"])
+        t.append("remove the imported session token\n", style=THEME["muted"])
+        t.append("  :grok status               ", style=THEME["cyan"])
+        t.append("check CLI and local auth readiness\n", style=THEME["muted"])
+        t.append("  :grok login                ", style=THEME["cyan"])
+        t.append("show browser and device-login commands\n", style=THEME["muted"])
+        t.append(
+            "\n  Subscription access and model eligibility are determined by xAI. "
+            "For direct API billing, use BYOK with XAI_API_KEY and xai/grok-4.5.\n",
+            style=THEME["dim"],
+        )
+        log.write(t)
+
     def _claude_runtime_or_connect(self, log):
         pure = getattr(self, "_pure_mode", None)
         runtime = getattr(pure, "_runtime", None) if pure is not None else None
@@ -15612,6 +15770,7 @@ class SuperQodeApp(App):
                 "vtcode",
                 "auggie",
                 "amp",
+                "grok",
             }
             if short_name in acp_agents:
                 model_name = self.current_model if self.current_model else "auto"
@@ -15688,6 +15847,7 @@ class SuperQodeApp(App):
             "vtcode",
             "auggie",
             "amp",
+            "grok",
         )
 
         if agent_type in acp_agents:
@@ -16008,7 +16168,7 @@ class SuperQodeApp(App):
     @staticmethod
     def _normalize_acp_model_id(agent_type: str, model: str) -> str | None:
         """Normalize a UI model value before sending it to an ACP agent."""
-        if not model or agent_type not in ("codex", "openhands", "opencode"):
+        if not model or agent_type not in ("codex", "grok", "openhands", "opencode"):
             return None
         normalized = model.strip()
         # "auto"/"default" is a UI placeholder meaning "let the agent
@@ -16018,6 +16178,8 @@ class SuperQodeApp(App):
             "default",
             "opencode/auto",
             "opencode/default",
+            "grok/auto",
+            "grok/default",
         ):
             return None
         # OpenCode model ids are provider/model pairs (for example
@@ -16025,6 +16187,14 @@ class SuperQodeApp(App):
         # bare ids; do not rewrite real provider ids.
         if agent_type == "opencode" and "/" not in normalized:
             return f"opencode/{normalized}"
+        # Grok Build expects bare xAI model ids (grok-4.5, grok-build-0.1) or
+        # its own "grok-build" default alias; strip UI/provider prefixes.
+        if agent_type == "grok":
+            for prefix in ("xai/", "grok/"):
+                if normalized.lower().startswith(prefix):
+                    normalized = normalized[len(prefix) :]
+                    break
+            return normalized or None
         return normalized
 
     def _run_acp_jsonrpc_client(
@@ -16082,6 +16252,14 @@ class SuperQodeApp(App):
                 self._call_ui(log.add_info, "  export OPENAI_API_KEY=sk-...")
                 self._call_ui(log.add_info, "  or export CODEX_API_KEY=sk-...")
                 return
+        elif agent_type == "grok":
+            command = "grok agent stdio"
+            model_display = f"grok/{model}" if model and model != "auto" else "grok/grok-build"
+            if shutil.which("grok") is None:
+                self._call_ui(self._stop_thinking)
+                self._call_ui(log.add_error, "Grok CLI not found. Install it before connecting.")
+                self._call_ui(log.add_info, "  curl -fsSL https://x.ai/cli/install.sh | bash")
+                return
         elif agent_type == "junie":
             command = "junie --acp"
             model_display = f"junie/{model}" if model else "junie/auto"
@@ -16617,6 +16795,11 @@ class SuperQodeApp(App):
                     if not ok:
                         self._acp_client = None
                         self._acp_client_key = None
+                        if agent_type == "grok":
+                            self._call_ui(
+                                log.add_info,
+                                "If Grok is not signed in, run `grok login` or `grok login --device-auth`, then retry.",
+                            )
                         return None, {}
 
                 # Store for cancellation cleanup
@@ -28801,6 +28984,8 @@ class SuperQodeApp(App):
             "geminicli": "💎",  # Gem (Gemini CLI)
             "codex": "📝",  # Memo/code
             "codex.openai.com": "📝",  # Memo/code
+            "grok": "G",  # Grok Build
+            "x.ai": "G",  # Grok Build
             "openclaw": "🦞",  # OpenClaw
             "openclaw.ai": "🦞",  # OpenClaw
             "goose": "🪿",  # Goose
@@ -28832,6 +29017,8 @@ class SuperQodeApp(App):
             "claude.com": 2,
             "codex": 3,
             "codex.openai.com": 3,
+            "grok": 4,
+            "x.ai": 4,
         }
 
         # Sort function: priority agents first, then alphabetically by name
@@ -29011,6 +29198,25 @@ class SuperQodeApp(App):
                         self._auto_select_codex_model(model_hint, agent, log)
                     else:
                         self._show_codex_models_selection(agent, log)
+                elif self.current_agent == "grok":
+                    # Grok Build owns the subscription and model catalog. Keep
+                    # the default unset so its signed-in account decides; an
+                    # explicit model hint is forwarded through ACP.
+                    self.current_model = (model_hint or "").strip()
+                    self.current_provider = "xai"
+                    self._awaiting_model_selection = False
+
+                    badge = self.query_one("#mode-badge", ModeBadge)
+                    badge.agent = self.current_agent
+                    badge.mode = ""
+                    badge.role = ""
+                    badge.model = self.current_model or "grok-build"
+                    badge.provider = self.current_provider
+                    badge.execution_mode = "acp"
+
+                    log.add_info("Connected to Grok Build via the official Grok CLI ACP server.")
+                    if not self.current_model:
+                        log.add_info("Using the signed-in account's Grok Build default (currently Grok 4.5).")
                 elif self.current_agent == "openhands":
                     # For OpenHands, handle model selection
                     if model_hint:
@@ -30359,6 +30565,8 @@ class SuperQodeApp(App):
                     (":connect antigravity", "Use local Antigravity CLI handoff"),
                     (":antigravity status", "Check local agy CLI status"),
                     (":antigravity migrate", "Show Gemini CLI migration steps"),
+                    (":connect grok", "Use signed-in Grok Build ACP (Grok 4.5 default)"),
+                    (":grok status|login", "Check Grok CLI readiness or show login commands"),
                 ],
             ),
             (

{superqode-0.2.8 → superqode-0.2.9}/src/superqode/commands/acp.py

@@ -442,7 +442,6 @@ def validate_agent_environment(agent: "Agent") -> list[str]:
         "gemini": ["GOOGLE_API_KEY"],
         "openai": ["OPENAI_API_KEY"],
         "kimi": ["MOONSHOT_API_KEY"],
-        "grok": ["XAI_API_KEY"],
     }
 
     # Check if agent requires specific environment variables

{superqode-0.2.8 → superqode-0.2.9}/src/superqode/main.py

@@ -663,7 +663,7 @@ class SuperQodeGroup(click.Group):
     default=None,
     type=click.Choice(connection_profile_ids()),
     help=(
-        "Connection source to start with: codex / claude / antigravity / byok / "
+        "Connection source to start with: codex / claude / antigravity / grok / byok / "
         "local / acp. e.g. `--connect codex` to use your Codex subscription."
     ),
 )