Add CI and deterministic mocked tests

Author: Mihai Chindris

.github/workflows/ci.yml

@@ -0,0 +1,74 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ci-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint-and-typecheck:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v5
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+          cache: pip
+          cache-dependency-path: pyproject.toml
+
+      - name: Install system dependencies
+        run: sudo apt-get update && sudo apt-get install -y libolm-dev
+
+      - name: Install project dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install -e ".[dev]"
+
+      - name: Lint with Ruff
+        run: ruff check src tests
+
+      - name: Type check with mypy
+        run: mypy src
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - "3.11"
+          - "3.12"
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v5
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: pip
+          cache-dependency-path: pyproject.toml
+
+      - name: Install system dependencies
+        run: sudo apt-get update && sudo apt-get install -y libolm-dev
+
+      - name: Install project dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install -e ".[dev]"
+
+      - name: Run test suite
+        run: pytest -q

pyproject.toml

@@ -54,6 +54,7 @@ dev = [
     "black>=24.0.0",
     "ruff>=0.3.0",
     "mypy>=1.8.0",
+    "types-PyYAML>=6.0.12",
     "pre-commit>=3.6.0",
 ]
 github = [
@@ -100,6 +101,10 @@ warn_return_any = true
 warn_unused_configs = true
 disallow_untyped_defs = true
 
+[[tool.mypy.overrides]]
+module = ["markdown", "nio", "nio.*"]
+ignore_missing_imports = true
+
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 testpaths = ["tests"]

src/codebeep/bot.py

@@ -13,10 +13,10 @@
 from pathlib import Path
 from typing import Any
 
-import markdown
+import markdown  # type: ignore[import-untyped]
 import simplematrixbotlib as botlib
-from nio import InviteMemberEvent, MegolmEvent, RoomMessageText, RoomPreset
-from nio.responses import (
+from nio import InviteMemberEvent, MegolmEvent, RoomMessageText, RoomPreset  # type: ignore[import-untyped]
+from nio.responses import (  # type: ignore[import-untyped]
     RoomCreateError,
     RoomCreateResponse,
     RoomInviteError,
@@ -59,12 +59,13 @@ def __init__(self, config: Config) -> None:
             config: Bot configuration
         """
         self.config = config
-        auth = None
-        if config.opencode.auth and config.opencode.auth.username and config.opencode.auth.password:
-            auth = (config.opencode.auth.username, config.opencode.auth.password)
+        auth_config = config.opencode.auth
+        auth: tuple[str, str] | None = None
+        if auth_config is not None and auth_config.username and auth_config.password:
+            auth = (auth_config.username, auth_config.password)
 
         if auth:
-            logger.info("OpenCode auth configured for user %s", config.opencode.auth.username)
+            logger.info("OpenCode auth configured for user %s", auth[0])
         else:
             logger.warning("OpenCode auth not configured; requests may be unauthorized")
 
@@ -429,7 +430,8 @@ def _parse_transport_payload(self, transport_response: Any) -> dict[str, Any] |
             if isinstance(content, (bytes, bytearray)):
                 content = content.decode("utf-8", errors="ignore")
             if isinstance(content, str):
-                return json.loads(content)
+                payload = json.loads(content)
+                return payload if isinstance(payload, dict) else None
         except Exception:
             return None
         return None
@@ -507,7 +509,7 @@ async def _resolve_room_alias(self, alias: str) -> str | None:
             "Room alias resolve", self.bot.api.async_client.room_resolve_alias, alias
         )
         if isinstance(response, RoomResolveAliasResponse):
-            return response.room_id
+            return response.room_id if isinstance(response.room_id, str) else None
         if isinstance(response, RoomResolveAliasError):
             return None
         room_id = getattr(response, "room_id", None)

src/codebeep/commands.py

@@ -396,8 +396,10 @@ class SSHCommand(Command):
     usage = "/ssh"
     aliases = ["mosh"]
 
-    async def execute(self, bot: CodeBeepBot, args: str) -> CommandResult:
-        del args
+    async def execute(
+        self, bot: CodeBeepBot, args: str, context: CommandContext
+    ) -> CommandResult:
+        del args, context
 
         host = (bot.config.bot.connect_host or "").strip()
         if not host:

tests/test_commands.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from codebeep.commands import HelpCommand, SSHCommand
+from codebeep.commands import CommandContext, HelpCommand, SSHCommand
 from codebeep.config import Config
 
 
@@ -17,13 +17,16 @@ def make_config(**bot_overrides: object) -> Config:
     return Config.model_validate(payload)
 
 
+TEST_CONTEXT = CommandContext(room_id="!room:example.org", sender="@mihai:matrix.org")
+
+
 @pytest.mark.asyncio
 async def test_ssh_command_requires_configured_host() -> None:
     """The connect helper should stay disabled until a host is configured."""
     command = SSHCommand()
     bot = SimpleNamespace(config=make_config())
 
-    result = await command.execute(bot, "")
+    result = await command.execute(bot, "", TEST_CONTEXT)
 
     assert result.success is True
     assert "not configured" in result.message.lower()
@@ -38,7 +41,7 @@ async def test_ssh_command_formats_default_commands() -> None:
         config=make_config(connect_host="codebeep.tailnet.example", connect_user="mihai")
     )
 
-    result = await command.execute(bot, "")
+    result = await command.execute(bot, "", TEST_CONTEXT)
 
     assert result.success is True
     assert "`ssh mihai@codebeep.tailnet.example`" in result.message
@@ -57,7 +60,7 @@ async def test_ssh_command_formats_non_default_port() -> None:
         )
     )
 
-    result = await command.execute(bot, "")
+    result = await command.execute(bot, "", TEST_CONTEXT)
 
     assert "`ssh -p 2222 mihai@100.64.0.42`" in result.message
     assert '`mosh --ssh="ssh -p 2222" mihai@100.64.0.42`' in result.message
@@ -73,8 +76,23 @@ async def test_help_lists_ssh_command_once() -> None:
         commands={"ssh": ssh, "mosh": ssh},
     )
 
-    result = await help_command.execute(bot, "")
+    result = await help_command.execute(bot, "", TEST_CONTEXT)
 
     assert result.success is True
     assert result.message.count("`/ssh`") == 1
 
+
+@pytest.mark.asyncio
+async def test_help_resolves_alias_to_primary_command() -> None:
+    """Alias help should render the canonical command entry."""
+    ssh = SSHCommand()
+    help_command = HelpCommand()
+    bot = SimpleNamespace(
+        config=make_config(),
+        commands={"ssh": ssh, "mosh": ssh},
+    )
+
+    result = await help_command.execute(bot, "mosh", TEST_CONTEXT)
+
+    assert result.success is True
+    assert result.message.startswith("**/ssh**")

tests/test_opencode_client.py

@@ -9,7 +9,7 @@
 import httpx
 import pytest
 
-from codebeep.opencode_client import Message, OpenCodeClient
+from codebeep.opencode_client import Message, OpenCodeClient, OpenCodeInvalidResponseError
 
 
 @pytest.fixture
@@ -64,6 +64,21 @@ def stream(self, method: str, path: str) -> _FakeStreamResponse:
         return self._responses.pop(0)
 
 
+class _RetryingHttpClient:
+    def __init__(self, responses: list[httpx.Response | Exception]) -> None:
+        self._responses = responses
+        self.calls = 0
+        self.requests: list[dict[str, object]] = []
+
+    async def request(self, method: str, path: str, **kwargs) -> httpx.Response:
+        self.calls += 1
+        self.requests.append({"method": method, "path": path, **kwargs})
+        response = self._responses.pop(0)
+        if isinstance(response, Exception):
+            raise response
+        return response
+
+
 class TestOpenCodeClient:
     """Tests for OpenCodeClient."""
 
@@ -141,3 +156,36 @@ async def test_subscribe_events_falls_back_to_legacy_path(
         assert fake_client.requested_paths == ["/global/event", "/event"]
         assert events[0].type == "session.message"
         assert client.extract_session_id_from_event(events[0]) == "sess-1"
+
+    @pytest.mark.asyncio
+    async def test_request_retries_transport_error(self, client: OpenCodeClient, monkeypatch) -> None:
+        request = httpx.Request("GET", "http://127.0.0.1:4096/session")
+        fake_client = _RetryingHttpClient(
+            [
+                httpx.ConnectError("boom", request=request),
+                httpx.Response(200, request=request, json=[]),
+            ]
+        )
+        client._get_client = AsyncMock(return_value=fake_client)  # type: ignore[attr-defined]
+        sleep = AsyncMock()
+        monkeypatch.setattr("codebeep.opencode_client.asyncio.sleep", sleep)
+        monkeypatch.setattr("codebeep.opencode_client.random.uniform", lambda _a, _b: 0.0)
+
+        sessions = await client.list_sessions()
+
+        assert sessions == []
+        assert fake_client.calls == 2
+        sleep.assert_awaited_once()
+
+    @pytest.mark.asyncio
+    async def test_list_sessions_rejects_non_json_payload(self, client: OpenCodeClient) -> None:
+        request = httpx.Request("GET", "http://127.0.0.1:4096/session")
+        fake_client = _RetryingHttpClient(
+            [
+                httpx.Response(200, request=request, text="not-json"),
+            ]
+        )
+        client._get_client = AsyncMock(return_value=fake_client)  # type: ignore[attr-defined]
+
+        with pytest.raises(OpenCodeInvalidResponseError):
+            await client.list_sessions()