awp-python 0.1.0a4__tar.gz → 0.1.0a5__tar.gz

awp_python-0.1.0a5/AGENTS.md

@@ -0,0 +1,58 @@
+# AGENTS.md
+
+awp-python is the Python agent SDK for the Agent World Protocol, published on PyPI as `awp-python`. `awp.ClientConnection` is the protocol as a sans-IO state machine, and `awp.aio.AsyncClient` drives it over a WebSocket. It targets one specification revision, which is pinned as the `spec/` submodule and named by `awp.SPEC_REVISION`.
+
+## Checks
+
+```bash
+git submodule update --init
+uv sync
+uv run ruff check && uv run ruff format --check
+uv run mypy
+uv run pytest --cov
+uv run python scripts/sync_spec.py --check
+```
+
+CI runs all of these on Python 3.11–3.13. It also runs awp-conformance against `awp-demo` in both time models, and fails unless the claim is AWP-conformant.
+
+## Code
+
+- Protocol behavior belongs in `ClientConnection`. `AsyncClient` adds only transport, timers, and awaiting.
+- Cite a requirement ID (`AWP-XXX-NNN`) where the code implements it. Otherwise, comment only what the code can't say.
+- Tests run against the scripted world in `tests/world.py`, not against awp-sim.
+- `src/awp/_spec/` is copied from `spec/` by `scripts/sync_spec.py`. Never edit it by hand.
+
+## Conformance
+
+`conformance/` holds the reports behind the README's claim, plus the evidence for their `manual` rows. The reports must come from the suite version CI runs. After bumping that pin in `.github/workflows/ci.yml`, regenerate them with the commands in `conformance/README.md`. Then update the versions named there and in the README.
+
+## Commits and pull requests
+
+- Branch from `main` and open a pull request. Merge once CI passes.
+- Write the title as one plain sentence in sentence case, with no trailing period, saying what changed: `Run awp-conformance 0.1.0a4 in CI`. When the change is part of a release, end it with the version: `(0.1.0a4)`.
+- Add a body only when the title can't carry the reason: one or two short sentences.
+- Write commits the way a person on the project would. No `Co-Authored-By` trailers, no "Generated with" lines, and no other mention of AI tools, in commits or in PRs.
+- The PR title matches the commit title, and the description is a few lines at most.
+
+## Moving to a new draft revision
+
+1. Check out the revision's tag (`spec-v0.1-draft.N`) in `spec/`.
+2. Run `uv run python scripts/sync_spec.py`.
+3. Update `SPEC_REVISION` in `src/awp/__init__.py`.
+4. Fix whatever the tests report.
+
+## Releasing
+
+1. In a pull request:
+   - Set the version with `uv version <version>`, for example `0.1.0a5`.
+   - Add a `CHANGELOG.md` entry that starts "Targets specification revision `0.1-draft.N`." and lists the user-visible changes.
+2. Once it is merged, tag the merge commit and push the tag:
+
+   ```bash
+   git tag -a v0.1.0a5 -m "awp-python 0.1.0a5 (AWP 0.1-draft.N)"
+   git push origin v0.1.0a5
+   ```
+
+3. `release.yml` checks that the tag matches the version, then builds the package. It publishes through PyPI trusted publishing once someone approves the `pypi` environment. A maintainer gives that approval. Agents never approve deployments, and never publish with a token.
+
+awp-sim depends on awp-python, so release awp-python first when both change.

{awp_python-0.1.0a4 → awp_python-0.1.0a5}/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.1.0a5
+
+Targets specification revision `0.1-draft.9`.
+
+- `open_session` takes `embodiments` to bind several embodiments of one `multi_bind_group`, and `submit` then requires `embodiment_id` (AWP-EMB-005).
+- A response that arrives after `AsyncClient.call` times out is still processed, so its `status_seq` and tick are not lost. `call`, `wait_for`, and `advance` accept `timeout=None`.
+- `advance()` refuses while a `world.tick` is pending: under a `barrier` it may wait for other sessions (AWP-TIM-012). In lockstep the heartbeat timer runs even with `heartbeat=False`.
+- Closing a session stops its heartbeat acknowledgements, stream connection, and resumption. A new session starts from none of the last one's channel, sequencing, or frame state, and `AsyncClient.latest` is cleared.
+- `ClientConnection` gains `lockstep`, `heartbeat_s`, and `embodiments`. `forget` is gone.
+
 ## 0.1.0a4
 
 Targets specification revision `0.1-draft.9`.
