v1.1.2

Co-Authored-By: Clément Drouin <clement.drouin@mistral.ai>

tests/acp/test_acp.py

@@ -17,14 +17,10 @@ from acp import (
     WriteTextFileRequest,
 )
 from acp.schema import (
-    AgentCapabilities,
     AllowedOutcome,
     DeniedOutcome,
-    Implementation,
     InitializeResponse,
-    McpCapabilities,
     NewSessionResponse,
-    PromptCapabilities,
     PromptResponse,
     SessionNotification,
     TextContentBlock,
@@ -324,48 +320,6 @@ async def initialize_session(acp_agent_process: asyncio.subprocess.Process) -> s
     return session_response_obj.result.sessionId
 
 
-class TestInitialization:
-    @pytest.mark.asyncio
-    async def test_initialize_request_response(self) -> None:
-        mock_env = get_mocking_env()
-        async for process in get_acp_agent_process(mock_env=mock_env):
-            await send_json_rpc(
-                process,
-                InitializeJsonRpcRequest(
-                    id=1, params=InitializeRequest(protocolVersion=1)
-                ),
-            )
-
-            text_response = await read_response(process, timeout=10.0)
-            assert text_response is not None, "No response to initialize"
-            response_json = json.loads(text_response)
-            response = InitializeJsonRpcResponse.model_validate(response_json)
-            assert response.error is None, f"JSON-RPC error: {response.error}"
-            assert response.result is not None, "No result in response"
-            assert response.result.protocolVersion == 1
-            assert response.result.agentCapabilities == AgentCapabilities(
-                loadSession=False,
-                promptCapabilities=PromptCapabilities(
-                    audio=False, embeddedContext=True, image=False
-                ),
-                mcpCapabilities=McpCapabilities(http=False, sse=False),
-            )
-            assert response.result.agentInfo == Implementation(
-                name="@mistralai/mistral-vibe", title="Mistral Vibe", version="1.1.1"
-            )
-            vibe_setup_method = next(
-                (
-                    method
-                    for method in response.result.authMethods or []
-                    if method.id == "vibe-setup"
-                ),
-                None,
-            )
-            assert vibe_setup_method is not None, "vibe-setup auth not found"
-            assert vibe_setup_method.field_meta is not None
-            assert "terminal-auth" in vibe_setup_method.field_meta.keys()
-
-
 class TestSessionManagement:
     @pytest.mark.asyncio
     async def test_multiple_sessions_unique_ids(self) -> None:

tests/acp/test_initialize.py

@@ -0,0 +1,80 @@
+from __future__ import annotations
+
+from acp import PROTOCOL_VERSION, AgentSideConnection, InitializeRequest
+from acp.schema import (
+    AgentCapabilities,
+    ClientCapabilities,
+    Implementation,
+    PromptCapabilities,
+)
+import pytest
+
+from tests.stubs.fake_connection import FakeAgentSideConnection
+from vibe.acp.acp_agent import VibeAcpAgent
+
+
+@pytest.fixture
+def acp_agent() -> VibeAcpAgent:
+    vibe_acp_agent: VibeAcpAgent | None = None
+
+    def _create_agent(connection: AgentSideConnection) -> VibeAcpAgent:
+        nonlocal vibe_acp_agent
+        vibe_acp_agent = VibeAcpAgent(connection)
+        return vibe_acp_agent
+
+    FakeAgentSideConnection(_create_agent)
+    return vibe_acp_agent  # pyright: ignore[reportReturnType]
+
+
+class TestACPInitialize:
+    @pytest.mark.asyncio
+    async def test_initialize(self, acp_agent: VibeAcpAgent) -> None:
+        """Test regular initialize without terminal-auth capabilities."""
+        request = InitializeRequest(protocolVersion=PROTOCOL_VERSION)
+        response = await acp_agent.initialize(request)
+
+        assert response.protocolVersion == PROTOCOL_VERSION
+        assert response.agentCapabilities == AgentCapabilities(
+            loadSession=False,
+            promptCapabilities=PromptCapabilities(
+                audio=False, embeddedContext=True, image=False
+            ),
+        )
+        assert response.agentInfo == Implementation(
+            name="@mistralai/mistral-vibe", title="Mistral Vibe", version="1.1.2"
+        )
+
+        assert response.authMethods == []
+
+    @pytest.mark.asyncio
+    async def test_initialize_with_terminal_auth(self, acp_agent: VibeAcpAgent) -> None:
+        """Test initialize with terminal-auth capabilities to check it was included."""
+        client_capabilities = ClientCapabilities(field_meta={"terminal-auth": True})
+        request = InitializeRequest(
+            protocolVersion=PROTOCOL_VERSION, clientCapabilities=client_capabilities
+        )
+        response = await acp_agent.initialize(request)
+
+        assert response.protocolVersion == PROTOCOL_VERSION
+        assert response.agentCapabilities == AgentCapabilities(
+            loadSession=False,
+            promptCapabilities=PromptCapabilities(
+                audio=False, embeddedContext=True, image=False
+            ),
+        )
+        assert response.agentInfo == Implementation(
+            name="@mistralai/mistral-vibe", title="Mistral Vibe", version="1.1.2"
+        )
+
+        assert response.authMethods is not None
+        assert len(response.authMethods) == 1
+        auth_method = response.authMethods[0]
+        assert auth_method.id == "vibe-setup"
+        assert auth_method.name == "Register your API Key"
+        assert auth_method.description == "Register your API Key inside Mistral Vibe"
+        assert auth_method.field_meta is not None
+        assert "terminal-auth" in auth_method.field_meta
+        terminal_auth_meta = auth_method.field_meta["terminal-auth"]
+        assert "command" in terminal_auth_meta
+        assert "args" in terminal_auth_meta
+        assert terminal_auth_meta["label"] == "Mistral Vibe Setup"