soothe-cli 1.0.0__tar.gz → 1.0.3__tar.gz

{soothe_cli-1.0.0 → soothe_cli-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: soothe-cli
-Version: 1.0.0
+Version: 1.0.3
 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.0 → soothe_cli-1.0.3}/src/soothe_cli/commands/binding.py

@@ -155,14 +155,14 @@ def message_to_widget(data: MessageData) -> Widget:
             is_tool_approval = origin == "tool_approval"
             refine_label = "Edit" if is_tool_approval else "Refine"
             question_spec = {
-                "question": "Action for this plan: Approve, Refine, or Reject?"
+                "question": "Action for this plan: Approve, Reject, or Refine?"
                 if not is_tool_approval
                 else "Approve this tool call?",
                 "header": "Plan review" if not is_tool_approval else "Tool approval",
                 "options": [
                     {"label": "Approve", "description": "Accept and proceed."},
-                    {"label": refine_label, "description": "Request changes."},
                     {"label": "Reject", "description": "Reject."},
+                    {"label": refine_label, "description": "Request changes."},
                 ],
             }
             w = StructuredAskUserWidget(
@@ -261,7 +261,7 @@ def message_from_widget(widget: Widget) -> MessageData:
         # Awaiting state for HITL origins.
         if is_hitl and not widget._submitted:  # noqa: SLF001
             if is_plan_review:
-                content = "Plan review: awaiting Approve / Refine / Reject"
+                content = "Plan review: awaiting Approve / Reject / Refine"
             else:
                 content = "Tool approval: awaiting Approve / Edit / Reject"
             return MessageData(type=MessageType.APP, content=content, id=widget_id)

{soothe_cli-1.0.0 → soothe_cli-1.0.3}/src/soothe_cli/tui/app/_execution.py

@@ -341,6 +341,10 @@ class _ExecutionMixin:
         # next pauses, which freezes scrolling and chat-input focus.
         await self._send_to_agent(payload_text)
 
+        # Return focus to the chat input so the user can type immediately.
+        with suppress(Exception):
+            self.focus_primary_input()
+
     async def _resolve_default_clarification_mode(self) -> str:
         """Fetch the daemon's default clarification mode for plan approval.
 

{soothe_cli-1.0.0 → soothe_cli-1.0.3}/src/soothe_cli/tui/app/_messages_mixin.py

@@ -793,20 +793,22 @@ class _MessagesMixin:
     def action_quit_or_interrupt(self) -> None:
         """Handle Ctrl+C — clear input, interrupt work, or exit on double-press.
 
-        Priority order when a task is running (agent/shell):
-        1. If input has pending text, clear it (first Ctrl+C).
-        2. If input is empty, interrupt the running task.
-        Interrupting a task resets the idle double-press exit state.
-
-        When idle, Ctrl+C arms a double-press exit:
-        1. First press clears any pending draft and shows a hint.
-        2. Second press within the timeout window exits the TUI.
-
-        Note: Copying selected text is bound to Ctrl+Y (`action_copy_selection`)
-        so Ctrl+C is reserved for interrupt/exit behavior.
+        Priority order: HITL review card (abandon + focus chat) → running
+        task (clear input, then interrupt) → idle double-press exit.
+        Ctrl+Y copies selection, so Ctrl+C stays reserved for this path.
         """
         current_time = time.monotonic()
 
+        # HITL review card (plan/tool): abandon and return focus to chat.
+        if self._has_active_qa_widget():
+            widget = self._active_plan_review_widget()
+            if widget is not None and not getattr(widget, "_submitted", False):
+                widget._abandon()
+                self._ctrl_c_pressed_time = None
+                if self._chat_input:
+                    self._chat_input.focus_input()
+                return
+
         # Check if input has pending content (text, mode, or completion).
         has_pending_input = self._has_pending_chat_input()
 
@@ -1072,25 +1074,21 @@ class _MessagesMixin:
                 inputs.append(inp)
         return inputs
 
-    def _active_plan_review_action_focus(self) -> Widget | None:
-        """Prefer the Approve button when a plan-review or tool-approval card is active."""
+    def _active_plan_review_widget(self) -> Widget | None:
+        """Return the active unsubmitted HITL review card, if any."""
         adapter = getattr(self, "_ui_adapter", None)
         if adapter is None:
             return None
         by_step = getattr(adapter, "_clarification_input_by_step", None) or {}
-        # Both option-selector origins render Approve / Refine(Edit) / Reject buttons.
         for message in by_step.values():
             if getattr(message, "_submitted", False):
                 continue
             # String compare — avoid MagicMock truthiness on property access in tests.
-            if getattr(message, "_origin_node", None) not in ("plan_mode_review", "tool_approval"):
-                continue
-            buttons = getattr(message, "_action_buttons", None) or {}
-            if not isinstance(buttons, dict):
-                continue
-            approve = buttons.get("approve")
-            if approve is not None and not getattr(approve, "disabled", False):
-                return approve
+            if getattr(message, "_origin_node", None) in (
+                "plan_mode_review",
+                "tool_approval",
+            ):
+                return message
         return None
 
     def _non_chat_focusable_inputs(self) -> list[Input]:
@@ -1107,18 +1105,13 @@ class _MessagesMixin:
         """Return the single input that should receive typing focus, if unambiguous.
 
         When an inline clarification card is active, its answer field takes
-        precedence over the bottom chat prompt. Planner-subagent review
-        focuses the Approve action. On modal screens, a lone
+        precedence over the bottom chat prompt. On modal screens, a lone
         filter box is focused automatically.
         """
         clar_inputs = self._active_clarification_inputs()
         if clar_inputs:
             return clar_inputs[0]
 
-        plan_action = self._active_plan_review_action_focus()
-        if plan_action is not None:
-            return plan_action
-
         non_chat = self._non_chat_focusable_inputs()
         if len(non_chat) == 1:
             return non_chat[0]

{soothe_cli-1.0.0 → soothe_cli-1.0.3}/src/soothe_cli/tui/widgets/context_data.py

@@ -138,7 +138,7 @@ def format_token_usage(snapshot: TokenUsageSnapshot) -> str:
     formatted = format_token_count(count)
     usage = f"{formatted}{suffix} tokens used this loop"
     if in_count > 0 or out_count > 0:
-        usage += f" (in: {format_token_count(in_count)} · out: {format_token_count(out_count)})"
+        usage += f" (↑{format_token_count(in_count)} · ↓{format_token_count(out_count)})"
 
     msg = f"{usage} · {model_name}" if model_name else usage
 

{soothe_cli-1.0.0 → soothe_cli-1.0.3}/src/soothe_cli/tui/widgets/messages/cognition_goal_tree.py

@@ -331,7 +331,7 @@ class CognitionGoalTreeMessage(Vertical):
         self._goal_out_tokens += out_t
 
     def goal_token_suffix(self) -> str:
-        """Compact `in:1.2K out:345` suffix for the plan panel title.
+        """Compact `↑1.2K ↓345` suffix for the plan panel title.
 
         Returns an empty string when no step has recorded any tokens.
         """
@@ -340,7 +340,7 @@ class CognitionGoalTreeMessage(Vertical):
             return ""
         from soothe_cli.runtime.state.session_stats import format_token_count
 
-        return f"in:{format_token_count(total_in)} out:{format_token_count(total_out)}"
+        return f"↑{format_token_count(total_in)} ↓{format_token_count(total_out)}"
 
     def mark_loop_started(self, started_at: float | None = None) -> None:
         """Anchor plan-level elapsed time (matches thinking-row turn start)."""
@@ -390,14 +390,14 @@ class CognitionGoalTreeMessage(Vertical):
 
     @staticmethod
     def _step_token_parts(st: _StepLineState) -> list[str]:
-        """In/out token labels for a step row, e.g. `in:1.2K out:345`."""
+        """Arrow token labels for a step row, e.g. `↑1.2K ↓345`."""
         if not (st.input_tokens or st.output_tokens):
             return []
         from soothe_cli.runtime.state.session_stats import format_token_count
 
         return [
-            f"in:{format_token_count(st.input_tokens)}",
-            f"out:{format_token_count(st.output_tokens)}",
+            f"↑{format_token_count(st.input_tokens)}",
+            f"↓{format_token_count(st.output_tokens)}",
         ]
 
     def _step_summary_suffix(self, st: _StepLineState) -> str:

{soothe_cli-1.0.0 → soothe_cli-1.0.3}/src/soothe_cli/tui/widgets/messages/cognition_step.py

@@ -251,14 +251,14 @@ class CognitionStepMessage(Vertical):
             self._sync_step_card_surface()
 
     def _token_budget_suffix(self) -> str:
-        """Token budget suffix for status lines, e.g. `in:1.2K out:345`."""
+        """Token budget suffix for status lines, e.g. `↑1.2K ↓345`."""
         if not (self._input_tokens or self._output_tokens):
             return ""
         from soothe_cli.runtime.state.session_stats import format_token_count
 
         parts: list[str] = []
-        parts.append(f"in:{format_token_count(self._input_tokens)}")
-        parts.append(f"out:{format_token_count(self._output_tokens)}")
+        parts.append(f"↑{format_token_count(self._input_tokens)}")
+        parts.append(f"↓{format_token_count(self._output_tokens)}")
         return " · " + " ".join(parts)
 
     def _compact_title_meta_suffix(self) -> str:

{soothe_cli-1.0.0 → soothe_cli-1.0.3}/src/soothe_cli/tui/widgets/messages/structured_ask_user.py

@@ -2,7 +2,7 @@
 
 Unifies the generic ``ask_user`` (execute origin) and the HITL plan-review /
 tool-approval origins into one widget. HITL origins differ only in that their
-options are system-prefilled (Approve / Refine or Edit / Reject), the ``Other``
+options are system-prefilled (Approve / Reject / Refine or Edit), the ``Other``
 free-text row is suppressed, and the Refine/Edit option shows a comment input.
 """
 
@@ -214,17 +214,21 @@ class StructuredAskUserWidget(Vertical):
         display: none;
     }
 
-    StructuredAskUserWidget .saq-custom-input {
-        margin: 0 0 0 2;
+    /* ── Inline option inputs (shared by custom + comment) ────────── */
+
+    /* `!important` beats Textual's default Input `:focus` border + height. */
+    StructuredAskUserWidget .saq-inline-input {
+        margin: 0;
         width: 1fr;
-        height: 1;
-        padding: 0 1;
-        background: $surface;
-        border: none;
+        height: auto !important;
+        padding: 0 !important;
+        border: none !important;
+        background: transparent !important;
+        color: $foreground !important;
     }
 
-    StructuredAskUserWidget .saq-custom-input:disabled {
-        opacity: 0.5;
+    StructuredAskUserWidget .saq-inline-input:disabled {
+        color: $text-muted;
     }
 
     StructuredAskUserWidget .saq-custom-hint {
@@ -351,7 +355,8 @@ class StructuredAskUserWidget(Vertical):
     StructuredAskUserWidget.is-submitted .saq-footer,
     StructuredAskUserWidget.is-submitted .saq-hint,
     StructuredAskUserWidget.is-submitted .saq-recap,
-    StructuredAskUserWidget.is-submitted .saq-separator {
+    StructuredAskUserWidget.is-submitted .saq-separator,
+    StructuredAskUserWidget.is-submitted .saq-body-path {
         display: none;
     }
 
@@ -414,17 +419,19 @@ class StructuredAskUserWidget(Vertical):
         min-width: 0;
     }
 
-    StructuredAskUserWidget .saq-comment-input {
-        margin: 0;
-        width: 1fr;
+    /* `❯` prefix before the comment input — same line height as the row.
+    Hidden unless the Refine/Edit option is highlighted. */
+    StructuredAskUserWidget .saq-comment-prefix {
+        width: auto;
         height: 1;
-        padding: 0 1;
-        background: $surface;
-        border: none;
+        padding: 0;
+        margin: 0 1 0 1;
+        color: $primary;
+        visibility: hidden;
     }
 
-    StructuredAskUserWidget .saq-comment-input:disabled {
-        opacity: 0.5;
+    StructuredAskUserWidget .saq-comment-prefix.is-visible {
+        visibility: visible;
     }
 
     /* ── HITL: expand/collapse plan body in answered view ──────────── */
@@ -437,6 +444,11 @@ class StructuredAskUserWidget(Vertical):
         margin: 0;
     }
 
+    /* After submit, hide the plan body preview unless expanded via toggle. */
+    StructuredAskUserWidget.is-submitted .saq-body-box {
+        display: none;
+    }
+
     StructuredAskUserWidget.is-submitted .saq-body-box.is-expanded {
         display: block;
     }
@@ -767,13 +779,19 @@ class StructuredAskUserWidget(Vertical):
                                 classes="saq-option-row",
                                 markup=False,
                             )
+                            yield Static(
+                                "❯",
+                                id="saq-comment-prefix",
+                                classes="saq-comment-prefix",
+                                markup=False,
+                            )
                             comment_placeholder = (
                                 "Revised args…" if self._is_tool_approval else "Comments…"
                             )
                             self._comment_input = Input(
                                 placeholder=comment_placeholder,
                                 id="saq-comment-input",
-                                classes="saq-comment-input",
+                                classes="saq-inline-input",
                                 disabled=True,
                             )
                             yield self._comment_input
@@ -804,7 +822,7 @@ class StructuredAskUserWidget(Vertical):
                     self._custom_input = Input(
                         placeholder="Type a custom answer…",
                         id="saq-custom-input",
-                        classes="saq-custom-input",
+                        classes="saq-inline-input",
                         disabled=_has_renderable_opts,
                     )
                     yield self._custom_input
@@ -962,8 +980,6 @@ class StructuredAskUserWidget(Vertical):
     def _start_focus_guard(self) -> None:
         """Poll every 200 ms and recapture focus if it drifted from the widget.
 
-        Scrollbar clicks, hydration re-layouts, and lifecycle events can
-        move focus to the chat input, the scroll container, or ``None``.
         Stopped on submit/abandon.
         """
 
@@ -974,16 +990,9 @@ class StructuredAskUserWidget(Vertical):
                 focused = self.app.focused
             except Exception:  # noqa: BLE001
                 return
-            # Recapture whenever focus has left the widget and its
-            # descendants.  The chat input is the most common culprit, but
-            # scrollbar clicks, hydration re-layouts, and other events can
-            # also move focus to None or the scroll container.
             if not self._focus_drifted(focused):
                 return
-            try:
-                self.app.set_focus(self)
-            except Exception:  # noqa: BLE001
-                pass
+            self._refocus_self_no_scroll()
 
         try:
             self._focus_guard_timer = self.set_interval(0.2, _tick)
@@ -1001,12 +1010,7 @@ class StructuredAskUserWidget(Vertical):
             self._focus_guard_timer = None
 
     def _schedule_robust_focus(self) -> None:
-        """Pin focus to the widget for ~600 ms after mount.
-
-        Textual's post-mount layout can re-focus the chat input after
-        `call_after_refresh` fires; staggered re-focus calls win that race
-        so arrow keys / Enter work immediately on appear.
-        """
+        """Pin focus to the widget for ~600 ms after mount."""
 
         def _refocus() -> None:
             try:
@@ -1017,10 +1021,7 @@ class StructuredAskUserWidget(Vertical):
                     return
             except Exception:  # noqa: BLE001
                 pass
-            try:
-                self.app.set_focus(self)
-            except Exception:  # noqa: BLE001
-                pass
+            self._refocus_self_no_scroll()
 
         try:
             self.set_timer(0.05, _refocus)
@@ -1030,6 +1031,13 @@ class StructuredAskUserWidget(Vertical):
         except Exception:  # noqa: BLE001
             pass
 
+    def _refocus_self_no_scroll(self) -> None:
+        """Focus the container without scrolling (prevents plan-header jump)."""
+        try:
+            self.app.set_focus(self, scroll_visible=False)
+        except Exception:  # noqa: BLE001
+            pass
+
     def _focus_drifted(self, focused: Any) -> bool:
         """Return True if focus left the widget and its descendants.
 
@@ -1075,16 +1083,12 @@ class StructuredAskUserWidget(Vertical):
         self._toggle_body_expanded()
 
     def on_descendant_focus(self, event: DescendantFocus) -> None:
-        """Guard: the HITL comment input may only hold focus when the
-        Refine/Edit option is the selected action."""
-        if (
-            self._comment_input is not None
-            and event.widget is self._comment_input
-            and self._comment_option_index is not None
-        ):
-            sel = self._selected.get(self._current_q)
-            if sel != self._comment_option_index:
-                self.screen.set_focus(self)
+        """An inline input holds focus only while its option is highlighted."""
+        allowed = self._inline_input_for_highlight()
+        if allowed is not None and event.widget is allowed:
+            return
+        if event.widget in self._inline_inputs():
+            self.screen.set_focus(self)
 
     # ── Rendering updates ──────────────────────────────────────────
 
@@ -1197,6 +1201,15 @@ class StructuredAskUserWidget(Vertical):
         # HITL: enable/disable comment input based on the selected option.
         if self._comment_input is not None and self._comment_option_index is not None:
             self._update_comment_input_state()
+            # Show the `❯` prefix only when the comment option is highlighted.
+            try:
+                prefix = self.query_one("#saq-comment-prefix", Static)
+                if self._highlighted == self._comment_option_index:
+                    prefix.add_class("is-visible")
+                else:
+                    prefix.remove_class("is-visible")
+            except Exception:  # noqa: BLE001
+                pass
 
     def _update_custom_row_highlight(self, custom_idx: int) -> None:
         """Apply highlight/selected classes and refresh the custom-row text."""
@@ -1244,12 +1257,47 @@ class StructuredAskUserWidget(Vertical):
             pass
 
     def _update_comment_input_state(self) -> None:
-        """Enable/disable the HITL comment input based on the selected option."""
+        """Enable the comment input when Refine/Edit is highlighted."""
         if self._comment_input is None or self._comment_option_index is None:
             return
-        sel = self._selected.get(self._current_q)
-        should_enable = sel is not None and sel == self._comment_option_index
-        self._comment_input.disabled = not should_enable
+        self._comment_input.disabled = self._highlighted != self._comment_option_index
+
+    # ── Inline-input helpers (shared by custom + comment) ───────────
+
+    def _inline_inputs(self) -> tuple[Input, ...]:
+        """Existing inline `Input`s attached to option rows."""
+        return tuple(inp for inp in (self._custom_input, self._comment_input) if inp is not None)
+
+    def _inline_input_for_highlight(self) -> Input | None:
+        """The inline input whose option is highlighted, else None."""
+        if (
+            self._comment_option_index is not None
+            and self._highlighted == self._comment_option_index
+        ):
+            return self._comment_input
+        if self._allow_custom:
+            custom_idx = len(self._question_options(self._current_q))
+            if self._highlighted == custom_idx:
+                return self._custom_input
+        return None
+
+    def _focus_inline_input_or_container(self) -> None:
+        """Focus the highlighted option's inline input, or the container.
+
+        When leaving an inline input (Refine→Approve/Reject), the input is
+        disabled by `_update_comment_input_state`, which makes Textual drop
+        focus to None.  Proactively re-focus the container without scrolling
+        so the 200 ms guard doesn't recapture and scroll to the plan header.
+        """
+        target = self._inline_input_for_highlight()
+        if target is not None and not target.disabled:
+            try:
+                self.app.set_focus(target)
+                return
+            except Exception:  # noqa: BLE001
+                pass
+        # No inline input — keep focus on the container without scrolling.
+        self._refocus_self_no_scroll()
 
     def _update_tab_highlight(self) -> None:
         """Update tab labels to reflect current question and answered state."""
@@ -1444,6 +1492,7 @@ class StructuredAskUserWidget(Vertical):
         total = num_opts + (1 if self._allow_custom else 0)
         self._highlighted = (self._highlighted - 1) % total
         self._update_option_highlight()
+        self._focus_inline_input_or_container()
 
     def action_next_option(self) -> None:
         if self._degraded or self._submitted or self._submit_review_open:
@@ -1452,6 +1501,7 @@ class StructuredAskUserWidget(Vertical):
         total = num_opts + (1 if self._allow_custom else 0)
         self._highlighted = (self._highlighted + 1) % total
         self._update_option_highlight()
+        self._focus_inline_input_or_container()
 
     def action_confirm(self) -> None:
         """Enter: select highlighted option, or finalize submit review."""
@@ -1471,7 +1521,10 @@ class StructuredAskUserWidget(Vertical):
         if self._allow_custom and self._highlighted == custom_idx:
             # Custom row — focus the input if not yet selected
             if self._custom_input is not None and not self._custom_input.disabled:
-                self._schedule_focus(self._custom_input)
+                try:
+                    self.app.set_focus(self._custom_input)
+                except Exception:  # noqa: BLE001
+                    self._schedule_focus(self._custom_input)
             return
         # Select the highlighted option
         self._selected[self._current_q] = self._highlighted
@@ -1484,7 +1537,10 @@ class StructuredAskUserWidget(Vertical):
             and self._highlighted == self._comment_option_index
             and self._comment_input is not None
         ):
