monkeybot-cli 0.9.0__tar.gz → 0.11.0__tar.gz

{monkeybot_cli-0.9.0 → monkeybot_cli-0.11.0}/.gitignore

@@ -68,4 +68,8 @@ code/
 .evals-venv/
 
 # monkeythink
-.monkeythink/
+.monkeythink/
+# Eval fixtures ship their own build/ decoy
+!/evals/fixtures/coding/calc_repo/build/
+!/evals/fixtures/coding/calc_repo_green/build/
+!/evals/fixtures/coding/shop_repo/build/

{monkeybot_cli-0.9.0 → monkeybot_cli-0.11.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.5
 Name: monkeybot-cli
-Version: 0.9.0
+Version: 0.11.0
 Summary: CLI to create, configure, validate, and chat with monkeybot agents.
 Requires-Python: >=3.11
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: monkeybot-browser-mcp<1,>=0.5.0
-Requires-Dist: monkeybot[cli]<4,>=3.8.0
+Requires-Dist: monkeybot[cli]<4,>=3.10.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: textual>=8.2.8

{monkeybot_cli-0.9.0 → monkeybot_cli-0.11.0}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "hatchling.build"
 
 [project]
 name = "monkeybot-cli"
-version = "0.9.0"
+version = "0.11.0"
 description = "CLI to create, configure, validate, and chat with monkeybot agents."
 requires-python = ">=3.11"
 dependencies = [
     # `cli` pulls realtime + typer so `monkeybot talk` works out of the box (text mode).
     # Audio mic/PTT needs the agent (or this env) to also install monkeybot[cli-realtime].
-    "monkeybot[cli]>=3.8.0,<4",
+    "monkeybot[cli]>=3.10.0,<4",
     "monkeybot-browser-mcp>=0.5.0,<1",
     "httpx>=0.27.0",
     "pyyaml>=6.0.2",

{monkeybot_cli-0.9.0 → monkeybot_cli-0.11.0}/skills/monkeybot/references/config-sections.md

@@ -2,7 +2,7 @@
 
 Deep reference for every `monkeybot.yaml` section. Load this only when a user needs to customize beyond Tier 1. The canonical, fully-commented template lives at `cli/src/monkeybot_cli/scaffold_defaults/monkeybot.example.yaml` in the monkeybot repo (copied to `monkeybot_config/monkeybot.example.yaml` when you scaffold); this file adds the **"when would I change this?"** context the comments don't.
 
-**Precedence:** env vars and `.env` win over YAML for `ENV_MAP` keys. `model.*` (provider, name, temperature, max_tokens, thinking_budget, context_window, summarization_model, max_turns, cache_retention) is YAML-only — leftover `MODEL_*` env vars are ignored. The YAML→env mapping is `ENV_MAP` in `src/monkeybot/core/config/runtime_env.py`. If a YAML edit has no effect, check for a shadowing env var (except `model.*`).
+**Precedence:** env vars and `.env` win over YAML for `ENV_MAP` keys. `model.*` (provider, name, temperature, max_tokens, thinking_budget, reasoning_effort, context_window, summarization_model, max_turns, cache_retention) is YAML-only — leftover `MODEL_*` env vars are ignored. The YAML→env mapping is `ENV_MAP` in `src/monkeybot/core/config/runtime_env.py`. If a YAML edit has no effect, check for a shadowing env var (except `model.*`).
 
 ---
 
@@ -42,7 +42,8 @@ YAML-only for provider, name, sampling, context window, summarization model, max
 | `name` | `gemini-3-flash` | Pick a specific model id |
 | `temperature` | `0.7` | Lower for deterministic output, higher for creative |
 | `max_tokens` | `60000` | Cap per-response length |
-| `thinking_budget` | `-1` | Gemini: `-1` model default, `0` off, `N` token budget. Ollama reasoning models: `-1` server default, `0` off (`reasoning_effort: none`) |
+| `thinking_budget` | `-1` | Gemini: `-1` model default, `0` off, `N` token budget. Ollama reasoning models: `-1` server default, `0` off (`reasoning_effort: none`). Ignored when `reasoning_effort` is set on providers that take an effort level |
+| `reasoning_effort` | (unset) | Effort level passed through to the provider (`low`, `medium`, `high`, `xhigh`, `max`, or whatever that provider accepts). Omit for the provider default. YAML-only. Gemini only sends SDK levels (`minimal`, `low`, `medium`, `high`) and otherwise uses `thinking_budget`. A level the API rejects is omitted on later turns. Bedrock sends it for Claude ids only; Converse models ignore it. Curator and summarizer calls skip the configured effort; when one is set, OpenAI and Ollama send `none` instead |
 | `context_window` | `1000000` | Summarization trigger (tokens); also drives soft-spill / `read_file` char budgets. **Not** Ollama `num_ctx` |
 | `keep_alive` | `24h` (ollama-local only) | How long local Ollama keeps the model (and KV prefix cache) loaded. YAML only. Set `"0"` to omit. See `docs/ollama-local.md` |
 | `num_ctx` | (unset) | Optional pinned Ollama `num_ctx`. YAML only. Omit = server default. Do not copy `context_window` |

{monkeybot_cli-0.9.0 → monkeybot_cli-0.11.0}/src/monkeybot_cli/chat_session.py

@@ -101,9 +101,7 @@ def extract_elicitation_fields(payload: dict[str, Any]) -> tuple[str | None, dic
     else:
         message = message.strip()
     schema_raw = (
-        payload.get("requestedSchema")
-        or payload.get("requested_schema")
-        or payload.get("schema")
+        payload.get("requestedSchema") or payload.get("requested_schema") or payload.get("schema")
     )
     schema = dict(schema_raw) if isinstance(schema_raw, dict) else None
     return message, schema
@@ -662,9 +660,7 @@ class ChatSessionController:
 
         self._maybe_thinking_trace(evt, request_id)
 
-    def _on_context_usage_hint(
-        self, *, estimated_tokens: int, context_window_tokens: int
-    ) -> None:
+    def _on_context_usage_hint(self, *, estimated_tokens: int, context_window_tokens: int) -> None:
         self.usage.update_context_hint(
             estimated_prompt_tokens=estimated_tokens,
             context_window_tokens=context_window_tokens,
@@ -750,9 +746,7 @@ class ChatSessionController:
         if answer.cancelled:
             approved = False
         reason = (
-            "cancelled by user"
-            if answer.cancelled
-            else (None if approved else "denied by user")
+            "cancelled by user" if answer.cancelled else (None if approved else "denied by user")
         )
         ok = await self._post_hitl(
             f"{self.base}/sessions/{self.session_id}/tool-confirmations/{evt.tool_call_id}",

{monkeybot_cli-0.9.0 → monkeybot_cli-0.11.0}/src/monkeybot_cli/chat_tool_display.py

@@ -37,9 +37,7 @@ _SHELL_TAIL_LINES = 40
 
 _SHELL_TOOLS = frozenset({"run_command", "execute", "shell", "bash"})
 _READ_TOOLS = frozenset({"read_file", "read"})
-_EDIT_TOOLS = frozenset(
-    {"write_file", "write", "edit_file", "apply_patch", "str_replace"}
-)
+_EDIT_TOOLS = frozenset({"write_file", "write", "edit_file", "apply_patch", "str_replace"})
 _PATH_TOOLS = _READ_TOOLS | _EDIT_TOOLS
 _SEARCH_TOOLS = frozenset({"grep", "web_search"})
 _HINT_KEYS = frozenset(

{monkeybot_cli-0.9.0 → monkeybot_cli-0.11.0}/src/monkeybot_cli/chat_tui.py

@@ -93,6 +93,7 @@ def cycle_approval_mode(mode: str) -> str:
         idx = 0
     return _APPROVAL_MODES[(idx + 1) % len(_APPROVAL_MODES)]
 
+
 _SLASH_SPECS: tuple[tuple[str, str], ...] = (
     ("/help", "Show commands and key hints"),
     ("/new", "Start a fresh session"),
@@ -327,11 +328,7 @@ class ChatApp(App[int]):
         self.theme = resolve_theme_name(theme_choice)
         self.base = base
         self.agent_root = agent_root
-        self.config_path = (
-            config_path.expanduser().resolve()
-            if config_path is not None
-            else None
-        )
+        self.config_path = config_path.expanduser().resolve() if config_path is not None else None
         self.provider = provider
         self.model = model
         self.spawned_gateway = spawned_gateway
@@ -443,9 +440,7 @@ class ChatApp(App[int]):
             else:
                 parts.append("y approve · n deny · Ctrl-C cancel")
         elif self.show_hints:
-            parts.append(
-                "Enter send · Ctrl+J newline · ↑ history · / commands · Ctrl+U usage"
-            )
+            parts.append("Enter send · Ctrl+J newline · ↑ history · / commands · Ctrl+U usage")
         else:
             parts.append("F1 hints")
         return "  ·  ".join(parts)
@@ -495,8 +490,7 @@ class ChatApp(App[int]):
             self._session_cost_text = f"${usage.cost_usd:.4f}"
         if self.show_usage:
             self._usage_text = (
-                f"in={usage.input_tokens} out={usage.output_tokens} "
-                f"${usage.cost_usd:.4f}"
+                f"in={usage.input_tokens} out={usage.output_tokens} ${usage.cost_usd:.4f}"
             )
 
     def _hide_empty_hint(self) -> None:
@@ -556,6 +550,7 @@ class ChatApp(App[int]):
             if transcript.is_anchored and not transcript._anchor_released:
                 transcript.release_anchor()
         self._refresh_jump_button()
+
     def _refresh_jump_button(self) -> None:
         with contextlib.suppress(NoMatches):
             btn = self.query_one("#jump-bottom", Button)
@@ -627,7 +622,12 @@ class ChatApp(App[int]):
                 if isinstance(child, EarlierTurns):
                     earlier = child
                     continue
-                if child is self._assistant or child is self._thinking or child is self._thinking_trace or child is self._hitl_card:
+                if (
+                    child is self._assistant
+                    or child is self._thinking
+                    or child is self._thinking_trace
+                    or child is self._hitl_card
+                ):
                     continue
                 if isinstance(child, ToolCallBlock) and (
                     child in self._open_tools.values() or child in self._anon_tools
@@ -683,6 +683,7 @@ class ChatApp(App[int]):
     def _seal_thinking_trace(self) -> None:
         """Finish the current thinking block and start fresh on the next delta."""
         self._finish_thinking_trace(clear=True)
+
     def _mount_user(self, body: str) -> None:
         self._mount(UserTurn(body, show_timestamp=self.show_timestamps))
 
@@ -768,9 +769,7 @@ class ChatApp(App[int]):
             palette.display = False
             palette.clear_options()
             return
-        palette.set_options(
-            [Option(f"{cmd}  {desc}", id=cmd) for cmd, desc in matches]
-        )
+        palette.set_options([Option(f"{cmd}  {desc}", id=cmd) for cmd, desc in matches])
         palette.highlighted = 0
         palette.display = True
 
@@ -945,9 +944,7 @@ class ChatApp(App[int]):
         if state == "reconnecting":
             attempt = p.get("attempt")
             self._conn_text = (
-                f"[yellow]reconnecting…[/] ({attempt})"
-                if attempt
-                else "[yellow]reconnecting…[/]"
+                f"[yellow]reconnecting…[/] ({attempt})" if attempt else "[yellow]reconnecting…[/]"
             )
         elif state == "connected":
             self._conn_text = ""
@@ -1508,7 +1505,9 @@ class ChatApp(App[int]):
         self.model = name
         self._refresh_topbar()
         await self._reset_transcript_ui()
-        self._mount_system(f"Model set to {provider}/{name} — new session started (context cleared)")
+        self._mount_system(
+            f"Model set to {provider}/{name} — new session started (context cleared)"
+        )
         self._refresh_status()
         self.query_one("#prompt", Composer).focus()
 
@@ -1566,6 +1565,7 @@ class ChatApp(App[int]):
         except Exception as exc:  # noqa: BLE001 - surface any YAML/parse error to the user
             self._mount_system(f"Could not read config: {exc}", error=True)
             return
+
         def _section(key: str) -> dict[str, object]:
             value = doc.get(key)
             return value if isinstance(value, dict) else {}
@@ -1755,7 +1755,6 @@ class ChatApp(App[int]):
     def action_toggle_usage(self) -> None:
         self._cmd_usage()
 
-
     def action_toggle_ptt(self) -> None:
         """Space toggles in-TUI PTT when composer is empty (realtime / SSH)."""
         with contextlib.suppress(NoMatches):
@@ -1786,10 +1785,7 @@ class ChatApp(App[int]):
             self._controller.abort_turn()
             return
         now = time.monotonic()
-        if (
-            self._last_esc is not None
-            and now - self._last_esc <= _ESC_RECALL_WINDOW
-        ):
+        if self._last_esc is not None and now - self._last_esc <= _ESC_RECALL_WINDOW:
             self._last_esc = None
             composer.recall_last()
             return
@@ -1815,11 +1811,7 @@ class ChatApp(App[int]):
         self._goodbye_and_exit()
 
     def _goodbye_and_exit(self) -> None:
-        msg = (
-            "Goodbye — shutting down gateway…"
-            if self.spawned_gateway
-            else "Goodbye."
-        )
+        msg = "Goodbye — shutting down gateway…" if self.spawned_gateway else "Goodbye."
         self._mount_system(msg)
         if self._session_id:
             self._mount_system("To continue this conversation, run: monkeybot chat --continue")

{monkeybot_cli-0.9.0 → monkeybot_cli-0.11.0}/src/monkeybot_cli/commands/chat.py

@@ -64,6 +64,7 @@ _UNDERLINE = "\x1b[4m"
 _SPINNER_FRAMES = "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏"
 _GROUNDING_SOURCES_MAX = 5
 
+
 def _hyperlink(url: str, label: str) -> str:
     """OSC 8 terminal hyperlink; falls back to a plain URL on non-TTY streams."""
     if not url:
@@ -278,9 +279,7 @@ def _resolve_base_url(args: argparse.Namespace, config_path: Path | None) -> str
     return f"http://127.0.0.1:{port}"
 
 
-def _model_banner_fields(
-    args: argparse.Namespace, config_path: Path | None
-) -> tuple[str, str]:
+def _model_banner_fields(args: argparse.Namespace, config_path: Path | None) -> tuple[str, str]:
     provider = (args.model_provider or "").strip()
     model = (args.model_name or "").strip()
     if config_path is not None and (not provider or not model):

{monkeybot_cli-0.9.0 → monkeybot_cli-0.11.0}/src/monkeybot_cli/commands/doctor.py

@@ -10,9 +10,12 @@ import tomllib
 from pathlib import Path
 
 import httpx
+from monkeybot.core.config.settings import normalize_model_provider
 from monkeybot.core.layout import AgentLayout, bootstrap_agent_layout
 from monkeybot.core.memory.config import memory_enabled_from_config
 from monkeybot.core.tools.sandbox_executor import SandboxConfig
+from monkeybot.providers._bedrock_converse import uses_anthropic_bedrock
+from monkeybot.providers.sampling import normalize_reasoning_effort
 
 from monkeybot_cli.compat import COMPATIBLE_CORE_RANGE
 from monkeybot_cli.config_resolve import (
@@ -228,6 +231,58 @@ def _strict_positive_int(raw: object) -> tuple[int | None, bool]:
     return raw, False
 
 
+def _add_reasoning_effort_check(
+    report: CommandReport,
+    *,
+    reasoning_effort: object,
+    provider: str = "",
+    model_name: str = "",
+) -> None:
+    """Note a YAML effort value.
+
+    Severity stays ``warning``: the doctor schema has no ``info`` level, and a
+    passing check does not increment the warning summary. A non-Claude Bedrock
+    model fails this check because the Converse path does not send the field.
+    """
+    text = normalize_reasoning_effort(reasoning_effort) or ""
+    converse = (
+        normalize_model_provider(provider) in {"aws_bedrock", "bedrock"}
+        and bool(model_name)
+        and not uses_anthropic_bedrock(model_name)
+    )
+    if text == "none":
+        message = "reasoning_effort turns thinking off where the provider supports it."
+        passed = True
+    elif text and converse:
+        message = (
+            f"reasoning_effort {text!r} is not sent for this Bedrock model. "
+            "Only Claude ids receive it; Converse models ignore it."
+        )
+        passed = False
+    elif text:
+        message = (
+            f"reasoning_effort {text!r} is sent to the provider. "
+            "It wins over thinking_budget where the provider accepts an effort level. "
+            "Gemini only sends levels its SDK knows; other values use thinking_budget. "
+            "A level the API rejects is omitted on later turns."
+        )
+        passed = True
+    else:
+        message = "reasoning_effort unset"
+        passed = True
+    check(
+        report,
+        id="model.reasoning_effort",
+        category="provider",
+        severity="warning",
+        passed=passed,
+        skip=not text,
+        message=message,
+        field="model.reasoning_effort",
+        value=text or None,
+    )
+
+
 def _add_ollama_local_checks(
     report: CommandReport,
     *,
@@ -464,11 +519,19 @@ def run_doctor(args: argparse.Namespace) -> int:
             skip=True,
         )
 
+    effort_raw = model.get("reasoning_effort") if isinstance(model, dict) else None
+    model_name = str(model.get("name", "")).strip() if isinstance(model, dict) else ""
+    _add_reasoning_effort_check(
+        report,
+        reasoning_effort=effort_raw,
+        provider=provider,
+        model_name=model_name,
+    )
+
     thinking_raw = model.get("thinking_budget") if isinstance(model, dict) else None
     if thinking_raw is None:
         thinking_raw = "-1"
     num_ctx_raw = model.get("num_ctx") if isinstance(model, dict) else None
-    model_name = str(model.get("name", "")).strip() if isinstance(model, dict) else ""
     _add_ollama_local_checks(
         report,
         provider=provider,

{monkeybot_cli-0.9.0 → monkeybot_cli-0.11.0}/src/monkeybot_cli/commands/loop.py

@@ -9,7 +9,12 @@ from pathlib import Path
 
 import httpx
 
-from monkeybot_cli.config_resolve import load_agent_dotenv, load_config_doc, resolve_agent_root, resolve_config
+from monkeybot_cli.config_resolve import (
+    load_agent_dotenv,
+    load_config_doc,
+    resolve_agent_root,
+    resolve_config,
+)
 
 DEFAULT_GATEWAY_PORT = 8000
 

monkeybot_cli-0.11.0/src/monkeybot_cli/commands/mcp_login.py

@@ -0,0 +1,81 @@
+"""monkeybot mcp-login — browser sign-in for one remote MCP server."""
+
+from __future__ import annotations
+
+import argparse
+import asyncio
+import json
+import logging
+import os
+import sys
+from pathlib import Path
+
+from mcp.client.auth.exceptions import OAuthFlowError
+from monkeybot.core.mcp.mcp_client import MCPAuthError
+from monkeybot.core.mcp.oauth_flow import login_mcp_server
+
+logger = logging.getLogger(__name__)
+
+CLIENT_SECRET_ENV = "MONKEYBOT_MCP_CLIENT_SECRET"
+
+
+def run_mcp_login(args: argparse.Namespace) -> int:
+    """Sign in, print JSON progress on stdout, and return 0 when the attempt finishes."""
+    client_secret = args.client_secret or os.environ.get(CLIENT_SECRET_ENV, "")
+    try:
+        result = asyncio.run(
+            login_mcp_server(
+                args.url,
+                Path(args.storage).expanduser(),
+                open_browser=not args.no_browser,
+                client_id=args.client_id,
+                client_secret=client_secret,
+                redirect_port=args.redirect_port,
+            )
+        )
+    except (MCPAuthError, OAuthFlowError) as exc:
+        print(str(exc), file=sys.stderr)
+        return 1
+    except Exception:
+        logger.exception("mcp oauth sign-in failed")
+        print("Sign-in failed.", file=sys.stderr)
+        return 1
+    print(json.dumps(result), flush=True)
+    return 0
+
+
+def register(sub: argparse._SubParsersAction[argparse.ArgumentParser]) -> None:
+    """Register the ``mcp-login`` subcommand."""
+    command = sub.add_parser(
+        "mcp-login",
+        help="Sign in to a remote MCP server in the browser",
+    )
+    command.add_argument("--url", required=True, help="Streamable HTTP URL of the MCP server")
+    command.add_argument(
+        "--storage", required=True, help="Directory for this machine's OAuth tokens"
+    )
+    command.add_argument(
+        "--no-browser",
+        action="store_true",
+        help="Print the authorization URL instead of opening a browser",
+    )
+    command.add_argument(
+        "--client-id",
+        default="",
+        help="OAuth client id, for a server that will not register one automatically",
+    )
+    command.add_argument(
+        "--client-secret",
+        default="",
+        help=(
+            f"OAuth client secret, when that client requires one. Prefer {CLIENT_SECRET_ENV}: "
+            "command-line arguments are visible to other processes."
+        ),
+    )
+    command.add_argument(
+        "--redirect-port",
+        type=int,
+        default=None,
+        help="Loopback port for the sign-in redirect, for a client registered with an exact URI",
+    )
+    command.set_defaults(func=run_mcp_login)

{monkeybot_cli-0.9.0 → monkeybot_cli-0.11.0}/src/monkeybot_cli/commands/new.py

@@ -13,7 +13,7 @@ from monkeybot_cli.extras_catalog import (
     additional_provider_extra_choices,
     normalize_extra_token,
 )
-from monkeybot_cli.scaffold import run_new
+from monkeybot_cli.scaffold import DEFAULT_TEMPLATE, TEMPLATES, run_new
 
 _DEFAULT_PROVIDER = "gemini"
 _DEFAULT_MODEL = "gemini-3-flash"
@@ -26,7 +26,19 @@ def _prompt_line(prompt: str) -> str:
         return ""
 
 
-def _prompt_single(choices: tuple[ExtraChoice, ...], *, title: str, default_key: str) -> str:
+TEMPLATE_CHOICES: tuple[ExtraChoice, ...] = (
+    ExtraChoice("default", "General-purpose agent"),
+    ExtraChoice("coding", "Coding agent for a repository (verification gate, dev toolchain)"),
+)
+
+
+def _prompt_single(
+    choices: tuple[ExtraChoice, ...],
+    *,
+    title: str,
+    default_key: str,
+    noun: str = "provider",
+) -> str:
     """Numbered single-select; Enter keeps default_key."""
     print(title)
     default_idx = 1
@@ -35,7 +47,7 @@ def _prompt_single(choices: tuple[ExtraChoice, ...], *, title: str, default_key:
         if choice.key == default_key:
             default_idx = i
         print(f"  {i}) {choice.key} — {choice.label}{marker}")
-    raw = _prompt_line(f"Choose provider [{default_idx}]: ").strip()
+    raw = _prompt_line(f"Choose {noun} [{default_idx}]: ").strip()
     if not raw:
         return default_key
     if raw.isdigit():
@@ -48,7 +60,7 @@ def _prompt_single(choices: tuple[ExtraChoice, ...], *, title: str, default_key:
     for choice in choices:
         if raw.lower() == choice.key.lower():
             return choice.key
-    print(f"  unknown provider {raw!r}; using {default_key}", file=sys.stderr)
+    print(f"  unknown {noun} {raw!r}; using {default_key}", file=sys.stderr)
     return default_key
 
 
@@ -128,6 +140,13 @@ def run_new_command(args: argparse.Namespace) -> int:
 
     provider = args.provider
     model = args.model
+    template = getattr(args, "template", None)
+    if template is not None and template not in TEMPLATES:
+        print(
+            f"error: unknown --template {template!r}; choose from {', '.join(TEMPLATES)}",
+            file=sys.stderr,
+        )
+        return 2
     extras, unknown = _resolve_extras_from_args(getattr(args, "with_extras", None))
     if unknown:
         print(
@@ -137,6 +156,13 @@ def run_new_command(args: argparse.Namespace) -> int:
         return 2
 
     if not args.yes:
+        if template is None:
+            template = _prompt_single(
+                TEMPLATE_CHOICES,
+                title="Template:",
+                default_key=DEFAULT_TEMPLATE,
+                noun="template",
+            )
         if provider is None:
             provider = _prompt_single(
                 PROVIDER_CHOICES,
@@ -144,9 +170,7 @@ def run_new_command(args: argparse.Namespace) -> int:
                 default_key=_DEFAULT_PROVIDER,
             )
         if model is None:
-            model = (
-                _prompt_line(f"Model name [{_DEFAULT_MODEL}]: ").strip() or _DEFAULT_MODEL
-            )
+            model = _prompt_line(f"Model name [{_DEFAULT_MODEL}]: ").strip() or _DEFAULT_MODEL
         # Only prompt for optional deps when --with was not already given.
         if not extras:
             more_providers = additional_provider_extra_choices(provider)
@@ -169,6 +193,7 @@ def run_new_command(args: argparse.Namespace) -> int:
         provider=provider,
         model=model,
         extras=extras or None,
+        template=template or DEFAULT_TEMPLATE,
     )
     print(f"monkeybot scaffold under {dest}:")
     print("\n".join(report))
@@ -179,6 +204,12 @@ def run_new_command(args: argparse.Namespace) -> int:
     print("  cp .env.example .env   # then add provider keys")
     print("  monkeybot doctor")
     print("  monkeybot chat")
+    if template == "coding":
+        print()
+        print("Coding template: clone the repository into ./workspace.")
+        print("Path prefixes in command_allowlist.yaml are relative to paths.workspace_root,")
+        print("so ../memory is the agent memory only while that stays ./workspace.")
+        print("If you set paths.workspace_root to another directory, update those prefixes.")
     return 0
 
 
@@ -202,6 +233,13 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
             "observability, openai, bedrock, claude"
         ),
     )
+    p.add_argument(
+        "--template",
+        choices=TEMPLATES,
+        default=None,
+        help="Scaffold flavour: default (general agent) or coding (repo workflow). "
+        "Prompted interactively when omitted.",
+    )
     p.add_argument("--force", action="store_true", help="Overwrite existing scaffold files")
     p.add_argument("--yes", "-y", action="store_true", help="Skip interactive prompts")
     p.set_defaults(func=run_new_command)

{monkeybot_cli-0.9.0 → monkeybot_cli-0.11.0}/src/monkeybot_cli/commands/validate.py

@@ -120,10 +120,19 @@ def run_validate(args: argparse.Namespace) -> int:
             category="config",
             severity="warning",
             passed=not missing,
-            message=f"Missing includes: {', '.join(missing)}" if missing else "All includes resolved",
+            message=f"Missing includes: {', '.join(missing)}"
+            if missing
+            else "All includes resolved",
         )
     else:
-        check(report, id="config.includes.resolve", category="config", severity="warning", passed=True, skip=True)
+        check(
+            report,
+            id="config.includes.resolve",
+            category="config",
+            severity="warning",
+            passed=True,
+            skip=True,
+        )
 
     model = merged.get("model") if isinstance(merged.get("model"), dict) else {}
     provider = str(model.get("provider", "")).strip().lower() if isinstance(model, dict) else ""
@@ -134,7 +143,9 @@ def run_validate(args: argparse.Namespace) -> int:
         category="config",
         severity="error",
         passed=not provider or provider in SUPPORTED_YAML_MODEL_PROVIDERS,
-        message=f"model.provider '{provider}' is not supported" if provider and provider not in SUPPORTED_YAML_MODEL_PROVIDERS else "",
+        message=f"model.provider '{provider}' is not supported"
+        if provider and provider not in SUPPORTED_YAML_MODEL_PROVIDERS
+        else "",
         field="model.provider",
         value=provider,
         expected=sorted(SUPPORTED_YAML_MODEL_PROVIDERS),
@@ -172,12 +183,23 @@ def run_validate(args: argparse.Namespace) -> int:
     )
 
     flat = _flatten_to_env(merged)
-    flat.update({k: v for k, v in os.environ.items() if k.startswith(("GCP_", "GOOGLE_", "ANTHROPIC_VERTEX"))})
+    flat.update(
+        {
+            k: v
+            for k, v in os.environ.items()
+            if k.startswith(("GCP_", "GOOGLE_", "ANTHROPIC_VERTEX"))
+        }
+    )
     norm_provider = normalize_model_provider(provider or "gemini")
     needs_gcp = norm_provider == "vertex_anthropic"
     gcp_present = any(
         os.environ.get(k, "").strip() or flat.get(k, "").strip()
-        for k in ("GCP_PROJECT_ID", "VERTEX_AI_PROJECT_ID", "ANTHROPIC_VERTEX_PROJECT_ID", "GOOGLE_CLOUD_PROJECT")
+        for k in (
+            "GCP_PROJECT_ID",
+            "VERTEX_AI_PROJECT_ID",
+            "ANTHROPIC_VERTEX_PROJECT_ID",
+            "GOOGLE_CLOUD_PROJECT",
+        )
     )
     if needs_gcp:
         check(
@@ -190,11 +212,20 @@ def run_validate(args: argparse.Namespace) -> int:
             remediation="Set gcp.project_id in monkeybot.yaml or GCP_PROJECT_ID in .env",
         )
     else:
-        check(report, id="gcp.project.required", category="config", severity="error", passed=True, skip=True)
+        check(
+            report,
+            id="gcp.project.required",
+            category="config",
+            severity="error",
+            passed=True,
+            skip=True,
+        )
 
     try:
         validate_monkeybot_yaml_doc(merged, env=dict(os.environ))
-        validate_provider_env({**flat, "MODEL_PROVIDER": provider or flat.get("MODEL_PROVIDER", "gemini")})
+        validate_provider_env(
+            {**flat, "MODEL_PROVIDER": provider or flat.get("MODEL_PROVIDER", "gemini")}
+        )
     except ConfigError as exc:
         check(
             report,
@@ -329,7 +360,9 @@ def run_validate(args: argparse.Namespace) -> int:
                         category="mcp",
                         severity="warning",
                         passed=not missing_refs,
-                        message=f"Unresolved MCP env refs: {', '.join(missing_refs)}" if missing_refs else "All MCP env refs set",
+                        message=f"Unresolved MCP env refs: {', '.join(missing_refs)}"
+                        if missing_refs
+                        else "All MCP env refs set",
                     )
                     if args.check_mcp:
                         for name, srv in servers.items():