@chbo297/infoflow 2026.3.6 → 2026.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chbo297/infoflow",
-  "version": "2026.3.6",
+  "version": "2026.3.7",
   "description": "OpenClaw Infoflow (如流) channel plugin for Baidu enterprise messaging",
   "type": "module",
   "main": "index.ts",

package/src/actions.ts

@@ -22,6 +22,12 @@ import {
 import { normalizeInfoflowTarget } from "./targets.js";
 import type { InfoflowMessageContentItem, InfoflowOutboundReply } from "./types.js";
 
+// Recall result hint constants — reused across single/batch, group/private recall paths
+const RECALL_OK_HINT = "Recall succeeded. output only NO_REPLY with no other text.";
+const RECALL_FAIL_HINT = "Recall failed. Send a brief reply stating only the failure reason.";
+const RECALL_PARTIAL_HINT =
+  "Some recalls failed. Send a brief reply stating only the failure reason(s).";
+
 export const infoflowMessageActions: ChannelMessageActionAdapter = {
   listActions: (): ChannelMessageActionName[] => ["send", "delete"],
 
@@ -91,9 +97,7 @@ export const infoflowMessageActions: ChannelMessageActionAdapter = {
             channel: "infoflow",
             to,
             ...(result.error ? { error: result.error } : {}),
-            _hint: result.ok
-              ? "Recall succeeded. Do NOT send any follow-up reply message to the user."
-              : "Recall failed. Send a brief reply stating only the failure reason.",
+            _hint: result.ok ? RECALL_OK_HINT : RECALL_FAIL_HINT,
           });
         }
 
@@ -171,10 +175,7 @@ export const infoflowMessageActions: ChannelMessageActionAdapter = {
             failed,
             total: recallable.length,
             details,
-            _hint:
-              failed === 0
-                ? "Recall succeeded. Do NOT send any follow-up reply message to the user."
-                : "Some recalls failed. Send a brief reply stating only the failure reason(s).",
+            _hint: failed === 0 ? RECALL_OK_HINT : RECALL_PARTIAL_HINT,
           });
         }
       } else {
@@ -210,9 +211,7 @@ export const infoflowMessageActions: ChannelMessageActionAdapter = {
             channel: "infoflow",
             to,
             ...(result.error ? { error: result.error } : {}),
-            _hint: result.ok
-              ? "Recall succeeded. Do NOT send any follow-up reply message to the user."
-              : "Recall failed. Send a brief reply stating only the failure reason.",
+            _hint: result.ok ? RECALL_OK_HINT : RECALL_FAIL_HINT,
           });
         }
 
@@ -286,10 +285,7 @@ export const infoflowMessageActions: ChannelMessageActionAdapter = {
             failed,
             total: recallable.length,
             details,
-            _hint:
-              failed === 0
-                ? "Recall succeeded. Do NOT send any follow-up reply message to the user."
-                : "Some recalls failed. Send a brief reply stating only the failure reason(s).",
+            _hint: failed === 0 ? RECALL_OK_HINT : RECALL_PARTIAL_HINT,
           });
         }
       }

package/src/bot.ts

@@ -5,23 +5,15 @@ import {
   type HistoryEntry,
   recordPendingHistoryEntryIfEnabled,
   buildAgentMediaPayload,
-  type OpenClawConfig,
-  type ReplyPayload,
 } from "openclaw/plugin-sdk";
 import { resolveInfoflowAccount } from "./accounts.js";
 import { getInfoflowBotLog, formatInfoflowError, logVerbose } from "./logging.js";
 import { createInfoflowReplyDispatcher } from "./reply-dispatcher.js";
 import { getInfoflowRuntime } from "./runtime.js";
-import {
-  sendInfoflowMessage,
-  recallInfoflowGroupMessage,
-  recallInfoflowPrivateMessage,
-} from "./send.js";
 import type {
   InfoflowChatType,
   InfoflowMessageEvent,
   InfoflowMentionIds,
-  InfoflowOutboundReply,
   InfoflowReplyMode,
   InfoflowGroupConfig,
   HandleInfoflowMessageParams,
@@ -262,7 +254,6 @@ type ResolvedGroupConfig = {
   followUpWindow: number;
   watchMentions: string[];
   systemPrompt?: string;
-  thinkingIndicator: boolean;
 };
 
 /** Infer replyMode from legacy requireMention + watchMentions fields */
@@ -287,104 +278,9 @@ function resolveGroupConfig(
     followUpWindow: groupCfg?.followUpWindow ?? account.config.followUpWindow ?? 300,
     watchMentions: groupCfg?.watchMentions ?? account.config.watchMentions ?? [],
     systemPrompt: groupCfg?.systemPrompt,
-    thinkingIndicator: groupCfg?.thinkingIndicator ?? account.config.thinkingIndicator ?? true,
   };
 }
 
