soothe-cli 1.1.0__tar.gz → 1.2.0b1__tar.gz

{soothe_cli-1.1.0 → soothe_cli-1.2.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: soothe-cli
-Version: 1.1.0
+Version: 1.2.0-beta.1
 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.1.0 → soothe_cli-1.2.0b1}/pyproject.toml

@@ -76,7 +76,7 @@ docstring-code-format = true
 
 [tool.hatch.version]
 path = "../../VERSION"
-pattern = "^(?P<version>[0-9]+\\.[0-9]+\\.[0-9]+)$"
+pattern = "^(?P<version>[0-9]+\\.[0-9]+\\.[0-9]+.*)"
 
 [tool.mypy]
 python_version = "3.12"

{soothe_cli-1.1.0 → soothe_cli-1.2.0b1}/src/soothe_cli/commands/command_registry.py

@@ -132,12 +132,6 @@ COMMANDS: tuple[SlashCommand, ...] = (
         bypass_tier=BypassTier.QUEUED,
         enter_action=EnterAction.COMPLETE,
     ),
-    SlashCommand(
-        name="/academic_research",
-        description="Route prompt to academic_research subagent (usage: /academic_research <query>)",
-        bypass_tier=BypassTier.QUEUED,
-        enter_action=EnterAction.COMPLETE,
-    ),
     SlashCommand(
         name="/browser_use",
         description="Route prompt to browser_use subagent (usage: /browser_use <task>)",

{soothe_cli-1.1.0 → soothe_cli-1.2.0b1}/src/soothe_cli/commands/slash_commands.py

@@ -268,12 +268,6 @@ COMMANDS: dict[str, dict[str, Any]] = {
         "description": "Route query to Deep Research subagent",
         "requires_query": True,
     },
-    "/academic_research": {
-        "location": "daemon",
-        "type": "routing",
-        "description": "Route query to Academic Research subagent",
-        "requires_query": True,
-    },
     "/browser_use": {
         "location": "daemon",
         "type": "routing",

{soothe_cli-1.1.0 → soothe_cli-1.2.0b1}/src/soothe_cli/commands/subagent_routing.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 # Display names for known soothe core subagents.
 SUBAGENT_DISPLAY_NAMES: dict[str, str] = {
     "deep_research": "Deep Research",
-    "academic_research": "Academic Research",
     "browser_use": "Browser",
 }
 
@@ -14,7 +13,6 @@ SUBAGENT_DISPLAY_NAMES: dict[str, str] = {
 # Intake-only specialists (601) must stay here so slash sets preferred_subagent.
 # ``/plan`` is now handled separately by command_router (interaction_mode=plan).
 SUBAGENT_SLASH_ROUTE_IDS: tuple[str, ...] = (
-    "academic_research",
     "deep_research",
     "browser_use",
 )

{soothe_cli-1.1.0 → soothe_cli-1.2.0b1}/src/soothe_cli/runtime/presentation/subagent_task_display.py

@@ -92,7 +92,7 @@ def format_subagent_task_assistant_for_display(
     """
     agent = (subagent_type or "").strip().lower()
     text = raw
-    if agent in ("deep_research", "academic_research"):
+    if agent == "deep_research":
         stripped = text.strip()
         internal_present = any(
             _is_deep_research_internal_json_object(obj)

soothe_cli-1.2.0b1/src/soothe_cli/tui/widgets/messages/cognition_reason.py

@@ -0,0 +1,176 @@
+"""Cognition reason (plan) message widget."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+from textual.containers import Horizontal, Vertical
+from textual.content import Content
+from textual.widgets import Static
+
+from soothe_cli.display.card import _assemble_card_header, _card_dot_prefix_content
+from soothe_cli.display.markdown_theme import ThemedMarkdownRenderer, resolve_markdown_theme_parts
+
+if TYPE_CHECKING:
+    from textual.app import ComposeResult
+
+
+class _ReasonMarkdownBody(Static):
+    """Static body that renders reason text as themed Markdown."""
+
+    DEFAULT_CSS = """
+    _ReasonMarkdownBody {
+        padding: 0;
+        margin: 0;
+        width: 1fr;
+        height: auto;
+    }
+    """
+
+
+class CognitionReasonMessage(Vertical):
+    """Single card for plan assessment and plan reasoning.
+
+    Header uses the same stateful prefix glyph plus foreground body as `CognitionStepMessage`.
+
+    The body is rendered as themed Markdown (headings, lists, code spans,
+    emphasis) via the active markdown theme preset, so multi-line reasoning
+    with Markdown formatting (e.g. numbered subtask lists) renders properly
+    instead of as a single plain-text line.
+    """
+
+    ALLOW_SELECT = True
+
+    DEFAULT_CSS = """
+    CognitionReasonMessage {
+        height: auto;
+        padding: 0 1;
+        margin: 0 0 1 0;
+        background: transparent;
+    }
+
+    CognitionReasonMessage .cognition-plan-row {
+        height: auto;
+        width: 1fr;
+    }
+
+    CognitionReasonMessage .cognition-plan-dot {
+        width: auto;
+        height: auto;
+        padding: 0;
+        margin: 0;
+    }
+
+    CognitionReasonMessage .cognition-plan-header {
+        height: auto;
+        margin: 0;
+        color: $foreground;
+        padding: 0;
+        width: 1fr;
+    }
+    """
+
+    def __init__(
+        self,
+        *,
+        status: str,
+        iteration: int,
+        plan_action: str = "new",
+        assessment_reasoning: str = "",
+        plan_reasoning: str = "",
+        **kwargs: Any,
+    ) -> None:
+        """Initialize a plan-reason card.
+
+        Args:
+        status: Plan status (continue, replan, done).
+        iteration: Agent-loop iteration index.
+        plan_action: `keep` or `new` (internal execution strategy, not displayed).
+        assessment_reasoning: Phase-1 status justification from plan-assess.
+        plan_reasoning: Optional strategy/summary line (e.g. step completion).
+        **kwargs: Passed to `Vertical`.
+        """
+        super().__init__(**kwargs)
+        self._status = status
+        self._iteration = iteration
+        self._plan_action = plan_action if plan_action in ("keep", "new") else ""
+        self._assessment_reasoning = assessment_reasoning.strip()
+        self._plan_reasoning = plan_reasoning.strip()
+        # Cached markdown theme parts (entry, colors, code_theme) — resolved
+        # once on first markdown render and reused for the widget's lifetime.
+        self._cached_theme_parts: tuple[Any, Any, str] | None = None
+        self._dot_widget: Static | None = None
+        self._body_widget: _ReasonMarkdownBody | None = None
+
+    def _plan_body_text(self) -> str:
+        """Assemble the plan body text from assessment and plan reasoning."""
+        parts: list[str] = []
+        if self._assessment_reasoning:
+            parts.append(self._assessment_reasoning)
+        if self._plan_reasoning:
+            parts.append(self._plan_reasoning)
+        if len(parts) == 2:
+            first = parts[0]
+            if not first.endswith((".", "!", "?")):
+                first = f"{first}."
+            return f"{first} {parts[1]}"
+        if parts:
+            return parts[0]
+        return ""
+
+    def _plan_header_content(self) -> Content:
+        """Build the header Content (prefix glyph + plain body).
+
+        Kept for backward compatibility with tests that inspect the header
+        content directly. The live widget renders the body as Markdown in
+        :meth:`_render_body`; this method returns the plain-text equivalent.
+        """
+        body = self._plan_body_text()
+        return _assemble_card_header(self, body, status=self._status)
+
+    def _get_theme_parts(self) -> tuple[Any, Any, str]:
+        """Resolve and cache markdown theme parts for repeated renders."""
+        if self._cached_theme_parts is None:
+            self._cached_theme_parts = resolve_markdown_theme_parts(self)
+        return self._cached_theme_parts
+
+    def _render_body(self) -> Any:
+        """Render the plan body as themed Markdown.
+
+        Falls back to plain styled Content when Markdown construction fails,
+        so a parse error never blanks out the card.
+        """
+        text = self._plan_body_text()
+        if not text:
+            return Content("")
+        try:
+            entry, colors, code_theme = self._get_theme_parts()
+            return ThemedMarkdownRenderer(
+                text,
+                entry=entry,
+                colors=colors,
+                code_theme=code_theme,
+            )
+        except Exception:  # noqa: BLE001  # Degrade gracefully on parse errors.
+            return _assemble_card_header(self, text, status=self._status)
+
+    def _refresh_dot(self) -> None:
+        if self._dot_widget is None:
+            return
+        self._dot_widget.update(_card_dot_prefix_content(self, self._status))
+
+    def on_mount(self) -> None:
+        """Wire child widget references and render initial content."""
+        self._dot_widget = self.query_one("#cognition-plan-dot", Static)
+        self._body_widget = self.query_one("#cognition-plan-header", _ReasonMarkdownBody)
+        self._refresh_dot()
+        if self._body_widget is not None:
+            self._body_widget.update(self._render_body())
+
+    def compose(self) -> ComposeResult:
+        """Compose inline prefix glyph and markdown body on one row."""
+        with Horizontal(classes="cognition-plan-row"):
+            yield Static("", classes="cognition-plan-dot", id="cognition-plan-dot")
+            yield _ReasonMarkdownBody(
+                "", markup=False, classes="cognition-plan-header", id="cognition-plan-header"
+            )

{soothe_cli-1.1.0 → soothe_cli-1.2.0b1}/src/soothe_cli/ux/subagent_wire_display.py

@@ -76,8 +76,7 @@ def subagent_wire_row_params(
         if rc or st:
             tail = f"{rc} hits, {st} sources"
             preview = f"{query} → {tail}" if query else tail
-        tool_name = "AcademicSearch" if ".academic_research." in et else "WebSearch"
-        return tool_name, {"query": preview or query}, "success", 0
+        return "WebSearch", {"query": preview or query}, "success", 0
     if et.endswith(".crawl.summary"):
         urls = int(data.get("urls_crawled", 0) or 0)
         success = int(data.get("success_count", 0) or 0)

soothe_cli-1.1.0/src/soothe_cli/tui/widgets/messages/cognition_reason.py

@@ -1,85 +0,0 @@
-"""Cognition reason (plan) message widget."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any
-
-from textual.containers import Vertical
-from textual.content import Content
-from textual.widgets import Static
-
-from soothe_cli.display.card import _assemble_card_header
-
-if TYPE_CHECKING:
-    from textual.app import ComposeResult
-
-
-class CognitionReasonMessage(Vertical):
-    """Single card for plan assessment and plan reasoning.
-
-    Header uses the same stateful prefix glyph plus foreground body as `CognitionStepMessage`.
-    """
-
-    ALLOW_SELECT = True
-
-    DEFAULT_CSS = """
-    CognitionReasonMessage {
-        height: auto;
-        padding: 0 1;
-        margin: 0 0 1 0;
-        background: transparent;
-    }
-
-    CognitionReasonMessage .cognition-plan-header {
-        height: auto;
-        margin: 0;
-        color: $foreground;
-    }
-    """
-
-    def __init__(
-        self,
-        *,
-        status: str,
-        iteration: int,
-        plan_action: str = "new",
-        assessment_reasoning: str = "",
-        plan_reasoning: str = "",
-        **kwargs: Any,
-    ) -> None:
-        """Initialize a plan-reason card.
-
-        Args:
-        status: Plan status (continue, replan, done).
-        iteration: Agent-loop iteration index.
-        plan_action: `keep` or `new` (internal execution strategy, not displayed).
-        assessment_reasoning: Phase-1 status justification from plan-assess.
-        plan_reasoning: Optional strategy/summary line (e.g. step completion).
-        **kwargs: Passed to `Vertical`.
-        """
-        super().__init__(**kwargs)
-        self._status = status
-        self._iteration = iteration
-        self._plan_action = plan_action if plan_action in ("keep", "new") else ""
-        self._assessment_reasoning = assessment_reasoning.strip()
-        self._plan_reasoning = plan_reasoning.strip()
-
-    def _plan_header_content(self) -> Content:
-        parts: list[str] = []
-        if self._assessment_reasoning:
-            parts.append(self._assessment_reasoning)
-        if self._plan_reasoning:
-            parts.append(self._plan_reasoning)
-        if len(parts) == 2:
-            first = parts[0]
-            if not first.endswith((".", "!", "?")):
-                first = f"{first}."
-            body = f"{first} {parts[1]}"
-        elif parts:
-            body = parts[0]
-        else:
-            body = ""
-        return _assemble_card_header(self, body, status=self._status)
-
-    def compose(self) -> ComposeResult:
-        yield Static(self._plan_header_content(), classes="cognition-plan-header")