@xmoxmo/bncr 0.5.2 → 0.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmoxmo/bncr",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "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,
@@ -187,6 +189,7 @@ export function buildBncrPromptVisibleContextFacts(
   facts: ReturnType<typeof buildBncrStructuredContextFacts>,
 ) {
   const result: {
+    platform?: string;
     trigger?: {
       botName?: string;
     };
@@ -199,6 +202,7 @@ export function buildBncrPromptVisibleContextFacts(
     reply?: {
       to: string;
       originatingTo: string;
+      rawTo?: string;
     };
     media?: Array<{
       path?: string;
@@ -220,6 +224,10 @@ export function buildBncrPromptVisibleContextFacts(
     }>;
   } = {};
 
+  if (facts.platform) {
+    result.platform = `${facts.channel.id}/${facts.platform}`;
+  }
+
   if (
     facts.sender.isAdmin === true ||
     facts.sender.isOwner === true ||
@@ -244,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 } : {}),
     };
   }
 
@@ -326,6 +335,7 @@ export type BncrStructuredContextFactsFromInboundPartsInput = {
   resolution: {
     chatType: string;
     canonicalTo: string;
+    rawTo: string;
     originatingTo: string;
     resolvedRoute: {
       agentId?: string;
@@ -384,6 +394,7 @@ export function buildBncrStructuredContextFactsFromInboundParts(
     reply: {
       to: input.resolution.canonicalTo,
       originatingTo: input.resolution.originatingTo,
+      rawTo: input.resolution.rawTo,
     },
     sender: {
       id: input.senderIdForContext,

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/native-command.ts

@@ -52,8 +52,8 @@ const BNCR_HELP_TEXT = [
   '  • /bncr mode help',
   '  • /bncr mode <admin|mention|hybrid|all> [<SceneId>]',
   '  • /bncr revoke [<SceneId>]',
-  '  • /bncr list pending',
-  '  • /bncr list scenes',
+  '  • /bncr list pending [filters...]',
+  '  • /bncr list scenes [filters...]',
   '',
   '📋 Group history',
   '  • /bncr history-help',

package/src/messaging/inbound/scene-admin.ts

@@ -14,7 +14,7 @@ export type BncrSceneAdminCommand =
   | { kind: 'mode-help' }
   | { kind: 'mode-get'; sceneKey?: string }
   | { kind: 'mode'; sceneKey: string; mode: BncrGroupReplyMode }
-  | { kind: 'list'; scope: 'pending' | 'scenes' }
+  | { kind: 'list'; scope: 'pending' | 'scenes'; filters?: string[] }
   | { kind: 'history-limit-get'; sceneKey?: string }
   | { kind: 'history-limit-set'; sceneKey: string; limit: number }
   | { kind: 'history-force-get'; sceneKey?: string }
@@ -69,6 +69,11 @@ function splitArgs(raw: string): string[] {
     .filter(Boolean);
 }
 
+function normalizeFilters(args: string[]): string[] | undefined {
+  const filters = args.map((part) => normalizeToken(part).toLowerCase()).filter(Boolean);
+  return filters.length > 0 ? filters : undefined;
+}
+
 function resolveCurrentGroupSceneKey(parsed: ParsedInbound): string | null {
   if (parsed.peer.kind !== 'group') return null;
   const platform = normalizeToken(parsed.platform);
@@ -151,12 +156,26 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
       };
     case 'list':
       if (args[0] === 'pending') {
-        return { matched: true, valid: true, command: { kind: 'list', scope: 'pending' } };
+        const filters = normalizeFilters(args.slice(1));
+        return {
+          matched: true,
+          valid: true,
+          command: { kind: 'list', scope: 'pending', ...(filters ? { filters } : {}) },
+        };
       }
       if (args[0] === 'scenes') {
-        return { matched: true, valid: true, command: { kind: 'list', scope: 'scenes' } };
+        const filters = normalizeFilters(args.slice(1));
+        return {
+          matched: true,
+          valid: true,
+          command: { kind: 'list', scope: 'scenes', ...(filters ? { filters } : {}) },
+        };
       }
-      return { matched: true, valid: false, text: 'Usage: /bncr list <pending|scenes>' };
+      return {
+        matched: true,
+        valid: false,
+        text: 'Usage: /bncr list <pending|scenes> [filters...]',
+      };
     case 'history-limit':
       if (args.length === 0) {
         return { matched: true, valid: true, command: { kind: 'history-limit-get' } };
@@ -271,6 +290,30 @@ function formatSceneGroups(scenes: BncrSceneRecord[]): string {
     .join('\n\n');
 }
 
+function buildSceneSearchHaystack(scene: BncrSceneRecord): string[] {
+  const parts: string[] = [
+    normalizeToken(scene.sceneKey),
+    normalizeToken(scene.platform),
+    normalizeToken(scene.status),
+    normalizeToken(scene.agentId ?? ''),
+    normalizeToken(scene.kind),
+    normalizeToken(scene.userId ?? ''),
+    normalizeToken(scene.userName ?? ''),
+    normalizeToken(scene.groupId ?? ''),
+    normalizeToken(scene.groupName ?? ''),
+  ];
+  if (scene.kind === 'group') {
+    parts.push(scene.groupReplyMode || 'admin');
+  }
+  return parts.map((part) => part.toLowerCase()).filter(Boolean);
+}
+
+function matchesSceneFilters(scene: BncrSceneRecord, filters: string[] | undefined): boolean {
+  if (!filters?.length) return true;
+  const haystack = buildSceneSearchHaystack(scene);
+  return filters.every((filter) => haystack.some((part) => part.includes(filter)));
+}
+
 function applySceneStatus(scene: BncrSceneRecord, status: BncrSceneStatus): BncrSceneRecord {
   return {
     ...scene,
@@ -299,11 +342,19 @@ export function executeSceneAdminCommand(args: {
   if (command.kind === 'list') {
     const scenes = Array.from(sceneRegistry.values())
       .filter((scene) => (command.scope === 'pending' ? scene.status === 'pending' : true))
+      .filter((scene) => matchesSceneFilters(scene, command.filters))
       .sort((a, b) => a.lastSeenAt - b.lastSeenAt);
     if (scenes.length === 0) {
       return {
         ok: true,
-        text: command.scope === 'pending' ? 'No pending scenes.' : 'No scenes recorded.',
+        text:
+          command.scope === 'pending'
+            ? command.filters?.length
+              ? `No pending scenes matched: ${command.filters.join(' ')}`
+              : 'No pending scenes.'
+            : command.filters?.length
+              ? `No scenes matched: ${command.filters.join(' ')}`
+              : 'No scenes recorded.',
       };
     }
     return { ok: true, text: formatSceneGroups(scenes) };

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

@@ -220,6 +220,7 @@ export function buildBncrInboundTurnContext(args: {
       reply: {
         to: resolution.canonicalTo,
         originatingTo: resolution.originatingTo,
+        rawTo: resolution.rawTo,
       },
       message: {
         inboundEventKind: 'user_request',
@@ -265,6 +266,7 @@ export function buildBncrInboundTurnContext(args: {
       },
       extra: {
         OriginatingChannel: channelId,
+        ...(parsed.isGroup === true && parsed.groupName ? { GroupSubject: parsed.groupName } : {}),
         ...(ownerAllowFrom?.length ? { OwnerAllowFrom: ownerAllowFrom } : {}),
         BncrStructuredContextFacts: structuredContextFacts,
         StructuredContextFacts: structuredContextFacts,