grok-telegram-bot 2.4.0 → 2.6.0

package/src/bot/handlers/running.ts

@@ -7,7 +7,7 @@ import { type Bot, type Context, InlineKeyboard } from "grammy";
 import type { RunningSession, SwitchResult } from "../chat-controller.js";
 import type { BotDeps } from "../deps.js";
 import type { HistoryEntry } from "../../sessions/types.js";
-import { jsonlMtimeMs, readFirstPrompt, readLastCardSummary } from "../../sessions/history.js";
+import { jsonlMtimeMs, readFirstPrompt, readLastUserPrompt } from "../../sessions/history.js";
 import { progressBar } from "../../render/progress.js";
 import { refreshMenu } from "../menu/refresh.js";
 import { sendMarkdownDoc } from "../telegram-io.js";
@@ -51,47 +51,49 @@ function cleanPrompt(raw: string): string {
 /** Build a rich card (plain text, no MarkdownV2) + buttons for one controlled
  *  session: Switch / History / Close.
  *
- *  The comment line always answers "what is happening / what was solved":
- *    busy  → live current step (tool / thinking / working on …)
- *    idle  → last-turn outcome (assistant result + files), never bare import noise
+ *  Comment:
+ *    always — last user prompt (≤250)
+ *    busy   — plus last AI agent thinking on the next line (≤250)
  */
 function buildRunningCard(s: RunningSession, deps: BotDeps, now: number): { text: string; kb: InlineKeyboard } {
   const dot = s.foreground ? "\u25B6\uFE0F" : s.busy ? "\u{1F7E0}" : "\u26AA";
   const state = s.foreground ? "foreground" : s.busy ? "working" : "idle";
 
   let when = "new";
-  let historySummary = "";
+  let lastUser = "";
   let firstPrompt = "";
   if (s.sessionId) {
     const path = deps.store.jsonlPath(s.sessionId);
     const mtime = jsonlMtimeMs(path);
     if (mtime) when = timeAgo(now - mtime);
-    // Last assistant outcome beats first-prompt import-confirm noise.
-    historySummary = readLastCardSummary(path);
+    lastUser = readLastUserPrompt(path, 40, 250);
     firstPrompt = cleanPrompt(readFirstPrompt(path));
     if (/session import complete/i.test(firstPrompt)) firstPrompt = "";
   }
 
   const diskComment = s.sessionId ? deps.store.get(s.sessionId)?.comment?.trim() : undefined;
-  // Order: live runtime comment → persisted last-turn summary → history tail → first prompt.
+  // Order: live runtime (user + thinking) → last user from history → disk → first prompt.
   const comment =
     (s.comment && s.comment.trim()) ||
+    lastUser ||
     diskComment ||
-    historySummary ||
     firstPrompt;
 
   const meta = [when, state];
   if (s.busy) meta.push("\u23F3");
   if (s.unread > 0) meta.push(`${s.unread} \u{1F4EC} unread`);
 
-  const commentLabel = s.busy ? "\u23F3" : "\u{1F4AC}";
-  const lines = [
-    `${dot} ${s.projectName}`,
-    comment
-      ? `${commentLabel} ${trunc(comment, 200)}`
-      : "\u{1F4AC} (no messages yet)",
-    `\u{1F552} ${meta.join(" \u00B7 ")}`,
-  ];
+  const lines = [`${dot} ${s.projectName}`];
+  if (comment) {
+    const parts = comment.split("\n").map((l) => l.trim()).filter(Boolean);
+    parts.forEach((part, i) => {
+      const icon = i === 0 ? (s.busy ? "\u23F3" : "\u{1F4AC}") : "\u{1F9E0}";
+      lines.push(`${icon} ${trunc(part, 250)}`);
+    });
+  } else {
+    lines.push("\u{1F4AC} (no messages yet)");
+  }
+  lines.push(`\u{1F552} ${meta.join(" \u00B7 ")}`);
   if (s.progress !== undefined) lines.push(`\u{1F4C8} ${progressBar(s.progress)}`);
   if (s.sessionId) lines.push(`\u{1F194} ${s.sessionId.slice(0, 8)}`);
 
@@ -108,14 +110,55 @@ function buildRunningCard(s: RunningSession, deps: BotDeps, now: number): { text
 
 export async function showRunning(ctx: Context, deps: BotDeps): Promise<void> {
   await deps.ephemeral.open(ctx);
-  const list = dedupeBySession(deps.registry.controller(ctx.chat!.id).list());
+  const { resolveScope } = await import("../scope.js");
+  const scope = resolveScope(ctx, deps);
+  // Topic: only this topic's controlled sessions. Private: this chat + same-project forum sessions.
+  let list = dedupeBySession(scope.controller.list());
+  if (!scope.isForum) {
+    const path = scope.rt.cwd;
+    for (const fc of deps.registry.allForumControllers()) {
+      if (fc.fixedCwd && samePath(fc.fixedCwd, path)) {
+        list = dedupeBySession([...list, ...fc.list().map((s) => ({ ...s, projectName: `${s.projectName} \u00B7 topic` }))]);
+      }
+    }
+  } else {
+    // Also surface private-bot sessions for the same project path.
+    for (const chatId of deps.settings.chatIds()) {
+      if (chatId === scope.chatId) continue;
+      try {
+        const priv = deps.registry.controller(chatId);
+        for (const s of priv.list()) {
+          // Match by session cwd via store or name — use store meta if available.
+          if (s.sessionId) {
+            const meta = deps.store.get(s.sessionId);
+            if (meta?.cwd && samePath(meta.cwd, scope.rt.cwd)) {
+              list = dedupeBySession([
+                ...list,
+                { ...s, projectName: `${s.projectName} \u00B7 DM`, foreground: false },
+              ]);
+            }
+          }
+        }
+      } catch {
+        /* skip */
+      }
+    }
+  }
   if (list.length === 0) {
-    await deps.ephemeral.reply(ctx, "No sessions controlled yet. Use \u{1F4C1} Project or /new to start one.");
+    await deps.ephemeral.reply(
+      ctx,
+      scope.isForum
+        ? "No sessions in this topic yet. Send a message or tap \u{1F195} New."
+        : "No sessions controlled yet. Use \u{1F4C1} Project or /new to start one.",
+    );
     return;
   }
   const now = Date.now();
   const shown = list.slice(0, CARD_LIMIT);
-  await deps.ephemeral.reply(ctx, `\u{1F9ED} Sessions controlled by this chat (${list.length}) \u2014 tap \u{1F500} Switch on a card:`);
+  const header = scope.isForum
+    ? `\u{1F9ED} Running in topic **${scope.projectName ?? "topic"}** (${list.length})`
+    : `\u{1F9ED} Sessions controlled by this chat (${list.length}) \u2014 tap \u{1F500} Switch on a card:`;
+  await deps.ephemeral.reply(ctx, header);
   for (const s of shown) {
     const { text, kb } = buildRunningCard(s, deps, now);
     await deps.ephemeral.reply(ctx, text, { reply_markup: kb });
@@ -125,6 +168,11 @@ export async function showRunning(ctx: Context, deps: BotDeps): Promise<void> {
   }
 }
 
+function samePath(a: string, b: string): boolean {
+  return a.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase() ===
+    b.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
+}
+
 /** Collapse any cards that share a session id (defensive — the controller
  *  already prunes duplicate runtimes, but never show the same session twice). */
 function dedupeBySession(list: RunningSession[]): RunningSession[] {
@@ -139,14 +187,76 @@ function dedupeBySession(list: RunningSession[]): RunningSession[] {
 
 /** Switch the chat to a session and show its summary + unread. */
 export async function switchAndShow(ctx: Context, deps: BotDeps, sessionId: string): Promise<void> {
-  const res = await deps.registry.controller(ctx.chat!.id).switchTo(sessionId);
+  const { resolveScope } = await import("../scope.js");
+  const scope = resolveScope(ctx, deps);
+  // Always bring the session into *this* scope's controller (never switch FG on
+  // another surface — that would dual-own one ACP session across controllers).
+  let res = await scope.controller.switchTo(sessionId);
+  if (!res) {
+    const meta = deps.store.get(sessionId);
+    let cwd = meta?.cwd;
+    let name = meta?.title || (cwd ? basenameSafe(cwd) : undefined);
+    if (!cwd) {
+      // Discover cwd from whatever controller currently lists it.
+      for (const c of [scope.controller, ...deps.registry.allForumControllers()]) {
+        const hit = c.list().find((s) => s.sessionId === sessionId);
+        if (hit) {
+          cwd = (c as { fixedCwd?: string }).fixedCwd || scope.rt.cwd;
+          name = hit.projectName || name;
+          break;
+        }
+      }
+    }
+    if (cwd) {
+      // Topic controllers are fixed-path — refuse foreign projects.
+      if (scope.controller.fixedCwd && !samePath(scope.controller.fixedCwd, cwd)) {
+        await ctx.reply(
+          "That session belongs to a different project than this topic.",
+          scope.threadExtra,
+        );
+        return;
+      }
+      // Drop dual ownership: release from any other controller first.
+      await releaseSessionElsewhere(deps, scope.controller, sessionId);
+      const hist = (await import("../../sessions/history.js")).readHistory(
+        deps.store.jsonlPath(sessionId),
+      );
+      await scope.controller.addAttach(sessionId, cwd, name || basenameSafe(cwd), hist);
+      res = await scope.controller.switchTo(sessionId);
+    }
+  }
   if (!res) {
-    await ctx.reply("Session not found (it may have been closed).");
+    await ctx.reply("Session not found (it may have been closed).", scope.threadExtra);
     return;
   }
   await deliverSwitch(ctx, deps, res);
 }
 
+/** Stop controlling a session on every controller except `keep`. */
+async function releaseSessionElsewhere(
+  deps: BotDeps,
+  keep: import("../chat-controller.js").ChatController,
+  sessionId: string,
+): Promise<void> {
+  for (const c of deps.registry.allForumControllers()) {
+    if (c !== keep && c.findBySession(sessionId)) await c.close(sessionId);
+  }
+  for (const chatId of deps.settings.chatIds()) {
+    try {
+      const c = deps.registry.controller(chatId);
+      if (c !== keep && c.findBySession(sessionId)) await c.close(sessionId);
+    } catch {
+      /* skip */
+    }
+  }
+}
+
+function basenameSafe(p: string): string {
+  const n = p.replace(/\\/g, "/").replace(/\/+$/, "");
+  const i = n.lastIndexOf("/");
+  return i >= 0 ? n.slice(i + 1) : n;
+}
+
 export function registerRunning(bot: Bot, deps: BotDeps): void {
   bot.command("running", (ctx) => showRunning(ctx, deps));
 
@@ -160,8 +270,24 @@ export function registerRunning(bot: Bot, deps: BotDeps): void {
 
   bot.callbackQuery(new RegExp(`^run:close:${UUID}$`), async (ctx) => {
     const id = ctx.match![1]!;
-    await deps.registry.controller(ctx.chat!.id).close(id);
-    await ctx.answerCallbackQuery({ text: "Closed" });
+    const { resolveScope } = await import("../scope.js");
+    const scope = resolveScope(ctx, deps);
+    let closed = await scope.controller.close(id);
+    // Card may show a session owned by the other surface — close on owner.
+    if (!closed) {
+      const fc = deps.registry.forumControllerForSession(id);
+      if (fc) closed = await fc.close(id);
+    }
+    if (!closed) {
+      for (const chatId of deps.settings.chatIds()) {
+        const c = deps.registry.controller(chatId);
+        if (c.findBySession(id)) {
+          closed = await c.close(id);
+          break;
+        }
+      }
+    }
+    await ctx.answerCallbackQuery({ text: closed ? "Closed" : "Not found" });
     await ctx.deleteMessage().catch(() => {}); // remove just this card
   });
 }

package/src/bot/handlers/session-card.ts

@@ -24,8 +24,8 @@ export interface SessionCardExtras {
   /** Latest task-completion % (0–100) for this session, if this chat runs it. */
   progress?: number;
   /**
-   * Live step (while working) or chat summary (when idle). Overrides
-   * `m.comment` when provided by the controlling chat runtime.
+   * Last user prompt (and, when busy, last AI thinking on a second line).
+   * Overrides `m.comment` when provided by the controlling chat runtime.
    */
   comment?: string;
 }
@@ -35,6 +35,8 @@ export interface SessionCard {
   keyboard: InlineKeyboard;
 }
 
+const COMMENT_LINE_MAX = 250;
+
 /** Build the card body + buttons for one session. */
 export function buildSessionCard(m: SessionMeta, extra: SessionCardExtras = {}): SessionCard {
   const dot = m.active ? "\u{1F7E2}" : "\u26AA";
@@ -44,10 +46,16 @@ export function buildSessionCard(m: SessionMeta, extra: SessionCardExtras = {}):
 
   const lines = [`${dot} ${m.title}`, `\u{1F4C1} ${proj}`];
   if (m.cwd) lines.push(`   ${m.cwd}`);
-  // Always surface "what is happening / what was done" when we have it.
+  // Last user prompt always; second line = thinking while running.
   if (comment) {
-    const icon = m.active || typeof extra.progress === "number" ? "\u23F3" : "\u{1F4AC}";
-    lines.push(`${icon} ${comment.length > 160 ? comment.slice(0, 159) + "\u2026" : comment}`);
+    const busy = m.active || typeof extra.progress === "number";
+    const parts = comment.split("\n").map((l) => l.trim()).filter(Boolean);
+    parts.forEach((part, i) => {
+      const clipped = part.length > COMMENT_LINE_MAX ? part.slice(0, COMMENT_LINE_MAX - 1) + "\u2026" : part;
+      // First line: user prompt; later lines (thinking): hourglass when busy.
+      const icon = i === 0 ? (busy ? "\u23F3" : "\u{1F4AC}") : "\u{1F9E0}";
+      lines.push(`${icon} ${clipped}`);
+    });
   }
   lines.push(`\u{1F552} updated ${relTime(m.updatedAt)} \u00B7 created ${relTime(m.createdAt)}`);
   const ctx = typeof extra.contextPct === "number" ? ` \u00B7 \u{1F9E0} ctx ${Math.round(extra.contextPct)}%` : "";

package/src/bot/handlers/sessions.ts

@@ -10,7 +10,7 @@
 import { type Bot, type Context, InlineKeyboard } from "grammy";
 import { basename } from "node:path";
 import type { BotDeps } from "../deps.js";
-import { readHistory, readLastCardSummary } from "../../sessions/history.js";
+import { readHistory, readLastUserPrompt } from "../../sessions/history.js";
 import type { SessionMeta } from "../../sessions/types.js";
 import { refreshMenu } from "../menu/refresh.js";
 import { showHistory } from "./history.js";
@@ -22,16 +22,35 @@ const UUID = "([0-9a-fA-F-]{36})";
 
 export async function showSessions(ctx: Context, deps: BotDeps, query?: string): Promise<void> {
   const q = (query ?? "").trim().toLowerCase();
+  const { resolveScope } = await import("../scope.js");
+  const scope = resolveScope(ctx, deps);
   let metas = deps.store.list(q ? 400 : 200);
+  // In a forum topic, only show sessions for this project path (includes bot DMs).
+  if (scope.isForum && scope.projectPath) {
+    const want = scope.projectPath.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
+    metas = metas.filter((m) => (m.cwd || "").replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase() === want);
+  }
   if (q) {
     metas = metas.filter((m) => `${m.title} ${m.cwd} ${m.sessionId}`.toLowerCase().includes(q));
   }
   if (metas.length === 0) {
     await deps.ephemeral.open(ctx);
-    await deps.ephemeral.reply(ctx, q ? `No sessions match "${q}".` : "No saved sessions found in ~/.grok/sessions/cli.");
+    await deps.ephemeral.reply(
+      ctx,
+      q
+        ? `No sessions match "${q}".`
+        : scope.isForum
+          ? `No saved sessions for project **${scope.projectName}** yet.`
+          : "No saved sessions found in ~/.grok/sessions/cli.",
+    );
     return;
   }
-  deps.menuCache.setSessions(ctx.chat!.id, metas, q ? `Sessions matching "${q}"` : "Recent sessions");
+  const heading = scope.isForum
+    ? `Sessions \u00B7 ${scope.projectName ?? "topic"}`
+    : q
+      ? `Sessions matching "${q}"`
+      : "Recent sessions";
+  deps.menuCache.setSessions(ctx.chat!.id, metas, heading);
   await renderSessionPage(ctx, deps, 0);
 }
 
@@ -50,15 +69,20 @@ async function renderSessionPage(ctx: Context, deps: BotDeps, page: number): Pro
   const pageStr = totalPages > 1 ? ` \u00B7 page ${p + 1}/${totalPages}` : "";
   await deps.ephemeral.reply(ctx, `\u{1F5C2} ${heading} \u2014 ${metas.length} total${liveStr}${pageStr}`);
 
+  const { resolveScope } = await import("../scope.js");
+  const scope = resolveScope(ctx, deps);
   for (const m of slice) {
     const contextPct = deps.acp.metadataFor(m.sessionId)?.contextUsagePercentage;
-    const ctrl = deps.registry.controller(ctx.chat!.id);
-    const progress = ctrl.progressFor(m.sessionId);
-    // Live runtime → persisted comment → last assistant outcome from history.
+    const ctrl = scope.controller;
+    const progress =
+      ctrl.progressFor(m.sessionId) ??
+      deps.registry.forumControllerForSession(m.sessionId)?.progressFor(m.sessionId);
+    // Live runtime (user + thinking) → last user from history → disk comment.
     const comment =
       ctrl.commentFor(m.sessionId) ||
-      m.comment ||
-      readLastCardSummary(deps.store.jsonlPath(m.sessionId));
+      deps.registry.forumControllerForSession(m.sessionId)?.commentFor(m.sessionId) ||
+      readLastUserPrompt(deps.store.jsonlPath(m.sessionId)) ||
+      m.comment;
     const { text, keyboard } = buildSessionCard(m, {
       contextPct,
       selfPid: deps.acp.pid,
@@ -97,8 +121,12 @@ export function registerSessions(bot: Bot, deps: BotDeps): void {
   });
 
   bot.command("unwatch", async (ctx) => {
-    const rt = deps.registry.get(ctx.chat.id);
-    await ctx.reply(rt.stopWatch() ? "\u{1F6D1} Stopped watching." : "Not watching anything.");
+    const { resolveScope } = await import("../scope.js");
+    const scope = resolveScope(ctx, deps);
+    await ctx.reply(
+      scope.rt.stopWatch() ? "\u{1F6D1} Stopped watching." : "Not watching anything.",
+      scope.threadExtra,
+    );
   });
 
   bot.callbackQuery(new RegExp(`^sess:${UUID}$`), async (ctx) => {
@@ -110,19 +138,39 @@ export function registerSessions(bot: Bot, deps: BotDeps): void {
     }
     await ctx.answerCallbackQuery();
     await deps.ephemeral.clear(ctx.chat!.id); // remove the session cards
-    const fgCwd = deps.registry.get(ctx.chat!.id).cwd;
+    const { resolveScope } = await import("../scope.js");
+    const scope = resolveScope(ctx, deps);
+    const fgCwd = scope.rt.cwd;
     const cwd = meta.cwd || fgCwd;
     const projectName = basename(meta.cwd || fgCwd) || "session";
+    if (scope.controller.fixedCwd) {
+      const a = scope.controller.fixedCwd.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
+      const b = cwd.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
+      if (a !== b) {
+        await ctx.reply("That session is for a different project than this topic.", scope.threadExtra);
+        return;
+      }
+    }
     const prior = readHistory(deps.store.jsonlPath(id), 24);
     try {
-      const { result, alreadyControlled } = await deps.registry
-        .controller(ctx.chat!.id)
-        .addAttach(id, cwd, projectName, prior);
-      await ctx.reply(alreadyControlled ? `\u{1F500} Switched to ${meta.title}` : connectMessage(result, meta));
+      // Avoid dual ownership across DM ↔ topic controllers.
+      for (const c of deps.registry.allForumControllers()) {
+        if (c !== scope.controller && c.findBySession(id)) await c.close(id);
+      }
+      const { result, alreadyControlled } = await scope.controller.addAttach(
+        id,
+        cwd,
+        projectName,
+        prior,
+      );
+      await ctx.reply(
+        alreadyControlled ? `\u{1F500} Switched to ${meta.title}` : connectMessage(result, meta),
+        scope.threadExtra,
+      );
       await refreshMenu(ctx, deps, `\u{1F4C2} ${meta.title}`);
       await showHistory(deps, ctx.chat!.id, id, meta);
     } catch (err) {
-      await ctx.reply(`\u274C Could not connect: ${(err as Error).message}`);
+      await ctx.reply(`\u274C Could not connect: ${(err as Error).message}`, scope.threadExtra);
     }
   });
 
@@ -137,10 +185,12 @@ export function registerSessions(bot: Bot, deps: BotDeps): void {
     const id = ctx.match![1]!;
     await ctx.answerCallbackQuery();
     const meta = deps.store.get(id);
-    const rt = deps.registry.get(ctx.chat!.id);
-    rt.startWatch(deps.store.jsonlPath(id));
+    const { resolveScope } = await import("../scope.js");
+    const scope = resolveScope(ctx, deps);
+    scope.rt.startWatch(deps.store.jsonlPath(id));
     await ctx.reply(
       `\u{1F4E1} Watching live: ${meta?.title ?? id.slice(0, 8)}\nNew activity streams here. Send /unwatch to stop.`,
+      scope.threadExtra,
     );
   });
 }

package/src/bot/handlers/voice.ts

@@ -14,8 +14,16 @@ import { extractReplyContext } from "../reply-context.js";
 
 const log = createLogger("voice");
 
+type VoiceMediaKind = "voice" | "audio" | "video_note";
+
 export function registerVoice(bot: Bot, deps: BotDeps): void {
-  const handle = async (ctx: Context, fileId: string, mime: string, name: string): Promise<void> => {
+  const handle = async (
+    ctx: Context,
+    fileId: string,
+    mime: string,
+    name: string,
+    mediaKind: VoiceMediaKind,
+  ): Promise<void> => {
     const chatId = ctx.chat!.id;
     if (deps.wizard.isActive(chatId)) {
       await ctx.reply("Finish or /cancel the task wizard before sending voice.");
@@ -36,11 +44,41 @@ export function registerVoice(bot: Bot, deps: BotDeps): void {
         await ctx.reply("\u{1F399} I couldn't make out any speech.");
         return;
       }
-      await ctx.reply(`\u{1F399} \u201C${text}\u201D`);
-      const rt = deps.registry.get(chatId);
+      const { resolveScope } = await import("../scope.js");
+      const { adoptUserPrompt } = await import("../prompt-anchor.js");
+      const scope = resolveScope(ctx, deps);
       const quoted = extractReplyContext(ctx);
-      const outcome = await rt.submit(textPrompt(text, ctx.message?.message_id, quoted));
-      if (outcome === "queued") await ctx.reply("\u{1F4E5} Queued \u2014 will run after the current task.");
+      const userMsgId = ctx.message?.message_id;
+      const media =
+        mediaKind === "video_note"
+          ? [{ type: "video_note" as const, fileId }]
+          : mediaKind === "voice"
+            ? [{ type: "voice" as const, fileId }]
+            : [{ type: "audio" as const, fileId, fileName: name }];
+      const anchor = await adoptUserPrompt(deps.api, {
+        chatId,
+        text: `\u201C${text}\u201D`,
+        userMessageIds: userMsgId !== undefined ? [userMsgId] : [],
+        messageThreadId: scope.threadExtra.message_thread_id,
+        projectName: scope.rt.projectName,
+        prefix: "\u{1F399} Voice",
+        media,
+      });
+      const outcome = await scope.rt.submit(
+        textPrompt(text, anchor?.replyTo ?? userMsgId, quoted, {
+          promptId: anchor?.promptId,
+        }),
+      );
+      if (outcome === "queued") {
+        const extra: Record<string, unknown> = { ...scope.threadExtra };
+        if (anchor?.replyTo !== undefined) {
+          extra.reply_parameters = {
+            message_id: anchor.replyTo,
+            allow_sending_without_reply: true,
+          };
+        }
+        await ctx.reply("\u{1F4E5} Queued \u2014 will run after the current task.", extra);
+      }
     } catch (e) {
       log.warn("voice failed:", (e as Error).message);
       await ctx.reply(`\u274C Voice transcription failed: ${(e as Error).message}`);
@@ -48,7 +86,13 @@ export function registerVoice(bot: Bot, deps: BotDeps): void {
   };
 
   bot.on("message:voice", (ctx) =>
-    handle(ctx, ctx.message.voice.file_id, ctx.message.voice.mime_type || "audio/ogg", "voice.ogg"),
+    handle(
+      ctx,
+      ctx.message.voice.file_id,
+      ctx.message.voice.mime_type || "audio/ogg",
+      "voice.ogg",
+      "voice",
+    ),
   );
   bot.on("message:audio", (ctx) =>
     handle(
@@ -56,10 +100,11 @@ export function registerVoice(bot: Bot, deps: BotDeps): void {
       ctx.message.audio.file_id,
       ctx.message.audio.mime_type || "audio/mpeg",
       ctx.message.audio.file_name || "audio.mp3",
+      "audio",
     ),
   );
   bot.on("message:video_note", (ctx) =>
-    handle(ctx, ctx.message.video_note.file_id, "video/mp4", "note.mp4"),
+    handle(ctx, ctx.message.video_note.file_id, "video/mp4", "note.mp4", "video_note"),
   );
 }
 

package/src/bot/image-return.ts

@@ -129,6 +129,8 @@ export interface SendImagesOptions {
   max: number;
   /** Optional Telegram message id to thread replies under. */
   replyTo?: number;
+  /** Forum topic — required so agent images land in the right topic. */
+  messageThreadId?: number;
 }
 
 /** Send the valid, fresh, not-yet-sent images as documents. Returns how many were sent. */
@@ -139,10 +141,14 @@ export async function sendImages(
   opts: SendImagesOptions,
 ): Promise<number> {
   let sent = 0;
-  const replyExtra =
-    opts.replyTo !== undefined
-      ? { reply_parameters: { message_id: opts.replyTo, allow_sending_without_reply: true } }
-      : {};
+  const extra: Record<string, unknown> = {};
+  if (opts.replyTo !== undefined) {
+    extra.reply_parameters = { message_id: opts.replyTo, allow_sending_without_reply: true };
+  }
+  // Omit General (1) — Bot API rejects message_thread_id=1.
+  if (opts.messageThreadId !== undefined && opts.messageThreadId !== 1) {
+    extra.message_thread_id = opts.messageThreadId;
+  }
   for (const path of paths) {
     if (sent >= opts.max) break;
     if (opts.already.has(path)) continue;
@@ -161,7 +167,7 @@ export async function sendImages(
       const file = new InputFile(path, basename(path));
       await api.sendDocument(chatId, file, {
         caption: basename(path),
-        ...replyExtra,
+        ...extra,
       });
       sent++;
       log.debug(`sent document ${path}`);