bub 0.3.4__tar.gz → 0.3.5__tar.gz

{bub-0.3.4 → bub-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bub
-Version: 0.3.4
+Version: 0.3.5
 Summary: A common shape for agents that live alongside people.
 Project-URL: Homepage, https://bub.build
 Project-URL: Repository, https://github.com/bubbuild/bub
@@ -130,11 +130,14 @@ See the [Extension Guide](https://bub.build/extension-guide/) for hook semantics
 | `bub chat`         | Interactive REPL                  |
 | `bub run MESSAGE`  | One-shot turn                     |
 | `bub gateway`      | Channel listener (Telegram, etc.) |
+| `bub install`      | Install or sync Bub plugin deps   |
+| `bub update`       | Upgrade Bub plugin deps           |
 | `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`).
 
+`bub hooks` still exists for diagnostics, but it is hidden from top-level help. `bub install` and `bub update` manage a separate uv project for Bub plugins, defaulting to `~/.bub/bub-project` or `BUB_PROJECT`.
+
 ## Configuration
 
 | Variable | Default | Description |

{bub-0.3.4 → bub-0.3.5}/README.md

@@ -96,11 +96,14 @@ See the [Extension Guide](https://bub.build/extension-guide/) for hook semantics
 | `bub chat`         | Interactive REPL                  |
 | `bub run MESSAGE`  | One-shot turn                     |
 | `bub gateway`      | Channel listener (Telegram, etc.) |
+| `bub install`      | Install or sync Bub plugin deps   |
+| `bub update`       | Upgrade Bub plugin deps           |
 | `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`).
 
+`bub hooks` still exists for diagnostics, but it is hidden from top-level help. `bub install` and `bub update` manage a separate uv project for Bub plugins, defaulting to `~/.bub/bub-project` or `BUB_PROJECT`.
+
 ## Configuration
 
 | Variable | Default | Description |

{bub-0.3.4 → bub-0.3.5}/pyproject.toml

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

{bub-0.3.4 → bub-0.3.5}/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.4"
+__version__ = "0.3.5"

{bub-0.3.4 → bub-0.3.5}/src/bub/builtin/cli.py

@@ -4,11 +4,15 @@
 from __future__ import annotations
 
 import asyncio
+import json
 import os
 import subprocess
 import sys
 from functools import lru_cache
+from importlib import metadata
 from pathlib import Path
+from urllib.parse import unquote, urlsplit
+from urllib.request import url2pathname
 
 import typer
 
@@ -148,15 +152,67 @@ def _build_requirement(spec: str) -> str:
         return f"git+https://github.com/{repo}.git{ref}"
     else:
         # Assume it's a package name in bub-contrib
-        name, *rest = spec.partition("@")
-        ref = "".join(rest)
-        return f"git+{BUB_CONTRIB_REPO}{ref}#subdirectory=packages/{name}"
+        name, has_ref, ref = spec.partition("@")
+        if has_ref:
+            ref = f"@{ref}"
+            return f"git+{BUB_CONTRIB_REPO}{ref}#subdirectory=packages/{name}"
+        else:  # PyPI package name
+            return name
+
+
+def _build_local_requirement_path(url: str, subdirectory: str | None = None) -> str | None:
+    parsed = urlsplit(url)
+    if parsed.scheme != "file":
+        return None
+
+    path = parsed.path
+    if parsed.netloc and parsed.netloc != "localhost":
+        path = f"//{parsed.netloc}{path}"
+    local_path = Path(url2pathname(unquote(path)))
+    if subdirectory:
+        local_path /= subdirectory
+    return os.fspath(local_path)
+
+
+def _build_bub_requirement() -> list[str]:
+    dist = metadata.distribution("bub")
+    dist_name = dist.name
+    direct_url_text = dist.read_text("direct_url.json")
+    if not direct_url_text:
+        return [dist_name]
+
+    direct_url = json.loads(direct_url_text)
+    requirement_url = str(direct_url["url"])
+    subdirectory = direct_url.get("subdirectory")
+    normalized_subdirectory = subdirectory if isinstance(subdirectory, str) and subdirectory else None
+
+    local_path = _build_local_requirement_path(requirement_url, normalized_subdirectory)
+    if local_path is not None:
+        dir_info = direct_url.get("dir_info")
+        editable = isinstance(dir_info, dict) and bool(dir_info.get("editable"))
+        return ["--editable", local_path] if editable else [local_path]
+
+    vcs_info = direct_url.get("vcs_info")
+    if isinstance(vcs_info, dict):
+        vcs = vcs_info.get("vcs")
+        requested_revision = vcs_info.get("requested_revision")
+        if isinstance(vcs, str) and vcs:
+            requirement_url = f"{vcs}+{requirement_url}"
+        if isinstance(requested_revision, str) and requested_revision:
+            requirement_url = f"{requirement_url}@{requested_revision}"
+
+    if normalized_subdirectory:
+        requirement_url = f"{requirement_url}#subdirectory={normalized_subdirectory}"
+
+    return [requirement_url]
 
 
 def _ensure_project(project: Path) -> None:
     if (project / "pyproject.toml").is_file():
         return
     _uv("init", "--bare", "--name", "bub-project", "--app", cwd=project)
+    bub_requirement = _build_bub_requirement()
+    _uv("add", "--active", "--no-sync", *bub_requirement, cwd=project)
 
 
 def install(
@@ -180,8 +236,7 @@ def uninstall(
 ) -> None:
     """Uninstall a plugin from Bub's environment."""
     _ensure_project(project)
-    _uv("remove", "--active", "--no-sync", *packages, cwd=project)
-    _uv("sync", "--active", "--frozen", "--inexact", cwd=project)
+    _uv("remove", "--active", *packages, cwd=project)
 
 
 def update(

{bub-0.3.4 → bub-0.3.5}/src/bub/builtin/hook_impl.py

@@ -119,8 +119,7 @@ class BuiltinImpl:
         app.command("hooks", hidden=True)(cli.list_hooks)
         app.command("gateway")(cli.gateway)
         app.command("install")(cli.install)
-        # TODO: uninstall command can't work properly
-        # app.command("uninstall")(cli.uninstall)
+        app.command("uninstall")(cli.uninstall)
         app.command("update")(cli.update)
 
     def _read_agents_file(self, state: State) -> str:

{bub-0.3.4 → bub-0.3.5}/src/bub/builtin/shell_manager.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import asyncio
 import contextlib
 import os
+import shutil
 import uuid
 from dataclasses import dataclass, field
 
@@ -39,7 +40,7 @@ class ShellManager:
             cwd=cwd,
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
-            executable="/bin/bash" if os.name != "nt" else None,
+            executable=(shutil.which("bash") or shutil.which("sh")) if os.name != "nt" else None,
         )
         shell = ManagedShell(shell_id=f"bash-{uuid.uuid4().hex[:8]}", cmd=cmd, cwd=cwd, process=process)
         shell.read_tasks.extend([

{bub-0.3.4 → bub-0.3.5}/src/bub/builtin/tools.py

@@ -42,9 +42,9 @@ class SearchInput(BaseModel):
     limit: int = Field(20, description="Maximum number of search results to return.")
     start: str | None = Field(None, description="Optional start date to filter entries (ISO format).")
     end: str | None = Field(None, description="Optional end date to filter entries (ISO format).")
-    kinds: list[EntryKind] = Field(
+    kinds: list[str] = Field(
         default=["message", "tool_result"],
-        description="Optional list of entry kinds to filter search results.",
+        description="Optional list of entry kinds to filter search results. Can include 'event', 'anchor', 'system', 'message', 'tool_call', 'tool_result'.",
     )
 
 

{bub-0.3.4 → bub-0.3.5}/src/skills/telegram/SKILL.md

@@ -1,125 +1,113 @@
----
-name: telegram
-description: |
-  Telegram Bot skill for sending and editing Telegram messages via Bot API.
-  Use when Bub needs to: (1) Send a message to a Telegram user/group/channel,
-  (2) Reply to a specific Telegram message with reply_to_message_id,
-  (3) Edit an existing Telegram message, or (4) Push proactive Telegram notifications.
-metadata:
-  channel: telegram
----
-
-# Telegram Skill
-
-Agent-facing execution guide for Telegram outbound communication.
-
-Assumption: `BUB_TELEGRAM_TOKEN` is already available.
-
-## Required Inputs
-Collect these before execution:
-
-- `chat_id` (required)
-- `message_id` (required for edit or reply)
-- message content (required for send/edit)
-- `reply_to_message_id` (required when you need a threaded reply)
-
-## Execution Policy
-
-1. If handling a Telegram message and `message_id` is known, send a reply message with `--reply-to`.
-2. If there is no message to reply to, send a normal message to `chat_id`.
-3. For long-running tasks, optionally send one progress message, then edit that same message for final status.
-4. For multi-line text, pass the content via heredoc command substitution instead of embedding raw line breaks in quoted strings.
-5. Avoid emitting HTML tags in message content; use Markdown for formatting instead.
-
-## Bot to co-Bot Communication
-
-In Telegram groups, communicate with another bot using only these patterns:
-
-1. Reply directly to the other bot's message when `message_id` is available.
-2. Use an explicit command mention such as `/command@OtherBot` when you need to invoke that bot intentionally.
-3. Do not assume free-form group text will reach another bot.
-
-## Active Response Policy
-
-When this skill is in scope, prefer proactive and timely Telegram updates:
-
-- Send an immediate acknowledgment for newly assigned tasks
-- Send progress updates for long-running operations using message edits
-- Send completion notifications when work finishes
-- Send important status or failure notifications without waiting for follow-up prompts
-- If execution is blocked or fails, send a problem report immediately with cause, impact, and next action
-
-Recommended pattern:
-
-1. Send a short acknowledgment reply
-2. Continue processing
-3. If blocked, edit or send an issue update immediately
-4. Edit the acknowledgment message with final result when possible
-
-## Voice Message Policy
-
-When the inbound Telegram message is voice:
-
-1. Transcribe the voice input first (use STT skill if available)
-2. Prepare response content based on transcription
-3. Prefer voice response output (use TTS skill if available)
-4. If voice output is unavailable, send a concise text fallback and state limitation
-
-## Reaction Policy
-
-When an inbound Telegram message warrants acknowledgment but does not merit a full reply, use a Telegram reaction as the response.
-But when any explanation or details are needed, use a normal reply instead.
-
-## Command Templates
-
-Paths are relative to this skill directory.
-
-```bash
-# Send simple text with SINGLE quotes
-uv run ${SKILL_DIR}/scripts/telegram_send.py \
-  --chat-id <CHAT_ID> \
-  --message '<TEXT>'
-
-# Or, send multi-line message using heredoc and double quotes
-uv run ${SKILL_DIR}/scripts/telegram_send.py \
-  --chat-id <CHAT_ID> \
-  --message "$(cat <<'EOF'
-Build finished successfully.
-Summary:
-- 12 tests passed
-- 0 failures
-EOF
-)"
-
-# Send reply to a specific message
-uv run ${SKILL_DIR}/scripts/telegram_send.py \
-  --chat-id <CHAT_ID> \
-  --message '<TEXT>' \
-  --reply-to <MESSAGE_ID>
-
-# Edit existing message
-uv run ${SKILL_DIR}/scripts/telegram_edit.py \
-  --chat-id <CHAT_ID> \
-  --message-id <MESSAGE_ID> \
-  --text '<TEXT>'
-```
-
-When sending message to a bot, either use `--reply-to` argument or pass `--source-is-bot` with `--source-username` otherwise the bot will not receive the message.
-
-For other actions that not covered by these scripts, use `curl` to call Telegram Bot API directly with the provided token.
-
-## Script Interface Reference
-
-### `telegram_send.py`
-
-- `--chat-id`, `-c`: required, supports comma-separated ids
-- `--message`, `-m`: required
-- `--reply-to`, `-r`: optional
-- `--token`, `-t`: optional (normally not needed)
-
-### `telegram_edit.py`
-
-- `--chat-id`, `-c`: required
-- `--message-id`, `-m`: required
-- `--text`, `-t`: required
-- `--token`: optional (normally not needed)
+---
+name: telegram
+description: |
+  Telegram Bot skill for sending and editing Telegram messages via Bot API.
+  Use when Bub needs to: (1) Send a message to a Telegram user/group/channel,
+  (2) Reply to a specific Telegram message with reply_to_message_id,
+  (3) Edit an existing Telegram message, or (4) Push proactive Telegram notifications.
+metadata:
+  channel: telegram
+---
+
+# Telegram Skill
+
+Agent-facing execution guide for Telegram outbound communication.
+
+Assumption: `BUB_TELEGRAM_TOKEN` is already available.
+
+## Required Inputs
+Collect these before execution:
+
+- `chat_id` (required)
+- `message_id` (required for edit or reply)
+- message content (required for send/edit)
+- `reply_to_message_id` (required when you need a threaded reply)
+
+## Execution Policy
+
+1. If handling a Telegram message and `message_id` is known, send a reply message with `--reply-to`.
+2. If there is no message to reply to, send a normal message to `chat_id`.
+3. For long-running tasks, optionally send one progress message, then edit that same message for final status.
+4. **ALWAYS pass message content via stdin using heredoc pipe and `--message -` (or `--text -`).** NEVER embed message text directly in shell arguments — special characters like `'`, `"`, `$`, `!` will be mangled or cause syntax errors.
+5. Avoid emitting HTML tags in message content; use Markdown for formatting instead.
+
+## Bot to co-Bot Communication
+
+In Telegram groups, communicate with another bot using only these patterns:
+
+1. Reply directly to the other bot's message when `message_id` is available.
+2. Use an explicit command mention such as `/command@OtherBot` when you need to invoke that bot intentionally.
+3. Do not assume free-form group text will reach another bot.
+
+## Active Response Policy
+
+When this skill is in scope, prefer proactive and timely Telegram updates:
+
+- Send an immediate acknowledgment for newly assigned tasks
+- Send progress updates for long-running operations using message edits
+- Send completion notifications when work finishes
+- Send important status or failure notifications without waiting for follow-up prompts
+- If execution is blocked or fails, send a problem report immediately with cause, impact, and next action
+
+Recommended pattern:
+
+1. Send a short acknowledgment reply
+2. Continue processing
+3. If blocked, edit or send an issue update immediately
+4. Edit the acknowledgment message with final result when possible
+
+## Voice Message Policy
+
+When the inbound Telegram message is voice:
+
+1. Transcribe the voice input first (use STT skill if available)
+2. Prepare response content based on transcription
+3. Prefer voice response output (use TTS skill if available)
+4. If voice output is unavailable, send a concise text fallback and state limitation
+
+## Reaction Policy
+
+When an inbound Telegram message warrants acknowledgment but does not merit a full reply, use a Telegram reaction as the response.
+But when any explanation or details are needed, use a normal reply instead.
+
+## Command Templates
+
+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 -
+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 -
+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 -
+Updated content here.
+EOF
+```
+
+When sending message to a bot, either use `--reply-to` argument or pass `--source-is-bot` with `--source-username` otherwise the bot will not receive the message.
+
+For other actions that not covered by these scripts, use `curl` to call Telegram Bot API directly with the provided token.
+
+## Script Interface Reference
+
+### `telegram_send.py`
+
+- `--chat-id`, `-c`: required, supports comma-separated ids
+- `--message`, `-m`: required (use `-` to read from stdin)
+- `--reply-to`, `-r`: optional
+- `--token`, `-t`: optional (normally not needed)
+
+### `telegram_edit.py`
+
+- `--chat-id`, `-c`: required
+- `--message-id`, `-m`: required
+- `--text`, `-t`: required (use `-` to read from stdin)
+- `--token`: optional (normally not needed)

{bub-0.3.4 → bub-0.3.5}/src/skills/telegram/scripts/telegram_edit.py

@@ -1,105 +1,106 @@
-#!/usr/bin/env uv run
-# /// script
-# requires-python = ">=3.10"
-# dependencies = [
-#     "requests>=2.31.0",
-#     "telegramify-markdown>=0.5.0",
-# ]
-# ///
-
-"""
-Telegram Bot Message Editor
-
-Edit an existing message via Telegram Bot API.
-Uses telegramify_markdown to convert markdown to Telegram MarkdownV2 format.
-
-"""
-
-import argparse
-import os
-import sys
-
-import requests
-
-try:
-    from telegramify_markdown import markdownify
-except ImportError:
-    print("❌ Error: telegramify_markdown not installed. Run: pip install telegramify-markdown")
-    sys.exit(1)
-
-
-def unescape_newlines(text: str) -> str:
-    """
-    Convert escaped newline sequences to real newlines.
-    Handles \\n -> \n, \\r\\n -> \r\n, etc.
-    """
-    # First unescape \\n to real newline
-    result = text.replace("\\n", "\n")
-    result = result.replace("\\r\\n", "\r\n")
-    result = result.replace("\\r", "\r")
-    return result
-
-
-def edit_message(bot_token: str, chat_id: str, message_id: int, text: str) -> dict:
-    """
-    Edit an existing message via Telegram Bot API.
-
-    Args:
-        bot_token: Telegram bot token
-        chat_id: Target chat ID
-        message_id: ID of the message to edit
-        text: New message text (will be converted to MarkdownV2)
-
-    Returns:
-        API response as dict
-    """
-    url = f"https://api.telegram.org/bot{bot_token}/editMessageText"
-
-    # Unescape \\n sequences to real newlines (bash/argparse converts real newlines to \\n)
-    text = unescape_newlines(text)
-
-    # Convert markdown to Telegram MarkdownV2 format
-    converted_text = markdownify(text).rstrip("\n")
-
-    payload = {
-        "chat_id": chat_id,
-        "message_id": message_id,
-        "text": converted_text,
-        "parse_mode": "MarkdownV2",
-    }
-
-    response = requests.post(url, json=payload, timeout=30)
-    response.raise_for_status()
-
-    return response.json()
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Edit an existing message via Telegram Bot API")
-    parser.add_argument("--chat-id", "-c", required=True, help="Target chat ID")
-    parser.add_argument("--message-id", "-m", type=int, required=True, help="ID of the message to edit")
-    parser.add_argument("--text", "-t", required=True, help="New message text (markdown supported)")
-    parser.add_argument("--token", help="Bot token (defaults to BUB_TELEGRAM_TOKEN env var)")
-
-    args = parser.parse_args()
-
-    # Get bot token
-    bot_token = args.token or os.environ.get("BUB_TELEGRAM_TOKEN")
-    if not bot_token:
-        print("❌ Error: Bot token required. Set BUB_TELEGRAM_TOKEN env var or use --token")
-        sys.exit(1)
-
-    try:
-        edit_message(bot_token, args.chat_id, args.message_id, args.text)
-        print(f"✅ Message {args.message_id} edited successfully")
-    except requests.HTTPError as e:
-        print(f"❌ HTTP Error: {e}")
-        print(f"   Response: {e.response.text}")
-        sys.exit(1)
-    except Exception as e:
-        print(f"❌ Error: {e}")
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()
+#!/usr/bin/env uv run
+# /// script
+# requires-python = ">=3.10"
+# dependencies = [
+#     "requests>=2.31.0",
+#     "telegramify-markdown>=0.5.0",
+# ]
+# ///
+
+"""
+Telegram Bot Message Editor
+
+Edit an existing message via Telegram Bot API.
+Uses telegramify_markdown to convert markdown to Telegram MarkdownV2 format.
+
+"""
+
+import argparse
+import os
+import sys
+
+import requests
+
+try:
+    from telegramify_markdown import markdownify
+except ImportError:
+    print("❌ Error: telegramify_markdown not installed. Run: pip install telegramify-markdown")
+    sys.exit(1)
+
+
+def unescape_newlines(text: str) -> str:
+    """
+    Convert escaped newline sequences to real newlines.
+    Handles \\n -> \n, \\r\\n -> \r\n, etc.
+    """
+    # First unescape \\n to real newline
+    result = text.replace("\\n", "\n")
+    result = result.replace("\\r\\n", "\r\n")
+    result = result.replace("\\r", "\r")
+    return result
+
+
+def edit_message(bot_token: str, chat_id: str, message_id: int, text: str) -> dict:
+    """
+    Edit an existing message via Telegram Bot API.
+
+    Args:
+        bot_token: Telegram bot token
+        chat_id: Target chat ID
+        message_id: ID of the message to edit
+        text: New message text (will be converted to MarkdownV2)
+
+    Returns:
+        API response as dict
+    """
+    url = f"https://api.telegram.org/bot{bot_token}/editMessageText"
+
+    # Unescape \\n sequences to real newlines (bash/argparse converts real newlines to \\n)
+    text = unescape_newlines(text)
+
+    # Convert markdown to Telegram MarkdownV2 format
+    converted_text = markdownify(text).rstrip("\n")
+
+    payload = {
+        "chat_id": chat_id,
+        "message_id": message_id,
+        "text": converted_text,
+        "parse_mode": "MarkdownV2",
+    }
+
+    response = requests.post(url, json=payload, timeout=30)
+    response.raise_for_status()
+
+    return response.json()
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Edit an existing message via Telegram Bot API")
+    parser.add_argument("--chat-id", "-c", required=True, help="Target chat ID")
+    parser.add_argument("--message-id", "-m", type=int, required=True, help="ID of the message to edit")
+    parser.add_argument("--text", "-t", required=True, help="New message text (markdown supported)")
+    parser.add_argument("--token", help="Bot token (defaults to BUB_TELEGRAM_TOKEN env var)")
+
+    args = parser.parse_args()
+
+    # Get bot token
+    bot_token = args.token or os.environ.get("BUB_TELEGRAM_TOKEN")
+    if not bot_token:
+        print("❌ Error: Bot token required. Set BUB_TELEGRAM_TOKEN env var or use --token")
+        sys.exit(1)
+
+    try:
+        text = sys.stdin.read() if args.text == "-" else args.text
+        edit_message(bot_token, args.chat_id, args.message_id, text)
+        print(f"✅ Message {args.message_id} edited successfully")
+    except requests.HTTPError as e:
+        print(f"❌ HTTP Error: {e}")
+        print(f"   Response: {e.response.text}")
+        sys.exit(1)
+    except Exception as e:
+        print(f"❌ Error: {e}")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()