uro-cli 0.7.0__tar.gz → 0.9.0__tar.gz

{uro_cli-0.7.0 → uro_cli-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: uro-cli
-Version: 0.7.0
+Version: 0.9.0
 Summary: Uro Engine reference client — play, dry-run, and dev tools against the engine
 Project-URL: Homepage, https://github.com/cupskeee/uro
 Project-URL: Repository, https://github.com/cupskeee/uro
@@ -12,8 +12,8 @@ Requires-Python: >=3.12
 Requires-Dist: python-dotenv>=1.0
 Requires-Dist: rich>=13.9
 Requires-Dist: typer>=0.27.2
-Requires-Dist: uro-core[llm,postgres]==0.7.0
-Requires-Dist: uro-server==0.7.0
+Requires-Dist: uro-core[llm,postgres]==0.9.0
+Requires-Dist: uro-server==0.9.0
 Requires-Dist: websockets>=16.1
 Description-Content-Type: text/markdown
 

{uro_cli-0.7.0 → uro_cli-0.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uro-cli"
-version = "0.7.0"
+version = "0.9.0"
 description = "Uro Engine reference client — play, dry-run, and dev tools against the engine"
 license = "MIT"
 license-files = ["LICENSE"]
@@ -13,8 +13,8 @@ requires-python = ">=3.12"
 # pair a new uro-cli with an old uro-core; `just release` bumps all three together, and the
 # `{workspace = true}` sources make a drifted pin fail `uv sync` locally.
 dependencies = [
-    "uro-core[postgres,llm]==0.7.0",
-    "uro-server==0.7.0",
+    "uro-core[postgres,llm]==0.9.0",
+    "uro-server==0.9.0",
     "typer>=0.27.2",
     "rich>=13.9",
     "websockets>=16.1",

uro_cli-0.9.0/tests/test_connect.py

@@ -0,0 +1,133 @@
+"""`uro connect`, the reference play client, against a real server on a local port.
+
+Its prompt used to come back the moment an intent was sent: it sat above the streaming narration,
+and nothing was on screen while the beat was still being extracted and committed, so a player in
+the first live run (2026-10-31) retyped an intent and played it twice.
+"""
+
+import asyncio
+import socket
+import threading
+import time
+from collections.abc import AsyncIterator
+
+import uvicorn
+from typer.testing import CliRunner
+from uro_cli.main import app
+from uro_server.app import ServerDeps, create_app
+
+
+def _free_port() -> int:
+    with socket.socket() as s:
+        s.bind(("127.0.0.1", 0))
+        return int(s.getsockname()[1])
+
+
+def test_the_prompt_waits_for_each_beat_to_settle() -> None:
+    started: list[str] = []
+
+    async def run_beat(campaign_id: str, participant: str, text: str) -> AsyncIterator[str]:
+        started.append(text)
+        for word in ("The ", "tide ", "turns."):
+            await asyncio.sleep(0.05)
+            yield word
+        await asyncio.sleep(0.3)  # extraction: the narration is done, the beat isn't
+
+    async def campaign_exists(campaign_id: str) -> bool:
+        return True
+
+    deps = ServerDeps(
+        resolve_participant={"tok": "player-1"}.get,
+        campaign_exists=campaign_exists,
+        run_beat=run_beat,
+    )
+    port = _free_port()
+    server = uvicorn.Server(
+        uvicorn.Config(create_app(deps), host="127.0.0.1", port=port, log_level="warning")
+    )
+    thread = threading.Thread(target=server.run, daemon=True)
+    thread.start()
+    while not server.started:
+        time.sleep(0.02)
+    try:
+        result = CliRunner().invoke(
+            app,
+            ["connect", "camp-1", "--server", f"http://127.0.0.1:{port}", "--token", "tok"],
+            input="first\nsecond\n/quit\n",  # typed ahead, as an impatient player would
+        )
+    finally:
+        server.should_exit = True
+        thread.join(5)
+    out = result.output
+    assert result.exit_code == 0, out
+    assert started == ["first", "second"]
+    prompts = [i for i in range(len(out)) if out.startswith("> ", i)]
+    first, second = out.index("✓ [player-1] 'first'"), out.index("✓ [player-1] 'second'")
+    assert len(prompts) == 3, out
+    assert first < prompts[1] < second < prompts[2], out  # each prompt only after its beat settled
+
+
+def test_another_players_identical_intent_never_settles_ours() -> None:
+    # Review: the client matched outcomes by intent TEXT. In a party, another player typing the same
+    # words while our beat ran got `not_your_turn`, broadcast to everyone, and released our prompt
+    # mid-beat. Intents now carry an id the server echoes back.
+    import json
+
+    import websockets
+    from uro_core.session import PartyArbiter
+
+    async def run_beat(campaign_id: str, participant: str, text: str) -> AsyncIterator[str]:
+        yield "The "
+        await asyncio.sleep(1.2)
+        yield "end."
+
+    async def campaign_exists(campaign_id: str) -> bool:
+        return True
+
+    deps = ServerDeps(
+        resolve_participant={"tok": "player-1", "tok2": "player-2"}.get,
+        campaign_exists=campaign_exists,
+        run_beat=run_beat,
+    )
+    port = _free_port()
+    server = uvicorn.Server(
+        uvicorn.Config(
+            create_app(deps, arbiter=PartyArbiter()),
+            host="127.0.0.1",
+            port=port,
+            log_level="warning",
+        )
+    )
+    thread = threading.Thread(target=server.run, daemon=True)
+    thread.start()
+    while not server.started:
+        time.sleep(0.02)
+
+    def player_two() -> None:  # joins second (so player-1 holds the turn), same words mid-beat
+        async def go() -> None:
+            await asyncio.sleep(0.3)
+            uri = f"ws://127.0.0.1:{port}/campaigns/c/play?token=tok2"
+            async with websockets.connect(uri) as ws:
+                await asyncio.sleep(0.2)
+                await ws.send(json.dumps({"type": "intent", "text": "look around"}))
+                await asyncio.sleep(1.5)
+
+        asyncio.run(go())
+
+    other = threading.Thread(target=player_two)
+    other.start()
+    try:
+        result = CliRunner().invoke(
+            app,
+            ["connect", "c", "--server", f"http://127.0.0.1:{port}", "--token", "tok"],
+            input="look around\n/quit\n",
+        )
+    finally:
+        other.join()
+        server.should_exit = True
+        thread.join(5)
+    out = result.output
+    assert "not your turn" in out, out  # player-2's identical intent did reach us...
+    ours = out.index("✓ [player-1] 'look around'")  # ...but our prompt waited for OUR beat
+    prompts = [i for i in range(len(out)) if out.startswith("> ", i)]
+    assert len(prompts) == 2 and prompts[1] > ours, out

{uro_cli-0.7.0 → uro_cli-0.9.0}/uro_cli/main.py

@@ -24,7 +24,7 @@ from uro_core.providers.router import ProviderRouter
 from uro_core.rulesets import registry
 from uro_core.rulesets.base import CharSpec, Ruleset
 from uro_core.rulesets.rng import Rng
-from uro_core.timeline.models import STARTING_GEAR, World
+from uro_core.timeline.models import FORK_TIME_SKIP, STARTING_GEAR, World
 
 from uro_cli.wiring import (
     build_router,
@@ -653,20 +653,24 @@ def serve(
         from uro_core.adapters.nats import NatsCommitFeed
 
         commit_feed = NatsCommitFeed(nats_url, subject_prefix=subject_prefix)
-    fastapi_app = create_app(
-        deps, arbiter=arbiter, cors_origins=cors_origin or None, commit_feed=commit_feed
-    )
 
-    @fastapi_app.on_event("startup")
     async def _startup() -> None:
         await connect_store(store)
         if deps.hydrate_tokens is not None:  # load durable runtime tokens (D-39) — AFTER connect
             await deps.hydrate_tokens()
 
-    @fastapi_app.on_event("shutdown")
     async def _shutdown() -> None:
         await store.close()
 
+    fastapi_app = create_app(
+        deps,
+        arbiter=arbiter,
+        cors_origins=cors_origin or None,
+        commit_feed=commit_feed,
+        startup=_startup,
+        shutdown=_shutdown,
+    )
+
     # (The DB preflight is folded into _resolve_router above — its connect_store gives the same
     # clean docker-first hint on a down DB, and the pool it opens is closed before uvicorn starts;
     # the startup hook re-opens one on uvicorn's own loop.)
@@ -697,6 +701,7 @@ def connect(
     the campaign stream in live."""
     import asyncio
     import json
+    import uuid
 
     import websockets
 
@@ -707,11 +712,44 @@ def connect(
         try:
             async with websockets.connect(uri) as ws:
                 typer.echo(f"connected to {campaign_id} as {token!r}. Type an action; /quit.\n")
+                # An intent's beat is SETTLED by one of these, each echoing the intent's text. The
+                # prompt waits for it: shown at once, it sat above the streaming narration and was
+                # gone by the time the beat committed (extraction runs after the narration), so a
+                # player retyped the intent and played it twice (live run, 2026-10-31).
+                settles = {
+                    "beat_committed",
+                    "beat_failed",
+                    "not_your_turn",
+                    "proposal_opened",
+                    "intent_rejected",
+                }
+                # intent id → (its text, set when it settles). The server echoes the id as
+                # `intent_id`, so another player's identical text never settles ours. Only a server
+                # that has never echoed one (an older one) is matched by text; once one has, a frame
+                # without an id is another client's.
+                pending: dict[str, tuple[str, asyncio.Event]] = {}
+                echoes = False
+
+                def settle(msg: dict[str, Any]) -> None:
+                    if "intent_id" in msg:
+                        hit = pending.pop(str(msg["intent_id"]), None)
+                    elif not echoes:
+                        text = str(msg.get("intent", msg.get("text", "")))
+                        rid = next((k for k, (t, _) in pending.items() if t == text), None)
+                        hit = pending.pop(rid) if rid is not None else None
+                    else:
+                        hit = None
+                    if hit is not None:
+                        hit[1].set()
 
                 async def receive() -> None:
+                    nonlocal echoes
                     async for raw in ws:
                         msg = json.loads(raw)
                         kind = msg.get("type")
+                        echoes = echoes or "intent_id" in msg
+                        if kind in settles:
+                            settle(msg)
                         if kind == "narration_chunk":
                             typer.echo(msg["text"], nl=False)
                         elif kind == "beat_committed":
@@ -740,6 +778,10 @@ def connect(
                             )
                         elif kind == "beat_failed":
                             typer.echo(f"\n  ✗ beat failed: {msg['error']}")
+                        elif kind == "intent_rejected":
+                            typer.echo(
+                                f"  ✗ [{msg['participant_id']}] intent rejected: {msg['text']!r}"
+                            )
                         elif kind == "commit":  # made elsewhere: another server, the CLI (D-67)
                             for beat in msg.get("beats") or []:
                                 typer.echo(f"\n[{beat['participant_id']}] {beat['narration']}")
@@ -759,7 +801,20 @@ def connect(
                     elif intent.startswith("/vote "):  # non-canon consensus vote (D-38)
                         await ws.send(json.dumps({"type": "vote", "choice": intent[6:]}))
                     elif intent:
-                        await ws.send(json.dumps({"type": "intent", "text": intent}))
+                        rid = uuid.uuid4().hex
+                        settled = asyncio.Event()
+                        pending[rid] = (intent, settled)
+                        await ws.send(json.dumps({"type": "intent", "text": intent, "id": rid}))
+                        waiting = asyncio.ensure_future(settled.wait())
+                        # a slow beat (a reasoning model's extraction) still settles well inside
+                        # this; past it — or if the server goes away — the prompt comes back anyway
+                        await asyncio.wait(
+                            {waiting, receiver}, timeout=600, return_when=asyncio.FIRST_COMPLETED
+                        )
+                        waiting.cancel()
+                        pending.pop(rid, None)
+                        if receiver.done():  # the server closed the connection
+                            break
                 receiver.cancel()
         except OSError as exc:
             typer.echo(f"could not connect to {server}: {exc} (is `uro serve` running?)", err=True)
@@ -964,7 +1019,7 @@ def branch_fork(
                 pick = registry.resolve_for_branch(store, branch.branch_id)
                 ruleset = await _time_skip_ruleset(pick)
                 engine = Engine(store, build_router("stub", None), ruleset=ruleset)
-                await engine.agenda_tick(branch.branch_id, time_skip_days)
+                await engine.agenda_tick(branch.branch_id, time_skip_days, reason=FORK_TIME_SKIP)
         finally:
             await store.close()
         forked = branch.forked_from if branch.forked_from else "-"
@@ -1279,6 +1334,7 @@ def calls(
             typer.echo(
                 f"{r['created_at']:%Y-%m-%d %H:%M:%S}  {r['stage_tag']:<10} {r['model'] or '-'}  "
                 f"{tokens}  {r['latency_ms']}ms"
+                + (f"  FAILED: {r['error']}" if r.get("error") else "")
             )
             if r["response"] is not None:
                 typer.echo(f"  {r['response']}")