Skip to content

v8: drop --spawn-topic, --importance; trim agency-report docstring #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MagMueller wants to merge 1 commit into
base: v7-simplify-modes
Choose a base branch
from
Open

v8: drop --spawn-topic, --importance; trim agency-report docstring #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 30 additions & 150 deletions agent/agency-report
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,107 +1,32 @@
#!/opt/bux/venv/bin/python
"""agency-report — record + post an Agency suggestion to Telegram.

Always:
1. records the suggestion in /var/lib/bux/agency.db
2. posts the body to TG with inline-keyboard buttons (default 3 in a 2+1 grid)
3. wires the message_id back into the row so a button tap can record
the user's decision against the right suggestion.

Default buttons: ✅ Yes · 🔁 More · ⏭ Skip
Default layout: row 1 = [Yes][More], row 2 = [Skip].

Each default button has a *kind* the bot uses to pick semantics:
• Yes → kind=action → bot dispatches the suggestion's --prompt in this
topic (the goal's permanent lane). No new forum
topic is spawned — one goal, one topic.
• More → kind=more → bot asks the agent to regenerate this card with
a different angle (different draft, different
framing, different next step). The user is
curious but not sold.
• Skip → kind=dismiss → bot records the dismissal, no LLM call.
(Cheap "saw it, move on".)

Callback data shape: `agcy:<thread>:<idx>:<kind>` where kind is one of
{action, more, dismiss, custom}. Custom button sets passed via --button
all get kind=custom (existing dispatch-in-same-topic behavior).

Custom buttons: pass --button (repeatable). Layout wraps in pairs of two.

Canonical card layout (HTML parse mode). Order is locked; the *number*
of expandable blocks is variable (0, 1, 2, N — your call):

[optional image — skip when text alone is clearer]
<emoji> <b>headline</b> ← write the specific action here:
"Reply to <user> on Slack: …" or
"Merge PR #347" — *not* "Agency 95"
or a generic source description.
<optional subhead>

<blockquote expandable>…</blockquote> ← zero or more
<blockquote expandable>…</blockquote>
…

<i>source: <link></i> ← at the very end, italic, optional.

[Yes] [More]
[Skip]

Blocks are specified via --block (repeatable, JSON object). Each --block
becomes one expandable. Pass any number for 0/1/2/N expandables — typical
copilot card is two (option A / option B). If no --block is passed and a
--prompt is set, a single auto-generated draft block is created so the
user can see what'll run on Yes-tap.

Yes-tap routing — one goal, one topic:
• Yes/More dispatch in the topic the card lives in. That topic is the
goal's permanent lane. The agent may create sub-topics later only if
the work genuinely needs fan-out (rare).
• --spawn-topic / --no-spawn-topic flags are kept for back-compat but
default to OFF inside topics, ON outside topics. The default-button
labels are the same in either case (✅ Yes / 🔁 More / ⏭ Skip).

If --image (URL), --image-file (local path), or --image-text (auto-rendered
placeholder) is given, the image renders above the body. For bodies that
fit Telegram's 1024-char caption budget the card is sent via sendPhoto;
otherwise it falls back to sendMessage with a large link-preview-image
above the text (visually identical, no length cap).

`--image-file` uploads a local file via multipart so the model never has
to know the bot token or build a public URL. Auto-detects content type
from the file extension (png/jpg/jpeg/gif/webp).

`--info-only` strips the inline keyboard entirely. Use for FYI cards
(weekly stats, observations) where there's nothing to act on. The row
is still recorded in the DB so dedup works.

Field mapping:
--emoji prepended to the bold headline
--title the headline (required)
--source-label short clickable label like "GitHub #347"
--source-url URL the source label links to
--subhead optional one-line under the headline
--image direct image URL
--image-file path to a local image file (multipart upload)
--image-text alt: shorthand text → auto-generated local card image
--block repeatable; each value is a JSON object
{emoji, title, body[, body_html]} → one expandable.
Two blocks for option A/B is the typical copilot
card; single block for status confirms.
--prompt exact action that runs if user taps Yes; also
auto-generates a draft block when no --block given.
--importance high|med|low (default med)
--source stable slug for dedupe
--skip-if-exists suppress posting if the source slug already has a
non-pending row
--button repeatable; overrides the default 3-button set.
Custom buttons all get kind=custom.
--info-only omit the inline keyboard entirely (FYI cards).
--thread-id forum topic to post into (defaults to $TG_THREAD_ID)

Inputs are HTML-escaped by default. To embed raw HTML in --block bodies,
pass `"body_html": true` alongside `"body": "<your html>"`. The
`--title-html`, `--subhead-html`, `--source-label-html` long forms remain
for raw HTML in headline / subhead / source label.
"""agency-report — record + post one card to Telegram.