-            self._schedule_focus(self._comment_input)
+            try:
+                self.app.set_focus(self._comment_input)
+            except Exception:  # noqa: BLE001
+                self._schedule_focus(self._comment_input)
             return
         # HITL: immediate submit on action selection (Approve/Reject).
         if self._is_hitl:
@@ -1600,7 +1656,12 @@ class StructuredAskUserWidget(Vertical):
         # HITL: comment input — Enter submits with the comment.
         if event.input is self._comment_input:
             event.stop()
-            self._comment_text = str(event.input.value or "").strip()
+            text = str(event.input.value or "").strip()
+            if not text:
+                return
+            self._comment_text = text
+            # Select Refine/Edit so _answers_collected appends the comment.
+            self._selected[self._current_q] = self._comment_option_index
             self._finalize()
             return
         if self._degraded:

{soothe_cli-1.0.0 → soothe_cli-1.0.3}/src/soothe_cli/tui/widgets/plan_quick_view_overlay.py

@@ -37,7 +37,7 @@ def _plan_quick_view_title(
     elapsed: str | None = None,
     tokens: str | None = None,
 ) -> str:
-    """Compose the panel title: `Orchestrating [8d26] · complex · 37s · in:1.2K out:345`."""
+    """Compose the panel title: `Orchestrating [8d26] · complex · 37s · ↑1.2K ↓345`."""
     title = "Orchestrating"
     short_id = compact_id_suffix(loop_id or "")
     if short_id: