mioku-plugin-chat 2.10.1 → 3.0.1

package/core/chat-engine.ts

@@ -1,5 +1,4 @@
 import type { AIInstance, SessionToolDefinition } from "mioku";
-import { logger } from "mioki";
 import type { AITool } from "mioku";
 import type {
   ToolContext,
@@ -19,6 +18,8 @@ import {
 } from "./external-skills";
 import {
   consumeCompleteStreamUnits,
+  isQuoteMarkerOnlyUnit,
+  mergeQuoteMarkerUnits,
   splitOutgoingUnits,
 } from "./media/markdown-message";
 import {
@@ -90,15 +91,16 @@ export async function runChat(
   const staticPrompt = buildStaticSystemPrompt(staticCtx);
   const dynamicUserContext = buildDynamicUserContext(dynamicCtx);
 
-  logger.info(
+  const engineLog = toolCtx.ctx.logger;
+  engineLog.info(
     `[chat-engine] Session ${toolCtx.sessionId} | target: ${targetMessage.userName}(${targetMessage.userId}): "${targetMessage.content}"`,
   );
   if (toolCtx.config.debug) {
-    logger.info("[chat-engine] === Static System Prompt ===");
-    logger.info(staticPrompt);
-    logger.info("[chat-engine] === Dynamic User Context ===");
-    logger.info(dynamicUserContext);
-    logger.info("[chat-engine] === End Prompts ===");
+    engineLog.info("[chat-engine] === Static System Prompt ===");
+    engineLog.info(staticPrompt);
+    engineLog.info("[chat-engine] === Dynamic User Context ===");
+    engineLog.info(dynamicUserContext);
+    engineLog.info("[chat-engine] === End Prompts ===");
   }
 
   const hasStructuredHistory =
@@ -181,6 +183,7 @@ export async function runChat(
     streamedMessages.push(text);
   };
 
+  let pendingQuoteMarkerLines: string[] = [];
   const flushStreamBuffer = async (force: boolean): Promise<void> => {
     while (true) {
       const { units, rest } = consumeCompleteStreamUnits(streamBuffer, force);
@@ -191,17 +194,29 @@ export async function runChat(
 
       streamBuffer = rest;
       for (const unit of units) {
+        if (!unit.trim()) {
+          continue;
+        }
+        if (isQuoteMarkerOnlyUnit(unit)) {
+          pendingQuoteMarkerLines.push(unit.trim());
+          continue;
+        }
+        const mergedUnit = pendingQuoteMarkerLines.length
+          ? [...pendingQuoteMarkerLines, unit].join("\n")
+          : unit;
+        pendingQuoteMarkerLines = [];
         const unitIndex = streamUnitIndex;
         streamUnitIndex += 1;
-        if (unit.trim()) {
-          await emitStreamSegment(unit, unitIndex);
-        }
+        await emitStreamSegment(mergedUnit, unitIndex);
       }
 
       if (!force) {
         break;
       }
     }
+    if (force) {
+      pendingQuoteMarkerLines = [];
+    }
   };
 
   const runComplete = () =>
@@ -252,7 +267,9 @@ export async function runChat(
       targetMessage,
     })
     .catch((err) =>
-      logger.warn(`[chat-engine] background emotion refresh failed: ${err}`),
+      toolCtx.ctx.logger.warn(
+        `[chat-engine] background emotion refresh failed: ${err}`,
+      ),
     );
 
   if (streamEnabled) {
@@ -261,9 +278,9 @@ export async function runChat(
   }
 
   if (toolCtx.config.debug) {
-    logger.info("[chat-engine] === Raw AI Reply ===");
-    logger.info(response.content || "(empty)");
-    logger.info("[chat-engine] === End Raw AI Reply ===");
+    toolCtx.ctx.logger.info("[chat-engine] === Raw AI Reply ===");
+    toolCtx.ctx.logger.info(response.content || "(empty)");
+    toolCtx.ctx.logger.info("[chat-engine] === End Raw AI Reply ===");
   }
 
   const allToolCalls = response.allToolCalls || [];
@@ -275,16 +292,18 @@ export async function runChat(
   }
 
   if (toolCtx.config.debug && response.reasoning) {
-    logger.info(`[chat-engine] AI reasoning: ${response.reasoning}`);
+    toolCtx.ctx.logger.info(
+      `[chat-engine] AI reasoning: ${response.reasoning}`,
+    );
   }
 
   if (toolCtx.config.debug && allToolCalls.length > 0) {
     for (const toolCall of allToolCalls) {
       const resultPreview = JSON.stringify(toolCall.result);
-      logger.info(
+      toolCtx.ctx.logger.info(
         `[chat-engine] Tool call: ${toolCall.name}(${JSON.stringify(toolCall.arguments).substring(0, 100)})`,
       );
-      logger.info(
+      toolCtx.ctx.logger.info(
         `[chat-engine] Tool result: ${toolCall.name} -> ${resultPreview ? resultPreview.substring(0, 300) : "undefined"}`,
       );
     }
@@ -298,7 +317,9 @@ export async function runChat(
       currentUserMessages,
       [],
     );
-    logger.info(`[chat-engine] Session ${toolCtx.sessionId} ended by tool`);
+    toolCtx.ctx.logger.info(
+      `[chat-engine] Session ${toolCtx.sessionId} ended by tool`,
+    );
     toolCtx.aiService.finalizeUsage?.(usageId, {
       sentUserMessages: 0,
       sentAssistantMessages: 0,
@@ -358,9 +379,9 @@ export async function runChat(
     }
   }
 
-  const finalMessages = splitOutgoingUnits(finalText).filter(
-    (unit) => unit.trim() && unit.trim() !== "---",
-  );
+  const finalMessages = mergeQuoteMarkerUnits(
+    splitOutgoingUnits(finalText),
+  ).filter((unit) => unit.trim() && unit.trim() !== "---");
   const sentAssistantMessages = streamEnabled
     ? streamedMessages.length
     : finalMessages.length;
@@ -369,7 +390,7 @@ export async function runChat(
     sentAssistantMessages,
   });
 
-  logger.info(
+  toolCtx.ctx.logger.info(
     `[chat-engine] Session ${toolCtx.sessionId} done | ${finalMessages.length} msg(s), ${allToolCalls.length} tool call(s)`,
   );
 
@@ -955,7 +976,7 @@ ${failedSummary}
       return text;
     }
   } catch (err) {
-    logger.warn(
+    toolCtx.ctx.logger.warn(
       `[chat-engine] Failed to generate tool-failure fallback reply: ${err}`,
     );
   }

package/core/chat-turn.ts

@@ -1,4 +1,4 @@
-import type { MiokiContext } from "mioki";
+import type { MiokuContext } from "mioku";
 import type { AITool, ChatRuntimePromptInjection } from "mioku";
 import type { ChatPluginContext, ChatRuntimeState } from "../context";
 import type { ChatConfig, ChatMessage, TargetMessage } from "../types";
@@ -41,14 +41,14 @@ interface ResolvedRuntimeContext {
   userRole: "owner" | "admin" | "member";
   userTitle?: string;
   groupName?: string;
-  messageId?: number;
+  messageId?: string;
 }
 
 const NO_NEW_MESSAGE =
   "[No new user message in this turn. Reply naturally based on the runtime instruction and recent context.]";
 
 function buildRuntimeTargetMessageContent(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   event: any,
   overrideContent?: string,
 ): string {
@@ -58,7 +58,7 @@ function buildRuntimeTargetMessageContent(
 }
 
 function resolveRuntimeContext(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   options: ExecuteChatRuntimeRequestOptions,
 ): ResolvedRuntimeContext {
   if (options.event) {
@@ -147,13 +147,13 @@ export async function finalizeChatTurn(
   const { groupId, groupSessionId, userId, selfId, cfg, toolCtx, result, event } = args;
 
   if (groupId) {
-    await pluginCtx.sendAIResponse(
+    const sentMessageIds = await pluginCtx.sendAIResponse(
       { ctx, groupId, messages: result.messages, config: cfg, sentIndices: toolCtx.sentMessageIndices, audioService: pluginCtx.audioService },
       selfId,
     );
-    await pluginCtx.sendEmoji(ctx, groupId, result.emojiPath, selfId);
+    await pluginCtx.sendEmoji(ctx, groupId, result.emojiPath, event?.bot);
     const now = Date.now();
-    pluginCtx.saveBotMessages(groupId, groupSessionId, result.messages, now, cfg, pluginCtx.db, ctx, selfId);
+    pluginCtx.saveBotMessages(groupId, groupSessionId, result.messages, now, cfg, pluginCtx.db, ctx, event?.bot, sentMessageIds);
     if (args.isLive) {
       pluginCtx.idleCheckManager.recordBotMessages(groupSessionId, result.messages.length, selfId);
     }
@@ -170,9 +170,9 @@ export async function finalizeChatTurn(
         if (args.isLive) {
           await event.reply([emojiSegment]);
         } else {
-          const bot = ctx.pickBot(selfId);
+          const bot = args.event?.bot;
           if (!bot) throw new Error(`bot ${selfId} not found`);
-          await bot.sendPrivateMsg(userId, [emojiSegment]);
+          await bot.sendMessage({ type: "private", user_id: userId}, [emojiSegment]);
         }
       } catch (err) {
         ctx.logger.warn(
@@ -260,7 +260,7 @@ export async function processChat(
     }));
 
     const botNickname =
-      cfg.nicknames[0] || ctx.pickBot(e.self_id).nickname || "Bot";
+      cfg.nicknames[0] || e.bot?.nickname || "Bot";
     const botRole = groupId ? await getBotRole(groupId, ctx, e.self_id) : "member";
     let groupName: string | undefined;
     let memberCount: number | undefined;
@@ -451,7 +451,7 @@ async function executeChatRuntimeRequestNow(
 
   const botRole = groupId ? await getBotRole(groupId, pluginCtx.ctx, selfId) : "member";
   const botNickname =
-    cfg.nicknames[0] || pluginCtx.ctx.pickBot(selfId)?.nickname || "Bot";
+    cfg.nicknames[0] || event?.bot?.nickname || "Bot";
 
   let groupName: string | undefined;
   let memberCount: number | undefined;

package/core/media/audio.ts

@@ -1,5 +1,5 @@
 import { readFile } from "node:fs/promises";
-import type { MiokiContext } from "mioki";
+import type { MiokuContext } from "mioku";
 import type { AudioServiceApi, SupportedLang } from "mioku-service-audio";
 
 function detectAudioLanguage(text: string): SupportedLang {
@@ -33,7 +33,7 @@ export async function synthesizeAudioSource(
 }
 
 export async function sendVoice(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   e: any,
   filePath: string,
   logTag = "[audio]",
@@ -42,7 +42,7 @@ export async function sendVoice(
     ? filePath
     : `file://${filePath}`;
   try {
-    await e.reply([ctx.segment.record(fileUrl)]);
+    await e.reply([ctx.segment.raw("record", { file: fileUrl })]);
     return;
   } catch (err: any) {
     const msg = String(err?.message ?? err);
@@ -59,6 +59,6 @@ export async function sendVoice(
     ctx.logger.info(
       `${logTag} file:// 发送失败 (${msg})，回退 base64 (${buf.length} bytes)`,
     );
-    await e.reply([ctx.segment.record(b64)]);
+    await e.reply([ctx.segment.raw("record", { file: b64 })]);
   }
 }

package/core/media/gif-extractor.ts

@@ -1,4 +1,4 @@
-import { logger } from "mioki";
+import { logger } from "mioku";
 import sharp from "sharp";
 import { QQ_IMAGE_FETCH_HEADERS } from "./image-compress";
 
@@ -57,7 +57,7 @@ export async function extractGifFrames(
     })
       .png()
       .toBuffer();
-    frames.push(`data:image/png;base64,${firstFrame.toString("base64")}`);
+    frames.push(`data:image/png);base64,${firstFrame.toString("base64")}`);
 
     // 提取中间帧
     if (middleIndex !== firstIndex && middleIndex !== lastIndex) {
@@ -67,7 +67,7 @@ export async function extractGifFrames(
       })
         .png()
         .toBuffer();
-      frames.push(`data:image/png;base64,${middleFrame.toString("base64")}`);
+      frames.push(`data:image/png);base64,${middleFrame.toString("base64")}`);
     }
 
     // 提取末尾帧
@@ -78,7 +78,7 @@ export async function extractGifFrames(
       })
         .png()
         .toBuffer();
-      frames.push(`data:image/png;base64,${lastFrame.toString("base64")}`);
+      frames.push(`data:image/png);base64,${lastFrame.toString("base64")}`);
     }
 
     logger.info(

package/core/media/history-media.ts

@@ -4,7 +4,7 @@ import * as fs from "fs/promises";
 import * as os from "os";
 import * as path from "path";
 import { promisify } from "util";
-import { logger } from "mioki";
+import { Bot, ForwardNode, logger } from "mioku";
 import type { AIInstance } from "mioku";
 import type { MediaSummaryKind, MediaSummaryRecord } from "../../types";
 
@@ -69,9 +69,7 @@ export interface HistoryMediaProcessingOptions {
     warn(message: string): void;
     error(message: string): void;
   };
-  bot?: {
-    api<T = any>(action: string, params?: Record<string, any>): Promise<T>;
-  };
+  bot?: Bot;
   groupId?: number;
   runAIRequest?<T>(request: () => Promise<T>): Promise<T | null>;
 }
@@ -82,7 +80,7 @@ export interface GroupNoticeHistorySummary {
   userRole: string;
   content: string;
   timestamp: number;
-  messageId: number;
+  messageId: string;
 }
 
 function runHistoryMediaAIRequest<T>(
@@ -252,7 +250,7 @@ export async function summarizeHistoryForward(
     return "[forward]";
   }
 
-  const forwardResult = await options.bot.api("get_forward_msg", { id });
+  const forwardResult = await options.bot.getForwardMessage(id);
   const text = extractForwardText(forwardResult);
   const source = `forward:${id}`;
   if (!text) {
@@ -293,7 +291,7 @@ export async function getCachedHistoryForwardTag(
   if (!id) return "[forward]";
   if (!options.bot) return "[forward]";
   try {
-    const forwardResult = await options.bot.api("get_forward_msg", { id });
+    const forwardResult = await options.bot.getForwardMessage(id);
     const text = extractForwardText(forwardResult);
     const summary = getCachedSummaryByHash(
       "forward",
@@ -395,7 +393,7 @@ export async function summarizeGroupNotice(
     userRole: "member",
     content,
     timestamp: normalizeNoticeTimestamp(notice),
-    messageId: 0,
+    messageId: String((notice as { message_id?: unknown }).message_id ?? ""),
   };
 }
 
@@ -558,7 +556,7 @@ async function extractVideoFrames(
         { timeout: 30_000 },
       );
       const buffer = await fs.readFile(outputPath);
-      frames.push(`data:image/jpeg;base64,${buffer.toString("base64")}`);
+      frames.push(`data:image/jpeg);base64,${buffer.toString("base64")}`);
     }
 
     return frames;
@@ -645,16 +643,13 @@ function buildFrameTimestamps(duration: number, frameCount: number): number[] {
   });
 }
 
-function extractForwardText(result: any): string {
-  const messages =
-    result?.messages || result?.data?.messages || result?.data || [];
-  const nodes = Array.isArray(messages) ? messages : [];
+function extractForwardText(result: ForwardNode[]): string {
+  const nodes = Array.isArray(result) ? result : [];
   const lines: string[] = [];
 
   for (const node of nodes) {
-    const senderName =
-      node.sender?.nickname || node.sender?.card || node.nickname || "unknown";
-    const content = extractMessageSegmentsText(node.message || node.content);
+    const senderName = node.nickname || String(node.user_id || "unknown");
+    const content = extractMessageSegmentsText(node.message);
     if (content) {
       lines.push(`${senderName}: ${content}`);
     }

package/core/media/image-analyzer.ts

@@ -1,6 +1,6 @@
 import * as crypto from "crypto";
 import type { AIInstance } from "mioku";
-import { logger } from "mioki";
+import { logger } from "mioku";
 import type { ChatDatabase } from "../../db";
 import type { ImageRecord } from "../../types";
 import {

package/core/media/image-compress.ts

@@ -1,5 +1,5 @@
 import sharp from "sharp";
-import { logger } from "mioki";
+import { logger } from "mioku";
 
 const IMAGE_MAX_BYTES = 1 * 1024 * 1024;
 const COMPRESS_MAX_WIDTH = 1280;

package/core/media/markdown-message.ts

@@ -1,6 +1,28 @@
 export const MARKDOWN_OPEN_TAG = "<MARKDOWN>";
 export const MARKDOWN_CLOSE_TAG = "</MARKDOWN>";
 
+const QUOTE_MARKER_ONLY = /^(?:\s*\[reply:[^\]\n]+\])+\s*$/i;
+
+export function isQuoteMarkerOnlyUnit(unit: string): boolean {
+  return QUOTE_MARKER_ONLY.test(String(unit || "").trim());
+}
+
+export function mergeQuoteMarkerUnits(units: string[]): string[] {
+  const result: string[] = [];
+  let pending: string[] = [];
+
+  for (const unit of units) {
+    if (isQuoteMarkerOnlyUnit(unit)) {
+      pending.push(unit.trim());
+      continue;
+    }
+    result.push(pending.length > 0 ? [...pending, unit].join("\n") : unit);
+    pending = [];
+  }
+
+  return result;
+}
+
 export function splitOutgoingUnits(text: string): string[] {
   const normalized = String(text || "").replace(/\r/g, "");
   const result: string[] = [];

package/core/media/segment.ts

@@ -1,4 +1,4 @@
-import type { AIInstance } from "mioku";
+import type { AIInstance, Bot } from "mioku";
 import type { ChatConfig, MediaSummaryRecord } from "../../types";
 import type { HistoryMediaOptions } from "../../manage/types";
 import {
@@ -27,9 +27,7 @@ export function buildHistoryMediaProcessingOptions(
     getMediaSummary(key: string): MediaSummaryRecord | null;
     saveMediaSummary(summary: MediaSummaryRecord): void;
   },
-  bot: {
-    api<T = unknown>(action: string, params?: Record<string, unknown>): Promise<T>;
-  },
+  bot: Bot,
   groupId: number,
   log: HistoryMediaProcessingOptions["logger"],
   runAIRequest?: <T>(request: () => Promise<T>) => Promise<T | null>,
@@ -53,17 +51,12 @@ export function getSegmentUrl(seg: {
 }
 
 export async function getVideoSourceCandidatesFromMessage(
-  bot: {
-    api(action: string, params?: Record<string, unknown>): Promise<unknown>;
-  },
+  bot: Bot,
   messageId: number | string | undefined,
 ): Promise<string[]> {
-  if (messageId == null) return [];
-  const result = (await bot.api("get_msg", { message_id: messageId })) as {
-    message?: unknown[];
-    data?: { message?: unknown[] };
-  };
-  const segments = result?.message || result?.data?.message || [];
+  if (messageId == null || !bot) return [];
+  const result = await bot.getMessage(messageId);
+  const segments = result?.message ?? [];
   if (!Array.isArray(segments)) return [];
   const candidates: string[] = [];
   for (const seg of segments as MediaMessageSegment[]) {
@@ -86,6 +79,9 @@ export function getCardData(seg: unknown): string | null {
   return typeof data === "string" ? data : JSON.stringify(data);
 }
 
-export function isMediaAnalysisBlocked(config: ChatConfig, userId: number): boolean {
+export function isMediaAnalysisBlocked(
+  config: ChatConfig,
+  userId: number,
+): boolean {
   return Boolean(config.mediaAnalysisBlacklistUsers?.includes(userId));
 }

package/core/multimodal.ts

@@ -1,6 +1,6 @@
-import type { AIInstance } from "mioku";
-import type { MiokiContext } from "mioki";
-import { logger } from "mioki";
+import type { AIInstance, Bot } from "mioku";
+import type { MiokuContext } from "mioku";
+import { logger } from "mioku";
 import { prepareImageUrlsForModel } from "./media/image-compress";
 
 /**
@@ -126,23 +126,26 @@ export type MediaByMessageId =
  * @returns 媒体信息或 null
  */
 export async function getMediaByMessageId(
-  ctx: MiokiContext,
-  messageId: number,
+  ctx: MiokuContext,
+  messageId: string | number,
   e: any,
 ): Promise<MediaByMessageId> {
   try {
-    const msg = await ctx.pickBot(e.self_id).getMsg(messageId);
+    const bot: Bot = e?.bot ?? ctx.pickBot(e.self_id ?? "");
+    if (!bot) return null;
+    const msg = await bot.getMessage(messageId);
     if (!msg || !msg.message) {
       return null;
     }
 
-    for (const seg of msg.message as any[]) {
+    for (const seg of Array.from(msg.message)) {
       if (seg.type === "image") {
-        const url = seg.url || seg.data?.url;
+        const url = String(seg.data?.url ?? seg.data?.file ?? "");
         if (url) return { kind: "image", url };
       }
       if (seg.type === "video") {
-        const { getSegmentSourceCandidates } = await import("./media/history-media");
+        const { getSegmentSourceCandidates } =
+          await import("./media/history-media");
         const sources = getSegmentSourceCandidates(seg);
         if (sources.length > 0) return { kind: "video", sources };
       }
@@ -150,7 +153,7 @@ export async function getMediaByMessageId(
 
     return null;
   } catch (err) {
-    logger.error(
+    ctx.logger.error(
       `[multimodal] Failed to get media from message ${messageId}: ${err}`,
     );
     return null;
@@ -164,7 +167,7 @@ export async function getMediaByMessageId(
  * @returns 图片 URL 或 null
  */
 export async function getQuoteImageUrl(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   event: any,
 ): Promise<string | null> {
   if (!event.quote_id) {
@@ -172,7 +175,9 @@ export async function getQuoteImageUrl(
   }
 
   try {
-    const quotedMsg = await ctx.getQuoteMsg(event);
+    const bot = event?.bot;
+    if (!bot) return null;
+    const quotedMsg = await bot.getMessage(event.quote_id);
     if (!quotedMsg || !quotedMsg.message) {
       return null;
     }
@@ -186,7 +191,7 @@ export async function getQuoteImageUrl(
     // 提取图片 URL
     return (imageSeg as any).url || (imageSeg as any).data?.url || null;
   } catch (err) {
-    logger.error(`[multimodal] Failed to get quote image URL: ${err}`);
+    ctx.logger.error(`[multimodal] Failed to get quote image URL: ${err}`);
     return null;
   }
 }

package/core/prompt.ts

@@ -1,5 +1,5 @@
 import type { ChatConfig, ChatMessage, TargetMessage } from "../types";
-import { logger } from "mioki";
+import { logger } from "mioku";
 import type {
   SkillPermissionRole,
   AIService,
@@ -45,7 +45,7 @@ export interface DynamicPromptContext {
   reviewMessages?: {
     contents: string[];
     userNames: string[];
-    messageIds: number[];
+    messageIds: string[];
   };
   currentEmotion?: string;
   expressionContext?: string;
@@ -276,7 +276,7 @@ function buildResponseFormatSection(
 - **SPECIAL ACTIONS in your text (auto-parsed and removed from message):**
   - Use [at:123456] in your text to @ someone (123456 is the QQ number)
   - Use [poke:123456] in your text to poke someone. IMPORTANT: when you plan to poke a user, DON't describe your poke actions.
-  - Use [reply:123456] at the START of a line to quote-reply that message (123456 is message_id)
+  - Use [reply:message_id] at the START of a line to quote-reply that message (copy the message_id EXACTLY as shown after # in the chat history; it may contain letters, e.g. [reply:P2rW...pMB])
   - **You can use MULTIPLE [reply:xxx] markers in different lines to quote multiple messages!**`);
 
   if (ctx.config.audio?.enabled) {
@@ -293,7 +293,7 @@ ${AUDIO_MODE_LINE[audioStrength]}`);
 ### Optional Markdown Screenshot Format
 - You MAY optionally send one rendered Markdown screenshot by wrapping content with exact tags: <MARKDOWN> ... </MARKDOWN>
 - Put the Markdown block on its own message whenever possible.
-- It is forbidden to use Markdown syntax or formulas in plain text; they must be rendered using <MARKDOWN> blocks.
+- It is forbidden to use Markdown syntax or formulas in plain text); they must be rendered using <MARKDOWN> blocks.
 ${MARKDOWN_MODE_LINE[markdownStrength]}
 - Inside <MARKDOWN>...</MARKDOWN>, there is NO length limit. If the user needs detail, explain clearly and thoroughly instead of over-compressing.
 `);
@@ -304,7 +304,7 @@ ${MARKDOWN_MODE_LINE[markdownStrength]}
   lines.push(`
 ### Tool Calling Format
 - When you decide to use a tool, you MUST use the structured tool_calls mechanism provided by the API
-- web_search and web_read_page are limited per conversation; do not retry excessively`);
+- web_search and web_read_page are limited per conversation); do not retry excessively`);
 
   appendEmojiSection(lines, ctx, emojiStrength);
 
@@ -579,13 +579,15 @@ function buildChatHistorySection(ctx: DynamicPromptContext): string {
   for (const msg of chatHistory) {
     const time = new Date(msg.timestamp);
     const timeStr = `${String(time.getMonth() + 1).padStart(2, "0")}-${String(time.getDate()).padStart(2, "0")} ${String(time.getHours()).padStart(2, "0")}:${String(time.getMinutes()).padStart(2, "0")}`;
+    const msgIdStr = msg.messageId ? `#${msg.messageId}` : "";
 
     if (msg.role === "assistant") {
+      const contentStr = msgIdStr ? `${msg.content} ${msgIdStr}` : msg.content;
       if (currentAssistantBlock && currentAssistantBlock.timeStr === timeStr) {
-        currentAssistantBlock.contents.push(msg.content);
+        currentAssistantBlock.contents.push(contentStr);
       } else {
         flushAssistant();
-        currentAssistantBlock = { timeStr, contents: [msg.content] };
+        currentAssistantBlock = { timeStr, contents: [contentStr] };
       }
       continue;
     }
@@ -600,16 +602,16 @@ function buildChatHistorySection(ctx: DynamicPromptContext): string {
           : "Member";
     const titleStr = msg.userTitle ? `, ${msg.userTitle}` : "";
     const qqStr = msg.userId ? `${msg.userId}` : "";
-    const msgIdStr = msg.messageId ? ` #${msg.messageId}` : "";
     mergedLines.push(
-      `[${timeStr}] ${name}(${qqStr}, ${roleLabel}${titleStr})${msgIdStr}): ${msg.content}`,
+      `[${timeStr}] ${name}(${qqStr}, ${roleLabel}${titleStr})${msgIdStr ? ` ${msgIdStr}` : ""}: ${msg.content}`,
     );
   }
   flushAssistant();
 
   return `## Recent Context
 ${mergedLines.join("\n")}
--- DON'T repeat yourself or bring up old topics - focus on what's being said right now. --`;
+-- DON'T repeat yourself or bring up old topics - focus on what's being said right now. --
+-- Use [reply:message_id] with the #id shown after a message to quote-reply it. --`;
 }
 
 function buildTargetMessageSection(