soothe-cli 0.5.0__tar.gz → 0.5.2__tar.gz

{soothe_cli-0.5.0 → soothe_cli-0.5.2}/PKG-INFO

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

{soothe_cli-0.5.0 → soothe_cli-0.5.2}/src/soothe_cli/cli/execution/daemon.py

@@ -26,7 +26,7 @@ from soothe_cli.shared.core.presentation_engine import PresentationEngine
 logger = logging.getLogger(__name__)
 
 _DAEMON_FALLBACK_EXIT_CODE = 42
-_SESSION_BOOTSTRAP_TIMEOUT_S = 5.0
+_SESSION_BOOTSTRAP_TIMEOUT_S = 30.0
 _QUERY_START_TIMEOUT_S = 20.0
 
 

{soothe_cli-0.5.0 → soothe_cli-0.5.2}/src/soothe_cli/cli/stream/display_line.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
-_MS_PER_SECOND = 1000
+from soothe_cli.shared.duration_format import format_duration_ms
 
 
 @dataclass
@@ -44,10 +44,7 @@ class DisplayLine:
             parts.append(f" [{self.status}]")
 
         if self.duration_ms is not None:
-            if self.duration_ms >= _MS_PER_SECOND:
-                parts.append(f" ({self.duration_ms / _MS_PER_SECOND:.1f}s)")
-            else:
-                parts.append(f" ({self.duration_ms}ms)")
+            parts.append(f" ({format_duration_ms(self.duration_ms)})")
 
         return "".join(parts)
 

{soothe_cli-0.5.0 → soothe_cli-0.5.2}/src/soothe_cli/cli/stream/formatter.py

@@ -7,6 +7,7 @@ from soothe_cli.cli.stream.task_scope import (
     format_task_scope_prefix,
     format_task_subagent_line,
 )
+from soothe_cli.shared.duration_format import format_duration_ms
 
 # Emoji presentation for step-done success (U+2705 + VS16); distinct from ✓ tool rows.
 _STEP_DONE_OK_MARK = "\u2705\ufe0f"
