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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soothe-cli
-Version: 0.4.9
+Version: 0.5.0
 Summary: Soothe CLI client - communicates with daemon via WebSocket
 Project-URL: Homepage, https://github.com/OpenSoothe/soothe
 Project-URL: Documentation, https://soothe.readthedocs.io
@@ -21,7 +21,7 @@ Requires-Python: <4.0,>=3.11
 Requires-Dist: python-dotenv<2.0.0,>=1.0.0
 Requires-Dist: pyyaml<7.0.0,>=6.0.0
 Requires-Dist: rich>=13.0.0
-Requires-Dist: soothe-sdk<1.0.0,>=0.4.0
+Requires-Dist: soothe-sdk<1.0.0,>=0.5.0
 Requires-Dist: textual>=8.0.0
 Requires-Dist: typer<1.0.0,>=0.9.0
 Requires-Dist: websockets>=12.0

{soothe_cli-0.4.9 → soothe_cli-0.5.0}/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dependencies = [
-    "soothe-sdk>=0.4.0,<1.0.0",     # WebSocket client, protocol, types
+    "soothe-sdk>=0.5.0,<1.0.0",     # WebSocket client, protocol, types
     "typer>=0.9.0,<1.0.0",          # CLI framework
     "textual>=8.0.0",               # TUI framework
     "rich>=13.0.0",                 # Console output

{soothe_cli-0.4.9 → soothe_cli-0.5.0}/src/soothe_cli/cli/commands/autopilot_cmd.py

@@ -31,11 +31,11 @@ def run(
 
     run_impl(
         prompt=prompt,
-        config=config,
-        thread_id=None,
+        resume_loop_id=None,
         no_tui=True,
         autonomous=True,
         max_iterations=max_iterations,
+        config_path=config,
     )
 
 

{soothe_cli-0.4.9 → soothe_cli-0.5.0}/src/soothe_cli/cli/commands/loop_cmd.py

@@ -1,13 +1,9 @@
-"""Loop management CLI commands for managing AgentLoop instances.
-
-Replaces thread-based commands with loop-based commands.
-Users interact with loops (threads are internal implementation detail).
+"""Loop management CLI commands for AgentLoop instances.
 
 RFC-503: Loop-First User Experience
 RFC-504: Loop Management CLI Commands
 
-All loop operations communicate exclusively via daemon WebSocket RPC.
-The daemon must be running for loop commands to work.
+All loop operations use daemon WebSocket RPC; the daemon must be running.
 """
 
 from __future__ import annotations
@@ -145,8 +141,6 @@ def list_loops(
 ) -> None:
     """List all AgentLoop instances.
 
-    Replaces: soothe thread list
-
     Examples:
         soothe loop list
         soothe loop list --status running
@@ -178,7 +172,7 @@ def list_loops(
     table = Table(title="AgentLoops")
     table.add_column("Loop ID", style="cyan")
     table.add_column("Status", style="green")
-    table.add_column("Threads", justify="right")
+    table.add_column("Contexts", justify="right")
     table.add_column("Goals", justify="right")
     table.add_column("Switches", justify="right")
     table.add_column("Created", style="dim")
@@ -206,8 +200,6 @@ def describe_loop(
 ) -> None:
     """Show detailed loop information.
 
-    Replaces: soothe thread describe
-
     Example:
         soothe loop show loop_abc123
         soothe loop show loop_abc123 --verbose
@@ -245,13 +237,12 @@ def describe_loop(
         )
     )
 
-    # Thread context (internal, shown for debugging)
-    # RFC-503: Hide thread IDs, show only thread count
+    # Internal checkpoint context counts from loop metadata
     console.print(
         Panel(
-            f"Internal Threads: {len(loop.get('thread_ids', []))}\n"
-            f"Thread Switches: {loop.get('total_thread_switches', 0)}",
-            title="Thread Context (Internal)",
+            f"Internal contexts: {len(loop.get('thread_ids', []))}\n"
+            f"Context switches: {loop.get('total_thread_switches', 0)}",
+            title="Checkpoint contexts (internal)",
             border_style="dim",
         )
     )
@@ -260,7 +251,7 @@ def describe_loop(
     console.print(
         Panel(
             f"Goals Completed: {loop.get('total_goals_completed', 0)}\n"
-            f"Thread Switches: {loop.get('total_thread_switches', 0)}\n"
+            f"Context switches: {loop.get('total_thread_switches', 0)}\n"
             f"Duration: {format_duration(loop.get('total_duration_ms', 0))}\n"
             f"Tokens Used: {format_tokens(loop.get('total_tokens_used', 0))}",
             title="Execution Summary",
@@ -419,9 +410,7 @@ def delete_loop(
 ) -> None:
     """Delete loop entirely.
 
-    Removes loop directory but preserves thread checkpoints.
-
-    Replaces: soothe thread delete
+    Removes this loop's run directory and related artifacts.
 
     Example:
         soothe loop delete loop_abc123
@@ -454,7 +443,7 @@ def delete_loop(
         console.print(
             f"[warning]Warning: This will permanently delete {loop_id} and all associated data:[/warning]"
         )
-        console.print(f"  - {len(loop.get('thread_ids', []))} internal thread contexts")
+        console.print(f"  - {len(loop.get('thread_ids', []))} internal checkpoint contexts")
         console.print(f"  - {loop.get('total_goals_completed', 0)} goal execution records")
         console.print("  - Working memory spills")
 
@@ -481,9 +470,7 @@ def delete_loop(
     console.print("  Removed checkpoint database")
     console.print("  Removed metadata")
     console.print("  Removed working memory spills")
-    console.print(
-        "[dim]  Preserved thread checkpoints (run `soothe thread delete` to remove)[/dim]"
-    )
+    console.print("[dim]  LangGraph checkpoints may remain until pruned separately[/dim]")
 
 
 # Helper functions
@@ -569,7 +556,7 @@ def format_anchor_summary(anchors: list[dict[str, Any]]) -> str:
         line = f"  iteration {anchor['iteration']}: [dim]{anchor['checkpoint_id']}[/dim] "
         line += f"({anchor['anchor_type']})"
 
-        # Check for thread switch (RFC-503: show context refreshed without thread ID)
+        # Context refresh when loop scope (LangGraph thread_id) changes between anchors
         if anchor["iteration"] > 0:
             prev_anchors = [a for a in anchors if a["iteration"] == anchor["iteration"] - 1]
             if prev_anchors and prev_anchors[0]["thread_id"] != anchor["thread_id"]:
@@ -587,10 +574,10 @@ def render_ascii_tree(tree: dict[str, Any]) -> None:
     for iteration in main_line:
         iter_num = iteration["iteration"]
 
-        # RFC-503: Hide thread ID, show context refresh notification
+        # Iteration marker (IDs omitted in UI)
         console.print(f"  iteration {iter_num}")
 
-        # Show context refresh note if thread switch occurred
+        # Context refresh when the tree marks a switch
         if iteration.get("thread_switch"):
             console.print("    [cyan][context refreshed][/cyan]")
 
@@ -610,7 +597,7 @@ def render_ascii_tree(tree: dict[str, Any]) -> None:
         console.print("\n[bold red]Failed Branches:[/bold red]")
 
         for branch in branches:
-            # RFC-503: Hide thread ID in failed branches
+            # Branch identity only (no per-anchor checkpoint id in UI)
             console.print(f"  [dim]{branch['branch_id']}[/dim] (iteration {branch['iteration']})")
             console.print(f"    ├─ [dim]{branch['root_checkpoint']}[/dim] [root] ← Rewind point")
 
@@ -689,8 +676,6 @@ def continue_loop(
 ) -> None:
     """Continue execution on existing loop.
 
-    Replaces: soothe thread continue <thread_id>
-
     Behavior:
     - Resolve target loop (explicit `LOOP_ID` or most-recent loop)
     - Launch TUI on that loop
@@ -709,7 +694,7 @@ def continue_loop(
 
     run_impl(
         prompt=prompt,
-        thread_id=resolved_loop_id,
+        resume_loop_id=resolved_loop_id,
         no_tui=False,
         autonomous=False,
         max_iterations=None,
@@ -724,7 +709,7 @@ def detach_loop(
 
     Behavior:
     - Unsubscribe client from loop events
-    - Loop continues executing (all threads continue)
+    - Loop keeps running on the daemon
     - Loop checkpoint saved at detachment point
     - Client can reattach later with 'soothe loop attach'
 
@@ -807,7 +792,7 @@ def attach_loop(
         Panel(
             f"Status: {loop.get('status', 'unknown')}\n"
             f"Goals: {loop.get('total_goals_completed', 0)} completed\n"
-            f"Internal Threads: {len(loop.get('thread_ids', []))}",
+            f"Internal contexts: {len(loop.get('thread_ids', []))}",
             title=f"Loop: {loop_id} (Reattached)",
         )
     )

{soothe_cli-0.4.9 → soothe_cli-0.5.0}/src/soothe_cli/cli/commands/run_cmd.py

@@ -17,18 +17,20 @@ logger = logging.getLogger(__name__)
 
 def run_impl(
     prompt: str | None,
-    thread_id: str | None,
+    resume_loop_id: str | None,
     no_tui: bool,  # noqa: FBT001
     autonomous: bool,  # noqa: FBT001
     max_iterations: int | None,
     streaming_enabled: bool | None = None,
     streaming_mode: str | None = None,
+    *,
+    config_path: str | None = None,
 ) -> None:
     """Core implementation for running Soothe agent.
 
     Args:
         prompt: Optional prompt for headless mode
-        thread_id: Thread ID to resume
+        resume_loop_id: Existing loop id to attach to (optional)
         no_tui: Force headless mode
         autonomous: Enable autonomous iteration mode
         max_iterations: Max iterations for autonomous mode
@@ -38,7 +40,7 @@ def run_impl(
     startup_start = time.perf_counter()
 
     try:
-        cfg = load_config()
+        cfg = load_config(config_path)
         log_level = resolve_cli_log_level(logging_level=cfg.logging_level)
         log_file = Path(SOOTHE_HOME) / "logs" / "soothe-cli.log"
         setup_logging(log_level, log_file=log_file)
@@ -65,13 +67,13 @@ def run_impl(
             run_headless(
                 cfg,
                 prompt or "",
-                thread_id=thread_id,
+                resume_loop_id=resume_loop_id,
                 autonomous=autonomous,
                 max_iterations=max_iterations,
             )
         else:
             # TUI mode (with optional initial prompt)
-            run_tui(cfg, thread_id=thread_id, initial_prompt=prompt)
+            run_tui(cfg, resume_loop_id=resume_loop_id, initial_prompt=prompt)
 
         run_elapsed_s = time.perf_counter() - run_start
         typer.echo(f"Total running time: {run_elapsed_s:.2f}s", err=True)

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

@@ -13,7 +13,7 @@ from typing import Any
 
 import typer
 from soothe_sdk.client import (
-    bootstrap_thread_session,
+    bootstrap_loop_session,
     connect_websocket_with_retries,
     websocket_url_from_config,
 )
@@ -30,11 +30,19 @@ _SESSION_BOOTSTRAP_TIMEOUT_S = 5.0
 _QUERY_START_TIMEOUT_S = 20.0
 
 
+def _is_loop_scoped_event(event: dict[str, Any], *, active_loop_id: str) -> bool:
+    """Return whether a daemon frame belongs to the active AgentLoop session."""
+    event_type = event.get("type", "")
+    if event_type not in {"status", "event"}:
+        return True
+    return event.get("loop_id") == active_loop_id
+
+
 async def run_headless_via_daemon(
     cfg: Any,
     prompt: str,
     *,
-    thread_id: str | None = None,
+    resume_loop_id: str | None = None,
     autonomous: bool = False,
     max_iterations: int | None = None,
 ) -> int:
@@ -51,27 +59,27 @@ async def run_headless_via_daemon(
     try:
         await connect_websocket_with_retries(client)
         cli_ws = os.environ.get("SOOTHE_CLI_WORKSPACE", "").strip() or os.getcwd()
-        status_event = await bootstrap_thread_session(
+        status_event = await bootstrap_loop_session(
             client,
-            resume_thread_id=thread_id,
+            resume_loop_id=resume_loop_id,
             verbosity="normal",
             workspace=cli_ws,
-            thread_status_timeout_s=_SESSION_BOOTSTRAP_TIMEOUT_S,
-            subscription_timeout_s=_SESSION_BOOTSTRAP_TIMEOUT_S,
+            subscribe_timeout_s=_SESSION_BOOTSTRAP_TIMEOUT_S,
         )
         if status_event.get("type") == "error":
             typer.echo(f"Daemon error: {status_event.get('message', 'unknown')}", err=True)
             return 1
 
-        actual_thread_id = status_event.get("thread_id")
-        if not actual_thread_id:
-            typer.echo("Error: No thread_id in status message", err=True)
+        active_loop_id = status_event.get("loop_id")
+        if not active_loop_id:
+            typer.echo("Error: No loop_id after session bootstrap", err=True)
             return 1
 
         subagent_name, cleaned_prompt = parse_subagent_from_input(prompt)
 
         await asyncio.wait_for(
             client.send_input(
+                active_loop_id,
                 cleaned_prompt if subagent_name else prompt,
                 autonomous=autonomous,
                 max_iterations=max_iterations,
@@ -104,6 +112,8 @@ async def run_headless_via_daemon(
                 break
 
             event_type = event.get("type", "")
+            if not _is_loop_scoped_event(event, active_loop_id=active_loop_id):
+                continue
 
             if event_type == "error":
                 typer.echo(f"Daemon error: {event.get('message', 'unknown')}", err=True)
@@ -132,6 +142,8 @@ async def run_headless_via_daemon(
                             break
                         if not nxt:
                             break
+                        if not _is_loop_scoped_event(nxt, active_loop_id=active_loop_id):
+                            continue
                         processor.process_event(nxt)
 
                     processor.process_event(event)

{soothe_cli-0.4.9 → soothe_cli-0.5.0}/src/soothe_cli/cli/execution/headless.py

@@ -22,7 +22,7 @@ def run_headless(
     cfg: CLIConfig,
     prompt: str,
     *,
-    thread_id: str | None = None,
+    resume_loop_id: str | None = None,
     autonomous: bool = False,
     max_iterations: int | None = None,
 ) -> None:
@@ -77,7 +77,7 @@ def run_headless(
         return await run_headless_via_daemon(
             cfg,
             prompt,
-            thread_id=thread_id,
+            resume_loop_id=resume_loop_id,
             autonomous=autonomous,
             max_iterations=max_iterations,
         )

{soothe_cli-0.4.9 → soothe_cli-0.5.0}/src/soothe_cli/cli/execution/launcher.py

@@ -10,7 +10,7 @@ from soothe_cli.config import CLIConfig
 def run_tui(
     cfg: CLIConfig,
     *,
-    thread_id: str | None = None,
+    resume_loop_id: str | None = None,
     initial_prompt: str | None = None,
 ) -> None:
     """Launch the Textual TUI (with daemon auto-start)."""
@@ -19,7 +19,7 @@ def run_tui(
 
         run_textual_tui(
             config=cfg,
-            thread_id=thread_id,
+            resume_loop_id=resume_loop_id,
             initial_prompt=initial_prompt,
         )
     except ImportError:

{soothe_cli-0.4.9 → soothe_cli-0.5.0}/src/soothe_cli/cli/main.py

@@ -106,7 +106,7 @@ def main(
 
         run_impl(
             prompt=prompt,
-            thread_id=None,
+            resume_loop_id=None,
             no_tui=no_tui,
             autonomous=False,
             max_iterations=None,
@@ -118,15 +118,11 @@ def main(
 # ---------------------------------------------------------------------------
 # Sub-command groups (nested Typer apps)
 # ---------------------------------------------------------------------------
-# Thread: read-only diagnostics per RFC-503 (Loop-First UX). Lifecycle
-# management lives under `soothe loop <subcommand>`.
 
 from soothe_cli.cli.commands.autopilot_cmd import app as _autopilot_app  # noqa: E402
 from soothe_cli.cli.commands.loop_cmd import loop_app as _loop_app  # noqa: E402
-from soothe_cli.cli.commands.thread_cmd import thread_app as _thread_app  # noqa: E402
 
 for _sub_app, _name in (
-    (_thread_app, "thread"),
     (_loop_app, "loop"),
     (_autopilot_app, "autopilot"),
 ):

{soothe_cli-0.4.9 → soothe_cli-0.5.0}/src/soothe_cli/shared/__init__.py

@@ -21,8 +21,6 @@ from soothe_sdk.utils import setup_logging
 # Import from commands subdirectory
 from soothe_cli.shared.commands.slash_commands import (
     KEYBOARD_SHORTCUTS,
-    SLASH_COMMANDS,
-    parse_autonomous_command,
     show_commands,
     show_config,
     show_history,
@@ -108,8 +106,6 @@ __all__ = [
     "update_name_map_from_tool_calls",
     # Slash commands (IG-176)
     "KEYBOARD_SHORTCUTS",
-    "SLASH_COMMANDS",
-    "parse_autonomous_command",
     "show_commands",
     "show_config",
     "show_history",

{soothe_cli-0.4.9 → soothe_cli-0.5.0}/src/soothe_cli/shared/commands/command_router.py

@@ -42,7 +42,7 @@ def parse_slash_command(input_text: str) -> tuple[str, str | None]:
 
 
 def validate_command(
-    entry: dict[str, Any], command: str, query: str | None, thread_id: str | None
+    entry: dict[str, Any], command: str, query: str | None, loop_id: str | None
 ) -> tuple[bool, str | None]:
     """Validate command before routing.
 
@@ -50,14 +50,13 @@ def validate_command(
         entry: Command registry entry
         command: Command name
         query: Query parameter (if present)
-        thread_id: Current thread ID
+        loop_id: Active AgentLoop id for this session
 
     Returns:
         Tuple of (is_valid, error_message)
     """
-    # Check thread requirement
-    if entry.get("requires_thread") and not thread_id:
-        return (False, "No active thread")
+    if entry.get("requires_loop") and not loop_id:
+        return (False, "No active loop")
 
     # Check query requirement for routing commands
     if entry.get("requires_query") and not query:
@@ -110,7 +109,13 @@ def parse_command_params(entry: dict[str, Any], query: str) -> dict[str, Any]:
     return params
 
 
-async def route_slash_command(cmd_input: str, console: Console, client: WebSocketClient) -> bool:
+async def route_slash_command(
+    cmd_input: str,
+    console: Console,
+    client: WebSocketClient,
+    *,
+    loop_id: str | None = None,
+) -> bool:
     """Route slash command based on registry metadata (RFC-404).
 
     Args:
@@ -137,7 +142,7 @@ async def route_slash_command(cmd_input: str, console: Console, client: WebSocke
         return True  # Handled (as error)
 
     # Validate command
-    is_valid, error = validate_command(entry, command, query, client.thread_id)
+    is_valid, error = validate_command(entry, command, query, loop_id)
     if not is_valid:
         console.print(f"[red]Error: {error}[/red]")
         return True  # Handled (as error)
@@ -151,13 +156,13 @@ async def route_slash_command(cmd_input: str, console: Console, client: WebSocke
         return True
 
     elif entry["location"] == "daemon" and entry.get("type") == "rpc":
-        # Daemon RPC: send command_request
-        await handle_rpc_command(entry, command, query, console, client)
+        # Daemon RPC: send command_request (scoped by loop_id)
+        await handle_rpc_command(entry, command, query, console, client, loop_id=loop_id)
         return True
 
     elif entry["location"] == "daemon" and entry.get("type") == "routing":
         # Daemon routing: send as plain text input
-        await handle_routing_command(cmd_input, console, client)
+        await handle_routing_command(cmd_input, console, client, loop_id=loop_id)
         return True
 
     return False
@@ -169,6 +174,8 @@ async def handle_rpc_command(
     query: str | None,
     console: Console,
     client: WebSocketClient,
+    *,
+    loop_id: str | None = None,
 ) -> None:
     """Handle daemon RPC command with structured request/response (RFC-404).
 
@@ -178,15 +185,17 @@ async def handle_rpc_command(
         query: Query/params (if present)
         console: Rich console
         client: WebSocket client
+        loop_id: Active subscribed loop (required for daemon-side binding)
     """
     daemon_command = entry["daemon_command"]
 
     # Build request
-    request = {
+    request: dict[str, Any] = {
         "type": "command_request",
         "command": daemon_command,
-        "thread_id": client.thread_id,
     }
+    if loop_id:
+        request["loop_id"] = loop_id
 
     # Parse params if schema exists
     if entry.get("params_schema") and query:
@@ -225,7 +234,13 @@ async def handle_rpc_command(
         console.print(f"[red]Error: {exc}[/red]")
 
 
-async def handle_routing_command(cmd_input: str, console: Console, client: WebSocketClient) -> None:
+async def handle_routing_command(
+    cmd_input: str,
+    console: Console,
+    client: WebSocketClient,
+    *,
+    loop_id: str | None = None,
+) -> None:
     """Handle daemon routing command by sending input with optional subagent (RFC-404).
 
     For ``/browser``, ``/claude``, ``/research``, and ``/explore``, sets the WebSocket
@@ -236,9 +251,13 @@ async def handle_routing_command(cmd_input: str, console: Console, client: WebSo
         cmd_input: Full command input (e.g., "/browser AI trends")
         console: Rich console
         client: WebSocket client
+        loop_id: Subscribed loop to target (required for ``loop_input``)
     """
+    if not loop_id:
+        console.print("[red]Error: No active loop for routing command[/red]")
+        return
     subagent_name, text = parse_subagent_from_input(cmd_input.strip())
-    await client.send_input(text, preferred_subagent=subagent_name)
+    await client.send_input(loop_id, text, preferred_subagent=subagent_name)
 
 
 __all__ = [