-// ---------------------------------------------------------------------------
-// Thinking indicator (收到🤔...)
-// ---------------------------------------------------------------------------
-
-type ThinkingIndicatorHandle = {
-  messageid: string;
-  msgseqid: string;
-};
-
-/**
- * Sends a "收到🤔..." thinking indicator message.
- * Returns message IDs needed for recall, or undefined on failure.
- */
-async function sendThinkingIndicator(params: {
-  cfg: OpenClawConfig;
-  to: string;
-  accountId: string;
-  replyTo?: InfoflowOutboundReply;
-}): Promise<ThinkingIndicatorHandle | undefined> {
-  const { cfg, to, accountId, replyTo } = params;
-  try {
-    const result = await sendInfoflowMessage({
-      cfg,
-      to,
-      contents: [{ type: "text", content: "收到🤔..." }],
-      accountId,
-      replyTo,
-    });
-    if (result.ok && result.messageId) {
-      logVerbose(
-        `[infoflow] thinking indicator sent: to=${to}, messageId=${result.messageId}, msgseqid=${result.msgseqid ?? "n/a"}`,
-      );
-      return { messageid: result.messageId, msgseqid: result.msgseqid ?? "" };
-    }
-    if (!result.ok) {
-      logVerbose(`[infoflow] thinking indicator send failed: ${result.error}`);
-    }
-    return undefined;
-  } catch (err) {
-    logVerbose(`[infoflow] thinking indicator exception: ${formatInfoflowError(err)}`);
-    return undefined;
-  }
-}
-
-/**
- * Recalls a previously sent thinking indicator (group or private).
- * Silently swallows errors to avoid disrupting the reply flow.
- */
-async function recallThinkingIndicator(params: {
-  cfg: OpenClawConfig;
-  accountId: string;
-  handle: ThinkingIndicatorHandle;
-  groupId?: number;
-  isPrivate?: boolean;
-}): Promise<void> {
-  const { cfg, accountId, handle, groupId, isPrivate } = params;
-  try {
-    const account = resolveInfoflowAccount({ cfg, accountId });
-    if (isPrivate) {
-      const appAgentId = account.config.appAgentId;
-      if (!appAgentId) {
-        logVerbose(
-          `[infoflow] thinking indicator private recall skipped: appAgentId not configured`,
-        );
-        return;
-      }
-      const result = await recallInfoflowPrivateMessage({
-        account,
-        msgkey: handle.messageid,
-        appAgentId,
-      });
-      if (result.ok) {
-        logVerbose(`[infoflow] thinking indicator recalled (private)`);
-      } else {
-        logVerbose(`[infoflow] thinking indicator private recall failed: ${result.error}`);
-      }
-    } else if (groupId !== undefined) {
-      const result = await recallInfoflowGroupMessage({
-        account,
-        groupId,
-        messageid: handle.messageid,
-        msgseqid: handle.msgseqid,
-      });
-      if (result.ok) {
-        logVerbose(`[infoflow] thinking indicator recalled: groupId=${groupId}`);
-      } else {
-        logVerbose(`[infoflow] thinking indicator recall failed: ${result.error}`);
-      }
-    }
-  } catch (err) {
-    logVerbose(`[infoflow] thinking indicator recall exception: ${formatInfoflowError(err)}`);
-  }
-}
-
 /**
  * Handles an incoming private chat message from Infoflow.
  * Receives the raw decrypted message data and dispatches to the agent.
@@ -886,21 +782,6 @@ export async function handleInfoflowMessage(params: HandleInfoflowMessageParams)
   // Build unified target: "group:<id>" for group chat, username for private chat
   const to = isGroup && groupId !== undefined ? `group:${groupId}` : fromuser;
 
-  // --- Thinking indicator ("收到🤔...") ---
-  const thinkingEnabled = groupCfg?.thinkingIndicator ?? account.config.thinkingIndicator ?? true;
-  let thinkingHandle: ThinkingIndicatorHandle | undefined;
-  if (thinkingEnabled) {
-    thinkingHandle = await sendThinkingIndicator({
-      cfg,
-      to,
-      accountId: account.accountId,
-      replyTo:
-        isGroup && event.messageId
-          ? { messageid: event.messageId, preview: mes.slice(0, 100) }
-          : undefined,
-    });
-  }
-
   // Provide mention context to the LLM so it can decide who to @mention
   if (isGroup && event.mentionIds) {
     const parts: string[] = [];
@@ -930,48 +811,12 @@ export async function handleInfoflowMessage(params: HandleInfoflowMessageParams)
     replyToPreview: isGroup ? mes : undefined,
   });
 
-  // Wrap dispatcher to recall thinking indicator before first delivery
-  const canRecallThinking = Boolean(thinkingHandle);
-  let thinkingRecalled = false;
-  const doRecallThinking = async () => {
-    if (thinkingRecalled || !canRecallThinking) return;
-    thinkingRecalled = true;
-    await recallThinkingIndicator({
-      cfg,
-      accountId: account.accountId,
-      handle: thinkingHandle!,
-      groupId: isGroup ? groupId : undefined,
-      isPrivate: !isGroup,
-    });
-  };
-
-  const originalDeliver = dispatcherOptions.deliver;
-  const wrappedDispatcherOptions = {
-    ...dispatcherOptions,
-    deliver: async (payload: ReplyPayload) => {
-      await doRecallThinking();
-      return originalDeliver(payload);
-    },
-    onCleanup: () => {
-      void doRecallThinking();
-    },
-  };
-
-  // Wrap dispatch in try/finally to guarantee the thinking indicator bound to
-  // this message is always recalled — even when queue policy drops/enqueues the
-  // message before typing activates (typing.cleanup skips onCleanup when inactive).
-  // doRecallThinking is idempotent (thinkingRecalled flag), so duplicate calls are no-ops.
-  let dispatchResult;
-  try {
-    dispatchResult = await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
-      ctx: ctxPayload,
-      cfg,
-      dispatcherOptions: wrappedDispatcherOptions,
-      replyOptions,
-    });
-  } finally {
-    await doRecallThinking();
-  }
+  const dispatchResult = await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
+    ctx: ctxPayload,
+    cfg,
+    dispatcherOptions,
+    replyOptions,
+  });
 
   const didReply = dispatchResult?.queuedFinal ?? false;
 

package/src/channel.ts

@@ -52,6 +52,7 @@ export const infoflowPlugin: ChannelPlugin<ResolvedInfoflowAccount> = {
   agentPrompt: {
     messageToolHints: () => [
       'Infoflow group @mentions: set atAll=true to @all members, or mentionUserIds="user1,user2" (comma-separated uuapName) to @mention specific users. Only effective for group targets (group:<id>).',
+      'Infoflow supports message recall (撤回): use action="delete" to recall the most recent message, or specify messageId to recall a specific message. Works for both private and group messages.',
     ],
   },
   config: {

package/src/infoflow-req-parse.ts

@@ -61,9 +61,9 @@ function isDuplicateMessage(msgData: Record<string, unknown>): boolean {
  * Called after successfully sending a message to prevent
  * the bot from processing its own outbound messages as inbound.
  */
