soothe-cli 0.3.4__tar.gz → 0.3.5__tar.gz

{soothe_cli-0.3.4 → soothe_cli-0.3.5}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: soothe-cli
-Version: 0.3.4
+Version: 0.3.5
 Summary: Soothe CLI client - communicates with daemon via WebSocket
-Project-URL: Homepage, https://github.com/caesar0301/soothe
+Project-URL: Homepage, https://github.com/OpenSoothe/soothe
 Project-URL: Documentation, https://soothe.readthedocs.io
-Project-URL: Repository, https://github.com/caesar0301/soothe
+Project-URL: Repository, https://github.com/OpenSoothe/soothe
 License: MIT
 Keywords: cli,client,soothe,tui,websocket
 Classifier: Development Status :: 3 - Alpha

{soothe_cli-0.3.4 → soothe_cli-0.3.5}/pyproject.toml

@@ -45,9 +45,9 @@ dev = [
 soothe = "soothe_cli.cli.main:app"
 
 [project.urls]
-Homepage = "https://github.com/caesar0301/soothe"
+Homepage = "https://github.com/OpenSoothe/soothe"
 Documentation = "https://soothe.readthedocs.io"
-Repository = "https://github.com/caesar0301/soothe"
+Repository = "https://github.com/OpenSoothe/soothe"
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/soothe_cli"]

{soothe_cli-0.3.4 → soothe_cli-0.3.5}/src/soothe_cli/cli/commands/config_cmd.py

@@ -189,9 +189,14 @@ def config_init(
         target.write_text("# Soothe configuration\n# See docs/user_guide.md for options\n")
         typer.echo(f"Created minimal {target}")
 
-    for subdir in ("runs", "generated_agents", "logs"):
+    for subdir in ("runs", "generated_agents", "logs", "data"):
         (home / subdir).mkdir(parents=True, exist_ok=True)
 
+    # Migrate runtime data files from root to data/ subdirectory
+    from soothe_sdk.client.config import migrate_data_to_subdir
+
+    migrate_data_to_subdir()
+
     typer.echo(f"Soothe home initialized at {home}")
 
 

{soothe_cli-0.3.4 → soothe_cli-0.3.5}/src/soothe_cli/cli/stream/display_line.py

@@ -19,7 +19,6 @@ class DisplayLine:
         status: Optional status suffix ("running" for parallel tools).
         duration_ms: Optional duration in milliseconds.
         source_prefix: Optional source identifier for debug mode (e.g., "[main]", "[subagent:research]").
-        newline_before: Add newline separator before this line for improved readability.
     """
 
     level: int
@@ -29,7 +28,6 @@ class DisplayLine:
     status: str | None = None
     duration_ms: int | None = None
     source_prefix: str | None = None
-    newline_before: bool = False
 
     def format(self) -> str:
         """Format the display line as a string.
@@ -39,10 +37,6 @@ class DisplayLine:
         """
         parts = []
 
-        # Add newline separator before if requested (for improved readability)
-        if self.newline_before:
-            parts.append("\n")
-
         # Add source prefix first if present (debug mode)
         if self.source_prefix:
             parts.append(self.source_prefix)

{soothe_cli-0.3.4 → soothe_cli-0.3.5}/src/soothe_cli/cli/stream/formatter.py

@@ -102,7 +102,6 @@ def format_goal_header(
         icon="●",
         indent=indent_for_level(1),
         source_prefix=_derive_source_prefix(namespace, verbosity_tier),
-        newline_before=True,  # Add separator for goal start
     )
 
 
@@ -133,7 +132,6 @@ def format_step_header(
         icon="○",  # Hollow circle for in-progress step
         indent=indent_for_level(2),
         source_prefix=_derive_source_prefix(namespace, verbosity_tier),
-        newline_before=True,  # Add separator for step start
     )
 
 
@@ -226,7 +224,6 @@ def format_subagent_milestone(
         icon="✓",
         indent=indent_for_level(3),
         source_prefix=_derive_source_prefix(namespace, verbosity_tier),
-        newline_before=True,  # Add separator before subagent milestone
     )
 
 
@@ -276,7 +273,6 @@ def format_plan_phase_reasoning(
         icon="•",
         indent=indent_for_level(3),
         source_prefix=_derive_source_prefix(namespace, verbosity_tier),
-        newline_before=True,
     )
 
 
@@ -307,7 +303,6 @@ def format_reasoning(
         icon="•",
         indent=indent_for_level(3),
         source_prefix=_derive_source_prefix(namespace, verbosity_tier),
-        newline_before=True,  # Add separator for reasoning display
     )
 
 
@@ -349,7 +344,6 @@ def format_judgement(
         icon=action_icon,
         indent=indent_for_level(2),
         source_prefix=_derive_source_prefix(namespace, verbosity_tier),
-        newline_before=True,  # Add separator before judgement indicator
     )
 
 
@@ -452,7 +446,6 @@ def format_goal_done(
         indent=indent_for_level(1),
         duration_ms=duration_ms,
         source_prefix=_derive_source_prefix(namespace, verbosity_tier),
-        newline_before=True,  # Add separator before final report
     )
 
 

{soothe_cli-0.3.4 → soothe_cli-0.3.5}/src/soothe_cli/shared/message_processing.py

@@ -49,22 +49,33 @@ def accumulate_tool_call_chunks(
         if tc_name and tc_id and tc_id not in pending_tool_calls:
             if isinstance(tc_args, str):
                 args_str = tc_args
+                is_complete = False  # String may be partial JSON
             elif isinstance(tc_args, dict) and tc_args:
                 args_str = json.dumps(tc_args)
+                is_complete = True  # Dict yields complete JSON
             else:
                 args_str = ""
+                is_complete = False  # Empty or missing args
             pending_tool_calls[tc_id] = {
                 "name": tc_name,
                 "args_str": args_str,
+                "is_complete_json": is_complete,
                 "emitted": False,
                 "is_main": is_main,
             }
-        # Some providers send final args as a dict on a later chunk
+        # Some providers send final args as a dict on a later chunk (replace previous)
         elif tc_id and tc_id in pending_tool_calls and isinstance(tc_args, dict) and tc_args:
             pending_tool_calls[tc_id]["args_str"] = json.dumps(tc_args)
+            pending_tool_calls[tc_id]["is_complete_json"] = True
         # Subsequent chunks: accumulate partial JSON strings for this tool call id
         elif tc_id and tc_id in pending_tool_calls and isinstance(tc_args, str) and tc_args:
-            pending_tool_calls[tc_id]["args_str"] += tc_args
+            # If args_str already contains complete JSON, provider refined args → restart
+            if pending_tool_calls[tc_id].get("is_complete_json"):
+                pending_tool_calls[tc_id]["args_str"] = tc_args
+                pending_tool_calls[tc_id]["is_complete_json"] = False
+            else:
+                # Normal partial accumulation
+                pending_tool_calls[tc_id]["args_str"] += tc_args
         elif tc_args and isinstance(tc_args, str) and tc_args:
             # Legacy: chunks missing ``id`` — attach to the first non-emitted pending call
             for pending in pending_tool_calls.values():
@@ -279,7 +290,7 @@ def tool_calls_have_any_arg_dict(tc_list: list[Any]) -> bool:
 # Maps tool name to list of argument keys to display (supports multiple args)
 _ARG_DISPLAY_MAP: dict[str, list[str]] = {
     # File operations — deepagents uses ``file_path`` for read/write/edit (see IG-053)
-    "read_file": ["file_path", "path", "path_name"],
+    "read_file": ["file_path", "path", "path_name", "target_file", "filename", "relative_path"],
     "write_file": ["file_path", "path"],
     "delete_file": ["file_path", "path"],
     "file_info": ["path", "file_path"],
@@ -312,6 +323,8 @@ _ARG_DISPLAY_MAP: dict[str, list[str]] = {
     "create_goal": ["description"],
     "complete_goal": ["goal_id"],
     "fail_goal": ["goal_id"],
+    # Subagent delegation (deepagents ``task`` tool)
+    "task": ["subagent_type", "description", "prompt"],
 }
 
 
@@ -323,6 +336,43 @@ def _normalize_tool_name_for_arg_map(tool_name: str) -> str:
     return re.sub(r"(?<!^)(?=[A-Z])", "_", tool_name).lower()
 
 
+_ARG_SUMMARY_SKIP_KEYS: frozenset[str] = frozenset({"_raw", "_internal", "raw_args_str"})
+
+
+def _compact_tool_args_display_values(
+    args: dict[str, Any],
+    *,
+    max_value_length: int = 40,
+    max_items: int = 3,
+) -> str:
+    """Build comma-separated display values from the first tool parameters (values only)."""
+    from soothe_sdk.utils import convert_and_abbreviate_path
+    from soothe_sdk.utils.parsing import is_path_argument as _path_arg_name_pattern
+
+    def _is_path_arg_name(key: str) -> bool:
+        return _path_arg_name_pattern.match(key) is not None
+
+    def _display_path_value(raw: str) -> str:
+        out = convert_and_abbreviate_path(raw)
+        if len(out) > max_value_length:
+            return out[: max_value_length - 3] + "..."
+        return out
+
+    parts: list[str] = []
+    for k, v in args.items():
+        if len(parts) >= max_items:
+            break
+        if k in _ARG_SUMMARY_SKIP_KEYS:
+            continue
+        s = str(v)
+        if _is_path_arg_name(k):
+            s = _display_path_value(s)
+        elif len(s) > max_value_length:
+            s = s[: max_value_length - 3] + "..."
+        parts.append(s)
+    return ", ".join(parts)
+
+
 def format_tool_call_args(tool_name: str, tool_call: dict[str, Any]) -> str:
     """Format key tool arguments for display (see IG-053).
 
@@ -340,8 +390,10 @@ def format_tool_call_args(tool_name: str, tool_call: dict[str, Any]) -> str:
     Returns:
         Formatted argument string like "file_name.md" or "/Users/dev/.../file.md, pattern"
         (without outer parentheses - caller adds them).
-        Returns "..." when args are empty but tool is known.
-        Returns "" if tool is unknown and no args.
+        Returns "..." when args are empty but tool is known (or placeholders while streaming).
+        Returns "…" when the tool is not in the display map and there are no usable args,
+        or when parsed args exist but only contain internal/skip keys.
+        For unmapped tools with parameters, returns a compact comma-separated value summary.
 
     Examples:
         >>> format_tool_call_args("read_file", {"args": {"path": "config.yml"}})
@@ -399,10 +451,13 @@ def format_tool_call_args(tool_name: str, tool_call: dict[str, Any]) -> str:
                             val = val[: max_value_length - 3] + "..."
                         return val
             return "..."
-        return ""
+        return "…"
 
     if not key_args:
-        return ""
+        if args:
+            compact = _compact_tool_args_display_values(args, max_value_length=max_value_length)
+            return compact if compact else "…"
+        return "…"
 
     # Extract values for all configured argument keys
     values = []
@@ -420,21 +475,9 @@ def format_tool_call_args(tool_name: str, tool_call: dict[str, Any]) -> str:
     if not values:
         # Model may use different arg names than _ARG_DISPLAY_MAP; still show something useful.
         if args:
-            parts: list[str] = []
-            # Skip internal keys like _raw, _internal, etc.
-            skip_keys = {"_raw", "_internal", "raw_args_str"}
-            for k, v in list(args.items())[:3]:
-                if k in skip_keys:
-                    continue
-                s = str(v)
-                # Convert and abbreviate path arguments
-                if _is_path_arg_name(k):
-                    s = _display_path_value(s)
-                elif len(s) > max_value_length:
-                    s = s[: max_value_length - 3] + "..."
-                parts.append(s)
-            if parts:
-                return ", ".join(parts)
+            compact = _compact_tool_args_display_values(args, max_value_length=max_value_length)
+            if compact:
+                return compact
             # All args were internal keys, check for raw_args_str
             raw = args.get("_raw") or args.get("raw_args_str", "")
             if raw:

{soothe_cli-0.3.4 → soothe_cli-0.3.5}/src/soothe_cli/shared/tool_call_resolution.py

@@ -12,6 +12,7 @@ duplicate precedence rules across merge/backfill helpers.
 
 from __future__ import annotations
 
+import logging
 from collections.abc import Mapping
 from dataclasses import dataclass
 from typing import Any
@@ -22,6 +23,8 @@ from soothe_cli.shared.message_processing import (
     try_parse_pending_tool_call_args,
 )
 
+logger = logging.getLogger(__name__)
+
 
 def infer_tool_name_from_call_id(tool_call_id: str) -> str | None:
     """Recover a real tool name from common ``functions.<name>:<idx>`` id shapes.
@@ -243,7 +246,13 @@ def build_streaming_args_overlay(
     message: Any,
     pending_tool_calls_lc: dict[str, dict[str, Any]],
 ) -> dict[str, dict[str, Any]]:
-    """Map ``tool_call_id`` → parsed args dict from ``tool_call_chunks`` accumulation."""
+    """Map ``tool_call_id`` → parsed args dict from ``tool_call_chunks`` accumulation.
+
+    Updates the overlay on every chunk whenever JSON parses successfully. A prior
+    version stopped after the first parse (``tui_stream_mounted``), which froze the
+    overlay when ``args_str`` grew across chunks so the TUI kept ``read_file(…)``
+    headers even after the path arrived in the accumulated string.
+    """
     from langchain_core.messages import AIMessageChunk
 
     overlay: dict[str, dict[str, Any]] = {}
@@ -252,8 +261,6 @@ def build_streaming_args_overlay(
     )
 
     for tc_id, pend in list(pending_tool_calls_lc.items()):
-        if pend.get("tui_stream_mounted"):
-            continue
         parsed = try_parse_pending_tool_call_args(pend)
         if parsed is None:
             continue
@@ -262,9 +269,18 @@ def build_streaming_args_overlay(
             continue
         if not parsed and not streaming_final:
             continue
-        pend["tui_stream_mounted"] = True
         str_id = str(tc_id)
         overlay[str_id] = parsed
+        if logger.isEnabledFor(logging.DEBUG):
+            args_preview = str(parsed)[:200]
+            logger.debug(
+                "tool_stream_overlay id=%s name=%s keys=%s streaming_final=%s preview=%s",
+                str_id,
+                name,
+                sorted(parsed.keys()) if isinstance(parsed, dict) else "?",
+                streaming_final,
+                args_preview,
+            )
     return overlay
 
 

{soothe_cli-0.3.4 → soothe_cli-0.3.5}/src/soothe_cli/tui/_version.py

@@ -8,13 +8,13 @@ except PackageNotFoundError:
     # Fallback for development/editable installs
     __version__ = "0.0.0"
 
-DOCS_URL = "https://github.com/caesar0301/soothe/docs"
+DOCS_URL = "https://github.com/OpenSoothe/soothe/docs"
 """URL for Soothe documentation."""
 
 PYPI_URL = "https://pypi.org/pypi/soothe/json"
 """PyPI JSON API endpoint for version checks."""
 
-CHANGELOG_URL = "https://github.com/caesar0301/soothe/blob/main/CHANGELOG.md"
+CHANGELOG_URL = "https://github.com/OpenSoothe/soothe/blob/main/CHANGELOG.md"
 """URL for the full changelog."""
 
 USER_AGENT = f"soothe/{__version__} update-check"