@xmoxmo/bncr 0.6.1 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmoxmo/bncr",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "private": false,
   "type": "module",
   "license": "MIT",

package/scripts/check-pack.mjs

@@ -174,7 +174,7 @@ const requiredSourceFiles = [
   'src/bootstrap/register-runtime-singleton.ts',
   'src/core/value-sanitize.ts',
   'src/messaging/inbound/contracts.ts',
-  'src/messaging/inbound/group-history.ts',
+  'src/messaging/inbound/conversation-history.ts',
   'src/messaging/inbound/native-command-runtime.ts',
   'src/messaging/inbound/reply-dispatch-serial.ts',
   'src/messaging/inbound/scene-admin.ts',

package/scripts/selfcheck.mjs

@@ -63,7 +63,7 @@ const requiredSourceFiles = [
   'src/messaging/inbound/dispatch-prep.ts',
   'src/messaging/inbound/dispatch.ts',
   'src/messaging/inbound/gate.ts',
-  'src/messaging/inbound/group-history.ts',
+  'src/messaging/inbound/conversation-history.ts',
   'src/messaging/inbound/last-route.ts',
   'src/messaging/inbound/media-url-download.ts',
   'src/messaging/inbound/native-command-runtime.ts',

package/src/channel.ts

@@ -4,6 +4,7 @@ import type {
   OpenClawPluginApi,
   OpenClawPluginServiceContext,
 } from 'openclaw/plugin-sdk/core';
+import { DEFAULT_GROUP_HISTORY_LIMIT as DEFAULT_HISTORY_LIMIT } from 'openclaw/plugin-sdk/reply-history';
 import {
   BNCR_DEFAULT_ACCOUNT_ID,
   CHANNEL_ID,
@@ -43,7 +44,7 @@ import type {
   FileSendTransferState,
   OutboxEntry,
 } from './core/types.ts';
-import type { BncrGroupHistoryMap } from './messaging/inbound/group-history.ts';
+import type { BncrConversationHistoryMap } from './messaging/inbound/conversation-history.ts';
 import type { BncrOutboundReplayCache } from './messaging/inbound/outbound-replay-cache.ts';
 import type { parseBncrInboundParams } from './messaging/inbound/parse.ts';
 import { buildEnqueueFromReplyDebugInfo } from './messaging/outbound/diagnostics.ts';
@@ -293,7 +294,7 @@ class BncrBridgeRuntime {
   getSceneRegistry(): Map<string, BncrSceneRecord> {
     return this.sceneRegistry;
   }
-  private groupHistories: BncrGroupHistoryMap = new Map();
+  private conversationHistories: BncrConversationHistoryMap = new Map();
   private outboundReplayCache: BncrOutboundReplayCache = new Map();
   private routeAliases = new Map<
     string,
@@ -1901,7 +1902,7 @@ class BncrBridgeRuntime {
     maxSessionRouteEntries: MAX_SESSION_ROUTE_ENTRIES,
     maxAccountActivityEntries: MAX_ACCOUNT_ACTIVITY_ENTRIES,
     sceneRegistry: this.sceneRegistry,
-    groupHistories: this.groupHistories,
+    conversationHistories: this.conversationHistories,
     outboundReplayCache: this.outboundReplayCache,
     outbox: this.outbox,
     getDeadLetter: () => this.deadLetter,
@@ -2168,6 +2169,17 @@ class BncrBridgeRuntime {
     deadLetterSinceStartByAccount: this.deadLetterSinceStartByAccount,
     lastOutboundByAccount: this.lastOutboundByAccount,
     outboundReplayCache: this.outboundReplayCache,
+    conversationHistories: this.conversationHistories,
+    resolveOutboundHistoryLimit: (entry) => {
+      const platform = entry.route?.platform || '';
+      const groupId = entry.route?.groupId || '0';
+      const userId = entry.route?.userId || '0';
+      const sceneKey = groupId !== '0' ? `${platform}:${groupId}` : `${platform}:${userId}`;
+      const sceneLimit = this.sceneRegistry.get(sceneKey)?.historyLimit;
+      return typeof sceneLimit === 'number' && Number.isFinite(sceneLimit) && sceneLimit >= 0
+        ? Math.floor(sceneLimit)
+        : DEFAULT_HISTORY_LIMIT;
+    },
     resolveOutboundSender: (entry) => {
       try {
         const account = resolveAccount(getOpenClawRuntimeConfig(this.api), entry.accountId);
@@ -2893,7 +2905,7 @@ class BncrBridgeRuntime {
       defaultAdminAgentId: (args) => this.defaultAdminAgentId(args),
       defaultPublicAgentId: () => this.defaultPublicAgentId(),
       sceneRegistry: this.sceneRegistry,
-      groupHistories: this.groupHistories,
+      conversationHistories: this.conversationHistories,
       outboundReplayCache: this.outboundReplayCache,
       prepareInboundAcceptance: (args) => this.prepareInboundAcceptance(args),
       logInboundSummary: (args) => this.logInboundSummary(args),

package/src/messaging/inbound/context-facts.ts

@@ -1,5 +1,37 @@
 import path from 'node:path';
 
+type BncrConversationContextMedia = {
+  type?: string;
+  path?: string;
+  contentType?: string;
+  kind?: string;
+  messageId?: string;
+};
+
+type BncrConversationContextEntry = {
+  messageId?: string;
+  timestamp?: number;
+  role?: 'user' | 'assistant' | 'system';
+  sender?: string;
+  senderId?: string;
+  content?: string;
+  media?: BncrConversationContextMedia[];
+};
+
+type BncrParticipantRecord = Record<
+  string,
+  {
+    name: string;
+    username?: string;
+    isBot?: boolean;
+    isAdmin?: boolean;
+    isOwner?: boolean;
+    isAuthorizedSender?: boolean;
+    role?: 'owner' | 'admin' | 'user';
+    displayName?: string;
+  }
+>;
+
 export type BncrStructuredContextFactsInput = {
   channelId: string;
   accountId: string;
@@ -57,18 +89,10 @@ export type BncrStructuredContextFactsInput = {
     kind?: string;
     messageId?: string;
   }>;
-  pendingMediaContext?: Array<{
-    messageId?: string;
-    sender?: string;
-    senderId?: string;
-    body?: string;
-    media?: Array<{
-      path?: string;
-      contentType?: string;
-      kind?: string;
-      messageId?: string;
-    }>;
-  }>;
+  conversationContext?: BncrConversationContextEntry[];
+  participants?: BncrParticipantRecord | null;
+  isGroupChat?: boolean;
+  groupSubject?: string;
 };
 
 function toBncrPromptMediaPath(id: string): string | undefined {
@@ -166,18 +190,24 @@ export function buildBncrStructuredContextFacts(input: BncrStructuredContextFact
       kind: item.kind,
       messageId: item.messageId,
     })),
-    pendingMediaContext: (input.pendingMediaContext || []).map((entry) => ({
+    conversationContext: (input.conversationContext || []).map((entry) => ({
       messageId: entry.messageId,
+      timestamp: entry.timestamp,
+      role: entry.role,
       sender: entry.sender,
       senderId: entry.senderId,
-      body: entry.body,
+      content: entry.content,
       media: (entry.media || []).map((item) => ({
+        type: item.type || item.kind || 'document',
         path: item.path,
         contentType: item.contentType,
-        kind: item.kind,
         messageId: item.messageId,
       })),
     })),
+    participants: input.participants ?? null,
+    isGroupChat: input.isGroupChat,
+    groupSubject: input.groupSubject,
+    accountId: input.accountId,
   };
 }
 
@@ -210,18 +240,11 @@ export function buildBncrPromptVisibleContextFacts(
       kind?: string;
       messageId?: string;
     }>;
-    pendingMediaContext?: Array<{
-      messageId?: string;
-      sender?: string;
-      senderId?: string;
-      body?: string;
-      media?: Array<{
-        path?: string;
-        contentType?: string;
-        kind?: string;
-        messageId?: string;
-      }>;
-    }>;
+    conversation_context?: Array<Record<string, unknown>>;
+    participants?: BncrParticipantRecord;
+    is_group_chat?: boolean;
+    group_subject?: string;
+    account_id?: string;
   } = {};
 
   if (facts.platform) {
@@ -272,27 +295,39 @@ export function buildBncrPromptVisibleContextFacts(
       return Object.values(payload).some((field) => field !== undefined) ? [payload] : [];
     });
   }
-  if (facts.pendingMediaContext?.length) {
-    result.pendingMediaContext = facts.pendingMediaContext.flatMap((entry) => {
-      const media = (entry.media || []).flatMap((item) => {
+  if (facts.conversationContext?.length) {
+    result.conversation_context = facts.conversationContext.flatMap((entry) => {
+      const items: Array<Record<string, unknown>> = [];
+      if (entry.content) {
+        items.push({
+          messageId: entry.messageId,
+          timestamp: entry.timestamp,
+          role: entry.role,
+          sender: entry.sender,
+          senderId: entry.senderId,
+          content: entry.content,
+        });
+      }
+      for (const item of entry.media || []) {
         const promptMediaPath = resolveBncrPromptMediaPath(item.path);
         const payload = {
+          messageId: item.messageId ?? entry.messageId,
+          timestamp: entry.timestamp,
+          role: entry.role,
+          sender: entry.sender,
+          senderId: entry.senderId,
+          media_type: item.type || 'document',
           ...(promptMediaPath ? { path: promptMediaPath } : {}),
-          contentType: item.contentType,
-          kind: item.kind,
-          messageId: item.messageId,
+          ...(item.contentType ? { contentType: item.contentType } : {}),
         };
-        return Object.values(payload).some((field) => field !== undefined) ? [payload] : [];
-      });
-      const payload = {
-        messageId: entry.messageId,
-        sender: entry.sender,
-        senderId: entry.senderId,
-        body: entry.body,
-        ...(media.length > 0 ? { media } : {}),
-      };
-      return Object.values(payload).some((field) => field !== undefined) ? [payload] : [];
+        if (Object.values(payload).some((field) => field !== undefined)) items.push(payload);
+      }
+      return items;
     });
+    if (facts.participants) result.participants = facts.participants;
+    if (facts.isGroupChat !== undefined) result.is_group_chat = facts.isGroupChat;
+    if (facts.groupSubject) result.group_subject = facts.groupSubject;
+    if (facts.accountId) result.account_id = facts.accountId;
   }
 
   return result;
@@ -358,25 +393,17 @@ export type BncrStructuredContextFactsFromInboundPartsInput = {
   bridgeSenderName?: string;
   senderIsOwner?: boolean;
   senderIsAuthorized?: boolean;
-  pendingHistoryContext?: Array<{
-    messageId?: string;
-    sender?: string;
-    senderId?: string;
-    body?: string;
-    media?: Array<{
-      path?: string;
-      contentType?: string;
-      kind?: string;
-      messageId?: string;
-    }>;
-  }>;
+  conversationHistoryContext?: BncrConversationContextEntry[];
+  participants?: BncrParticipantRecord | null;
+  isGroupChat?: boolean;
+  groupSubject?: string;
 };
 export function buildBncrStructuredContextFactsFromInboundParts(
   input: BncrStructuredContextFactsFromInboundPartsInput,
 ) {
   const mediaItems = Array.isArray(input.prepared.mediaItems) ? input.prepared.mediaItems : [];
-  const pendingHistoryContext = Array.isArray(input.pendingHistoryContext)
-    ? input.pendingHistoryContext
+  const conversationHistoryContext = Array.isArray(input.conversationHistoryContext)
+    ? input.conversationHistoryContext
     : [];
   return buildBncrStructuredContextFacts({
     channelId: input.channelId,
@@ -435,6 +462,9 @@ export function buildBncrStructuredContextFactsFromInboundParts(
       kind: item.kind || inferBncrStructuredMediaKind(item.contentType),
       messageId: input.parsed.msgId,
     })),
-    pendingMediaContext: pendingHistoryContext,
+    conversationContext: conversationHistoryContext,
+    participants: input.participants ?? null,
+    isGroupChat: input.isGroupChat,
+    groupSubject: input.groupSubject,
   });
 }

package/src/messaging/inbound/{group-history.ts → conversation-history.ts}

@@ -1,6 +1,6 @@
 import {
   createChannelHistoryWindow,
-  DEFAULT_GROUP_HISTORY_LIMIT,
+  DEFAULT_GROUP_HISTORY_LIMIT as DEFAULT_HISTORY_LIMIT,
   type HistoryEntry,
   type HistoryMediaEntry,
 } from 'openclaw/plugin-sdk/reply-history';
@@ -10,9 +10,10 @@ import type { ParsedInbound } from './dispatch-prep.ts';
 
 export type BncrHistoryEntry = HistoryEntry & {
   senderId?: string;
+  role?: 'user' | 'assistant' | 'system';
 };
 
-export type BncrGroupHistoryMap = Map<string, BncrHistoryEntry[]>;
+export type BncrConversationHistoryMap = Map<string, BncrHistoryEntry[]>;
 
 type BncrHistoryMediaKind = NonNullable<HistoryMediaEntry['kind']>;
 
@@ -22,16 +23,35 @@ function normalizeTextBody(value: string): string {
     .trim();
 }
 
-export function buildBncrGroupHistoryKey(parsed: ParsedInbound): string | null {
-  if (parsed.peer.kind !== 'group') return null;
+export function buildBncrConversationHistoryKey(parsed: ParsedInbound): string | null {
   const platform = String(parsed.platform || '').trim();
-  const groupId = String(parsed.groupId || '').trim();
-  if (!platform || !groupId || groupId === '0') return null;
-  return `${platform}:${groupId}`;
+  if (!platform) return null;
+  if (parsed.peer.kind === 'group') {
+    const groupId = String(parsed.groupId || '').trim();
+    if (!groupId || groupId === '0') return null;
+    return `${platform}:${groupId}`;
+  }
+  const userId = String(parsed.userId || '').trim();
+  if (!userId || userId === '0') return null;
+  return `${platform}:${userId}`;
+}
+
+export function buildBncrConversationHistoryKeyFromRoute(args: {
+  platform?: string;
+  groupId?: string;
+  userId?: string;
+}): string | null {
+  const platform = String(args.platform || '').trim();
+  if (!platform) return null;
+  const groupId = String(args.groupId || '0').trim() || '0';
+  const userId = String(args.userId || '0').trim() || '0';
+  if (groupId !== '0') return `${platform}:${groupId}`;
+  if (userId !== '0') return `${platform}:${userId}`;
+  return null;
 }
 
-export function recordBncrPendingGroupText(args: {
-  historyMap: BncrGroupHistoryMap;
+export function recordBncrPendingConversationText(args: {
+  historyMap: BncrConversationHistoryMap;
   parsed: ParsedInbound;
   senderDisplayName: string;
   senderId: string;
@@ -43,8 +63,8 @@ export function recordBncrPendingGroupText(args: {
     Number.isFinite(args.historyLimit) &&
     args.historyLimit >= 0
       ? Math.floor(args.historyLimit)
-      : DEFAULT_GROUP_HISTORY_LIMIT;
-  const historyKey = buildBncrGroupHistoryKey(args.parsed);
+      : DEFAULT_HISTORY_LIMIT;
+  const historyKey = buildBncrConversationHistoryKey(args.parsed);
   const body = normalizeTextBody(args.bodyText);
   if (!historyKey || !body || args.parsed.msgType !== 'text') return;
   const msgId = String(args.parsed.msgId || '').trim();
@@ -61,6 +81,7 @@ export function recordBncrPendingGroupText(args: {
       body,
       timestamp: Date.now(),
       messageId: args.parsed.msgId,
+      role: 'user',
     },
   });
 }
@@ -88,8 +109,8 @@ function buildBncrHistoryMediaBody(kind: BncrHistoryMediaKind): string {
   return `<media:${kind}>`;
 }
 
-export async function recordBncrPendingGroupMedia(args: {
-  historyMap: BncrGroupHistoryMap;
+export async function recordBncrPendingConversationMedia(args: {
+  historyMap: BncrConversationHistoryMap;
   parsed: ParsedInbound;
   senderDisplayName: string;
   senderId: string;
@@ -107,8 +128,8 @@ export async function recordBncrPendingGroupMedia(args: {
     Number.isFinite(args.historyLimit) &&
     args.historyLimit >= 0
       ? Math.floor(args.historyLimit)
-      : DEFAULT_GROUP_HISTORY_LIMIT;
-  const historyKey = buildBncrGroupHistoryKey(args.parsed);
+      : DEFAULT_HISTORY_LIMIT;
+  const historyKey = buildBncrConversationHistoryKey(args.parsed);
   if (!historyKey || args.parsed.msgType === 'text') return;
   const normalizedMediaItems = Array.isArray(args.mediaItems) ? args.mediaItems : [];
   const itemKinds = normalizedMediaItems
@@ -142,6 +163,7 @@ export async function recordBncrPendingGroupMedia(args: {
         body,
         timestamp: Date.now(),
         messageId: args.parsed.msgId,
+        role: 'user',
       },
     });
     return;
@@ -160,6 +182,7 @@ export async function recordBncrPendingGroupMedia(args: {
       body,
       timestamp: Date.now(),
       messageId: args.parsed.msgId,
+      role: 'user',
       media: normalizedMediaItems.map(
         (item) =>
           ({
@@ -173,12 +196,52 @@ export async function recordBncrPendingGroupMedia(args: {
   });
 }
 
+export function recordBncrBotReply(args: {
+  historyMap: BncrConversationHistoryMap;
+  historyKey: string;
+  sender: string;
+  senderId?: string;
+  body: string;
+  timestamp?: number;
+  messageId?: string;
+  media?: HistoryMediaEntry[];
+  historyLimit?: number;
+}) {
+  const limit =
+    typeof args.historyLimit === 'number' &&
+    Number.isFinite(args.historyLimit) &&
+    args.historyLimit >= 0
+      ? Math.floor(args.historyLimit)
+      : DEFAULT_HISTORY_LIMIT;
+  const body = normalizeTextBody(args.body);
+  if (!body) return;
+  const msgId = String(args.messageId || '').trim();
+  if (msgId) {
+    const existing = args.historyMap.get(args.historyKey) || [];
+    if (existing.some((e) => e.messageId === msgId)) return;
+  }
+  createChannelHistoryWindow({ historyMap: args.historyMap }).record({
+    historyKey: args.historyKey,
+    limit,
+    entry: {
+      sender: args.sender,
+      ...(args.senderId ? { senderId: args.senderId } : {}),
+      body,
+      timestamp: args.timestamp ?? Date.now(),
+      ...(args.messageId ? { messageId: args.messageId } : {}),
+      role: 'assistant',
+      ...(Array.isArray(args.media) && args.media.length > 0 ? { media: args.media } : {}),
+    },
+  });
+}
+
 function cloneBncrHistoryEntry(entry: BncrHistoryEntry): BncrHistoryEntry {
   return {
     sender: entry.sender,
     ...(entry.messageId ? { messageId: entry.messageId } : {}),
     ...(typeof entry.timestamp === 'number' ? { timestamp: entry.timestamp } : {}),
     ...(entry.senderId ? { senderId: entry.senderId } : {}),
+    ...(entry.role ? { role: entry.role } : {}),
     body: entry.body,
     ...(Array.isArray(entry.media)
       ? {
@@ -193,8 +256,8 @@ function cloneBncrHistoryEntry(entry: BncrHistoryEntry): BncrHistoryEntry {
   };
 }
 
-export function readBncrPendingGroupHistorySnapshot(args: {
-  historyMap: BncrGroupHistoryMap;
+export function readBncrPendingConversationHistorySnapshot(args: {
+  historyMap: BncrConversationHistoryMap;
   parsed: ParsedInbound;
   historyLimit?: number;
 }): BncrHistoryEntry[] {
@@ -203,15 +266,19 @@ export function readBncrPendingGroupHistorySnapshot(args: {
     Number.isFinite(args.historyLimit) &&
     args.historyLimit >= 0
       ? Math.floor(args.historyLimit)
-      : DEFAULT_GROUP_HISTORY_LIMIT;
-  const historyKey = buildBncrGroupHistoryKey(args.parsed);
+      : DEFAULT_HISTORY_LIMIT;
+  const historyKey = buildBncrConversationHistoryKey(args.parsed);
   if (!historyKey) return [];
   const entries = args.historyMap.get(historyKey) || [];
   if (entries.length === 0) return [];
-  return entries.slice(-limit).map(cloneBncrHistoryEntry);
+  return entries
+    .slice()
+    .sort((a, b) => (a.timestamp ?? 0) - (b.timestamp ?? 0))
+    .slice(-limit)
+    .map(cloneBncrHistoryEntry);
 }
 
-export function buildBncrGroupContextFromEntries(args: {
+export function buildBncrConversationContextFromEntries(args: {
   api: BncrInboundApi;
   entries: readonly BncrHistoryEntry[];
   channelLabel: string;
@@ -244,8 +311,8 @@ export function collectBncrHistoryMediaFromEntries(args: {
 }): HistoryMediaEntry[] {
   return args.entries.flatMap((entry) => (Array.isArray(entry.media) ? entry.media : []));
 }
-export function clearBncrPendingGroupHistory(args: {
-  historyMap: BncrGroupHistoryMap;
+export function clearBncrPendingConversationHistory(args: {
+  historyMap: BncrConversationHistoryMap;
   parsed: ParsedInbound;
   historyLimit?: number;
 }) {
@@ -254,8 +321,8 @@ export function clearBncrPendingGroupHistory(args: {
     Number.isFinite(args.historyLimit) &&
     args.historyLimit >= 0
       ? Math.floor(args.historyLimit)
-      : DEFAULT_GROUP_HISTORY_LIMIT;
-  const historyKey = buildBncrGroupHistoryKey(args.parsed);
+      : DEFAULT_HISTORY_LIMIT;
+  const historyKey = buildBncrConversationHistoryKey(args.parsed);
   if (!historyKey) return;
   createChannelHistoryWindow({ historyMap: args.historyMap }).clear({
     historyKey,