@xmoxmo/bncr 0.5.6 → 0.5.7

package/src/core/types.ts

@@ -21,8 +21,6 @@ export type BncrGatewayCapabilityFlags = {
   inboundOnly: boolean;
 };
 
-export type FileRecvTransferStatus = 'init' | 'transferring' | 'completed' | 'aborted';
-
 type FileRecvTransferBase = {
   transferId: string;
   accountId: string;
@@ -105,21 +103,7 @@ export type OutboxEntry = {
   accountId: string;
   sessionKey: string;
   route: BncrRoute;
-  payload: Record<string, unknown> & {
-    _meta?: {
-      kind?: 'message' | 'file-transfer';
-      retryCount?: number;
-      nextAttemptAt?: number;
-      mediaUrl?: string;
-      mediaLocalRoots?: string[];
-      text?: string;
-      asVoice?: boolean;
-      audioAsVoice?: boolean;
-      replyToId?: string;
-      finalEvent?: string;
-      [key: string]: unknown;
-    };
-  };
+  payload: Record<string, unknown>;
   createdAt: number;
   retryCount: number;
   nextAttemptAt: number;

package/src/core/value-sanitize.ts

@@ -1,15 +1,39 @@
-export function asSanitizedString(value: unknown, fallback = ''): string {
+export function asString(value: unknown, fallback = ''): string {
   if (typeof value === 'string') return value;
   if (value == null) return fallback;
   return String(value);
 }
 
+/** Alias: same as asString, named for call-sites that want a sanitization signal. */
+export const asSanitizedString = asString;
+
 export function finiteNumberOr(value: unknown, fallback: number): number {
   const n = Number(value);
   return Number.isFinite(n) ? n : fallback;
 }
 
+export function now(): number {
+  return Date.now();
+}
+
+export function asBoolean(value: unknown, fallback = false): boolean {
+  if (typeof value === 'boolean') return value;
+  if (typeof value === 'number') return value !== 0;
+  if (typeof value === 'string') {
+    const raw = value.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;
+}
+
+export function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
 export function finiteNumberOrNull(value: unknown): number | null {
+  if (value === null || value === undefined) return null;
   const n = Number(value);
   return Number.isFinite(n) ? n : null;
 }
@@ -27,3 +51,16 @@ export function clampFiniteNumber(
   const finite = finiteNumberOr(value, fallback);
   return Math.max(min, Math.min(finite, max));
 }
+
+export 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 [];
+}

package/src/messaging/inbound/commands.ts

@@ -7,10 +7,7 @@ import {
   resolveBncrPinnedMainDmOwnerFromAllowlist,
 } from '../../openclaw/inbound-session-runtime.ts';
 import { dispatchOpenClawReplyWithBufferedBlockDispatcher } from '../../openclaw/reply-runtime.ts';
-import {
-  type OpenClawResolvedAgentRoute,
-  resolveOpenClawAgentRoute,
-} from '../../openclaw/routing-runtime.ts';
+import { resolveOpenClawAgentRoute } from '../../openclaw/routing-runtime.ts';
 import type {
   BncrEnqueueFromReply,
   BncrInboundApi,
@@ -18,7 +15,7 @@ import type {
   BncrInboundLogger,
   BncrRememberSessionRoute,
 } from './contracts.ts';
-import type { ParsedInbound } from './dispatch-prep.ts';
+import { assertResolvedAgentRoute, type ParsedInbound } from './dispatch-prep.ts';
 import { buildBncrInboundRecordUpdateLastRoute } from './last-route.ts';
 import {
   parseBncrNativeCommand,
@@ -50,25 +47,6 @@ import {
 } from './session-label.ts';
 import { createBncrSessionMetaTaskBarrier } from './session-meta-task.ts';
 
-function assertResolvedAgentRoute(resolvedRoute: OpenClawResolvedAgentRoute): {
-  sessionKey: string;
-  agentId: string;
-  mainSessionKey?: string;
-} {
-  const sessionKey =
-    typeof resolvedRoute.sessionKey === 'string' ? resolvedRoute.sessionKey.trim() : '';
-  const agentId = typeof resolvedRoute.agentId === 'string' ? resolvedRoute.agentId.trim() : '';
-  if (!sessionKey) throw new Error('OpenClaw resolveAgentRoute returned empty sessionKey');
-  if (!agentId) throw new Error('OpenClaw resolveAgentRoute returned empty agentId');
-  return {
-    sessionKey,
-    agentId,
-    ...(typeof resolvedRoute.mainSessionKey === 'string' && resolvedRoute.mainSessionKey.trim()
-      ? { mainSessionKey: resolvedRoute.mainSessionKey }
-      : {}),
-  };
-}
-
 function buildBncrNativeCommandResolvedRoute(args: {
   api: BncrInboundApi;
   cfg: BncrInboundConfig;

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

@@ -95,7 +95,7 @@ const BNCR_GENERIC_MEDIA_TEXTS = new Set([
   '[文件]',
 ]);
 
-function assertResolvedAgentRoute(resolvedRoute: OpenClawResolvedAgentRoute): {
+export function assertResolvedAgentRoute(resolvedRoute: OpenClawResolvedAgentRoute): {
   sessionKey: string;
   agentId: string;
   mainSessionKey?: string;

package/src/messaging/inbound/gate.ts

@@ -6,36 +6,7 @@ export type BncrGateResult = { allowed: true } | { allowed: false; reason: strin
 const REQUIRED_PROTOCOL_VERSION = 'scene-routing-v1';
 const REQUIRED_CAPABILITY = 'scene-routing-v1';
 
-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 asCapabilities(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 [];
-}
+import { asBoolean, asString, asStringArray } from '../../core/value-sanitize.ts';
 
 export async function checkBncrMessageGate(params: {
   parsed: BncrInboundParamsInput & {
@@ -57,7 +28,7 @@ export async function checkBncrMessageGate(params: {
   }
 
   const protocolVersion = asString(parsed?.protocolVersion || '').trim();
-  const capabilities = asCapabilities(parsed?.capabilities);
+  const capabilities = asStringArray(parsed?.capabilities);
   if (
     protocolVersion !== REQUIRED_PROTOCOL_VERSION ||
     !capabilities.includes(REQUIRED_CAPABILITY)

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

@@ -1,4 +1,3 @@
-import path from 'node:path';
 import {
   createChannelHistoryWindow,
   DEFAULT_GROUP_HISTORY_LIMIT,
@@ -245,80 +244,6 @@ export function collectBncrHistoryMediaFromEntries(args: {
 }): HistoryMediaEntry[] {
   return args.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 buildBncrHistoryWindowContextFromEntries(args: {
-  entries: readonly BncrHistoryEntry[];
-  channelId: string;
-}) {
-  if (args.entries.length === 0) return undefined;
-  const messages = args.entries.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: {
   historyMap: BncrGroupHistoryMap;
   parsed: ParsedInbound;

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

@@ -21,7 +21,7 @@ export type BncrSceneAdminCommand =
   | { 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 }
+  | { kind: 'download-media-set'; sceneKey: string; enabled: boolean | undefined }
   | { kind: 'download-media-global-get' }
   | { kind: 'download-media-global-set'; enabled: boolean };
 
@@ -132,7 +132,7 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
           return {
             matched: true,
             valid: true,
-            command: { kind: 'mode', sceneKey: '', mode: 'clear' as any },
+            command: { kind: 'mode', sceneKey: '', mode: 'clear' },
           };
         }
         if (args[0] === 'help') {
@@ -159,7 +159,7 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
         return {
           matched: true,
           valid: true,
-          command: { kind: 'mode', sceneKey: args[1], mode: 'clear' as any },
+          command: { kind: 'mode', sceneKey: args[1], mode: 'clear' },
         };
       }
       if (GROUP_REPLY_MODES.has(args[0] as BncrGroupReplyMode) && args[1]) {
@@ -205,7 +205,7 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
           return {
             matched: true,
             valid: true,
-            command: { kind: 'history-limit-set', sceneKey: '', limit: 'clear' as any },
+            command: { kind: 'history-limit-set', sceneKey: '', limit: 'clear' },
           };
         }
         const num = parseInt(args[0], 10);
@@ -227,7 +227,7 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
           return {
             matched: true,
             valid: true,
-            command: { kind: 'history-limit-set', sceneKey: args[1], limit: 'clear' as any },
+            command: { kind: 'history-limit-set', sceneKey: args[1], limit: 'clear' },
           };
         }
         const num = parseInt(args[0], 10);
@@ -253,13 +253,13 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
           return {
             matched: true,
             valid: true,
-            command: { kind: 'history-force-set', sceneKey: '', enabled: 'clear' as any },
+            command: { kind: 'history-force-set', sceneKey: '', enabled: 'clear' },
           };
         }
         return {
           matched: true,
           valid: true,
-          command: { kind: 'history-force-set', sceneKey: args[1], enabled: 'clear' as any },
+          command: { kind: 'history-force-set', sceneKey: args[1], enabled: 'clear' },
         };
       }
       if (args[0] === 'on' || args[0] === 'off') {
@@ -302,7 +302,7 @@ export function parseSceneAdminCommand(command: NativeCommand): ParsedSceneAdmin
           command: {
             kind: 'download-media-set',
             sceneKey: args[1] || '',
-            enabled: undefined as any,
+            enabled: undefined,
           },
         };
       }

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

@@ -6,29 +6,30 @@
  *
  * Format: [BncrParam:{"key":"val","asVoice":true}]
  *
- * Incomplete markers (missing closing ]) are left in text unchanged.
- * Invalid JSON within a complete marker - marker is removed but no params.
+ * - 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:';
 
-export function parseBncrMarker(text: string): {
-  cleanText: string;
-  params: Record<string, unknown>;
-} {
-  const idx = text.indexOf(PREFIX);
-  if (idx === -1) return { cleanText: text, params: {} };
-
-  const start = idx + PREFIX.length;
-  if (start >= text.length) return { cleanText: text, params: {} };
+/**
+ * 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 content) is not mistaken for
+  // ] 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 end = -1;
   let started = false;
 
   for (let i = start; i < text.length; i++) {
@@ -63,29 +64,62 @@ export function parseBncrMarker(text: string): {
         if (depth === 0) {
           // JSON content complete - expect ] to close the marker
           if (i + 1 < text.length && text[i + 1] === ']') {
-            end = i + 1;
+            return i + 1;
           }
-          break;
+          return -1;
         }
       }
     }
   }
 
-  if (end === -1) return { cleanText: text, params: {} };
+  return -1;
+}
 
-  const rawJson = text.slice(start, end);
-  let params: Record<string, unknown> = {};
+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;
+    }
 
-  try {
-    const parsed = JSON.parse(rawJson);
-    if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
-      params = parsed as Record<string, unknown>;
+    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;
     }
-  } catch {
-    // Invalid JSON — remove marker but don't apply params
   }
 
-  const cleanText = (text.slice(0, idx) + text.slice(end + 1)).replace(/ {2,}/g, ' ').trim();
+  // 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 };
 }
 
@@ -103,6 +137,7 @@ const MEDIA_CONSUMPTION_TYPES = new Set(['file', 'image', 'video', 'audio', 'voi
  * based on whether its value is a recognized media type.
  */
 const CONSUMPTION_FIELDS_NO_TYPE = new Set([
+  'ismedia',
   'asVoice',
   'audioAsVoice',
   'kind',
@@ -110,8 +145,6 @@ const CONSUMPTION_FIELDS_NO_TYPE = new Set([
   'downloadMedia',
 ]);
 
-const CONSUMPTION_FIELDS = new Set([...CONSUMPTION_FIELDS_NO_TYPE]);
-
 export function extractConsumptionFields(extra: Record<string, unknown> | undefined): {
   consumed: Partial<{
     asVoice: boolean;
@@ -120,6 +153,7 @@ export function extractConsumptionFields(extra: Record<string, unknown> | undefi
     kind: string;
     replyToId: string;
     downloadMedia: boolean;
+    ismedia: boolean;
   }>;
   remaining: Record<string, unknown>;
 } {
@@ -140,7 +174,7 @@ export function extractConsumptionFields(extra: Record<string, unknown> | undefi
       }
       continue;
     }
-    if (CONSUMPTION_FIELDS.has(key)) {
+    if (CONSUMPTION_FIELDS_NO_TYPE.has(key)) {
       consumed[key] = value;
     } else {
       remaining[key] = value;

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,13 +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 isBncrOutboundMessageType(value: string): value is BncrOutboundMessageType {
   return (
     value === 'text' ||