@xmoxmo/bncr 0.5.7 → 0.5.9

package/src/plugin/channel-runtime-constants.ts

@@ -28,7 +28,7 @@ export const OUTBOUND_READY_TTL_MS = 30_000;
 export const PREFERRED_OUTBOUND_TTL_MS = 12_000;
 export const FILE_FORCE_CHUNK = true;
 export const FILE_INLINE_THRESHOLD = 5 * 1024 * 1024;
-export const FILE_CHUNK_SIZE = 256 * 1024;
+const FILE_CHUNK_SIZE = 256 * 1024;
 export const INBOUND_FILE_TRANSFER_MAX_BYTES = 50 * 1024 * 1024;
 export const INBOUND_FILE_TRANSFER_MAX_CHUNKS =
   Math.ceil(INBOUND_FILE_TRANSFER_MAX_BYTES / FILE_CHUNK_SIZE) + 1;

package/src/plugin/channel-send.ts

@@ -8,7 +8,7 @@ import type { ReplyPayloadInput } from '../messaging/outbound/reply-enqueue.ts';
 import type { BncrChannelSendContext, BncrVerifiedTarget } from './channel-runtime-types.ts';
 
 /**
- * Resolve downloadMedia with cascade: override (host/user) > ctx > scene.
+ * Resolve downloadMedia with cascade: host override > ctx > scene > default(false).
  * Marker-level downloadMedia is extracted downstream by the orchestrator's
  * normalisation and has highest priority (overrides whatever we pass).
  */
@@ -52,7 +52,7 @@ export type BncrChannelSendRuntime = {
     mediaLocalRoots?: readonly string[];
   }) => Promise<void>;
   listOutboxEntries: () => OutboxEntry[];
-  /** Resolve downloadMedia from scene config: marker > scene > global > default(false). */
+  /** Resolve downloadMedia from scene config (host/ctx already resolved above). */
   resolveSceneDownloadMedia?: (to: string) => boolean | undefined;
 };
 