@@ -33,13 +43,5 @@ First release, targeting specification revision `0.1-draft.7`.
 - The `ws` stream binding: `awp-sim serve --stream-binding ws` offers frames on a stream connection in the binary envelope, and `AsyncClient` uses it when offered, re-establishing it if only the stream drops (AWP-TRN-010..013).
 - Beyond Core, each enabled with `awp-sim serve --features`: `task`, `approval` (the `park` action; approvers connect with `--approver-token`), `blend`, `transfer`, `sim` (seeding, snapshot and restore, replay bundles with `--replay-dir`, and `awp-sim replay`), and `servo` (a command channel). `ClientConnection` gains `update_task`, `transfer`, `reset`, `snapshot`, `restore`, `respond_approval`, and `command`.
 - The lockstep session clock counts advances, so reset and restore, which now move the tick, never move it backward (AWP-TIM-013). Audit records hash frame payloads, not their base64 text.
-
 - `awp`: `ClientConnection.submit` refuses action types the session was not granted (AWP-AGT-003); `AsyncClient` treats three heartbeat intervals without a message from the world as a lost connection (AWP-SAF-002).
 - `awp_sim`: channels in modalities the agent did not declare are not granted (AWP-AGM-001); granted rates honor the agent's `max_obs_rate_hz` (AWP-AGM-002); a connection without a session is closed after at least 15 s (AWP-SES-012); `--max-duration-ms`. The demo agent does nothing when `move_to_pose` is not granted.
-
-## 0.1.0.dev0 — unreleased
-
-First implementation, targeting specification revision `0.1-draft.5`.
-
-- `awp`: sans-IO `ClientConnection`, asyncio `AsyncClient`, binary and inline frame codec, canonical schema validation (receiver and sender forms), the lifecycle transition table, clock synchronization.
-- `awp_sim`: sans-IO world engine for lockstep and streaming, simulated arm, WebSocket server with bearer authentication, audit log, trace recorder, in-process loopback, twelve scripted scenarios, and the `awp-sim` command.

awp_python-0.1.0a5/CLAUDE.md

@@ -0,0 +1 @@
+@AGENTS.md

