feat(notifications): add bump mode + russify Telegram live-tracker
ORCH-042: new ORCH_TRACKER_MODE (Settings.tracker_mode, default edit) selects the live-tracker card behaviour. bump mode re-creates the card at the bottom of the chat on every update (delete_telegram + send silently + repoint message_id), keeping the "one card per task" invariant: <=1 new message per call, repoint only on successful send, delete result never gates the send. New never-raising delete_telegram helper. Anything != "bump" resolves to edit (zero regression). Also russify/cosmetic-fix the card text (both modes): "Подтверждение BRD" label, ✅ after approve-gate, Russian stage labels, "📦 Внедрено". Docs updated in the same PR (CHANGELOG, internals.md, .env.example). Refs: ORCH-042 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -134,6 +134,14 @@ class Settings(BaseSettings):
|
||||
telegram_bot_token: str = ""
|
||||
telegram_chat_id: str = ""
|
||||
|
||||
# ORCH-042: режим live-трекера задачи.
|
||||
# edit -> карточка редактируется на месте (editMessageText), ДЕФОЛТ (как было).
|
||||
# bump -> при обновлении старое сообщение удаляется и карточка отправляется
|
||||
# заново вниз чата (deleteMessage + sendMessage + repoint message_id),
|
||||
# тихо (disable_notification). Одна карточка на задачу в обоих режимах.
|
||||
# Неизвестное/пустое значение трактуется как edit (см. notifications).
|
||||
tracker_mode: str = "edit"
|
||||
|
||||
class Config:
|
||||
env_prefix = "ORCH_"
|
||||
env_file = ".env"
|
||||
|
||||
@@ -68,6 +68,62 @@ def send_telegram(text: str, disable_notification: bool = False):
|
||||
return None
|
||||
|
||||
|
||||
# Telegram error descriptions that mean a deleteMessage target is already gone /
|
||||
# can't be deleted (>48h, already deleted, invalid id). Treated as "no longer our
|
||||
# problem" -> the caller proceeds to send a fresh card. NOT a transient failure.
|
||||
_DELETE_GONE_MARKERS = (
|
||||
"message to delete not found",
|
||||
"message can't be deleted",
|
||||
"message_id_invalid",
|
||||
)
|
||||
|
||||
|
||||
def delete_telegram(message_id: int) -> bool:
|
||||
"""Delete a Telegram message. Never raises.
|
||||
|
||||
Returns True if the message is gone after the call (deleted now, OR Telegram
|
||||
says it's already not there / can't be deleted -> treat as "no longer our
|
||||
problem", caller proceeds to send a fresh card). Returns False only on a
|
||||
transient failure (network / timeout / 5xx / unknown error) where the old
|
||||
message may still be alive.
|
||||
"""
|
||||
s = _get_settings()
|
||||
if not s.telegram_bot_token or not s.telegram_chat_id:
|
||||
# No creds -> nothing was deleted; mirror the other helpers' no-op path.
|
||||
return False
|
||||
try:
|
||||
url = f"https://api.telegram.org/bot{s.telegram_bot_token}/deleteMessage"
|
||||
resp = httpx.post(
|
||||
url,
|
||||
json={
|
||||
"chat_id": s.telegram_chat_id,
|
||||
"message_id": message_id,
|
||||
},
|
||||
timeout=5,
|
||||
)
|
||||
data = resp.json()
|
||||
if data.get("ok"):
|
||||
return True
|
||||
# ok:false -> classify. "Already gone / can't delete" is an expected,
|
||||
# non-transient outcome (>48h, already deleted) -> the old message is no
|
||||
# longer there, caller should still send a fresh card.
|
||||
desc = str(data.get("description") or "").lower()
|
||||
if any(m in desc for m in _DELETE_GONE_MARKERS):
|
||||
logger.debug(
|
||||
f"delete_telegram(mid={message_id}): already gone ({desc!r})"
|
||||
)
|
||||
return True
|
||||
# Unknown 400 / 5xx -> transient; the old message may still be alive.
|
||||
logger.warning(
|
||||
f"delete_telegram(mid={message_id}): delete failed ({desc!r})"
|
||||
)
|
||||
return False
|
||||
except Exception as e:
|
||||
# Network / timeout -> transient; old message may still be alive.
|
||||
logger.warning(f"delete_telegram(mid={message_id}): transient error: {e}")
|
||||
return False
|
||||
|
||||
|
||||
# edit_telegram outcome codes -> let update_task_tracker decide what to do:
|
||||
# "ok" edit applied -> nothing else to do
|
||||
# "not_modified" Telegram says text is identical (400 "message is not
|
||||
@@ -166,19 +222,23 @@ def _get_work_item_id(task_id: int) -> str:
|
||||
# the agent whose agent_runs rows describe that stage's work. "Ревью БРД" is NOT
|
||||
# an agent stage — it is the human approve gate rendered between Analysis and
|
||||
# Architecture from the task's brd_review_* timestamps.
|
||||
# ORCH-042 (BR-11): display-labels are Russian. Stage KEYS (analysis, …) and
|
||||
# agent names (analyst, …) are NOT touched — they are wired to
|
||||
# _STAGE_ACTIVE_AGENT, last_done and the DB. Only the 2nd tuple element changed.
|
||||
_TRACKER_STAGES = [
|
||||
("analysis", "Analysis", "analyst"),
|
||||
("architecture", "Architecture", "architect"),
|
||||
("development", "Development", "developer"),
|
||||
("review", "Review", "reviewer"),
|
||||
("testing", "Testing", "tester"),
|
||||
("deploy", "Deploy", "deployer"),
|
||||
("analysis", "Анализ", "analyst"), # Анализ
|
||||
("architecture", "Архитектура", "architect"), # Архитектура
|
||||
("development", "Разработка", "developer"), # Разработка
|
||||
("review", "Код ревью", "reviewer"), # Код ревью
|
||||
("testing", "Тестирование", "tester"), # Тестирование
|
||||
("deploy", "Внедрение", "deployer"), # Внедрение
|
||||
]
|
||||
|
||||
# Map a pipeline stage -> the agent that is RUNNING while the task sits in it.
|
||||
# (development is entered after architecture finishes, etc.) Used to render the
|
||||
# "🔄 <Stage> … идёт" line for the currently-active stage.
|
||||
_BRD_LABEL = "\u0420\u0435\u0432\u044c\u044e \u0411\u0420\u0414" # "Ревью БРД"
|
||||
# ORCH-042 (BR-9): "Подтверждение BRD" (was "Ревью БРД").
|
||||
_BRD_LABEL = "Подтверждение BRD"
|
||||
|
||||
_STAGE_ACTIVE_AGENT = {
|
||||
"analysis": "analyst",
|
||||
@@ -232,7 +292,8 @@ def render_task_tracker(task_id: int) -> str:
|
||||
the BRD-review timestamps, then renders:
|
||||
- one '✅ <Stage> <dur> · <in>↓/<out>↑ · <cost> · <model>' line per finished
|
||||
stage (latest run per stage),
|
||||
- the '⏸️ Ревью БРД <dur> · твоё время[ ⏳]' line between Analysis/Architecture,
|
||||
- the '✅/⏸️ Подтверждение BRD <dur> · твоё время[ ⏳]' line between
|
||||
Analysis/Architecture (✅ once the approve-gate passed, ⏸️+⏳ while waiting),
|
||||
- a '🔄 <Stage> … идёт' line for the active (in-progress) stage,
|
||||
- the '💰 <in>↓ / <out>↑ · <cost>' totals,
|
||||
- on done: '⏱️ Всего .. · агенты .. · твоё ..' and a '🔗 PR / 📦' line.
|
||||
@@ -365,9 +426,11 @@ def render_task_tracker(task_id: int) -> str:
|
||||
if stage_key == "analysis" and brd_started:
|
||||
brd_label = f"{_BRD_LABEL:<13}"
|
||||
if review_seconds is not None:
|
||||
# ORCH-042 (BR-10): approve-gate passed -> \u2705 (was \u23f8\ufe0f). The
|
||||
# still-waiting branch below keeps \u23f8\ufe0f + \u23f3 unchanged.
|
||||
dur = _fmt_minutes(review_seconds)
|
||||
lines.append(
|
||||
f"\u23f8\ufe0f {brd_label} {dur} \u00b7 \u0442\u0432\u043e\u0451 \u0432\u0440\u0435\u043c\u044f"
|
||||
f"\u2705 {brd_label} {dur} \u00b7 \u0442\u0432\u043e\u0451 \u0432\u0440\u0435\u043c\u044f"
|
||||
)
|
||||
else:
|
||||
# Still waiting on the human (ended not stamped yet).
|
||||
@@ -406,7 +469,7 @@ def render_task_tracker(task_id: int) -> str:
|
||||
|
||||
|
||||
def _done_link(task_id: int, work_item_id) -> str | None:
|
||||
"""Build the final '🔗 PR #n · 📦 deployed' line. Never raises -> None."""
|
||||
"""Build the final '🔗 PR #n · 📦 Внедрено' line. Never raises -> None."""
|
||||
try:
|
||||
from .config import settings
|
||||
from .db import get_db
|
||||
@@ -436,7 +499,7 @@ def _done_link(task_id: int, work_item_id) -> str | None:
|
||||
parts = []
|
||||
if pr_part:
|
||||
parts.append(pr_part)
|
||||
parts.append("\U0001f4e6 deployed")
|
||||
parts.append("\U0001f4e6 Внедрено") # ORCH-042 (BR-12): was "deployed"
|
||||
return " \u00b7 ".join(parts)
|
||||
except Exception:
|
||||
return None
|
||||
@@ -445,19 +508,49 @@ def _done_link(task_id: int, work_item_id) -> str | None:
|
||||
def update_task_tracker(task_id: int):
|
||||
"""Render + push the live tracker for a task. Never raises.
|
||||
|
||||
First call (no stored tracker_message_id): sendMessage (silent) and store the
|
||||
returned message_id. Subsequent calls: editMessageText the stored message.
|
||||
A NEW message is sent ONLY when the original is truly gone (deleted / too old
|
||||
/ invalid id). On "not modified" (text unchanged) or transient failures
|
||||
(network / timeout / 5xx / unknown 400) we do NOT send a new message — that
|
||||
is exactly what produced duplicate trackers and orphaned (lagging) messages.
|
||||
Two modes, selected by Settings.tracker_mode (env ORCH_TRACKER_MODE),
|
||||
resolved case-insensitively here; anything other than "bump" -> "edit"
|
||||
(ORCH-042). Both keep the "one card per task" invariant.
|
||||
|
||||
edit (DEFAULT):
|
||||
First call (no stored tracker_message_id): sendMessage (silent) and store
|
||||
the returned message_id. Subsequent calls: editMessageText the stored
|
||||
message. A NEW message is sent ONLY when the original is truly gone
|
||||
(deleted / too old / invalid id). On "not modified" (text unchanged) or
|
||||
transient failures (network / timeout / 5xx / unknown 400) we do NOT send
|
||||
a new message — that is exactly what produced duplicate trackers and
|
||||
orphaned (lagging) messages.
|
||||
|
||||
bump (ORCH-042):
|
||||
The card is re-created at the BOTTOM of the chat on every update:
|
||||
best-effort delete_telegram(old_id) (its result NEVER blocks the send),
|
||||
then sendMessage (silent), then re-point tracker_message_id to the new id
|
||||
— but ONLY on a successful send (new_mid is not None), so a transient send
|
||||
failure never wipes the pointer to None. At most ONE new message is sent
|
||||
per call -> no duplicates within a call.
|
||||
|
||||
The tracker is always sent with disable_notification so it never pings —
|
||||
only the dedicated alert helpers ping.
|
||||
"""
|
||||
try:
|
||||
from .db import get_tracker_message_id, set_tracker_message_id
|
||||
text = render_task_tracker(task_id)
|
||||
mode = (_get_settings().tracker_mode or "edit").strip().lower()
|
||||
mid = get_tracker_message_id(task_id)
|
||||
|
||||
if mode == "bump":
|
||||
# bump: one card, always at the bottom (delete + send + repoint).
|
||||
if mid is not None:
|
||||
# best-effort; result does NOT gate the send (BR-6).
|
||||
delete_telegram(mid)
|
||||
new_mid = send_telegram(text, disable_notification=True)
|
||||
if new_mid is not None:
|
||||
set_tracker_message_id(task_id, new_mid)
|
||||
# send returned None (no creds / transient) -> leave mid untouched;
|
||||
# no duplicate within this call, redraws on the next transition.
|
||||
return
|
||||
|
||||
# mode == "edit" (DEFAULT): existing behaviour, unchanged.
|
||||
if mid is not None:
|
||||
result = edit_telegram(mid, text)
|
||||
if result in (EDIT_OK, EDIT_NOT_MODIFIED):
|
||||
|
||||
Reference in New Issue
Block a user