brindle 0.4.3__tar.gz → 0.4.4__tar.gz

{brindle-0.4.3 → brindle-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brindle
-Version: 0.4.3
+Version: 0.4.4
 Summary: Run coding agents in parallel, each on its own git branch, with a supervisor that delegates, reviews, and merges
 Project-URL: Homepage, https://pawdelta.com/brindle/
 Project-URL: Documentation, https://pawdelta.com/brindle/docs/recommended-use

{brindle-0.4.3 → brindle-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "brindle"
-version = "0.4.3"
+version = "0.4.4"
 description = "Run coding agents in parallel, each on its own git branch, with a supervisor that delegates, reviews, and merges"
 readme = "README.md"
 requires-python = ">=3.11"

{brindle-0.4.3 → brindle-0.4.4}/src/brindle/agents.py

@@ -2159,9 +2159,40 @@ def finish_review(db: DB, reviewer_id: str, ws_id: str) -> None:
 
             learned_rules.refresh_later(ws.repo_root)   # the finding just landed in the history
     finally:
+        # A merge removes the workspace but leaves the session this reviewer
+        # runs in; once the reviewer is gone nobody else would end it.
+        if ws and db.get_workspace(ws_id) is None:
+            _closing_session(reviewer_id).write_text(ws.tmux_session)
         close_later(reviewer_id)
 
 
+def _closing_session(agent_id: str):
+    from brindle.config import brindle_home
+
+    d = brindle_home() / "closing"
+    d.mkdir(parents=True, exist_ok=True)
+    return d / agent_id
+
+
+def close_removed(db: DB, agent_id: str) -> None:
+    """Kill an agent and, when its workspace was removed with the session left
+    running (noted by ``finish_review``), that session too: only brindle's own,
+    unattached session of a workspace that no longer exists."""
+    note = _closing_session(agent_id)
+    try:
+        session = note.read_text().strip()
+        note.unlink()
+    except OSError:
+        session = ""
+    try:
+        kill(db, agent_id)
+    except AgentError:
+        pass
+    if session and db.workspace_by_tmux_session(session) is None \
+            and not tmux.session_attached(session):
+        tmux.kill_session(session)
+
+
 def close_later(agent_id: str, delay: float = 5.0) -> None:
     """Stop an agent shortly, from a detached process: used by an agent's own
     tool call, which must return before its CLI goes away."""

{brindle-0.4.3 → brindle-0.4.4}/src/brindle/cli.py

@@ -3080,10 +3080,7 @@ def quit_cmd(root_id: str) -> None:
 @app.command("_close", hidden=True)
 def close_cmd(agent_id: str, delay: float = typer.Option(0.0)) -> None:
     time.sleep(delay)
-    try:
-        agents.kill(_helper_db(), agent_id)
-    except agents.AgentError:
-        pass
+    agents.close_removed(_helper_db(), agent_id)
 
 
 @app.command("_finish-review", hidden=True)

{brindle-0.4.3 → brindle-0.4.4}/src/brindle/codex_hook.py

@@ -36,6 +36,7 @@ import json
 import os
 import queue
 import shlex
+import signal
 import subprocess
 import threading
 import time
@@ -228,7 +229,8 @@ class _AppServer:
         self.timeout = timeout
         try:
             self.proc = subprocess.Popen([binary, "app-server", *flags], stdin=subprocess.PIPE,
-                                         stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, text=True)
+                                         stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, text=True,
+                                         start_new_session=True)
         except OSError as e:
             raise CodexHookError(f"couldn't run {binary}: {e}") from e
         self.lines: queue.Queue = queue.Queue()
@@ -279,6 +281,14 @@ class _AppServer:
                 return result
 
     def close(self) -> None:
+        # The app-server leads its own process group (see __init__): kill the
+        # group so nothing it spawned outlives it.
+        pid = getattr(self.proc, "pid", None)
+        if pid:
+            try:
+                os.killpg(pid, signal.SIGKILL)
+            except OSError:
+                pass
         try:
             self.proc.kill()
         except OSError: