brindle 0.3.18__tar.gz → 0.3.19__tar.gz

brindle-0.3.18/README.md → brindle-0.3.19/PKG-INFO

@@ -1,3 +1,34 @@
+Metadata-Version: 2.4
+Name: brindle
+Version: 0.3.19
+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
+Project-URL: Changelog, https://pawdelta.com/brindle/changelog
+Project-URL: Support, https://pawdelta.com/brindle/docs/faq
+Author: Hannah Lerner
+License-Expression: LicenseRef-brindle-1.0
+License-File: LICENSE
+License-File: SCHEDULE-A
+Keywords: agents,ai,claude-code,codex,git,mcp,orchestration,tmux,worktree
+Classifier: Development Status :: 3 - Alpha
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Software Development
+Classifier: Topic :: Software Development :: Version Control :: Git
+Requires-Python: >=3.11
+Requires-Dist: cryptography>=42
+Requires-Dist: mcp<3,>=2.2
+Requires-Dist: packaging>=24
+Requires-Dist: typer>=0.12
+Description-Content-Type: text/markdown
+
 # brindle
 
 *[pawdelta.com/brindle](https://pawdelta.com/brindle/) · Published on PyPI as `brindle`; the command is `brindle`. This project is
@@ -63,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.18`). A session started before an upgrade keeps
+session shows it too (`brindle 0.3.19`). A session started before an upgrade keeps
 running the old code, and shows the old number, until you restart it.
 
 ## Quick start
@@ -184,6 +215,31 @@ brindle pr fix-login                          # push + gh pr create
 brindle rm fix-login                          # deletes the branch only if it's merged (-K keeps it)
 ```
 
+### Choosing the supervisor and workers
+
+The first time you run `brindle` it asks which CLI runs the supervisor (the
+agent that plans the work and hands it out), and remembers your pick. After
+that it starts straight away and prints one line naming the CLI. It asks again
+only when your pick is no longer signed in or no longer allowed.
+
+- `brindle -s` opens the picker; `brindle -s codex` switches directly. Either
+  is remembered.
+- In the picker, `w` opens the workers screen: a model for each task size
+  (light, medium, heavy). Models are grouped by how they run: through a CLI
+  you sign in to, locally with Ollama, or hosted with an API key. Picking one
+  that isn't ready sets it up right there: signing in, installing Ollama and
+  downloading the model after a memory check, or asking for the API key.
+- API keys are checked with the provider before they're stored, and stay in
+  this machine's keychain.
+- The picker and the workers screen list only the CLIs and models you're
+  allowed to use. In an org that means its allowed providers and models for
+  your role, its managed routes, and whether personal API keys are allowed.
+  `-s` with anything else is refused, and saved picks are re-checked at every
+  launch.
+- Without a terminal (scripts, CI), with `--yes`, or in `brindle demo`, nothing
+  asks: brindle uses your last pick, else the supervisor profile's CLI (Claude
+  Code unless you changed it).
+
 ## Recommended use
 
 brindle pays off when work splits into pieces that can proceed in parallel, or
@@ -312,6 +368,7 @@ your own status line prints, so what you see doesn't change.
 | | |
 |---|---|
 | `brindle` | a fresh supervisor chat here, dashboard alongside |
+| `brindle -s [CLI]` | pick the supervisor's CLI (no value: open the picker; `w` there picks worker models); remembered for next time |
 | `brindle supervisor` | the same, with `--branch`/`--worktree` to run it in another worktree |
 | `brindle init` | detect setup and test commands, write `.brindle/config.json`, check tools |
 | `brindle demo [--local]` | watch brindle finish a tiny practice repo: parallel workers, reviews, gated merges |

brindle-0.3.18/PKG-INFO → brindle-0.3.19/README.md

@@ -1,34 +1,3 @@
-Metadata-Version: 2.4
-Name: brindle
-Version: 0.3.18
-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
-Project-URL: Changelog, https://pawdelta.com/brindle/changelog
-Project-URL: Support, https://pawdelta.com/brindle/docs/faq
-Author: Hannah Lerner
-License-Expression: LicenseRef-brindle-1.0
-License-File: LICENSE
-License-File: SCHEDULE-A
-Keywords: agents,ai,claude-code,codex,git,mcp,orchestration,tmux,worktree
-Classifier: Development Status :: 3 - Alpha
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Classifier: Operating System :: MacOS
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Software Development
-Classifier: Topic :: Software Development :: Version Control :: Git
-Requires-Python: >=3.11
-Requires-Dist: cryptography>=42
-Requires-Dist: mcp<3,>=2.2
-Requires-Dist: packaging>=24
-Requires-Dist: typer>=0.12
-Description-Content-Type: text/markdown
-
 # brindle
 
 *[pawdelta.com/brindle](https://pawdelta.com/brindle/) · Published on PyPI as `brindle`; the command is `brindle`. This project is
@@ -94,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.18`). A session started before an upgrade keeps
+session shows it too (`brindle 0.3.19`). A session started before an upgrade keeps
 running the old code, and shows the old number, until you restart it.
 
 ## Quick start
@@ -215,6 +184,31 @@ brindle pr fix-login                          # push + gh pr create
 brindle rm fix-login                          # deletes the branch only if it's merged (-K keeps it)
 ```
 
+### Choosing the supervisor and workers
+
+The first time you run `brindle` it asks which CLI runs the supervisor (the
+agent that plans the work and hands it out), and remembers your pick. After
+that it starts straight away and prints one line naming the CLI. It asks again
+only when your pick is no longer signed in or no longer allowed.
+
+- `brindle -s` opens the picker; `brindle -s codex` switches directly. Either
+  is remembered.
+- In the picker, `w` opens the workers screen: a model for each task size
+  (light, medium, heavy). Models are grouped by how they run: through a CLI
+  you sign in to, locally with Ollama, or hosted with an API key. Picking one
+  that isn't ready sets it up right there: signing in, installing Ollama and
+  downloading the model after a memory check, or asking for the API key.
+- API keys are checked with the provider before they're stored, and stay in
+  this machine's keychain.
+- The picker and the workers screen list only the CLIs and models you're
+  allowed to use. In an org that means its allowed providers and models for
+  your role, its managed routes, and whether personal API keys are allowed.
+  `-s` with anything else is refused, and saved picks are re-checked at every
+  launch.
+- Without a terminal (scripts, CI), with `--yes`, or in `brindle demo`, nothing
+  asks: brindle uses your last pick, else the supervisor profile's CLI (Claude
+  Code unless you changed it).
+
 ## Recommended use
 
 brindle pays off when work splits into pieces that can proceed in parallel, or
@@ -343,6 +337,7 @@ your own status line prints, so what you see doesn't change.
 | | |
 |---|---|
 | `brindle` | a fresh supervisor chat here, dashboard alongside |
+| `brindle -s [CLI]` | pick the supervisor's CLI (no value: open the picker; `w` there picks worker models); remembered for next time |
 | `brindle supervisor` | the same, with `--branch`/`--worktree` to run it in another worktree |
 | `brindle init` | detect setup and test commands, write `.brindle/config.json`, check tools |
 | `brindle demo [--local]` | watch brindle finish a tiny practice repo: parallel workers, reviews, gated merges |

{brindle-0.3.18 → brindle-0.3.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "brindle"
-version = "0.3.18"
+version = "0.3.19"
 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.18 → brindle-0.3.19}/src/brindle/cli.py

@@ -34,7 +34,34 @@ class _App(typer.Typer):
             raise SystemExit(1)
 
 
