@xmoxmo/bncr 0.4.9 → 0.5.0

package/package.json

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

package/src/channel.ts

@@ -1551,6 +1551,7 @@ class BncrBridgeRuntime {
         resolvedAgentId: string;
         shouldDispatch: boolean;
         shouldAccumulate: boolean;
+        dispatchBy: string;
       }
     | {
         ok: false;

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

@@ -1,3 +1,5 @@
+import path from 'node:path';
+
 export type BncrStructuredContextFactsInput = {
   channelId: string;
   accountId: string;
@@ -54,8 +56,54 @@ 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;
+    }>;
+  }>;
 };
 
+function toBncrPromptMediaPath(id: string): string | undefined {
+  if (
+    !id ||
+    id === '.' ||
+    id === '..' ||
+    id.includes('/') ||
+    id.includes('\\') ||
+    id.includes('\0')
+  ) {
+    return undefined;
+  }
+  return `media://inbound/${encodeURIComponent(id)}`;
+}
+
+function resolveBncrPromptMediaPath(mediaPath: string | undefined): string | undefined {
+  const normalized = String(mediaPath || '').trim();
+  if (!normalized) return undefined;
+
+  const canonicalMatch = /^media:\/\/inbound\/([^/\\]+)$/i.exec(normalized);
+  if (canonicalMatch?.[1]) {
+    try {
+      return toBncrPromptMediaPath(decodeURIComponent(canonicalMatch[1]));
+    } catch {
+      return undefined;
+    }
+  }
+
+  const slashNormalized = normalized.replace(/\\/g, '/');
+  if (!slashNormalized.includes('/media/inbound/')) {
+    return undefined;
+  }
+  return toBncrPromptMediaPath(path.posix.basename(slashNormalized));
+}
+
 export function buildBncrStructuredContextFacts(input: BncrStructuredContextFactsInput) {
   const rawBody = input.message.rawBody;
   return {
@@ -116,6 +164,18 @@ export function buildBncrStructuredContextFacts(input: BncrStructuredContextFact
       kind: item.kind,
       messageId: item.messageId,
     })),
+    pendingMediaContext: (input.pendingMediaContext || []).map((entry) => ({
+      messageId: entry.messageId,
+      sender: entry.sender,
+      senderId: entry.senderId,
+      body: entry.body,
+      media: (entry.media || []).map((item) => ({
+        path: item.path,
+        contentType: item.contentType,
+        kind: item.kind,
+        messageId: item.messageId,
+      })),
+    })),
   };
 }
 
@@ -141,10 +201,23 @@ export function buildBncrPromptVisibleContextFacts(
       originatingTo: string;
     };
     media?: Array<{
+      path?: string;
       contentType?: string;
       kind?: string;
       messageId?: string;
     }>;
+    pendingMediaContext?: Array<{
+      messageId?: string;
+      sender?: string;
+      senderId?: string;
+      body?: string;
+      media?: Array<{
+        path?: string;
+        contentType?: string;
+        kind?: string;
+        messageId?: string;
+      }>;
+    }>;
   } = {};
 
   if (
@@ -179,11 +252,39 @@ export function buildBncrPromptVisibleContextFacts(
   }
 
   if (facts.media.length > 0) {
-    result.media = facts.media.map((item) => ({
-      contentType: item.contentType,
-      kind: item.kind,
-      messageId: item.messageId,
-    }));
+    result.media = facts.media.flatMap((item) => {
+      const promptMediaPath = resolveBncrPromptMediaPath(item.path);
+      const payload = {
+        ...(promptMediaPath ? { path: promptMediaPath } : {}),
+        contentType: item.contentType,
+        kind: item.kind,
+        messageId: item.messageId,
+      };
+      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) => {
+        const promptMediaPath = resolveBncrPromptMediaPath(item.path);
+        const payload = {
+          ...(promptMediaPath ? { path: promptMediaPath } : {}),
+          contentType: item.contentType,
+          kind: item.kind,
+          messageId: item.messageId,
+        };
+        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] : [];
+    });
   }
 
   return result;
@@ -248,6 +349,18 @@ export type BncrStructuredContextFactsFromInboundPartsInput = {
   bridgeSenderName?: string;
   senderIsOwner?: boolean;
   senderIsAuthorized?: boolean;
+  pendingMediaContext?: Array<{
+    messageId?: string;
+    sender?: string;
+    senderId?: string;
+    body?: string;
+    media?: Array<{
+      path?: string;
+      contentType?: string;
+      kind?: string;
+      messageId?: string;
+    }>;
+  }>;
 };
 
 export function buildBncrStructuredContextFactsFromInboundParts(
@@ -310,5 +423,6 @@ export function buildBncrStructuredContextFactsFromInboundParts(
       kind: item.kind || inferBncrStructuredMediaKind(item.contentType),
       messageId: input.parsed.msgId,
     })),
