@xmoxmo/bncr 0.5.6 → 0.5.7

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.7",
   "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',

package/scripts/selfcheck.mjs

@@ -72,10 +72,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 +82,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 +102,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',
@@ -198,7 +192,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/channel.ts

@@ -152,10 +152,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 +167,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';
@@ -1133,7 +1133,7 @@ class BncrBridgeRuntime {
 
   private async pushFileTransferSuccessPath(args: {
     entry: OutboxEntry;
-    meta: Record<string, unknown>;
+    msg: Record<string, unknown>;
     owner: ReturnType<BncrBridgeRuntime['resolveOutboxPushOwner']>;
     connIds: Iterable<string>;
     recentInboundReachable: boolean;
@@ -1157,11 +1157,11 @@ class BncrBridgeRuntime {
 
   private async tryPushFileTransferEntry(
     entry: OutboxEntry,
-    meta: Record<string, unknown>,
+    msg: Record<string, unknown>,
   ): Promise<boolean> {
     return await runBncrFileTransferOutboxPush({
       entry,
-      meta,
+      msg,
       gatewayContext: this.gatewayContext,
       owner: this.resolveOutboxPushOwner(entry.accountId),
       resolvePushConnIds: (accountId) => this.resolvePushConnIds(accountId),
@@ -1195,7 +1195,6 @@ class BncrBridgeRuntime {
       createMessageId: () => randomUUID(),
       now,
       normalizeAccountId,
-      pushEvent: BNCR_PUSH_EVENT,
       accountId: params.accountId,
       sessionKey: params.sessionKey,
       route: params.route,
@@ -1209,7 +1208,7 @@ class BncrBridgeRuntime {
       kind: params.kind,
       replyToId: asString(params.replyToId || '').trim() || undefined,
       replyTargetPolicy: params.replyTargetPolicy,
-      downloadMedia: params.downloadMedia === true ? true : undefined,
+      downloadMedia: params.downloadMedia,
     });
   }
 
@@ -1243,29 +1242,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 +1303,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(),
     });
   }
@@ -1305,13 +1330,11 @@ class BncrBridgeRuntime {
     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,
@@ -1320,16 +1343,18 @@ class BncrBridgeRuntime {
       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);
+    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);
   }
 
@@ -1753,8 +1778,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,
@@ -2937,6 +2966,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 +3062,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;

package/src/core/dead-letter-diagnostics.ts

@@ -5,6 +5,7 @@ import type {
   BncrDeadLetterEntrySummary,
   OutboxEntry,
 } from './types.ts';
+import { asString } from './value-sanitize.ts';
 
 export type DeadLetterTopReason = { reason: string; count: number };
 
@@ -15,12 +16,6 @@ export type BuildDeadLetterDiagnosticsOptions = {
   cappedAt: number;
 };
 
-function asString(value: unknown, fallback = ''): string {
-  if (typeof value === 'string') return value;
-  if (value == null) return fallback;
-  return String(value);
-}
-
 function asPayloadMessage(payload: OutboxEntry['payload']): {
   msg?: string;
   type?: string;
@@ -87,15 +82,14 @@ export function parseDeadLetterOlderThan(raw: unknown): number | null {
 }
 
 export function summarizeDeadLetterEntry(entry: OutboxEntry) {
-  const meta = entry.payload?._meta || {};
-  const msg = asPayloadMessage(entry.payload);
-  const text = asString(meta.text || msg.msg || '');
+  const msg = asPayloadMessage(entry.payload) || {};
+  const text = asString(msg.msg || '');
   return {
     messageId: entry.messageId,
     accountId: entry.accountId,
     sessionKey: entry.sessionKey,
     route: formatDisplayScope(entry.route),
-    kind: asString(meta.kind || msg.type || 'message'),
+    kind: asString(msg.type || 'message'),
     createdAt: Number.isFinite(Number(entry.createdAt)) ? Number(entry.createdAt) : null,
     retryCount: Number.isFinite(Number(entry.retryCount)) ? Number(entry.retryCount) : 0,
     lastError: entry.lastError || null,

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

@@ -2,11 +2,20 @@ import type { OutboundReplyTargetPolicy } from '../messaging/outbound/reply-targ
 import { normalizeOutboundReplyToId } from '../messaging/outbound/reply-target-policy.ts';
 import type { BncrRoute, OutboxEntry } from './types.ts';
 
+/** Strip empty/falsy values from extra so they don't override existing message defaults. */
+function sanitizeExtraSpread(extra: Record<string, unknown>): Record<string, unknown> {
+  const out: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(extra)) {
+    if (value === '' || value === null || value === undefined) continue;
+    out[key] = value;
+  }
+  return out;
+}
+
 export function buildFileTransferOutboxEntry(args: {
   createMessageId: () => string;
   now: () => number;
   normalizeAccountId: (accountId?: string | null) => string;
-  pushEvent: string;
   accountId: string;
   sessionKey: string;
   route: BncrRoute;
@@ -31,25 +40,34 @@ export function buildFileTransferOutboxEntry(args: {
     route: args.route,
     payload: {
       type: 'message.outbound',
+      messageId,
+      idempotencyKey: messageId,
       sessionKey: args.sessionKey,
-      _meta: {
-        kind: 'file-transfer',
+      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: 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,
-        text: args.text,
         asVoice: args.asVoice === true,
         audioAsVoice: args.audioAsVoice === true,
-        type: args.type,
-        downloadMedia: args.downloadMedia === true,
-        ...(args.extra ? { extra: { ...args.extra } } : {}),
-        finalEvent: args.pushEvent,
-        replyToId:
-          normalizeOutboundReplyToId({
-            kind: args.kind,
-            replyToId: args.replyToId,
-            replyTargetPolicy: args.replyTargetPolicy,
-          }) || undefined,
-        messageKind: args.kind,
+        downloadMedia: args.downloadMedia,
+        transferMode: 'media',
+        path: '',
+        base64: '',
+        fileName: '',
+        ...(args.extra ? sanitizeExtraSpread(args.extra) : {}),
       },
     },
     createdAt,
@@ -62,7 +80,6 @@ export function buildTextOutboxEntry(args: {
   createMessageId: () => string;
   now: () => number;
   normalizeAccountId: (accountId?: string | null) => string;
-  normalizeReplyToId: (value?: string | null) => string;
   accountId: string;
   extra?: Record<string, unknown>;
   sessionKey: string;
@@ -71,7 +88,6 @@ export function buildTextOutboxEntry(args: {
   kind?: 'tool' | 'block' | 'final';
   replyToId?: string;
   replyTargetPolicy?: OutboundReplyTargetPolicy;
-  downloadMedia?: boolean;
 }): OutboxEntry {
   const messageId = args.createMessageId();
   const createdAt = args.now();
@@ -98,7 +114,7 @@ export function buildTextOutboxEntry(args: {
       fileName: '',
       // Extra fields from marker/pipeline spread for adapter-specific data
       // (e.g. type="appmsg", msg="<appmsg>..." from [BncrParam:...])
-      ...(args.extra ? { ...args.extra } : {}),
+      ...(args.extra ? sanitizeExtraSpread(args.extra) : {}),
     },
     ts: createdAt,
   };

package/src/core/outbox-file-transfer-failure.ts

@@ -1,3 +1,8 @@
+/*
+ * Intentionally separate from outbox-text-push-failure.ts.
+ * File transfer failure adds retryable-state resolution logic
+ * that text push doesn't need (no chunk-level retry semantics).
+ */
 import { buildPushFailureArgs } from './outbox-push-args.ts';
 import type { OutboxEntry } from './types.ts';
 

package/src/core/outbox-file-transfer-guards.ts

@@ -1,3 +1,9 @@
+/*
+ * Intentionally separate from outbox-text-push-guards.ts.
+ * File transfer guard has distinct output type (includes owner/mediaUrl)
+ * and extra mediaUrl validation that text push doesn't need.
+ * Merging would add unnecessary conditional branches.
+ */
 import type { BncrConnection, OutboxEntry } from './types.ts';
 
 export type FileTransferGuardResult =

package/src/core/outbox-file-transfer-prep.ts

@@ -1,26 +1,29 @@
 import type { BncrConnection, OutboxEntry } from './types.ts';
 
-export function prepareFileTransferRouteSelection(args: {
+type PushRouteSelectionArgs<C> = {
   entry: OutboxEntry;
   owner: BncrConnection | null;
   resolvePushConnIds: (accountId: string) => Iterable<string>;
   resolveRecentInboundConnIds: (accountId: string) => Iterable<string>;
   hasRecentInboundReachability: (accountId: string) => boolean;
   isRevalidatedAttemptedConn: (connId: string) => boolean;
-  selectOutboxFileTransferRouteCandidates: (args: {
+  selectRouteCandidates: (args: {
     routeCandidates: Iterable<string>;
     attemptedConnIds: string[];
     recentInboundConnIds: Iterable<string>;
     ownerConnId?: string;
     recentInboundReachable: boolean;
     isRevalidatedAttemptedConn: (connId: string) => boolean;
-  }) => { connIds: Iterable<string>; recentInboundReachable: boolean; routeReason: string };
-}) {
+  }) => C;
+};
+
+/** Shared route selection prep for both text and file push flows. */
+export function prepareRouteSelection<C>(args: PushRouteSelectionArgs<C>): C {
   const attemptedConnIds = Array.isArray(args.entry.routeAttemptConnIds)
     ? args.entry.routeAttemptConnIds.filter((v): v is string => typeof v === 'string' && !!v)
     : [];
 
-  return args.selectOutboxFileTransferRouteCandidates({
+  return args.selectRouteCandidates({
     routeCandidates: args.resolvePushConnIds(args.entry.accountId),
     attemptedConnIds,
     recentInboundConnIds: args.resolveRecentInboundConnIds(args.entry.accountId),

package/src/core/outbox-file-transfer-success.ts

@@ -1,3 +1,8 @@
+/*
+ * Intentionally separate from outbox-text-push-success.ts.
+ * File transfer success uses kind:'file-transfer' tag and different
+ * argument shapes (owner vs connId). Separate callers, separate files.
+ */
 import { buildPushBroadcastPayload, buildPushRouteSelectArgs } from './outbox-push-args.ts';
 import type { BncrConnection, OutboxEntry } from './types.ts';
 

package/src/core/outbox-queue.ts

@@ -50,13 +50,7 @@ export function collectDueOutboxEntries(args: {
       nextAttemptAt: args.now + args.backoffMs(nextAttempt),
     };
     updatedEntries.push(updatedEntry);
-    duePayloads.push({
-      ...updatedEntry.payload,
-      _meta: {
-        retryCount: updatedEntry.retryCount,
-        nextAttemptAt: updatedEntry.nextAttemptAt,
-      },
-    });
+    duePayloads.push(updatedEntry.payload);
 
     if (duePayloads.length >= args.maxBatch) break;
   }