brindle 0.3.16__tar.gz → 0.3.17__tar.gz

{brindle-0.3.16 → brindle-0.3.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brindle
-Version: 0.3.16
+Version: 0.3.17
 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
@@ -94,7 +94,7 @@ uv tool install --editable ~/Projects/brindle   # or from a local checkout
 brindle drives Claude Code, so you need that too (`npm install -g @anthropic-ai/claude-code`).
 
 `brindle --version` prints the installed version; the tmux status bar of every brindle
-session shows it too (`brindle 0.3.16`). A session started before an upgrade keeps
+session shows it too (`brindle 0.3.17`). A session started before an upgrade keeps
 running the old code, and shows the old number, until you restart it.
 
 ## Quick start

{brindle-0.3.16 → brindle-0.3.17}/README.md

@@ -63,7 +63,7 @@ uv tool install --editable ~/Projects/brindle   # or from a local checkout
 brindle drives Claude Code, so you need that too (`npm install -g @anthropic-ai/claude-code`).
 
 `brindle --version` prints the installed version; the tmux status bar of every brindle
-session shows it too (`brindle 0.3.16`). A session started before an upgrade keeps
+session shows it too (`brindle 0.3.17`). A session started before an upgrade keeps
 running the old code, and shows the old number, until you restart it.
 
 ## Quick start

{brindle-0.3.16 → brindle-0.3.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "brindle"
-version = "0.3.16"
+version = "0.3.17"
 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.3.16 → brindle-0.3.17}/src/brindle/agents.py

@@ -322,10 +322,12 @@ def spawn(
     autopilot: bool = False,
     plan_first: bool = False,
     review_sha: str | None = None,
+    claim_goals: bool = True,
 ) -> Agent:
     """Start an agent in ``ws``. Workers (handoff/assign) given a ``done_when``
     finish line run it as a Claude Code ``/goal``. With ``autopilot``, the
-    agent is a session root that drives toward a goal (see brindle.autopilot)."""
+    agent is a session root that drives toward a goal (see brindle.autopilot);
+    with ``claim_goals`` it claims a hand-written ``.brindle/goals.md``."""
     from brindle import autopilot as pilot
     from brindle import identity_lock
 
@@ -377,9 +379,9 @@ def spawn(
         db.update_agent(agent_id, plan_first=1)
         agent.plan_first = 1
     if autopilot:
-        plan = pilot.enable(db, agent_id, ws)
+        plan = pilot.enable(db, agent_id, ws, claim=claim_goals)
         if plan and not prompt:
-            prompt = agent.task = pilot.kickoff(plan)
+            prompt = agent.task = pilot.kickoff(plan, agent_id)
             db.update_agent(agent_id, task=prompt)
     if mode == "interactive":
         from brindle import codemap
@@ -1177,6 +1179,10 @@ def resume(db: DB, root_id: str, *, watch_pane: bool = True,
                   if a.status in ("paused", "failed") and (only is None or a.id in only)]
     for a in candidates:   # all or nothing: a session never half-resumes under another identity
         identity_lock.ensure(a)
+    if any(a.id == root_id for a in candidates):
+        from brindle import autopilot as pilot
+
+        pilot.reload_goals_file(db, root_id)   # edits the person made to this session's goal file
     resumed = []
     for a in candidates:
         if a.status == "failed":
@@ -1506,14 +1512,22 @@ def screen_status(db: DB, agent: Agent, samples: int = 2, gap: float = 0.7) -> s
     single cheap read, as the dashboard does, leaves it alone. Moving an
     agent to idle also delivers anything queued for it, but only when
     ``samples`` >= 2: a single-sample read must never pop a message into a
-    terminal as a side effect of just rendering the dashboard."""
+    terminal as a side effect of just rendering the dashboard.
+
+    An agent whose CLI runs none of brindle's hooks (``hooks_off``: the
+    person's settings turn them off, at launch or later through /hooks, or
+    none reported within HOOKS_GRACE of its input box appearing) has only the
+    screen to go by: it may leave 'starting', a single read may move it from
+    'idle' to busy, and a ``samples`` >= 2 idle read delivers what's queued
+    even when the status was already idle, since no Stop hook ever will."""
     provider = get_provider(agent.provider)
     if (agent.headless or not provider.uses_hooks
             or agent.status not in ("starting", "idle", "processing", "waiting")):
         return None  # a headless pane shows output, not a TUI to read
-    if agent.status == "idle" and samples < 2:
+    _sync_hooks_off(db, agent, provider.hooks_disabled(*_settings_scope(db, agent)))
+    if agent.status == "idle" and samples < 2 and not agent.hooks_off:
         return None
-    seen = set()
+    seen, ready = set(), True
     for i in range(samples):
         if i:
             time.sleep(gap)
@@ -1525,25 +1539,71 @@ def screen_status(db: DB, agent: Agent, samples: int = 2, gap: float = 0.7) -> s
         if agent.status == "idle" and state == "busy" and not provider.busy_in_footer(screen):
             state = None
         seen.add(state)
+        ready = ready and provider.input_ready(screen)
+    if (agent.status == "starting" and not agent.hooks_off and ready and provider.announces_start
+            and time.time() - (agent.status_since or agent.created_at) >= HOOKS_GRACE):
+        # Its input box is up, and SessionStart, which runs before it, never reported.
+        # (A CLI without one is marked ready by after_launch instead: see ready.)
+        _sync_hooks_off(db, agent, f"{NO_HOOK_EVENTS} from {provider.name}")
     if len(seen) != 1:
         return None
     state = seen.pop()
     new = {"idle": "idle", "busy": "processing", "waiting": "waiting"}.get(state or "")
-    if agent.status == "starting" and new != "waiting":
+    if agent.status == "starting" and new != "waiting" and not agent.hooks_off:
         # Its hooks say when it's ready; the screen only adds that it's
         # stuck on a dialog before they could (e.g. folder trust).
         return None
-    if new and new != agent.status:
+    changed = bool(new) and new != agent.status
+    if changed:
         db.set_status(agent.id, new, only_if=agent.status)
         agent.status = new
-        if new == "idle" and samples >= 2 and db.pending_count(agent.id):
-            try:
-                flush(db, agent.id)
-            except tmux.TmuxError:
-                pass  # stays queued; its Stop hook hands it over
+    if (new == "idle" and samples >= 2 and (changed or agent.hooks_off)
+            and db.pending_count(agent.id)):
+        try:
+            flush(db, agent.id)
+        except tmux.TmuxError:
+            pass  # stays queued; its Stop hook hands it over
     return new
 
 
+# How long a hooks CLI may show its input box while still 'starting' before
+# brindle takes it that none of its hooks run (see screen_status).
+HOOKS_GRACE = 60.0
+# How hooks_off reads when no settings explain it, only the missing events.
+NO_HOOK_EVENTS = "no hook events"
+
+
+_settings_scopes: dict[tuple[str, float], tuple[str | None, list[str] | None]] = {}
+
+
+def _settings_scope(db: DB, agent: Agent) -> tuple[str | None, list[str] | None]:
+    """Where ``agent``'s CLI reads its settings: its workspace, and the
+    profile's setting_sources (None: all of them). Kept per agent, as the
+    sidebar asks on every refresh and a running CLI keeps its launch flags."""
+    key = (agent.id, agent.created_at)
+    if key in _settings_scopes:
+        return _settings_scopes[key]
+    from brindle.profiles import ProfileError
+
+    ws = db.get_workspace(agent.workspace_id)
+    try:
+        sources = load_profile(agent.profile, ws.repo_root if ws else None).setting_sources
+    except (KeyError, ProfileError):
+        sources = None
+    scope = _settings_scopes[key] = (ws.path if ws else None), sources
+    return scope
+
+
+def _sync_hooks_off(db: DB, agent: Agent, why: str | None) -> None:
+    """Record ``why`` its hooks are off; None clears a reason the settings
+    gave (turned back on), but not missing events, which only a hook clears."""
+    if why is None and agent.hooks_off and agent.hooks_off.startswith(NO_HOOK_EVENTS):
+        return
+    if why != agent.hooks_off:
+        db.update_agent(agent.id, hooks_off=why)
+        agent.hooks_off = why
+
+
 def _deliver_to_inbox(db: DB, agent: Agent, message_id: int, text: str,
                       sender_id: str | None) -> bool:
     """Send a queued message through Claude Code's own inbox (see
@@ -2661,6 +2721,8 @@ def handle_hook(db: DB, agent_id: str, event: str, payload: dict) -> dict | None
     agent = db.get_agent(agent_id)
     if agent is None:
         return None
+    if agent.hooks_off:
+        db.update_agent(agent_id, hooks_off=None)  # its hooks run after all: turned back on
     # A hook runs only once the session is going, so its launch is past any
     # startup prompt: a menu on its pane from now on is the agent's own (a
     # question for the user), which no sweep may answer.