mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
Renn F
a88045aacf
Move the last Grok runtime off opencode onto xAI's official `grok` CLI, for full parity with the Claude path. The intake/secretary chat now runs per-turn headless `grok -p` invocations that resume one session id (proven live: context carries across runs), with streaming-json deltas mapped to the existing panel StreamChunk kinds — the IntakeDriver loop, message source, relay, and idle reaper are reused unchanged; only the SessionFactory differs (GrokCliSession replaces the opencode-serve session). - GrokCliSession + a pure, unit-tested streaming-json -> StreamChunk assembler (thought coalesced to one block, text streamed live, end captures the session id for -r, fenced-draft fallback, clear errors incl. rate-limit). - intake propose_draft and secretary read_company_state/read_task/submit_directive are now FastMCP servers (roboco-intake / roboco-secretary) wired into ~/.grok/config.toml, launched via `uv run --directory /app` to resolve the installed package. The secretary tools reuse the shared backend helpers. - Orchestrator: interactive spawn mounts the subscription auth + per-agent usage dir (no metered xAI key, no permission env — grok flags carry per-role perms); usage/cost now read a captured usage.json (drop the opencode.db reader, the _opencode_db_path/_grok_usage_from_opencode methods, and the cost-cap's opencode read). hosts["opencode"] -> hosts["grok_usage"]; OPENCODE_DATA_DIR -> GROK_USAGE_DATA_DIR. - Fix one-shot usage capture: `-s` does not pin the session id (grok generates its own), so the entrypoint now reads the real id back from the JSON run log and the reader uses it; usage is captured per-turn on the interactive path. - Delete the opencode layer: opencode_config/opencode_usage/opencode_session, the docker/grok/*.js plugins, the old one-shot entrypoint, and their tests. - Compose (all three files), .env.example, and stale comments updated to the grok-CLI runtime; add the SuperGrok auth mount + grok-usage dir. Gate green: ruff, mypy (296 files), xenon, tests. NAS build/verify pending.
76 lines
2.4 KiB
Python
76 lines
2.4 KiB
Python
"""roboco-secretary MCP server — tools wrap the shared backend helpers as JSON.
|
|
|
|
The backend-calling logic (``secretary_driver._do_*``) is covered by the secretary
|
|
driver tests; here we only assert the MCP wrappers forward the right args and
|
|
return the backend result as a JSON string the model reads back.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from typing import Any
|
|
|
|
import pytest
|
|
from roboco.mcp import secretary_server
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_read_company_state_returns_json(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
async def _state() -> dict[str, Any]:
|
|
return {"charter": "ship it", "tasks": {"pending": 3}}
|
|
|
|
monkeypatch.setattr(secretary_server, "_do_read_state", _state)
|
|
out = await secretary_server.read_company_state()
|
|
assert json.loads(out) == {"charter": "ship it", "tasks": {"pending": 3}}
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_read_task_forwards_the_id(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
seen: dict[str, Any] = {}
|
|
|
|
async def _task(task_id: str) -> dict[str, Any]:
|
|
seen["id"] = task_id
|
|
return {"id": task_id, "title": "T"}
|
|
|
|
monkeypatch.setattr(secretary_server, "_do_read_task", _task)
|
|
out = await secretary_server.read_task("task-9")
|
|
assert seen["id"] == "task-9"
|
|
assert json.loads(out)["title"] == "T"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_submit_directive_forwards_kind_and_payload(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
seen: dict[str, Any] = {}
|
|
|
|
async def _submit(kind: str, payload: dict[str, Any]) -> dict[str, Any]:
|
|
seen["kind"] = kind
|
|
seen["payload"] = payload
|
|
return {"queued": True}
|
|
|
|
monkeypatch.setattr(secretary_server, "_do_submit_directive", _submit)
|
|
out = await secretary_server.submit_directive(
|
|
"relay_message", {"channel": "announcements", "text": "hi"}
|
|
)
|
|
assert seen["kind"] == "relay_message"
|
|
assert seen["payload"] == {"channel": "announcements", "text": "hi"}
|
|
assert json.loads(out) == {"queued": True}
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_submit_directive_tolerates_missing_payload(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
seen: dict[str, Any] = {}
|
|
|
|
async def _submit(_kind: str, payload: dict[str, Any]) -> dict[str, Any]:
|
|
seen["payload"] = payload
|
|
return {"ok": True}
|
|
|
|
monkeypatch.setattr(secretary_server, "_do_submit_directive", _submit)
|
|
await secretary_server.submit_directive("announce", None)
|
|
assert seen["payload"] == {}
|