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.
78 lines
2.7 KiB
Python
78 lines
2.7 KiB
Python
"""GROK agents capture token usage/cost from their captured ``usage.json``.
|
|
|
|
A Grok agent runs the grok CLI — no SDK /usage/status server and no Claude
|
|
transcript — so finalize reads the ``usage.json`` the entrypoint / interactive
|
|
driver wrote to the per-agent data dir (mounted into the orchestrator). grok
|
|
reports a single cumulative total with no input/output split, so it folds into
|
|
output (it bills at the output rate).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from typing import TYPE_CHECKING
|
|
|
|
import pytest
|
|
from roboco.models.runtime import AgentInstance
|
|
from roboco.runtime.orchestrator import AgentOrchestrator
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
|
|
def _write_usage(path: Path, total_tokens: int, cost_usd: float) -> None:
|
|
path.write_text(
|
|
json.dumps(
|
|
{"model": "grok-build", "total_tokens": total_tokens, "cost_usd": cost_usd}
|
|
),
|
|
encoding="utf-8",
|
|
)
|
|
|
|
|
|
def test_grok_usage_folds_total_into_output(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
usage = tmp_path / "usage.json"
|
|
_write_usage(usage, total_tokens=180, cost_usd=0.02)
|
|
orch = AgentOrchestrator.__new__(AgentOrchestrator)
|
|
monkeypatch.setattr(
|
|
orch, "_grok_usage_json", lambda _aid: json.loads(usage.read_text())
|
|
)
|
|
|
|
# The whole total folds into output (no input/output split from the CLI).
|
|
assert orch._grok_usage_tokens("be-dev-1") == (0, 180, 0, 0)
|
|
|
|
|
|
def test_grok_usage_zero_when_store_missing(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
orch = AgentOrchestrator.__new__(AgentOrchestrator)
|
|
monkeypatch.setattr(orch, "_grok_usage_json", lambda _aid: None)
|
|
assert orch._grok_usage_tokens("be-dev-1") == (0, 0, 0, 0)
|
|
|
|
|
|
def test_grok_cost_read_from_usage_json(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
captured_cost = 3.25
|
|
orch = AgentOrchestrator.__new__(AgentOrchestrator)
|
|
monkeypatch.setattr(
|
|
orch,
|
|
"_grok_usage_json",
|
|
lambda _aid: {"cost_usd": captured_cost, "total_tokens": 9},
|
|
)
|
|
assert orch._grok_cost_usd("be-dev-1") == captured_cost
|
|
monkeypatch.setattr(orch, "_grok_usage_json", lambda _aid: None)
|
|
assert orch._grok_cost_usd("be-dev-1") == 0.0
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_resolve_final_usage_routes_grok_to_usage_json(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
orch = AgentOrchestrator.__new__(AgentOrchestrator)
|
|
monkeypatch.setattr(
|
|
orch, "_grok_usage_json", lambda _aid: {"total_tokens": 12, "cost_usd": 0.01}
|
|
)
|
|
cfg = type("C", (), {"provider_type": "grok"})()
|
|
orch._instances = {"be-dev-1": AgentInstance(agent_id="be-dev-1", config=cfg)}
|
|
|
|
# No SDK fetch / transcript read for GROK — usage comes from usage.json.
|
|
assert await orch._resolve_final_token_usage("be-dev-1") == (0, 12, 0, 0)
|