@xmoxmo/bncr 0.5.7 → 0.5.8

package/package.json

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

package/scripts/check-pack.mjs

@@ -149,11 +149,9 @@ const requiredSourceFiles = [
   'src/plugin/outbox-drain-post-push.ts',
   'src/plugin/outbox-drain-runtime.ts',
   'src/plugin/outbox-drain-schedule.ts',
-  'src/plugin/outbox-file-push-flow.ts',
   'src/plugin/outbox-push-route-runtime-group.ts',
   'src/plugin/outbox-push.ts',
   'src/plugin/outbox-route.ts',
-  'src/plugin/outbox-text-push-flow.ts',
   'src/plugin/runtime-diagnostics-snapshot.ts',
   'src/plugin/setup.ts',
   'src/plugin/state-transient-runtime-group.ts',

package/scripts/selfcheck.mjs

@@ -44,7 +44,6 @@ const requiredSourceFiles = [
   'src/core/outbox-summary.ts',
   'src/core/outbox-text-push-failure.ts',
   'src/core/outbox-text-push-guards.ts',
-  'src/core/outbox-text-push-prep.ts',
   'src/core/outbox-text-push-success.ts',
   'src/core/permissions.ts',
   'src/core/persisted-outbox-entry.ts',
@@ -145,11 +144,9 @@ const requiredSourceFiles = [
   'src/plugin/outbox-drain-post-push.ts',
   'src/plugin/outbox-drain-runtime.ts',
   'src/plugin/outbox-drain-schedule.ts',
-  'src/plugin/outbox-file-push-flow.ts',
   'src/plugin/outbox-push-route-runtime-group.ts',
   'src/plugin/outbox-push.ts',
   'src/plugin/outbox-route.ts',
-  'src/plugin/outbox-text-push-flow.ts',
   'src/plugin/runtime-diagnostics-snapshot.ts',
   'src/plugin/setup.ts',
   'src/plugin/state-transient-runtime-group.ts',

package/src/bootstrap/runtime-loader.ts

@@ -44,7 +44,7 @@ export const pluginRoot = resolveBncrPluginRoot(pluginFile);
 const runtimeSourceDir = resolveBncrRuntimeSourceDir(pluginDir);
 let runtime: LoadedRuntime | null = null;
 
-export const readPluginVersion = (rootDir = pluginRoot) => {
+const readPluginVersion = (rootDir = pluginRoot) => {
   try {
     const raw = fs.readFileSync(path.join(rootDir, 'package.json'), 'utf8');
     const parsed = JSON.parse(raw);

package/src/channel.ts

@@ -19,10 +19,7 @@ import {
   emitBncrLog,
   summarizeBncrTextPreview,
 } from './core/logging.ts';
-import {
-  buildFileTransferOutboxEntry as buildFileTransferOutboxEntryFromRuntime,
-  buildTextOutboxEntry as buildTextOutboxEntryFromRuntime,
-} from './core/outbox-entry-builders.ts';
+import { buildOutboxEntry as buildOutboxEntryFromRuntime } from './core/outbox-entry-builders.ts';
 import { summarizeOutboxEntry } from './core/outbox-summary.ts';
 import { normalizePersistedOutboxEntry as normalizePersistedOutboxEntryFromRuntime } from './core/persisted-outbox-entry.ts';
 import {
@@ -53,7 +50,6 @@ import { OUTBOUND_FLUSH_REASON, OUTBOUND_FLUSH_TRIGGER } from './messaging/outbo
 import type {
   NormalizedReplyPayload,
   OutboundReplyTargetPolicy,
-  ReplyMediaEntriesParams,
   ReplyPayloadInput,
 } from './messaging/outbound/reply-enqueue.ts';
 import type { OpenClawChannelRuntimeApiHolder } from './openclaw/channel-runtime-contracts.ts';
@@ -67,7 +63,6 @@ import { createBncrBridgeConnectionFacade } from './plugin/bridge-connection-fac
 import { createBncrBridgeDiagnosticsFacade } from './plugin/bridge-diagnostics-facade.ts';
 import { createBncrBridgeDrainFacade } from './plugin/bridge-drain-facade.ts';
 import { createBncrBridgeExtendedDiagnosticsFacade } from './plugin/bridge-extended-diagnostics-facade.ts';
-import { createBncrBridgeFileTransferPushFacade } from './plugin/bridge-file-transfer-push-facade.ts';
 import {
   cleanupBncrBridgeRuntime,
   shutdownBncrBridgeService,
@@ -175,9 +170,9 @@ import { createBncrInboundSurfaceHandlersGroup } from './plugin/inbound-surface-
 import { createBncrMediaOrchestratorsRuntimeGroup } from './plugin/media-orchestrators-runtime-group.ts';
 import { BNCR_CHANNEL_META } from './plugin/meta.ts';
 import type { BncrOutboxAckOkTelemetryPatch } from './plugin/outbox-ack-outcome.ts';
-import { runBncrFileTransferOutboxPush } from './plugin/outbox-file-push-flow.ts';
+
 import { createBncrOutboxPushRouteRuntimeGroup } from './plugin/outbox-push-route-runtime-group.ts';
-import { runBncrTextOutboxPush } from './plugin/outbox-text-push-flow.ts';
+import { runBncrOutboxPush } from './plugin/outbox-unified-push-flow.ts';
 import {
   createBncrDeadLetterDiagnosticsHelpers,
   createBncrDiagnosticsSelectionHelpers,
@@ -1131,83 +1126,53 @@ class BncrBridgeRuntime {
   // This block prepares media, chooses transfer mode, sends chunk/complete
   // frames, and feeds successful media pushes back into the shared outbox path.
 
-  private async pushFileTransferSuccessPath(args: {
-    entry: OutboxEntry;
-    msg: Record<string, unknown>;
-    owner: ReturnType<BncrBridgeRuntime['resolveOutboxPushOwner']>;
-    connIds: Iterable<string>;
-    recentInboundReachable: boolean;
-    routeReason: string;
-    mediaUrl: string;
-  }): Promise<void> {
-    await this.fileTransferPushFacade.pushFileTransferSuccessPath(args);
-  }
-
   private handleFileTransferPushFailure(args: { entry: OutboxEntry; error: unknown }) {
-    this.fileTransferPushFacade.handleFileTransferPushFailure(args);
+    this.outboxPush.handleFileTransferPushFailure(args);
   }
 
   private handleFileTransferPushGuardFailure(
-    args: Parameters<typeof this.fileTransferPushFacade.handleFileTransferPushGuardFailure>[0],
+    args: Parameters<typeof this.outboxPush.handleFileTransferPushGuardFailure>[0],
   ) {
-    this.fileTransferPushFacade.handleFileTransferPushGuardFailure(args);
+    this.outboxPush.handleFileTransferPushGuardFailure(args);
   }
 
   // File-transfer outbound entry builders / dedupe -------------------------
 
-  private async tryPushFileTransferEntry(
-    entry: OutboxEntry,
-    msg: Record<string, unknown>,
-  ): Promise<boolean> {
-    return await runBncrFileTransferOutboxPush({
-      entry,
-      msg,
-      gatewayContext: this.gatewayContext,
-      owner: this.resolveOutboxPushOwner(entry.accountId),
-      resolvePushConnIds: (accountId) => this.resolvePushConnIds(accountId),
-      resolveRecentInboundConnIds: (accountId) => this.resolveRecentInboundConnIds(accountId),
-      hasRecentInboundReachability: (accountId) => this.hasRecentInboundReachability(accountId),
-      isRevalidatedAttemptedConn: (connId) => this.isRevalidatedAttemptedConn(entry, connId),
-      handleFileTransferPushGuardFailure: (flowArgs) =>
-        this.handleFileTransferPushGuardFailure(flowArgs),
-      pushFileTransferSuccessPath: (flowArgs) => this.pushFileTransferSuccessPath(flowArgs),
-      handleFileTransferPushFailure: (flowArgs) => this.handleFileTransferPushFailure(flowArgs),
-    });
-  }
-
-  private buildFileTransferOutboxEntry(params: {
+  private buildOutboxEntry(params: {
     accountId: string;
     sessionKey: string;
     route: BncrRoute;
-    mediaUrl: string;
-    mediaLocalRoots?: readonly string[];
-    text?: string;
-    asVoice?: boolean;
-    audioAsVoice?: boolean;
     type?: string;
-    extra?: Record<string, unknown>;
+    msg: string;
     kind?: 'tool' | 'block' | 'final';
     replyToId?: string;
     replyTargetPolicy?: OutboundReplyTargetPolicy;
+    extra?: Record<string, unknown>;
+    transferMode?: 'text' | 'media';
+    mediaUrl?: string;
+    mediaLocalRoots?: readonly string[];
+    asVoice?: boolean;
+    audioAsVoice?: boolean;
     downloadMedia?: boolean;
   }): OutboxEntry {
-    return buildFileTransferOutboxEntryFromRuntime({
+    return buildOutboxEntryFromRuntime({
       createMessageId: () => randomUUID(),
       now,
       normalizeAccountId,
       accountId: params.accountId,
       sessionKey: params.sessionKey,
       route: params.route,
-      mediaUrl: params.mediaUrl,
-      mediaLocalRoots: params.mediaLocalRoots,
-      text: asString(params.text || ''),
-      asVoice: params.asVoice,
-      audioAsVoice: params.audioAsVoice,
       type: params.type,
-      extra: params.extra,
+      msg: params.msg,
       kind: params.kind,
       replyToId: asString(params.replyToId || '').trim() || undefined,
       replyTargetPolicy: params.replyTargetPolicy,
+      extra: params.extra,
+      transferMode: params.transferMode,
+      mediaUrl: params.mediaUrl,
+      mediaLocalRoots: params.mediaLocalRoots,
+      asVoice: params.asVoice,
+      audioAsVoice: params.audioAsVoice,
       downloadMedia: params.downloadMedia,
     });
   }
@@ -1321,66 +1286,8 @@ class BncrBridgeRuntime {
   // This is the core outbound state machine: build entries, enqueue them,
   // push them, observe ACK outcomes, and terminate in retry or dead-letter.
 
-  private buildTextOutboxEntry(params: {
-    accountId: string;
-    sessionKey: string;
-    route: BncrRoute;
-    text: string;
-    extra?: Record<string, unknown>;
-    kind?: 'tool' | 'block' | 'final';
-    replyToId?: string;
-    replyTargetPolicy?: OutboundReplyTargetPolicy;
-  }): OutboxEntry {
-    return buildTextOutboxEntryFromRuntime({
-      createMessageId: () => randomUUID(),
-      now,
-      normalizeAccountId,
-      accountId: params.accountId,
-      sessionKey: params.sessionKey,
-      route: params.route,
-      text: params.text,
-      extra: params.extra && Object.keys(params.extra).length > 0 ? { ...params.extra } : undefined,
-      kind: params.kind,
-      replyToId: params.replyToId,
-      replyTargetPolicy: params.replyTargetPolicy,
-    });
-  }
-
   private async tryPushEntry(entry: OutboxEntry): Promise<boolean> {
-    const msg =
-      isPlainObject(entry.payload) &&
-      isPlainObject((entry.payload as Record<string, unknown>).message)
-        ? ((entry.payload as Record<string, unknown>).message as Record<string, unknown>)
-        : null;
-    if (msg?.transferMode === 'media') {
-      return this.tryPushFileTransferEntry(entry, msg);
-    }
-    return this.tryPushTextEntry(entry);
-  }
-
-  private pushTextSuccessPath(args: {
-    entry: OutboxEntry;
-    owner: ReturnType<BncrBridgeRuntime['resolveOutboxPushOwner']>;
-    connIds: Iterable<string>;
-    recentInboundReachable: boolean;
-    routeReason: string;
-    ownerConnId?: string;
-  }) {
-    this.outboxPush.pushTextSuccessPath(args);
-  }
-
-  private handleTextPushFailure(args: { entry: OutboxEntry; error: unknown }) {
-    this.outboxPush.handleTextPushFailure(args);
-  }
-
-  // Text outbound push runtime bridge --------------------------------------
-
-  // Outbound diagnostics/logging helpers -----------------------------------
-  // Keep the compact logging helpers adjacent to the outbound state machine so
-  // queue transitions and emitted diagnostics remain easy to correlate.
-
-  private async tryPushTextEntry(entry: OutboxEntry): Promise<boolean> {
-    return await runBncrTextOutboxPush({
+    return runBncrOutboxPush({
       entry,
       gatewayContext: this.gatewayContext,
       owner: this.resolveOutboxPushOwner(entry.accountId),
@@ -1390,11 +1297,34 @@ class BncrBridgeRuntime {
       isRevalidatedAttemptedConn: (connId) => this.isRevalidatedAttemptedConn(entry, connId),
       recordOutboxPrePushFailure: (flowArgs) => this.recordOutboxPrePushFailure(flowArgs),
       logOutboxPushSkip: (flowArgs) => this.logOutboxPushSkip(flowArgs),
-      pushTextSuccessPath: (flowArgs) => this.pushTextSuccessPath(flowArgs),
+      handleFileTransferPushGuardFailure: (flowArgs) =>
+        this.handleFileTransferPushGuardFailure(flowArgs),
       handleTextPushFailure: (flowArgs) => this.handleTextPushFailure(flowArgs),
+      handleFileTransferPushFailure: (flowArgs) => this.handleFileTransferPushFailure(flowArgs),
+      // Unified push deps
+      pushEvent: BNCR_PUSH_EVENT,
+      gatewayBroadcastToConnIds: (event, payload, connIds) =>
+        this.gatewayContext?.broadcastToConnIds(event, payload, connIds),
+      recordOutboxPushSuccess: (args) => this.recordOutboxPushSuccess(args),
+      logOutboxRouteSelect: (args) => this.logOutboxRouteSelect(args),
+      logOutboxPushOkSummary: (mid) => this.logOutboxPushOkSummary(mid),
+      logOutboundSummary: (entry) => this.logOutboundSummary(entry),
+      logOutboxPushOk: (args) => this.logOutboxPushOk(args),
+      transferMediaToBncrClient: (params) => this.transferMediaToBncrClient(params),
+      buildFileTransferOutboundFrame: (params) => this.buildFileTransferOutboundFrame(params),
     });
   }
 
+  private handleTextPushFailure(args: { entry: OutboxEntry; error: unknown }) {
+    this.outboxPush.handleTextPushFailure(args);
+  }
+
+  // Text outbound push runtime bridge --------------------------------------
+
+  // Outbound diagnostics/logging helpers -----------------------------------
+  // Keep the compact logging helpers adjacent to the outbound state machine so
+  // queue transitions and emitted diagnostics remain easy to correlate.
+
   private logOutboxPushSkip(args: {
     messageId: string;
     accountId: string;
@@ -2734,8 +2664,7 @@ class BncrBridgeRuntime {
     logInfo: (scope, message, options) => this.logInfo(scope, message, options),
     logEnqueueFromReply: (args) => this.logEnqueueFromReply(args),
     enqueueOutbound: (entry) => this.enqueueOutbound(entry),
-    buildTextOutboxEntry: (args) => this.buildTextOutboxEntry(args),
-    buildFileTransferOutboxEntry: (args) => this.buildFileTransferOutboxEntry(args),
+    buildOutboxEntry: (args) => this.buildOutboxEntry(args),
     rememberRecentMediaSend: (args) => this.rememberRecentMediaSend(args),
     tryBuildMediaDedupeFallback: (args) => this.tryBuildMediaDedupeFallback(args),
   });
@@ -2789,7 +2718,7 @@ class BncrBridgeRuntime {
     mediaLocalRoots?: readonly string[];
     replyTargetPolicy?: OutboundReplyTargetPolicy;
   }) {
-    this.bridgeMediaFacade.enqueueFromReply(params);
+    return this.bridgeMediaFacade.enqueueFromReply(params);
   }
 
   private logEnqueueFromReply(args: {
@@ -2829,24 +2758,6 @@ class BncrBridgeRuntime {
     normalizeAccountId,
   });
 
-  private readonly fileTransferPushFacade = createBncrBridgeFileTransferPushFacade({
-    pushEvent: BNCR_PUSH_EVENT,
-    getGatewayContext: () => this.gatewayContext,
-    transferMediaToBncrClient: (params) => this.transferMediaToBncrClient(params),
-    buildFileTransferOutboundFrame: (params) => this.buildFileTransferOutboundFrame(params),
-    logOutboxRouteSelect: (args) => this.logOutboxRouteSelect(args),
-    recordOutboxPushSuccess: (args) => this.recordOutboxPushSuccess(args),
-    logOutboxPushOkSummary: (messageId) => this.logOutboxPushOkSummary(messageId),
-    logOutboxPushOk: (args) => this.logOutboxPushOk(args),
-    handleFileTransferPushFailure: (args) => this.outboxPush.handleFileTransferPushFailure(args),
-    handleFileTransferPushGuardFailure: (args) =>
-      this.outboxPush.handleFileTransferPushGuardFailure(args),
-  });
-
-  private enqueueReplyMediaEntries(params: ReplyMediaEntriesParams) {
-    this.bridgeMediaFacade.enqueueReplyMediaEntries(params);
-  }
-
   // Surface runtime assembly -----------------------------------------------
   // The bridge remains the ownership root, but these builders keep the final
   // gateway/inbound/channel send wiring readable by concern instead of as one

package/src/core/connection-reachability.ts

@@ -141,7 +141,7 @@ function scoreOutboundPushConnection(args: {
   };
 }
 
-export function compareOutboundPushConnections(args: {
+function compareOutboundPushConnections(args: {
   a: BncrConnection;
   b: BncrConnection;
   now: number;

package/src/core/logging.ts

@@ -117,7 +117,7 @@ function sanitizeDebugValue(key: string, value: unknown): unknown {
   return value;
 }
 
-export function sanitizeBncrDebugPayload(payload: Record<string, unknown>) {
+function sanitizeBncrDebugPayload(payload: Record<string, unknown>) {
   return sanitizeDebugPayload(payload);
 }
 

package/src/core/outbox-entry-builders.ts

@@ -12,27 +12,67 @@ function sanitizeExtraSpread(extra: Record<string, unknown>): Record<string, unk
   return out;
 }
 
-export function buildFileTransferOutboxEntry(args: {
+export type BuildOutboxEntryParams = {
   createMessageId: () => string;
   now: () => number;
   normalizeAccountId: (accountId?: string | null) => string;
   accountId: string;
   sessionKey: string;
   route: BncrRoute;
-  mediaUrl: string;
-  mediaLocalRoots?: readonly string[];
-  text: string;
-  asVoice?: boolean;
-  audioAsVoice?: boolean;
+  /** For text sends this is 'text'; for media it may be undefined (inferred downstream). */
   type?: string;
-  extra?: Record<string, unknown>;
+  /** Message body (text content for text sends, caption for media sends). */
+  msg: string;
   kind?: 'tool' | 'block' | 'final';
   replyToId?: string;
   replyTargetPolicy?: OutboundReplyTargetPolicy;
+  extra?: Record<string, unknown>;
+  /** Media-only fields. When transferMode === 'media' these shape the frame. */
+  transferMode?: 'text' | 'media';
+  mediaUrl?: string;
+  mediaLocalRoots?: readonly string[];
+  asVoice?: boolean;
+  audioAsVoice?: boolean;
   downloadMedia?: boolean;
-}): OutboxEntry {
+};
+
+/**
+ * Unified outbox entry builder.
+ *
+ * Text and media sends share the same outbox lifecycle (queue, drain, retry).
+ * The only structural difference is that media entries carry extra media fields
+ * and set `transferMode: 'media'` so the push layer knows to process media.
+ *
+ * - **Text**: `{ type: 'text', transferMode: undefined, no media fields }`
+ * - **Media**: `{ type: args.type || undefined, transferMode: 'media', ...media fields }`
+ */
+export function buildOutboxEntry(args: BuildOutboxEntryParams): OutboxEntry {
   const messageId = args.createMessageId();
   const createdAt = args.now();
+  const isMedia = args.transferMode === 'media';
+
+  const message: Record<string, unknown> = {
+    platform: args.route.platform,
+    groupId: args.route.groupId,
+    userId: args.route.userId,
+    type: isMedia ? args.type : 'text',
+    kind: args.kind,
+    msg: args.msg,
+    path: '',
+    base64: '',
+    fileName: '',
+    ...(args.extra ? sanitizeExtraSpread(args.extra) : {}),
+  };
+
+  if (isMedia) {
+    message.mediaUrl = args.mediaUrl || '';
+    if (args.mediaLocalRoots) message.mediaLocalRoots = Array.from(args.mediaLocalRoots);
+    message.asVoice = args.asVoice === true;
+    message.audioAsVoice = args.audioAsVoice === true;
+    message.downloadMedia = args.downloadMedia;
+    message.transferMode = 'media';
+  }
+
   return {
     messageId,
     accountId: args.normalizeAccountId(args.accountId),
@@ -49,84 +89,22 @@ export function buildFileTransferOutboxEntry(args: {
           replyToId: args.replyToId,
           replyTargetPolicy: args.replyTargetPolicy,
         }) || undefined,
-      message: {
-        platform: args.route.platform,
-        groupId: args.route.groupId,
-        userId: args.route.userId,
-        type: args.type,
-        // No fallback: when type is not provided the downstream adapter
-        // (tgBot / GewePlus) infers from mediaUrl extension.
-        kind: args.kind,
-        msg: args.text,
-        mediaUrl: args.mediaUrl,
-        mediaLocalRoots: args.mediaLocalRoots ? Array.from(args.mediaLocalRoots) : undefined,
-        asVoice: args.asVoice === true,
-        audioAsVoice: args.audioAsVoice === true,
-        downloadMedia: args.downloadMedia,
-        transferMode: 'media',
-        path: '',
-        base64: '',
-        fileName: '',
-        ...(args.extra ? sanitizeExtraSpread(args.extra) : {}),
+      message: message as {
+        platform: string;
+        groupId: string;
+        userId: string;
+        type?: string;
+        kind?: 'tool' | 'block' | 'final';
+        msg: string;
+        path: string;
+        base64: string;
+        fileName: string;
+        [key: string]: unknown;
       },
+      ts: createdAt,
     },
     createdAt,
     retryCount: 0,
     nextAttemptAt: createdAt,
   };
 }
-
-export function buildTextOutboxEntry(args: {
-  createMessageId: () => string;
-  now: () => number;
-  normalizeAccountId: (accountId?: string | null) => string;
-  accountId: string;
-  extra?: Record<string, unknown>;
-  sessionKey: string;
-  route: BncrRoute;
-  text: string;
-  kind?: 'tool' | 'block' | 'final';
-  replyToId?: string;
-  replyTargetPolicy?: OutboundReplyTargetPolicy;
-}): OutboxEntry {
-  const messageId = args.createMessageId();
-  const createdAt = args.now();
-  const frame = {
-    type: 'message.outbound',
-    messageId,
-    idempotencyKey: messageId,
-    sessionKey: args.sessionKey,
-    replyToId:
-      normalizeOutboundReplyToId({
-        kind: args.kind,
-        replyToId: args.replyToId,
-        replyTargetPolicy: args.replyTargetPolicy,
-      }) || undefined,
-    message: {
-      platform: args.route.platform,
-      groupId: args.route.groupId,
-      userId: args.route.userId,
-      type: 'text',
-      kind: args.kind,
-      msg: args.text,
-      path: '',
-      base64: '',
-      fileName: '',
-      // Extra fields from marker/pipeline spread for adapter-specific data
-      // (e.g. type="appmsg", msg="<appmsg>..." from [BncrParam:...])
-      ...(args.extra ? sanitizeExtraSpread(args.extra) : {}),
-    },
-    ts: createdAt,
-  };
-
-  return {
-    messageId,
-    accountId: args.normalizeAccountId(args.accountId),
-    sessionKey: args.sessionKey,
-    route: args.route,
-    payload: frame,
-    createdAt,
-    retryCount: 0,
-    nextAttemptAt: createdAt,
-  };
-}

package/src/core/outbox-summary.ts

@@ -1,26 +1,6 @@
 import type { OutboxEntry } from './types.ts';
 
-type OutboxSummaryMessage = {
-  type?: unknown;
-  msg?: unknown;
-  mediaUrl?: unknown;
-  audioAsVoice?: boolean;
-  asVoice?: boolean;
-};
-
-type OutboxSummaryPayload = {
-  type?: unknown;
-  message?: OutboxSummaryMessage;
-};
-
-function inferMediaTypeFromUrl(raw: string): 'image' | 'video' | 'audio' | 'file' {
-  const clean = String(raw || '').split(/[?#]/, 1)[0] || '';
-  const ext = clean.includes('.') ? clean.slice(clean.lastIndexOf('.') + 1).toLowerCase() : '';
-  if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'bmp', 'heic', 'heif'].includes(ext)) return 'image';
-  if (['mp4', 'mov', 'mkv', 'webm', 'avi', 'm4v'].includes(ext)) return 'video';
-  if (['mp3', 'wav', 'ogg', 'oga', 'opus', 'm4a', 'aac', 'flac'].includes(ext)) return 'audio';
-  return 'file';
-}
+type OutboxSummaryMessage = { type?: unknown; msg?: unknown; mediaUrl?: unknown };
 
 function filenameFromUrl(raw: string): string {
   const clean = String(raw || '').split(/[?#]/, 1)[0] || '';
@@ -33,27 +13,13 @@ function filenameFromUrl(raw: string): string {
   }
 }
 
-function summarizeOutboxType(
-  payload: OutboxSummaryPayload,
-  msg: OutboxSummaryMessage,
-  asString: (value: unknown) => string,
-) {
-  const directType = asString(msg.type || '');
-  if (directType) return directType;
-  // Infer type from mediaUrl when no direct type is set
-  const mediaUrl = asString(msg.mediaUrl || '');
-  if (mediaUrl) {
-    if (msg.audioAsVoice === true || msg.asVoice === true) return 'voice';
-    const inferred = inferMediaTypeFromUrl(mediaUrl);
-    if (inferred) return inferred;
-  }
-  return asString(payload?.type || 'unknown');
+function summarizeOutboxType(msg: OutboxSummaryMessage, asString: (value: unknown) => string) {
+  return asString(msg.type || '') || 'unknown';
 }
 
 function summarizeOutboxText(msg: OutboxSummaryMessage, asString: (value: unknown) => string) {
   const text = asString(msg.msg || '').trim();
   if (text) return text;
-  // Fall back to filename from mediaUrl when no caption is set
   const mediaUrl = asString(msg.mediaUrl || '');
   if (mediaUrl) return filenameFromUrl(mediaUrl);
   return '';
@@ -65,9 +31,9 @@ export function summarizeOutboxEntry(args: {
   formatDisplayScope: (route: OutboxEntry['route']) => string;
   summarizeTextPreview: (raw: string, limit?: number) => string;
 }) {
-  const payload = args.entry.payload as OutboxSummaryPayload;
+  const payload = args.entry.payload as { message?: OutboxSummaryMessage } | undefined;
   const msg = payload?.message || {};
-  const type = summarizeOutboxType(payload, msg, args.asString);
+  const type = summarizeOutboxType(msg, args.asString);
   const text = summarizeOutboxText(msg, args.asString);
   const preview = args.summarizeTextPreview(text);
   return [type, args.formatDisplayScope(args.entry.route), preview].join('|');

package/src/core/permissions.ts

@@ -10,7 +10,7 @@ type BncrElevatedConfigRoot = {
     };
   };
 };
-export function getBncrElevatedConfig(rootCfg: BncrElevatedConfigRoot | null | undefined) {
+function getBncrElevatedConfig(rootCfg: BncrElevatedConfigRoot | null | undefined) {
   const elevated = rootCfg?.tools?.elevated || {};
   const allowFrom = elevated?.allowFrom || {};
   const bncrRules = Array.isArray(allowFrom?.bncr)

package/src/core/register-trace.ts

@@ -43,7 +43,7 @@ export type RegisterDriftSnapshot = {
   traceRecent: Array<Record<string, unknown>>;
 };
 
-export function classifyRegisterTrace(stack: string) {
+function classifyRegisterTrace(stack: string) {
   if (
     stack.includes('prepareSecretsRuntimeSnapshot') ||
     stack.includes('resolveRuntimeWebTools') ||
@@ -66,7 +66,7 @@ export function classifyRegisterTrace(stack: string) {
   return 'other';
 }
 
-export function dominantRegisterBucket(sourceBuckets: Record<string, number>) {
+function dominantRegisterBucket(sourceBuckets: Record<string, number>) {
   let winner: string | null = null;
   let winnerCount = -1;
   for (const [bucket, count] of Object.entries(sourceBuckets)) {

package/src/messaging/inbound/parse.ts

@@ -58,7 +58,7 @@ function asInboundMediaItems(params: BncrInboundParamsInput): BncrInboundMediaIt
   }));
 }
 
-export function inboundDedupKey(params: {
+function inboundDedupKey(params: {
   accountId: string;
   platform: string;
   groupId: string;

package/src/messaging/outbound/diagnostics-debug-builders.ts

@@ -348,18 +348,3 @@ export function buildPushFailureDebugInfo(args: {
       (typeof args.lastError === 'string' && args.lastError) || OUTBOUND_TERMINAL_REASON.PUSH_RETRY,
   };
 }
-
-export function buildReplyMediaFallbackDebugInfo(args: {
-  sessionKey: string;
-  mediaUrl: string;
-  replyToId: string;
-  fallback: { text: string; reason: string };
-}) {
-  return {
-    sessionKey: args.sessionKey,
-    mediaUrl: args.mediaUrl,
-    replyToId: args.replyToId || undefined,
-    fallbackText: args.fallback.text,
-    reason: args.fallback.reason,
-  };
-}

package/src/messaging/outbound/diagnostics.ts

@@ -17,7 +17,6 @@ export {
   buildOutboxRouteSelectDebugInfo,
   buildOutboxScheduleDebugInfo,
   buildPushFailureDebugInfo,
-  buildReplyMediaFallbackDebugInfo,
   buildRetryRerouteDebugInfo,
 } from './diagnostics-debug-builders.ts';