@xmoxmo/bncr 0.5.3 → 0.5.5

package/package.json

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

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

@@ -17,6 +17,7 @@ export type BncrStructuredContextFactsInput = {
   reply: {
     to: string;
     originatingTo: string;
+    rawTo?: string;
   };
   sender: {
     id: string;
@@ -125,6 +126,7 @@ export function buildBncrStructuredContextFacts(input: BncrStructuredContextFact
     reply: {
       to: input.reply.to,
       originatingTo: input.reply.originatingTo,
+      ...(input.reply.rawTo ? { rawTo: input.reply.rawTo } : {}),
     },
     sender: {
       id: input.sender.id,
@@ -200,6 +202,7 @@ export function buildBncrPromptVisibleContextFacts(
     reply?: {
       to: string;
       originatingTo: string;
+      rawTo?: string;
     };
     media?: Array<{
       path?: string;
@@ -249,10 +252,11 @@ export function buildBncrPromptVisibleContextFacts(
     };
   }
 
-  if (facts.reply.originatingTo !== facts.reply.to) {
+  if (facts.reply.originatingTo !== facts.reply.to || facts.reply.rawTo) {
     result.reply = {
       to: facts.reply.to,
       originatingTo: facts.reply.originatingTo,
+      ...(facts.reply.rawTo ? { rawTo: facts.reply.rawTo } : {}),
     };
   }
 
@@ -268,7 +272,6 @@ 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) => {
@@ -331,6 +334,7 @@ export type BncrStructuredContextFactsFromInboundPartsInput = {
   resolution: {
     chatType: string;
     canonicalTo: string;
+    rawTo: string;
     originatingTo: string;
     resolvedRoute: {
       agentId?: string;
@@ -354,7 +358,7 @@ export type BncrStructuredContextFactsFromInboundPartsInput = {
   bridgeSenderName?: string;
   senderIsOwner?: boolean;
   senderIsAuthorized?: boolean;
-  pendingMediaContext?: Array<{
+  pendingHistoryContext?: Array<{
     messageId?: string;
     sender?: string;
     senderId?: string;
@@ -367,11 +371,13 @@ export type BncrStructuredContextFactsFromInboundPartsInput = {
     }>;
   }>;
 };
-
 export function buildBncrStructuredContextFactsFromInboundParts(
   input: BncrStructuredContextFactsFromInboundPartsInput,
 ) {
   const mediaItems = Array.isArray(input.prepared.mediaItems) ? input.prepared.mediaItems : [];
+  const pendingHistoryContext = Array.isArray(input.pendingHistoryContext)
+    ? input.pendingHistoryContext
+    : [];
   return buildBncrStructuredContextFacts({
     channelId: input.channelId,
     accountId: input.parsed.accountId,
@@ -389,6 +395,7 @@ export function buildBncrStructuredContextFactsFromInboundParts(
     reply: {
       to: input.resolution.canonicalTo,
       originatingTo: input.resolution.originatingTo,
+      rawTo: input.resolution.rawTo,
     },
     sender: {
       id: input.senderIdForContext,
@@ -428,6 +435,6 @@ export function buildBncrStructuredContextFactsFromInboundParts(
       kind: item.kind || inferBncrStructuredMediaKind(item.contentType),
       messageId: input.parsed.msgId,
     })),
-    pendingMediaContext: input.pendingMediaContext,
+    pendingMediaContext: pendingHistoryContext,
   });
 }

package/src/messaging/inbound/dispatch-prep.ts

@@ -48,6 +48,7 @@ export type BncrInboundReplyRouteFact = {
   sessionKey: string;
   route: ParsedInbound['route'];
   canonicalTo: string;
+  rawTo: string;
   originatingTo: string;
   chatType: 'direct' | 'group';
 };
@@ -270,7 +271,7 @@ export function resolveBncrInboundConversation(args: {
   const dispatchSessionKey = taskSessionKey || baseSessionKey;
   const rawTo = formatRawBncrInboundTarget(route);
   const canonicalTo = formatDisplayScope(route);
-  const originatingTo = providedOriginatingTo || rawTo;
+  const originatingTo = providedOriginatingTo || canonicalTo;
 
   return {
     accountId,
@@ -419,6 +420,7 @@ export function buildBncrInboundReplyRouteFact(
     sessionKey: resolution.dispatchSessionKey,
     route: resolution.route,
     canonicalTo: resolution.canonicalTo,
+    rawTo: resolution.rawTo,
     originatingTo: resolution.originatingTo,
     chatType: resolution.chatType,
   };

package/src/messaging/inbound/group-history.ts

@@ -226,7 +226,10 @@ export function buildBncrGroupContextFromEntries(args: {
     .map((entry) =>
       formatOpenClawAgentEnvelope(args.api, {
         channel: 'Bncr',
-        from: args.channelLabel,
+        from:
+          (entry.senderId
+            ? `${entry.sender} (${entry.senderId})`
+            : entry.sender || args.channelLabel) + (entry.messageId ? ` #${entry.messageId}` : ''),
         timestamp: entry.timestamp || args.currentTimestamp,
         previousTimestamp: args.previousTimestamp,
         envelope: args.envelope,

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

@@ -1,3 +1,4 @@
+import type { HistoryMediaEntry } from 'openclaw/plugin-sdk/reply-history';
 import { readBncrSessionUpdatedAt } from '../../openclaw/inbound-session-runtime.ts';
 import {
   formatOpenClawAgentEnvelope,
@@ -125,6 +126,20 @@ export function buildBncrInboundTurnContext(args: {
   const pendingHistoryMedia = shouldDispatch
     ? collectBncrHistoryMediaFromEntries({ entries: pendingHistoryEntries })
     : [];
+  const pendingHistoryContext = shouldDispatch
+    ? pendingHistoryEntries.map((entry) => ({
+        messageId: entry.messageId,
+        sender: entry.sender,
+        senderId: entry.senderId,
+        body: entry.body,
+        media: (entry.media || []).map((item: HistoryMediaEntry) => ({
+          path: item.path,
+          contentType: item.contentType,
+          kind: item.kind,
+          messageId: item.messageId,
+        })),
+      }))
+    : [];
   const structuredContextFacts = buildBncrStructuredContextFactsFromInboundParts({
     channelId,
     parsed,
@@ -140,6 +155,7 @@ export function buildBncrInboundTurnContext(args: {
     bridgeSenderName,
     senderIsOwner,
     senderIsAuthorized,
+    pendingHistoryContext,
   });
   const promptVisibleContextFacts = buildBncrPromptVisibleContextFacts(structuredContextFacts);
   const supplementalUntrustedContext = [
@@ -220,6 +236,7 @@ export function buildBncrInboundTurnContext(args: {
       reply: {
         to: resolution.canonicalTo,
         originatingTo: resolution.originatingTo,
+        rawTo: resolution.rawTo,
       },
       message: {
         inboundEventKind: 'user_request',