@xmoxmo/bncr 0.5.6 → 0.5.7

package/src/messaging/outbound/target-resolver.ts

@@ -4,6 +4,7 @@ import {
   parseStrictBncrSessionKey,
 } from '../../core/targets.ts';
 import type { BncrRoute } from '../../core/types.ts';
+import { asString } from '../../core/value-sanitize.ts';
 
 type ResolveBncrOutboundTargetParams = {
   target: string;
@@ -11,12 +12,6 @@ type ResolveBncrOutboundTargetParams = {
   resolveRouteBySession?: (raw: string, accountId: string) => BncrRoute | null;
 };
 
-function asString(v: unknown, fallback = ''): string {
-  if (typeof v === 'string') return v;
-  if (v == null) return fallback;
-  return String(v);
-}
-
 export function looksLikeBncrExplicitTarget(input: string): boolean {
   const raw = asString(input).trim();
   if (!raw) return false;

package/src/openclaw/routing-runtime.ts

@@ -1,4 +1,3 @@
-import { buildChannelOutboundSessionRoute } from 'openclaw/plugin-sdk/core';
 import { resolveInboundLastRouteSessionKey } from 'openclaw/plugin-sdk/routing';
 import type { BncrChannelConfigRoot } from '../plugin/channel-runtime-types.ts';
 import type {
@@ -17,10 +16,6 @@ type OpenClawRoutingApi = {
   }) => OpenClawResolvedAgentRoute;
 };
 
-type BuildChannelOutboundSessionRouteParams = Parameters<
-  typeof buildChannelOutboundSessionRoute
->[0];
-
 function resolveRoutingApi(api: OpenClawChannelRuntimeApiHolder): OpenClawRoutingApi {
   const routing = api?.runtime?.channel?.routing;
   if (!routing || typeof routing !== 'object') {
@@ -56,9 +51,3 @@ export function resolveOpenClawInboundLastRouteSessionKey(params: {
     },
   );
 }
-
-export function buildOpenClawChannelOutboundSessionRoute(
-  params: BuildChannelOutboundSessionRouteParams,
-) {
-  return buildChannelOutboundSessionRoute(params);
-}

package/src/openclaw/sdk-helpers.ts

@@ -1,4 +1,3 @@
-import { readBooleanParam as sdkReadBooleanParam } from 'openclaw/plugin-sdk/boolean-param';
 import {
   applyAccountNameToChannelSection as sdkApplyAccountNameToChannelSection,
   jsonResult as sdkJsonResult,
@@ -15,7 +14,6 @@ import { extractToolSend as sdkExtractToolSend } from 'openclaw/plugin-sdk/tool-
 
 export type OpenClawChannelToolSend = ChannelToolSend;
 
-export const readOpenClawBooleanParam = sdkReadBooleanParam;
 export const readOpenClawStringParam = sdkReadStringParam;
 export const readOpenClawJsonFileWithFallback = sdkReadJsonFileWithFallback;
 export const writeOpenClawJsonFileAtomically = sdkWriteJsonFileAtomically;

package/src/plugin/bridge-file-transfer-push-facade.ts

@@ -29,7 +29,7 @@ export function createBncrBridgeFileTransferPushFacade(runtime: {
   }>;
   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;
   }) => Record<string, unknown>;
@@ -74,7 +74,7 @@ export function createBncrBridgeFileTransferPushFacade(runtime: {
 }) {
   const pushFileTransferSuccessPath = async (args: {
     entry: OutboxEntry;
-    meta: Record<string, unknown>;
+    msg: Record<string, unknown>;
     owner: BncrConnection | null;
     connIds: Iterable<string>;
     recentInboundReachable: boolean;
@@ -86,14 +86,14 @@ export function createBncrBridgeFileTransferPushFacade(runtime: {
       sessionKey: args.entry.sessionKey,
       route: args.entry.route,
       mediaUrl: args.mediaUrl,
-      mediaLocalRoots: Array.isArray(args.meta.mediaLocalRoots)
-        ? args.meta.mediaLocalRoots.filter((v): v is string => typeof v === 'string')
+      mediaLocalRoots: Array.isArray(args.msg.mediaLocalRoots)
+        ? args.msg.mediaLocalRoots.filter((v): v is string => typeof v === 'string')
         : undefined,
-      downloadMedia: args.meta.downloadMedia === true,
+      downloadMedia: args.msg.downloadMedia as boolean | undefined,
     });
     const frame = runtime.buildFileTransferOutboundFrame({
       entry: args.entry,
-      meta: args.meta,
+      msg: args.msg,
       media,
       mediaUrl: args.mediaUrl,
     });

package/src/plugin/bridge-media-facade.ts

@@ -161,7 +161,6 @@ export function createBncrBridgeMediaFacade(runtime: {
   const loadOutboundTransferMedia = async (params: {
     mediaUrl: string;
     mediaLocalRoots?: readonly string[];
-    downloadMedia?: boolean;
   }): Promise<{
     loaded: OpenClawLoadedMedia;
     size: number;

package/src/plugin/channel-components.ts

@@ -11,7 +11,6 @@ import { OUTBOUND_FLUSH_REASON, OUTBOUND_FLUSH_TRIGGER } from '../messaging/outb
 import type { ReplyPayloadInput } from '../messaging/outbound/reply-enqueue.ts';
 import { getOpenClawRuntimeConfig } from '../openclaw/config-runtime.ts';
 import { saveOpenClawChannelMediaBuffer } from '../openclaw/media-runtime.ts';
-import { createBncrChannelSendRuntime } from './channel-send.ts';
 import { createBncrConnectionHandlers } from './connection-handlers.ts';
 import { createBncrDiagnosticsHandlers } from './diagnostics-handlers.ts';
 import { createBncrFileInboundHandlers } from './file-inbound-handlers.ts';
@@ -23,12 +22,6 @@ export function createBncrConnectionHandlersComponent(
   return createBncrConnectionHandlers(runtime);
 }
 
-export function createBncrDiagnosticsHandlersComponent(
-  runtime: Parameters<typeof createBncrDiagnosticsHandlers>[0],
-) {
-  return createBncrDiagnosticsHandlers(runtime);
-}
-
 export function createBncrBridgeDiagnosticsHandlersComponent(runtime: {
   getApi: () => OpenClawPluginApi;
   channelId: string;
@@ -312,12 +305,6 @@ export function createBncrInboundHandlersComponent(runtime: {
   });
 }
 
-export function createBncrChannelSendRuntimeComponent(
-  runtime: Parameters<typeof createBncrChannelSendRuntime>[0],
-) {
-  return createBncrChannelSendRuntime(runtime);
-}
-
 export function resolveBncrChannelRoot(pluginRoot: string) {
   return pluginRoot || path.join(process.cwd(), 'plugins', 'bncr');
 }

package/src/plugin/channel-plugin-surface-group.ts

@@ -1,15 +1,14 @@
-import { randomUUID } from 'node:crypto';
 import type { ChannelMessageSendResult } from 'openclaw/plugin-sdk/channel-message';
-import { listAccountIds, resolveAccount } from '../core/accounts.ts';
+import { listAccountIds, normalizeAccountId, resolveAccount } from '../core/accounts.ts';
 import { BncrConfigSchema } from '../core/config-schema.ts';
 import { resolveBncrChannelPolicy } from '../core/policy.ts';
 import type { ReplyPayloadInput } from '../messaging/outbound/reply-enqueue.ts';
 import type { OutboundReplyTargetPolicy } from '../messaging/outbound/reply-target-policy.ts';
-import { sendBncrMedia, sendBncrText } from '../messaging/outbound/send.ts';
-import { normalizeBncrSendParams } from '../messaging/outbound/send-params.ts';
 import type { OpenClawChannelToolSend, openClawJsonResult } from '../openclaw/sdk-helpers.ts';
+import { readOpenClawStringParam } from '../openclaw/sdk-helpers.ts';
 import type {
   BncrChannelConfigRoot,
+  BncrChannelSendContext,
   BncrSceneRecord,
   BncrStatusRuntimeSnapshot,
   BncrVerifiedTarget,
@@ -139,71 +138,59 @@ export function createBncrChannelPluginSurfaceGroup(runtime: {
       if (action !== 'send') {
         throw new Error(`Action ${action} is not supported for provider ${runtime.channelId}.`);
       }
-      const normalized = normalizeBncrSendParams({ params, accountId: accountId || '' });
-      console.log(
-        '[bncr] handleAction normalized.downloadMedia=' +
-          JSON.stringify(normalized.downloadMedia) +
-          '|mediaUrl=' +
-          JSON.stringify(normalized.mediaUrl) +
-          '|hasMedia=' +
-          Boolean(normalized.mediaUrl || normalized.mediaUrls?.length),
+
+      /* -- extract raw params (no normalization) ----------------------- */
+      const paramsObj = (params && typeof params === 'object' ? params : {}) as Record<
+        string,
+        unknown
+      >;
+      const to = readOpenClawStringParam(paramsObj, 'to', { required: true });
+      const resolvedAccountId = normalizeAccountId(
+        (readOpenClawStringParam(paramsObj, 'accountId') ?? accountId) || '',
       );
+      const toolMediaUrl =
+        (typeof paramsObj.mediaUrl === 'string' ? paramsObj.mediaUrl : '') ||
+        (typeof paramsObj.media === 'string' ? paramsObj.media : '') ||
+        (typeof paramsObj.path === 'string' ? paramsObj.path : '') ||
+        (typeof paramsObj.filePath === 'string' ? paramsObj.filePath : '');
+      const rawExtra = paramsObj.extra;
+      const extra =
+        rawExtra && typeof rawExtra === 'object' && !Array.isArray(rawExtra)
+          ? (rawExtra as Record<string, unknown>)
+          : undefined;
+      const rawMediaUrls = paramsObj.mediaUrls;
+      const mediaUrls = Array.isArray(rawMediaUrls)
+        ? rawMediaUrls.filter((u): u is string => typeof u === 'string')
+        : undefined;
+
+      const toolMessage = readOpenClawStringParam(paramsObj, 'message', { allowEmpty: true }) ?? '';
+      const toolCaption = readOpenClawStringParam(paramsObj, 'caption', { allowEmpty: true }) ?? '';
+      const text = toolCaption || toolMessage || '';
+      const ctx: BncrChannelSendContext = {
+        to,
+        accountId: resolvedAccountId,
+        text,
+        mediaUrl: toolMediaUrl || undefined,
+        mediaUrls: mediaUrls?.length ? mediaUrls : undefined,
+        asVoice: paramsObj.asVoice === true,
+        audioAsVoice: paramsObj.audioAsVoice === true,
+        downloadMedia: paramsObj.downloadMedia as boolean | undefined,
+        type: typeof paramsObj.type === 'string' ? paramsObj.type : undefined,
+        extra,
+        forceDocument: paramsObj.forceDocument === true,
+        gifPlayback: paramsObj.gifPlayback === true,
+        silent: paramsObj.silent === true,
+        mediaLocalRoots,
+      };
 
-      // Priority: marker → scene config → global default → false
-      if (normalized.downloadMedia === undefined) {
-        const parts = normalized.to.split(':');
-        if (parts.length >= 3) {
-          const sceneKey = `${parts[1]}:${parts[2]}`;
-          const scene = runtime.sceneRegistry.get(sceneKey);
-          if (scene?.downloadMedia === true) {
-            normalized.downloadMedia = true;
-          }
-          if (normalized.downloadMedia === undefined) {
-            const globalScene = runtime.sceneRegistry.get('__global__');
-            if (globalScene?.downloadMedia === true) {
-              normalized.downloadMedia = true;
-            }
-          }
-        }
+      const hasContent = Boolean(text?.trim() || toolMediaUrl || mediaUrls?.length || extra);
+      if (!hasContent) {
+        throw new Error('send requires message, media, or extra params');
       }
 
-      const toolActionBridge = runtime.getToolActionBridge();
-      const result =
-        normalized.mediaUrl || normalized.mediaUrls?.length
-          ? await sendBncrMedia({
-              channelId: runtime.channelId,
-              accountId: normalized.accountId,
-              to: normalized.to,
-              text: normalized.caption,
-              mediaUrl: normalized.mediaUrl,
-              mediaUrls: normalized.mediaUrls,
-              asVoice: normalized.asVoice,
-              audioAsVoice: normalized.audioAsVoice,
-              type: normalized.type,
-              downloadMedia: normalized.downloadMedia,
-              extra: normalized.extra,
-              mediaLocalRoots,
-              resolveVerifiedTarget: (to, accountId) =>
-                toolActionBridge.resolveVerifiedTarget(to, accountId),
-              rememberSessionRoute: (sessionKey, accountId, route) =>
-                toolActionBridge.rememberSessionRoute(sessionKey, accountId, route),
-              enqueueFromReply: (args) => toolActionBridge.enqueueFromReply(args),
-              createMessageId: () => randomUUID(),
-            })
-          : await sendBncrText({
-              channelId: runtime.channelId,
-              accountId: normalized.accountId,
-              to: normalized.to,
-              text: normalized.message,
-              extra: normalized.extra,
-              mediaLocalRoots,
-              resolveVerifiedTarget: (to, accountId) =>
-                toolActionBridge.resolveVerifiedTarget(to, accountId),
-              rememberSessionRoute: (sessionKey, accountId, route) =>
-                toolActionBridge.rememberSessionRoute(sessionKey, accountId, route),
-              enqueueFromReply: (args) => toolActionBridge.enqueueFromReply(args),
-              createMessageId: () => randomUUID(),
-            });
+      /* -- bridge to sendDispatch (normalization + routing inside) ----- */
+      const outboundBridge = runtime.getOutboundBridge();
+      const result = await outboundBridge.channelSendText(ctx);
 
       return runtime.openClawJsonResult({ ok: true, ...result });
     },

package/src/plugin/channel-runtime-builders-delivery.ts

@@ -535,6 +535,7 @@ export function buildBncrChannelSendRuntime(deps: {
     replyTargetPolicy?: OutboundReplyTargetPolicy;
   }) => Promise<void>;
   listOutboxEntries: () => OutboxEntry[];
+  resolveSceneDownloadMedia?: (to: string) => boolean | undefined;
 }) {
   return { ...deps };
 }

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

@@ -1,4 +1,4 @@
-import type { RegisterDriftSnapshot, RegisterTraceEntry } from '../core/register-trace.ts';
+import type { RegisterDriftSnapshot } from '../core/register-trace.ts';
 import type { BncrDiagnosticsSummary, BncrRoute, OutboxEntry } from '../core/types.ts';
 import type { OpenClawChannelToolSend, openClawJsonResult } from '../openclaw/sdk-helpers.ts';
 
@@ -133,7 +133,7 @@ export type BncrChannelSendContext = {
   payload?: Record<string, unknown>;
   sessionKey?: string;
   mirror?: { sessionKey?: string };
-  threadId?: string;
+  threadId?: string | number | null;
   /** Pass-through fields from host - bncr plugin does NOT consume these. */
   forceDocument?: boolean;
   gifPlayback?: boolean;
@@ -143,28 +143,6 @@ export type BncrChannelSendContext = {
   extra?: Record<string, unknown>;
 };
 
-export type BncrRegisterRuntimeSnapshot = {
-  bridgeId: string;
-  gatewayPid: number;
-  pluginVersion: string | null;
-  pluginSource: string | null;
-  lastApiInstanceId: string | null;
-  lastRegistryFingerprint: string | null;
-  registerCount: number;
-  firstRegisterAt: number | null;
-  lastRegisterAt: number | null;
-  lastApiRebindAt: number | null;
-  apiGeneration: number;
-  registerTraceRecent: RegisterTraceEntry[];
-  lastDriftSnapshot: RegisterDriftSnapshot | null;
-};
-
-export type FileAckPayloadState = {
-  payload: Record<string, unknown>;
-  ok: boolean;
-  at: number;
-};
-
 export type ChannelMessageActionAdapter = {
   describeMessageTool: (ctx: { cfg: BncrChannelConfigRoot }) => {
     actions: readonly ['send'];