-export function recordSentMessageId(messageId: string | number): void {
+export function recordSentMessageId(messageId: string | null): void {
   if (messageId == null) return;
-  messageCache.check(String(messageId)); // Will record if not duplicate
+  messageCache.check(messageId);
 }
 
 // ---------------------------------------------------------------------------

package/src/media.ts

@@ -15,7 +15,7 @@ import {
   INFOFLOW_PRIVATE_SEND_PATH,
   INFOFLOW_GROUP_SEND_PATH,
 } from "./send.js";
-import { recordSentMessage } from "./sent-message-store.js";
+import { recordSentMessage, buildAgentFrom } from "./sent-message-store.js";
 import type { ResolvedInfoflowAccount, InfoflowOutboundReply } from "./types.js";
 
 /** Infoflow API image size limit: 1MB raw bytes */
@@ -225,6 +225,7 @@ export async function sendInfoflowGroupImage(params: {
       try {
         recordSentMessage(account.accountId, {
           target: `group:${groupId}`,
+          from: buildAgentFrom(account.config.appAgentId),
           messageid,
           msgseqid: msgseqid ?? "",
           digest: "image",
@@ -313,6 +314,7 @@ export async function sendInfoflowPrivateImage(params: {
       try {
         recordSentMessage(account.accountId, {
           target: toUser,
+          from: buildAgentFrom(account.config.appAgentId),
           messageid: msgkey,
           msgseqid: "",
           digest: "image",

package/src/send.ts

@@ -8,7 +8,7 @@ import type { OpenClawConfig } from "openclaw/plugin-sdk";
 import { resolveInfoflowAccount } from "./accounts.js";
 import { recordSentMessageId } from "./infoflow-req-parse.js";
 import { getInfoflowSendLog, formatInfoflowError, logVerbose } from "./logging.js";
-import { recordSentMessage, buildMessageDigest } from "./sent-message-store.js";
+import { recordSentMessage, buildMessageDigest, buildAgentFrom } from "./sent-message-store.js";
 import type {
   InfoflowGroupMessageBodyItem,
   InfoflowMessageContentItem,
@@ -375,6 +375,7 @@ export async function sendInfoflowPrivateMessage(params: {
       try {
         recordSentMessage(account.accountId, {
           target: toUser,
+          from: buildAgentFrom(account.config.appAgentId),
           messageid: msgkey,
           msgseqid: "",
           digest: buildMessageDigest(contents),
@@ -576,18 +577,18 @@ export async function sendInfoflowGroupMessage(params: {
     result: { messageid?: string; msgseqid?: string },
     digestContents: InfoflowMessageContentItem[],
   ) => {
-    if (result.messageid) {
-      try {
-        recordSentMessage(account.accountId, {
-          target: `group:${groupId}`,
-          messageid: result.messageid,
-          msgseqid: result.msgseqid ?? "",
-          digest: buildMessageDigest(digestContents),
-          sentAt: Date.now(),
-        });
-      } catch {
-        // Do not block sending
-      }
+    if (!result.messageid) return;
+    try {
+      recordSentMessage(account.accountId, {
+        target: `group:${groupId}`,
+        from: buildAgentFrom(account.config.appAgentId),
+        messageid: result.messageid,
+        msgseqid: result.msgseqid ?? "",
+        digest: buildMessageDigest(digestContents),
+        sentAt: Date.now(),
+      });
+    } catch {
+      // Do not block sending
     }
   };
 
@@ -774,7 +775,7 @@ export async function recallInfoflowPrivateMessage(params: {
 
     const bodyStr = JSON.stringify({ msgkey, agentid: appAgentId });
 
-    logVerbose(`[infoflow:recallPrivate] POST body: ${bodyStr}`);
+    logVerbose(`[infoflow:recallPrivate] POST auth: ${tokenResult.token} body: ${bodyStr}`);
 
     const res = await fetch(`${ensureHttps(apiHost)}${INFOFLOW_PRIVATE_RECALL_PATH}`, {
       method: "POST",

package/src/sent-message-store.ts

@@ -51,6 +51,7 @@ function getDb(): DatabaseSync {
       id INTEGER PRIMARY KEY AUTOINCREMENT,
       account_id TEXT NOT NULL,
       target TEXT NOT NULL,
+      from_id TEXT NOT NULL DEFAULT '',
       messageid TEXT NOT NULL,
       msgseqid TEXT NOT NULL DEFAULT '',
       digest TEXT NOT NULL DEFAULT '',
@@ -62,6 +63,13 @@ function getDb(): DatabaseSync {
       ON sent_messages(account_id, target, sent_at DESC);
   `);
 
+  // Migration: add from_id column to existing databases
+  try {
+    db.exec(`ALTER TABLE sent_messages ADD COLUMN from_id TEXT NOT NULL DEFAULT ''`);
+  } catch {
+    // Column already exists — ignore
+  }
+
   return db;
 }
 
@@ -71,6 +79,7 @@ function getDb(): DatabaseSync {
 
 export type SentMessageRecord = {
   target: string;
+  from: string;
   messageid: string;
   msgseqid: string;
   digest: string;
@@ -85,11 +94,12 @@ export function recordSentMessage(accountId: string, record: SentMessageRecord):
   try {
     const d = getDb();
     d.prepare(
-      `INSERT INTO sent_messages (account_id, target, messageid, msgseqid, digest, sent_at)
-       VALUES (?, ?, ?, ?, ?, ?)`,
+      `INSERT INTO sent_messages (account_id, target, from_id, messageid, msgseqid, digest, sent_at)
+       VALUES (?, ?, ?, ?, ?, ?, ?)`,
     ).run(
       accountId,
       record.target,
+      record.from,
       record.messageid,
       record.msgseqid,
       record.digest,
@@ -117,7 +127,7 @@ export function querySentMessages(
   const d = getDb();
   const rows = d
     .prepare(
-      `SELECT target, messageid, msgseqid, digest, sent_at
+      `SELECT target, from_id, messageid, msgseqid, digest, sent_at
        FROM sent_messages
        WHERE account_id = ? AND target = ?
        ORDER BY sent_at DESC
@@ -125,6 +135,7 @@ export function querySentMessages(
     )
     .all(accountId, params.target, params.count) as Array<{
     target: string;
+    from_id: string;
     messageid: string;
     msgseqid: string;
     digest: string;
@@ -133,6 +144,7 @@ export function querySentMessages(
 
   return rows.map((r) => ({
     target: r.target,
+    from: r.from_id,
     messageid: r.messageid,
     msgseqid: r.msgseqid,
     digest: r.digest,
@@ -150,18 +162,26 @@ export function findSentMessage(
   const d = getDb();
   const row = d
     .prepare(
-      `SELECT target, messageid, msgseqid, digest, sent_at
+      `SELECT target, from_id, messageid, msgseqid, digest, sent_at
        FROM sent_messages
        WHERE account_id = ? AND messageid = ?
        LIMIT 1`,
     )
     .get(accountId, messageid) as
-    | { target: string; messageid: string; msgseqid: string; digest: string; sent_at: number }
+    | {
+        target: string;
+        from_id: string;
+        messageid: string;
+        msgseqid: string;
+        digest: string;
+        sent_at: number;
+      }
     | undefined;
 
   if (!row) return undefined;
   return {
     target: row.target,
+    from: row.from_id,
     messageid: row.messageid,
     msgseqid: row.msgseqid,
     digest: row.digest,
@@ -181,6 +201,15 @@ export function removeRecalledMessages(accountId: string, messageids: string[]):
   ).run(accountId, ...messageids);
 }
 
+// ---------------------------------------------------------------------------
+// From-ID builder
+// ---------------------------------------------------------------------------
+
+/** Builds a `from` identifier for self-sent (agent) messages. */
+export function buildAgentFrom(appAgentId: number | undefined): string {
+  return appAgentId != null ? `agent:${appAgentId}` : "agent:unknown";
+}
+
 // ---------------------------------------------------------------------------
 // Digest builder
 // ---------------------------------------------------------------------------

package/src/types.ts

@@ -25,8 +25,6 @@ export type InfoflowGroupConfig = {
   followUp?: boolean;
   followUpWindow?: number;
   systemPrompt?: string;
-  /** Enable thinking indicator ("收到🤔...") before processing (default: true) */
-  thinkingIndicator?: boolean;
 };
 
 // ---------------------------------------------------------------------------
@@ -120,8 +118,6 @@ export type InfoflowAccountConfig = {
   followUp?: boolean;
   /** Follow-up window in seconds after last bot reply (default: 300) */
   followUpWindow?: number;
-  /** Enable thinking indicator ("收到🤔...") before processing (default: true) */
-  thinkingIndicator?: boolean;
   /** 如流企业后台的应用ID（私聊消息撤回依赖此字段） */
   appAgentId?: number;
   /** Per-group configuration overrides, keyed by group ID */
@@ -159,8 +155,6 @@ export type ResolvedInfoflowAccount = {
     followUp?: boolean;
     /** Follow-up window in seconds after last bot reply (default: 300) */
     followUpWindow?: number;
-    /** Enable thinking indicator ("收到🤔...") before processing (default: true) */
-    thinkingIndicator?: boolean;
     /** 如流企业后台的应用ID（私聊消息撤回依赖此字段） */
     appAgentId?: number;
     /** Per-group configuration overrides, keyed by group ID */