soothe-client-python 0.9.8__py3-none-any.whl → 0.9.9__py3-none-any.whl

soothe_client/appkit/daemon_session.py

@@ -23,7 +23,7 @@ from soothe_client.stream_terminal import (
     is_turn_end_custom_data,
     is_turn_progress_chunk,
 )
-from soothe_client.turn_boundary import frame_seq, frame_turn_id
+from soothe_client.turn_boundary import frame_seq, frame_turn_id, parse_turn_generation
 from soothe_client.websocket import WebSocketClient
 
 logger = logging.getLogger(__name__)
@@ -392,13 +392,19 @@ class DaemonSession:
                     if ev_seq is not None and last_end_seq > 0 and ev_seq <= last_end_seq:
                         continue
 
-                    # IG-659 phases 1–2: drop mismatched turn_id once bound.
+                    # Drop mismatched turn_id once bound — except status=running,
+                    # which may rebind to a newer generation (pre-admit early
+                    # running can briefly carry a stale or empty turn_id).
                     ev_turn_id = frame_turn_id(event)
+                    is_running_status = (
+                        event_type == "status" and str(event.get("state") or "") == "running"
+                    )
                     if (
                         expected_turn_id
                         and ev_turn_id
                         and ev_turn_id != expected_turn_id
                         and event_type in {"event", "status"}
+                        and not is_running_status
                     ):
                         logger.debug(
                             "Ignoring mismatched turn_id frame type=%s got=%s expected=%s",
@@ -426,8 +432,18 @@ class DaemonSession:
                             progress_seen = True
                             status_turn = frame_turn_id(event)
                             if status_turn:
-                                expected_turn_id = status_turn
-                                self._expected_turn_id = status_turn
+                                new_gen = parse_turn_generation(status_turn)
+                                old_gen = parse_turn_generation(expected_turn_id)
+                                if expected_turn_id is None or (
+                                    new_gen is not None and (old_gen is None or new_gen >= old_gen)
+                                ):
+                                    if expected_turn_id and status_turn != expected_turn_id:
+                                        # Successor turn admitted while this reader
+                                        # still held a stale/early binding.
+                                        stream_payload_seen = False
+                                        turn_progress_seen = False
+                                    expected_turn_id = status_turn
+                                    self._expected_turn_id = status_turn
                         elif query_started and state == "stopped":
                             self.last_turn_end_state = state
                             if ev_seq is not None:

soothe_client/turn_boundary.py

@@ -18,6 +18,19 @@ def format_turn_id(loop_id: str, generation: int) -> str:
     return f"{lid}:{gen}"
 
 
+def parse_turn_generation(turn_id: str | None) -> int | None:
+    """Extract generation int from ``turn_id``, or None if malformed."""
+    raw = str(turn_id or "").strip()
+    if not raw or ":" not in raw:
+        return None
+    suffix = raw.rsplit(":", 1)[-1]
+    try:
+        gen = int(suffix)
+    except ValueError:
+        return None
+    return gen if gen > 0 else None
+
+
 def frame_turn_id(frame: dict[str, Any] | None) -> str | None:
     """Return ``turn_id`` from a status/event frame or nested custom data."""
     if not isinstance(frame, dict):
@@ -51,4 +64,5 @@ __all__ = [
     "format_turn_id",
     "frame_seq",
     "frame_turn_id",
+    "parse_turn_generation",
 ]

{soothe_client_python-0.9.8.dist-info → soothe_client_python-0.9.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soothe-client-python
-Version: 0.9.8
+Version: 0.9.9
 Summary: WebSocket client + appkit for soothe-daemon (Python)
 Project-URL: Homepage, https://github.com/mirasoth/soothe-client-python
 Project-URL: Documentation, https://soothe.readthedocs.io

{soothe_client_python-0.9.8.dist-info → soothe_client_python-0.9.9.dist-info}/RECORD

@@ -7,7 +7,7 @@ soothe_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 soothe_client/schemas.py,sha256=FDhx2qwKOrJMqxjwFSDVi3SnYihFmZiNWD97ZktLmLc,1689
 soothe_client/session.py,sha256=Z-j_8sgcWaH5lJbPUDRdmMCgR_E81sCm0u5UFhLAEI8,7887
 soothe_client/stream_terminal.py,sha256=CD7CMNXHx8klFXmrT0kZWBwtJOTdsjhhF-2PaaHP0M8,3515
-soothe_client/turn_boundary.py,sha256=lsCgPh7CbRIgorignVUVS-1DfxQiLMfP7PcuuDEyRUs,1530
+soothe_client/turn_boundary.py,sha256=FLBL5Pz47lVhVlPuqjvO4YjUtq2gIccXIsqsV2N-s-4,1937
 soothe_client/websocket.py,sha256=UmHRYNmx8brDYr983fO1tKQIFWHKfF7Wc6DbQRlYBTA,64716
 soothe_client/ws_command_client.py,sha256=Clp9YT6WDa5COTfus8FmxGksozmJbiXFctN6c36z-RI,23605
 soothe_client/appkit/__init__.py,sha256=lloR8K0FARCaBE1n9Rr-B28qUMS0Fd180OUNqiPDnCE,3651
@@ -15,7 +15,7 @@ soothe_client/appkit/attachments.py,sha256=hD2FsXeR8TqO3hzIYT49DUedsv9r2yFEuIYDB
 soothe_client/appkit/broadcaster.py,sha256=wcWQUOy7HjFgNaXDk1Ec71CGi7mZmb-zXZZbuOon9OY,3529
 soothe_client/appkit/chunk_filter.py,sha256=UoC4kbS_65UNEJIjbyufqxGBLwvamwvQ26BqZ_gkDTg,3134
 soothe_client/appkit/classifier.py,sha256=DH04CtdYyJV7Eoft1i7CR-vVvLBhH9n4Wl_CypFzi5M,18767
-soothe_client/appkit/daemon_session.py,sha256=OUDMo6z8ENojF85kKMstGp4EH-EawAAOD9aL1eVvrPs,30969
+soothe_client/appkit/daemon_session.py,sha256=AQQLKF7fHkrbm1aBVUdcAALoboN3B0BQuBjGZnFjkC0,32113
 soothe_client/appkit/events.py,sha256=p7uZmSx_kYdiR7DQY84rvgyHE6RQ6Orbq2KT-WCNsiM,2290
 soothe_client/appkit/managed_client.py,sha256=QZhXA-zbx2v8IJpU_YFyUcwHRmNEziEGR6euPSvadfY,7183
 soothe_client/appkit/observability.py,sha256=9maW5oyEK0PZBjU7x8tHupoRBvAxApkHFQavRzkr7SM,650
@@ -25,7 +25,7 @@ soothe_client/appkit/session_store.py,sha256=uJNMZ33bq3F_qggdSD2ku4CN4aMxbMWywb5
 soothe_client/appkit/thinking_step.py,sha256=dB1L1ERPkisLh2y3KIgd4f6EmN8GmF5B0h6lae9tt18,4558
 soothe_client/appkit/turn.py,sha256=gtQyz3gGw8nkg8tfzpGZzNgRmJ48vJnj2Ll95W_BX4w,12479
 soothe_client/appkit/turn_runner.py,sha256=Svy-LAgy6p506zEHHnKKPay2rzxgLORoAawf6S66dKQ,20753
-soothe_client_python-0.9.8.dist-info/METADATA,sha256=x7OQyn9aZv7geK0PZ9WMovHx8WOvkEgoE8zdBfn-8kM,2857
-soothe_client_python-0.9.8.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-soothe_client_python-0.9.8.dist-info/licenses/LICENSE,sha256=WbXjnHkSCPG_f4TfOdS_mGrbkQAYykAdfIqVDj9O-IY,1068
-soothe_client_python-0.9.8.dist-info/RECORD,,
+soothe_client_python-0.9.9.dist-info/METADATA,sha256=lIhxg_Ah3XN-p3xj8XBgvBqb5Km13KcSabhPn5a8wBc,2857
+soothe_client_python-0.9.9.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+soothe_client_python-0.9.9.dist-info/licenses/LICENSE,sha256=WbXjnHkSCPG_f4TfOdS_mGrbkQAYykAdfIqVDj9O-IY,1068
+soothe_client_python-0.9.9.dist-info/RECORD,,