+    pendingMediaContext: input.pendingMediaContext,
   });
 }

package/src/messaging/inbound/dispatch.ts

@@ -153,12 +153,14 @@ export async function dispatchBncrInbound(params: {
       historyMap: groupHistories,
       parsed,
       senderDisplayName,
+      senderId: senderIdForContext,
       bodyText: rawBody,
     });
     await recordBncrPendingGroupMedia({
       historyMap: groupHistories,
       parsed,
       senderDisplayName,
+      senderId: senderIdForContext,
       bodyText: rawBody,
       mediaItems,
       mediaContentType: mediaContentType || mimeType,

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

@@ -1,3 +1,4 @@
+import path from 'node:path';
 import {
   createChannelHistoryWindow,
   DEFAULT_GROUP_HISTORY_LIMIT,
@@ -8,7 +9,11 @@ import { formatOpenClawAgentEnvelope } from '../../openclaw/reply-runtime.ts';
 import type { BncrInboundApi } from './contracts.ts';
 import type { ParsedInbound } from './dispatch-prep.ts';
 
-export type BncrGroupHistoryMap = Map<string, HistoryEntry[]>;
+export type BncrHistoryEntry = HistoryEntry & {
+  senderId?: string;
+};
+
+export type BncrGroupHistoryMap = Map<string, BncrHistoryEntry[]>;
 
 type BncrHistoryMediaKind = NonNullable<HistoryMediaEntry['kind']>;
 
@@ -30,6 +35,7 @@ export function recordBncrPendingGroupText(args: {
   historyMap: BncrGroupHistoryMap;
   parsed: ParsedInbound;
   senderDisplayName: string;
+  senderId: string;
   bodyText: string;
 }) {
   const historyKey = buildBncrGroupHistoryKey(args.parsed);
@@ -40,6 +46,7 @@ export function recordBncrPendingGroupText(args: {
     limit: DEFAULT_GROUP_HISTORY_LIMIT,
     entry: {
       sender: args.senderDisplayName,
+      senderId: args.senderId,
       body,
       timestamp: Date.now(),
       messageId: args.parsed.msgId,
@@ -74,6 +81,7 @@ export async function recordBncrPendingGroupMedia(args: {
   historyMap: BncrGroupHistoryMap;
   parsed: ParsedInbound;
   senderDisplayName: string;
+  senderId: string;
   bodyText: string;
   mediaItems?: Array<{
     path: string;
@@ -101,12 +109,13 @@ export async function recordBncrPendingGroupMedia(args: {
         mediaContentType: args.mediaContentType,
       });
   const body = normalizeTextBody(args.bodyText) || buildBncrHistoryMediaBody(kind);
-  if (normalizedMediaItems.length === 0 || kind !== 'image') {
+  if (normalizedMediaItems.length === 0) {
     createChannelHistoryWindow({ historyMap: args.historyMap }).record({
       historyKey,
       limit: DEFAULT_GROUP_HISTORY_LIMIT,
       entry: {
         sender: args.senderDisplayName,
+        senderId: args.senderId,
         body,
         timestamp: Date.now(),
         messageId: args.parsed.msgId,
@@ -114,25 +123,25 @@ export async function recordBncrPendingGroupMedia(args: {
     });
     return;
   }
-  await createChannelHistoryWindow({ historyMap: args.historyMap }).recordWithMedia({
+  createChannelHistoryWindow({ historyMap: args.historyMap }).record({
     historyKey,
     limit: DEFAULT_GROUP_HISTORY_LIMIT,
     entry: {
       sender: args.senderDisplayName,
+      senderId: args.senderId,
       body,
       timestamp: Date.now(),
       messageId: args.parsed.msgId,
+      media: normalizedMediaItems.map(
+        (item) =>
+          ({
+            path: item.path,
+            contentType: item.contentType || args.mediaContentType,
+            kind: item.kind || kind,
+            messageId: args.parsed.msgId,
+          }) satisfies HistoryMediaEntry,
+      ),
     },
-    messageId: args.parsed.msgId,
-    media: normalizedMediaItems.map(
-      (item) =>
-        ({
-          path: item.path,
-          contentType: item.contentType || args.mediaContentType || 'image/*',
-          kind: 'image',
-          messageId: args.parsed.msgId,
-        }) satisfies HistoryMediaEntry,
-    ),
   });
 }
 
@@ -164,16 +173,91 @@ export function buildBncrPendingGroupContext(args: {
   });
 }
 
-export function buildBncrInboundHistory(args: {
+export function collectBncrPendingHistoryMedia(args: {
   historyMap: BncrGroupHistoryMap;
   parsed: ParsedInbound;
+}): HistoryMediaEntry[] {
+  const historyKey = buildBncrGroupHistoryKey(args.parsed);
+  if (!historyKey) return [];
+  const entries = args.historyMap.get(historyKey) || [];
+  return entries.flatMap((entry) => (Array.isArray(entry.media) ? entry.media : []));
+}
+
+function toBncrPromptMediaPath(value: string | undefined): string | undefined {
+  const normalized = String(value || '').trim();
+  if (!normalized) return undefined;
+  const slashNormalized = normalized.replace(/\\/g, '/');
+  if (!slashNormalized.includes('/media/inbound/')) return undefined;
+  const base = path.posix.basename(slashNormalized);
+  if (!base || base === '.' || base === '..') return undefined;
+  return `media://inbound/${encodeURIComponent(base)}`;
+}
+
+function buildHistoryWindowMediaSummary(
+  media: HistoryMediaEntry[] | undefined,
+): string | undefined {
+  if (!Array.isArray(media) || media.length === 0) return undefined;
+  const kinds = media
+    .map((item) =>
+      String(item?.kind || '')
+        .trim()
+        .toLowerCase(),
+    )
+    .filter(Boolean);
+  const uniformKind = kinds[0] && kinds.every((item) => item === kinds[0]) ? kinds[0] : 'document';
+  const count = media.length;
+  if (uniformKind === 'image')
+    return count === 1 ? '<media:image>' : `<media:image> (${count} images)`;
+  if (uniformKind === 'video')
+    return count === 1 ? '<media:video>' : `<media:video> (${count} videos)`;
+  if (uniformKind === 'audio') {
+    return count === 1 ? '<media:audio>' : `<media:audio> (${count} audio attachments)`;
+  }
+  return count === 1 ? '<media:document>' : `<media:document> (${count} attachments)`;
+}
+
+function buildHistoryWindowMedias(media: HistoryMediaEntry[] | undefined) {
+  if (!Array.isArray(media) || media.length === 0) return [];
+  return media.flatMap((item) => {
+    const promptPath = toBncrPromptMediaPath(item?.path);
+    const payload = {
+      ...(promptPath ? { path: promptPath } : {}),
+      ...(item?.contentType ? { contentType: item.contentType } : {}),
+      ...(item?.kind ? { kind: item.kind } : {}),
+      ...(item?.messageId ? { messageId: item.messageId } : {}),
+    };
+    return Object.keys(payload).length > 0 ? [payload] : [];
+  });
+}
+
+export function buildBncrPendingHistoryWindowContext(args: {
+  historyMap: BncrGroupHistoryMap;
+  parsed: ParsedInbound;
+  channelId: string;
 }) {
   const historyKey = buildBncrGroupHistoryKey(args.parsed);
   if (!historyKey) return undefined;
-  return createChannelHistoryWindow({ historyMap: args.historyMap }).buildInboundHistory({
-    historyKey,
-    limit: DEFAULT_GROUP_HISTORY_LIMIT,
-  });
+  const entries = args.historyMap.get(historyKey) || [];
+  if (entries.length === 0) return undefined;
+  const messages = entries.slice(-DEFAULT_GROUP_HISTORY_LIMIT).map((entry) => ({
+    ...(entry.messageId ? { messageId: entry.messageId } : {}),
+    sender: entry.sender,
+    senderId: entry.senderId,
+    ...(typeof entry.timestamp === 'number' ? { timestampMs: entry.timestamp } : {}),
+    body: entry.body,
+    mediaSummary: buildHistoryWindowMediaSummary(entry.media),
+    medias: buildHistoryWindowMedias(entry.media),
+  }));
+  return {
+    label: 'Bncr history window',
+    source: args.channelId,
+    type: 'bncr.history_window',
+    payload: {
+      relation: 'before_current_message',
+      order: 'chronological',
+      messages,
+    },
+  };
 }
 
 export function clearBncrPendingGroupHistory(args: {

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

@@ -12,8 +12,9 @@ import type {
 } from './dispatch-prep.ts';
 import {
   type BncrGroupHistoryMap,
-  buildBncrInboundHistory,
   buildBncrPendingGroupContext,
+  buildBncrPendingHistoryWindowContext,
+  collectBncrPendingHistoryMedia,
 } from './group-history.ts';
 import { resolveBncrChannelInboundRuntime } from './runtime-compat.ts';
 
@@ -88,6 +89,15 @@ export function buildBncrInboundTurnContext(args: {
   } = args;
   const senderIsOwner = parsed.isAdmin === true || Boolean(ownerAllowFrom?.length);
   const senderIsAuthorized = senderIsOwner;
+  const inboundHistory = undefined;
+  const pendingHistoryMedia =
+    shouldDispatch && parsed.peer.kind === 'group'
+      ? collectBncrPendingHistoryMedia({ historyMap: groupHistories, parsed })
+      : [];
+  const pendingHistoryWindowContext =
+    shouldDispatch && parsed.peer.kind === 'group'
+      ? buildBncrPendingHistoryWindowContext({ historyMap: groupHistories, parsed, channelId })
+      : undefined;
   const structuredContextFacts = buildBncrStructuredContextFactsFromInboundParts({
     channelId,
     parsed,
@@ -105,16 +115,19 @@ export function buildBncrInboundTurnContext(args: {
     senderIsAuthorized,
   });
   const promptVisibleContextFacts = buildBncrPromptVisibleContextFacts(structuredContextFacts);
-  const supplementalUntrustedContext = Object.keys(promptVisibleContextFacts).length
-    ? [
-        {
-          label: 'Bncr inbound context',
-          source: channelId,
-          type: 'bncr.inbound_context',
-          payload: promptVisibleContextFacts,
-        },
-      ]
-    : [];
+  const supplementalUntrustedContext = [
+    ...(pendingHistoryWindowContext ? [pendingHistoryWindowContext] : []),
+    ...(Object.keys(promptVisibleContextFacts).length
+      ? [
+          {
+            label: 'Bncr inbound context',
+            source: channelId,
+            type: 'bncr.inbound_context',
+            payload: promptVisibleContextFacts,
+          },
+        ]
+      : []),
+  ];
   const platformWantsReply = parsed.shouldRespond === true;
   const wasMentioned = parsed.isBotMentioned === true || platformWantsReply;
   const isAuthorizedTextCommand = Boolean(ownerAllowFrom?.length);
@@ -134,10 +147,13 @@ export function buildBncrInboundTurnContext(args: {
           currentMessage: prepared.body,
         })
       : prepared.body;
-  const inboundHistory =
-    shouldDispatch && parsed.peer.kind === 'group'
-      ? buildBncrInboundHistory({ historyMap: groupHistories, parsed })
-      : undefined;
+  const currentTurnMedia = prepared.mediaItems.map((item) => ({
+    path: item.path,
+    contentType: item.contentType,
+    kind: item.kind,
+    messageId: msgId ?? undefined,
+  }));
+  const media = [...pendingHistoryMedia, ...currentTurnMedia];
 
   return Promise.resolve(
     resolveBncrChannelInboundRuntime(api).buildContext({
@@ -194,15 +210,7 @@ export function buildBncrInboundTurnContext(args: {
             },
           }
         : {}),
-      media:
-        prepared.mediaItems.length > 0
-          ? prepared.mediaItems.map((item) => ({
-              path: item.path,
-              contentType: item.contentType,
-              kind: item.kind,
-              messageId: msgId ?? undefined,
-            }))
-          : [],
+      media,
       access: {
         mentions: {
           canDetectMention: true,

package/src/plugin/channel-runtime-builders-delivery.ts

@@ -478,6 +478,7 @@ export function buildBncrInboundSurfaceRuntime(deps: {
         resolvedAgentId: string;
         shouldDispatch: boolean;
         shouldAccumulate: boolean;
+        dispatchBy: string;
       }
     | {
         ok: false;

package/src/plugin/inbound-acceptance.ts

@@ -11,6 +11,34 @@ import { decideSceneAdmission } from './scene-registry.ts';
 
 type InboundAcceptanceResponsePayload = ReturnType<typeof buildInboundResponsePayload>;
 
+function resolveDispatchBy(args: {
+  parsed: ReturnType<typeof parseBncrInboundParams>;
+  admission: ReturnType<typeof decideSceneAdmission>;
+  cfg: BncrChannelConfigRoot;
+}): string {
+  const { parsed, admission, cfg } = args;
+  if (parsed.peer.kind === 'direct') return 'direct';
+  if (!admission.allowed) return 'denied';
+
+  const isBncrNativeCommand =
+    parseBncrNativeCommand(parsed.extracted.text, {
+      allowBareWhoami: parsed.isAdmin !== true,
+    }) !== null;
+  const isAdminOpenClawNativeCommand =
+    parsed.isAdmin === true &&
+    !isBncrNativeCommand &&
+    hasControlCommand(parsed.extracted.text, cfg as Parameters<typeof hasControlCommand>[1]);
+  if (isAdminOpenClawNativeCommand) return 'native-command-admin';
+
+  const mode = admission.scene.groupReplyMode || 'admin';
+  if (mode === 'all') return 'mode-all';
+  if (mode === 'admin') return parsed.isAdmin === true ? 'mode-admin-admin' : 'mode-admin-blocked';
+  if (mode === 'mention')
+    return parsed.shouldRespond === true ? 'mode-mention-trigger' : 'mode-mention-idle';
+  if (parsed.isAdmin === true) return 'mode-hybrid-admin';
+  return parsed.shouldRespond === true ? 'mode-hybrid-trigger' : 'mode-hybrid-idle';
+}
+
 function shouldDispatchForScene(args: {
   parsed: ReturnType<typeof parseBncrInboundParams>;
   admission: ReturnType<typeof decideSceneAdmission>;
@@ -184,5 +212,6 @@ export async function prepareBncrInboundAcceptance(args: {
     resolvedAgentId: admission.agentId,
     shouldDispatch: shouldDispatchForScene({ parsed, admission, cfg }),
     shouldAccumulate: shouldAccumulateForScene({ parsed, admission, cfg }),
+    dispatchBy: resolveDispatchBy({ parsed, admission, cfg }),
   };
 }

package/src/plugin/inbound-handlers.ts

@@ -45,6 +45,7 @@ type InboundAcceptanceResult =
       resolvedAgentId: string;
       shouldDispatch: boolean;
       shouldAccumulate: boolean;
+      dispatchBy: string;
     }
   | {
       ok: false;
@@ -254,7 +255,7 @@ export function createBncrInboundHandlers(runtime: Omit<BncrInboundHandlersRunti
           .trim();
         runtime.logInfo(
           'inbound',
-          `accept reject|accountId=${accountId}|msgId=${msgId ?? '-'}|scope=${runtime.formatDisplayScope(route)}|chatType=${peer.kind}|msgType=${msgType}|status=${acceptance.status}|reason=${reason || '-'}|isAdmin=${parsed.isAdmin === true}|shouldRespond=${parsed.shouldRespond === true}`,
+          `accept reject|accountId=${accountId}|msgId=${msgId ?? '-'}|scope=${runtime.formatDisplayScope(route)}|chatType=${peer.kind}|msgType=${msgType}|status=${acceptance.status}|reason=${reason || '-'}|isAdmin=${parsed.isAdmin === true}|platformShouldRespond=${parsed.shouldRespond === true}`,
         );
         const pendingNotice = buildBncrPendingDirectApprovalNotice({ parsed, reason });
         if (pendingNotice) {
@@ -280,10 +281,11 @@ export function createBncrInboundHandlers(runtime: Omit<BncrInboundHandlersRunti
         resolvedAgentId,
         shouldDispatch,
         shouldAccumulate,
+        dispatchBy,
       } = acceptance;
       runtime.logInfo(
         'inbound',
-        `accept ok|accountId=${accountId}|msgId=${msgId ?? '-'}|scope=${runtime.formatDisplayScope(route)}|chatType=${peer.kind}|msgType=${msgType}|sessionKey=${sessionKey}|agent=${resolvedAgentId}|dispatch=${shouldDispatch}|accumulate=${shouldAccumulate}|isAdmin=${parsed.isAdmin === true}|shouldRespond=${parsed.shouldRespond === true}`,
+        `accept ok|accountId=${accountId}|msgId=${msgId ?? '-'}|scope=${runtime.formatDisplayScope(route)}|chatType=${peer.kind}|msgType=${msgType}|sessionKey=${sessionKey}|agent=${resolvedAgentId}|dispatch=${shouldDispatch}|dispatchBy=${dispatchBy}|accumulate=${shouldAccumulate}|isAdmin=${parsed.isAdmin === true}|platformShouldRespond=${parsed.shouldRespond === true}`,
       );
       runtime.logInfo(
         'inbound',

package/src/plugin/meta.ts

@@ -7,4 +7,5 @@ export const BNCR_CHANNEL_META = {
   docsPath: '/channels/bncr',
   blurb: 'Bncr Channel.',
   aliases: ['bncr'],
+  preferSessionLookupForAnnounceTarget: true,
 };