-app = _App(add_completion=False, help="""brindle: run coding agents in parallel, each on its own git branch.
+SUPERVISOR_FLAGS = ("-s", "--supervisor")
+
+
+def _bare_supervisor_flag(args: list[str], commands) -> list[str]:
+    """``args`` with picker.PICK after each ``-s``/``--supervisor`` that has
+    no CLI after it (it's last, or an option or a command follows), so a bare
+    ``brindle -s`` opens the picker: a Typer option can't take an optional
+    value."""
+    from brindle.picker import PICK
+
+    out = []
+    for i, a in enumerate(args):
+        out.append(a)
+        if a == "--":
+            return out + list(args[i + 1:])
+        if a in SUPERVISOR_FLAGS:
+            nxt = args[i + 1] if i + 1 < len(args) else None
+            if nxt is None or nxt.startswith("-") or nxt in commands:
+                out.append(PICK)
+    return out
+
+
+class _PickerGroup(typer.core.TyperGroup):
+    def parse_args(self, ctx, args):
+        return super().parse_args(ctx, _bare_supervisor_flag(args, self.commands))
+
+
+app = _App(cls=_PickerGroup, add_completion=False, help="""brindle: run coding agents in parallel, each on its own git branch.
 
 Run `brindle` with no arguments to open (or reopen) a supervisor chat here, with
 the live dashboard underneath. Outside a git repo it starts a scratch session;
@@ -177,7 +204,7 @@ def demo(
     typer.echo(f"demo repo: {root}")
     os.chdir(root)
     start(prompt=None, provider=None, attach=attach, watch=True,
-          autopilot=True, branch=None, worktree=None)
+          autopilot=True, branch=None, worktree=None, demo=True)
 
 
 @app.command()
@@ -193,6 +220,7 @@ def new(
     no_fetch: bool = typer.Option(False, "--no-fetch", help="Don't fetch the base branch first."),
     no_setup: bool = typer.Option(False, "--no-setup", help="Skip setup commands."),
     attach: bool = typer.Option(False, "--attach", help="Attach to the tmux session afterward."),
+    yes: Annotated[bool, typer.Option("--yes", "-y", help="Don't open the supervisor picker: use your last pick, else the default.")] = False,
     provider_alias: Annotated[Optional[str], typer.Option("--provider", hidden=True)] = None,
 ) -> None:
     """Create a worktree on a new branch and start a supervisor in it."""
@@ -209,6 +237,12 @@ def new(
             _fail("--base can't be combined with --pr (the PR's base branch is used)")
     elif not branch:
         _fail("missing BRANCH (or pass --pr <number>)")
+    if not no_agent:
+        try:
+            root = git.main_repo_root(os.getcwd())
+        except git.GitError:
+            root = None
+        provider = _resolve_supervisor(root, provider, yes=yes)
     db = DB()
     if pr is not None:
         created = _run(workspaces.create_from_pr, db, os.getcwd(), pr, run_setup=not no_setup)
@@ -258,7 +292,9 @@ def start(
     autopilot: Optional[bool] = typer.Option(None, "--autopilot/--no-autopilot", help="The supervisor drives toward a goal until it's verified (default: on, or `autopilot` in .brindle/config.json)."),
     branch: Optional[str] = typer.Option(None, "--branch", "-b", help="Run in the worktree for this branch, creating the branch and worktree if needed."),
     worktree: Optional[str] = typer.Option(None, "--worktree", "-w", help="Run in the worktree at this path (created with --branch if it doesn't exist)."),
+    yes: Annotated[bool, typer.Option("--yes", "-y", help="Don't open the supervisor picker: use your last pick, else the default.")] = False,
     provider_alias: Annotated[Optional[str], typer.Option("--provider", hidden=True)] = None,
+    demo: Annotated[bool, typer.Option("--demo-run", hidden=True)] = False,
 ) -> None:
     """Start a fresh supervisor chat here, with the dashboard alongside. A launch only ever starts a supervisor; it starts the other agents itself.
 
@@ -312,6 +348,7 @@ def start(
     if provider and provider in NOT_SUPERVISOR:
         _fail(f"the {provider} provider can't run the supervisor; use one of: "
               f"{', '.join(SUPERVISOR_PROVIDERS)}")
+    provider = _resolve_supervisor(ws.repo_root, provider, yes=yes, demo=demo)
     _preflight(agents.SUPERVISOR, provider, ws.repo_root)
     _trust_codex_hook(ws.repo_root)
     # Nothing slow before the chat starts: the paused session's leftover
@@ -366,6 +403,67 @@ def _preflight(agent: str, provider: Optional[str], repo_root: str) -> None:
         _fail("brindle can't start yet. `brindle doctor` checks everything else.")
 
 
+def _is_ci_env() -> bool:
+    for key in ("CI", "GITHUB_ACTIONS", "GITLAB_CI", "BUILDKITE", "CIRCLECI", "TF_BUILD", "JENKINS_URL", "BRINDLE_CI"):
+        val = (os.environ.get(key) or "").strip().lower()
+        if val and val not in ("0", "false", "no", "off"):
+            return True
+    return False
+
+
+def _can_prompt(yes: bool = False, demo: bool = False) -> bool:
+    return bool(sys.stdin.isatty() and yes is not True and demo is not True and not _is_ci_env())
+
+
+def _resolve_supervisor(repo_root: str | None, provider: Optional[str], *,
+                        yes: bool = False, demo: bool = False) -> Optional[str]:
+    """The CLI the supervisor runs on (None: its profile's). ``-s CLI`` picks
+    it and is remembered; a bare ``-s`` opens the picker. Otherwise the
+    person's last pick, asked again in the picker only on the first launch or
+    when that pick isn't signed in or allowed, and only where brindle may ask.
+    A CLI the org doesn't allow this person is refused, whichever way it came."""
+    from brindle import doctor as doctor_mod, picker
+    from brindle.config import SUPERVISOR_KEY, set_user, supervisor_pick
+    from brindle.pro import team_policy
+
+    acc = team_policy.access(repo_root)
+    pick = supervisor_pick()
+
+    def ask() -> str:
+        chosen = picker.pick_supervisor(acc, pick)
+        if chosen is None:
+            typer.echo("No supervisor picked; nothing was started.")
+            raise typer.Exit(1)
+        return chosen
+
+    if provider == picker.PICK:
+        if not _can_prompt(yes, demo):
+            _fail("`brindle -s` on its own opens the supervisor picker, which needs a terminal; "
+                  "name the CLI instead, e.g. `brindle -s codex`")
+        provider = ask()
+    elif provider:
+        why = acc.refusal(provider)
+        if why:
+            _fail(f"can't run the supervisor on {provider}: {why}")
+        if _can_prompt(yes, demo) and provider not in doctor_mod.signed_in_providers():
+            if not picker.sign_in(provider):
+                raise typer.Exit(1)
+    elif _can_prompt(yes, demo) and not (pick and acc.allows(pick)
+                                         and pick in doctor_mod.signed_in_providers()):
+        provider = ask()
+    elif pick and acc.allows(pick):
+        provider = pick
+    final = provider or _run(load_profile, agents.SUPERVISOR, repo_root).provider
+    why = acc.refusal(final)
+    if why:
+        _fail(f"can't run the supervisor on {final}: {why}. Pick another with `brindle -s`.")
+    if provider:
+        if provider != pick:
+            set_user(SUPERVISOR_KEY, provider)
+        typer.echo(f"Supervisor: {provider} (your pick) · brindle -s to change")
+    return provider
+
+
 def _trust_codex_hook(repo_root: str) -> None:
     """With the permission policy on and Codex installed, trust brindle's Codex
     hook if it isn't yet (or brindle moved), and say so in one line, so Codex
@@ -761,6 +859,7 @@ def default(
         None, "--supervisor", "-s", help="Run the supervisor on this CLI instead of Claude Code (codex, antigravity). Workers keep their own profiles' providers.",
     ),
     show_version: bool = typer.Option(False, "--version", help="Print brindle's version and exit."),
+    yes: Annotated[bool, typer.Option("--yes", "-y", help="Don't open the supervisor picker: use your last pick, else the default.")] = False,
     provider_alias: Annotated[Optional[str], typer.Option("--provider", hidden=True)] = None,
 ) -> None:
     """Bare `brindle`: a fresh supervisor chat here (a scratch session outside git)."""
@@ -782,7 +881,7 @@ def default(
             continue_cmd(session_id=None, attach=True)
         else:
             start(prompt=None, provider=provider, attach=True, watch=True,
-                  autopilot=autopilot, branch=None, worktree=None)
+                  autopilot=autopilot, branch=None, worktree=None, yes=yes)
 
 
 @app.command()
@@ -796,12 +895,13 @@ def supervisor(
     autopilot: Optional[bool] = typer.Option(None, "--autopilot/--no-autopilot", help="The supervisor drives toward a goal until it's verified (default: on, or `autopilot` in .brindle/config.json)."),
     branch: Optional[str] = typer.Option(None, "--branch", "-b", help="Run in the worktree for this branch, creating the branch and worktree if needed."),
     worktree: Optional[str] = typer.Option(None, "--worktree", "-w", help="Run in the worktree at this path (created with --branch if it doesn't exist)."),
+    yes: Annotated[bool, typer.Option("--yes", "-y", help="Don't open the supervisor picker: use your last pick, else the default.")] = False,
     provider_alias: Annotated[Optional[str], typer.Option("--provider", hidden=True)] = None,
 ) -> None:
     """Start an explicit supervisor session to coordinate coding agents."""
     provider = provider or provider_alias
     start(prompt=prompt, provider=provider, attach=attach, watch=watch,
-          autopilot=autopilot, branch=branch, worktree=worktree)
+          autopilot=autopilot, branch=branch, worktree=worktree, yes=yes)
 
 
 def _session_root(db: DB) -> str:

{brindle-0.3.18 → brindle-0.3.19}/src/brindle/config.py

@@ -267,6 +267,9 @@ def load_repo_config(repo_root: str | Path) -> RepoConfig:
                 if norm_tier in WEIGHTS and isinstance(names, list):
                     cfg.routing[norm_tier] = [n for n in names if isinstance(n, str)]
                     cfg.routing_sources[norm_tier] = str(path)
+    from brindle import worker_models
+
+    worker_models.apply(cfg, user, str(repo_root))   # the models picked on the picker's workers screen
     for source in (shared, local):  # per weight, so a repo can override one and keep the rest
         second = source.get("second_review")
         if isinstance(second, dict):
@@ -311,6 +314,16 @@ def user_settings() -> dict:
     return _read_json(user_config_path())
 
 
+SUPERVISOR_KEY = "supervisor"      # ~/.brindle/config.json: the CLI the person last picked for the supervisor
+
+
+def supervisor_pick() -> str | None:
+    """The supervisor CLI this person last picked (in the picker or with
+    ``-s``), or None before the first pick."""
+    pick = user_settings().get(SUPERVISOR_KEY)
+    return pick if isinstance(pick, str) and pick else None
+
+
 def set_user(key: str, value: object) -> Path:
     """Set one key in ``~/.brindle/config.json`` (other keys are kept)."""
     path = user_config_path()

brindle-0.3.19/src/brindle/key_check.py

@@ -0,0 +1,66 @@
+"""Check a pasted API key with its provider before `brindle keys set` stores it.
+Every check is a read-only GET that generates nothing and costs nothing."""
+
+from __future__ import annotations
+
+import json
+import urllib.error
+import urllib.request
+
+# name -> (where to create a key, how the provider is called)
+KEY_PAGES = {
+    "ANTHROPIC_API_KEY": "https://console.anthropic.com/settings/keys",
+    "OPENAI_API_KEY": "https://platform.openai.com/api-keys",
+    "OPENROUTER_API_KEY": "https://openrouter.ai/keys",
+}
+
+
+def key_page(name: str) -> str | None:
+    return KEY_PAGES.get(name)
+
+
+def personal_keys_denied(repo_root: str | None) -> bool:
+    """True when the org's policy sets deny_personal_keys (read as agents.py does)."""
+    from brindle import agents
+
+    m = agents.managed(repo_root or ".")
+    return bool(m is not None and m.deny_personal_keys)
+
+
+def _get(url: str, headers: dict[str, str]) -> tuple[int, dict]:
+    req = urllib.request.Request(url, headers=headers, method="GET")
+    try:
+        with urllib.request.urlopen(req, timeout=15) as resp:  # noqa: S310 - fixed https URLs
+            return resp.status, json.loads(resp.read() or b"{}")
+    except urllib.error.HTTPError as e:
+        return e.code, {}
+
+
+def verify(name: str, value: str) -> str | None:
+    """None when the provider accepts the key, else a message saying why not.
+    Names without a check are accepted unchecked."""
+    if name == "OPENROUTER_API_KEY":
+        url, headers = "https://openrouter.ai/api/v1/key", {"Authorization": f"Bearer {value}"}
+    elif name == "ANTHROPIC_API_KEY":
+        url = "https://api.anthropic.com/v1/models"
+        headers = {"x-api-key": value, "anthropic-version": "2023-06-01"}
+    elif name == "OPENAI_API_KEY":
+        url, headers = "https://api.openai.com/v1/models", {"Authorization": f"Bearer {value}"}
+    else:
+        return None
+    try:
+        status, body = _get(url, headers)
+    except (OSError, ValueError) as e:
+        return f"couldn't reach the provider to check the key: {e}"
+    if status == 401:
+        return "the provider rejected this key (401 unauthorized); check that you copied all of it"
+    if status != 200:
+        return f"the provider answered {status} when checking the key"
+    if name == "OPENROUTER_API_KEY":
+        data = (body.get("data") if isinstance(body, dict) else None) or {}
+        if not isinstance(data, dict):
+            data = {}
+        left = data.get("limit_remaining")
+        if left is not None and left <= 0:
+            return "this OpenRouter key has no credit left"
+    return None

{brindle-0.3.18 → brindle-0.3.19}/src/brindle/keys_cmds.py

@@ -7,10 +7,11 @@ from __future__ import annotations
 import getpass
 import os
 import sys
+import webbrowser
 
 import typer
 
-from brindle import keystore
+from brindle import key_check, keystore
 
 app = typer.Typer(no_args_is_help=True,
                   help="Store model API keys once; every agent pane gets the ones its provider reads.")
@@ -37,10 +38,26 @@ def keys_set(name: str = typer.Argument(..., help="The variable, e.g. ANTHROPIC_
         keystore.check_name(name, _root())
     except keystore.CredentialError as e:
         _fail(str(e))
+    try:
+        denied = key_check.personal_keys_denied(_root())
+    except Exception as e:  # noqa: BLE001 - policy unreadable: fail closed
+        _fail(f"couldn't read your org's key policy: {e}")
+    if denied:
+        _fail("your org's policy denies personal API keys; brindle won't store one")
+    page = key_check.key_page(name)
     if sys.stdin.isatty():
+        if page:
+            typer.echo(f"Get a key at {page}")
+            if input("Press o to open it in your browser, or Enter to paste a key: ").strip().lower() == "o":
+                webbrowser.open(page)
         value = getpass.getpass(f"{name}: ")
     else:
         value = sys.stdin.readline()
+    value = value.strip()
+    if value:
+        problem = key_check.verify(name, value)
+        if problem:
+            _fail(f"{name} not stored: {problem}")
     try:
         keystore.set_key(name, value, _root())
     except keystore.CredentialError as e: