soothe-cli 1.0.16__tar.gz → 1.0.18__tar.gz

{soothe_cli-1.0.16 → soothe_cli-1.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: soothe-cli
-Version: 1.0.16
+Version: 1.0.18
 Summary: Soothe CLI client - communicates with daemon via WebSocket
 Project-URL: Homepage, https://github.com/mirasoth/soothe
 Project-URL: Documentation, https://soothe.readthedocs.io

{soothe_cli-1.0.16 → soothe_cli-1.0.18}/src/soothe_cli/tui/app/_execution.py

@@ -232,13 +232,7 @@ class _ExecutionMixin:
         answers: list[str],
         origin_node: str = "",
     ) -> None:
-        """Shared clarification-answer forwarding.
-
-        Renders the answers on the matching step card, disarms stale inline
-        widgets, and hands the answers to `_send_to_agent` so the daemon
-        resumes the suspended loop graph with one answer per question
-        instead of starting a new turn.
-        """
+        """Forward clarification answers to the daemon so the loop graph resumes."""
         adapter = self._ui_adapter
         if adapter is None:
             return
@@ -258,9 +252,12 @@ class _ExecutionMixin:
             except Exception:  # noqa: BLE001
                 logger.debug("Failed to render clarification answers on step card", exc_info=True)
 
-        # Drop tracking; the inline widget itself stays mounted (disabled) so
-        # the user can still see what they answered.
-        adapter._clarification_input_by_step.pop(step_id, None)
+        # Mark the submitted widget so a late re-emit deduplicates against it
+        # instead of mounting a second card. The widget stays mounted (disabled).
+        submitted_widget = adapter._clarification_input_by_step.get(step_id)
+        if submitted_widget is not None:
+            submitted_widget._submitted = True  # noqa: SLF001
+            submitted_widget.add_class("is-submitted")
 
         # A stale empty remount (resume re-emit) can leave another interactive
         # plan-review card. Disable extras so a second click cannot fire a
@@ -282,7 +279,6 @@ class _ExecutionMixin:
                     inp.disabled = True
             except Exception:  # noqa: BLE001
                 logger.debug("Failed to disarm leftover clarification widget", exc_info=True)
-            adapter._clarification_input_by_step.pop(sid, None)
 
         non_empty = [a for a in answers if a.strip()]
         if not non_empty:

{soothe_cli-1.0.16 → soothe_cli-1.0.18}/src/soothe_cli/tui/textual_adapter.py

@@ -2928,10 +2928,10 @@ async def _mount_manual_clarification_input(
 ) -> str:
     """Mount (or reuse) the inline clarification answer widget.
 
-    Prefers the paused step id from the wire event, then a running step card,
-    then an active orphan SubAgent card, then a synthetic key from
-    `origin_node`. HITL origins get `allow_custom=False` and an optional plan
-    body; structured dicts render structured mode, plain strings degraded mode.
+    Reuses an existing widget for the same `origin_node` (including one already
+    submitted) to avoid duplicate cards on late re-emits. Otherwise resolves a
+    target step id from the wire event, a running step card, an active orphan
+    SubAgent card, or a synthetic key from `origin_node`.
 
     Returns:
         The step/key used for `adapter._clarification_input_by_step`.
@@ -2948,16 +2948,18 @@ async def _mount_manual_clarification_input(
     if not questions_list:
         return ""
 
-    # Reuse an already-mounted, unanswered widget for this origin. A single
-    # clarification can be announced more than once, and the first mount flips
-    # the step card to "pending", so a re-emit would otherwise resolve a
-    # different key and mount a duplicate question card.
+    # Reuse an already-mounted widget for this origin so a late re-emit does
+    # not mount a duplicate. When the wire event carries a step_id, scope reuse
+    # to the same step so a stale (already-answered) card from a prior step
+    # does not suppress a fresh approval prompt for a different step.
+    target_origin = str(origin_node or "").strip()
+    incoming_step = str(step_id or "").strip()
     for _key, _w in adapter._clarification_input_by_step.items():
-        if (
-            not getattr(_w, "_submitted", False)
-            and getattr(_w, "_origin_node", "") == str(origin_node or "").strip()
-        ):
-            return _key
+        if getattr(_w, "_origin_node", "") != target_origin:
+            continue
+        if incoming_step and getattr(_w, "_step_id", "") != incoming_step:
+            continue
+        return _key
 
     target_step_id = str(step_id or "").strip()
     if target_step_id and target_step_id in adapter._current_step_messages:
@@ -3012,7 +3014,7 @@ async def _mount_manual_clarification_input(
         mount_result = adapter._mount_message(input_widget)
         if mount_result is not None:
             await mount_result
-        return target_step_id
+    return target_step_id
 
 
 async def execute_task_textual(
@@ -4243,6 +4245,16 @@ async def execute_task_textual(
                             if event_type == LOOP_CLARIFICATION_ANSWERED:
                                 clarification_pending = False
                                 adapter._clarification_pending = False
+                                # Evict already-submitted clarification cards so a
+                                # later approval for a different step is not
+                                # deduped against this answered one (the loop
+                                # would otherwise park in await_clarification
+                                # with no visible prompt).
+                                adapter._clarification_input_by_step = {
+                                    _k: _w
+                                    for _k, _w in adapter._clarification_input_by_step.items()
+                                    if not getattr(_w, "_submitted", False)
+                                }
                                 if adapter._resume_spinner:
                                     await adapter._resume_spinner()
                                 continue