bub 0.4.3__tar.gz → 0.4.4__tar.gz

{bub-0.4.3 → bub-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: bub
-Version: 0.4.3
+Version: 0.4.4
 Summary: A common shape for agents that live alongside people.
 Project-URL: Homepage, https://bub.build
 Project-URL: Repository, https://github.com/bubbuild/bub
@@ -57,8 +57,26 @@ Built on [agents.md](https://agents.md/) and [Agent Skills](https://agentskills.
 
 ## Quick Start
 
+macOS and Linux:
+
+```bash
+curl -fsSL https://bub.build/install.sh | bash
+```
+
+Windows PowerShell:
+
+```powershell
+powershell -ExecutionPolicy ByPass -c "irm https://bub.build/install.ps1 | iex"
+```
+
+The interactive installer uses a colored preset picker, accepts additional plugin dependencies, and runs `bub onboard` after installation. For automation, select a preset explicitly; non-interactive installs skip onboarding:
+
 ```bash
-pip install bub
+curl -fsSL https://bub.build/install.sh | bash -s -- --preset recommended --dependency extra-plugin
+```
+
+```powershell
+powershell -ExecutionPolicy ByPass -c "& ([scriptblock]::Create((irm https://bub.build/install.ps1))) --preset recommended --dependency extra-plugin"
 ```
 
 Or from source:
@@ -72,9 +90,9 @@ uv sync  # enough to run Bub from source
 For local development, use `make install` instead so the website toolchain and `prek` hooks are installed too.
 
 ```bash
-uv run bub chat                         # interactive session
-uv run bub run "summarize this repo"    # one-shot task
-uv run bub gateway                      # channel listener mode
+bub chat                         # interactive session
+bub run "summarize this repo"    # one-shot task
+bub gateway                      # channel listener mode
 ```
 
 ## Why Bub
@@ -158,6 +176,7 @@ Lines starting with `,` enter internal command mode (`,help`, `,skill name=my-sk
 | `BUB_MAX_STEPS`             | unlimited                    | Tool-use loop limit; must be a positive integer      |
 | `BUB_MAX_TOKENS`            | `16384`                      | Max tokens per model call                            |
 | `BUB_MODEL_TIMEOUT_SECONDS` | —                            | Model call timeout (seconds)                         |
+| `BUB_SPILL_THRESHOLD`       | `4096`                       | Estimated tokens before tool output spills; `0` disables |
 
 ## Background
 

{bub-0.4.3 → bub-0.4.4}/README.md

@@ -19,8 +19,26 @@ Built on [agents.md](https://agents.md/) and [Agent Skills](https://agentskills.
 
 ## Quick Start
 
+macOS and Linux:
+
+```bash
+curl -fsSL https://bub.build/install.sh | bash
+```
+
+Windows PowerShell:
+
+```powershell
+powershell -ExecutionPolicy ByPass -c "irm https://bub.build/install.ps1 | iex"
+```
+
+The interactive installer uses a colored preset picker, accepts additional plugin dependencies, and runs `bub onboard` after installation. For automation, select a preset explicitly; non-interactive installs skip onboarding:
+
 ```bash
-pip install bub
+curl -fsSL https://bub.build/install.sh | bash -s -- --preset recommended --dependency extra-plugin
+```
+
+```powershell
+powershell -ExecutionPolicy ByPass -c "& ([scriptblock]::Create((irm https://bub.build/install.ps1))) --preset recommended --dependency extra-plugin"
 ```
 
 Or from source:
@@ -34,9 +52,9 @@ uv sync  # enough to run Bub from source
 For local development, use `make install` instead so the website toolchain and `prek` hooks are installed too.
 
 ```bash
-uv run bub chat                         # interactive session
-uv run bub run "summarize this repo"    # one-shot task
-uv run bub gateway                      # channel listener mode
+bub chat                         # interactive session
+bub run "summarize this repo"    # one-shot task
+bub gateway                      # channel listener mode
 ```
 
 ## Why Bub
@@ -120,6 +138,7 @@ Lines starting with `,` enter internal command mode (`,help`, `,skill name=my-sk
 | `BUB_MAX_STEPS`             | unlimited                    | Tool-use loop limit; must be a positive integer      |
 | `BUB_MAX_TOKENS`            | `16384`                      | Max tokens per model call                            |
 | `BUB_MODEL_TIMEOUT_SECONDS` | —                            | Model call timeout (seconds)                         |
+| `BUB_SPILL_THRESHOLD`       | `4096`                       | Estimated tokens before tool output spills; `0` disables |
 
 ## Background
 

{bub-0.4.3 → bub-0.4.4}/src/bub/__main__.py

@@ -6,28 +6,35 @@ import sys
 
 import typer
 
+from bub.builtin.settings import load_settings
 from bub.framework import BubFramework
 
+LOG_LEVEL = {
+    0: "INFO",
+    1: "DEBUG",
+    2: "TRACE",
+}
 
-def _instrument_bub() -> None:
+
+def _instrument_bub(level: str) -> None:
     from loguru import logger
 
     logger.remove()
-    logger.add(sys.stderr, colorize=True)
+    logger.add(sys.stderr, level=level, colorize=True, diagnose=False)
 
     try:
         import logfire
         from logfire.integrations.loguru import LogfireHandler
 
         logfire.configure()
-        logger.add(LogfireHandler(), format="{message}")
+        logger.add(LogfireHandler(), level=level, format="{message}", diagnose=False)
     except Exception as exc:
         logger.debug("logfire instrumentation disabled: {}", exc)
 
 
 def create_cli_app() -> typer.Typer:
-    _instrument_bub()
     framework = BubFramework()
+    _instrument_bub(LOG_LEVEL[load_settings().verbose])
     framework.load_hooks()
     app = framework.create_cli_app()
 

{bub-0.4.3 → bub-0.4.4}/src/bub/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.4.3'
-__version_tuple__ = version_tuple = (0, 4, 3)
+__version__ = version = '0.4.4'
+__version_tuple__ = version_tuple = (0, 4, 4)
 
 __commit_id__ = commit_id = None

{bub-0.4.3 → bub-0.4.4}/src/bub/builtin/agent.py

@@ -58,7 +58,12 @@ class Agent:
             tape_store = InMemoryTapeStore()
         if not is_async_tape_store(tape_store):
             tape_store = AsyncTapeStoreAdapter(tape_store)
-        return Tape(bub.home / "tapes", tape_store, self.framework.build_tape_context())
+        return Tape(
+            bub.home / "tapes",
+            tape_store,
+            self.framework.build_tape_context(),
+            sidecars=self.framework.get_tape_sidecars(),
+        )
 
     @staticmethod
     def _events_from_iterable(iterable: Iterable) -> AsyncStreamEvents:

{bub-0.4.3 → bub-0.4.4}/src/bub/builtin/cli.py

@@ -80,12 +80,27 @@ def list_hooks(ctx: typer.Context) -> None:
 def gateway(
     ctx: typer.Context,
     enable_channels: list[str] = typer.Option([], "--enable-channel", help="Channels to enable for CLI (default: all)"),
+    install: bool = typer.Option(False, "--install", help="Install and start the gateway as a per-user service"),
+    uninstall: bool = typer.Option(False, "--uninstall", help="Stop and uninstall the per-user gateway service"),
 ) -> None:
     """Start message listeners(like telegram)."""
-    from bub.channels.manager import ChannelManager
-
     framework = ctx.ensure_object(BubFramework)
 
+    if install and uninstall:
+        raise typer.BadParameter("--install and --uninstall cannot be used together")
+    if uninstall:
+        from bub.gateway_installer import GatewayServiceError, uninstall_gateway
+
+        try:
+            removed = uninstall_gateway()
+        except GatewayServiceError as exc:
+            typer.secho(f"Gateway uninstallation failed: {exc}", err=True, fg="red")
+            raise typer.Exit(1) from exc
+        typer.echo(f"Stopped and uninstalled the gateway from {removed.backend}: {removed.destination}")
+        return
+
+    from bub.channels.manager import ChannelManager
+
     manager = ChannelManager(framework, enabled_channels=enable_channels or None)
     if not manager.enabled_channels():
         typer.secho(
@@ -94,6 +109,16 @@ def gateway(
             fg="red",
         )
         raise typer.Exit(1)
+    if install:
+        from bub.gateway_installer import GatewayServiceError, install_gateway
+
+        try:
+            installed = install_gateway(framework.workspace, enable_channels)
+        except GatewayServiceError as exc:
+            typer.secho(f"Gateway installation failed: {exc}", err=True, fg="red")
+            raise typer.Exit(1) from exc
+        typer.echo(f"Installed and started the gateway with {installed.backend}: {installed.destination}")
+        return
     asyncio.run(manager.listen_and_run())
 
 
@@ -134,6 +159,26 @@ def onboard(ctx: typer.Context) -> None:
 
     typer.echo(f"Saved config to {framework.config_file}")
 
+    from bub import inquirer as bub_inquirer
+    from bub.gateway_installer import GatewayServiceError, install_gateway, is_gateway_service_supported
+
+    enabled_channels = str(config_data.get("enabled_channels", "")).strip()
+    if not enabled_channels or not is_gateway_service_supported():
+        return
+    if not bub_inquirer.ask_confirm("Install gateway as a background service?", default=False):
+        return
+
+    try:
+        installed = install_gateway(framework.workspace, [])
+    except GatewayServiceError as exc:
+        typer.secho(
+            f"Gateway installation failed: {exc}. Configuration remains saved at {framework.config_file}.",
+            err=True,
+            fg="red",
+        )
+        raise typer.Exit(1) from exc
+    typer.echo(f"Installed and started the gateway with {installed.backend}: {installed.destination}")
+
 
 @lru_cache(maxsize=1)
 def _find_uv() -> str:

{bub-0.4.3 → bub-0.4.4}/src/bub/builtin/hook_impl.py

@@ -2,7 +2,7 @@ import sys
 from datetime import datetime
 from difflib import get_close_matches
 from pathlib import Path
-from typing import cast
+from typing import Any, cast
 
 import typer
 from loguru import logger
@@ -15,12 +15,13 @@ from bub.builtin.steering import InMemorySteeringInbox
 from bub.channels.admission import AdmitDecision, SteeringInbox, TurnSnapshot
 from bub.channels.base import Channel
 from bub.channels.contracts import MessageHandler
-from bub.channels.message import ChannelMessage, MediaItem
+from bub.channels.message import ChannelMessage, MediaItem, audio_format_from_mime_type
 from bub.envelope import Envelope, content_of, field_of
 from bub.framework import BubFramework
 from bub.hooks import hookimpl
-from bub.hooks.interception import ToolCall, ToolCallDecision
+from bub.hooks.interception import ToolCall, ToolCallDecision, ToolCallResult
 from bub.model_selection import ModelChoice, ModelOptions
+from bub.sidecars import TapeSidecar
 from bub.store import TapeStore
 from bub.streaming import AsyncStreamEvents, StreamState
 from bub.tape import Tape, TapeContext
@@ -63,11 +64,21 @@ Excessively long context may cause model call failures. In this case, you MAY us
 DEFAULT_CONTINUE_PROMPT = "Continue the task until all targets are completed."
 
 
+def _input_audio_part(data_url: str, mime_type: str) -> dict[str, Any] | None:
+    prefix, separator, data = data_url.partition("base64,")
+    if not separator or not prefix.startswith("data:audio/") or not data:
+        return None
+    return {
+        "type": "input_audio",
+        "input_audio": {"data": data, "format": audio_format_from_mime_type(mime_type)},
+    }
+
+
 class BuiltinImpl:
     """Default hook implementations for basic runtime operations."""
 
     def __init__(self, framework: BubFramework) -> None:
-        from bub.builtin import tools  # noqa: F401
+        from bub.builtin import spill, tools  # noqa: F401
 
         self.framework = framework
         self._agent: Agent | None = None
@@ -198,13 +209,18 @@ class BuiltinImpl:
         media_parts: list[dict] = []
         for item in cast("list[MediaItem]", media):
             match item.type:
-                case "image":
+                case "image" | "video":
                     data_url = await item.get_url()
                     if not data_url:
                         continue
-                    media_parts.append({"type": "image_url", "image_url": {"url": data_url}})
+                    part_type = f"{item.type}_url"
+                    media_parts.append({"type": part_type, part_type: {"url": data_url}})
+                case "audio":
+                    data_url = await item.get_url()
+                    if data_url and (audio_part := _input_audio_part(data_url, item.mime_type)):
+                        media_parts.append(audio_part)
                 case _:
-                    pass  # TODO: Not supported for now
+                    pass
         if media_parts:
             return [{"type": "text", "text": text}, *media_parts]
         return text
@@ -370,6 +386,13 @@ class BuiltinImpl:
 
         return FileTapeStore(directory=bub.home / "tapes")
 
+    @hookimpl
+    def provide_tape_sidecar(self) -> TapeSidecar:
+        from bub.builtin.spill import SpillSettings, SpillStore
+        from bub.configure import ensure_config
+
+        return SpillStore(ensure_config(SpillSettings))
+
     @hookimpl
     def build_tape_context(self) -> TapeContext:
         return default_tape_context()
@@ -417,3 +440,27 @@ class BuiltinImpl:
         else:
             guidance = f"Tool `{call.tool}` does not exist. No similar tool is available."
         return ToolCallDecision.replace(guidance)
+
+    @hookimpl
+    async def after_tool_call(
+        self,
+        call: ToolCall,
+        result: ToolCallResult,
+        state: TurnState,
+    ) -> None:
+        from bub.builtin.spill import SPILL_SIDECAR_NAME, SpillStore
+
+        if result.error is not None or not isinstance(result.result, str):
+            return
+        tape = state.get("_runtime_tape")
+        if tape is None:
+            return
+        spill = tape.get_sidecar(SPILL_SIDECAR_NAME)
+        if not isinstance(spill, SpillStore):
+            return
+        result.result = await spill.spill_tool_result(
+            tape,
+            result.result,
+            tool=call.tool,
+            run_id=call.run_id,
+        )

{bub-0.4.3 → bub-0.4.4}/src/bub/builtin/model_runner.py

@@ -7,6 +7,7 @@ import re
 from collections.abc import AsyncGenerator, AsyncIterator, Iterable, Iterator
 from dataclasses import dataclass
 from datetime import UTC, datetime
+from time import monotonic
 from typing import Any, Literal, cast
 
 from any_llm import AnyLLM
@@ -28,6 +29,7 @@ from pydantic import TypeAdapter, ValidationError
 
 from bub.builtin.codex_provider import OpenaiCodexProvider, should_use_openai_codex_provider
 from bub.builtin.settings import AgentSettings, ModelCandidate
+from bub.channels.message import audio_mime_type_from_format
 from bub.errors import BubError, ErrorKind
 from bub.hooks.interception import (
     AgentHooks,
@@ -45,6 +47,7 @@ CONTEXT_LENGTH_PATTERNS = re.compile(
 )
 TOOL_ARGUMENTS_ADAPTER = TypeAdapter(dict[str, Any])
 CompletionResult = ChatCompletion | ParsedChatCompletion[Any] | AsyncIterator[ChatCompletionChunk]
+GOOGLE_FILE_CONTENT_PROVIDERS = frozenset({LLMProvider.GEMINI, LLMProvider.VERTEXAI})
 
 
 def _extra_options(llm: AnyLLM, *, stream: bool) -> dict[str, Any]:
@@ -56,6 +59,48 @@ def _extra_options(llm: AnyLLM, *, stream: bool) -> dict[str, Any]:
     return {}
 
 
+def _adapt_messages_for_provider(messages: list[dict[str, Any]], provider: LLMProvider) -> list[dict[str, Any]]:
+    """Translate canonical multimodal blocks when a provider uses a different wire format."""
+    if provider not in GOOGLE_FILE_CONTENT_PROVIDERS:
+        return messages
+
+    adapted_messages: list[dict[str, Any]] = []
+    for message in messages:
+        content = message.get("content")
+        if not isinstance(content, list):
+            adapted_messages.append(message)
+            continue
+
+        adapted_content: list[Any] = []
+        changed = False
+        for part in content:
+            if not isinstance(part, dict):
+                adapted_content.append(part)
+                continue
+
+            if part.get("type") == "video_url":
+                video_url = part.get("video_url")
+                url = video_url.get("url") if isinstance(video_url, dict) else None
+                if isinstance(url, str) and url:
+                    adapted_content.append({"type": "file", "file": {"file_data": url}})
+                    changed = True
+                    continue
+            elif part.get("type") == "input_audio":
+                input_audio = part.get("input_audio")
+                data = input_audio.get("data") if isinstance(input_audio, dict) else None
+                audio_format = input_audio.get("format") if isinstance(input_audio, dict) else None
+                if isinstance(data, str) and data and isinstance(audio_format, str) and audio_format:
+                    mime_type = audio_mime_type_from_format(audio_format)
+                    file_data = f"data:{mime_type};base64,{data}"
+                    adapted_content.append({"type": "file", "file": {"file_data": file_data}})
+                    changed = True
+                    continue
+            adapted_content.append(part)
+
+        adapted_messages.append({**message, "content": adapted_content} if changed else message)
+    return adapted_messages
+
+
 class ModelRunner:
     def __init__(self, settings: AgentSettings, hooks: AgentHooks | None = None) -> None:
         self.settings = settings
@@ -90,12 +135,12 @@ class ModelRunner:
         reasoning_effort: str | None = None,
     ) -> CompletionResult:
         tool_payloads = [tool.to_schema() for tool in tools] or None
-        completion_messages: list[dict[str, Any] | ChatCompletionMessage] = list(messages)
         clients = list(self.iter_llm_clients(model))
         completion_error: Exception | None = None
         for index, (candidate, llm) in enumerate(clients):
             try:
                 streaming = llm.SUPPORTS_COMPLETION_STREAMING
+                completion_messages = _adapt_messages_for_provider(messages, candidate.provider)
                 completion_kwargs = {
                     **self.settings.completion_args,
                     **_extra_options(llm, stream=streaming),
@@ -175,6 +220,7 @@ class ModelRunner:
                 await self._fire_after_llm_call(request, output, state, llm_started, tape, error=error)
 
             try:
+                completion_started = monotonic()
                 async with asyncio.timeout(self.settings.model_timeout_seconds):
                     completion = await self.completion_response(
                         model=request.model,
@@ -185,6 +231,7 @@ class ModelRunner:
                     )
                     async for event in self._completion_events(completion, state, output):
                         yield event
+                completion_elapsed = monotonic() - completion_started
             except Exception as exc:
                 # Cancellation / consumer close (BaseException) intentionally
                 # bypasses after_llm_call: only real completions and failures
@@ -193,6 +240,8 @@ class ModelRunner:
                 raise
             await fire_after()
 
+            yield StreamEvent("usage", {"usage": state.usage, "elapsed_seconds": completion_elapsed})
+
             tool_calls = output.tool_calls
             if tool_calls:
                 tool_map = {tool_item.name: tool_item for tool_item in tools}

{bub-0.4.3 → bub-0.4.4}/src/bub/builtin/shell_manager.py

@@ -4,6 +4,7 @@ import asyncio
 import contextlib
 import os
 import shutil
+import signal
 import uuid
 from dataclasses import dataclass, field
 
@@ -33,6 +34,8 @@ class ManagedShell:
 
 class ShellManager:
     SHELL = shutil.which("bash") or shutil.which("sh") if os.name != "nt" else None
+    TERMINATE_TIMEOUT = 3.0
+    DRAIN_TIMEOUT = 1.0
 
     def __init__(self) -> None:
         self._shells: dict[str, ManagedShell] = {}
@@ -44,6 +47,7 @@ class ShellManager:
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
             executable=self.SHELL,
+            start_new_session=os.name != "nt",
         )
         shell = ManagedShell(
             shell_id=f"bash-{uuid.uuid4().hex[:8]}",
@@ -70,20 +74,52 @@ class ShellManager:
 
     async def terminate(self, shell_id: str) -> ManagedShell:
         shell = self.get(shell_id)
-        if shell.returncode is not None:
-            await self._finalize_shell(shell)
-            return shell
-
-        shell.process.terminate()
+        self._signal_shell(shell, kill=False)
         try:
-            async with asyncio.timeout(3):
-                await shell.process.wait()
+            async with asyncio.timeout(self.TERMINATE_TIMEOUT):
+                # The shell may exit before its children, even when they have
+                # closed their output pipes. Wait for the group, not just its leader.
+                while self._is_running(shell):
+                    await asyncio.sleep(0.05)
         except TimeoutError:
-            shell.process.kill()
-            await shell.process.wait()
-        await self._finalize_shell(shell)
+            self._signal_shell(shell, kill=True)
+        try:
+            async with asyncio.timeout(self.DRAIN_TIMEOUT):
+                await self.wait_closed(shell_id)
+        except TimeoutError:
+            # A descendant can escape the group and retain a pipe. Do not let
+            # waiting for EOF make termination unbounded.
+            for task in shell.read_tasks:
+                task.cancel()
+            await asyncio.gather(*shell.read_tasks, return_exceptions=True)
+            self._shells.pop(shell_id, None)
         return shell
 
+    @staticmethod
+    def _signal_shell(shell: ManagedShell, *, kill: bool) -> None:
+        with contextlib.suppress(ProcessLookupError):
+            if os.name != "nt":
+                os.killpg(shell.process.pid, signal.SIGKILL if kill else signal.SIGTERM)
+            elif shell.returncode is None:
+                if kill:
+                    shell.process.kill()
+                else:
+                    shell.process.terminate()
+
+    @staticmethod
+    def _is_running(shell: ManagedShell) -> bool:
+        if os.name == "nt":
+            return shell.returncode is None
+        try:
+            os.killpg(shell.process.pid, 0)
+        except ProcessLookupError:
+            return False
+        except PermissionError:
+            # EPERM does not establish that the group is gone (in particular
+            # while its leader is exiting on macOS).
+            return True
+        return True
+
     async def terminate_session(self, session_id: str) -> int:
         shell_ids = [shell.shell_id for shell in self._shells.values() if shell.session_id == session_id]
         for shell_id in shell_ids:
@@ -100,8 +136,8 @@ class ShellManager:
 
     async def _finalize_shell(self, shell: ManagedShell) -> None:
         for task in shell.read_tasks:
-            with contextlib.suppress(asyncio.CancelledError):
-                await task
+            # A caller timing out must not cancel a reader or swallow cancellation.
+            await asyncio.shield(task)
         self._shells.pop(shell.shell_id, None)
 
     async def _drain_stream(