@@ -101,7 +102,7 @@ def format_subagent_done(
 ) -> DisplayLine:
     """Format a subagent completion line with metrics.
 
-    With Task scope: ``⚙ Task(type, \"…\") -> ✓ Completed (Nms)`` using wire task description
+    With Task scope: ``⚙ Task(type, \"…\") -> ✓ Completed (human duration)`` using wire task description
     when provided; falls back to summary text inside quotes.
     Without scope: legacy ``✓ …`` row with triple markers.
 
@@ -123,7 +124,7 @@ def format_subagent_done(
         ms = max(0, int(duration_s * 1000))
         outcome = "✓ Completed" if task_done_success else "✗ Failed"
         tail = (answer_summary or "").strip()
-        base = f"{quoted} -> {outcome} ({ms}ms)"
+        base = f"{quoted} -> {outcome} ({format_duration_ms(ms)})"
         content = f"{base}: {tail}" if tail else base
         return DisplayLine(
             level=2,

{soothe_cli-0.5.0 → soothe_cli-0.5.2}/src/soothe_cli/cli/stream/pipeline.py

@@ -159,7 +159,7 @@ class StreamDisplayPipeline:
     def _task_scope_from_event(self, event: dict[str, Any]) -> tuple[str, str] | None:
         """Extract IG-334 ``(task_tool_call_id, subagent_type)`` when attached by the renderer."""
         ts = event.get("task_scope")
-        if isinstance(ts, tuple) and len(ts) == 2:
+        if isinstance(ts, (list, tuple)) and len(ts) == 2:
             a, b = ts
             if isinstance(a, str) and isinstance(b, str):
                 return (a, b)

{soothe_cli-0.5.0 → soothe_cli-0.5.2}/src/soothe_cli/shared/core/presentation_engine.py

@@ -13,6 +13,8 @@ from dataclasses import dataclass
 from soothe_sdk.core.verbosity import VerbosityTier, should_show
 from soothe_sdk.utils import log_preview
 
+from soothe_cli.shared.duration_format import format_duration_ms
+
 
 @dataclass
 class PresentationState:
@@ -152,7 +154,7 @@ class PresentationEngine:
             icon = "✗" if is_error else "✓"
             result_line = f"{icon} {summarized}"
         if duration_ms > 0:
-            result_line += f" ({duration_ms}ms)"
+            result_line += f" ({format_duration_ms(duration_ms)})"
         return result_line
 
     @staticmethod

soothe_cli-0.5.2/src/soothe_cli/shared/duration_format.py

@@ -0,0 +1,42 @@
+"""Human-readable duration strings for CLI and TUI (no Textual imports)."""
+
+from __future__ import annotations
+
+
+def format_duration(seconds: float) -> str:
+    """Format a duration in seconds into a human-readable string.
+
+    Args:
+        seconds: Duration in seconds.
+
+    Returns:
+        Formatted string like `"5s"`, `"2.3s"`, `"5m 12s"`, or `"1h 23m 4s"`.
+    """
+    rounded = round(seconds, 1)
+    if rounded < 60:  # noqa: PLR2004
+        if rounded % 1 == 0:
+            return f"{int(rounded)}s"
+        return f"{rounded:.1f}s"
+    minutes, secs = divmod(int(rounded), 60)
+    if minutes < 60:  # noqa: PLR2004
+        return f"{minutes}m {secs}s"
+    hours, minutes = divmod(minutes, 60)
+    return f"{hours}h {minutes}m {secs}s"
+
+
+def format_duration_ms(milliseconds: int) -> str:
+    """Format a wall-clock duration in milliseconds for status lines and cards.
+
+    Values under one second stay in milliseconds for precision; longer durations
+    reuse :func:`format_duration` (seconds, minutes, hours).
+
+    Args:
+        milliseconds: Elapsed time in milliseconds (negative values are treated as 0).
+
+    Returns:
+        Strings such as ``\"0ms\"``, ``\"240ms\"``, ``\"1.5s\"``, or ``\"2m 15s\"``.
+    """
+    ms = max(0, int(milliseconds))
+    if ms < 1000:  # noqa: PLR2004
+        return f"{ms}ms"
+    return format_duration(ms / 1000.0)

{soothe_cli-0.5.0 → soothe_cli-0.5.2}/src/soothe_cli/shared/tools/tool_formatters/web.py

@@ -42,9 +42,13 @@ class WebFormatter(BaseFormatter):
         # Route to specific formatter (handle both legacy and wizsearch naming)
         if normalized in ("search_web", "wizsearch_search"):
             return self._format_search_web(result)
-        if normalized in ("crawl_web", "wizsearch_crawl"):
+        if normalized in ("crawl_web", "wizsearch_crawl", "fetch_url"):
             return self._format_crawl_web(result)
 
+        # Handle HTTP request tools (IG-339)
+        if normalized.startswith("requests_"):
+            return self._format_http_request(normalized, result)
+
         msg = f"Unknown web tool: {tool_name}"
         raise ValueError(msg)
 
@@ -142,3 +146,48 @@ class WebFormatter(BaseFormatter):
             detail=detail,
             metrics={"size_bytes": size_bytes, "words": words, "lines": lines},
         )
+
+    def _format_http_request(self, tool_name: str, result: Any) -> ToolBrief:  # noqa: ANN401
+        r"""Format HTTP request tool result (requests_get, requests_post, etc.).
+
+        Shows HTTP method and response status/size.
+
+        Args:
+            tool_name: Name of the HTTP tool (requests_get, requests_post, etc.).
+            result: Tool result (string with response content or error).
+
+        Returns:
+            ToolBrief with HTTP request summary.
+
+        Example:
+            >>> brief = formatter._format_http_request("requests_get", '{"data": 123}')
+            >>> brief.summary
+            'GET 12 B'
+        """
+        # Extract method from tool name
+        method = tool_name.replace("requests_", "").upper()
+
+        # Check for error
+        if text_looks_like_error(result):
+            return ToolBrief(
+                icon="✗",
+                summary=f"{method} failed",
+                detail=self._truncate_text(result, 80),
+                metrics={"error": True},
+            )
+
+        # Calculate size
+        if isinstance(result, str):
+            size_bytes = len(result.encode("utf-8"))
+        else:
+            size_bytes = len(str(result).encode("utf-8"))
+
+        size_str = self._format_size(size_bytes)
+        summary = f"{method} {size_str}"
+
+        return ToolBrief(
+            icon="✓",
+            summary=summary,
+            detail=None,
+            metrics={"method": method, "size_bytes": size_bytes},
+        )

{soothe_cli-0.5.0 → soothe_cli-0.5.2}/src/soothe_cli/tui/app/_app.py

@@ -10,7 +10,6 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any, ClassVar
 
 if TYPE_CHECKING:
-    from langgraph.pregel import Pregel
     from textual.app import ComposeResult
     from textual.worker import Worker
 
@@ -133,22 +132,8 @@ class SootheApp(
     """App-level keybindings for interrupt, quit, toggles, and approval menu
     navigation."""
 
-    class ServerReady(Message):
-        """Posted by the background server-startup worker on success."""
-
-        def __init__(  # noqa: D107
-            self,
-            agent: Any,  # noqa: ANN401
-            server_proc: Any,  # noqa: ANN401
-            mcp_server_info: list[Any] | None,
-        ) -> None:
-            super().__init__()
-            self.agent = agent
-            self.server_proc = server_proc
-            self.mcp_server_info = mcp_server_info
-
     class ServerStartFailed(Message):
-        """Posted by the background server-startup worker on failure."""
+        """Posted when daemon bootstrap or background connection fails."""
 
         def __init__(self, error: Exception) -> None:  # noqa: D107
             super().__init__()
@@ -165,63 +150,30 @@ class SootheApp(
     def __init__(
         self,
         *,
-        agent: Pregel | None = None,
+        daemon_config: Any,
         assistant_id: str | None = None,
         auto_approve: bool = False,
         cwd: str | Path | None = None,
         resume_loop_id: str | None = None,
-        resume_loop_intent: str | None = None,
         initial_prompt: str | None = None,
         initial_skill: str | None = None,
         mcp_server_info: list[dict[str, Any]] | None = None,
         profile_override: dict[str, Any] | None = None,
-        server_proc: Any | None = None,
-        server_kwargs: dict[str, Any] | None = None,
-        mcp_preload_kwargs: dict[str, Any] | None = None,
-        model_kwargs: dict[str, Any] | None = None,
-        daemon_config: Any | None = None,
         **kwargs: Any,
     ) -> None:
-        """Initialize the Deep Agents application.
+        """Initialize the Textual application (daemon-backed execution only).
 
         Args:
-            agent: Pre-configured LangGraph agent, or `None` when server
-                startup is deferred via `server_kwargs`.
-            assistant_id: Agent identifier for memory storage
-            auto_approve: Whether to start with auto-approve enabled
-            cwd: Current working directory to display
-            resume_loop_id: Initial AgentLoop id (daemon-backed).
-
-                `None` when `resume_loop_intent` is provided (resolved asynchronously).
-            resume_loop_intent: Raw resume intent from `-r` flag.
-
-                `'__MOST_RECENT__'` for bare `-r`, a loop id for
-                `-r <id>`, or `None` for new sessions.
-
-                Resolved via `_resolve_resume_loop_intent`
-                during `_start_server_background`.
-
-                Requires `server_kwargs` to be set; ignored otherwise.
-            initial_prompt: Optional prompt to auto-submit when session starts
+            daemon_config: Loaded Soothe configuration (WebSocket URL, etc.).
+            assistant_id: Agent identifier for memory storage.
+            auto_approve: Whether to start with auto-approve enabled.
+            cwd: Current working directory to display.
+            resume_loop_id: Initial AgentLoop id when attaching to an existing loop.
+            initial_prompt: Optional prompt to auto-submit when session starts.
             initial_skill: Optional skill name to invoke when session starts.
             mcp_server_info: MCP server metadata for the `/mcp` viewer.
-            profile_override: Extra profile fields from `--profile-override`,
-                retained so later profile-aware behavior stays consistent with
-                the CLI override, including model selection details and
-                on-demand `create_model()` calls.
-            server_proc: LangGraph server process for the interactive session.
-            server_kwargs: When provided, server startup is deferred.
-
-                The app shows a "Connecting..." state and starts the server in
-                the background using these kwargs
-                for `start_server_and_get_agent`.
-            mcp_preload_kwargs: Kwargs for `_preload_session_mcp_server_info`,
-                run concurrently with server startup when `server_kwargs` is set.
-            model_kwargs: Kwargs for deferred `create_model()`.
-
-                When provided, model creation runs in a background worker after
-                first paint instead of blocking startup.
-            **kwargs: Additional arguments passed to parent
+            profile_override: Extra profile fields from ``--profile-override``.
+            **kwargs: Additional arguments passed to the Textual ``App``.
         """
         super().__init__(**kwargs)
 
