@xmoxmo/bncr 0.5.8 → 0.6.0

package/package.json

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

package/scripts/selfcheck.mjs

@@ -12,13 +12,15 @@ const require = createRequire(import.meta.url);
 const requiredRootFiles = ['index.ts', 'openclaw.plugin.json'];
 
 const requiredSourceFiles = [
-  'src/channel.ts',
   'src/bootstrap/channel-plugin-runtime.ts',
   'src/bootstrap/cli.ts',
+  'src/bootstrap/register-runtime-gateway.ts',
   'src/bootstrap/register-runtime-helpers.ts',
+  'src/bootstrap/register-runtime-singleton.ts',
   'src/bootstrap/register-runtime.ts',
   'src/bootstrap/runtime-discovery.ts',
   'src/bootstrap/runtime-loader.ts',
+  'src/channel.ts',
   'src/core/accounts.ts',
   'src/core/config-schema.ts',
   'src/core/connection-capability.ts',
@@ -54,35 +56,46 @@ const requiredSourceFiles = [
   'src/core/status.ts',
   'src/core/targets.ts',
   'src/core/types.ts',
+  'src/core/value-sanitize.ts',
   'src/messaging/inbound/commands.ts',
   'src/messaging/inbound/context-facts.ts',
+  'src/messaging/inbound/contracts.ts',
   'src/messaging/inbound/dispatch-prep.ts',
   'src/messaging/inbound/dispatch.ts',
   'src/messaging/inbound/gate.ts',
+  'src/messaging/inbound/group-history.ts',
   'src/messaging/inbound/last-route.ts',
   'src/messaging/inbound/media-url-download.ts',
+  'src/messaging/inbound/native-command-runtime.ts',
   'src/messaging/inbound/native-command.ts',
   'src/messaging/inbound/native-reply-delivery.ts',
   'src/messaging/inbound/parse.ts',
   'src/messaging/inbound/remote-media.ts',
   'src/messaging/inbound/reply-config.ts',
+  'src/messaging/inbound/reply-dispatch-serial.ts',
   'src/messaging/inbound/reply-dispatch.ts',
   'src/messaging/inbound/runtime-compat.ts',
+  'src/messaging/inbound/scene-admin.ts',
   'src/messaging/inbound/session-label.ts',
+  'src/messaging/inbound/session-meta-task.ts',
   'src/messaging/inbound/turn-context.ts',
   'src/messaging/outbound/actions.ts',
-  'src/messaging/outbound/diagnostics.ts',
   'src/messaging/outbound/diagnostics-debug-builders.ts',
+  'src/messaging/outbound/diagnostics.ts',
   'src/messaging/outbound/durable-queue-adapter.ts',
+  'src/messaging/outbound/marker-parser.ts',
   'src/messaging/outbound/media-dedupe.ts',
   'src/messaging/outbound/media.ts',
+  'src/messaging/outbound/normalize-outbound-send.ts',
   'src/messaging/outbound/queue-selectors.ts',
   'src/messaging/outbound/reasons.ts',
+  'src/messaging/outbound/reply-enqueue-media.ts',
   'src/messaging/outbound/reply-enqueue.ts',
   'src/messaging/outbound/reply-target-policy.ts',
   'src/messaging/outbound/retry-policy.ts',
   'src/messaging/outbound/session-route.ts',
   'src/messaging/outbound/target-resolver.ts',
+  'src/openclaw/channel-runtime-contracts.ts',
   'src/openclaw/config-runtime.ts',
   'src/openclaw/inbound-session-runtime.ts',
   'src/openclaw/media-runtime.ts',
@@ -92,6 +105,20 @@ const requiredSourceFiles = [
   'src/openclaw/sdk-helpers.ts',
   'src/openclaw/session-route-runtime.ts',
   'src/plugin/ack-outbox-runtime-group.ts',
+  'src/plugin/bridge-ack-facade.ts',
+  'src/plugin/bridge-connection-facade.ts',
+  'src/plugin/bridge-diagnostics-facade.ts',
+  'src/plugin/bridge-drain-facade.ts',
+  'src/plugin/bridge-extended-diagnostics-facade.ts',
+  'src/plugin/bridge-lifecycle.ts',
+  'src/plugin/bridge-media-facade.ts',
+  'src/plugin/bridge-outbox-facade.ts',
+  'src/plugin/bridge-runtime-helpers.ts',
+  'src/plugin/bridge-runtime-snapshots.ts',
+  'src/plugin/bridge-runtime-surface-facade.ts',
+  'src/plugin/bridge-status-facade.ts',
+  'src/plugin/bridge-status-worker-facade.ts',
+  'src/plugin/bridge-support-runtime.ts',
   'src/plugin/bridge-surface-handlers-group.ts',
   'src/plugin/bridge-surface-helpers.ts',
   'src/plugin/capabilities.ts',
@@ -99,16 +126,21 @@ const requiredSourceFiles = [
   'src/plugin/channel-inbound-helpers.ts',
   'src/plugin/channel-plugin-bridge-group.ts',
   'src/plugin/channel-plugin-surface-group.ts',
-  'src/plugin/channel-runtime-constants.ts',
+  'src/plugin/channel-runtime-builders-delivery.ts',
+  'src/plugin/channel-runtime-builders-status.ts',
   'src/plugin/channel-runtime-builders.ts',
+  'src/plugin/channel-runtime-constants.ts',
   'src/plugin/channel-runtime-types.ts',
   'src/plugin/channel-send.ts',
   'src/plugin/channel-utils.ts',
   'src/plugin/config.ts',
+  'src/plugin/connection-handlers-helpers.ts',
   'src/plugin/connection-handlers.ts',
-  'src/plugin/connection-state.ts',
+  'src/plugin/connection-state-helpers.ts',
   'src/plugin/connection-state-runtime-group.ts',
+  'src/plugin/connection-state.ts',
   'src/plugin/diagnostics-handlers.ts',
+  'src/plugin/error-message.ts',
   'src/plugin/file-ack-runtime.ts',
   'src/plugin/file-inbound-abort.ts',
   'src/plugin/file-inbound-chunk.ts',
@@ -118,9 +150,8 @@ const requiredSourceFiles = [
   'src/plugin/file-inbound-runtime.ts',
   'src/plugin/file-inbound-state.ts',
   'src/plugin/file-transfer-logs.ts',
-  'src/plugin/media-dedupe-runtime.ts',
+  'src/plugin/file-transfer-orchestrator-chunk.ts',
   'src/plugin/file-transfer-orchestrator.ts',
-  'src/plugin/media-orchestrators-runtime-group.ts',
   'src/plugin/file-transfer-runtime-group.ts',
   'src/plugin/file-transfer-send.ts',
   'src/plugin/file-transfer-setup.ts',
@@ -128,8 +159,10 @@ const requiredSourceFiles = [
   'src/plugin/gateway-methods.ts',
   'src/plugin/gateway-runtime.ts',
   'src/plugin/inbound-acceptance.ts',
-  'src/plugin/inbound-surface-handlers-group.ts',
   'src/plugin/inbound-handlers.ts',
+  'src/plugin/inbound-surface-handlers-group.ts',
+  'src/plugin/media-dedupe-runtime.ts',
+  'src/plugin/media-orchestrators-runtime-group.ts',
   'src/plugin/message-ack-runtime.ts',
   'src/plugin/message-policy.ts',
   'src/plugin/message-send.ts',
@@ -147,15 +180,20 @@ const requiredSourceFiles = [
   'src/plugin/outbox-push-route-runtime-group.ts',
   'src/plugin/outbox-push.ts',
   'src/plugin/outbox-route.ts',
+  'src/plugin/outbox-unified-push-flow.ts',
+  'src/plugin/runtime-diagnostics-assembler.ts',
+  'src/plugin/runtime-diagnostics-helpers.ts',
+  'src/plugin/runtime-diagnostics-payload-builders.ts',
   'src/plugin/runtime-diagnostics-snapshot.ts',
+  'src/plugin/scene-registry.ts',
   'src/plugin/setup.ts',
-  'src/plugin/state-transient-runtime-group.ts',
   'src/plugin/state-store.ts',
+  'src/plugin/state-transient-runtime-group.ts',
+  'src/plugin/status-runtime.ts',
+  'src/plugin/status.ts',
   'src/plugin/target-runtime.ts',
   'src/plugin/target-status-runtime-group.ts',
   'src/plugin/transient-state-runtime.ts',
-  'src/plugin/status-runtime.ts',
-  'src/plugin/status.ts',
   'src/runtime/log-dedupe.ts',
   'src/runtime/outbound-ack-timeout.ts',
   'src/runtime/outbound-flags.ts',

package/src/channel.ts

@@ -1741,6 +1741,7 @@ class BncrBridgeRuntime {
     handleFileTransferPushFailure: (args) => this.handleFileTransferPushFailure(args),
     handleTextPushFailure: (args) => this.handleTextPushFailure(args),
     isPrePushGuardDeferral: (entry) => this.isPrePushGuardDeferral(entry),
+    resolveActiveAccountIds: () => this.activeConnectionByAccount.keys(),
     resolveAccountIdForSession: (sessionKey) => {
       const hit = this.sessionRoutes.get(sessionKey);
       return hit ? hit.accountId : BNCR_DEFAULT_ACCOUNT_ID;

package/src/messaging/inbound/dispatch-prep.ts

@@ -392,7 +392,11 @@ export async function prepareBncrInboundSessionContext(args: {
   });
   const body = formatOpenClawAgentEnvelope(api, {
     channel: 'Bncr',
-    from: `${platform}:${groupId}:${userId}`,
+    from:
+      (parsed.userId
+        ? `${parsed.userName} (${parsed.userId})`
+        : parsed.userName || `${platform}:${groupId}:${userId}`) +
+      (parsed.msgId ? ` #${parsed.msgId}` : ''),
     timestamp: Date.now(),
     previousTimestamp: readBncrSessionUpdatedAt(api, {
       storePath,

package/src/messaging/outbound/marker-parser.ts

@@ -233,9 +233,28 @@ async function probeMediaPath(raw: string): Promise<{
       });
       clearTimeout(timer);
       if (response.ok || response.status === 206) return { ok: true };
-      return { ok: false, reason: `HTTP ${response.status} ${response.statusText}` };
+      // HEAD failed — try Range GET (first 4 bytes) as fallback.
+      // Some CDNs / object stores reject HEAD but serve GET with Range.
+      const probeReason = `HEAD ${response.status}`;
+      try {
+        const controller2 = new AbortController();
+        const timer2 = setTimeout(() => controller2.abort(), PROBE_TIMEOUT_MS);
+        const rangeResp = await fetch(path, {
+          method: 'GET',
+          headers: { Range: 'bytes=0-3' },
+          signal: controller2.signal,
+          redirect: 'follow',
+        });
+        clearTimeout(timer2);
+        if (rangeResp.status === 206 || rangeResp.ok) return { ok: true }; // 206=Range ok, other 2xx=server reachable
+        return { ok: false, reason: `${probeReason}, Range GET ${rangeResp.status}` };
+      } catch (err2: unknown) {
+        const reason2 = err2 instanceof Error ? err2.message : String(err2);
+        return { ok: false, reason: `${probeReason}, Range GET error: ${reason2}` };
+      }
     } catch (err: unknown) {
       const reason = err instanceof Error ? err.message : String(err);
+      // fetch-level error (DNS / timeout) — don't attempt fallback
       return { ok: false, reason };
     }
   }

package/src/plugin/ack-outbox-runtime-group.ts

@@ -20,6 +20,7 @@ export function createBncrAckOutboxRuntimeGroup(runtime: {
   clampFiniteNumber: (value: unknown, fallback: number, min?: number, max?: number) => number;
   normalizeAccountId: (accountId: string) => string;
   resolveAccountIdForSession: (sessionKey: string) => string | null;
+  resolveActiveAccountIds?: () => Iterable<string>;
   formatDisplayScope: (route: OutboxEntry['route']) => string;
   isFileTransferEntry: (entry: OutboxEntry) => boolean;
   recommendedAckTimeoutMaxMs: number;
@@ -237,6 +238,7 @@ export function createBncrAckOutboxRuntimeGroup(runtime: {
     handleTextPushFailure: runtime.handleTextPushFailure,
     isPrePushGuardDeferral: runtime.isPrePushGuardDeferral,
     resolveAccountIdForSession: runtime.resolveAccountIdForSession,
+    resolveActiveAccountIds: runtime.resolveActiveAccountIds,
     moveToDeadLetter: runtime.moveToDeadLetter,
     scheduleSave: runtime.scheduleSave,
     logInfo: runtime.logInfo,

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

@@ -53,8 +53,21 @@ export function createBncrBridgeOutboxFacade(runtime: {
     lastError: string;
     persist?: boolean;
   }) => {
+    const nowMs = runtime.now();
+    const nextRetry = (args.entry.retryCount || 0) + 1;
+    if (nextRetry > runtime.maxRetry) {
+      // Budget exhausted — dead-letter the entry
+      Object.assign(args.entry, {
+        lastError: args.lastError,
+        retryCount: nextRetry,
+        lastAttemptAt: nowMs,
+      });
+      moveToDeadLetter(args.entry, args.lastError);
+      return;
+    }
+    const nextAttemptAt = nowMs + runtime.backoffMs(nextRetry);
     const nextEntry = buildBncrOutboxFailureEntryPatch({
-      entry: args.entry,
+      entry: { ...args.entry, retryCount: nextRetry, lastAttemptAt: nowMs, nextAttemptAt },
       lastError: args.lastError,
     });
     Object.assign(args.entry, nextEntry);

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,