@xmoxmo/bncr 0.6.0 → 0.6.2

package/README.md

@@ -81,6 +81,13 @@ openclaw devices approve --latest
 - 状态诊断
 - 文件互传
 
+### 0.6.1 新增说明
+
+- `bncr.outbound.recent`：本地 bridge 方法，可直接查询最近的出站记录；该记录来自出站重放缓存，不额外维护一份独立最近出站存储。
+- 出站重放缓存：最近出站消息会在下轮入站上下文回灌时带给 agent，用于让 agent 知道自己刚发过什么；查询和回灌共享同一份 `outboundReplayCache`。
+- bridge 方法调用：`message` 工具支持传入 `bridgeMethod`，可调用插件本地方法（如 `bncr.status.*`、`bncr.outbound.recent`）或转发到 OpenClawClient RPC。
+- unsend / delete：`message` 工具支持撤回/删除动作，按发送缓存映射回真实平台消息，不需要业务侧单独拼平台 message id。
+
 补充口径：
 
 - 入站会话按正式 scene / route 语义接入 OpenClaw，区分私聊与群聊会话。
@@ -285,6 +292,7 @@ npm pack
 - `npm run typecheck`：执行 `tsconfig.typecheck.json`，确保类型边界与 OpenClaw surface 对齐
 - `npm run selfcheck`：检查插件骨架是否完整，并验证关键 OpenClaw SDK subpath 可解析
 - `npm run check-pack`：执行 `npm pack --dry-run --json`，确认发布包包含关键入口与 OpenClaw adapter 文件
+- `tests/integrity/source-manifest.test.mjs`：确保 `selfcheck` / `check-pack` 的源文件清单与当前 `src/**/*.ts` 一致，新增源文件不会漏进发布清单
 - `npm run format:check`：执行 Biome `format` 只读检查（不带 `--write`），防止格式漂移混进发布门禁
 - `npm pack`：确认当前版本可正常打包
 - `npm run check-register-drift -- --duration-sec 300 --interval-sec 15`：静置采样 `bncr.diagnostics`，观察 `registerCount / apiGeneration / postWarmupRegisterCount` 是否在 warmup 后继续增长

package/dist/index.js

