meshagent-cli 0.49.1__tar.gz → 0.50.1__tar.gz

{meshagent_cli-0.49.1 → meshagent_cli-0.50.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-cli
-Version: 0.49.1
+Version: 0.50.1
 Summary: CLI for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -22,8 +22,8 @@ Requires-Dist: openpyxl~=3.1
 Requires-Dist: xlsxwriter~=3.2
 Requires-Dist: pathspec<2,>=1.0.3
 Requires-Dist: zstandard~=0.25.0
-Requires-Dist: meshagent-llm-proxy==0.49.1
-Requires-Dist: meshagent-codex==0.49.1
+Requires-Dist: meshagent-llm-proxy==0.50.1
+Requires-Dist: meshagent-codex==0.50.1
 Requires-Dist: rich~=14.3.0
 Requires-Dist: sounddevice~=0.5
 Requires-Dist: textual<9.0,>=8.2.3
@@ -32,23 +32,23 @@ Requires-Dist: prompt-toolkit~=3.0.52
 Requires-Dist: ascii-magic~=2.3
 Requires-Dist: pillow~=11.3.0
 Provides-Extra: all
-Requires-Dist: meshagent-agents[all]==0.49.1; extra == "all"
-Requires-Dist: meshagent-api[all]==0.49.1; extra == "all"
-Requires-Dist: meshagent-commoncrawl==0.49.1; extra == "all"
-Requires-Dist: meshagent-scrapy==0.49.1; extra == "all"
-Requires-Dist: meshagent-computers==0.49.1; extra == "all"
-Requires-Dist: meshagent-openai==0.49.1; extra == "all"
-Requires-Dist: meshagent-anthropic==0.49.1; extra == "all"
-Requires-Dist: meshagent-otel==0.49.1; extra == "all"
-Requires-Dist: meshagent-mcp==0.49.1; extra == "all"
-Requires-Dist: meshagent-tools==0.49.1; extra == "all"
+Requires-Dist: meshagent-agents[all]==0.50.1; extra == "all"
+Requires-Dist: meshagent-api[all]==0.50.1; extra == "all"
+Requires-Dist: meshagent-commoncrawl==0.50.1; extra == "all"
+Requires-Dist: meshagent-scrapy==0.50.1; extra == "all"
+Requires-Dist: meshagent-computers==0.50.1; extra == "all"
+Requires-Dist: meshagent-openai==0.50.1; extra == "all"
+Requires-Dist: meshagent-anthropic==0.50.1; extra == "all"
+Requires-Dist: meshagent-otel==0.50.1; extra == "all"
+Requires-Dist: meshagent-mcp==0.50.1; extra == "all"
+Requires-Dist: meshagent-tools==0.50.1; extra == "all"
 Requires-Dist: supabase-auth~=2.28.0; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0.52; extra == "all"
 Provides-Extra: mcp-service
-Requires-Dist: meshagent-agents[all]==0.49.1; extra == "mcp-service"
-Requires-Dist: meshagent-api==0.49.1; extra == "mcp-service"
-Requires-Dist: meshagent-mcp==0.49.1; extra == "mcp-service"
-Requires-Dist: meshagent-tools==0.49.1; extra == "mcp-service"
+Requires-Dist: meshagent-agents[all]==0.50.1; extra == "mcp-service"
+Requires-Dist: meshagent-api==0.50.1; extra == "mcp-service"
+Requires-Dist: meshagent-mcp==0.50.1; extra == "mcp-service"
+Requires-Dist: meshagent-tools==0.50.1; extra == "mcp-service"
 Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
 Dynamic: license-file
 

{meshagent_cli-0.49.1 → meshagent_cli-0.50.1}/meshagent/cli/chatbot.py

@@ -1471,6 +1471,8 @@ def _build_shell_tool_env(
         env["MESHAGENT_TOKEN"] = room.protocol.token
         env["OPENAI_API_KEY"] = room.protocol.token
         env["ANTHROPIC_API_KEY"] = room.protocol.token
+        env["GROK_API_KEY"] = room.protocol.token
+        env["XAI_API_KEY"] = room.protocol.token
     return env
 
 

{meshagent_cli-0.49.1 → meshagent_cli-0.50.1}/meshagent/cli/cli_test.py

@@ -4,7 +4,7 @@ import types
 
 import pytest
 
-from meshagent.api import RoomException
+from meshagent.api import RoomDisabledError, RoomException
 from meshagent.agents import channel_process
 from meshagent.cli import async_typer
 from meshagent.cli import cli
@@ -134,6 +134,26 @@ def test_app_prints_room_exception_without_traceback(capsys) -> None:
     assert captured.out == ""
 
 
+def test_app_prints_disabled_room_message_and_exits_nonzero(capsys) -> None:
+    app = async_typer.AsyncTyper()
+
+    @app.callback()
+    def app_callback() -> None:
+        pass
+
+    @app.command("connect")
+    def connect_command() -> None:
+        raise RoomDisabledError()
+
+    with pytest.raises(SystemExit) as exc_info:
+        app(["connect"])
+
+    assert exc_info.value.code == 1
+    captured = capsys.readouterr()
+    assert captured.err == "This room is currently disabled.\n"
+    assert captured.out == ""
+
+
 def test_main_exits_with_status_returned_by_async_typer(monkeypatch) -> None:
     monkeypatch.setattr(channel_process, "dispatch_main", lambda **kwargs: False)
     monkeypatch.setattr(cli, "app", lambda: 23)

{meshagent_cli-0.49.1 → meshagent_cli-0.50.1}/meshagent/cli/containers.py

@@ -780,12 +780,14 @@ async def run_container(
             "--template",
             help=(
                 "Allowed values: agent, none. agent: MeshAgent mounts room storage "
-                "at /data, sets MESHAGENT_TOKEN, OPENAI_API_KEY, and "
-                "ANTHROPIC_API_KEY to a container-scoped MeshAgent token. agent "
+                "at /data, sets MESHAGENT_TOKEN, OPENAI_API_KEY, "
+                "ANTHROPIC_API_KEY, GROK_API_KEY, and XAI_API_KEY to a "
+                "container-scoped MeshAgent token. agent "
                 "also sets SMTP_PASSWORD to that token, SMTP_USERNAME to the "
                 "container name, SMTP_PORT to 587, SMTP_HOSTNAME from "
                 "MESHAGENT_MAIL_DOMAIN when available, plus OPENAI_BASE_URL, "
-                "ANTHROPIC_BASE_URL, MESHAGENT_API_URL, MESHAGENT_ROOM_URL, "
+                "ANTHROPIC_BASE_URL, GROK_BASE_URL, XAI_BASE_URL, "
+                "MESHAGENT_API_URL, MESHAGENT_ROOM_URL, "
                 "MESHAGENT_ROOM, MESHAGENT_PROJECT_ID, MESHAGENT_SESSION_ID, "
                 "OTEL_ENDPOINT, OTEL_PYTHON_LOG_LEVEL, and MESHAGENT_MAIL_DOMAIN "
                 "from the room runtime when available. Manual env values win. "

{meshagent_cli-0.49.1 → meshagent_cli-0.50.1}/meshagent/cli/image.py

@@ -140,6 +140,8 @@ _TOKEN_ENVIRONMENT_NAMES = (
     "MESHAGENT_TOKEN",
     "OPENAI_API_KEY",
     "ANTHROPIC_API_KEY",
+    "GROK_API_KEY",
+    "XAI_API_KEY",
 )
 _DEFAULT_MESHAGENT_IMAGE_PREFIX = PROD_MESHAGENT_IMAGE_PREFIX
 _IMAGE_TAG_RE = re.compile(r"^[A-Za-z0-9_][A-Za-z0-9_.-]{0,127}$")
@@ -4584,12 +4586,14 @@ async def deploy_image(
             "--template",
             help=(
                 "Allowed values: agent, none. agent: MeshAgent mounts room storage "
-                "at /data, sets MESHAGENT_TOKEN, OPENAI_API_KEY, and "
-                "ANTHROPIC_API_KEY to a container-scoped MeshAgent token. agent "
+                "at /data, sets MESHAGENT_TOKEN, OPENAI_API_KEY, "
+                "ANTHROPIC_API_KEY, GROK_API_KEY, and XAI_API_KEY to a "
+                "container-scoped MeshAgent token. agent "
                 "also sets SMTP_PASSWORD to that token, SMTP_USERNAME to the "
                 "container name, SMTP_PORT to 587, SMTP_HOSTNAME from "
                 "MESHAGENT_MAIL_DOMAIN when available, plus OPENAI_BASE_URL, "
-                "ANTHROPIC_BASE_URL, MESHAGENT_API_URL, MESHAGENT_ROOM_URL, "
+                "ANTHROPIC_BASE_URL, GROK_BASE_URL, XAI_BASE_URL, "
+                "MESHAGENT_API_URL, MESHAGENT_ROOM_URL, "
                 "MESHAGENT_ROOM, MESHAGENT_PROJECT_ID, MESHAGENT_SESSION_ID, "
                 "OTEL_ENDPOINT, OTEL_PYTHON_LOG_LEVEL, and MESHAGENT_MAIL_DOMAIN "
                 "from the room runtime when available. Manual env values win. "

{meshagent_cli-0.49.1 → meshagent_cli-0.50.1}/meshagent/cli/image_test.py

@@ -3131,7 +3131,12 @@ async def test_deploy_image_creates_room_service_with_mounts_env_secret_and_toke
     assert env_by_name["MESHAGENT_TOKEN"].token.api.secrets is None
     assert env_by_name["MESHAGENT_TOKEN"].token.api.services is not None
     assert env_by_name["MESHAGENT_TOKEN"].token.role == "agent"
-    for env_name in ("OPENAI_API_KEY", "ANTHROPIC_API_KEY"):
+    for env_name in (
+        "OPENAI_API_KEY",
+        "ANTHROPIC_API_KEY",
+        "GROK_API_KEY",
+        "XAI_API_KEY",
+    ):
         assert env_by_name[env_name].token is not None
         assert env_by_name[env_name].token == env_by_name["MESHAGENT_TOKEN"].token
     assert "restarted_service_id" not in captured
@@ -3208,7 +3213,12 @@ async def test_deploy_image_identity_overrides_env_secret_and_token_identity(
     assert env_by_name["APP_SECRET"].secret == SecretValue(id="secret-1")
     assert env_by_name["MESHAGENT_TOKEN"].token is not None
     assert env_by_name["MESHAGENT_TOKEN"].token.identity == "custom-agent"
-    for env_name in ("OPENAI_API_KEY", "ANTHROPIC_API_KEY"):
+    for env_name in (
+        "OPENAI_API_KEY",
+        "ANTHROPIC_API_KEY",
+        "GROK_API_KEY",
+        "XAI_API_KEY",
+    ):
         assert env_by_name[env_name].token is not None
         assert env_by_name[env_name].token == env_by_name["MESHAGENT_TOKEN"].token
     assert captured["room_client_closed"] is True
@@ -5252,7 +5262,12 @@ async def test_deploy_image_updates_existing_service_route_and_replaces_environm
     assert env_by_name["MESHAGENT_TOKEN"].token.api.admin is not None
     assert env_by_name["MESHAGENT_TOKEN"].token.api.secrets is None
     assert env_by_name["MESHAGENT_TOKEN"].token.api.tunnels is not None
-    for env_name in ("OPENAI_API_KEY", "ANTHROPIC_API_KEY"):
+    for env_name in (
+        "OPENAI_API_KEY",
+        "ANTHROPIC_API_KEY",
+        "GROK_API_KEY",
+        "XAI_API_KEY",
+    ):
         assert env_by_name[env_name].token is not None
         assert env_by_name[env_name].token == env_by_name["MESHAGENT_TOKEN"].token
     assert updated_spec.ports is not None

{meshagent_cli-0.49.1 → meshagent_cli-0.50.1}/meshagent/cli/mailbot.py

@@ -395,6 +395,8 @@ def build_mailbot(
                 env["MESHAGENT_TOKEN"] = self.room.protocol.token
                 env["OPENAI_API_KEY"] = self.room.protocol.token
                 env["ANTHROPIC_API_KEY"] = self.room.protocol.token
+                env["GROK_API_KEY"] = self.room.protocol.token
+                env["XAI_API_KEY"] = self.room.protocol.token
 
             if require_shell:
                 if supports_openai_shell:

{meshagent_cli-0.49.1 → meshagent_cli-0.50.1}/meshagent/cli/process.py

@@ -2178,6 +2178,7 @@ ThreadStorageBackends = ThreadStorageBackend | str | list[str] | tuple[str, ...]
 DEFAULT_PROCESS_THREAD_STORAGE_BACKENDS: tuple[str, ...] = ("dataset",)
 ContextManagementMode = Literal["auto", "standalone", "none"]
 ProcessToolSearchMode = Literal["room", "agent", "none"]
+LlmDelegationPolicy = Literal["required", "optional"]
 
 ShellCopyEnvOption = Annotated[
     list[str],
@@ -3471,9 +3472,19 @@ def _provider_name_for_model(model: str) -> str:
         return "openai-realtime"
     if model.startswith("claude-"):
         return "anthropic"
+    if model.startswith("grok-"):
+        return "grok"
     return "openai"
 
 
+def _grok_base_url() -> str:
+    for name in ("GROK_BASE_URL", "XAI_BASE_URL"):
+        value = os.getenv(name)
+        if value is not None and value.strip() != "":
+            return value.strip()
+    raise ValueError("GROK_BASE_URL or XAI_BASE_URL is required for Grok models")
+
+
 def _normalize_thread_storage_backend(
     thread_storage: str,
 ) -> NormalizedThreadStorageBackend:
@@ -4324,7 +4335,7 @@ def _format_model_list(
 
 
 def _supports_openai_responses_builtin_tools(*, model: str) -> bool:
-    return _provider_name_for_model(model) == "openai"
+    return _provider_name_for_model(model) in {"openai", "grok"}
 
 
 def _supports_anthropic_builtin_tools(*, model: str) -> bool:
@@ -4337,7 +4348,8 @@ def _has_openai_responses_provider(
     if llm_participant is not None:
         return False
     return any(
-        spec.backend == "llm" and spec.provider == "openai" for spec in model_specs
+        spec.backend == "llm" and spec.provider in {"openai", "grok"}
+        for spec in model_specs
     )
 
 
@@ -4355,6 +4367,16 @@ def _build_decision_llm_adapter(
             log_requests=log_llm_requests,
         )
 
+    if decision_model.startswith("grok-"):
+        return OpenAIResponsesAdapter(
+            model=decision_model,
+            provider="grok",
+            base_url=_grok_base_url(),
+            api_key=api_key,
+            mode="request",
+            log_requests=log_llm_requests,
+        )
+
     client = _openai_proxy_client(
         api_key=api_key,
         meshagent_project_id=meshagent_project_id,
@@ -4701,6 +4723,7 @@ def _build_runtime_agent(
     verbose_dataset: bool = False,
     save_audio_input: bool = False,
     preamble_rule: bool = True,
+    llm_delegation: LlmDelegationPolicy = "optional",
 ):
     builder = _builder_for_runtime(runtime)
     selected_models = (
@@ -4790,6 +4813,7 @@ def _build_runtime_agent(
         builder_kwargs["preamble_rule"] = preamble_rule
         builder_kwargs["websocket_auth"] = websocket_auth
         builder_kwargs["room_token"] = room_token
+        builder_kwargs["llm_delegation"] = llm_delegation
     return builder(**builder_kwargs)
 
 
@@ -4857,6 +4881,8 @@ def _build_shell_tool_env(
         env["MESHAGENT_TOKEN"] = room.protocol.token
         env["OPENAI_API_KEY"] = room.protocol.token
         env["ANTHROPIC_API_KEY"] = room.protocol.token
+        env["GROK_API_KEY"] = room.protocol.token
+        env["XAI_API_KEY"] = room.protocol.token
     return env
 
 
@@ -5061,9 +5087,13 @@ def build_chatbot(
             if resolved_decision_model is None:
                 resolved_decision_model = _DEFAULT_OPENAI_REALTIME_DECISION_MODEL
         else:
+            is_grok_model = model.startswith("grok-")
             llm_adapter = OpenAIResponsesAdapter(
                 model=model,
+                provider="grok" if is_grok_model else "openai",
+                base_url=_grok_base_url() if is_grok_model else None,
                 api_key=api_key,
+                mode="request" if is_grok_model else "websocket",
                 log_requests=log_llm_requests,
             )
 
@@ -5482,6 +5512,7 @@ def build_process_agent(
     verbose_dataset: bool = False,
     save_audio_input: bool = False,
     preamble_rule: bool = True,
+    llm_delegation: LlmDelegationPolicy = "optional",
 ):
     from meshagent.agents import (
         AgentMessageThreadStatusPublisher,
@@ -5698,6 +5729,7 @@ def build_process_agent(
         openai_models: list[str] = []
         realtime_models: list[str] = []
         anthropic_models: list[str] = []
+        grok_models: list[str] = []
         provider_order: list[str] = []
         for selected_spec in llm_model_specs:
             selected_model = selected_spec.model
@@ -5711,6 +5743,9 @@ def build_process_agent(
             elif provider_name == "anthropic":
                 if selected_model not in anthropic_models:
                     anthropic_models.append(selected_model)
+            elif provider_name == "grok":
+                if selected_model not in grok_models:
+                    grok_models.append(selected_model)
             elif selected_model not in openai_models:
                 openai_models.append(selected_model)
 
@@ -5777,6 +5812,24 @@ def build_process_agent(
                     allowed_models=None if unfiltered_llm_backend else anthropic_models,
                 ),
             )
+        if grok_models:
+            providers_by_name["grok"] = LLMProvider(
+                name="grok",
+                adapter=OpenAIResponsesAdapter(
+                    model=grok_models[0],
+                    provider="grok",
+                    base_url=_grok_base_url(),
+                    api_key=api_key,
+                    mode="request",
+                    log_requests=log_llm_requests,
+                    context_management=context_management,
+                    compaction_threshold=compaction_threshold,
+                    max_output_tokens=max_output_tokens,
+                    reasoning_effort=reasoning_effort,
+                    tool_search="server" if tool_search != "none" else None,
+                    allowed_models=None if unfiltered_llm_backend else grok_models,
+                ),
+            )
         for provider_name in provider_order:
             provider = providers_by_name.get(provider_name)
             if provider is not None:
@@ -6108,6 +6161,12 @@ def build_process_agent(
                     connection = await provider.adapter.create_realtime_connection(
                         protocol=protocol,
                         model=resolved_model,
+                        llm_authorization_token=(
+                            start_thread.llm_authorization.token
+                            if start_thread.llm_authorization is not None
+                            and not start_thread.llm_authorization.is_expired()
+                            else None
+                        ),
                     )
                     return AgentRealtimeConnectionInfo(
                         protocol=connection.protocol,
@@ -6936,6 +6995,7 @@ def build_process_agent(
                         turns=turns,
                     )
                 ),
+                llm_delegation=llm_delegation,
             )
             if room is not None:
                 process.register_content_scheme(_room_content_scheme(room=room))
@@ -7194,6 +7254,13 @@ async def join(
         Optional[str],
         typer.Option(..., help="Delegate LLM interactions to a remote participant"),
     ] = None,
+    llm_delegation: Annotated[
+        LlmDelegationPolicy,
+        typer.Option(
+            "--llm-delegation",
+            help="Require per-turn LLM delegation or allow it when provided.",
+        ),
+    ] = "optional",
     decision_model: DecisionModelOption = None,
     transcription_model: TranscriptionModelOption = (
         DEFAULT_OPENAI_REALTIME_TRANSCRIPTION_MODEL
@@ -7403,6 +7470,7 @@ async def join(
             require_discovery=require_discovery,
             require_advanced_shell=require_advanced_shell,
             llm_participant=llm_participant,
+            llm_delegation=llm_delegation,
             decision_model=decision_model,
             transcription_model=transcription_model,
             voice=voice,
@@ -7689,6 +7757,13 @@ async def service(
         Optional[str],
         typer.Option(..., help="Delegate LLM interactions to a remote participant"),
     ] = None,
+    llm_delegation: Annotated[
+        LlmDelegationPolicy,
+        typer.Option(
+            "--llm-delegation",
+            help="Require per-turn LLM delegation or allow it when provided.",
+        ),
+    ] = "optional",
     decision_model: DecisionModelOption = None,
     transcription_model: TranscriptionModelOption = (
         DEFAULT_OPENAI_REALTIME_TRANSCRIPTION_MODEL
@@ -7865,6 +7940,7 @@ async def service(
             require_discovery=require_discovery,
             require_advanced_shell=require_advanced_shell,
             llm_participant=llm_participant,
+            llm_delegation=llm_delegation,
             decision_model=decision_model,
             transcription_model=transcription_model,
             voice=voice,
@@ -8125,6 +8201,13 @@ async def spec(
         Optional[str],
         typer.Option(..., help="Delegate LLM interactions to a remote participant"),
     ] = None,
+    llm_delegation: Annotated[
+        LlmDelegationPolicy,
+        typer.Option(
+            "--llm-delegation",
+            help="Require per-turn LLM delegation or allow it when provided.",
+        ),
+    ] = "optional",
     decision_model: DecisionModelOption = None,
     transcription_model: TranscriptionModelOption = (
         DEFAULT_OPENAI_REALTIME_TRANSCRIPTION_MODEL
@@ -8281,6 +8364,7 @@ async def spec(
             require_discovery=require_discovery,
             require_advanced_shell=require_advanced_shell,
             llm_participant=llm_participant,
+            llm_delegation=llm_delegation,
             decision_model=decision_model,
             transcription_model=transcription_model,
             voice=voice,
@@ -8557,6 +8641,13 @@ async def deploy(
         Optional[str],
         typer.Option(..., help="Delegate LLM interactions to a remote participant"),
     ] = None,
+    llm_delegation: Annotated[
+        LlmDelegationPolicy,
+        typer.Option(
+            "--llm-delegation",
+            help="Require per-turn LLM delegation or allow it when provided.",
+        ),
+    ] = "optional",
     decision_model: DecisionModelOption = None,
     transcription_model: TranscriptionModelOption = (
         DEFAULT_OPENAI_REALTIME_TRANSCRIPTION_MODEL
@@ -8716,6 +8807,7 @@ async def deploy(
             require_discovery=require_discovery,
             require_advanced_shell=require_advanced_shell,
             llm_participant=llm_participant,
+            llm_delegation=llm_delegation,
             decision_model=decision_model,
             transcription_model=transcription_model,
             voice=voice,
@@ -11061,6 +11153,13 @@ async def run(
         Optional[str],
         typer.Option(..., help="Delegate LLM interactions to a remote participant"),
     ] = None,
+    llm_delegation: Annotated[
+        LlmDelegationPolicy,
+        typer.Option(
+            "--llm-delegation",
+            help="Require per-turn LLM delegation or allow it when provided.",
+        ),
+    ] = "optional",
     decision_model: DecisionModelOption = None,
     transcription_model: TranscriptionModelOption = (
         DEFAULT_OPENAI_REALTIME_TRANSCRIPTION_MODEL
@@ -11375,6 +11474,7 @@ async def run(
             require_discovery=require_discovery,
             require_advanced_shell=require_advanced_shell,
             llm_participant=llm_participant,
+            llm_delegation=llm_delegation,
             decision_model=decision_model,
             transcription_model=transcription_model,
             voice=voice,

{meshagent_cli-0.49.1 → meshagent_cli-0.50.1}/meshagent/cli/process_test.py

@@ -1420,6 +1420,7 @@ def test_build_process_agent_passes_custom_realtime_transcription_model(
 def test_build_process_agent_groups_repeated_models_by_provider(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
+    monkeypatch.setenv("GROK_BASE_URL", "https://grok.example.test/v1")
     created_adapters: list[dict[str, object]] = []
 
     class _FakeOpenAIAdapter:
@@ -1437,6 +1438,9 @@ def test_build_process_agent_groups_repeated_models_by_provider(
             response_options=None,
             tool_search=None,
             allowed_models=None,
+            provider="openai",
+            base_url=None,
+            mode="websocket",
         ) -> None:
             del api_key
             del client
@@ -1447,9 +1451,11 @@ def test_build_process_agent_groups_repeated_models_by_provider(
             del reasoning_effort
             del response_options
             del tool_search
+            del base_url
+            del mode
             created_adapters.append(
                 {
-                    "provider": "openai",
+                    "provider": provider,
                     "model": model,
                     "allowed_models": allowed_models,
                 }
@@ -1514,7 +1520,13 @@ def test_build_process_agent_groups_repeated_models_by_provider(
     )
 
     agent_cls = process.build_process_agent(
-        model=["gpt-5.6-sol", "gpt-5.4", "claude-opus-4-7", "gpt-realtime"],
+        model=[
+            "gpt-5.6-sol",
+            "gpt-5.4",
+            "claude-opus-4-7",
+            "gpt-realtime",
+            "grok-4.6",
+        ],
         rule=[],
         toolkit=[],
         schema=[],
@@ -1540,9 +1552,31 @@ def test_build_process_agent_groups_repeated_models_by_provider(
             "model": "claude-opus-4-7",
             "allowed_models": ["claude-opus-4-7"],
         },
+        {
+            "provider": "grok",
+            "model": "grok-4.6",
+            "allowed_models": ["grok-4.6"],
+        },
     ]
 
 
+def test_grok_base_url_never_falls_back_to_openai(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("OPENAI_BASE_URL", "https://openai.example.test/v1")
+    monkeypatch.delenv("GROK_BASE_URL", raising=False)
+    monkeypatch.delenv("XAI_BASE_URL", raising=False)
+
+    with pytest.raises(
+        ValueError,
+        match="GROK_BASE_URL or XAI_BASE_URL is required for Grok models",
+    ):
+        process._grok_base_url()
+
+    monkeypatch.setenv("XAI_BASE_URL", " https://xai.example.test/v1 ")
+    assert process._grok_base_url() == "https://xai.example.test/v1"
+
+
 def test_build_process_agent_passes_project_header_client_to_openai_adapters(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
@@ -7075,6 +7109,8 @@ async def test_chatbot_require_advanced_shell_uses_container_toolkit_with_shell_
         "MESHAGENT_TOKEN": "test-token",
         "OPENAI_API_KEY": "test-token",
         "ANTHROPIC_API_KEY": "test-token",
+        "GROK_API_KEY": "test-token",
+        "XAI_API_KEY": "test-token",
     }
 
 
@@ -7124,6 +7160,8 @@ async def test_process_agent_require_advanced_shell_uses_container_toolkit_with_
             "MESHAGENT_TOKEN": "token",
             "OPENAI_API_KEY": "token",
             "ANTHROPIC_API_KEY": "token",
+            "GROK_API_KEY": "token",
+            "XAI_API_KEY": "token",
         }
     finally:
         await agent.stop()

{meshagent_cli-0.49.1 → meshagent_cli-0.50.1}/meshagent/cli/room_connect.py

@@ -29,6 +29,8 @@ _CONNECTED_TOKEN_ENV_NAMES = (
     "MESHAGENT_TOKEN",
     "OPENAI_API_KEY",
     "ANTHROPIC_API_KEY",
+    "GROK_API_KEY",
+    "XAI_API_KEY",
 )
 
 if TYPE_CHECKING:
@@ -500,6 +502,8 @@ async def _build_connected_command_env(
             child_env["MESHAGENT_ROOM"] = room_env.room_name
             child_env["OPENAI_BASE_URL"] = f"{api_url}/openai/v1"
             child_env["ANTHROPIC_BASE_URL"] = f"{api_url}/anthropic"
+            child_env["GROK_BASE_URL"] = f"{api_url}/grok/v1"
+            child_env["XAI_BASE_URL"] = child_env["GROK_BASE_URL"]
             _set_connected_token_environment(
                 child_env=child_env,
                 connected_token=connected_token,
@@ -528,7 +532,8 @@ app = async_typer.AsyncTyper(add_completion=False)
     help=(
         "Connect to a room and run a local command with "
         "MESHAGENT_API_URL, MESHAGENT_PROJECT_ID, MESHAGENT_TOKEN, "
-        "OPENAI_API_KEY, ANTHROPIC_API_KEY, and MESHAGENT_ROOM set by "
+        "OPENAI_API_KEY, ANTHROPIC_API_KEY, GROK_API_KEY, XAI_API_KEY, and "
+        "MESHAGENT_ROOM set by "
         "the default agent template. Use -- before the local command."
     ),
 )
@@ -580,8 +585,9 @@ def _connect_command(
         show_default=True,
         help=(
             "Allowed values: agent, none. agent: MeshAgent sets MESHAGENT_TOKEN, "
-            "OPENAI_API_KEY, and ANTHROPIC_API_KEY to a room-scoped MeshAgent token, "
-            "and sets OPENAI_BASE_URL, ANTHROPIC_BASE_URL, MESHAGENT_API_URL, "
+            "OPENAI_API_KEY, ANTHROPIC_API_KEY, GROK_API_KEY, and XAI_API_KEY to a "
+            "room-scoped MeshAgent token, and sets OPENAI_BASE_URL, "
+            "ANTHROPIC_BASE_URL, GROK_BASE_URL, XAI_BASE_URL, MESHAGENT_API_URL, "
             "MESHAGENT_PROJECT_ID, and MESHAGENT_ROOM for the connected room unless "
             "manually set. Provider base URLs use the project API endpoint. none: "
             "MeshAgent applies no template defaults."

{meshagent_cli-0.49.1 → meshagent_cli-0.50.1}/meshagent/cli/room_connect_test.py

@@ -440,6 +440,10 @@ def test_room_connect_runs_command_with_connected_room_env(
     assert captured_env["ANTHROPIC_BASE_URL"] == "https://env.meshagent.test/anthropic"
     assert captured_env["OPENAI_API_KEY"] == "room-jwt"
     assert captured_env["ANTHROPIC_API_KEY"] == "room-jwt"
+    assert captured_env["GROK_BASE_URL"] == "https://env.meshagent.test/grok/v1"
+    assert captured_env["XAI_BASE_URL"] == captured_env["GROK_BASE_URL"]
+    assert captured_env["GROK_API_KEY"] == "room-jwt"
+    assert captured_env["XAI_API_KEY"] == "room-jwt"
 
 
 def test_room_connect_ignores_ambient_participant_token_for_other_room(
@@ -561,13 +565,21 @@ async def test_room_connect_env_satisfies_llm_proxy_docs_samples(
         "OPENAI_API_KEY",
         "ANTHROPIC_BASE_URL",
         "ANTHROPIC_API_KEY",
+        "GROK_BASE_URL",
+        "GROK_API_KEY",
+        "XAI_BASE_URL",
+        "XAI_API_KEY",
     }
     assert sample_required_env <= child_env.keys()
     assert child_env["MESHAGENT_TOKEN"] == "room-jwt"
     assert child_env["OPENAI_API_KEY"] == child_env["MESHAGENT_TOKEN"]
     assert child_env["ANTHROPIC_API_KEY"] == child_env["MESHAGENT_TOKEN"]
+    assert child_env["GROK_API_KEY"] == child_env["MESHAGENT_TOKEN"]
+    assert child_env["XAI_API_KEY"] == child_env["MESHAGENT_TOKEN"]
     assert child_env["OPENAI_BASE_URL"] == "https://env.meshagent.test/openai/v1"
     assert child_env["ANTHROPIC_BASE_URL"] == "https://env.meshagent.test/anthropic"
+    assert child_env["GROK_BASE_URL"] == "https://env.meshagent.test/grok/v1"
+    assert child_env["XAI_BASE_URL"] == child_env["GROK_BASE_URL"]
 
 
 @pytest.mark.asyncio