Three things every call: insert a row in `/var/lib/bux/agency.db`, post
the card to TG (image + expandable blocks + inline-keyboard buttons),
and wire the resulting message_id back into the DB row so a button tap
finds the right suggestion.

Default buttons: ✅ Yes · 🔁 More · ⏭ Skip. All taps dispatch in the
card's own topic (one-goal-one-topic; if the agent needs a fresh lane
for a big new project, it spawns one explicitly with `tg-schedule
"+1 minute" --fresh`). Yes runs --prompt as a new agent turn; More asks
the agent to regenerate with a different angle; Skip records dismissal,
no LLM call.

Callback data shape: `agcy:<thread>:<idx>:<kind>` where kind ∈
{action, more, dismiss, custom}. Custom --button entries get
kind=custom and dispatch a synthesized `[agency-button] <label>`
turn in the same topic.

Blocks are specified via --block (repeatable, JSON object). Each block
becomes one expandable. Typical copilot card is two (option A + option
B). If no --block is given and --prompt is set, a single auto-generated
draft block is created so the user can see what'll fire on Yes-tap.

Run `agency-report --help` for the flag reference. Image rendering uses
PIL (1080×540 gradient with emoji + caps headline + sentence-case why);
agency-report falls back to sendMessage + large link-preview when the
body would exceed Telegram's 1024-char caption cap.
"""
from __future__ import annotations

Expand Down Expand Up @@ -241,10 +166,6 @@ def _render_image_text_file(args: argparse.Namespace) -> str | None:
width, height = 1080, 540
top = (31, 41, 55)
bottom = (20, 184, 166)
if args.importance == "high":
top, bottom = (76, 29, 149), (236, 72, 153)
elif args.importance == "low":
top, bottom = (51, 65, 85), (100, 116, 139)

img = Image.new("RGB", (width, height), top)
pix = img.load()
Expand Down Expand Up @@ -319,9 +240,7 @@ def _coerce_button_label(raw: str) -> str:


def _resolve_buttons(args: argparse.Namespace) -> list[tuple[str, str]]:
"""Returns list of (label, kind). Custom buttons all get kind='custom'.
Default set is one canonical ✅ Yes / 🔁 More / ⏭ Skip — one goal, one
topic, no spawn-topic label variants."""
"""Returns list of (label, kind). Custom buttons all get kind='custom'."""
if args.button:
return [(_coerce_button_label(label), "custom") for label in args.button]
return list(DEFAULT_BUTTONS)
Expand Down Expand Up @@ -593,12 +512,6 @@ def main() -> int:
"--prompt",
help="Exact action that runs if user taps Yes — also fills the auto-generated draft block when no --block is given.",
)
p.add_argument(
"--importance",
choices=("high", "med", "low"),
default="med",
help="Priority bucket for triage. Default: med.",
)
p.add_argument(
"--source",
help="Stable slug for dedupe (e.g. slack-c-foo, gmail-thread-19df, gh-pr-78).",
Expand All @@ -608,38 +521,13 @@ def main() -> int:
action="append",
default=None,
help="Custom button LABEL (plain string). Repeatable. Each gets "
"kind=custom. Pass the visible text only — e.g. --button \"❌ No\". "
"NOT JSON. (--block takes JSON; --button does not.) "
"Defensive: a JSON object with a `text` field is coerced to its "
"text, but write plain strings to be safe.",
"kind=custom. Plain text only — e.g. --button \"❌ No\". NOT JSON.",
)
p.add_argument(
"--info-only",
action="store_true",
help="Drop the inline keyboard entirely (FYI cards with no action).",
)
spawn_grp = p.add_mutually_exclusive_group()
spawn_grp.add_argument(
"--spawn-topic",
dest="spawn_topic",
action="store_const",
const=True,
default=None,
help="On Yes/Edit tap, spawn a fresh forum topic and dispatch "
"the lane there. Use for agency-loop cards (each cycle's cards "
"get their own topics) or any case where the work warrants a "
"dedicated thread. Overrides the auto-default.",
)
spawn_grp.add_argument(
"--no-spawn-topic",
dest="spawn_topic",
action="store_const",
const=False,
help="On Yes/Edit tap, dispatch in the same thread the card "
"lives in. Overrides the auto-default. Use when the agent is "
"already deep in one topic and follow-up cards should keep the "
"conversation in-place.",
)
p.add_argument(
"--thread-id",
type=int,
Expand Down Expand Up @@ -680,12 +568,6 @@ def main() -> int:

db = agency_db.conn()

# spawn_topic auto-default: forum topics are goal/session lanes, so
# accepted cards stay in that lane unless the card explicitly asks
# to spawn. A non-topic chat still gets a worker topic.
if args.spawn_topic is None:
args.spawn_topic = not bool(args.thread_id)

buttons = [] if args.info_only else _resolve_buttons(args)
button_labels_for_db = [label for label, _ in buttons]
blocks = _resolve_blocks(args)
Expand Down Expand Up @@ -715,7 +597,6 @@ def main() -> int:
db,
title=args.title,
description=db_description,
importance=args.importance,
source=args.source,
prompt=args.prompt,
buttons=button_labels_for_db,
Expand All @@ -726,7 +607,6 @@ def main() -> int:
source_url=args.source_url,
chat_id=chat_id(),
thread_id=args.thread_id,
spawn_topic=args.spawn_topic,
)

body = _build_body(args)
Expand Down
65 changes: 9 additions & 56 deletions agent/telegram_bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7218,63 +7218,16 @@ def _handle_agency_callback(self, cb: dict, data: str) -> None:
# work lives in a separate thread. That way the deep-link is
# glued to the card permanently — never lost when other cards
# stack up below.
topic_title = (sugg_row.get("title") or label)[:128] if sugg_row else label
spawn = bool(sugg_row and sugg_row.get("spawn_topic"))
existing_worker = int(sugg_row.get("worker_topic_id") or 0) if sugg_row else 0
new_thread_id = 0
if spawn and existing_worker and existing_worker != target_thread:
# Multi-tap: a prior Yes/Edit already spawned a topic for this
# suggestion. Reuse it instead of forking again.
new_thread_id = existing_worker
elif spawn and kind in ("action", "refine"):
spawn_error: str | None = None
try:
res = self.call("createForumTopic", chat_id=chat_id, name=topic_title)
if res.get("ok"):
new_thread_id = int(res["result"].get("message_thread_id") or 0)
else:
spawn_error = str(res.get("description") or "createForumTopic returned not-ok")
except Exception as exc:
LOG.exception("createForumTopic failed")
spawn_error = str(exc)
if not new_thread_id:
LOG.warning(
"agency: createForumTopic returned no thread; falling back to in-place"
)
spawn = False
if spawn_error:
# Tell the user the spawn failed and we're running here
# instead — silent fall-through used to confuse users.
try:
self.call(
"sendMessage",
chat_id=chat_id,
message_thread_id=target_thread or None,
text=(
"ℹ️ Couldn't spawn a new topic for this action "
f"({_html.escape(spawn_error[:140], quote=False)}). "
"Running it in this thread instead."
),
parse_mode="HTML",
)
except Exception:
LOG.exception("agency: failed to surface spawn error")

# work_thread = where the lane actually runs.
if kind in ("action", "refine"):
work_thread = new_thread_id if (spawn and new_thread_id) else target_thread
else:
work_thread = target_thread

# URL button row to glue onto the card. Only when work lives in
# a different thread than the card itself.
# One-goal-one-topic (v8): button taps always dispatch in the card's
# own topic. If the agent decides a tap should spawn a new lane (rare,
# for big new projects), it does so explicitly via `tg-schedule
# "+1 minute" --fresh` from inside the dispatched turn.
work_thread = target_thread

# v8: work always runs in the card's own topic. The "open thread"
# deep-link row used to glue a spawned-topic URL here, but with
# one-goal-one-topic there's no spawned topic to link to.
append_url_row = None
if new_thread_id and new_thread_id != target_thread:
chat_str = str(chat_id).removeprefix("-100")
append_url_row = [{
"text": "🧵 Open thread",
"url": f"https://t.me/c/{chat_str}/{new_thread_id}",
}]

if kind == "custom" or not sugg_row:
# Custom buttons stack — additive Style A on the tapped one,
Expand Down
Loading