@@ -626,6 +626,7 @@ function createBncrRegisterRuntime() {
     "bncr.diagnostics": (bridge, opts) => bridge.handleDiagnostics(opts),
     "bncr.deadLetter.inspect": (bridge, opts) => bridge.handleDeadLetterInspect(opts),
     "bncr.deadLetter.prune": (bridge, opts) => bridge.handleDeadLetterPrune(opts),
+    "bncr.rpc.response": (bridge, opts) => bridge.handleRpcResponse(opts),
     "bncr.file.init": (bridge, opts) => bridge.handleFileInit(opts),
     "bncr.file.chunk": (bridge, opts) => bridge.handleFileChunk(opts),
     "bncr.file.complete": (bridge, opts) => bridge.handleFileComplete(opts),
@@ -936,6 +937,7 @@ var plugin = {
     ensureGatewayMethodRegistered(api, "bncr.diagnostics", debugLog);
     ensureGatewayMethodRegistered(api, "bncr.deadLetter.inspect", debugLog);
     ensureGatewayMethodRegistered(api, "bncr.deadLetter.prune", debugLog);
+    ensureGatewayMethodRegistered(api, "bncr.rpc.response", debugLog);
     ensureGatewayMethodRegistered(api, "bncr.file.init", debugLog);
     ensureGatewayMethodRegistered(api, "bncr.file.chunk", debugLog);
     ensureGatewayMethodRegistered(api, "bncr.file.complete", debugLog);

package/index.ts

@@ -208,6 +208,7 @@ const plugin = {
     ensureGatewayMethodRegistered(api, 'bncr.diagnostics', debugLog);
     ensureGatewayMethodRegistered(api, 'bncr.deadLetter.inspect', debugLog);
     ensureGatewayMethodRegistered(api, 'bncr.deadLetter.prune', debugLog);
+    ensureGatewayMethodRegistered(api, 'bncr.rpc.response', debugLog);
     ensureGatewayMethodRegistered(api, 'bncr.file.init', debugLog);
     ensureGatewayMethodRegistered(api, 'bncr.file.chunk', debugLog);
     ensureGatewayMethodRegistered(api, 'bncr.file.complete', debugLog);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmoxmo/bncr",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "private": false,
   "type": "module",
   "license": "MIT",
@@ -62,5 +62,8 @@
     "runtimeExtensions": [
       "./dist/index.js"
     ]
+  },
+  "dependencies": {
+    "typebox": "^1.3.10"
   }
 }

package/scripts/check-pack.mjs

@@ -48,7 +48,6 @@ const requiredSourceFiles = [
   'src/core/outbox-summary.ts',
   'src/core/outbox-text-push-failure.ts',
   'src/core/outbox-text-push-guards.ts',
-  'src/core/outbox-text-push-prep.ts',
   'src/core/outbox-text-push-success.ts',
   'src/core/permissions.ts',
   'src/core/persisted-outbox-entry.ts',
@@ -68,6 +67,7 @@ const requiredSourceFiles = [
   'src/messaging/inbound/media-url-download.ts',
   'src/messaging/inbound/native-command.ts',
   'src/messaging/inbound/native-reply-delivery.ts',
+  'src/messaging/inbound/outbound-replay-cache.ts',
   'src/messaging/inbound/parse.ts',
   'src/messaging/inbound/remote-media.ts',
   'src/messaging/inbound/reply-config.ts',
@@ -109,6 +109,8 @@ const requiredSourceFiles = [
   'src/plugin/channel-runtime-types.ts',
   'src/plugin/channel-send.ts',
   'src/plugin/channel-utils.ts',
+  'src/plugin/bridge-call.ts',
+  'src/plugin/client-rpc-runtime.ts',
   'src/plugin/config.ts',
   'src/plugin/connection-handlers.ts',
   'src/plugin/connection-state.ts',
@@ -168,6 +170,44 @@ const requiredSourceFiles = [
   'src/runtime/register-trace-runtime.ts',
   'src/runtime/status-snapshots.ts',
   'src/runtime/status-worker.ts',
+  'src/bootstrap/register-runtime-gateway.ts',
+  'src/bootstrap/register-runtime-singleton.ts',
+  'src/core/value-sanitize.ts',
+  'src/messaging/inbound/contracts.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',
+  'src/messaging/inbound/session-meta-task.ts',
+  'src/messaging/outbound/marker-parser.ts',
+  'src/messaging/outbound/normalize-outbound-send.ts',
+  'src/messaging/outbound/reply-enqueue-media.ts',
+  'src/openclaw/channel-runtime-contracts.ts',
+  'src/plugin/bridge-ack-facade.ts',
+  'src/plugin/bridge-connection-facade.ts',
+  'src/plugin/bridge-diagnostics-facade.ts',
+  'src/plugin/bridge-drain-facade.ts',
+  'src/plugin/bridge-extended-diagnostics-facade.ts',
+  'src/plugin/bridge-lifecycle.ts',
+  'src/plugin/bridge-media-facade.ts',
+  'src/plugin/bridge-outbox-facade.ts',
+  'src/plugin/bridge-runtime-helpers.ts',
+  'src/plugin/bridge-runtime-snapshots.ts',
+  'src/plugin/bridge-runtime-surface-facade.ts',
+  'src/plugin/bridge-status-facade.ts',
+  'src/plugin/bridge-status-worker-facade.ts',
+  'src/plugin/bridge-support-runtime.ts',
+  'src/plugin/channel-runtime-builders-delivery.ts',
+  'src/plugin/channel-runtime-builders-status.ts',
+  'src/plugin/connection-handlers-helpers.ts',
+  'src/plugin/connection-state-helpers.ts',
+  'src/plugin/error-message.ts',
+  'src/plugin/file-transfer-orchestrator-chunk.ts',
+  'src/plugin/outbox-unified-push-flow.ts',
+  'src/plugin/runtime-diagnostics-assembler.ts',
+  'src/plugin/runtime-diagnostics-helpers.ts',
+  'src/plugin/runtime-diagnostics-payload-builders.ts',
+  'src/plugin/scene-registry.ts',
 ];
 
 const requiredPackFiles = [

package/scripts/selfcheck.mjs

@@ -63,12 +63,13 @@ 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',
   'src/messaging/inbound/native-command.ts',
   'src/messaging/inbound/native-reply-delivery.ts',
+  'src/messaging/inbound/outbound-replay-cache.ts',
   'src/messaging/inbound/parse.ts',
   'src/messaging/inbound/remote-media.ts',
   'src/messaging/inbound/reply-config.ts',
@@ -106,6 +107,7 @@ const requiredSourceFiles = [
   'src/openclaw/session-route-runtime.ts',
   'src/plugin/ack-outbox-runtime-group.ts',
   'src/plugin/bridge-ack-facade.ts',
+  'src/plugin/bridge-call.ts',
   'src/plugin/bridge-connection-facade.ts',
   'src/plugin/bridge-diagnostics-facade.ts',
   'src/plugin/bridge-drain-facade.ts',
@@ -133,6 +135,7 @@ const requiredSourceFiles = [
   'src/plugin/channel-runtime-types.ts',
   'src/plugin/channel-send.ts',
   'src/plugin/channel-utils.ts',
+  'src/plugin/client-rpc-runtime.ts',
   'src/plugin/config.ts',
   'src/plugin/connection-handlers-helpers.ts',
   'src/plugin/connection-handlers.ts',

package/src/bootstrap/register-runtime-gateway.ts

@@ -23,6 +23,7 @@ export type BncrGatewayMethodName =
   | 'bncr.diagnostics'
   | 'bncr.deadLetter.inspect'
   | 'bncr.deadLetter.prune'
+  | 'bncr.rpc.response'
   | 'bncr.file.init'
   | 'bncr.file.chunk'
   | 'bncr.file.complete'

package/src/bootstrap/register-runtime.ts

@@ -97,6 +97,7 @@ export function createBncrRegisterRuntime() {
     'bncr.diagnostics': (bridge, opts) => bridge.handleDiagnostics(opts),
     'bncr.deadLetter.inspect': (bridge, opts) => bridge.handleDeadLetterInspect(opts),
     'bncr.deadLetter.prune': (bridge, opts) => bridge.handleDeadLetterPrune(opts),
+    'bncr.rpc.response': (bridge, opts) => bridge.handleRpcResponse(opts),
     'bncr.file.init': (bridge, opts) => bridge.handleFileInit(opts),
     'bncr.file.chunk': (bridge, opts) => bridge.handleFileChunk(opts),
     'bncr.file.complete': (bridge, opts) => bridge.handleFileComplete(opts),

package/src/channel.ts

@@ -4,7 +4,13 @@ import type {
   OpenClawPluginApi,
   OpenClawPluginServiceContext,
 } from 'openclaw/plugin-sdk/core';
-import { BNCR_DEFAULT_ACCOUNT_ID, CHANNEL_ID, normalizeAccountId } from './core/accounts.ts';
+import { DEFAULT_GROUP_HISTORY_LIMIT as DEFAULT_HISTORY_LIMIT } from 'openclaw/plugin-sdk/reply-history';
+import {
+  BNCR_DEFAULT_ACCOUNT_ID,
+  CHANNEL_ID,
+  normalizeAccountId,
+  resolveAccount,
+} from './core/accounts.ts';
 import {
   countInvalidOutboxSessionKeys as countInvalidOutboxSessionKeysFromRuntime,
   countLegacyAccountResidue as countLegacyAccountResidueFromRuntime,
@@ -38,7 +44,8 @@ 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';
 import { buildBncrMediaOutboundFrame } from './messaging/outbound/media.ts';
@@ -160,6 +167,7 @@ import {
   now,
   resolveOutboundFileName,
 } from './plugin/channel-utils.ts';
+import { createBncrClientRpcRuntime } from './plugin/client-rpc-runtime.ts';
 import { BNCR_CONFIG_SURFACE } from './plugin/config.ts';
 import { createBncrConnectionStateRuntimeGroup } from './plugin/connection-state-runtime-group.ts';
 import type { FileAckPayloadState } from './plugin/file-ack-runtime.ts';
@@ -286,7 +294,8 @@ 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,
     { accountId: string; route: BncrRoute; updatedAt: number }
@@ -373,6 +382,14 @@ class BncrBridgeRuntime {
   >();
   private earlyFileAcks = new Map<string, FileAckPayloadState>();
 
+  private readonly clientRpcRuntime = createBncrClientRpcRuntime({
+    resolvePushConnIds: (accountId) => this.resolvePushConnIds(accountId),
+    broadcastToConnIds: (event, payload, connIds) =>
+      this.gatewayContext?.broadcastToConnIds(event, payload, connIds),
+    now,
+    logInfo: (scope, message, options) => this.logInfo(scope, message, options),
+  });
+
   private readonly bridgeSupportRuntime = createBridgeSupportRuntime({
     isStopped: () => this.stopped,
     hasSaveTimer: () => Boolean(this.saveTimer),
@@ -851,6 +868,7 @@ class BncrBridgeRuntime {
   }
 
   private cleanupRuntimeWaitersAndTimers(reason: string) {
+    this.clientRpcRuntime.shutdown();
     cleanupBncrBridgeRuntime(
       {
         bridgeId: this.bridgeId,
@@ -1759,6 +1777,7 @@ class BncrBridgeRuntime {
     setOutboxEntry: (messageId, entry) => this.outbox.set(messageId, entry),
     resolveMessageAck: (messageId, result) => this.resolveMessageAck(messageId, result),
     moveToDeadLetter: (entry, reason) => this.moveToDeadLetter(entry, reason),
+    markRecentOutboundAcked: (entry) => this.markRecentOutboundAcked(entry),
     recordAckTimeoutTelemetry: (accountId) => this.recordAckTimeoutTelemetry(accountId),
     degradeOutboundCapability: (args) => this.degradeOutboundCapability(args),
     flushPushQueueBestEffort: (args) => this.flushPushQueueBestEffort(args),
@@ -1883,7 +1902,8 @@ 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,
     setDeadLetter: (entries) => {
@@ -2148,6 +2168,27 @@ class BncrBridgeRuntime {
     lastPrePushGuardSkipReasonByAccount: this.lastPrePushGuardSkipReasonByAccount,
     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);
+        return { sender: account.name, senderId: entry.accountId };
+      } catch {
+        return { sender: 'OpenClaw', senderId: entry.accountId };
+      }
+    },
+    isOutboundAckRequired: (accountId) => this.isOutboundAckRequired(accountId),
     scheduleSave: () => this.scheduleSave(),
     flushPushQueueBestEffort: (args) => this.flushPushQueueBestEffort(args),
     logInfo: (scope, message, options) => this.logInfo(scope, message, options),
@@ -2722,6 +2763,18 @@ class BncrBridgeRuntime {
     return this.bridgeMediaFacade.enqueueFromReply(params);
   }
 
+  listRecentOutbound(sessionKey: string) {
+    return this.bridgeOutboxFacade.listRecentOutbound(sessionKey);
+  }
+
+  listRecentOutboundByAccount(accountId: string) {
+    return this.bridgeOutboxFacade.listRecentOutboundByAccount(accountId);
+  }
+
+  private markRecentOutboundAcked(entry: OutboxEntry) {
+    this.bridgeOutboxFacade.markRecentOutboundAcked(entry);
+  }
+
   private logEnqueueFromReply(args: {
     accountId: string;
     sessionKey: string;
@@ -2852,7 +2905,8 @@ 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),
       flushPushQueueBestEffort: (args) => this.flushPushQueueBestEffort(args),
@@ -2922,6 +2976,12 @@ class BncrBridgeRuntime {
   handleDeadLetterPrune = async (ctx: GatewayRequestHandlerOptions) =>
     this.diagnosticsHandlers.handleDeadLetterPrune(ctx);
 
+  handleRpcResponse = async (ctx: GatewayRequestHandlerOptions) =>
+    this.clientRpcRuntime.handleResponse(ctx);
+
+  callClientRpc = async (method: string, args: Record<string, unknown>, accountId: string) =>
+    this.clientRpcRuntime.call(method, args, normalizeAccountId(accountId));
+
   handleFileInit = async (ctx: GatewayRequestHandlerOptions) =>
     this.fileInboundHandlers.handleFileInit(ctx);
 
@@ -3024,6 +3084,7 @@ export function createBncrChannelPlugin(getBridge: () => BncrBridgeRuntime) {
     getStatusBridge: bridgeGroup.getStatusBridge,
     getToolActionBridge: bridgeGroup.getToolActionBridge,
     getGatewayBridge: bridgeGroup.getGatewayBridge,
+    getBridgeCallBridge: bridgeGroup.getBridgeCallBridge,
     channelMeta: BNCR_CHANNEL_META,
     channelCapabilities: BNCR_CHANNEL_CAPABILITIES,
     gatewayMethods: BNCR_GATEWAY_METHODS,

package/src/core/types.ts

@@ -118,6 +118,47 @@ export type OutboxEntry = {
   awaitingRetryPush?: boolean;
 };
 
+export type BncrRecentOutboundEntry = {
+  messageId: string;
+  accountId: string;
+  sessionKey: string;
+  route: BncrRoute;
+  type?: string;
+  kind?: string;
+  text: string;
+  mediaUrl?: string;
+  createdAt: number;
+  lastPushAt?: number;
+  lastError?: string;
+  ackedAt?: number;
+  status: 'queued' | 'pushed' | 'failed' | 'acked';
+};
+
+export type BncrOutboundReplayMediaEntry = {
+  path?: string;
+  contentType?: string;
+  kind?: 'image' | 'video' | 'audio' | 'document' | 'unknown';
+  messageId?: string;
+};
+
+export type BncrOutboundReplayStatus = 'pushed' | 'acked';
+
+export type BncrOutboundReplayEntry = {
+  sender: string;
+  senderId?: string;
+  body: string;
+  timestamp?: number;
+  messageId?: string;
+  media?: BncrOutboundReplayMediaEntry[];
+  accountId?: string;
+  sessionKey?: string;
+  route?: BncrRoute;
+  type?: string;
+  mediaUrl?: string;
+  createdAt?: number;
+  status?: BncrOutboundReplayStatus;
+};
+
 export type BncrDiagnosticsSummary = {
   health: {
     connected: boolean;

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,
   });
 }