@@ -81,8 +81,9 @@ async function enqueueChannelMessageHandoff(
 }
 
 /**
- * Resolve downloadMedia from scene config when not already set by marker/host.
- * Scene cascade: marker > scene config > global > default(false).
+ * Resolve downloadMedia from scene config when not already set.
+ * Scene cascade: host override > ctx > scene config > default(false).
+ * (Marker-level downloadMedia overrides everything and is handled downstream.)
  */
 
 export function createBncrChannelSendRuntime(runtime: BncrChannelSendRuntime) {

package/src/plugin/file-transfer-orchestrator.ts

@@ -193,7 +193,38 @@ export function createBncrFileTransferOrchestrator(runtime: BncrFileTransferOrch
   };
   const HTTP_URL_RE = /^https?:\/\//i;
 
-  /** Try HEAD for Content-Type; fall back to Range+sniff for magic bytes when unclear. */
+  const EXT_TO_MIME: Record<string, string> = {
+    jpg: 'image/jpeg',
+    jpeg: 'image/jpeg',
+    png: 'image/png',
+    gif: 'image/gif',
+    webp: 'image/webp',
+    bmp: 'image/bmp',
+    heic: 'image/heic',
+    heif: 'image/heif',
+    mp4: 'video/mp4',
+    mov: 'video/quicktime',
+    mkv: 'video/x-matroska',
+    webm: 'video/webm',
+    avi: 'video/x-msvideo',
+    m4v: 'video/x-m4v',
+    mp3: 'audio/mpeg',
+    wav: 'audio/wav',
+    ogg: 'audio/ogg',
+    oga: 'audio/ogg',
+    opus: 'audio/opus',
+    m4a: 'audio/mp4',
+    aac: 'audio/aac',
+    flac: 'audio/flac',
+  };
+
+  function mimeFromUrlExt(url: string): string | undefined {
+    const clean = url.split(/[?#]/, 1)[0] || '';
+    const ext = clean.includes('.') ? clean.slice(clean.lastIndexOf('.') + 1).toLowerCase() : '';
+    return EXT_TO_MIME[ext];
+  }
+
+  /** Try HEAD for Content-Type; fall back to Range+sniff for magic bytes; then URL extension. */
   async function resolveRemoteMediaType(url: string): Promise<{ mimeType?: string }> {
     // 1) HEAD -> Content-Type
     let headerType = '';
@@ -229,8 +260,14 @@ export function createBncrFileTransferOrchestrator(runtime: BncrFileTransferOrch
       if (!sniffed) return {};
       return { mimeType: sniffed };
     } catch {
-      return {};
+      /* Range sniff failed, fall through to extension inference */
     }
+
+    // 3) URL extension -> mime type (fallback when HEAD and Range both fail)
+    const extMime = mimeFromUrlExt(url);
+    if (extMime) return { mimeType: extMime };
+
+    return {};
   }
 
   /** Minimal magic-byte MIME sniffer for the first ~512 bytes. */

package/src/plugin/media-orchestrators-runtime-group.ts

@@ -1,21 +1,13 @@
 import type { BncrRoute, FileSendTransferState, OutboxEntry } from '../core/types.ts';
-import { normalizeMessageText } from '../messaging/outbound/media-dedupe.ts';
 import type {
   NormalizedReplyPayload,
   OutboundReplyTargetPolicy,
-  ReplyMediaEntriesParams,
   ReplyPayloadInput,
 } from '../messaging/outbound/reply-enqueue.ts';
 import {
   enqueueNormalizedReplyPayload,
-  enqueueReplyTextEntry,
   normalizeReplyPayload,
 } from '../messaging/outbound/reply-enqueue.ts';
-import {
-  enqueueReplyMediaFallbackTextEntry,
-  enqueueReplyMediaFileTransferEntry,
-  enqueueSingleReplyMediaEntry,
-} from '../messaging/outbound/reply-enqueue-media.ts';
 import type { createBncrFileAckRuntime } from './file-ack-runtime.ts';
 import { createBncrFileTransferOrchestrator } from './file-transfer-orchestrator.ts';
 import type { createBncrFileTransferSetup } from './file-transfer-setup.ts';
@@ -27,92 +19,12 @@ type FileAckPayload = Awaited<
   ReturnType<ReturnType<typeof createBncrFileAckRuntime>['waitForFileAck']>
 >;
 
-function buildReplyMediaEntryHelpers(runtime: {
-  logInfo: (scope: string | undefined, message: string, options?: { debugOnly?: boolean }) => void;
-  enqueueOutbound: (entry: OutboxEntry) => void;
-  buildTextOutboxEntry: (args: {
-    accountId: string;
-    sessionKey: string;
-    route: BncrRoute;
-    text: string;
-    kind?: 'tool' | 'block' | 'final';
-    replyToId?: string;
-    replyTargetPolicy?: OutboundReplyTargetPolicy;
-  }) => OutboxEntry;
-  buildFileTransferOutboxEntry: (args: {
-    accountId: string;
-    sessionKey: string;
-    route: BncrRoute;
-    mediaUrl: string;
-    mediaLocalRoots?: readonly string[];
-    text: string;
-    asVoice: boolean;
-    audioAsVoice: boolean;
-    type?: string;
-    extra?: Record<string, unknown>;
-    kind?: 'tool' | 'block' | 'final';
-    replyToId?: string;
-    replyTargetPolicy?: OutboundReplyTargetPolicy;
-    downloadMedia?: boolean;
-  }) => OutboxEntry;
-  rememberRecentMediaSend: (args: {
-    sessionKey: string;
-    mediaUrl: string;
-    text: string;
-    replyToId: string;
-    createdAt: number;
-  }) => void;
-}) {
-  return {
-    enqueueReplyMediaFallbackTextEntry: (
-      params: Parameters<typeof enqueueReplyMediaFallbackTextEntry>[0],
-    ) =>
-      enqueueReplyMediaFallbackTextEntry(params, {
-        logInfo: runtime.logInfo,
-        enqueueOutbound: runtime.enqueueOutbound,
-        buildTextOutboxEntry: runtime.buildTextOutboxEntry,
-      }),
-    enqueueReplyMediaFileTransferEntry: (
-      params: Parameters<typeof enqueueReplyMediaFileTransferEntry>[0],
-    ) =>
-      enqueueReplyMediaFileTransferEntry(params, {
-        enqueueOutbound: runtime.enqueueOutbound,
-        buildFileTransferOutboxEntry: runtime.buildFileTransferOutboxEntry,
-        rememberRecentMediaSend: runtime.rememberRecentMediaSend,
-      }),
-  };
-}
-
-function buildReplyTextEntryHelper(runtime: {
-  enqueueOutbound: (entry: OutboxEntry) => void;
-  buildTextOutboxEntry: (args: {
-    accountId: string;
-    sessionKey: string;
-    route: BncrRoute;
-    text: string;
-    kind?: 'tool' | 'block' | 'final';
-    replyToId?: string;
-    replyTargetPolicy?: OutboundReplyTargetPolicy;
-  }) => OutboxEntry;
-}) {
-  return (params: {
-    accountId: string;
-    sessionKey: string;
-    route: BncrRoute;
-    payload: NormalizedReplyPayload;
-  }) =>
-    enqueueReplyTextEntry(params, {
-      enqueueOutbound: runtime.enqueueOutbound,
-      buildTextOutboxEntry: runtime.buildTextOutboxEntry,
-    });
-}
-
-function normalizeReplyOrchestratorPayload(args: {
+async function normalizeReplyOrchestratorPayload(args: {
   payload: ReplyPayloadInput;
   asString: (value: unknown, fallback?: string) => string;
   replyTargetPolicy?: OutboundReplyTargetPolicy;
 }) {
-  return normalizeReplyPayload(
+  return await normalizeReplyPayload(
     args.payload,
     { asString: args.asString },
     {
@@ -186,29 +98,21 @@ export function createBncrMediaOrchestratorsRuntimeGroup(runtime: {
     payload: NormalizedReplyPayload;
   }) => void;
   enqueueOutbound: (entry: OutboxEntry) => void;
-  buildTextOutboxEntry: (args: {
+  buildOutboxEntry: (args: {
     accountId: string;
     sessionKey: string;
     route: BncrRoute;
-    text: string;
-    kind?: 'tool' | 'block' | 'final';
-    replyToId?: string;
-    replyTargetPolicy?: OutboundReplyTargetPolicy;
-  }) => OutboxEntry;
-  buildFileTransferOutboxEntry: (args: {
-    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;
   rememberRecentMediaSend: (args: {
@@ -244,40 +148,7 @@ export function createBncrMediaOrchestratorsRuntimeGroup(runtime: {
     logFileTransferCompleteAck: runtime.logFileTransferCompleteAck,
   });
 
-  const replyMediaEntryHelpers = buildReplyMediaEntryHelpers(runtime);
-  const replyTextEntryHelper = buildReplyTextEntryHelper(runtime);
-
-  const enqueueReplyMediaEntries = (params: ReplyMediaEntriesParams) => {
-    let first = true;
-    const currentTime = runtime.now();
-
-    for (const mediaUrl of params.payload.mediaList) {
-      const normalizedText = normalizeMessageText(first ? params.payload.text : '');
-      const fallback = runtime.tryBuildMediaDedupeFallback({
-        sessionKey: params.sessionKey,
-        mediaUrl,
-        text: normalizedText,
-        replyToId: params.payload.replyToId,
-        currentTime,
-      });
-
-      enqueueSingleReplyMediaEntry(
-        {
-          params,
-          mediaUrl,
-          normalizedText,
-          text: first ? params.payload.text : '',
-          fallback,
-          currentTime,
-        },
-        replyMediaEntryHelpers,
-      );
-
-      first = false;
-    }
-  };
-
-  const enqueueFromReply = (params: {
+  const enqueueFromReply = async (params: {
     accountId: string;
     sessionKey: string;
     route: BncrRoute;
@@ -286,7 +157,7 @@ export function createBncrMediaOrchestratorsRuntimeGroup(runtime: {
     replyTargetPolicy?: OutboundReplyTargetPolicy;
   }) => {
     const { accountId, sessionKey, route, payload, mediaLocalRoots, replyTargetPolicy } = params;
-    const normalized = normalizeReplyOrchestratorPayload({
+    const normalized = await normalizeReplyOrchestratorPayload({
       payload,
       asString: runtime.asString,
       replyTargetPolicy,
@@ -302,19 +173,19 @@ export function createBncrMediaOrchestratorsRuntimeGroup(runtime: {
       },
       {
         logEnqueueFromReply: runtime.logEnqueueFromReply,
-        enqueueReplyMediaEntries,
-        enqueueReplyTextEntry: replyTextEntryHelper,
+        enqueueOutbound: runtime.enqueueOutbound,
+        buildOutboxEntry: runtime.buildOutboxEntry,
+        tryBuildMediaDedupeFallback: runtime.tryBuildMediaDedupeFallback,
+        rememberRecentMediaSend: runtime.rememberRecentMediaSend,
+        logInfo: runtime.logInfo,
       },
     );
   };
 
-  const replyMediaOrchestrator = {
-    enqueueFromReply,
-    enqueueReplyMediaEntries,
-  };
-
   return {
     fileTransferOrchestrator,
-    replyMediaOrchestrator,
+    replyMediaOrchestrator: {
+      enqueueFromReply,
+    },
   };
 }

package/src/plugin/messaging.ts

@@ -67,12 +67,12 @@ function isDisplayTarget(
   return Boolean(value && typeof value === 'object');
 }
 
-export function normalizeBncrMessagingTarget(raw: string) {
+function normalizeBncrMessagingTarget(raw: string) {
   const input = asSanitizedString(raw).trim();
   return input || undefined;
 }
 
-export function formatBncrMessagingTargetDisplay({ target }: BncrMessagingTargetDisplayInput) {
+function formatBncrMessagingTargetDisplay({ target }: BncrMessagingTargetDisplayInput) {
   if (typeof target === 'string') {
     const parsed = parseExplicitTarget(asSanitizedString(target).trim());
     return parsed?.route ? formatBncrHumanDisplay(parsed.route) : asSanitizedString(target).trim();
@@ -183,7 +183,7 @@ export function createBncrMessagingSurface(getBridge: () => BncrMessagingRuntime
   };
 }
 
-export function createBncrMessagingTargetResolver(getBridge: () => BncrMessagingRuntimeBridge) {
+function createBncrMessagingTargetResolver(getBridge: () => BncrMessagingRuntimeBridge) {
   return {
     looksLikeId: (raw: string, normalized?: string) => {
       return looksLikeBncrExplicitTarget(asSanitizedString(normalized || raw).trim());

package/src/plugin/outbox-drain-failure.ts

@@ -21,6 +21,8 @@ type BncrOutboxDrainFailureRuntime = {
   backoffMs: (retryCount: number) => number;
   outbox: Map<string, OutboxEntry>;
   resolveAccountIdForSession: (sessionKey: string) => string | null;
+  resolveActiveAccountIds?: () => Iterable<string>;
+  resolvePushConnIds?: (accountId: string) => Iterable<string>;
   logInfo: (scope: string, message: string, options?: { debugOnly?: boolean }) => void;
   logWarn: (scope: string, message: string, options?: { debugOnly?: boolean }) => void;
   isPrePushGuardDeferral: (entry: OutboxEntry) => boolean;
@@ -45,7 +47,7 @@ export function createBncrOutboxDrainFailure(runtime: BncrOutboxDrainFailureRunt
     // If the entry keeps hitting pre-push guard (no active connection), the
     // accountId on the entry might be wrong (e.g. constructed from route data).
     // Try to correct it from recent inbound session context before giving up.
-    if (runtime.isPrePushGuardDeferral(entry) && entry.retryCount > 0) {
+    if (runtime.isPrePushGuardDeferral(entry) && entry.retryCount >= 1) {
       const corrected = runtime.resolveAccountIdForSession(entry.sessionKey);
       if (corrected && corrected !== entry.accountId) {
         const oldAccountId = entry.accountId;
@@ -75,7 +77,38 @@ export function createBncrOutboxDrainFailure(runtime: BncrOutboxDrainFailureRunt
       }
     }
 
+    // Round-robin fallback: try all active accounts when session healing fails
+    if (
+      runtime.isPrePushGuardDeferral(entry) &&
+      runtime.resolveActiveAccountIds &&
+      runtime.resolvePushConnIds
+    ) {
+      const currentId = entry.accountId;
+      for (const candidateId of runtime.resolveActiveAccountIds()) {
+        if (candidateId === currentId) continue;
+        const connIds = Array.from(runtime.resolvePushConnIds(candidateId));
+        if (connIds.length > 0) {
+          const oldAccountId = entry.accountId;
+          runtime.logWarn(
+            'outbound',
+            `account round-robin corrected sessionKey=${entry.sessionKey} ${oldAccountId}→${candidateId}`,
+          );
+          entry.accountId = candidateId;
+          entry.retryCount = 0;
+          entry.lastError = undefined;
+          runtime.outbox.set(entry.messageId, entry);
+          runtime.scheduleSave();
+          return { action: 'continue', localNextDelay };
+        }
+      }
+    }
+
     if (runtime.isPrePushGuardDeferral(entry)) {
+      // Budget check: guard failures that exceed maxRetry go to dead-letter
+      if ((entry.retryCount || 0) >= runtime.maxRetry) {
+        runtime.moveToDeadLetter(entry, entry.lastError || 'guard-failure-limit');
+        return { action: 'continue', localNextDelay };
+      }
       const wait = runtime.prePushGuardRetryDelayMs;
       localNextDelay = runtime.outboxDrainSchedule.scheduleAccountWait({
         accountId,

package/src/plugin/outbox-drain-runtime.ts

@@ -59,6 +59,7 @@ type BncrOutboxDrainRuntime = {
   isPlainObject: (value: unknown) => value is Record<string, unknown>;
   normalizeAccountId: (accountId: string) => string;
   resolveAccountIdForSession: (sessionKey: string) => string | null;
+  resolveActiveAccountIds?: () => Iterable<string>;
   stopped: () => boolean;
   outbox: Map<string, OutboxEntry>;
   deadLetter: () => OutboxEntry[];
@@ -137,6 +138,8 @@ export function createBncrOutboxDrainRuntime(runtime: BncrOutboxDrainRuntime) {
     backoffMs: runtime.backoffMs,
     outbox: runtime.outbox,
     resolveAccountIdForSession: runtime.resolveAccountIdForSession,
+    resolveActiveAccountIds: runtime.resolveActiveAccountIds,
+    resolvePushConnIds: runtime.resolvePushConnIds,
     logInfo: runtime.logInfo,
     logWarn: runtime.logWarn,
     isPrePushGuardDeferral: runtime.isPrePushGuardDeferral,

package/src/plugin/outbox-push.ts

@@ -3,12 +3,7 @@ import {
   resolveFileTransferFailureState,
 } from '../core/outbox-file-transfer-failure.ts';
 import { buildTextPushFailureArgs } from '../core/outbox-text-push-failure.ts';
-import {
-  buildTextPushBroadcastPayload,
-  buildTextPushOkArgs,
-  buildTextPushRouteSelectArgs,
-  buildTextPushSuccessArgs,
-} from '../core/outbox-text-push-success.ts';
+
 import type { BncrConnection, OutboxEntry } from '../core/types.ts';
 import {
   buildOutboxPushOkDebugInfo,
@@ -137,51 +132,6 @@ export function createBncrOutboxPush(runtime: BncrOutboxPushRuntime) {
     );
   };
 
-  const pushTextSuccessPath = (args: {
-    entry: OutboxEntry;
-    owner: BncrConnection | null;
-    connIds: Iterable<string>;
-    recentInboundReachable: boolean;
-    routeReason: string;
-    ownerConnId?: string;
-  }) => {
-    runtime.gatewayBroadcastToConnIds(
-      runtime.pushEvent,
-      buildTextPushBroadcastPayload({
-        payload: args.entry.payload,
-        messageId: args.entry.messageId,
-      }),
-      new Set(args.connIds),
-    );
-    logOutboxRouteSelect(
-      buildTextPushRouteSelectArgs({
-        entry: args.entry,
-        connIds: args.connIds,
-        routeReason: args.routeReason,
-        recentInboundReachable: args.recentInboundReachable,
-        owner: args.owner,
-        event: runtime.pushEvent,
-      }),
-    );
-    runtime.recordOutboxPushSuccess(
-      buildTextPushSuccessArgs({
-        entry: args.entry,
-        connIds: args.connIds,
-        ownerConnId: args.ownerConnId,
-        ownerClientId: args.ownerConnId ? args.owner?.clientId : undefined,
-      }),
-    );
-    logOutboxPushOkSummary(args.entry.messageId);
-    logOutboxPushOk(
-      buildTextPushOkArgs({
-        entry: args.entry,
-        connIds: args.connIds,
-        recentInboundReachable: args.recentInboundReachable,
-        event: runtime.pushEvent,
-      }),
-    );
-  };
-
   const handleTextPushFailure = (args: { entry: OutboxEntry; error: unknown }) => {
     runtime.recordOutboxPushFailure({
       entry: args.entry,
@@ -253,7 +203,6 @@ export function createBncrOutboxPush(runtime: BncrOutboxPushRuntime) {
   };
 
   return {
-    pushTextSuccessPath,
     handleTextPushFailure,
     handleFileTransferPushFailure,
     handleFileTransferPushGuardFailure,