grok-telegram-bot 2.5.0 → 2.6.0

package/src/bot/telegram-bots.ts

@@ -176,7 +176,8 @@ export class TelegramBotService {
       : `/${cmd}@${username}`;
 
     const extra: Record<string, unknown> = {};
-    if (opts.messageThreadId !== undefined) {
+    // Omit General (1) — Bot API rejects message_thread_id=1.
+    if (opts.messageThreadId !== undefined && opts.messageThreadId !== 1) {
       extra.message_thread_id = opts.messageThreadId;
     }
 

package/src/bot/telegram-io.ts

@@ -183,7 +183,10 @@ export async function sendMarkdownDoc(
   opts?: { loud?: boolean; messageThreadId?: number },
 ): Promise<void> {
   const extra: Record<string, unknown> = opts?.loud ? { disable_notification: false } : {};
-  if (opts?.messageThreadId !== undefined) extra.message_thread_id = opts.messageThreadId;
+  // Omit General (1) — Bot API rejects message_thread_id=1.
+  if (opts?.messageThreadId !== undefined && opts.messageThreadId !== 1) {
+    extra.message_thread_id = opts.messageThreadId;
+  }
   const rendered = toTelegramMarkdown(rawMarkdown);
   const mdChunks = chunkMarkdown(rendered);
   const plainChunks = chunkMarkdown(rawMarkdown);

package/src/forum/manager.ts

@@ -265,7 +265,8 @@ export class ForumManager {
       () =>
         this.api.sendMessage(
           this.groupId,
-          `\u{1F916} **AI Chat** — general conversation (workspace).\nPath: \`${this.cfg.workspace}\``,
+          `\u{1F916} **AI Chat** — workspace coding chat.\nPath: \`${this.cfg.workspace}\`\n\n` +
+            `Use **General** to orchestrate projects (manager). Code here or in a project topic.`,
           { message_thread_id: topic.message_thread_id, parse_mode: "Markdown" },
         ),
       "ai-chat-announce",

package/src/forum/thread.ts

@@ -14,3 +14,36 @@ export function batchKey(chatId: number, threadId: number | undefined, isForumGr
 export function forumThreadId(threadId: number | undefined): number {
   return threadId ?? FORUM_GENERAL_THREAD_ID;
 }
+
+/**
+ * True when this forum thread is the General manager topic.
+ * Only exact id `1` — do NOT treat private chats (undefined) as General.
+ * Callers should pass {@link forumThreadId} first when reading raw Telegram ids.
+ */
+export function isGeneralThread(threadId: number | undefined): boolean {
+  return threadId === FORUM_GENERAL_THREAD_ID;
+}
+
+/**
+ * Thread id for **outbound** Telegram API calls (`sendMessage`, `editMessage`, …).
+ *
+ * Critical: Bot API often rejects `message_thread_id: 1` for the General forum
+ * topic with "Bad Request: message thread not found". Omitting the field posts
+ * to General correctly. Real project topics (id > 1) must still pass the id.
+ *
+ * Inbound routing still uses {@link forumThreadId} (undefined → 1).
+ */
+export function outboundMessageThreadId(
+  threadId: number | undefined,
+): number | undefined {
+  if (threadId === undefined || threadId === FORUM_GENERAL_THREAD_ID) return undefined;
+  return threadId;
+}
+
+/** Extra object for send/edit: only includes message_thread_id when safe. */
+export function outboundThreadExtra(
+  threadId: number | undefined,
+): { message_thread_id?: number } {
+  const id = outboundMessageThreadId(threadId);
+  return id !== undefined ? { message_thread_id: id } : {};
+}

package/src/render/manager-directive.ts

@@ -0,0 +1,137 @@
+/**
+ * Manager (OpenClaw-style) directive for the Telegram General topic.
+ *
+ * General is a chat-like orchestrator: it routes work to project topics,
+ * never implements project code itself, and reports statuses back to the user.
+ * Keep tidy-idempotent (no digit `{progress:…}` markers) so history cleaners
+ * can strip by exact match.
+ */
+import type { PromptInput } from "../app/types.js";
+
+export const MANAGER_DIRECTIVE_MARKER = "MANAGER MODE (General topic — OpenClaw-style orchestrator):";
+
+/** Marker for child-session completion wakes injected into General. */
+export const MANAGER_WORK_REPORT_MARKER =
+  "MANAGER WORK REPORT (system — analyze and report to the user; do not invent facts):";
+
+/**
+ * First-prompt / steering block for General. Free of real progress digit tokens.
+ */
+export const MANAGER_DIRECTIVE = [
+  MANAGER_DIRECTIVE_MARKER,
+  "You are the global manager of this Telegram forum group — like OpenClaw.",
+  "This topic is a chat control room, not a coding workspace.",
+  "",
+  "How you behave:",
+  "- The user SEES your free-form prose in this chat. Always answer them in short chat text.",
+  "- Keep replies brief (a few sentences). No progress bars, tool dumps, job tables, or",
+  "  \"Dispatching…\" / \"Sending to…\" narration.",
+  "- Use telegram JSON for side effects: search_memory, list_topics, send_prompt, notify.",
+  "- notify is an OPTIONAL extra ping — do NOT rely on it as the only user-facing channel.",
+  "- Example good reply: \"On it — continuing the ship gate in WindowsStoreListingGenerator.\"",
+  "- NEVER emit task-progress markers (no progress percent footers).",
+  "- NEVER enter plan mode, run self-recheck, or dump long tool/trace spam here.",
+  "- NEVER implement app code, edit project files, run builds/tests, or do multi-file work in General.",
+  "- Always DELEGATE real work to the correct project topic via telegram bridge actions.",
+  "",
+  "MEMORY-FIRST (mandatory — do this BEFORE any git/shell/file tools):",
+  "1. Read the auto-injected MANAGER CONTEXT (General history, memory hits, topics, jobs).",
+  "2. Call search_memory with the user's keywords (and list_topics if needed).",
+  "3. Prefer Telegram/bot memory + project topic session history over `git log` / filesystem.",
+  "4. Only use git if the user explicitly asks for git, or after memory has no useful hits.",
+  "5. Order of truth for \"what changed / last work\":",
+  "   (a) General chat + manager memory hits with [age] stamps (newest first),",
+  "   (b) that project's MOST RECENT topic sessions (highest recency / last user prompts / Done notes),",
+  "   (c) ignore older sessions for the same app when a newer session exists,",
+  "   (d) then optional git — never jump to git first.",
+  "6. When summarizing last work: weight last user prompts and assistant Done text by time,",
+  "   not by how many times a keyword appears in an old session.",
+  "",
+  "Dispatch workflow:",
+  "1. Identify the target topic (exact title, #threadId, or create a new project topic).",
+  "2. Build a RICH child prompt from memory (what was done, what remains, acceptance criteria).",
+  "3. Emit one telegram JSON block: create_topic/set_path as needed, then send_prompt,",
+  "   plus optional single notify if the user should hear about it.",
+  "4. After bridge results: silent is fine if dispatch ok; notify only on failure or if user asked.",
+  "5. MANAGER WORK REPORT wakes: notify only for outcomes the user needs (done/fail/important);",
+  "   otherwise process silently (no notify).",
+  "",
+  "RESUME RELATED SESSIONS (critical):",
+  "- When memory/context shows a related session (session=019fc9ec or full UUID) and the user",
+  "  wants a follow-up / continue / fix there, you MUST pass session_id on send_prompt.",
+  "- Without session_id the bridge uses the topic's CURRENT open session — often the wrong one.",
+  "- topic must be the EXACT forum title or #threadId from list_topics / memory — NEVER \"…\" / \"...\" / placeholders.",
+  "- If you only know the session id, omit topic: { \"action\": \"send_prompt\", \"session_id\": \"019fc9ec\", \"prompt\": \"...\" }",
+  "- Example: { \"action\": \"send_prompt\", \"topic\": \"MyApp\", \"session_id\": \"019fc9ec\", \"prompt\": \"...\" }",
+  "- Only omit session_id for brand-new work on the topic's foreground, or use new_session=true for a fresh session.",
+  "- On Topic not found: call list_topics and retry with the exact name or #id (or session_id only).",
+  "",
+  "New projects: create_topic with name + absolute path (folder is created if missing),",
+  "then send_prompt into that topic with the full kickoff instructions.",
+  "",
+  "User message:",
+].join("\n");
+
+/** True when text is a system work-report wake (meta; skip recheck / manager re-wrap noise). */
+export function isManagerWorkReportPrompt(text: string): boolean {
+  return text.trimStart().startsWith(MANAGER_WORK_REPORT_MARKER);
+}
+
+/** Prepend manager directive (idempotent). */
+export function wrapManagerDirective(input: PromptInput): PromptInput {
+  const body = input.text.trim() || "(see attached media / files)";
+  if (body.startsWith(MANAGER_DIRECTIVE_MARKER) || body.includes(MANAGER_DIRECTIVE_MARKER)) {
+    return input;
+  }
+  return {
+    ...input,
+    text: `${MANAGER_DIRECTIVE}\n${body}`,
+  };
+}
+
+/** Build the meta prompt that wakes General after a child topic finishes. */
+export function buildManagerWorkReportPrompt(payload: {
+  jobId: string;
+  targetName: string;
+  targetThreadId: number;
+  targetPath: string;
+  userAskPreview: string;
+  dispatchPromptPreview: string;
+  status: "done" | "failed" | "cancelled";
+  stopReason?: string;
+  error?: string;
+  assistantSummary: string;
+  filesSummary?: string;
+  childSessionId?: string;
+}): string {
+  const lines = [
+    MANAGER_WORK_REPORT_MARKER,
+    "```json",
+    JSON.stringify(
+      {
+        jobId: payload.jobId,
+        status: payload.status,
+        target: {
+          name: payload.targetName,
+          threadId: payload.targetThreadId,
+          path: payload.targetPath,
+        },
+        userAskPreview: payload.userAskPreview.slice(0, 500),
+        dispatchPromptPreview: payload.dispatchPromptPreview.slice(0, 800),
+        stopReason: payload.stopReason,
+        error: payload.error,
+        childSessionId: payload.childSessionId,
+        filesSummary: payload.filesSummary,
+        assistantSummary: payload.assistantSummary.slice(0, 3500),
+      },
+      null,
+      2,
+    ),
+    "```",
+    "If the user needs to know (success, failure, blocked, needs a decision), reply in short prose.",
+    "If this is routine and they did not ask for a status, a one-line note is enough.",
+    "Do not re-emit the same send_prompt unless a retry is clearly useful.",
+    "No progress markers. No job tables or multi-message status spam.",
+  ];
+  return lines.join("\n");
+}

package/src/render/session-comment.ts

@@ -52,6 +52,14 @@ export function cleanCommentLine(raw: string, max = COMMENT_MAX): string {
  */
 export function stripDirectiveWrappers(raw: string): string {
   let t = raw.trim().replace(/^\([^)]*\)\s*/, "");
+  // Manager context + work reports (meta).
+  if (/^MANAGER WORK REPORT \(system/i.test(t)) t = "";
+  if (/MANAGER CONTEXT \(auto/i.test(t)) {
+    t = t.replace(/MANAGER CONTEXT \(auto[\s\S]*?\n---\n\n/i, "");
+  }
+  if (/^MANAGER MODE \(General topic/i.test(t)) {
+    t = t.replace(/^MANAGER MODE \(General topic[\s\S]*?User message:\s*/i, "");
+  }
   const marker = "User's new message:";
   const i = t.lastIndexOf(marker);
   if (i !== -1) t = t.slice(i + marker.length);
@@ -68,6 +76,7 @@ export function stripDirectiveWrappers(raw: string): string {
     }
   }
   if (/^TELEGRAM BRIDGE RESULTS \(system/i.test(t.trim())) t = "";
+  if (/^MANAGER WORK REPORT \(system/i.test(t.trim())) t = "";
   return t.trim();
 }
 
@@ -81,6 +90,7 @@ export function cleanUserPreview(raw: string, max = COMMENT_MAX): string {
   if (/^SELF-RECHECK DECISION \(meta only\)/i.test(t)) return "";
   if (/^FOLLOW-UP SUGGESTIONS \(meta only\)/i.test(t)) return "";
   if (/^TELEGRAM BRIDGE RESULTS \(system/i.test(t)) return "Telegram bridge";
+  if (/^MANAGER WORK REPORT \(system/i.test(t)) return "Manager work report";
   return cleanCommentLine(t, max);
 }
 

package/src/render/telegram-bridge.ts

@@ -25,11 +25,25 @@ export const TELEGRAM_SEND_PROMPT_MAX = 5;
 export type TelegramAction =
   | { action: "create_topic"; name: string; path?: string }
   | { action: "set_path"; topic: string; path: string }
-  | { action: "send_prompt"; topic: string; prompt: string; newSession?: boolean }
+  | {
+      action: "send_prompt";
+      topic: string;
+      prompt: string;
+      newSession?: boolean;
+      /** Resume this exact Grok session in the topic (full id or short prefix). */
+      sessionId?: string;
+    }
+  /** User-facing message in the current chat (General: only way to talk to the user). */
+  | { action: "notify"; text: string; important?: boolean }
   | { action: "search_memory"; query: string; limit?: number }
+  | { action: "list_topics" }
+  | { action: "list_jobs" }
   | { action: "list_bots" }
   | { action: "bot_command"; bot: string; command: string; args?: string };
 
+/** Max user-facing notify messages per turn (anti-spam). */
+export const TELEGRAM_NOTIFY_MAX = 3;
+
 export interface TelegramActionExtract {
   actions: TelegramAction[];
   /** Text with telegram action fences removed. */
@@ -49,8 +63,11 @@ export const TELEGRAM_BRIDGE_DIRECTIVE_BASE = [
   '{ "telegram": [',
   '  { "action": "create_topic", "name": "Topic title", "path": "optional absolute project path or exact catalog name" },',
   '  { "action": "set_path", "topic": "Topic title or #threadId", "path": "absolute path or exact catalog name" },',
-  '  { "action": "send_prompt", "topic": "Topic title or #threadId", "prompt": "work for that topic", "new_session": false },',
+  '  { "action": "send_prompt", "topic": "ExactTopicTitle or #threadId", "prompt": "work for that topic", "new_session": false, "session_id": "optional-full-or-short-session-id" },',
+  '  { "action": "notify", "text": "short message for the user", "important": false },',
   '  { "action": "search_memory", "query": "keywords about past work", "limit": 8 },',
+  '  { "action": "list_topics" },',
+  '  { "action": "list_jobs" },',
   '  { "action": "list_bots" },',
   '  { "action": "bot_command", "bot": "username_without_at", "command": "status", "args": "optional" }',
   "] }",
@@ -62,22 +79,50 @@ export const TELEGRAM_BRIDGE_DIRECTIVE_BASE = [
   "- set_path — bind/rebind an existing topic to a project path (absolute dir or exact catalog name).",
   "  Absolute paths that do not exist yet are created on disk.",
   "- send_prompt — start or queue a prompt in another topic's session (does not wait for that turn to finish).",
-  "  From General/AI Chat (GROK_WORKSPACE) you can create a project topic, set_path, then send_prompt with multi-step work.",
-  "  topic = exact topic title, #threadId, \"general\", or \"ai chat\". Optional new_session=true starts a fresh session there.",
-  "- search_memory — search indexed forum topics + session titles/comments/history.",
+  "  From General (manager) you MUST create/set path then send_prompt — never code in General.",
+  "  Child sessions started from General auto report back with a MANAGER WORK REPORT when done.",
+  "  topic = EXACT forum title (from list_topics / memory), #threadId, \"general\", or \"ai chat\".",
+  "  NEVER use placeholders like \"…\", \"...\", \"topic\", \"there\" — call list_topics if unsure.",
+  "  Optional new_session=true starts a FRESH session in that topic.",
+  "  Optional session_id (full UUID or short prefix like 019fc9ec) RESUMES that exact session.",
+  "  When session_id is set, topic may be omitted — the bridge maps session path → topic.",
+  "  session_id is REQUIRED when memory found a related session and the user wants a follow-up there.",
+  "  Without session_id the bridge uses the topic's current foreground session (often wrong).",
+  "- notify — optional extra short message. In General the user ALSO sees your free-form prose,",
+  "  so always write a brief chat reply; do not stay silent after search/dispatch.",
+  "  Max 3 notify per turn. Never notify dispatch chatter, job tables, or \"sending to…\" spam.",
+  "- search_memory — search indexed forum topics + session titles/comments/history (memory-first).",
+  "- list_topics — list all mapped forum topics (name, #id, path, kind).",
+  "- list_jobs — list recent manager dispatches from General (status, target topic).",
   "- list_bots — list allowlisted sibling Telegram bots and command catalogs.",
   "- bot_command — /command@bot; waits for that bot to settle. NOT a Done; timeouts return ok=false.",
   "",
+  "Example (General — short prose plus dispatch):",
+  "```json",
+  '{ "telegram": [',
+  '  { "action": "send_prompt", "topic": "WindowsStoreListingGenerator", "session_id": "019fc9ec", "prompt": "Continue ship gate." },',
+  '  { "action": "notify", "text": "On it — continuing the ship gate in WindowsStoreListingGenerator." }',
+  "] }",
+  "```",
+  "",
+  "Example (session_id only — topic inferred from session path):",
+  "```json",
+  '{ "telegram": [',
+  '  { "action": "send_prompt", "session_id": "019fc9ec", "prompt": "Continue the related work." }',
+  "] }",
+  "```",
+  "",
   "Example (from General): create project topic + path + kick off work there:",
-  '```json',
+  "```json",
   '{ "telegram": [',
   '  { "action": "create_topic", "name": "MyApp", "path": "H:\\\\Projects\\\\MyApp" },',
-  '  { "action": "send_prompt", "topic": "MyApp", "prompt": "1) scaffold\\n2) tests\\n3) README" }',
+  '  { "action": "send_prompt", "topic": "MyApp", "new_session": true, "prompt": "1) scaffold\\n2) tests\\n3) README" },',
+  '  { "action": "notify", "text": "Created **MyApp** and started scaffolding there." }',
   "] }",
   "```",
   "",
   "After you emit these actions, the bridge runs them and may send TELEGRAM BRIDGE RESULTS. Use those facts; do not invent replies.",
-  "The bridge strips the JSON fence from the user-visible message. Prefer plain prose for the user; put protocol only in the fence.",
+  "The bridge strips the JSON fence from display. In General write a short prose answer the user can see.",
   "Do not spam actions. Prefer one orchestration block per turn.",
 ].join("\n");
 
@@ -87,6 +132,8 @@ export interface TelegramBridgeCaps {
   allowedBots: string[];
   /** username → command list for first-prompt teaching */
   botCommands?: Record<string, Array<{ command: string; description?: string }>>;
+  /** When true, General manager wording is appended. */
+  managerMode?: boolean;
 }
 
 /** Full first-prompt directive including live capabilities. */
@@ -95,7 +142,7 @@ export function buildTelegramBridgeDirective(caps: TelegramBridgeCaps): string {
   if (caps.forumReady && caps.topicGroupId !== undefined) {
     lines.push(
       `- Forum topics: READY (group ${caps.topicGroupId}). You may create_topic, set_path, and send_prompt.`,
-      `- General / AI Chat sessions use GROK_WORKSPACE; other topics use their bound project path.`,
+      `- General is the manager topic (orchestrates only). AI Chat uses GROK_WORKSPACE for coding there; project topics use their bound path.`,
     );
   } else if (caps.topicGroupId !== undefined) {
     lines.push(
@@ -123,7 +170,12 @@ export function buildTelegramBridgeDirective(caps: TelegramBridgeCaps): string {
       "- Sibling bots: none configured (ALLOWED_TELEGRAM_BOTS empty). list_bots returns empty; bot_command disabled.",
     );
   }
-  lines.push("- search_memory: always available against bot-owned session/topic indexes.");
+  lines.push("- search_memory / list_topics / list_jobs: available against bot-owned indexes.");
+  if (caps.managerMode) {
+    lines.push(
+      "- You are in General manager mode: chat-like replies only; memory-first; dispatch via send_prompt; child work auto-reports back.",
+    );
+  }
   return lines.join("\n");
 }
 
@@ -165,6 +217,7 @@ export function buildTelegramBridgeResultsPrompt(results: unknown[]): string {
     payload,
     "```",
     "Continue the user's task with this information. Do not ask the user to paste results. Do not re-emit the same telegram actions unless something failed and a retry is useful.",
+    "If actions succeeded, continue with a short prose answer — never dump job tables or dispatch narration.",
   ].join("\n");
 }
 
@@ -190,7 +243,7 @@ export function extractTelegramActions(text: string): TelegramActionExtract {
   cleaned = cleaned.replace(/```(?:json|JSON)?\s*\r?\n[\s\S]*$/i, (tail) => {
     if (
       /"telegram"\s*:/i.test(tail) ||
-      /"action"\s*:\s*"(?:create_topic|set_path|send_prompt|search_memory|list_bots|bot_command)"/i.test(
+      /"action"\s*:\s*"(?:create_topic|set_path|send_prompt|notify|search_memory|list_topics|list_jobs|list_bots|bot_command)"/i.test(
         tail,
       )
     ) {
@@ -280,19 +333,58 @@ function normalizeAction(item: unknown): TelegramAction | undefined {
     case "send_prompt":
     case "topic_prompt":
     case "prompt_topic": {
-      const topic = String(rec.topic ?? rec.name ?? rec.thread ?? rec.thread_id ?? rec.threadId ?? "").trim();
+      let topic = String(rec.topic ?? rec.name ?? rec.thread ?? rec.thread_id ?? rec.threadId ?? "").trim();
       const prompt = String(rec.prompt ?? rec.text ?? rec.message ?? "").trim();
-      if (!topic || !prompt) return undefined;
       const newSessionRaw = rec.new_session ?? rec.newSession ?? rec.fresh;
       const newSession =
         newSessionRaw === true ||
         newSessionRaw === 1 ||
         /^(1|true|yes|y)$/i.test(String(newSessionRaw ?? "").trim());
+      const sessionIdRaw = String(
+        rec.session_id ?? rec.sessionId ?? rec.sess ?? rec.session ?? "",
+      ).trim();
+      const sessionId = sessionIdRaw
+        ? sessionIdRaw.replace(/^#?sess[_-]?/i, "").slice(0, 64)
+        : undefined;
+      // Drop placeholder topics ("…") so resolve can use session_id / memory inference.
+      if (
+        !topic ||
+        /^[\s.…·•⋯︙\-–—_*~`'"“”‘’\u2026\u22ef\u3002]+$/u.test(topic) ||
+        /^(topic|there|here|same|related|todo|tbd|none|null|target)$/i.test(topic)
+      ) {
+        topic = "";
+      }
+      // topic optional when session_id is present OR prompt alone (memory may infer topic).
+      if (!prompt) return undefined;
+      // Allow prompt-only send_prompt: bridge may infer topic from memory + user ask.
+      // Still require at least something actionable (prompt is enough).
+      // Full prompt for the target agent — do NOT hard-crop to Telegram size.
+      // Long prompts are split only in the human-visible announce message.
+      const PROMPT_MAX = 100_000;
       return {
         action: "send_prompt",
         topic: topic.slice(0, 128),
-        prompt: prompt.slice(0, 4000),
+        prompt: prompt.length > PROMPT_MAX ? prompt.slice(0, PROMPT_MAX) : prompt,
         newSession: newSession || undefined,
+        // session_id wins over new_session when both are set (resume is explicit).
+        sessionId: sessionId || undefined,
+      };
+    }
+    case "notify":
+    case "message_user":
+    case "say":
+    case "tell_user": {
+      const text = String(rec.text ?? rec.message ?? rec.body ?? rec.prompt ?? "").trim();
+      if (!text) return undefined;
+      const impRaw = rec.important ?? rec.priority ?? rec.loud;
+      const important =
+        impRaw === true ||
+        impRaw === 1 ||
+        /^(1|true|yes|y|high|urgent|important)$/i.test(String(impRaw ?? "").trim());
+      return {
+        action: "notify",
+        text: text.slice(0, 3500),
+        important: important || undefined,
       };
     }
     case "search_memory":
@@ -305,6 +397,13 @@ function normalizeAction(item: unknown): TelegramAction | undefined {
       limit = Math.max(1, Math.min(20, Math.round(limit)));
       return { action: "search_memory", query: query.slice(0, 300), limit };
     }
+    case "list_topics":
+    case "topics":
+      return { action: "list_topics" };
+    case "list_jobs":
+    case "jobs":
+    case "manager_jobs":
+      return { action: "list_jobs" };
     case "list_bots":
     case "bots":
       return { action: "list_bots" };
@@ -332,6 +431,7 @@ function normalizeAction(item: unknown): TelegramAction | undefined {
 function capBotCommands(actions: TelegramAction[]): TelegramAction[] {
   let botCmds = 0;
   let sendPrompts = 0;
+  let notifies = 0;
   const out: TelegramAction[] = [];
   for (const a of actions) {
     if (a.action === "bot_command") {
@@ -342,6 +442,10 @@ function capBotCommands(actions: TelegramAction[]): TelegramAction[] {
       if (sendPrompts >= TELEGRAM_SEND_PROMPT_MAX) continue;
       sendPrompts++;
     }
+    if (a.action === "notify") {
+      if (notifies >= TELEGRAM_NOTIFY_MAX) continue;
+      notifies++;
+    }
     out.push(a);
     if (out.length >= TELEGRAM_ACTION_MAX) break;
   }

package/src/sessions/history.ts

@@ -10,8 +10,15 @@ import {
   TELEGRAM_BRIDGE_MARKER,
   TELEGRAM_BRIDGE_RESULTS_MARKER,
 } from "../render/telegram-bridge.js";
+import {
+  MANAGER_DIRECTIVE_MARKER,
+  MANAGER_WORK_REPORT_MARKER,
+} from "../render/manager-directive.js";
 import type { HistoryEntry, HistoryRole } from "./types.js";
 
+/** Keep in sync with bot/manager-context.ts (avoid sessions→bot import). */
+const MANAGER_CONTEXT_MARKER = "MANAGER CONTEXT (auto — use before dispatching work):";
+
 const TAIL_WINDOWS = [256 * 1024, 1024 * 1024, 4 * 1024 * 1024]; // grow until entries found
 
 interface RawEvent {
@@ -261,6 +268,17 @@ function cleanStoredText(text: string): string {
   if (/^SELF-RECHECK DECISION \(meta only\)/i.test(t.trim())) t = "";
   if (/^SELF-RECHECK \(automatic quality pass/i.test(t.trim())) t = "";
   if (t.trimStart().startsWith(TELEGRAM_BRIDGE_RESULTS_MARKER)) t = "";
+  if (t.trimStart().startsWith(MANAGER_WORK_REPORT_MARKER)) t = "";
+  // Manager directive / context: keep only the user message tail.
+  if (t.includes(MANAGER_CONTEXT_MARKER)) {
+    const split = t.split(/\n---\n\n/);
+    if (split.length > 1) t = split.slice(1).join("\n---\n\n").trim();
+  }
+  if (t.includes(MANAGER_DIRECTIVE_MARKER)) {
+    const um = "User message:";
+    const ui = t.lastIndexOf(um);
+    if (ui !== -1) t = t.slice(ui + um.length).trim();
+  }
   return t;
 }