@@ -230,8 +182,6 @@ class SootheApp(
         # Apply saved theme preference (or default)
         self.theme = _load_theme_preference()
 
-        self._agent = agent
-
         self._assistant_id = assistant_id
 
         self._auto_approve = auto_approve
@@ -242,8 +192,6 @@ class SootheApp(
         # Named `_lc_loop_id` to avoid colliding with Textual's App._thread_id.
         self._lc_loop_id = resume_loop_id
 
-        self._resume_loop_intent = resume_loop_intent
-
         self._initial_prompt = initial_prompt
 
         self._initial_skill = (
@@ -254,14 +202,6 @@ class SootheApp(
 
         self._profile_override = profile_override
 
-        self._server_proc = server_proc
-
-        self._server_kwargs = server_kwargs
-
-        self._mcp_preload_kwargs = mcp_preload_kwargs
-
-        self._model_kwargs = model_kwargs
-
         self._daemon_config = daemon_config
 
         self._daemon_session: Any | None = None
@@ -269,14 +209,9 @@ class SootheApp(
         self._daemon_skills_wire: list[dict[str, Any]] = []
         """Cached ``skills_list_response`` rows when the TUI uses ``TuiDaemonSession``."""
 
-        self._connecting = server_kwargs is not None or daemon_config is not None
-        # Extract sandbox type from server kwargs for trace metadata.
-        # ServerConfig.__post_init__ normalizes "none" → None, but server_kwargs carries
-        # the raw argparse value, so guard against both.
+        self._connecting = True
 
-        raw = (server_kwargs or {}).get("sandbox_type")
-
-        self._sandbox_type: str | None = raw if raw and raw != "none" else None
+        self._sandbox_type: str | None = None
 
         self._model_override: str | None = None
 
@@ -304,11 +239,7 @@ class SootheApp(
         self._agent_running = False
 
         self._server_startup_error: str | None = None
-        """Set when the background server fails to start; persists for the
-        session lifetime (server failure is terminal).
-
-        Shown in place of the generic 'Agent not configured' message.
-        """
+        """Set when daemon bootstrap fails; persists for the session lifetime."""
 
         self._shell_process: asyncio.subprocess.Process | None = None
         """Shell command process tracking for interruption (! commands)."""
@@ -391,18 +322,9 @@ class SootheApp(
 
         self._image_tracker = MediaTracker()
 
-    def _remote_agent(self) -> Any:  # noqa: ANN401
-        """Return the agent if it appears to be a remote agent, or `None`.
-
-        Returns `None` when no agent is configured or the agent is a local graph.
-        """
-        # RemoteAgent module doesn't exist in this package; always return None.
-        # When the SDK provides a RemoteAgent class, this can be re-implemented.
-        return None
-
     def _runtime_backend_ready(self) -> bool:
-        """Return whether the app has a usable execution backend."""
-        return self._daemon_session is not None or self._agent is not None
+        """Return whether the app has a connected daemon session."""
+        return self._daemon_session is not None
 
     def get_theme_variable_defaults(self) -> dict[str, str]:
         """Return custom CSS variable defaults for the current theme.
@@ -434,8 +356,6 @@ class SootheApp(
                     mcp_tool_count=self._mcp_tool_count,
                     workspace_path=self._cwd,
                     connecting=self._connecting,
-                    resuming=self._resume_loop_intent is not None,
-                    local_server=self._server_kwargs is not None,
                     id="welcome-banner",
                 )
                 yield Container(id="messages")

{soothe_cli-0.5.0 → soothe_cli-0.5.2}/src/soothe_cli/tui/app/_commands.py

@@ -9,7 +9,6 @@ from contextlib import suppress
 from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
-    from langchain_core.runnables import RunnableConfig
     from textual.content import Content
 
 from textual.app import ScreenStackError
@@ -191,24 +190,25 @@ class _CommandsMixin:
             self._update_tokens(0)
             # Clear status message (e.g., "Interrupted" from previous session)
             self._update_status("")
-            # New AgentLoop (daemon) or new local loop id
             if self._session_state:
-                if self._daemon_session is not None:
+                if self._daemon_session is None:
+                    await self._mount_message(
+                        AppMessage("Not connected to the daemon; cannot start a new loop.")
+                    )
+                else:
                     status_event = await self._daemon_session.new_loop()
                     new_loop_id = (
                         str(status_event.get("loop_id", "")) or self._session_state.reset_loop()
                     )
                     self._session_state.loop_id = new_loop_id
                     self._lc_loop_id = new_loop_id
-                else:
-                    new_loop_id = self._session_state.reset_loop()
-                try:
-                    banner = self.query_one("#welcome-banner", WelcomeBanner)
-                    banner.update_loop_id(new_loop_id)
-                except NoMatches:
-                    pass
-                self._clear_loop_model_override()
-                await self._mount_message(AppMessage(f"Started new loop: {new_loop_id}"))
+                    try:
+                        banner = self.query_one("#welcome-banner", WelcomeBanner)
+                        banner.update_loop_id(new_loop_id)
+                    except NoMatches:
+                        pass
+                    self._clear_loop_model_override()
+                    await self._mount_message(AppMessage(f"Started new loop: {new_loop_id}"))
         elif cmd == "/editor":
             await self.action_open_editor()
         elif cmd == "/loops":
@@ -367,13 +367,6 @@ class _CommandsMixin:
                 report += "\nTheme registry reload failed. Check config.yml for errors."
             await self._mount_message(AppMessage(report))
 
-            # Re-discover skills so autocomplete reflects any new/removed skills
-            if self._daemon_config is None:
-                self.run_worker(
-                    self._discover_skills(),
-                    exclusive=True,
-                    group="startup-skill-discovery",
-                )
             if self._daemon_session is not None:
                 self.run_worker(
                     self._refresh_daemon_skills_catalog(),
@@ -424,22 +417,26 @@ class _CommandsMixin:
         Returns:
             Token count as an integer, or `None` if state is unavailable.
         """
-        if not self._agent:
+        if not self._lc_loop_id:
             return None
         try:
-            from langchain_core.messages.utils import (
-                count_tokens_approximately,
-            )
+            from langchain_core.messages import messages_from_dict
+            from langchain_core.messages.utils import count_tokens_approximately
 
-            config: RunnableConfig = {
-                "configurable": {"thread_id": self._lc_loop_id},
-            }
-            state = await self._agent.aget_state(config)
-            if not state or not state.values:
+            if self._daemon_session is None:
                 return None
-            messages = state.values.get("messages", [])
-            if not messages:
+            snap = await self._daemon_session.aget_loop_state(self._lc_loop_id)
+            vals = getattr(snap, "values", None)
+            if not isinstance(vals, dict):
                 return None
+            raw = vals.get("messages")
+            if not isinstance(raw, list) or not raw:
+                return None
+            if isinstance(raw[0], dict):
+                messages = messages_from_dict(raw)
+            else:
+                messages = raw
+
             return count_tokens_approximately(messages)
         except Exception:  # best-effort for /tokens display
             logger.debug("Failed to retrieve conversation token count", exc_info=True)

{soothe_cli-0.5.0 → soothe_cli-0.5.2}/src/soothe_cli/tui/app/_execution.py

@@ -10,10 +10,7 @@ import sys
 import time
 import webbrowser
 from contextlib import suppress
-from typing import TYPE_CHECKING, Any, Literal
-
-if TYPE_CHECKING:
-    from langchain_core.runnables import RunnableConfig
+from typing import Any, Literal
 
 from textual.app import ScreenStackError
 from textual.containers import VerticalScroll
@@ -532,24 +529,25 @@ class _ExecutionMixin:
             self._update_tokens(0)
             # Clear status message (e.g., "Interrupted" from previous session)
             self._update_status("")
-            # New AgentLoop (daemon) or new local loop id
             if self._session_state:
-                if self._daemon_session is not None:
+                if self._daemon_session is None:
+                    await self._mount_message(
+                        AppMessage("Not connected to the daemon; cannot start a new loop.")
+                    )
+                else:
                     status_event = await self._daemon_session.new_loop()
                     new_loop_id = (
                         str(status_event.get("loop_id", "")) or self._session_state.reset_loop()
                     )
                     self._session_state.loop_id = new_loop_id
                     self._lc_loop_id = new_loop_id
-                else:
-                    new_loop_id = self._session_state.reset_loop()
-                try:
-                    banner = self.query_one("#welcome-banner", WelcomeBanner)
-                    banner.update_loop_id(new_loop_id)
-                except NoMatches:
-                    pass
-                self._clear_loop_model_override()
-                await self._mount_message(AppMessage(f"Started new loop: {new_loop_id}"))
+                    try:
+                        banner = self.query_one("#welcome-banner", WelcomeBanner)
+                        banner.update_loop_id(new_loop_id)
+                    except NoMatches:
+                        pass
+                    self._clear_loop_model_override()
+                    await self._mount_message(AppMessage(f"Started new loop: {new_loop_id}"))
         elif cmd == "/editor":
             await self.action_open_editor()
         elif cmd == "/loops":
@@ -708,13 +706,6 @@ class _ExecutionMixin:
                 report += "\nTheme registry reload failed. Check config.yml for errors."
             await self._mount_message(AppMessage(report))
 
-            # Re-discover skills so autocomplete reflects any new/removed skills
-            if self._daemon_config is None:
-                self.run_worker(
-                    self._discover_skills(),
-                    exclusive=True,
-                    group="startup-skill-discovery",
-                )
             if self._daemon_session is not None:
                 self.run_worker(
                     self._refresh_daemon_skills_catalog(),
@@ -759,33 +750,6 @@ class _ExecutionMixin:
             AppMessage("Skills require a daemon connection. Connect to a daemon first.")
         )
 
-    async def _get_conversation_token_count(self) -> int | None:
-        """Return the approximate conversation-only token count.
-
-        Returns:
-            Token count as an integer, or `None` if state is unavailable.
-        """
-        if not self._agent:
-            return None
-        try:
-            from langchain_core.messages.utils import (
-                count_tokens_approximately,
-            )
-
-            config: RunnableConfig = {
-                "configurable": {"thread_id": self._lc_loop_id},
-            }
-            state = await self._agent.aget_state(config)
-            if not state or not state.values:
-                return None
-            messages = state.values.get("messages", [])
-            if not messages:
-                return None
-            return count_tokens_approximately(messages)
-        except Exception:  # best-effort for /tokens display
-            logger.debug("Failed to retrieve conversation token count", exc_info=True)
-            return None
-
     async def _handle_user_message(self, message: str) -> None:
         """Handle a user message to send to the agent.
 
@@ -878,7 +842,6 @@ class _ExecutionMixin:
         try:
             await execute_task_textual(
                 user_input=message,
-                agent=self._agent,
                 daemon_session=self._daemon_session,
                 assistant_id=self._assistant_id,
                 session_state=self._session_state,