{awp_python-0.1.0a4 → awp_python-0.1.0a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: awp-python
-Version: 0.1.0a4
+Version: 0.1.0a5
 Summary: Agent World Protocol agent SDK for Python.
 Project-URL: Specification, https://www.agentworldprotocol.com
 Project-URL: Source, https://github.com/Hyperduality/awp-python
@@ -29,16 +29,19 @@ It targets specification revision **`0.1-draft.9`**, pinned as the `spec/` submo
 
 ![AWP: Core Agent, AWP-conformant against 0.1-draft.9](https://img.shields.io/badge/AWP-Core_Agent%2C_conformant_0.1--draft.9-555)
 
-In both time models, the demo agent built on the client is **Core Agent: AWP-conformant against 0.1-draft.9**. [awp-conformance](https://github.com/Hyperduality/awp-conformance) reports no failure and nothing untested, and [`conformance/`](conformance/README.md) holds the reports and the evidence for their manual rows. CI runs the suite against the demo agent on every change.
+In both time models, the demo agent built on the client is **Core Agent: AWP-conformant against 0.1-draft.9**. [awp-conformance](https://github.com/Hyperduality/awp-conformance) reports no failure and nothing untested, and [`conformance/`](conformance/README.md) holds the reports and the evidence for their manual rows.
 
-| Implemented | Not implemented |
-|---|---|
-| Lockstep and streaming sessions; `world.tick` advances that wait for every per-tick channel | Multi-bind (`embodiments`) |
-| Inline and `ws` stream bindings; binary frame codec (every spec vector) | Other stream bindings (`webrtc`, `webtransport`, `shm`, `grpc`) |
-| Action lifecycle checked against the spec's transition table; idempotent resubmission | |
-| Heartbeats, clock synchronization, receiver reports, resumption with replay and acknowledgement | |
-| Canonical schema validation in receiver and sender forms | |
-| Task, approval and standing approvals, transfer, reset, snapshots, and command channels | |
+Implemented:
+
+- lockstep and streaming sessions, with `world.tick` advances that wait for every per-tick channel;
+- multi-bind sessions (`embodiments`);
+- inline and `ws` stream bindings, and the binary frame codec (every spec vector);
+- the action lifecycle, checked against the spec's transition table, and idempotent resubmission;
+- heartbeats, clock synchronization, receiver reports, and resumption with replay and acknowledgement;
+- canonical schema validation in receiver and sender forms;
+- task, approval and standing approvals, transfer, reset, snapshots, and command channels.
+
+Not implemented: stream bindings other than inline and `ws` (`webrtc`, `webtransport`, `shm`, `grpc`).
 
 ## Install
 
@@ -74,9 +77,11 @@ async with AsyncClient(conn, "ws://127.0.0.1:8710") as client:
 Without asyncio, feed `ClientConnection` the decoded messages and send whatever it queues:
 
 ```python
-events = conn.receive(message)  # typed events: ActionUpdated, FrameReceived, ...
+from awp import jsonrpc
+
+events = conn.receive(jsonrpc.decode(text))  # typed events: ActionUpdated, FrameReceived, ...
 for out in conn.outgoing():  # messages to send, in order
-    transport.send(json.dumps(out))
+    transport.send(jsonrpc.encode(out))
 ```
 
 The connection:
@@ -118,12 +123,7 @@ uv run pytest --cov
 uv run python scripts/sync_spec.py --check
 ```
 
-To move to a new draft revision:
-
-1. Check out its tag in `spec/`.
-2. Run `scripts/sync_spec.py`.
-3. Update `SPEC_REVISION` in `src/awp/__init__.py`.
-4. Fix whatever the tests report.
+[AGENTS.md](AGENTS.md) covers moving to a new draft revision and releasing.
 
 ## License
 

{awp_python-0.1.0a4 → awp_python-0.1.0a5}/README.md

@@ -8,16 +8,19 @@ It targets specification revision **`0.1-draft.9`**, pinned as the `spec/` submo
 
 ![AWP: Core Agent, AWP-conformant against 0.1-draft.9](https://img.shields.io/badge/AWP-Core_Agent%2C_conformant_0.1--draft.9-555)
 
-In both time models, the demo agent built on the client is **Core Agent: AWP-conformant against 0.1-draft.9**. [awp-conformance](https://github.com/Hyperduality/awp-conformance) reports no failure and nothing untested, and [`conformance/`](conformance/README.md) holds the reports and the evidence for their manual rows. CI runs the suite against the demo agent on every change.
+In both time models, the demo agent built on the client is **Core Agent: AWP-conformant against 0.1-draft.9**. [awp-conformance](https://github.com/Hyperduality/awp-conformance) reports no failure and nothing untested, and [`conformance/`](conformance/README.md) holds the reports and the evidence for their manual rows.
 
-| Implemented | Not implemented |
-|---|---|
-| Lockstep and streaming sessions; `world.tick` advances that wait for every per-tick channel | Multi-bind (`embodiments`) |
-| Inline and `ws` stream bindings; binary frame codec (every spec vector) | Other stream bindings (`webrtc`, `webtransport`, `shm`, `grpc`) |
-| Action lifecycle checked against the spec's transition table; idempotent resubmission | |
-| Heartbeats, clock synchronization, receiver reports, resumption with replay and acknowledgement | |
-| Canonical schema validation in receiver and sender forms | |
-| Task, approval and standing approvals, transfer, reset, snapshots, and command channels | |
+Implemented:
+
+- lockstep and streaming sessions, with `world.tick` advances that wait for every per-tick channel;
+- multi-bind sessions (`embodiments`);
+- inline and `ws` stream bindings, and the binary frame codec (every spec vector);
+- the action lifecycle, checked against the spec's transition table, and idempotent resubmission;
+- heartbeats, clock synchronization, receiver reports, and resumption with replay and acknowledgement;
+- canonical schema validation in receiver and sender forms;
+- task, approval and standing approvals, transfer, reset, snapshots, and command channels.
+
+Not implemented: stream bindings other than inline and `ws` (`webrtc`, `webtransport`, `shm`, `grpc`).
 
 ## Install
 
@@ -53,9 +56,11 @@ async with AsyncClient(conn, "ws://127.0.0.1:8710") as client:
 Without asyncio, feed `ClientConnection` the decoded messages and send whatever it queues:
 
 ```python
-events = conn.receive(message)  # typed events: ActionUpdated, FrameReceived, ...
+from awp import jsonrpc
+
+events = conn.receive(jsonrpc.decode(text))  # typed events: ActionUpdated, FrameReceived, ...
 for out in conn.outgoing():  # messages to send, in order
-    transport.send(json.dumps(out))
+    transport.send(jsonrpc.encode(out))
 ```
 
 The connection:
@@ -97,12 +102,7 @@ uv run pytest --cov
 uv run python scripts/sync_spec.py --check
 ```
 
-To move to a new draft revision:
-
-1. Check out its tag in `spec/`.
-2. Run `scripts/sync_spec.py`.
-3. Update `SPEC_REVISION` in `src/awp/__init__.py`.
-4. Fix whatever the tests report.
+[AGENTS.md](AGENTS.md) covers moving to a new draft revision and releasing.
 
 ## License
 

{awp_python-0.1.0a4 → awp_python-0.1.0a5}/conformance/README.md

@@ -4,10 +4,10 @@
 
 | Class | Configuration | Claim | Report |
 |---|---|---|---|
-| Core Agent | `awp-demo`, [`manifest-lockstep.json`](manifest-lockstep.json) | Core Agent (lockstep): AWP-conformant against 0.1-draft.9 (awp-conformance 0.1.0a3) | [`core-agent-lockstep.json`](core-agent-lockstep.json) |
-| Core Agent | `awp-demo`, [`manifest-streaming.json`](manifest-streaming.json) | Core Agent (streaming): AWP-conformant against 0.1-draft.9 (awp-conformance 0.1.0a3) | [`core-agent-streaming.json`](core-agent-streaming.json) |
+| Core Agent | `awp-demo`, [`manifest-lockstep.json`](manifest-lockstep.json) | Core Agent (lockstep): AWP-conformant against 0.1-draft.9 (awp-conformance 0.1.0a6) | [`core-agent-lockstep.json`](core-agent-lockstep.json) |
+| Core Agent | `awp-demo`, [`manifest-streaming.json`](manifest-streaming.json) | Core Agent (streaming): AWP-conformant against 0.1-draft.9 (awp-conformance 0.1.0a6) | [`core-agent-streaming.json`](core-agent-streaming.json) |
 
-The reports come from awp-conformance 0.1.0a3 run against awp-python 0.1.0a4. Neither has a failure or anything untested. The evidence for their `manual` rows is below (AWP-CNF-005).
+The reports come from awp-conformance 0.1.0a6 run against awp-python 0.1.0a5. Neither has a failure or anything untested. The evidence for their `manual` rows is below (AWP-CNF-005).
 
 ## Reproduce
 
@@ -19,7 +19,7 @@ awp-conformance agent --manifest conformance/manifest-lockstep.json --frames con
   --mode lockstep --out report/ -- awp-demo --url '{url}' --token '{token}'
 ```
 
-For streaming, use `manifest-streaming.json` with `--mode streaming`. CI runs both on every change. The tests cited below run in CI too:
+For streaming, use `manifest-streaming.json` with `--mode streaming`. The tests the evidence below cites:
 
 ```bash
 uv run pytest tests/test_frames.py tests/test_evidence.py
@@ -41,7 +41,7 @@ In streaming, the suite reads the agent's loss accounting from its `obs.report`.
 `test_vectors` (`tests/test_frames.py`) runs `awp.frames` over every vector in `schemas/test-vectors/frames.json` of the `spec/` submodule, which is pinned at `spec-v0.1-draft.9`:
 
 - the 10 valid vectors decode to their listed fields;
-- the 7 marked `expect_error` are rejected with their listed error.
+- the 10 marked `expect_error` are rejected with their listed error.
 
 `test_roundtrip_without_vendor` re-encodes the 8 valid vectors that have no unknown extension or reserved bits, and each matches byte for byte.
 

{awp_python-0.1.0a4 → awp_python-0.1.0a5}/conformance/core-agent-lockstep.json

@@ -1,15 +1,15 @@
 {
   "suite": {
     "name": "awp-conformance",
-    "version": "0.1.0a3"
+    "version": "0.1.0a6"
   },
   "specification": "0.1-draft.9",
   "target": "awp-demo --url {url} --token {token}",
   "side": "agent",
-  "generated": "2026-09-25T21:46:19Z",
+  "generated": "2026-09-26T18:45:07Z",
   "claim": {
     "status": "conformant",
-    "wording": "Core Agent (lockstep): AWP-conformant against 0.1-draft.9 (awp-conformance 0.1.0a3)",
+    "wording": "Core Agent (lockstep): AWP-conformant against 0.1-draft.9 (awp-conformance 0.1.0a6)",
     "classes": [
       "Core Agent"
     ],
@@ -108,7 +108,7 @@
       "id": "AWP-AGT-001",
       "level": "MUST",
       "outcome": "pass",
-      "detail": "123 check(s): lockstep/baseline, lockstep/integer-range, lockstep/invalid-manifest, lockstep/malformed-frame, lockstep/no-action-grants, lockstep/reconnect, lockstep/refused-submission, lockstep/restarted-world, lockstep/silent-world"
+      "detail": "124 check(s): lockstep/baseline, lockstep/integer-range, lockstep/invalid-manifest, lockstep/malformed-frame, lockstep/no-action-grants, lockstep/reconnect, lockstep/refused-submission, lockstep/restarted-world, lockstep/silent-world"
     },
     {
       "id": "AWP-AGT-002",
@@ -138,7 +138,7 @@
       "id": "AWP-AGT-006",
       "level": "MUST",
       "outcome": "pass",
-      "detail": "23 check(s): lockstep/baseline, lockstep/malformed-frame, lockstep/reconnect, lockstep/restarted-world, lockstep/silent-world"
+      "detail": "24 check(s): lockstep/baseline, lockstep/integer-range, lockstep/malformed-frame, lockstep/reconnect, lockstep/restarted-world, lockstep/silent-world"
     },
     {
       "id": "AWP-AGT-007",
@@ -396,7 +396,7 @@
       "id": "AWP-CTL-001",
       "level": "MUST",
       "outcome": "pass",
-      "detail": "124 check(s): lockstep/baseline, lockstep/integer-range, lockstep/invalid-manifest, lockstep/malformed-frame, lockstep/no-action-grants, lockstep/reconnect, lockstep/refused-submission, lockstep/restarted-world, lockstep/silent-world"
+      "detail": "125 check(s): lockstep/baseline, lockstep/integer-range, lockstep/invalid-manifest, lockstep/malformed-frame, lockstep/no-action-grants, lockstep/reconnect, lockstep/refused-submission, lockstep/restarted-world, lockstep/silent-world"
     },
     {
       "id": "AWP-CTL-002",
@@ -426,7 +426,7 @@
       "id": "AWP-CTL-006",
       "level": "MUST",
       "outcome": "pass",
-      "detail": "124 check(s): lockstep/baseline, lockstep/integer-range, lockstep/invalid-manifest, lockstep/malformed-frame, lockstep/no-action-grants, lockstep/reconnect, lockstep/refused-submission, lockstep/restarted-world, lockstep/silent-world"
+      "detail": "125 check(s): lockstep/baseline, lockstep/integer-range, lockstep/invalid-manifest, lockstep/malformed-frame, lockstep/no-action-grants, lockstep/reconnect, lockstep/refused-submission, lockstep/restarted-world, lockstep/silent-world"
     },
     {
       "id": "AWP-CTL-007",
@@ -444,7 +444,7 @@
       "id": "AWP-CTL-009",
       "level": "MUST",
       "outcome": "pass",
-      "detail": "126 check(s): lockstep/baseline, lockstep/integer-range, lockstep/invalid-manifest, lockstep/malformed-frame, lockstep/no-action-grants, lockstep/reconnect, lockstep/refused-submission, lockstep/restarted-world, lockstep/silent-world"
+      "detail": "127 check(s): lockstep/baseline, lockstep/integer-range, lockstep/invalid-manifest, lockstep/malformed-frame, lockstep/no-action-grants, lockstep/reconnect, lockstep/refused-submission, lockstep/restarted-world, lockstep/silent-world"
     },
     {
       "id": "AWP-CTL-010",
@@ -1206,7 +1206,7 @@
       "id": "AWP-TIM-003",
       "level": "MUST",
       "outcome": "pass",
-      "detail": "5 check(s): lockstep/baseline, lockstep/malformed-frame, lockstep/reconnect, lockstep/restarted-world"
+      "detail": "6 check(s): lockstep/baseline, lockstep/reconnect, lockstep/restarted-world"
     },
     {
       "id": "AWP-TIM-004",
@@ -1422,7 +1422,7 @@
       "id": "AWP-VER-004",
       "level": "MUST",
       "outcome": "pass",
-      "detail": "110 check(s): lockstep/baseline, lockstep/integer-range, lockstep/invalid-manifest, lockstep/malformed-frame, lockstep/no-action-grants, lockstep/reconnect, lockstep/refused-submission, lockstep/restarted-world, lockstep/silent-world"
+      "detail": "111 check(s): lockstep/baseline, lockstep/integer-range, lockstep/invalid-manifest, lockstep/malformed-frame, lockstep/no-action-grants, lockstep/reconnect, lockstep/refused-submission, lockstep/restarted-world, lockstep/silent-world"
     },
     {
       "id": "AWP-VER-005",

{awp_python-0.1.0a4 → awp_python-0.1.0a5}/conformance/core-agent-streaming.json

@@ -1,15 +1,15 @@
 {
   "suite": {
     "name": "awp-conformance",
-    "version": "0.1.0a3"
+    "version": "0.1.0a6"
   },
   "specification": "0.1-draft.9",
   "target": "awp-demo --url {url} --token {token}",
   "side": "agent",
-  "generated": "2026-09-25T21:46:39Z",
+  "generated": "2026-09-26T18:45:09Z",
   "claim": {
     "status": "conformant",
-    "wording": "Core Agent (streaming): AWP-conformant against 0.1-draft.9 (awp-conformance 0.1.0a3)",
+    "wording": "Core Agent (streaming): AWP-conformant against 0.1-draft.9 (awp-conformance 0.1.0a6)",
     "classes": [
       "Core Agent"
     ],

{awp_python-0.1.0a4 → awp_python-0.1.0a5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "awp-python"
-version = "0.1.0a4"
+version = "0.1.0a5"
 description = "Agent World Protocol agent SDK for Python."
 readme = "README.md"
 license = "Apache-2.0"

{awp_python-0.1.0a4 → awp_python-0.1.0a5}/src/awp/aio.py

@@ -28,6 +28,7 @@ from .client import (
     Event,
     FrameReceived,
     Response,
+    SessionOpened,
     SessionStateChanged,
 )
 from .errors import AwpError, ErrorCode
@@ -40,9 +41,11 @@ SUBPROTOCOL = Subprotocol("awp")
 class AsyncClient:
     """An agent's connection to a world.
 
-    With `heartbeat=True` a timer sends pings. An agent that actuates something should pass
+    A timer sends pings. In a streaming session, an agent that actuates something should pass
     `heartbeat=False` and call `ping()` from its decision loop instead, so that a stalled policy
-    also stops the heartbeat that holds off the world's watchdog (AWP-SAF-005).
+    also stops the heartbeat that holds off the world's watchdog (AWP-SAF-005). A lockstep session
+    has no watchdog, and its `advance()` may wait on other sessions (AWP-TIM-012), so the timer
+    pings there regardless.
     """
 
     def __init__(
@@ -95,8 +98,7 @@ class AsyncClient:
             asyncio.create_task(self._read(self._ws)),
             asyncio.create_task(self._watch(self._ws)),
         ]
-        if self.heartbeat:
-            self._tasks.append(asyncio.create_task(self._beat()))
+        self._tasks.append(asyncio.create_task(self._beat()))
         if self.report_interval_s:
             self._tasks.append(asyncio.create_task(self._report()))
 
@@ -139,9 +141,9 @@ class AsyncClient:
     async def flush(self) -> None:
         """Send everything the connection has queued, in order."""
         async with self._send_lock:
+            if self._ws is None:
+                raise ConnectionError("not connected")
             for msg in self.conn.outgoing():
-                if self._ws is None:
-                    raise ConnectionError("not connected")
                 await self._ws.send(jsonrpc.encode(msg))
 
     async def _drop(self) -> None:
@@ -250,6 +252,8 @@ class AsyncClient:
     def _dispatch(self, event: Event) -> None:
         if isinstance(event, FrameReceived):
             self.latest[event.channel] = event
+        elif isinstance(event, SessionOpened) and not event.resumed:
+            self.latest.clear()
         for q in self._subscribers:
             q.put_nowait(event)
         for item in list(self._waiters):
@@ -263,7 +267,9 @@ class AsyncClient:
         last = loop.time()
         while not self._closed.is_set():
             await asyncio.sleep(0.05)  # re-read the interval: it is only known once a session opens
-            if self.conn.ready is not None and loop.time() - last >= self._heartbeat_s():
+            if self.conn.ready is None or not (self.heartbeat or self.conn.lockstep):
+                continue
+            if loop.time() - last >= self.conn.heartbeat_s:
                 last = loop.time()
                 self.conn.ping()
                 await self.flush()
@@ -275,25 +281,17 @@ class AsyncClient:
             await asyncio.sleep(0.1)
             if self.conn.ready is None:
                 continue
-            interval = (self.conn.ready.get("heartbeat_interval_ms", 5000)) / 1000
+            interval = self.conn.ready["heartbeat_interval_ms"] / 1000
             if loop.time() - self._last_rx > 3 * interval:
                 log.warning("no message from the world for %.1f s; closing", 3 * interval)
                 await ws.close(code=1001, reason="heartbeat lost")
                 return
 
-    def _heartbeat_s(self) -> float:
-        """Every heartbeat interval, and at least twice per watchdog period (AWP-SAF-005)."""
-        interval = (self.conn.ready or {}).get("heartbeat_interval_ms", 5000)
-        safe_state = ((self.conn.manifest or {}).get("safety_policy") or {}).get("safe_state")
-        if safe_state:
-            interval = min(interval, safe_state["watchdog_ms"] / 2)
-        return float(interval) / 1000
-
     async def _report(self) -> None:
         assert self.report_interval_s is not None
         while not self._closed.is_set():
             await asyncio.sleep(self.report_interval_s)
-            streaming = self.conn.tick is None and self.conn.ready is not None
+            streaming = self.conn.ready is not None and not self.conn.lockstep
             if streaming and self.conn.clock.samples:
                 self.conn.report()
                 await self.flush()
@@ -308,24 +306,23 @@ class AsyncClient:
             self._waiters.append((predicate, fut))
         return fut
 
-    async def _await(self, fut: asyncio.Future[Event], timeout: float) -> Event:
+    async def _await(self, fut: asyncio.Future[Event], timeout: float | None) -> Event:
         try:
             return await asyncio.wait_for(fut, timeout)
         finally:
             self._waiters = [(p, f) for p, f in self._waiters if f is not fut]
 
-    async def wait_for(self, predicate: Callable[[Event], bool], timeout: float = 10.0) -> Event:
+    async def wait_for(
+        self, predicate: Callable[[Event], bool], timeout: float | None = 10.0
+    ) -> Event:
         return await self._await(self._waiter(predicate), timeout)
 
-    async def call(self, rid: int, timeout: float = 10.0) -> dict[str, Any]:
-        """Send what is queued and await the response to request `rid`."""
+    async def call(self, rid: int, timeout: float | None = 10.0) -> dict[str, Any]:
+        """Send what is queued and await the response to request `rid`. A timeout stops the
+        waiting, not the request: a late response is still processed."""
         fut = self._waiter(lambda e: isinstance(e, (Response, ErrorResponse)) and e.id == rid)
         await self.flush()
-        try:
-            event = await self._await(fut, timeout)
-        except TimeoutError:
-            self.conn.forget(rid)
-            raise
+        event = await self._await(fut, timeout)
         if isinstance(event, ErrorResponse):
             raise event.error
         assert isinstance(event, Response)
@@ -387,7 +384,7 @@ class AsyncClient:
     async def cancel(self, action_id: str) -> dict[str, Any]:
         return await self.call(self.conn.cancel(action_id))
 
-    async def advance(self, count: int | None = None, timeout: float = 10.0) -> int:
+    async def advance(self, count: int | None = None, timeout: float | None = 10.0) -> int:
         """Advance lockstep time. Returns once the result and a frame of its tick on every
         subscribed per-tick channel are held; on a stream connection the frames may follow the
         result (AWP-TIM-003)."""