@xmoxmo/bncr 0.5.6 → 0.5.8

package/dist/index.js

@@ -1,6 +1,3 @@
-// index.ts
-import path3 from "node:path";
-
 // src/bootstrap/channel-plugin-runtime.ts
 function createDynamicChannelPlugin(args) {
   const { loaded, getCurrentBridge: getCurrentBridge2 } = args;
@@ -786,12 +783,7 @@ var BncrConfigSchema = {
 };
 
 // index.ts
-var readPluginVersion2 = (rootDir = pluginRoot) => {
-  const packageJsonPath = path3.join(rootDir, "package.json");
-  void packageJsonPath;
-  return pluginVersion;
-};
-var pluginVersion2 = readPluginVersion2();
+var pluginVersion2 = pluginVersion;
 var registerRuntime = createBncrRegisterRuntime();
 var {
   ensureGatewayMethodRegistered,

package/index.ts

@@ -1,4 +1,3 @@
-import path from 'node:path';
 import { createDynamicChannelPlugin } from './src/bootstrap/channel-plugin-runtime.ts';
 import {
   type BncrRegistrationApi,
@@ -10,7 +9,6 @@ import {
   type ChannelModule,
   type LoadedRuntime,
   loadBncrRuntimeSync,
-  pluginRoot,
   pluginVersion as runtimePluginVersion,
 } from './src/bootstrap/runtime-loader.ts';
 import { BncrConfigSchema } from './src/core/config-schema.ts';
@@ -19,13 +17,7 @@ import { getOpenClawRuntimeConfig } from './src/openclaw/config-runtime.ts';
 
 type ChannelPlugin = ReturnType<ChannelModule['createBncrChannelPlugin']>;
 
-const readPluginVersion = (rootDir = pluginRoot) => {
-  const packageJsonPath = path.join(rootDir, 'package.json');
-  void packageJsonPath;
-  return runtimePluginVersion;
-};
-
-const pluginVersion = readPluginVersion();
+const pluginVersion = runtimePluginVersion;
 
 const registerRuntime = createBncrRegisterRuntime();
 

package/package.json

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

package/scripts/check-pack.mjs

@@ -76,10 +76,8 @@ const requiredSourceFiles = [
   'src/messaging/inbound/session-label.ts',
   'src/messaging/inbound/turn-context.ts',
   'src/messaging/outbound/actions.ts',
-  'src/messaging/outbound/build-send-action.ts',
   'src/messaging/outbound/diagnostics.ts',
   'src/messaging/outbound/diagnostics-debug-builders.ts',
-  'src/messaging/outbound/durable-message-adapter.ts',
   'src/messaging/outbound/durable-queue-adapter.ts',
   'src/messaging/outbound/media-dedupe.ts',
   'src/messaging/outbound/media.ts',
@@ -88,13 +86,10 @@ const requiredSourceFiles = [
   'src/messaging/outbound/reply-enqueue.ts',
   'src/messaging/outbound/reply-target-policy.ts',
   'src/messaging/outbound/retry-policy.ts',
-  'src/messaging/outbound/send-params.ts',
-  'src/messaging/outbound/send.ts',
   'src/messaging/outbound/session-route.ts',
   'src/messaging/outbound/target-resolver.ts',
   'src/openclaw/config-runtime.ts',
   'src/openclaw/inbound-session-runtime.ts',
-  'src/openclaw/ingress-runtime.ts',
   'src/openclaw/media-runtime.ts',
   'src/openclaw/reply-runtime.ts',
   'src/openclaw/routing-runtime.ts',
@@ -111,7 +106,6 @@ const requiredSourceFiles = [
   'src/plugin/channel-plugin-surface-group.ts',
   'src/plugin/channel-runtime-constants.ts',
   'src/plugin/channel-runtime-builders.ts',
-  'src/plugin/channel-send-runtime-group.ts',
   'src/plugin/channel-runtime-types.ts',
   'src/plugin/channel-send.ts',
   'src/plugin/channel-utils.ts',
@@ -155,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',
@@ -72,10 +71,8 @@ const requiredSourceFiles = [
   'src/messaging/inbound/session-label.ts',
   'src/messaging/inbound/turn-context.ts',
   'src/messaging/outbound/actions.ts',
-  'src/messaging/outbound/build-send-action.ts',
   'src/messaging/outbound/diagnostics.ts',
   'src/messaging/outbound/diagnostics-debug-builders.ts',
-  'src/messaging/outbound/durable-message-adapter.ts',
   'src/messaging/outbound/durable-queue-adapter.ts',
   'src/messaging/outbound/media-dedupe.ts',
   'src/messaging/outbound/media.ts',
@@ -84,13 +81,10 @@ const requiredSourceFiles = [
   'src/messaging/outbound/reply-enqueue.ts',
   'src/messaging/outbound/reply-target-policy.ts',
   'src/messaging/outbound/retry-policy.ts',
-  'src/messaging/outbound/send-params.ts',
-  'src/messaging/outbound/send.ts',
   'src/messaging/outbound/session-route.ts',
   'src/messaging/outbound/target-resolver.ts',
   'src/openclaw/config-runtime.ts',
   'src/openclaw/inbound-session-runtime.ts',
-  'src/openclaw/ingress-runtime.ts',
   'src/openclaw/media-runtime.ts',
   'src/openclaw/reply-runtime.ts',
   'src/openclaw/routing-runtime.ts',
@@ -107,7 +101,6 @@ const requiredSourceFiles = [
   'src/plugin/channel-plugin-surface-group.ts',
   'src/plugin/channel-runtime-constants.ts',
   'src/plugin/channel-runtime-builders.ts',
-  'src/plugin/channel-send-runtime-group.ts',
   'src/plugin/channel-runtime-types.ts',
   'src/plugin/channel-send.ts',
   'src/plugin/channel-utils.ts',
@@ -151,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',
@@ -198,7 +189,6 @@ const readNpmLatestVersion = (packageName) => {
 
 const requiredOpenClawSdkSubpaths = [
   'openclaw/plugin-sdk',
-  'openclaw/plugin-sdk/boolean-param',
   'openclaw/plugin-sdk/channel-outbound',
   'openclaw/plugin-sdk/channel-ingress-runtime',
   'openclaw/plugin-sdk/channel-message',

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,
@@ -152,10 +147,9 @@ import type {
   BncrChannelConfigRoot,
   BncrChannelSendContext,
   BncrSceneRecord,
-  FileAckPayloadState,
   PersistedState,
 } from './plugin/channel-runtime-types.ts';
-import { createBncrChannelSendRuntimeGroup } from './plugin/channel-send-runtime-group.ts';
+import { createBncrChannelSendRuntime } from './plugin/channel-send.ts';
 import {
   asString,
   backoffMs,
@@ -168,6 +162,7 @@ import {
 } from './plugin/channel-utils.ts';
 import { BNCR_CONFIG_SURFACE } from './plugin/config.ts';
 import { createBncrConnectionStateRuntimeGroup } from './plugin/connection-state-runtime-group.ts';
+import type { FileAckPayloadState } from './plugin/file-ack-runtime.ts';
 import { createBncrFileTransferRuntimeGroup } from './plugin/file-transfer-runtime-group.ts';
 import { BNCR_GATEWAY_METHODS } from './plugin/gateway-methods.ts';
 import { prepareBncrInboundAcceptance } from './plugin/inbound-acceptance.ts';
@@ -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,85 +1126,54 @@ 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;
-    meta: 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,
-    meta: Record<string, unknown>,
-  ): Promise<boolean> {
-    return await runBncrFileTransferOutboxPush({
-      entry,
-      meta,
-      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,
-      pushEvent: BNCR_PUSH_EVENT,
       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,
-      downloadMedia: params.downloadMedia === true ? true : undefined,
+      extra: params.extra,
+      transferMode: params.transferMode,
+      mediaUrl: params.mediaUrl,
+      mediaLocalRoots: params.mediaLocalRoots,
+      asVoice: params.asVoice,
+      audioAsVoice: params.audioAsVoice,
+      downloadMedia: params.downloadMedia,
     });
   }
 
@@ -1243,29 +1207,55 @@ class BncrBridgeRuntime {
 
   private buildFileTransferOutboundFrame(params: {
     entry: OutboxEntry;
-    meta: Record<string, unknown>;
+    msg: Record<string, unknown>;
     media: { fileName?: string; mimeType?: string; path?: string; base64?: string; type?: string };
     mediaUrl: string;
   }) {
-    const wantsVoice = params.meta.asVoice === true || params.meta.audioAsVoice === true;
-    const messageKind =
-      params.meta.messageKind === 'tool' ||
-      params.meta.messageKind === 'block' ||
-      params.meta.messageKind === 'final'
-        ? params.meta.messageKind
+    const wantsVoice = params.msg.asVoice === true || params.msg.audioAsVoice === true;
+    const rawKind = params.msg.kind ?? (params.msg as Record<string, unknown>).messageKind;
+    const messageKind: 'tool' | 'block' | 'final' | undefined =
+      rawKind === 'tool' || rawKind === 'block' || rawKind === 'final'
+        ? (rawKind as 'tool' | 'block' | 'final')
         : undefined;
 
     const hasPayload = !!(params.media.base64 || params.media.path);
-    if (hasPayload) {
-      console.log(
-        '[bncr] outbound-media download=true|media=' +
-          (params.media.path || `base64:${(params.media.base64 || '').substring(0, 12)}...`) +
-          '|url=' +
-          params.mediaUrl.split('?')[0],
-      );
-    } else {
-      console.log(`[bncr] outbound-media pass-through|url=${params.mediaUrl.split('?')[0]}`);
+    this.logInfoJson(
+      'outbound',
+      'media-frame',
+      {
+        mid: params.entry.messageId,
+        mode: hasPayload ? (params.media.path ? 'chunk' : 'base64') : 'pass-through',
+        type: wantsVoice ? 'voice' : asString(params.msg.type || '') || undefined,
+        url: params.mediaUrl.split('?')[0],
+        ...(params.media.path ? { path: params.media.path } : {}),
+        ...(params.media.base64 ? { base64: true } : {}),
+      },
+      { debugOnly: true },
+    );
+    // Collect non-control fields from msg for passthrough into message.*
+    const MSG_PASSTHROUGH_KEYS = new Set([
+      'platform',
+      'groupId',
+      'userId',
+      'mediaUrl',
+      'mediaLocalRoots',
+      'asVoice',
+      'audioAsVoice',
+      'downloadMedia',
+      'transferMode',
+      'path',
+      'base64',
+      'fileName',
+      'kind',
+      'replyToId',
+    ]);
+    const passthroughExtra: Record<string, unknown> = {};
+    for (const [key, value] of Object.entries(params.msg)) {
+      if (!MSG_PASSTHROUGH_KEYS.has(key) && value !== undefined) {
+        passthroughExtra[key] = value;
+      }
     }
+
     return buildBncrMediaOutboundFrame({
       messageId: params.entry.messageId,
       sessionKey: params.entry.sessionKey,
@@ -1278,16 +1268,16 @@ class BncrBridgeRuntime {
         path: params.media.path,
       },
       mediaUrl: params.mediaUrl,
-      mediaMsg: asString(params.meta.text || ''),
+      mediaMsg: asString(params.msg.msg ?? ''),
       fileName: resolveOutboundFileName({
         mediaUrl: params.mediaUrl,
         fileName: params.media.fileName,
         mimeType: params.media.mimeType,
       }),
-      hintedType: wantsVoice ? 'voice' : asString(params.meta.type || '') || undefined,
-      extra: params.meta.extra as Record<string, unknown> | undefined,
+      hintedType: wantsVoice ? 'voice' : asString(params.msg.type || '') || undefined,
+      extra: Object.keys(passthroughExtra).length > 0 ? passthroughExtra : undefined,
       kind: messageKind,
-      replyToId: normalizeReplyToId(params.meta.replyToId) || undefined,
+      replyToId: normalizeReplyToId(asString(params.msg.replyToId || '')) || undefined,
       now: now(),
     });
   }
@@ -1296,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;
-    downloadMedia?: boolean;
-  }): OutboxEntry {
-    return buildTextOutboxEntryFromRuntime({
-      createMessageId: () => randomUUID(),
-      now,
-      normalizeAccountId,
-      normalizeReplyToId,
-      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,
-      downloadMedia: params.downloadMedia === true ? true : undefined,
-    });
-  }
-
   private async tryPushEntry(entry: OutboxEntry): Promise<boolean> {
-    const meta = isPlainObject(entry.payload?._meta) ? entry.payload._meta : null;
-    if (meta?.kind === 'file-transfer') {
-      return this.tryPushFileTransferEntry(entry, meta);
-    }
-
-    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),
@@ -1365,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;
@@ -1753,8 +1708,12 @@ class BncrBridgeRuntime {
       clampFiniteNumber(value, fallback, min ?? fallback, max ?? fallback),
     normalizeAccountId,
     formatDisplayScope,
-    isFileTransferEntry: (entry) =>
-      isPlainObject(entry.payload?._meta) && entry.payload?._meta?.kind === 'file-transfer',
+    isFileTransferEntry: (entry) => {
+      const msg = isPlainObject(entry.payload)
+        ? (entry.payload as Record<string, unknown>).message
+        : null;
+      return isPlainObject(msg) && (msg as Record<string, unknown>).transferMode === 'media';
+    },
     recommendedAckTimeoutMaxMs: RECOMMENDED_ACK_TIMEOUT_MAX_MS,
     adaptiveAckTimeoutEnabled: ADAPTIVE_ACK_TIMEOUT_DEFAULT_ENABLED,
     defaultAckTimeoutMs: PUSH_ACK_TIMEOUT_MS,
@@ -2705,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),
   });
@@ -2760,7 +2718,7 @@ class BncrBridgeRuntime {
     mediaLocalRoots?: readonly string[];
     replyTargetPolicy?: OutboundReplyTargetPolicy;
   }) {
-    this.bridgeMediaFacade.enqueueFromReply(params);
+    return this.bridgeMediaFacade.enqueueFromReply(params);
   }
 
   private logEnqueueFromReply(args: {
@@ -2800,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
@@ -2937,6 +2877,18 @@ class BncrBridgeRuntime {
       logInfo: (scope, message, options) => this.logInfo(scope, message, options),
       ...targetRuntime,
       listOutboxEntries: () => Array.from(this.outbox.values()),
+      resolveSceneDownloadMedia: (to: string) => {
+        const parts = to.split(':');
+        if (parts.length >= 3) {
+          const key = `${parts[1]}:${parts[2]}`;
+          const sc = this.sceneRegistry.get(key);
+          // Scene boolean wins (including explicit false); else fall to global.
+          if (typeof sc?.downloadMedia === 'boolean') return sc.downloadMedia;
+          const g = this.sceneRegistry.get('__global__');
+          if (typeof g?.downloadMedia === 'boolean') return g.downloadMedia;
+        }
+        return undefined;
+      },
     });
   }
 
@@ -3021,20 +2973,15 @@ class BncrBridgeRuntime {
     if (ctx.forceDocument === true) extra.forceDocument = true;
     if (ctx.gifPlayback === true) extra.gifPlayback = true;
     if (ctx.silent === true) extra.silent = true;
-    // Clear original fields so resolveUnifiedOutboundExtra doesn't re-add and override marker values
+    // Promote host flags into extra so marker params can override them via mergeMarkerAndHostFields
     return { ...ctx, extra, forceDocument: undefined, gifPlayback: undefined, silent: undefined };
   }
 
   // Channel send surface assembly ------------------------------------------
-  // This group backs the public channel send APIs and should stay adjacent to
-  // the final exposed channel* methods for quick top-down scanning.
-
-  private readonly channelSendRuntimeGroup = createBncrChannelSendRuntimeGroup(
+  private readonly channelSendRuntime = createBncrChannelSendRuntime(
     this.buildChannelSendRuntime(),
   );
 
-  private readonly channelSendRuntime = this.channelSendRuntimeGroup.channelSendRuntime;
-
   channelSendText = async (ctx: BncrChannelSendContext) =>
     this.channelSendRuntime.channelSendText(this.mergeHostFields(ctx));
 

package/src/core/accounts.ts

@@ -3,16 +3,11 @@ import type {
   BncrChannelConfigRoot,
   BncrChannelConfigSection,
 } from '../plugin/channel-runtime-types.ts';
+import { asString } from './value-sanitize.ts';
 
 const CHANNEL_ID = 'bncr';
 const BNCR_DEFAULT_ACCOUNT_ID = 'Primary';
 
-function asString(v: unknown, fallback = ''): string {
-  if (typeof v === 'string') return v;
-  if (v == null) return fallback;
-  return String(v);
-}
-
 export function normalizeAccountId(accountId?: string | null): string {
   const v = asString(accountId || '').trim();
   if (!v) return BNCR_DEFAULT_ACCOUNT_ID;

package/src/core/connection-reachability.ts

@@ -1,9 +1,5 @@
 import type { BncrConnection, OutboxEntry } from './types.ts';
-
-function finiteNumberOr(value: unknown, fallback: number): number {
-  const n = Number(value);
-  return Number.isFinite(n) ? n : fallback;
-}
+import { finiteNumberOr } from './value-sanitize.ts';
 
 export function hasRecentInboundReachability(args: {
   now: number;
@@ -145,7 +141,7 @@ function scoreOutboundPushConnection(args: {
   };
 }
 
-export function compareOutboundPushConnections(args: {
+function compareOutboundPushConnections(args: {
   a: BncrConnection;
   b: BncrConnection;
   now: number;