@xmoxmo/bncr 0.5.5 → 0.5.7

package/src/messaging/inbound/parse.ts

@@ -2,39 +2,9 @@ import { createHash } from 'node:crypto';
 import { normalizeAccountId } from '../../core/accounts.ts';
 import { extractInlineTaskKey } from '../../core/targets.ts';
 import type { BncrRoute } from '../../core/types.ts';
+import { asBoolean, asString, asStringArray } from '../../core/value-sanitize.ts';
 import type { BncrInboundMediaItem, BncrInboundParamsInput } from './contracts.ts';
 
-function asString(v: unknown, fallback = ''): string {
-  if (typeof v === 'string') return v;
-  if (v == null) return fallback;
-  return String(v);
-}
-
-function asBoolean(v: unknown, fallback = false): boolean {
-  if (typeof v === 'boolean') return v;
-  if (typeof v === 'number') return v !== 0;
-  if (typeof v === 'string') {
-    const raw = v.trim().toLowerCase();
-    if (!raw) return fallback;
-    if (['true', '1', 'yes', 'y', 'on'].includes(raw)) return true;
-    if (['false', '0', 'no', 'n', 'off'].includes(raw)) return false;
-  }
-  return fallback;
-}
-
-function asStringArray(v: unknown): string[] {
-  if (Array.isArray(v)) {
-    return v.map((item) => asString(item).trim()).filter(Boolean);
-  }
-  if (typeof v === 'string') {
-    return v
-      .split(',')
-      .map((item) => item.trim())
-      .filter(Boolean);
-  }
-  return [];
-}
-
 function asInboundMediaItems(params: BncrInboundParamsInput): BncrInboundMediaItem[] {
   const normalized: BncrInboundMediaItem[] = [];
   const rawList = Array.isArray(params?.mediaList) ? params.mediaList : [];

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

@@ -13,16 +13,22 @@ export type BncrSceneAdminCommand =
   | { kind: 'bind'; sceneKey?: string; agentId: string }
   | { kind: 'mode-help' }
   | { kind: 'mode-get'; sceneKey?: string }
-  | { kind: 'mode'; sceneKey: string; mode: BncrGroupReplyMode }
+  | { kind: 'mode'; sceneKey: string; mode: string }
   | { kind: 'list'; scope: 'pending' | 'scenes'; filters?: string[] }
   | { kind: 'history-limit-get'; sceneKey?: string }
-  | { kind: 'history-limit-set'; sceneKey: string; limit: number }
+  | { kind: 'history-limit-set'; sceneKey: string; limit: number | 'clear' }
   | { kind: 'history-force-get'; sceneKey?: string }
-  | { kind: 'history-force-set'; sceneKey: string; enabled: boolean }
-  | { kind: 'history-help' };
+  | { kind: 'history-force-set'; sceneKey: string; enabled: boolean | 'clear' }
+  | { kind: 'history-help' }
+  | { kind: 'download-media-get'; sceneKey?: string }
+  | { kind: 'download-media-set'; sceneKey: string; enabled: boolean | undefined }
+  | { kind: 'download-media-global-get' }
+  | { kind: 'download-media-global-set'; enabled: boolean };
 
 const GROUP_REPLY_MODES = new Set<BncrGroupReplyMode>(['admin', 'mention', 'hybrid', 'all']);
 
+const GLOBAL_SCENE_KEY = '__global__';
+
 const MODE_HELP_TEXT = [
   '💬 Bncr Group Reply Mode Configuration',
   '',
@@ -122,6 +128,13 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
         return { matched: true, valid: true, command: { kind: 'mode-get' } };
       }
       if (args.length === 1) {
+        if (args[0] === 'clear') {
+          return {
+            matched: true,
+            valid: true,
+            command: { kind: 'mode', sceneKey: '', mode: 'clear' },
+          };
+        }
         if (args[0] === 'help') {
           return {
             matched: true,
@@ -142,6 +155,13 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
           command: { kind: 'mode-get', sceneKey: args[0] },
         };
       }
+      if (args[0] === 'clear' && args[1]) {
+        return {
+          matched: true,
+          valid: true,
+          command: { kind: 'mode', sceneKey: args[1], mode: 'clear' },
+        };
+      }
       if (GROUP_REPLY_MODES.has(args[0] as BncrGroupReplyMode) && args[1]) {
         return {
           matched: true,
@@ -181,6 +201,13 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
         return { matched: true, valid: true, command: { kind: 'history-limit-get' } };
       }
       if (args.length === 1) {
+        if (args[0] === 'clear') {
+          return {
+            matched: true,
+            valid: true,
+            command: { kind: 'history-limit-set', sceneKey: '', limit: 'clear' },
+          };
+        }
         const num = parseInt(args[0], 10);
         if (Number.isFinite(num)) {
           return {
@@ -196,6 +223,13 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
         };
       }
       if (args.length === 2) {
+        if (args[0] === 'clear') {
+          return {
+            matched: true,
+            valid: true,
+            command: { kind: 'history-limit-set', sceneKey: args[1], limit: 'clear' },
+          };
+        }
         const num = parseInt(args[0], 10);
         if (Number.isFinite(num)) {
           return {
@@ -214,6 +248,20 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
       if (args.length === 0) {
         return { matched: true, valid: true, command: { kind: 'history-force-get' } };
       }
+      if (args[0] === 'clear') {
+        if (args.length === 1) {
+          return {
+            matched: true,
+            valid: true,
+            command: { kind: 'history-force-set', sceneKey: '', enabled: 'clear' },
+          };
+        }
+        return {
+          matched: true,
+          valid: true,
+          command: { kind: 'history-force-set', sceneKey: args[1], enabled: 'clear' },
+        };
+      }
       if (args[0] === 'on' || args[0] === 'off') {
         if (args.length === 1) {
           return {
@@ -233,6 +281,50 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
         valid: true,
         command: { kind: 'history-force-get', sceneKey: args[0] },
       };
+    case 'download-media':
+      if (args.length === 0) {
+        return { matched: true, valid: true, command: { kind: 'download-media-get' } };
+      }
+      if (args[0] === 'default') {
+        if (args[1] === 'on' || args[1] === 'off') {
+          return {
+            matched: true,
+            valid: true,
+            command: { kind: 'download-media-global-set', enabled: args[1] === 'on' },
+          };
+        }
+        return { matched: true, valid: true, command: { kind: 'download-media-global-get' } };
+      }
+      if (args[0] === 'clear') {
+        return {
+          matched: true,
+          valid: true,
+          command: {
+            kind: 'download-media-set',
+            sceneKey: args[1] || '',
+            enabled: undefined,
+          },
+        };
+      }
+      if (args[0] === 'on' || args[0] === 'off') {
+        if (args.length === 1) {
+          return {
+            matched: true,
+            valid: true,
+            command: { kind: 'download-media-set', sceneKey: '', enabled: args[0] === 'on' },
+          };
+        }
+        return {
+          matched: true,
+          valid: true,
+          command: { kind: 'download-media-set', sceneKey: args[1], enabled: args[0] === 'on' },
+        };
+      }
+      return {
+        matched: true,
+        valid: true,
+        command: { kind: 'download-media-get', sceneKey: args[0] },
+      };
     case 'history-help':
       return { matched: true, valid: true, command: { kind: 'history-help' } };
     default:
@@ -399,6 +491,11 @@ export function executeSceneAdminCommand(args: {
     }
     const sExisting = sceneRegistry.get(sSceneKey);
     if (!sExisting) return { ok: false, text: `Scene not found: ${sSceneKey}` };
+    if (command.limit === 'clear') {
+      const { historyLimit: _, ...rest } = sExisting;
+      sceneRegistry.set(sSceneKey, { ...rest, lastSeenAt: now() });
+      return { ok: true, text: `Cleared ${sSceneKey} history limit. Will use default (50).` };
+    }
     const rawLimit = command.limit;
     if (!Number.isFinite(rawLimit) || Number.isNaN(rawLimit)) {
       return { ok: false, text: 'Invalid number.' };
@@ -443,6 +540,11 @@ export function executeSceneAdminCommand(args: {
     }
     const sExisting = sceneRegistry.get(sSceneKey);
     if (!sExisting) return { ok: false, text: `Scene not found: ${sSceneKey}` };
+    if (command.enabled === 'clear') {
+      const { historyForce: _, ...rest } = sExisting;
+      sceneRegistry.set(sSceneKey, { ...rest, lastSeenAt: now() });
+      return { ok: true, text: `Cleared ${sSceneKey} history auto flush. Will use default (on).` };
+    }
     sceneRegistry.set(sSceneKey, {
       ...sExisting,
       historyForce: command.enabled,
@@ -454,6 +556,75 @@ export function executeSceneAdminCommand(args: {
     };
   }
 
+  if (command.kind === 'download-media-global-get') {
+    const g = sceneRegistry.get(GLOBAL_SCENE_KEY);
+    const enabled = g?.downloadMedia === true;
+    return { ok: true, text: `Global default download remote media is ${enabled ? 'on' : 'off'}.` };
+  }
+
+  if (command.kind === 'download-media-global-set') {
+    const g = sceneRegistry.get(GLOBAL_SCENE_KEY);
+    sceneRegistry.set(GLOBAL_SCENE_KEY, {
+      sceneKey: GLOBAL_SCENE_KEY,
+      kind: 'group',
+      status: 'allowed',
+      ...(g || { platform: 'bncr' }),
+      downloadMedia: command.enabled,
+      lastSeenAt: now(),
+    });
+    return {
+      ok: true,
+      text: `Global default download remote media set to ${command.enabled ? 'on' : 'off'}.`,
+    };
+  }
+
+  if (command.kind === 'download-media-get') {
+    const qSceneKey = command.sceneKey || resolveCurrentGroupSceneKey(parsed);
+    if (!qSceneKey) {
+      return {
+        ok: true,
+        text: `Global default download remote media is ${sceneRegistry.get(GLOBAL_SCENE_KEY)?.downloadMedia === true ? 'on' : 'off'}.`,
+      };
+    }
+    const s = sceneRegistry.get(qSceneKey);
+    if (!s) return { ok: true, text: 'Default download remote media is off.' };
+    const enabled = s.downloadMedia === true;
+    return {
+      ok: true,
+      text: `Current ${qSceneKey} download remote media is ${enabled ? 'on' : 'off'}.`,
+    };
+  }
+
+  if (command.kind === 'download-media-set') {
+    const sSceneKey = command.sceneKey || resolveCurrentGroupSceneKey(parsed);
+    if (!sSceneKey) {
+      return { ok: false, text: 'Current group shortcut only works inside a group chat.' };
+    }
+    const sExisting = sceneRegistry.get(sSceneKey);
+    if (command.enabled === undefined) {
+      // Clear per-group setting
+      if (sExisting) {
+        const { downloadMedia: _, ...rest } = sExisting;
+        sceneRegistry.set(sSceneKey, { ...rest, lastSeenAt: now() });
+        return {
+          ok: true,
+          text: `Cleared ${sSceneKey} download remote media. Will use global default.`,
+        };
+      }
+      return { ok: true, text: `No per-group config to clear for ${sSceneKey}.` };
+    }
+    if (!sExisting) return { ok: false, text: `Scene not found: ${sSceneKey}` };
+    sceneRegistry.set(sSceneKey, {
+      ...sExisting,
+      downloadMedia: command.enabled,
+      lastSeenAt: now(),
+    });
+    return {
+      ok: true,
+      text: `Set ${sSceneKey} download remote media to ${command.enabled ? 'on' : 'off'}.`,
+    };
+  }
+
   const sceneKey = command.sceneKey || resolveCurrentGroupSceneKey(parsed);
   if (!sceneKey) {
     return { ok: false, text: 'Current group shortcut only works inside a group chat.' };
@@ -482,9 +653,14 @@ export function executeSceneAdminCommand(args: {
     if (existing.kind !== 'group') {
       return { ok: false, text: `Scene ${sceneKey} is not a group scene.` };
     }
+    if (command.mode === 'clear') {
+      const { groupReplyMode: _, ...rest } = existing;
+      sceneRegistry.set(sceneKey, { ...rest, lastSeenAt: now() });
+      return { ok: true, text: `Cleared ${sceneKey} reply mode. Will use default (admin).` };
+    }
     sceneRegistry.set(sceneKey, {
       ...existing,
-      groupReplyMode: command.mode,
+      groupReplyMode: command.mode as BncrGroupReplyMode,
       lastSeenAt: now(),
     });
     return { ok: true, text: `Set ${sceneKey} reply mode to ${command.mode}.` };

package/src/messaging/outbound/diagnostics.ts

@@ -5,6 +5,7 @@ import type {
   BncrOutboxQueueDiagnostics,
   OutboxEntry,
 } from '../../core/types.ts';
+import { finiteNumberOrNull } from '../../core/value-sanitize.ts';
 
 export {
   buildFlushDebugInfo,
@@ -42,12 +43,6 @@ type OutboxIncidentSummaryInput = {
   nowMs?: number;
 };
 
-function finiteNumberOrNull(value: unknown): number | null {
-  if (value == null) return null;
-  const n = Number(value);
-  return Number.isFinite(n) ? n : null;
-}
-
 function positiveAgeMs(nowMs: number, at: unknown): number | null {
   const n = finiteNumberOrNull(at);
   if (n === null || n < 0) return null;

package/src/messaging/outbound/durable-queue-adapter.ts

@@ -8,7 +8,7 @@ export type BncrDurableQueuedReceipt = {
     platformMessageId: string;
     kind: 'text' | 'media' | 'voice' | 'unknown';
     index: number;
-    threadId?: string;
+    threadId?: string | number | null;
     replyToId?: string;
     raw: {
       channel: 'bncr';
@@ -20,7 +20,7 @@ export type BncrDurableQueuedReceipt = {
       meta: BncrDurableQueuedReceiptMeta;
     };
   }>;
-  threadId?: string;
+  threadId?: string | number | null;
   replyToId?: string;
   sentAt: number;
   raw: Array<{
@@ -66,8 +66,12 @@ export type BncrDurableQueuedResult = {
 };
 
 type OutboxPayload = OutboxEntry['payload'];
-type OutboxMeta = NonNullable<OutboxPayload['_meta']>;
-type OutboxMessagePayload = { type?: unknown };
+type OutboxMessagePayload = {
+  type?: unknown;
+  transferMode?: string;
+  asVoice?: boolean;
+  audioAsVoice?: boolean;
+};
 
 function getOutboxPayload(entry: OutboxEntry): OutboxPayload {
   return entry.payload;
@@ -76,7 +80,7 @@ function getOutboxPayload(entry: OutboxEntry): OutboxPayload {
 export function buildBncrDurableQueuedResult(args: {
   entry: OutboxEntry;
   index?: number;
-  threadId?: string;
+  threadId?: string | number | null;
   replyToId?: string;
   sentAt?: number;
 }): BncrDurableQueuedResult {
@@ -145,20 +149,22 @@ function extractPayloadType(entry: OutboxEntry): string | undefined {
 
 function extractReplyToId(entry: OutboxEntry): string | undefined {
   const payload = getOutboxPayload(entry);
-  const metaReply = (payload?._meta as OutboxMeta | undefined)?.replyToId;
-  const replyToId = payload?.replyToId ?? metaReply;
+  const message =
+    payload?.message && typeof payload.message === 'object' && !Array.isArray(payload.message)
+      ? (payload.message as Record<string, unknown>)
+      : null;
+  const replyToId = payload?.replyToId ?? (message?.replyToId as string | undefined);
   return typeof replyToId === 'string' ? replyToId : undefined;
 }
 
 function inferReceiptKind(entry: OutboxEntry): 'text' | 'media' | 'voice' | 'unknown' {
   const payload = getOutboxPayload(entry);
-  const meta = payload?._meta as OutboxMeta | undefined;
   const message =
-    payload.message && typeof payload.message === 'object'
+    payload?.message && typeof payload.message === 'object'
       ? (payload.message as OutboxMessagePayload)
       : null;
-  if (meta?.kind === 'file-transfer') {
-    if (meta.asVoice === true || meta.audioAsVoice === true) return 'voice';
+  if (message?.transferMode === 'media') {
+    if (message?.asVoice === true || message?.audioAsVoice === true) return 'voice';
     return 'media';
   }
   if (message?.type === 'text') return 'text';

package/src/messaging/outbound/marker-parser.ts

@@ -0,0 +1,188 @@
+/**
+ * [BncrParam:JSON] marker parser.
+ *
+ * Extracts embedded JSON control parameters from agent text, removes the
+ * marker from the visible message, and returns the parsed key-value pairs.
+ *
+ * Format: [BncrParam:{"key":"val","asVoice":true}]
+ *
+ * - Complete marker whose JSON parses successfully → stripped, params merged.
+ * - Complete marker whose JSON fails to parse → left in text (not stripped)
+ *   so the user can see and fix the bad payload.
+ * - Incomplete marker (no closing ]) → left in text, does NOT block later
+ *   complete markers.
+ * - Multiple valid markers → all stripped, params merge (later same-key wins).
+ */
+
+const PREFIX = '[BncrParam:';
+
+/**
+ * Locate the closing `]` of a complete marker starting at `prefixIdx`.
+ * Returns the index of the closing `]`, or -1 if incomplete.
+ */
+function findMarkerEnd(text: string, prefixIdx: number): number {
+  const start = prefixIdx + PREFIX.length;
+  if (start >= text.length) return -1;
+
+  // Scan character-by-character tracking brace/bracket depth so that
+  // ] inside JSON values (e.g. CDATA / lyric tags) is not mistaken for
+  // the closing marker bracket.
+  let depth = 0;
+  let inString = false;
+  let esc = false;
+  let started = false;
+
+  for (let i = start; i < text.length; i++) {
+    const ch = text[i];
+
+    if (esc) {
+      esc = false;
+      continue;
+    }
+    if (ch === '\\' && inString) {
+      esc = true;
+      continue;
+    }
+    if (ch === '"') {
+      inString = !inString;
+      continue;
+    }
+
+    if (!inString) {
+      if (!started) {
+        if (ch === '{' || ch === '[') {
+          started = true;
+          depth = 1;
+        }
+        continue;
+      }
+
+      if (ch === '{' || ch === '[') {
+        depth++;
+      } else if (ch === '}' || ch === ']') {
+        depth--;
+        if (depth === 0) {
+          // JSON content complete - expect ] to close the marker
+          if (i + 1 < text.length && text[i + 1] === ']') {
+            return i + 1;
+          }
+          return -1;
+        }
+      }
+    }
+  }
+
+  return -1;
+}
+
+export function parseBncrMarker(text: string): {
+  cleanText: string;
+  params: Record<string, unknown>;
+} {
+  const params: Record<string, unknown> = {};
+  let result = text;
+  let searchFrom = 0;
+
+  while (true) {
+    const idx = result.indexOf(PREFIX, searchFrom);
+    if (idx === -1) break;
+
+    const end = findMarkerEnd(result, idx);
+    if (end === -1) {
+      // Incomplete marker (missing ]): leave in place,
+      // keep looking after this PREFIX so later valid markers are not blocked.
+      searchFrom = idx + PREFIX.length;
+      continue;
+    }
+
+    const rawJson = result.slice(idx + PREFIX.length, end);
+    let parsedOk = false;
+    try {
+      const parsed = JSON.parse(rawJson);
+      if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+        Object.assign(params, parsed as Record<string, unknown>);
+        parsedOk = true;
+      }
+    } catch {
+      // JSON parse failed — do NOT strip marker so the user can debug it
+    }
+
+    if (parsedOk) {
+      // Strip the complete valid marker
+      result = result.slice(0, idx) + result.slice(end + 1);
+      searchFrom = idx;
+    } else {
+      // Leave the invalid marker in place, continue after it
+      searchFrom = end + 1;
+    }
+  }
+
+  // Only trim whitespace when markers were actually stripped (result changed).
+  // Without markers the original text is returned as-is for maximum fidelity.
+  const cleanText = result !== text ? result.replace(/ {2,}/g, ' ').trim() : result;
+  return { cleanText, params };
+}
+
+/**
+ * Media types that the pipeline internally routes as media sends.
+ * Only these types are consumed (stripped) from extra.
+ * Non-media types like "appmsg" remain in extra for downstream passthrough.
+ */
+const MEDIA_CONSUMPTION_TYPES = new Set(['file', 'image', 'video', 'audio', 'voice']);
+
+/**
+ * Known fields that the bncr plugin unconditionally consumes during outbound
+ * processing. These are stripped from extra at entry and set as independent
+ * pipeline params.  `type` is NOT in this set — it is consumed conditionally
+ * based on whether its value is a recognized media type.
+ */
+const CONSUMPTION_FIELDS_NO_TYPE = new Set([
+  'ismedia',
+  'asVoice',
+  'audioAsVoice',
+  'kind',
+  'replyToId',
+  'downloadMedia',
+]);
+
+export function extractConsumptionFields(extra: Record<string, unknown> | undefined): {
+  consumed: Partial<{
+    asVoice: boolean;
+    audioAsVoice: boolean;
+    type: string;
+    kind: string;
+    replyToId: string;
+    downloadMedia: boolean;
+    ismedia: boolean;
+  }>;
+  remaining: Record<string, unknown>;
+} {
+  const consumed: Record<string, unknown> = {};
+  const remaining: Record<string, unknown> = {};
+
+  if (!extra) return { consumed: {}, remaining: {} };
+
+  for (const [key, value] of Object.entries(extra)) {
+    // type is only consumed when its value is a recognized media type
+    // (file/image/video/audio/voice).  Non-media types like "appmsg"
+    // stay in remaining for downstream passthrough.
+    if (key === 'type' && typeof value === 'string') {
+      if (MEDIA_CONSUMPTION_TYPES.has(value.trim().toLowerCase())) {
+        consumed[key] = value;
+      } else {
+        remaining[key] = value;
+      }
+      continue;
+    }
+    if (CONSUMPTION_FIELDS_NO_TYPE.has(key)) {
+      consumed[key] = value;
+    } else {
+      remaining[key] = value;
+    }
+  }
+
+  return {
+    consumed: consumed as Record<string, unknown>,
+    remaining,
+  };
+}

package/src/messaging/outbound/media-dedupe.ts

@@ -1,3 +1,5 @@
+import { asString } from '../../core/value-sanitize.ts';
+
 export type MediaDedupeCacheEntry = {
   mediaUrl: string;
   text: string;
@@ -5,12 +7,6 @@ export type MediaDedupeCacheEntry = {
   createdAt: number;
 };
 
-function asString(v: unknown, fallback = ''): string {
-  if (typeof v === 'string') return v;
-  if (v == null) return fallback;
-  return String(v);
-}
-
 export function normalizeReplyToId(value: unknown): string {
   return asString(value || '').trim();
 }

package/src/messaging/outbound/media.ts

@@ -1,18 +1,8 @@
+import { asString } from '../../core/value-sanitize.ts';
 import { normalizeOutboundReplyToId } from './reply-target-policy.ts';
 
 type BncrOutboundMessageType = 'text' | 'image' | 'video' | 'voice' | 'audio' | 'file';
 
-function asString(v: unknown, fallback = ''): string {
-  if (typeof v === 'string') return v;
-  if (v == null) return fallback;
-  return String(v);
-}
-
-function isAudioMimeType(mimeType?: string): boolean {
-  const mt = asString(mimeType || '').toLowerCase();
-  return mt.startsWith('audio/');
-}
-
 function isBncrOutboundMessageType(value: string): value is BncrOutboundMessageType {
   return (
     value === 'text' ||
@@ -43,11 +33,7 @@ export function resolveBncrOutboundMessageType(params: {
   const isStandard = isBncrOutboundMessageType(hinted);
 
   if (hasPayload && major === 'text' && (hinted === 'text' || !isStandard)) return 'file';
-  if (hinted === 'voice') {
-    if (isAudioMimeType(mt)) return 'voice';
-    if (isMimeMajorOutboundMessageType(major)) return major;
-    return 'file';
-  }
+  if (hinted === 'voice') return 'voice';
   if (isStandard) return hinted;
   if (isMimeMajorOutboundMessageType(major)) return major;
   return 'file';
@@ -61,7 +47,7 @@ export function buildBncrMediaOutboundFrame(params: {
     mode: 'base64' | 'chunk';
     mimeType?: string;
     fileName?: string;
-    mediaBase64?: string;
+    base64?: string;
     path?: string;
   };
   mediaUrl: string;
@@ -87,17 +73,17 @@ export function buildBncrMediaOutboundFrame(params: {
       type: resolveBncrOutboundMessageType({
         mimeType: params.media.mimeType,
         fileName: params.media.fileName,
-        hasPayload: !!(params.media.path || params.media.mediaBase64),
+        hasPayload: !!(params.media.path || params.media.base64),
         hintedType: params.hintedType,
       }),
       kind: params.kind,
       mimeType: params.media.mimeType || '',
       msg: params.mediaMsg,
       path: params.media.path || params.mediaUrl,
-      base64: params.media.mediaBase64 || '',
+      base64: params.media.base64 || '',
       fileName: params.fileName,
       transferMode: params.media.mode,
-      ...(params.extra ? { extra: { ...params.extra } } : {}),
+      ...(params.extra ? { ...params.extra } : {}),
     },
     ts: params.now,
   };