monkeybot-cli 0.10.0__tar.gz → 0.11.1__tar.gz

monkeybot_cli-0.11.1/.gitignore

@@ -0,0 +1,90 @@
+# Internal (not shipped in OSS)
+internal/
+
+# Environment
+.env
+.env.*
+!.env.example
+# The grants fixture's .env is fixture data, not a local secret.
+!regression/fixtures/workspaces/grants_ws/granted/.env
+
+# Local scaffolded harness config (defaults ship in monkeybot-cli scaffold_defaults/)
+/monkeybot_config/
+
+# Live eval run artifacts. Baselines under regression/t4/baselines/ stay versioned.
+/regression/t4/runs/
+# Live-eval agent project local state. Live secrets come from the repo-root .env; a stray key
+# file in the agent project stays out of git. The two workspace .gitkeep files need git add -f.
+/regression/t4/agent/.env
+/regression/t4/agent/data/
+/regression/t4/agent/workspace/
+
+# Python
+__pycache__/
+*.py[cod]
+*.pyo
+*.pyd
+.Python
+*.egg-info/
+dist/
+build/
+.eggs/
+*.egg
+
+# uv
+.venv/
+.uv/
+
+# Data (SQLite DB + memory files — never commit)
+data/
+# Shared attachment fixtures live here (§5.4); they are not a local data dir.
+!testkit/data/
+!testkit/data/**
+/memory/
+.monkeybot/
+# Store layout for the attachment loop fixture. The directory name is ignored above.
+!regression/fixtures/workspaces/att_ws/.monkeybot/
+!regression/fixtures/workspaces/att_ws/.monkeybot/**
+*.sqlite3
+workspace/.monkeybot/
+*.sqlite
+*.sqlite.writer-pid
+
+# Testing & coverage
+/test-runs/
+/.cursor/hooks/.state/
+.pytest_cache/
+.coverage
+htmlcov/
+.mypy_cache/
+.ruff_cache/
+.deepeval/
+
+# macOS
+.DS_Store
+
+# IDEs
+.idea/
+.vscode/
+*.swp
+*.swo
+
+# Docker
+docker/data/
+
+# Planning Documents
+.prt/
+.monkeymode/
+
+# Reference clones (read-only)
+code/
+
+# Local venv for evals dependency experiments
+.evals-venv/
+
+# monkeythink
+.monkeythink/
+# Eval fixtures ship their own build/ decoy
+!/regression/fixtures/workspaces/calc_repo/build/
+!/regression/fixtures/workspaces/calc_repo_green/build/
+!/regression/fixtures/workspaces/shop_repo/build/

{monkeybot_cli-0.10.0 → monkeybot_cli-0.11.1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.5
 Name: monkeybot-cli
-Version: 0.10.0
+Version: 0.11.1
 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.9.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.10.0 → monkeybot_cli-0.11.1}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "hatchling.build"
 
 [project]
 name = "monkeybot-cli"
-version = "0.10.0"
+version = "0.11.1"
 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.9.0,<4",
+    "monkeybot[cli]>=3.10.0,<4",
     "monkeybot-browser-mcp>=0.5.0,<1",
     "httpx>=0.27.0",
     "pyyaml>=6.0.2",
@@ -21,6 +21,12 @@ dependencies = [
 [project.scripts]
 monkeybot = "monkeybot_cli.main:main"
 
+[tool.uv]
+# browser-harness 0.1.13 pins pillow==12.3.0, which is still inside the Pillow 13 advisory range.
+# uv lock and uv sync honor this. uv tool install and uv pip install do not;
+# those commands pass src/monkeybot_cli/overrides.txt via --overrides.
+override-dependencies = ["pillow>=13"]
+
 [tool.uv.sources]
 monkeybot = { path = "..", editable = true }
 monkeybot-browser-mcp = { path = "../integrations/browser-mcp", editable = true }

{monkeybot_cli-0.10.0 → monkeybot_cli-0.11.1}/skills/monkeybot/SKILL.md

@@ -176,7 +176,7 @@ Only if the user is changing monkeybot itself (not creating an agent):
 git clone https://github.com/human-plus-machine/monkeybot.git
 cd monkeybot && uv sync
 cd cli && uv sync
-uv tool install --editable .
+uv tool install --editable . --overrides src/monkeybot_cli/overrides.txt
 ```
 
 ## Rules

{monkeybot_cli-0.10.0 → monkeybot_cli-0.11.1}/skills/monkeybot/references/config-sections.md

@@ -84,7 +84,9 @@ MemPalace capture, wake-up, and search teaching are on by default. Turn them off
 |---|---|---|
 | `enabled` | `true` | Set `false` to skip capture, wake-up, and prompt teaching |
 | `backend` | `chroma` | Alternate MemPalace vector backend |
-| `embedding_model` | `embeddinggemma-300m` | Match the embedder the palace was built with |
+| `embedding_model` | `minilm` | MemPalace's default embedder. `embeddinggemma-300m` is a legacy alias; startup rewrites it to `minilm` |
+
+Chats in one project share saved lines by default, including the wake-up briefing. Set `MONKEYBOT_MEMORY_SHARE_THREADS=0` to keep each chat's lines in that chat. Unset, `1`, `true`, `yes`, and `on` share.
 
 ## `subagents`
 

{monkeybot_cli-0.10.0 → monkeybot_cli-0.11.1}/src/monkeybot_cli/chat_tui_widgets.py

@@ -28,6 +28,10 @@ from monkeybot_cli.chat_tool_display import format_tool_expand_body
 _SPIN = "⠋⠙⠹⠸⠴⠦⠧⠇⠏"
 _HISTORY_LIMIT = 500
 _COMPOSER_PLACEHOLDER = "Message the agent — / commands · @ files · ! shell"
+# Enter's raw bytes. modifyOtherKeys and a few terminals report Shift/Alt+Enter
+# as these characters instead of the name "enter".
+_ENTER_KEY_NAMES = frozenset({"enter", "\r", "\n"})
+_NEWLINE_MODIFIERS = frozenset({"shift", "alt"})
 
 
 def _plain_title(text: str) -> Content:
@@ -747,6 +751,50 @@ class ShortcutsScreen(ModalScreen[None]):
         self.dismiss(None)
 
 
+def is_newline_key(key: str) -> bool:
+    """True when this key should insert a newline instead of sending.
+
+    Kitty-protocol terminals report ``shift+enter``. modifyOtherKeys and some
+    macOS terminals report the same chord as ``shift+`` plus a raw CR or LF.
+    ``ctrl+j`` is the chord every terminal can deliver.
+    """
+    if key in {"shift+enter", "alt+enter", "ctrl+j", "newline"}:
+        return True
+    parts = key.split("+")
+    if len(parts) < 2 or parts[-1] not in _ENTER_KEY_NAMES:
+        return False
+    return bool(_NEWLINE_MODIFIERS.intersection(parts[:-1]))
+
+
+def install_terminal_newline_keys() -> None:
+    """Teach Textual's parser the Enter chords it currently mislabels.
+
+    Alt+Enter arrives as ESC then CR, and Textual drops the Alt because Enter
+    is not a single-character key. modifyOtherKeys Shift+Enter arrives as
+    ``shift+`` plus a raw carriage return, which matches no binding.
+    """
+    from textual._xterm_parser import XTermParser
+
+    current = XTermParser._sequence_to_key_events
+    if getattr(current, "_monkeybot_newline", False):
+        return
+
+    def _sequence_to_key_events(self: XTermParser, sequence: str, alt: bool = False):  # type: ignore[no-untyped-def]
+        for event in current(self, sequence, alt=alt):
+            key = event.key
+            if alt and key == "enter":
+                yield Key("alt+enter", None)
+            elif key in {"shift+\r", "shift+\n"}:
+                yield Key("shift+enter", None)
+            elif key in {"alt+\r", "alt+\n"}:
+                yield Key("alt+enter", None)
+            else:
+                yield event
+
+    _sequence_to_key_events._monkeybot_newline = True  # type: ignore[attr-defined]
+    XTermParser._sequence_to_key_events = _sequence_to_key_events  # type: ignore[method-assign]
+
+
 class Composer(TextArea):
     """Growing multiline input: Enter sends, Shift+Enter/Ctrl+J newline, history, slash."""
 
@@ -1003,6 +1051,11 @@ class Composer(TextArea):
         if self._search_mode:
             self._handle_search_key(event)
             return
+        if is_newline_key(event.key):
+            self.action_insert_newline()
+            event.prevent_default()
+            event.stop()
+            return
         if event.character == "?" and not self.text.strip():
             with contextlib.suppress(Exception):
                 app = self.app
@@ -1054,7 +1107,8 @@ class Composer(TextArea):
             event.prevent_default()
             event.stop()
             return
-        super()._on_key(event)
+        # TextArea._on_key runs next via the message MRO and inserts printable
+        # characters. Calling it here as well only creates an unawaited coroutine.
         self.call_after_refresh(self._sync_height)
 
     def _handle_search_key(self, event: Key) -> None:
@@ -1115,3 +1169,6 @@ class TranscriptPane(VerticalScroll):
         on_scroll = getattr(app, "_on_transcript_scroll", None)
         if callable(on_scroll):
             on_scroll()
+
+
+install_terminal_newline_keys()

monkeybot_cli-0.11.1/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.10.0 → monkeybot_cli-0.11.1}/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,
@@ -167,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))
@@ -177,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
 
 
@@ -200,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.10.0 → monkeybot_cli-0.11.1}/src/monkeybot_cli/main.py

@@ -5,7 +5,18 @@ from __future__ import annotations
 import argparse
 import sys
 
-from monkeybot_cli.commands import chat, doctor, loop, new, refresh, run_cmd, talk, trace, validate
+from monkeybot_cli.commands import (
+    chat,
+    doctor,
+    loop,
+    mcp_login,
+    new,
+    refresh,
+    run_cmd,
+    talk,
+    trace,
+    validate,
+)
 from monkeybot_cli.runtime_python import RuntimeUpgradeError, report_runtime_upgrade_error
 
 
@@ -25,6 +36,7 @@ def build_parser() -> argparse.ArgumentParser:
     talk.register(sub)
     loop.register(sub)
     trace.register(sub)
+    mcp_login.register(sub)
     return parser
 
 

monkeybot_cli-0.11.1/src/monkeybot_cli/overrides.txt

@@ -0,0 +1,5 @@
+# browser-harness 0.1.13 requires pillow==12.3.0. That release is inside
+# advisories fixed in Pillow 13. [tool.uv] override-dependencies applies this
+# floor to uv lock and uv sync only. uv tool install and uv pip install need
+# this file via --overrides.
+pillow>=13