bub 0.3.1__tar.gz → 0.3.2__tar.gz

{bub-0.3.1 → bub-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bub
-Version: 0.3.1
+Version: 0.3.2
 Summary: A common shape for agents that live alongside people.
 Author-Email: Chojan Shang <psiace@apache.org>, Frost Ming <me@frostming.com>, Yihong <zouzou0208@gmail.com>
 Classifier: Intended Audience :: Developers
@@ -31,7 +31,16 @@ Description-Content-Type: text/markdown
 
 # Bub
 
-**A common shape for agents that live alongside people.**
+<div align="center">
+
+<picture>
+  <source srcset="https://bub.build/dark.png" media="(prefers-color-scheme: dark)">
+  <img alt="Bub logo" src="https://bub.build/light.png" width="200">
+</picture>
+
+<p><strong>A common shape for agents that live alongside people.</strong></p>
+
+</div>
 
 Bub started in group chats. Not as a demo or a personal assistant, but as a teammate that had to coexist with real humans and other agents in the same messy conversations — concurrent tasks, incomplete context, and nobody waiting.
 
@@ -113,27 +122,27 @@ See the [Extension Guide](https://bub.build/extension-guide/) for hook semantics
 
 ## CLI
 
-| Command | Description |
-|---------|-------------|
-| `bub chat` | Interactive REPL |
-| `bub run MESSAGE` | One-shot turn |
-| `bub gateway` | Channel listener (Telegram, etc.) |
-| `bub login openai` | OpenAI Codex OAuth |
-| `bub hooks` | Print hook-to-plugin bindings |
+| Command            | Description                       |
+| ------------------ | --------------------------------- |
+| `bub chat`         | Interactive REPL                  |
+| `bub run MESSAGE`  | One-shot turn                     |
+| `bub gateway`      | Channel listener (Telegram, etc.) |
+| `bub login openai` | OpenAI Codex OAuth                |
+| `bub hooks`        | Print hook-to-plugin bindings     |
 
 Lines starting with `,` enter internal command mode (`,help`, `,skill name=my-skill`, `,fs.read path=README.md`).
 
 ## Configuration
 
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `BUB_MODEL` | `openrouter:qwen/qwen3-coder-next` | Model identifier |
-| `BUB_API_KEY` | — | Provider key (optional with `bub login openai`) |
-| `BUB_API_BASE` | — | Custom provider endpoint |
-| `BUB_API_FORMAT` | `completion` | `completion`, `responses`, or `messages` |
-| `BUB_MAX_STEPS` | `50` | Max tool-use loop iterations |
-| `BUB_MAX_TOKENS` | `1024` | Max tokens per model call |
-| `BUB_MODEL_TIMEOUT_SECONDS` | — | Model call timeout (seconds) |
+| Variable                    | Default                            | Description                                     |
+| --------------------------- | ---------------------------------- | ----------------------------------------------- |
+| `BUB_MODEL`                 | `openrouter:qwen/qwen3-coder-next` | Model identifier                                |
+| `BUB_API_KEY`               | —                                  | Provider key (optional with `bub login openai`) |
+| `BUB_API_BASE`              | —                                  | Custom provider endpoint                        |
+| `BUB_API_FORMAT`            | `completion`                       | `completion`, `responses`, or `messages`        |
+| `BUB_MAX_STEPS`             | `50`                               | Max tool-use loop iterations                    |
+| `BUB_MAX_TOKENS`            | `1024`                             | Max tokens per model call                       |
+| `BUB_MODEL_TIMEOUT_SECONDS` | —                                  | Model call timeout (seconds)                    |
 
 ## Background
 

{bub-0.3.1 → bub-0.3.2}/README.md

@@ -1,6 +1,15 @@
 # Bub
 
-**A common shape for agents that live alongside people.**
+<div align="center">
+
+<picture>
+  <source srcset="https://bub.build/dark.png" media="(prefers-color-scheme: dark)">
+  <img alt="Bub logo" src="https://bub.build/light.png" width="200">
+</picture>
+
+<p><strong>A common shape for agents that live alongside people.</strong></p>
+
+</div>
 
 Bub started in group chats. Not as a demo or a personal assistant, but as a teammate that had to coexist with real humans and other agents in the same messy conversations — concurrent tasks, incomplete context, and nobody waiting.
 
@@ -82,27 +91,27 @@ See the [Extension Guide](https://bub.build/extension-guide/) for hook semantics
 
 ## CLI
 
-| Command | Description |
-|---------|-------------|
-| `bub chat` | Interactive REPL |
-| `bub run MESSAGE` | One-shot turn |
-| `bub gateway` | Channel listener (Telegram, etc.) |
-| `bub login openai` | OpenAI Codex OAuth |
-| `bub hooks` | Print hook-to-plugin bindings |
+| Command            | Description                       |
+| ------------------ | --------------------------------- |
+| `bub chat`         | Interactive REPL                  |
+| `bub run MESSAGE`  | One-shot turn                     |
+| `bub gateway`      | Channel listener (Telegram, etc.) |
+| `bub login openai` | OpenAI Codex OAuth                |
+| `bub hooks`        | Print hook-to-plugin bindings     |
 
 Lines starting with `,` enter internal command mode (`,help`, `,skill name=my-skill`, `,fs.read path=README.md`).
 
 ## Configuration
 
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `BUB_MODEL` | `openrouter:qwen/qwen3-coder-next` | Model identifier |
-| `BUB_API_KEY` | — | Provider key (optional with `bub login openai`) |
-| `BUB_API_BASE` | — | Custom provider endpoint |
-| `BUB_API_FORMAT` | `completion` | `completion`, `responses`, or `messages` |
-| `BUB_MAX_STEPS` | `50` | Max tool-use loop iterations |
-| `BUB_MAX_TOKENS` | `1024` | Max tokens per model call |
-| `BUB_MODEL_TIMEOUT_SECONDS` | — | Model call timeout (seconds) |
+| Variable                    | Default                            | Description                                     |
+| --------------------------- | ---------------------------------- | ----------------------------------------------- |
+| `BUB_MODEL`                 | `openrouter:qwen/qwen3-coder-next` | Model identifier                                |
+| `BUB_API_KEY`               | —                                  | Provider key (optional with `bub login openai`) |
+| `BUB_API_BASE`              | —                                  | Custom provider endpoint                        |
+| `BUB_API_FORMAT`            | `completion`                       | `completion`, `responses`, or `messages`        |
+| `BUB_MAX_STEPS`             | `50`                               | Max tool-use loop iterations                    |
+| `BUB_MAX_TOKENS`            | `1024`                             | Max tokens per model call                       |
+| `BUB_MODEL_TIMEOUT_SECONDS` | —                                  | Model call timeout (seconds)                    |
 
 ## Background
 

{bub-0.3.1 → bub-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bub"
-version = "0.3.1"
+version = "0.3.2"
 description = "A common shape for agents that live alongside people."
 authors = [
     { name = "Chojan Shang", email = "psiace@apache.org" },

{bub-0.3.1 → bub-0.3.2}/src/bub/__init__.py

@@ -5,4 +5,4 @@ from bub.hookspecs import hookimpl
 from bub.tools import tool
 
 __all__ = ["BubFramework", "hookimpl", "tool"]
-__version__ = "0.3.1"
+__version__ = "0.3.2"

{bub-0.3.1 → bub-0.3.2}/src/bub/builtin/agent.py

@@ -18,7 +18,7 @@ from loguru import logger
 from republic import LLM, AsyncTapeStore, TapeContext, ToolAutoResult, ToolContext
 from republic.tape import InMemoryTapeStore, Tape
 
-from bub.builtin.settings import AgentSettings
+from bub.builtin.settings import AgentSettings, load_settings
 from bub.builtin.store import ForkTapeStore
 from bub.builtin.tape import TapeService
 from bub.framework import BubFramework
@@ -36,7 +36,7 @@ class Agent:
     """Agent that processes prompts using hooks and tools. Backed by republic."""
 
     def __init__(self, framework: BubFramework) -> None:
-        self.settings = _load_runtime_settings()
+        self.settings = load_settings()
         self.framework = framework
 
     @cached_property
@@ -290,10 +290,6 @@ def _build_llm(settings: AgentSettings, tape_store: AsyncTapeStore, tape_context
     )
 
 
-def _load_runtime_settings() -> AgentSettings:
-    return AgentSettings.from_env()
-
-
 @dataclass(frozen=True)
 class Args:
     positional: list[str]

bub-0.3.2/src/bub/builtin/settings.py

@@ -0,0 +1,71 @@
+from __future__ import annotations
+
+import os
+import pathlib
+import re
+from collections.abc import Callable
+from functools import lru_cache
+from typing import Literal
+
+from pydantic import Field
+from pydantic_settings import BaseSettings, PydanticBaseSettingsSource, SettingsConfigDict, YamlConfigSettingsSource
+
+DEFAULT_MODEL = "openrouter:qwen/qwen3-coder-next"
+DEFAULT_MAX_TOKENS = 1024
+DEFAULT_HOME = pathlib.Path.home() / ".bub"
+DEFAULT_CONFIG_FILE = DEFAULT_HOME / "config.yml"
+
+
+def provider_specific(setting_name: str) -> Callable[[], dict[str, str] | None]:
+    def default_factory() -> dict[str, str] | None:
+        setting_regex = re.compile(rf"^BUB_(.+)_{setting_name.upper()}$")
+        loaded_env = os.environ
+        result: dict[str, str] = {}
+        for key, value in loaded_env.items():
+            if value is None:
+                continue
+            if match := setting_regex.match(key):
+                provider = match.group(1).lower()
+                result[provider] = value
+        return result or None
+
+    return default_factory
+
+
+class AgentSettings(BaseSettings):
+    """Configuration settings for the Agent."""
+
+    model_config = SettingsConfigDict(env_prefix="BUB_", env_parse_none_str="null", extra="ignore")
+    home: pathlib.Path = Field(default=DEFAULT_HOME)
+    model: str = DEFAULT_MODEL
+    fallback_models: list[str] | None = None
+    api_key: str | dict[str, str] | None = Field(default_factory=provider_specific("api_key"))
+    api_base: str | dict[str, str] | None = Field(default_factory=provider_specific("api_base"))
+    api_format: Literal["completion", "responses", "messages"] = "completion"
+    max_steps: int = 50
+    max_tokens: int = DEFAULT_MAX_TOKENS
+    model_timeout_seconds: int | None = None
+    verbose: int = Field(default=0, description="Verbosity level for logging. Higher means more verbose.", ge=0, le=2)
+
+    @classmethod
+    def settings_customise_sources(
+        cls,
+        settings_cls: type[BaseSettings],
+        init_settings: PydanticBaseSettingsSource,
+        env_settings: PydanticBaseSettingsSource,
+        dotenv_settings: PydanticBaseSettingsSource,
+        file_secret_settings: PydanticBaseSettingsSource,
+    ) -> tuple[PydanticBaseSettingsSource, ...]:
+        home = os.getenv("BUB_HOME", str(DEFAULT_HOME))
+        return (
+            init_settings,
+            env_settings,
+            dotenv_settings,
+            YamlConfigSettingsSource(settings_cls, yaml_file=pathlib.Path(home) / "config.yml"),
+            file_secret_settings,
+        )
+
+
+@lru_cache(maxsize=1)
+def load_settings() -> AgentSettings:
+    return AgentSettings()

{bub-0.3.1 → bub-0.3.2}/src/bub/builtin/shell_manager.py

@@ -53,6 +53,9 @@ class ShellManager:
         except KeyError as exc:
             raise KeyError(f"unknown shell id: {shell_id}") from exc
 
+    def release(self, shell_id: str) -> ManagedShell | None:
+        return self._shells.pop(shell_id, None)
+
     async def terminate(self, shell_id: str) -> ManagedShell:
         shell = self.get(shell_id)
         if shell.returncode is not None:
@@ -80,6 +83,7 @@ class ShellManager:
         for task in shell.read_tasks:
             with contextlib.suppress(asyncio.CancelledError):
                 await task
+        self._shells.pop(shell.shell_id, None)
 
     async def _drain_stream(
         self,

{bub-0.3.1 → bub-0.3.2}/src/bub/builtin/tools.py

@@ -11,7 +11,7 @@ from republic import AsyncTapeStore, TapeQuery, ToolContext
 
 from bub.builtin.shell_manager import shell_manager
 from bub.skills import discover_skills
-from bub.tools import REGISTRY, tool
+from bub.tools import resolve_tool_names, tool
 
 if TYPE_CHECKING:
     from bub.builtin.agent import Agent
@@ -263,10 +263,7 @@ async def run_subagent(param: SubAgentInput, *, context: ToolContext) -> str:
     else:
         subagent_session = param.session
     state = {**context.state, "session_id": subagent_session}
-    if param.allowed_tools:
-        allowed_tools = set(param.allowed_tools) - {"subagent"}
-    else:
-        allowed_tools = set(REGISTRY.keys()) - {"subagent"}
+    allowed_tools = resolve_tool_names(param.allowed_tools or None, exclude={"subagent"})
     return await agent.run(
         session_id=subagent_session,
         prompt=param.prompt,

{bub-0.3.1 → bub-0.3.2}/src/bub/framework.py

@@ -8,6 +8,7 @@ from typing import TYPE_CHECKING, Any
 
 import pluggy
 import typer
+from dotenv import load_dotenv
 from loguru import logger
 from republic import AsyncTapeStore, TapeContext
 from republic.tape import TapeStore
@@ -21,6 +22,9 @@ if TYPE_CHECKING:
     from bub.channels.base import Channel
 
 
+load_dotenv()
+
+
 @dataclass(frozen=True)
 class PluginStatus:
     is_success: bool

{bub-0.3.1 → bub-0.3.2}/src/bub/skills.py

@@ -172,7 +172,7 @@ def render_skills_prompt(skills: list[SkillMetadata], expanded_skills: Collectio
     for skill in skills:
         line = f"- {skill.name}: {skill.description}"
         if skill.name in expanded_skills:
-            line += f"  Location: {skill.location}"
+            line += f"\n  Location: {skill.location}"
             body = skill.body()
             if body:
                 line += f"\n{body}"

{bub-0.3.1 → bub-0.3.2}/src/bub/tools.py

@@ -136,6 +136,51 @@ def _to_model_name(name: str) -> str:
     return name.replace(".", "_")
 
 
+def _tool_name_index() -> dict[str, str]:
+    real_names = {tool_name.casefold(): tool_name for tool_name in REGISTRY}
+    alias_names = {_to_model_name(tool_name).casefold(): tool_name for tool_name in REGISTRY}
+    return {**alias_names, **real_names}
+
+
+def resolve_tool_name(name: str) -> str | None:
+    """Resolve a user/model-provided tool name to the runtime registry name."""
+    key = name.strip().casefold()
+    if not key:
+        return None
+    return _tool_name_index().get(key)
+
+
+def _resolve_explicit_tool_names(names: Iterable[str]) -> tuple[set[str], set[str]]:
+    resolved: set[str] = set()
+    unknown: set[str] = set()
+    for name in names:
+        normalized_name = name.strip()
+        if resolved_name := resolve_tool_name(normalized_name):
+            resolved.add(resolved_name)
+        else:
+            unknown.add(normalized_name)
+    return resolved, unknown
+
+
+def _raise_unknown_tool_names(names: set[str]) -> None:
+    formatted = ", ".join(sorted(repr(name) for name in names))
+    raise ValueError(f"unknown tool name(s): {formatted}")
+
+
+def resolve_tool_names(names: Iterable[str] | None = None, *, exclude: Iterable[str] = ()) -> set[str]:
+    """Resolve tool names from either runtime names or model-facing aliases."""
+    excluded, unknown_excluded = _resolve_explicit_tool_names(exclude)
+    if unknown_excluded:
+        _raise_unknown_tool_names(unknown_excluded)
+    if names is None:
+        return set(REGISTRY) - excluded
+
+    resolved, unknown = _resolve_explicit_tool_names(names)
+    if unknown:
+        _raise_unknown_tool_names(unknown)
+    return resolved - excluded
+
+
 def model_tools(tools: Iterable[Tool]) -> list[Tool]:
     """Helper to convert a list of Tool instances into a format accepted by LLMs."""
     return [replace(tool, name=_to_model_name(tool.name)) for tool in tools]

{bub-0.3.1 → bub-0.3.2}/src/skills/telegram/SKILL.md

@@ -17,7 +17,6 @@ Agent-facing execution guide for Telegram outbound communication.
 Assumption: `BUB_TELEGRAM_TOKEN` is already available.
 
 ## Required Inputs
-
 Collect these before execution:
 
 - `chat_id` (required)

{bub-0.3.1 → bub-0.3.2}/tests/test_builtin_tools.py

@@ -9,6 +9,8 @@ from republic import ToolContext
 from republic.core.errors import ErrorKind
 from republic.tools.executor import ToolExecutor
 
+import bub.builtin.tools as builtin_tools
+from bub.builtin.shell_manager import ShellManager
 from bub.builtin.tools import bash, bash_output, kill_bash
 
 
@@ -27,6 +29,28 @@ async def test_bash_returns_stdout_for_foreground_command(tmp_path) -> None:
     assert result == "hello"
 
 
+@pytest.mark.asyncio
+async def test_foreground_bash_releases_shell_from_shell_manager(tmp_path, monkeypatch) -> None:
+    manager = ShellManager()
+    monkeypatch.setattr(builtin_tools, "shell_manager", manager)
+
+    result = await bash.run(cmd=_python_shell("print('hello')"), context=_tool_context(tmp_path))
+
+    assert result == "hello"
+    assert manager._shells == {}
+
+
+@pytest.mark.asyncio
+async def test_foreground_bash_releases_shell_when_command_fails(tmp_path, monkeypatch) -> None:
+    manager = ShellManager()
+    monkeypatch.setattr(builtin_tools, "shell_manager", manager)
+
+    with pytest.raises(RuntimeError, match="command exited with code"):
+        await bash.run(cmd=_python_shell("import sys; sys.exit(2)"), context=_tool_context(tmp_path))
+
+    assert manager._shells == {}
+
+
 @pytest.mark.asyncio
 async def test_bash_non_zero_exit_is_returned_as_tool_error(tmp_path) -> None:
     command = _python_shell("import sys; print('boom'); sys.exit(7)")
@@ -71,7 +95,7 @@ async def test_background_bash_exposes_output_via_bash_output(tmp_path) -> None:
 
 
 @pytest.mark.asyncio
-async def test_kill_bash_terminates_background_process(tmp_path) -> None:
+async def test_kill_bash_terminates_background_process_and_releases_shell(tmp_path) -> None:
     started = await bash.run(
         cmd=_python_shell("import time; time.sleep(10)"),
         background=True,
@@ -80,11 +104,11 @@ async def test_kill_bash_terminates_background_process(tmp_path) -> None:
     shell_id = started.removeprefix("started: ").strip()
 
     killed = await kill_bash.run(shell_id=shell_id)
-    output = await bash_output.run(shell_id=shell_id)
 
     assert killed.startswith(f"id: {shell_id}\nstatus: exited\nexit_code: ")
     assert "exit_code: null" not in killed
-    assert output.startswith(f"id: {shell_id}\nstatus: exited\n")
+    with pytest.raises(KeyError, match="unknown shell id"):
+        await bash_output.run(shell_id=shell_id)
 
 
 @pytest.mark.asyncio

bub-0.3.2/tests/test_settings.py

@@ -0,0 +1,134 @@
+from __future__ import annotations
+
+from pathlib import Path
+from unittest.mock import patch
+
+from bub.builtin.settings import AgentSettings, load_settings
+
+
+def _settings_with_env(env: dict[str, str]) -> AgentSettings:
+    with patch.dict("os.environ", env, clear=True):
+        return AgentSettings()
+
+
+def _write_config(home: Path, content: str) -> None:
+    home.mkdir(parents=True, exist_ok=True)
+    (home / "config.yml").write_text(content, encoding="utf-8")
+
+
+def test_settings_single_api_key_and_base() -> None:
+    settings = _settings_with_env({"BUB_API_KEY": "sk-test", "BUB_API_BASE": "https://api.example.com"})
+
+    assert isinstance(settings.api_key, str)
+    assert isinstance(settings.api_base, str)
+
+
+def test_settings_per_provider_keys() -> None:
+    settings = _settings_with_env({
+        "BUB_OPENAI_API_KEY": "sk-openai",
+        "BUB_OPENAI_API_BASE": "https://api.openai.com",
+        "BUB_ANTHROPIC_API_KEY": "sk-anthropic",
+    })
+
+    assert isinstance(settings.api_key, dict)
+    assert settings.api_key["openai"] == "sk-openai"
+    assert settings.api_key["anthropic"] == "sk-anthropic"
+    assert isinstance(settings.api_base, dict)
+    assert settings.api_base["openai"] == "https://api.openai.com"
+
+
+def test_settings_no_keys_returns_none() -> None:
+    settings = _settings_with_env({})
+
+    assert settings.api_key is None
+    assert settings.api_base is None
+
+
+def test_settings_provider_names_are_lowercased() -> None:
+    settings = _settings_with_env({"BUB_OPENROUTER_API_KEY": "sk-or"})
+
+    assert isinstance(settings.api_key, dict)
+    assert "openrouter" in settings.api_key
+
+
+def test_settings_mixed_single_key_with_per_provider_base() -> None:
+    settings = _settings_with_env({
+        "BUB_API_KEY": "sk-global",
+        "BUB_OPENAI_API_BASE": "https://api.openai.com",
+    })
+
+    assert settings.api_key == "sk-global"
+    assert isinstance(settings.api_base, dict)
+    assert settings.api_base["openai"] == "https://api.openai.com"
+
+
+def test_settings_load_values_from_yaml(tmp_path: Path) -> None:
+    _write_config(
+        tmp_path,
+        """
+model: openai:gpt-5
+fallback_models:
+  - openai:gpt-4o-mini
+max_steps: 77
+api_key:
+  openai: sk-yaml
+api_base:
+  openai: https://api.openai.com
+""".strip(),
+    )
+
+    with patch.dict("os.environ", {"BUB_HOME": str(tmp_path)}, clear=True):
+        settings = AgentSettings()
+
+    assert settings.model == "openai:gpt-5"
+    assert settings.fallback_models == ["openai:gpt-4o-mini"]
+    assert settings.max_steps == 77
+    assert settings.api_key == {"openai": "sk-yaml"}
+    assert settings.api_base == {"openai": "https://api.openai.com"}
+
+
+def test_env_settings_override_yaml(tmp_path: Path) -> None:
+    _write_config(
+        tmp_path,
+        """
+model: openai:gpt-5
+api_key: sk-yaml
+max_steps: 77
+""".strip(),
+    )
+
+    with patch.dict(
+        "os.environ",
+        {
+            "BUB_HOME": str(tmp_path),
+            "BUB_MODEL": "anthropic:claude-3-7-sonnet",
+            "BUB_API_KEY": "sk-env",
+            "BUB_MAX_STEPS": "12",
+        },
+        clear=True,
+    ):
+        settings = AgentSettings()
+
+    assert settings.model == "anthropic:claude-3-7-sonnet"
+    assert settings.api_key == "sk-env"
+    assert settings.max_steps == 12
+
+
+def test_load_settings_reads_yaml_from_bub_home(tmp_path: Path) -> None:
+    _write_config(
+        tmp_path,
+        """
+model: openrouter:qwen/qwen3-coder-next
+api_format: responses
+""".strip(),
+    )
+
+    load_settings.cache_clear()
+    try:
+        with patch.dict("os.environ", {"BUB_HOME": str(tmp_path)}, clear=True):
+            settings = load_settings()
+    finally:
+        load_settings.cache_clear()
+
+    assert settings.model == "openrouter:qwen/qwen3-coder-next"
+    assert settings.api_format == "responses"

{bub-0.3.1 → bub-0.3.2}/tests/test_subagent_tool.py

@@ -6,6 +6,7 @@ from unittest.mock import AsyncMock
 import pytest
 
 from bub.builtin.tools import run_subagent
+from bub.tools import REGISTRY, tool
 
 
 class FakeContext:
@@ -94,3 +95,50 @@ async def test_subagent_default_session_when_missing() -> None:
 
     call_kwargs = agent.run.call_args.kwargs
     assert call_kwargs["session_id"] == "temp/unknown"
+
+
+@pytest.mark.asyncio
+async def test_subagent_empty_allowed_tools_defaults_to_all_non_subagent_tools() -> None:
+    tool_name = "tests.allowed_tool_default"
+    REGISTRY.pop(tool_name, None)
+
+    @tool(name=tool_name)
+    def allowed_tool_default() -> str:
+        return "ok"
+
+    agent = FakeAgent()
+    ctx = FakeContext({"_runtime_agent": agent, "session_id": "user/abc"})
+
+    await run_subagent.run(prompt="task", allowed_tools=[], context=ctx)
+
+    allowed_tools = agent.run.call_args.kwargs["allowed_tools"]
+    assert tool_name in allowed_tools
+    assert "subagent" not in allowed_tools
+
+
+@pytest.mark.asyncio
+async def test_subagent_resolves_model_tool_aliases_to_runtime_names() -> None:
+    tool_name = "tests.resolve_subagent"
+    REGISTRY.pop(tool_name, None)
+
+    @tool(name=tool_name)
+    def resolve_subagent() -> str:
+        return "ok"
+
+    agent = FakeAgent()
+    ctx = FakeContext({"_runtime_agent": agent, "session_id": "user/abc"})
+
+    await run_subagent.run(prompt="task", allowed_tools=[" tests_resolve_subagent "], context=ctx)
+
+    assert agent.run.call_args.kwargs["allowed_tools"] == {tool_name}
+
+
+@pytest.mark.asyncio
+async def test_subagent_rejects_unknown_allowed_tools() -> None:
+    agent = FakeAgent()
+    ctx = FakeContext({"_runtime_agent": agent, "session_id": "user/abc"})
+
+    with pytest.raises(ValueError, match="tests_missing_tool"):
+        await run_subagent.run(prompt="task", allowed_tools=[" tests_missing_tool "], context=ctx)
+
+    agent.run.assert_not_called()

{bub-0.3.1 → bub-0.3.2}/tests/test_tools.py

@@ -6,7 +6,7 @@ import pytest
 from loguru import logger
 from pydantic import BaseModel
 
-from bub.tools import REGISTRY, model_tools, render_tools_prompt, tool
+from bub.tools import REGISTRY, model_tools, render_tools_prompt, resolve_tool_names, tool
 
 
 class EchoInput(BaseModel):
@@ -123,3 +123,33 @@ def test_render_tools_prompt_renders_available_tools_block() -> None:
 
 def test_render_tools_prompt_returns_empty_string_for_empty_input() -> None:
     assert render_tools_prompt([]) == ""
+
+
+def test_resolve_tool_names_accepts_runtime_names_and_model_aliases() -> None:
+    dotted_name = "tests.resolve_alias"
+    underscored_name = "tests_with_underscore"
+    REGISTRY.pop(dotted_name, None)
+    REGISTRY.pop(underscored_name, None)
+
+    @tool(name=dotted_name)
+    def resolve_alias() -> str:
+        return "alias"
+
+    @tool(name=underscored_name)
+    def resolve_runtime_name() -> str:
+        return "runtime"
+
+    assert resolve_tool_names([" tests_resolve_alias ", " tests_with_underscore "], exclude={" subagent "}) == {
+        dotted_name,
+        underscored_name,
+    }
+    assert dotted_name not in resolve_tool_names(None, exclude={" tests_resolve_alias "})
+    assert resolve_tool_names(None, exclude={" tests_resolve_alias "}) >= {underscored_name}
+
+
+def test_resolve_tool_names_rejects_unknown_names() -> None:
+    with pytest.raises(ValueError, match="tests_missing_tool"):
+        resolve_tool_names([" tests_missing_tool "])
+
+    with pytest.raises(ValueError, match="tests_missing_tool"):
+        resolve_tool_names(None, exclude={" tests_missing_tool "})

bub-0.3.1/src/bub/builtin/settings.py

@@ -1,63 +0,0 @@
-from __future__ import annotations
-
-import os
-import pathlib
-import re
-from typing import Literal
-
-from pydantic import Field
-from pydantic_settings import BaseSettings, SettingsConfigDict
-
-DEFAULT_MODEL = "openrouter:qwen/qwen3-coder-next"
-DEFAULT_MAX_TOKENS = 1024
-DEFAULT_HOME = pathlib.Path.home() / ".bub"
-
-
-class AgentSettings(BaseSettings):
-    """Configuration settings for the Agent, loaded from environment variables with prefix BUB_ or from a .env file."""
-
-    model_config = SettingsConfigDict(env_prefix="BUB_", env_parse_none_str="null", extra="ignore", env_file=".env")
-
-    home: pathlib.Path = Field(default=DEFAULT_HOME)
-
-    model: str = DEFAULT_MODEL
-    fallback_models: list[str] | None = None
-    api_key: str | dict[str, str] | None = None
-    api_base: str | dict[str, str] | None = None
-    api_format: Literal["completion", "responses", "messages"] = "completion"
-    max_steps: int = 50
-    max_tokens: int = DEFAULT_MAX_TOKENS
-    model_timeout_seconds: int | None = None
-    verbose: int = Field(default=0, description="Verbosity level for logging. Higher means more verbose.", ge=0, le=2)
-
-    @classmethod
-    def from_env(cls) -> AgentSettings:
-        from dotenv import dotenv_values
-
-        key_regex = re.compile(r"^BUB_(.+)_API_KEY$")
-        base_regex = re.compile(r"^BUB_(.+)_API_BASE$")
-
-        loaded_env = dotenv_values(".env")
-        loaded_env.update(os.environ)
-
-        api_key: str | dict[str, str] | None = loaded_env.get("BUB_API_KEY")
-        api_base: str | dict[str, str] | None = loaded_env.get("BUB_API_BASE")
-        if api_key and api_base:
-            return cls()
-
-        if api_key is None:
-            api_key = {}
-        if api_base is None:
-            api_base = {}
-
-        for key, value in loaded_env.items():
-            if value is None:
-                continue
-            if isinstance(api_key, dict) and (match := key_regex.match(key)):
-                provider = match.group(1).lower()
-                api_key[provider] = value
-            if isinstance(api_base, dict) and (match := base_regex.match(key)):
-                provider = match.group(1).lower()
-                api_base[provider] = value
-
-        return cls(api_key=api_key or None, api_base=api_base or None)

bub-0.3.1/tests/test_settings_from_env.py

@@ -1,92 +0,0 @@
-from __future__ import annotations
-
-from unittest.mock import patch
-
-from bub.builtin.settings import AgentSettings
-
-
-def _from_env_with(env: dict[str, str]) -> AgentSettings:
-    """Call AgentSettings.from_env() with a controlled env, bypassing .env file and real os.environ."""
-    with (
-        patch("dotenv.dotenv_values", return_value={}),
-        patch.dict("os.environ", env, clear=True),
-    ):
-        return AgentSettings.from_env()
-
-
-def test_from_env_single_api_key_and_base() -> None:
-    """When BUB_API_KEY and BUB_API_BASE are both set, return plain AgentSettings."""
-    settings = _from_env_with({"BUB_API_KEY": "sk-test", "BUB_API_BASE": "https://api.example.com"})
-
-    assert isinstance(settings.api_key, str)
-    assert isinstance(settings.api_base, str)
-
-
-def test_from_env_per_provider_keys() -> None:
-    """When per-provider BUB_<PROVIDER>_API_KEY vars are set, build a dict."""
-    settings = _from_env_with({
-        "BUB_OPENAI_API_KEY": "sk-openai",
-        "BUB_OPENAI_API_BASE": "https://api.openai.com",
-        "BUB_ANTHROPIC_API_KEY": "sk-anthropic",
-    })
-
-    assert isinstance(settings.api_key, dict)
-    assert settings.api_key["openai"] == "sk-openai"
-    assert settings.api_key["anthropic"] == "sk-anthropic"
-    assert isinstance(settings.api_base, dict)
-    assert settings.api_base["openai"] == "https://api.openai.com"
-
-
-def test_from_env_no_keys_returns_none() -> None:
-    """When no API key env vars are present, api_key and api_base are None."""
-    settings = _from_env_with({})
-
-    assert settings.api_key is None
-    assert settings.api_base is None
-
-
-def test_from_env_provider_names_are_lowercased() -> None:
-    """Provider names extracted from env vars should be lowercased."""
-    settings = _from_env_with({"BUB_OPENROUTER_API_KEY": "sk-or"})
-
-    assert isinstance(settings.api_key, dict)
-    assert "openrouter" in settings.api_key
-
-
-def test_from_env_mixed_single_key_with_per_provider_base() -> None:
-    """When BUB_API_KEY is set but BUB_API_BASE is not, key stays string, base becomes dict."""
-    settings = _from_env_with({
-        "BUB_API_KEY": "sk-global",
-        "BUB_OPENAI_API_BASE": "https://api.openai.com",
-    })
-
-    # api_key is a plain string (from BUB_API_KEY), base is a dict
-    assert settings.api_key == "sk-global"
-    assert isinstance(settings.api_base, dict)
-    assert settings.api_base["openai"] == "https://api.openai.com"
-
-
-def test_from_env_dotenv_file_values_used() -> None:
-    """Values from .env file are used when present."""
-    dotenv_data = {"BUB_OPENAI_API_KEY": "sk-from-dotenv"}
-    with (
-        patch("dotenv.dotenv_values", return_value=dotenv_data),
-        patch.dict("os.environ", {}, clear=True),
-    ):
-        settings = AgentSettings.from_env()
-
-    assert isinstance(settings.api_key, dict)
-    assert settings.api_key["openai"] == "sk-from-dotenv"
-
-
-def test_from_env_os_environ_overrides_dotenv() -> None:
-    """os.environ should override values from .env file."""
-    dotenv_data = {"BUB_OPENAI_API_KEY": "sk-from-dotenv"}
-    with (
-        patch("dotenv.dotenv_values", return_value=dotenv_data),
-        patch.dict("os.environ", {"BUB_OPENAI_API_KEY": "sk-from-env"}, clear=True),
-    ):
-        settings = AgentSettings.from_env()
-
-    assert isinstance(settings.api_key, dict)
-    assert settings.api_key["openai"] == "sk-from-env"