bub 0.3.7__tar.gz → 0.3.8__tar.gz

{bub-0.3.7 → bub-0.3.8}/.gitignore

@@ -142,6 +142,8 @@ cython_debug/
 
 # Reference directory - ignore all reference projects
 reference/
+!website/src/content/docs/**/build
+!website/src/content/docs/**/reference
 
 # Local legacy backups created during framework migrations
 backup/

{bub-0.3.7 → bub-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bub
-Version: 0.3.7
+Version: 0.3.8
 Summary: A common shape for agents that live alongside people.
 Project-URL: Homepage, https://bub.build
 Project-URL: Repository, https://github.com/bubbuild/bub
@@ -106,24 +106,28 @@ Key source files:
 
 ```python
 from bub import hookimpl
+from bub.envelope import content_of
 
 
 class EchoPlugin:
     @hookimpl
     def build_prompt(self, message, session_id, state):
-        return f"[echo] {message['content']}"
+        return f"[echo] {content_of(message)}"
 
     @hookimpl
     async def run_model(self, prompt, session_id, state):
         return prompt
+
+
+echo_plugin = EchoPlugin()
 ```
 
 ```toml
 [project.entry-points."bub"]
-echo = "my_package.plugin:EchoPlugin"
+echo = "my_package.plugin:echo_plugin"
 ```
 
-See the [Extending docs](https://bub.build/docs/extending/) for hook guides, packaging, and plugin structure.
+See the [Build docs](https://bub.build/docs/build/) for hook guides, packaging, and plugin structure.
 
 ## CLI
 
@@ -150,7 +154,7 @@ Lines starting with `,` enter internal command mode (`,help`, `,skill name=my-sk
 | `BUB_API_FORMAT`            | `completion`                 | `completion`, `responses`, or `messages`             |
 | `BUB_CLIENT_ARGS`           | —                            | JSON object forwarded to the underlying model client |
 | `BUB_MAX_STEPS`             | `50`                         | Max tool-use loop iterations                         |
-| `BUB_MAX_TOKENS`            | `1024`                       | Max tokens per model call                            |
+| `BUB_MAX_TOKENS`            | `16384`                      | Max tokens per model call                            |
 | `BUB_MODEL_TIMEOUT_SECONDS` | —                            | Model call timeout (seconds)                         |
 
 ## Background
@@ -166,11 +170,11 @@ Read more:
 ## Docs
 
 - [Getting Started](https://bub.build/docs/getting-started/) — install Bub and run the first turn
-- [Architecture](https://bub.build/docs/concepts/architecture/) — the mental model behind the runtime
-- [Channels](https://bub.build/docs/guides/channels/) — run Bub in CLI, Telegram, or your own channel
-- [Skills](https://bub.build/docs/guides/skills/) — discover, inspect, and author Agent Skills in Bub
-- [Extending](https://bub.build/docs/extending/) — write plugins, override hooks, ship tools and skills
-- [Deployment](https://bub.build/docs/guides/deployment/) — Docker, environment, upgrades
+- [Concepts](https://bub.build/docs/concepts/) — the mental model behind the runtime
+- [Channels](https://bub.build/docs/operate/channels/) — run Bub in CLI, Telegram, or your own channel
+- [Skills](https://bub.build/docs/build/skills/) — discover, inspect, and author Agent Skills in Bub
+- [Build](https://bub.build/docs/build/) — write plugins, override hooks, ship tools and skills
+- [Deployment](https://bub.build/docs/operate/deploy/) — Docker, environment, upgrades
 
 ## Development
 

{bub-0.3.7 → bub-0.3.8}/README.md

@@ -70,24 +70,28 @@ Key source files:
 
 ```python
 from bub import hookimpl
+from bub.envelope import content_of
 
 
 class EchoPlugin:
     @hookimpl
     def build_prompt(self, message, session_id, state):
-        return f"[echo] {message['content']}"
+        return f"[echo] {content_of(message)}"
 
     @hookimpl
     async def run_model(self, prompt, session_id, state):
         return prompt
+
+
+echo_plugin = EchoPlugin()
 ```
 
 ```toml
 [project.entry-points."bub"]
-echo = "my_package.plugin:EchoPlugin"
+echo = "my_package.plugin:echo_plugin"
 ```
 
-See the [Extending docs](https://bub.build/docs/extending/) for hook guides, packaging, and plugin structure.
+See the [Build docs](https://bub.build/docs/build/) for hook guides, packaging, and plugin structure.
 
 ## CLI
 
@@ -114,7 +118,7 @@ Lines starting with `,` enter internal command mode (`,help`, `,skill name=my-sk
 | `BUB_API_FORMAT`            | `completion`                 | `completion`, `responses`, or `messages`             |
 | `BUB_CLIENT_ARGS`           | —                            | JSON object forwarded to the underlying model client |
 | `BUB_MAX_STEPS`             | `50`                         | Max tool-use loop iterations                         |
-| `BUB_MAX_TOKENS`            | `1024`                       | Max tokens per model call                            |
+| `BUB_MAX_TOKENS`            | `16384`                      | Max tokens per model call                            |
 | `BUB_MODEL_TIMEOUT_SECONDS` | —                            | Model call timeout (seconds)                         |
 
 ## Background
@@ -130,11 +134,11 @@ Read more:
 ## Docs
 
 - [Getting Started](https://bub.build/docs/getting-started/) — install Bub and run the first turn
-- [Architecture](https://bub.build/docs/concepts/architecture/) — the mental model behind the runtime
-- [Channels](https://bub.build/docs/guides/channels/) — run Bub in CLI, Telegram, or your own channel
-- [Skills](https://bub.build/docs/guides/skills/) — discover, inspect, and author Agent Skills in Bub
-- [Extending](https://bub.build/docs/extending/) — write plugins, override hooks, ship tools and skills
-- [Deployment](https://bub.build/docs/guides/deployment/) — Docker, environment, upgrades
+- [Concepts](https://bub.build/docs/concepts/) — the mental model behind the runtime
+- [Channels](https://bub.build/docs/operate/channels/) — run Bub in CLI, Telegram, or your own channel
+- [Skills](https://bub.build/docs/build/skills/) — discover, inspect, and author Agent Skills in Bub
+- [Build](https://bub.build/docs/build/) — write plugins, override hooks, ship tools and skills
+- [Deployment](https://bub.build/docs/operate/deploy/) — Docker, environment, upgrades
 
 ## Development
 

{bub-0.3.7 → bub-0.3.8}/src/bub/__main__.py

@@ -2,22 +2,27 @@
 
 from __future__ import annotations
 
+import sys
+
 import typer
 
 from bub.framework import BubFramework
 
 
 def _instrument_bub() -> None:
+    from loguru import logger
+
+    logger.remove()
+    logger.add(sys.stderr, colorize=True)
+
     try:
         import logfire
+        from logfire.integrations.loguru import LogfireHandler
 
         logfire.configure()
+        logger.add(LogfireHandler(), format="{message}")
     except ImportError:
         pass
-    else:
-        from loguru import logger
-
-        logger.configure(handlers=[logfire.loguru_handler()])
 
 
 def create_cli_app() -> typer.Typer:

{bub-0.3.7 → bub-0.3.8}/src/bub/_version.py

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

{bub-0.3.7 → bub-0.3.8}/src/bub/builtin/agent.py

@@ -41,7 +41,7 @@ from bub.utils import workspace_from_state
 CONTINUE_PROMPT = "Continue the task."
 HINT_RE = re.compile(r"\$([A-Za-z0-9_.-]+)")
 _CONTEXT_LENGTH_PATTERNS = re.compile(
-    r"context.{0,20}length|maximum.{0,20}context|token.{0,10}limit|prompt.{0,10}too long|tokens? > \d+ maximum",
+    r"context.{0,20}(?:length|window)|maximum.{0,20}context|token.{0,10}limit|prompt.{0,10}too long|tokens? > \d+ maximum",
     re.IGNORECASE,
 )
 MAX_AUTO_HANDOFF_RETRIES = 1

{bub-0.3.7 → bub-0.3.8}/src/bub/builtin/cli.py

@@ -21,6 +21,7 @@ from bub.builtin.auth import app as login_app  # noqa: F401
 from bub.channels.message import ChannelMessage
 from bub.envelope import field_of
 from bub.framework import BubFramework
+from bub.types import TurnResult
 
 ONBOARD_BANNER = r"""
  ███████████             █████
@@ -53,7 +54,11 @@ def run(
         context={"sender_id": sender_id},
     )
 
-    result = asyncio.run(framework.process_inbound(inbound))
+    async def _run() -> TurnResult:
+        async with framework.running():
+            return await framework.process_inbound(inbound)
+
+    result = asyncio.run(_run())
     for outbound in result.outbounds:
         rendered = str(field_of(outbound, "content", ""))
         target_channel = str(field_of(outbound, "channel", "stdout"))
@@ -128,8 +133,10 @@ def _find_uv() -> str:
     import shutil
     import sysconfig
 
+    default_path = Path.home() / ".local" / "bin"
+
     bin_path = sysconfig.get_path("scripts")
-    uv_path = shutil.which("uv", path=os.pathsep.join([bin_path, os.getenv("PATH", "")]))
+    uv_path = shutil.which("uv", path=os.pathsep.join([bin_path, str(default_path), os.getenv("PATH", "")]))
     if uv_path is None:
         raise FileNotFoundError("uv executable not found in PATH or scripts directory.")
     return uv_path

{bub-0.3.7 → bub-0.3.8}/src/bub/builtin/settings.py

@@ -12,7 +12,7 @@ from pydantic_settings import SettingsConfigDict
 from bub import Settings, config, ensure_config
 
 DEFAULT_MODEL = "openrouter:openrouter/free"
-DEFAULT_MAX_TOKENS = 1024
+DEFAULT_MAX_TOKENS = 16384
 
 
 def provider_specific(setting_name: str) -> Callable[[], dict[str, str] | None]:

{bub-0.3.7 → bub-0.3.8}/src/bub/builtin/shell_manager.py

@@ -13,6 +13,7 @@ class ManagedShell:
     shell_id: str
     cmd: str
     cwd: str | None
+    session_id: str | None
     process: asyncio.subprocess.Process
     output_chunks: list[str] = field(default_factory=list)
     read_tasks: list[asyncio.Task[None]] = field(default_factory=list)
@@ -36,7 +37,7 @@ class ShellManager:
     def __init__(self) -> None:
         self._shells: dict[str, ManagedShell] = {}
 
-    async def start(self, *, cmd: str, cwd: str | None) -> ManagedShell:
+    async def start(self, *, cmd: str, cwd: str | None, session_id: str | None = None) -> ManagedShell:
         process = await asyncio.create_subprocess_shell(
             cmd,
             cwd=cwd,
@@ -44,7 +45,13 @@ class ShellManager:
             stderr=asyncio.subprocess.PIPE,
             executable=self.SHELL,
         )
-        shell = ManagedShell(shell_id=f"bash-{uuid.uuid4().hex[:8]}", cmd=cmd, cwd=cwd, process=process)
+        shell = ManagedShell(
+            shell_id=f"bash-{uuid.uuid4().hex[:8]}",
+            cmd=cmd,
+            cwd=cwd,
+            session_id=session_id,
+            process=process,
+        )
         shell.read_tasks.extend([
             asyncio.create_task(self._drain_stream(shell, process.stdout)),
             asyncio.create_task(self._drain_stream(shell, process.stderr)),
@@ -77,6 +84,13 @@ class ShellManager:
         await self._finalize_shell(shell)
         return shell
 
+    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:
+            with contextlib.suppress(KeyError):
+                await self.terminate(shell_id)
+        return len(shell_ids)
+
     async def wait_closed(self, shell_id: str) -> ManagedShell:
         shell = self.get(shell_id)
         if shell.returncode is None:

{bub-0.3.7 → bub-0.3.8}/src/bub/builtin/tools.py

@@ -79,12 +79,17 @@ async def bash(
     """Run a shell command. Use background=true to keep it running and fetch output later via bash_output."""
     workspace = context.state.get("_runtime_workspace")
     target_cwd = cwd or workspace
-    shell = await shell_manager.start(cmd=cmd, cwd=target_cwd)
+    raw_session_id = context.state.get("session_id")
+    session_id = str(raw_session_id) if raw_session_id is not None else None
+    shell = await shell_manager.start(cmd=cmd, cwd=target_cwd, session_id=session_id)
     if background:
         return f"started: {shell.shell_id}"
     try:
         async with asyncio.timeout(timeout_seconds):
             shell = await shell_manager.wait_closed(shell.shell_id)
+    except asyncio.CancelledError:
+        await shell_manager.terminate(shell.shell_id)
+        raise
     except TimeoutError:
         await shell_manager.terminate(shell.shell_id)
         return f"command timed out after {timeout_seconds} seconds and was terminated"
@@ -307,9 +312,10 @@ def show_help() -> str:
 
 @tool(name="quit", context=True)
 async def quit_tool(*, context: ToolContext) -> str:
-    """Quit the tasks of the current session."""
+    """Abort the tasks of the current session. DO NOT use it in a normal workflow."""
     agent = _get_agent(context)
-    session_id = context.state.get("session_id", "temp/unknown")
+    session_id = str(context.state.get("session_id", "temp/unknown"))
+    await shell_manager.terminate_session(session_id)
     await agent.framework.quit_via_router(session_id)
     return "Session tasks stopped."
 

{bub-0.3.7 → bub-0.3.8}/src/bub/channels/cli/__init__.py

@@ -44,14 +44,13 @@ class CliChannel(Channel):
         self._mode = "agent"  # or "shell"
         self._main_task: asyncio.Task | None = None
         self._renderer = CliRenderer(get_console())
-        self._log_handler_id = self._install_log_sink()
         self._last_tape_info: TapeInfo | None = None
         self._workspace = self._agent.framework.workspace
         self._prompt = self._build_prompt(self._workspace)
 
     def _install_log_sink(self) -> int:
         with contextlib.suppress(ValueError):
-            logger.remove(0)
+            logger.remove()
         return logger.add(self._renderer.log, colorize=False, format="{level:<8} | {message}")
 
     async def _refresh_tape_info(self) -> None:
@@ -66,6 +65,7 @@ class CliChannel(Channel):
             self._message_template["chat_id"] = chat_id
 
     async def start(self, stop_event: asyncio.Event) -> None:
+        self._log_handler_id = self._install_log_sink()
         self._stop_event = stop_event
         self._main_task = asyncio.create_task(self._main_loop())
 

{bub-0.3.7 → bub-0.3.8}/src/bub/channels/manager.py

@@ -118,11 +118,16 @@ class ChannelManager:
 
     async def quit(self, session_id: str) -> None:
         tasks = self._ongoing_tasks.pop(session_id, set())
+        current_task = asyncio.current_task()
+        cancelled_count = 0
         for task in tasks:
+            if task is current_task:
+                continue
             task.cancel()
             with contextlib.suppress(asyncio.CancelledError):
                 await task
-        logger.info(f"channel.manager quit session_id={session_id}, cancelled {len(tasks)} tasks")
+            cancelled_count += 1
+        logger.info(f"channel.manager quit session_id={session_id}, cancelled {cancelled_count} tasks")
 
     def enabled_channels(self) -> list[Channel]:
         if "all" in self._enabled_channels:
@@ -133,7 +138,10 @@ class ChannelManager:
         ]
 
     def _on_task_done(self, session_id: str, task: asyncio.Task) -> None:
-        task.exception()  # to log any exception
+        if task.cancelled():
+            logger.info("channel.manager task cancelled session_id={}", session_id)
+        else:
+            task.exception()  # to log any exception
         tasks = self._ongoing_tasks.get(session_id, set())
         tasks.discard(task)
         if not tasks:
@@ -142,24 +150,25 @@ class ChannelManager:
     async def listen_and_run(self) -> None:
         stop_event = asyncio.Event()
         self.framework.bind_outbound_router(self)
-        for channel in self.enabled_channels():
-            await channel.start(stop_event)
-        logger.info("channel.manager started listening")
-        try:
-            while True:
-                message = await wait_until_stopped(self._messages.get(), stop_event)
-                task = asyncio.create_task(self.framework.process_inbound(message, self._stream_output))
-                task.add_done_callback(functools.partial(self._on_task_done, message.session_id))
-                self._ongoing_tasks.setdefault(message.session_id, set()).add(task)
-        except asyncio.CancelledError:
-            logger.info("channel.manager received shutdown signal")
-        except Exception:
-            logger.exception("channel.manager error")
-            raise
-        finally:
-            self.framework.bind_outbound_router(None)
-            await self.shutdown()
-            logger.info("channel.manager stopped")
+        async with self.framework.running():
+            for channel in self.enabled_channels():
+                await channel.start(stop_event)
+            logger.info("channel.manager started listening")
+            try:
+                while True:
+                    message = await wait_until_stopped(self._messages.get(), stop_event)
+                    task = asyncio.create_task(self.framework.process_inbound(message, self._stream_output))
+                    task.add_done_callback(functools.partial(self._on_task_done, message.session_id))
+                    self._ongoing_tasks.setdefault(message.session_id, set()).add(task)
+            except asyncio.CancelledError:
+                logger.info("channel.manager received shutdown signal")
+            except Exception:
+                logger.exception("channel.manager error")
+                raise
+            finally:
+                self.framework.bind_outbound_router(None)
+                await self.shutdown()
+                logger.info("channel.manager stopped")
 
     async def shutdown(self) -> None:
         count = 0

{bub-0.3.7 → bub-0.3.8}/src/bub/channels/telegram.py

@@ -173,10 +173,10 @@ class TelegramChannel(Channel):
             len(self._allow_chats),
             bool(proxy),
         )
-        get_updates_request = HTTPXRequest(read_timeout=30)
+        get_updates_request = HTTPXRequest(read_timeout=30, proxy=proxy)
         builder = Application.builder().token(self._settings.token).get_updates_request(get_updates_request)
         if proxy:
-            builder = builder.proxy(proxy).get_updates_proxy(proxy)
+            builder = builder.proxy(proxy)
         self._app = builder.build()
         self._app.add_handler(CommandHandler("start", self._on_start))
         self._app.add_handler(CommandHandler("bub", self._on_message, has_args=True, block=False))

{bub-0.3.7 → bub-0.3.8}/src/bub/configure.py

@@ -6,6 +6,7 @@ from pydantic_settings import BaseSettings, PydanticBaseSettingsSource
 
 CONFIG_MAP: dict[str, list[type[BaseSettings]]] = {}
 ROOT = ""
+MISSING = object()
 
 _global_config: dict[str, list[BaseSettings]] = {}
 _config_data: dict[str, Any] = {}
@@ -95,6 +96,22 @@ def ensure_config[C: BaseSettings](config_cls: type[C]) -> C:
     return instance
 
 
+def get_value(path: str, default: Any = MISSING) -> Any:
+    """Get a loaded config value by dotted path, preserving registered settings behavior."""
+
+    parts = [part for part in path.split(".") if part]
+    if not parts:
+        raise ValueError("config path must not be empty")
+
+    value = _lookup_registered_config(parts)
+    if value is not MISSING:
+        return value
+
+    if default is not MISSING:
+        return default
+    raise KeyError(path)
+
+
 def _copy_dict(data: dict[str, Any]) -> dict[str, Any]:
     copied: dict[str, Any] = {}
     for key, value in data.items():
@@ -105,6 +122,36 @@ def _copy_dict(data: dict[str, Any]) -> dict[str, Any]:
     return copied
 
 
+def _lookup_registered_config(parts: list[str]) -> Any:
+    section, *subpath = parts
+    if section in CONFIG_MAP and section != ROOT:
+        for config_cls in CONFIG_MAP[section]:
+            value = _lookup_path(ensure_config(config_cls), subpath)
+            if value is not MISSING:
+                return value
+
+    for config_cls in CONFIG_MAP.get(ROOT, []):
+        value = _lookup_path(ensure_config(config_cls), parts)
+        if value is not MISSING:
+            return value
+
+    return MISSING
+
+
+def _lookup_path(value: Any, parts: list[str]) -> Any:
+    current = value
+    for part in parts:
+        if isinstance(current, dict):
+            if part not in current:
+                return MISSING
+            current = current[part]
+            continue
+        if not hasattr(current, part):
+            return MISSING
+        current = getattr(current, part)
+    return current
+
+
 def _merge_into(target: dict[str, Any], incoming: dict[str, Any], path: tuple[str, ...]) -> None:
     for key, value in incoming.items():
         existing = target.get(key)

{bub-0.3.7 → bub-0.3.8}/src/bub/framework.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import contextlib
+from collections.abc import AsyncGenerator, AsyncIterator, Iterator
 from dataclasses import dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
@@ -46,6 +48,7 @@ class BubFramework:
         self._hook_runtime = HookRuntime(self._plugin_manager)
         self._plugin_status: dict[str, PluginStatus] = {}
         self._outbound_router: OutboundChannelRouter | None = None
+        self._tape_store: TapeStore | AsyncTapeStore | None = None
         configure.load(self.config_file)
 
     def _load_builtin_hooks(self) -> None:
@@ -253,8 +256,24 @@ class BubFramework:
                     channels[channel.name] = channel
         return channels
 
+    @contextlib.asynccontextmanager
+    async def running(self) -> AsyncGenerator[contextlib.AsyncExitStack, None]:
+        async with contextlib.AsyncExitStack() as stack:
+            tape_store = self._hook_runtime.call_first_sync("provide_tape_store")
+            # Allow plugins to return either TapeStore/AsyncTapeStore instances or context managers for them
+            # This benefits plugins that need to initialize and clean up resources with the tape store.
+            if isinstance(tape_store, AsyncIterator):
+                tape_store = await stack.enter_async_context(contextlib.asynccontextmanager(lambda: tape_store)())
+            elif isinstance(tape_store, Iterator):
+                tape_store = stack.enter_context(contextlib.contextmanager(lambda: tape_store)())
+            self._tape_store = tape_store
+            try:
+                yield stack
+            finally:
+                self._tape_store = None
+
     def get_tape_store(self) -> TapeStore | AsyncTapeStore | None:
-        return self._hook_runtime.call_first_sync("provide_tape_store")
+        return self._tape_store
 
     def get_system_prompt(self, prompt: str | list[dict], state: dict[str, Any]) -> str:
         return "\n\n".join(
@@ -269,7 +288,7 @@ class BubFramework:
     def collect_onboard_config(self) -> dict[str, Any]:
         current_config: dict[str, Any] = {}
 
-        for impl in self._hook_runtime._iter_hookimpls("onboard_config"):
+        for impl in reversed(list(self._hook_runtime._iter_hookimpls("onboard_config"))):
             result = self._hook_runtime._invoke_impl_sync(
                 hook_name="onboard_config",
                 impl=impl,

{bub-0.3.7 → bub-0.3.8}/src/bub/skills.py

@@ -13,11 +13,14 @@ from typing import Any
 
 import yaml
 
+import bub.configure as configure
+
 PROJECT_SKILLS_DIR = ".agents/skills"
 LEGACY_SKILLS_DIR = ".agent/skills"
 SKILL_FILE_NAME = "SKILL.md"
 SKILL_SOURCES = ("project", "global", "builtin")
 SKILL_NAME_PATTERN = re.compile(r"^[a-z0-9]+(?:-[a-z0-9]+)*$")
+CONFIG_TEMPLATE_PATTERN = re.compile(r"\$\{\s*config\.([a-zA-Z0-9_.-]+)\s*\}")
 
 
 @dataclass(frozen=True)
@@ -33,11 +36,15 @@ class SkillMetadata:
     def body(self) -> str:
         front_matter_pattern = re.compile(r"^---\s*\n.*?\n---\s*\n", re.DOTALL)
         try:
-            template = string.Template(self.location.read_text(encoding="utf-8").strip())
+            template_content = self.location.read_text(encoding="utf-8").strip()
         except OSError:
             return ""
-        content = template.safe_substitute({"SKILL_DIR": str(self.location.parent), "PYTHON": sys.executable})
-        return front_matter_pattern.sub("", content, count=1).strip()
+        raw_content = front_matter_pattern.sub("", template_content, count=1).strip()
+        content = _render_config_templates(raw_content)
+        return string.Template(content).safe_substitute({
+            "SKILL_DIR": str(self.location.parent),
+            "PYTHON": sys.executable,
+        })
 
 
 def discover_skills(workspace_path: Path) -> list[SkillMetadata]:
@@ -60,6 +67,23 @@ def discover_skills(workspace_path: Path) -> list[SkillMetadata]:
     return sorted(skills_by_name.values(), key=lambda item: item.name.casefold())
 
 
+def _render_config_templates(content: str) -> str:
+    def replace(match: re.Match[str]) -> str:
+        try:
+            value = configure.get_value(match.group(1), default="")
+        except KeyError:
+            return match.group(0)
+        if isinstance(value, str):
+            return value
+        if isinstance(value, bool):
+            return "true" if value else "false"
+        if isinstance(value, int | float):
+            return str(value)
+        return yaml.safe_dump(value, sort_keys=False).strip()
+
+    return CONFIG_TEMPLATE_PATTERN.sub(replace, content)
+
+
 def _read_skill(skill_dir: Path, *, source: str) -> SkillMetadata | None:
     skill_file = skill_dir / SKILL_FILE_NAME
     if not skill_file.is_file():

{bub-0.3.7 → bub-0.3.8}/src/skills/skill-creator/SKILL.md

@@ -20,8 +20,8 @@ equipped with procedural knowledge that no model can fully possess.
 
 When creating a skill, place it in one of these two roots:
 
-1. Project-local: `$workspace/.agent/skills/<skill-name>`
-2. Global: `~/.agent/skills/<skill-name>` (shared across workspaces)
+1. Project-local: `$workspace/.agents/skills/<skill-name>`
+2. Global: `~/.agents/skills/<skill-name>` (shared across workspaces)
 
 Prefer project-local by default. Use global only when the user explicitly wants the skill available across multiple workspaces.
 

{bub-0.3.7 → bub-0.3.8}/src/skills/telegram/SKILL.md

@@ -13,7 +13,9 @@ metadata:
 
 Agent-facing execution guide for Telegram outbound communication.
 
-Assumption: `BUB_TELEGRAM_TOKEN` is already available.
+Env vars:
+
+- `BUB_TELEGRAM_TOKEN=${config.telegram.token}`
 
 ## Required Inputs
 Collect these before execution:
@@ -76,18 +78,18 @@ Paths are relative to this skill directory.
 
 ```bash
 # Send message (ALWAYS use heredoc stdin, never inline text in arguments)
-cat << 'EOF' | uv run ${SKILL_DIR}/scripts/telegram_send.py --chat-id <CHAT_ID> --message -
+cat << 'EOF' | uv run ${SKILL_DIR}/scripts/telegram_send.py --chat-id <CHAT_ID> --token "$BUB_TELEGRAM_TOKEN" --message -
 Your message content here.
 Special characters are safe: $100, "quotes", 'apostrophes', !exclamation
 EOF
 
 # Reply to a specific message
-cat << 'EOF' | uv run ${SKILL_DIR}/scripts/telegram_send.py --chat-id <CHAT_ID> --reply-to <MESSAGE_ID> --message -
+cat << 'EOF' | uv run ${SKILL_DIR}/scripts/telegram_send.py --chat-id <CHAT_ID> --token "$BUB_TELEGRAM_TOKEN" --reply-to <MESSAGE_ID> --message -
 Reply content here.
 EOF
 
 # Edit an existing message
-cat << 'EOF' | uv run ${SKILL_DIR}/scripts/telegram_edit.py --chat-id <CHAT_ID> --message-id <MESSAGE_ID> --text -
+cat << 'EOF' | uv run ${SKILL_DIR}/scripts/telegram_edit.py --chat-id <CHAT_ID> --token "$BUB_TELEGRAM_TOKEN" --message-id <MESSAGE_ID> --text -
 Updated content here.
 EOF
 ```