tsugite-cli 0.22.0__tar.gz → 0.22.1__tar.gz

{tsugite_cli-0.22.0 → tsugite_cli-0.22.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: tsugite-cli
-Version: 0.22.0
+Version: 0.22.1
 Summary: Micro-agent runner for task automation using markdown definitions
 Author: Justyn Shull
 License: GNU AFFERO GENERAL PUBLIC LICENSE

{tsugite_cli-0.22.0 → tsugite_cli-0.22.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tsugite-cli"
-version = "0.22.0"
+version = "0.22.1"
 description = "Micro-agent runner for task automation using markdown definitions"
 authors = [{ name = "Justyn Shull" }]
 requires-python = ">=3.11"

{tsugite_cli-0.22.0 → tsugite_cli-0.22.1}/tsugite/agent_preparation.py

@@ -119,8 +119,9 @@ class AgentPreparer:
         placeholders: Dict[str, str] = {}
         modified = content
         for d in directives:
-            if d.assign_var:
-                placeholders[d.assign_var] = f"[{kind} directive: {d.name}(...) - not executed in render mode]"
+            for var in (d.assign_var, getattr(d, "stdout_assign", None)):
+                if var:
+                    placeholders[var] = f"[{kind} directive: {d.name}(...) - not executed in render mode]"
             if rewrite_to is not None:
                 modified = modified.replace(d.raw_match, rewrite_to(d))
         return modified, placeholders

{tsugite_cli-0.22.0 → tsugite_cli-0.22.1}/tsugite/agent_runner/history_integration.py

@@ -231,11 +231,14 @@ def save_run_to_history(
     # agent ran to completion against this storage.
     existing = list(storage.iter_events())
     last_session_start = -1
+    last_user_input = -1
     last_model_response = -1
     last_session_end = -1
     for i, e in enumerate(existing):
         if e.type == "session_start":
             last_session_start = i
+        elif e.type == "user_input":
+            last_user_input = i
         elif e.type == "model_response":
             last_model_response = i
         elif e.type == "session_end":
@@ -244,7 +247,10 @@ def save_run_to_history(
     agent_already_recorded = last_model_response > last_session_start
 
     if agent_already_recorded:
-        if last_session_end <= last_session_start:
+        # A continued conversation pins session_start at index 0, so the current
+        # turn starts at its own user_input.
+        turn_start = max(last_session_start, last_user_input)
+        if last_session_end < turn_start:
             record_session_end(storage, status=status, error_message=error_message)
         return storage.session_id
 

{tsugite_cli-0.22.0 → tsugite_cli-0.22.1}/tsugite/attachments/base.py

@@ -68,8 +68,7 @@ class Attachment:
 
         ``key`` is the stable id used for dedupe and the UI chip; ``label`` is the
         human name the model and UI show; ``value`` is the text. Fills the text
-        content-type so context producers don't repeat it. This is the shape the
-        old ``ContextItem`` carried, now just an Attachment.
+        content-type so context producers don't repeat it.
         """
         return cls(
             name=label,
@@ -88,8 +87,7 @@ class Attachment:
 
     @property
     def value(self) -> str:
-        """The text content (an alias of ``content`` when it is text, else "").
-        Lets context code read ``.value`` the way the old ``ContextItem`` did."""
+        """The text content (an alias of ``content`` when it is text, else "")."""
         return self.content if isinstance(self.content, str) else ""
 
     def to_metadata(self) -> dict:

{tsugite_cli-0.22.0 → tsugite_cli-0.22.1}/tsugite/builtin_agents/default.md

@@ -157,12 +157,12 @@ You are managing a shared channel. When a user asks for something that would ben
 - **Inline** - single edit, one-shot read, small calculation. Don't spawn anything.
 - **`spawn_job`** - background work: long-running tasks, parallel work, or delegating to a different agent/model. Fire-and-forget by default; add `acceptance_criteria=[...]` when "done" has a checkable shape (tests pass, copy satisfies criteria, refactor preserves behavior) and the verification loop becomes the value.
 
-**Acceptance criteria**: pass each criterion as a plain string. The verifier reads them verbatim and returns per-criterion pass/fail in `result.ac_results`:
+**Acceptance criteria**: pass each criterion as a plain string. A criterion starting with `cmd:<command>` (passes on exit 0), `exit_code:<command>:<n>` (passes on exit code `n`, default 0) or `file_exists:<path>` is checked in the Job's working directory with no verifier model. Write one whenever the check is mechanical. The verifier reads the rest verbatim and returns per-criterion pass/fail in `result.ac_results`:
 ```python-exec
 spawn_job(
     prompt="Refactor the agent loop to handle nested tool calls",
     acceptance_criteria=[
-        "All existing tests still pass",
+        "cmd:uv run pytest -q",
         "Adds at least 2 new tests for nested calls",
         "No new dependencies",
     ],

{tsugite_cli-0.22.0 → tsugite_cli-0.22.1}/tsugite/cli/run.py

@@ -1,6 +1,7 @@
 """CLI run command - execute agents."""
 
 from pathlib import Path
+from types import SimpleNamespace
 from typing import Any, Dict, List, Optional, Tuple
 
 import typer
@@ -137,11 +138,18 @@ def _execute_agent_with_ui(
     """Execute agent with appropriate UI mode.
 
     Dispatch order:
-      1. --headless / --final-only -> custom_agent_ui with silent progress
-      2. fall-through default -> plain logger (covers no flags, --plain, piped/NO_COLOR)
+      1. --log-json -> JSONL event stream on stdout
+      2. --headless / --final-only -> custom_agent_ui with silent progress
+      3. fall-through default -> plain logger (covers no flags, --plain, piped/NO_COLOR)
     """
     from tsugite.ui import create_plain_logger, custom_agent_ui
 
+    if ui_opts.log_json:
+        from tsugite.ui.jsonl import JSONLUIHandler
+
+        executor_kwargs["custom_logger"] = SimpleNamespace(ui_handler=JSONLUIHandler())
+        return executor(**executor_kwargs)
+
     if ui_opts.headless or ui_opts.final_only:
         stderr_console = get_error_console(True, console)
         show_progress_items = ui_opts.verbose and not ui_opts.final_only
@@ -188,6 +196,9 @@ def _display_result(result_str: str, ui_opts: UIOptions, stderr_console: Console
 
     from tsugite.console import get_stdout_console
 
+    if ui_opts.log_json:
+        return
+
     if not (ui_opts.headless or ui_opts.final_only):
         stderr_console.print()
         stderr_console.rule("[bold green]Agent Execution Complete[/bold green]")
@@ -358,6 +369,10 @@ def run(
 
     if history_opts.storage_dir:
         history_opts.storage_dir.mkdir(parents=True, exist_ok=True)
+        from tsugite.history import set_history_backend
+        from tsugite.history.sqlite_backend import SqliteHistoryBackend
+
+        set_history_backend(SqliteHistoryBackend(history_opts.storage_dir / "history.db"))
 
     if ui_opts.no_color:
         console.no_color = True

{tsugite_cli-0.22.0 → tsugite_cli-0.22.1}/tsugite/core/proxy.py

@@ -8,6 +8,7 @@ import asyncio
 import fnmatch
 import ipaddress
 import logging
+import socket
 from pathlib import Path
 from typing import Optional
 
@@ -46,6 +47,13 @@ def _is_ip_address(host: str) -> bool:
         ipaddress.ip_address(host)
         return True
     except ValueError:
+        pass
+    # inet_aton accepts the integer, octal and short IPv4 forms that
+    # ip_address rejects and getaddrinfo resolves, and rejects hostnames.
+    try:
+        socket.inet_aton(host)
+        return True
+    except OSError:
         return False
 
 

{tsugite_cli-0.22.0 → tsugite_cli-0.22.1}/tsugite/md_agents.py

@@ -305,7 +305,7 @@ def extract_tool_directives(content: str) -> List[ToolDirective]:
         {'url': 'http://example.com'}
     """
     directives = []
-    pattern = r"<!--\s*tsu:tool\s+([^>]+?)\s*-->"
+    pattern = r"<!--\s*tsu:tool\s+(.+?)\s*-->"
 
     for match in re.finditer(pattern, content):
         raw_args = match.group(1).strip()
@@ -478,7 +478,7 @@ def extract_step_directives(content: str, include_preamble: bool = True) -> tupl
         True
     """
     steps = []
-    pattern = r"<!--\s*tsu:step\s+([^>]+?)\s*-->"
+    pattern = r"<!--\s*tsu:step\s+(.+?)\s*-->"
     matches = list(re.finditer(pattern, content))
 
     # Extract preamble (content before first step)

{tsugite_cli-0.22.0 → tsugite_cli-0.22.1}/tsugite/tools/agents.py

@@ -1,5 +1,7 @@
 """Agent orchestration tools for spawning and managing sub-agents."""
 
+import os
+import signal
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -31,6 +33,13 @@ def _build_subagent_cmd(agent_file: Path, model_override: Optional[str], sandbox
     return cmd
 
 
+def _kill_process_tree(proc) -> None:
+    try:
+        os.killpg(proc.pid, signal.SIGKILL)
+    except ProcessLookupError:
+        pass
+
+
 def resolve_agent_path(agent_path: str) -> Optional[Path]:
     """Resolve an agent reference (path or name) to a file. Returns None if missing.
 
@@ -187,7 +196,6 @@ def spawn_agent(
         emit_info_event(f"🚀 Spawning subagent: [cyan]{agent_name}[/cyan]...")
 
     try:
-        # Spawn subprocess with line buffering
         proc = subprocess.Popen(
             cmd,
             stdin=subprocess.PIPE,
@@ -196,18 +204,16 @@ def spawn_agent(
             text=True,
             bufsize=1,  # Line buffered for real-time output
             cwd=str(_effective_cwd()),
+            start_new_session=True,
         )
 
-        # Write context to stdin then close it
         proc.stdin.write(context_json)
         proc.stdin.close()
 
-        # Queue for passing lines from reader thread to main thread
         line_queue = queue.Queue()
         reader_exception = None
 
         def read_stdout():
-            """Read stdout lines in separate thread and put in queue."""
             nonlocal reader_exception
             try:
                 for line in proc.stdout:
@@ -217,11 +223,19 @@ def spawn_agent(
                 reader_exception = e
                 line_queue.put(None)
 
-        # Start reader thread
         reader_thread = threading.Thread(target=read_stdout, daemon=True)
         reader_thread.start()
 
-        # Read JSONL stream and collect events
+        # A child that fills the stderr pipe blocks on write(2).
+        stderr_text = ""
+
+        def read_stderr():
+            nonlocal stderr_text
+            stderr_text = proc.stderr.read()
+
+        stderr_thread = threading.Thread(target=read_stderr, daemon=True)
+        stderr_thread.start()
+
         final_result = None
         errors = []
         # The child signals EOF by closing stdout, so one that hangs without
@@ -231,7 +245,7 @@ def spawn_agent(
 
         while True:
             if time.monotonic() >= deadline:
-                proc.kill()
+                _kill_process_tree(proc)
                 raise RuntimeError(f"Subagent timed out after {timeout}s")
             # Try to get line from queue with timeout for periodic updates
             try:
@@ -280,17 +294,17 @@ def spawn_agent(
 
         # Wait for completion
         try:
-            return_code = proc.wait(timeout=timeout)
+            return_code = proc.wait(timeout=max(0.0, deadline - time.monotonic()))
         except subprocess.TimeoutExpired:
-            proc.kill()
+            _kill_process_tree(proc)
             raise RuntimeError(f"Subagent timed out after {timeout}s")
 
         # Check for failures
         if return_code != 0:
-            stderr = proc.stderr.read()
+            stderr_thread.join(timeout=1.0)
             error_msg = f"Subagent failed with exit code {return_code}"
-            if stderr:
-                error_msg += f": {stderr}"
+            if stderr_text:
+                error_msg += f": {stderr_text}"
             if errors:
                 error_msg += f"\nErrors: {[e['error'] for e in errors]}"
             raise RuntimeError(error_msg)

{tsugite_cli-0.22.0 → tsugite_cli-0.22.1}/tsugite/tools/jobs.py

@@ -57,9 +57,11 @@ def spawn_job(
 
     Args:
         prompt: Task instruction for the spawned Job.
-        acceptance_criteria: List of criterion strings the verifier grades
-            against. Empty list short-circuits verification (Job goes straight
-            to done).
+        acceptance_criteria: List of criterion strings. A criterion starting
+            with cmd:<command>, exit_code:<command>:<n> or file_exists:<path>
+            is checked by exit status in the Job's working directory and the
+            verifier grades the rest. Empty list short-circuits verification
+            (Job goes straight to done).
         repo: Repo path (workspace-relative or absolute). The worker runs in a
             fresh git worktree provisioned under `<repo>/.tsugite-jobs/<job_id>`,
             isolated from the parent checkout; it's pruned on done/cancelled and