@xmoxmo/bncr 0.1.3 → 0.1.4

package/index.ts

@@ -59,6 +59,18 @@ const readOpenClawPackageName = (pkgPath: string) => {
   }
 };
 
+const readPluginVersion = () => {
+  try {
+    const raw = fs.readFileSync(path.join(pluginDir, 'package.json'), 'utf8');
+    const parsed = JSON.parse(raw);
+    return typeof parsed?.version === 'string' ? parsed.version : 'unknown';
+  } catch {
+    return 'unknown';
+  }
+};
+
+const pluginVersion = readPluginVersion();
+
 const findOpenClawPackageRoot = (startPath: string) => {
   let current = startPath;
   try {
@@ -273,7 +285,7 @@ const plugin = {
     const { bridge, runtime, created } = getBridgeSingleton(api);
     bridge.noteRegister?.({
       source: '~/.openclaw/workspace/plugins/bncr/index.ts',
-      pluginVersion: '0.1.1',
+      pluginVersion,
       apiRebound: !created,
       apiInstanceId: meta.apiInstanceId,
       registryFingerprint: meta.registryFingerprint,

package/package.json

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

package/src/channel.ts

@@ -70,6 +70,7 @@ const BNCR_PUSH_EVENT = 'bncr.push';
 const CONNECT_TTL_MS = 120_000;
 const MAX_RETRY = 10;
 const PUSH_DRAIN_INTERVAL_MS = 500;
+const PUSH_ACK_TIMEOUT_MS = 30_000;
 const FILE_FORCE_CHUNK = true; // 统一走 WS 分块，保留 base64 仅作兜底
 const FILE_INLINE_THRESHOLD = 5 * 1024 * 1024; // fallback 阈值（仅 FILE_FORCE_CHUNK=false 时生效）
 const FILE_CHUNK_SIZE = 256 * 1024; // 256KB
@@ -1179,7 +1180,6 @@ class BncrBridgeRuntime {
           })}`,
         );
       }
-      this.outbox.delete(entry.messageId);
       this.lastOutboundByAccount.set(entry.accountId, now());
       this.markActivity(entry.accountId);
       this.scheduleSave();
@@ -1249,92 +1249,6 @@ class BncrBridgeRuntime {
           })}`,
         );
       }
-      if (!online) {
-        const ctx = this.gatewayContext;
-        const directConnIds = Array.from(this.connections.values())
-          .filter((c) => normalizeAccountId(c.accountId) === acc && c.connId)
-          .map((c) => c.connId as string);
-
-        if (BNCR_DEBUG_VERBOSE) {
-          this.api.logger.info?.(
-            `[bncr-outbox-direct-push] ${JSON.stringify({
-              bridge: this.bridgeId,
-              accountId: acc,
-              outboxSize: this.outbox.size,
-              hasGatewayContext: Boolean(ctx),
-              connCount: directConnIds.length,
-            })}`,
-          );
-        }
-
-        if (!ctx) {
-          if (BNCR_DEBUG_VERBOSE) {
-            this.api.logger.info?.(
-              `[bncr-outbox-direct-push-skip] ${JSON.stringify({
-                bridge: this.bridgeId,
-                accountId: acc,
-                reason: 'no-gateway-context',
-              })}`,
-            );
-          }
-          continue;
-        }
-
-        if (!directConnIds.length) {
-          if (BNCR_DEBUG_VERBOSE) {
-            this.api.logger.info?.(
-              `[bncr-outbox-direct-push-skip] ${JSON.stringify({
-                accountId: acc,
-                reason: 'no-connection',
-              })}`,
-            );
-          }
-          continue;
-        }
-
-        const directPayloads = this.collectDue(acc, 50);
-        if (!directPayloads.length) continue;
-
-        try {
-          ctx.broadcastToConnIds(
-            BNCR_PUSH_EVENT,
-            {
-              forcePush: true,
-              items: directPayloads,
-            },
-            new Set(directConnIds),
-          );
-
-          const pushedIds = directPayloads
-            .map((item: any) => asString(item?.messageId || item?.idempotencyKey || '').trim())
-            .filter(Boolean);
-          for (const id of pushedIds) this.outbox.delete(id);
-          if (pushedIds.length) this.scheduleSave();
-
-          if (BNCR_DEBUG_VERBOSE) {
-            this.api.logger.info?.(
-              `[bncr-outbox-direct-push-ok] ${JSON.stringify({
-                bridge: this.bridgeId,
-                accountId: acc,
-                count: directPayloads.length,
-                connCount: directConnIds.length,
-                dropped: pushedIds.length,
-              })}`,
-            );
-          }
-        } catch (error) {
-          if (BNCR_DEBUG_VERBOSE) {
-            this.api.logger.info?.(
-              `[bncr-outbox-direct-push-fail] ${JSON.stringify({
-                accountId: acc,
-                error: asString((error as any)?.message || error || 'direct-push-error'),
-              })}`,
-            );
-          }
-        }
-        continue;
-      }
-
       this.pushDrainRunningAccounts.add(acc);
       try {
         let localNextDelay: number | null = null;
@@ -1346,7 +1260,6 @@ class BncrBridgeRuntime {
             .sort((a, b) => a.createdAt - b.createdAt);
 
           if (!entries.length) break;
-          if (!this.isOnline(acc)) break;
 
           const entry = entries.find((item) => item.nextAttemptAt <= t);
           if (!entry) {
@@ -1355,11 +1268,33 @@ class BncrBridgeRuntime {
             break;
           }
 
+          const onlineNow = this.isOnline(acc);
           const pushed = this.tryPushEntry(entry);
           if (pushed) {
+            if (onlineNow) {
+              await this.waitForOutbound(acc, PUSH_ACK_TIMEOUT_MS);
+            }
+
+            if (!this.outbox.has(entry.messageId)) {
+              await this.sleepMs(PUSH_DRAIN_INTERVAL_MS);
+              continue;
+            }
+
+            entry.retryCount += 1;
+            entry.lastAttemptAt = now();
+            if (entry.retryCount > MAX_RETRY) {
+              this.moveToDeadLetter(entry, entry.lastError || 'push-ack-timeout');
+              continue;
+            }
+            entry.nextAttemptAt = now() + backoffMs(entry.retryCount);
+            entry.lastError = entry.lastError || 'push-ack-timeout';
+            this.outbox.set(entry.messageId, entry);
             this.scheduleSave();
+
+            const wait = Math.max(0, entry.nextAttemptAt - now());
+            localNextDelay = localNextDelay == null ? wait : Math.min(localNextDelay, wait);
             await this.sleepMs(PUSH_DRAIN_INTERVAL_MS);
-            continue;
+            break;
           }
 
           const nextAttempt = entry.retryCount + 1;
@@ -2230,7 +2165,7 @@ class BncrBridgeRuntime {
       mediaUrls?: string[];
       asVoice?: boolean;
       audioAsVoice?: boolean;
-      kind?: 'block' | 'final';
+      kind?: 'tool' | 'block' | 'final';
     };
     mediaLocalRoots?: readonly string[];
   }) {
@@ -2413,6 +2348,7 @@ class BncrBridgeRuntime {
     if (ok) {
       this.outbox.delete(messageId);
       this.scheduleSave();
+      this.wakeAccountWaiters(accountId);
       respond(true, { ok: true });
       return;
     }
@@ -3189,7 +3125,6 @@ export function createBncrChannelPlugin(bridge: BncrBridgeRuntime) {
     },
     outbound: {
       deliveryMode: 'gateway' as const,
-      textChunkLimit: 4000,
       sendText: bridge.channelSendText,
       sendMedia: bridge.channelSendMedia,
       replyAction: async (ctx: any) =>

package/src/messaging/inbound/commands.ts

@@ -3,6 +3,7 @@ import {
   normalizeInboundSessionKey,
   withTaskSessionKey,
 } from '../../core/targets.ts';
+import { buildBncrReplyConfig } from './reply-config.ts';
 
 type ParsedInbound = ReturnType<typeof import('./parse.ts')['parseBncrInboundParams']>;
 
@@ -122,20 +123,18 @@ export async function handleBncrNativeCommand(params: {
     },
   });
 
+  const effectiveReply = buildBncrReplyConfig(cfg);
+
   let responded = false;
   await api.runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
     ctx: ctxPayload,
-    cfg,
-    replyOptions: {
-      disableBlockStreaming: true,
-    },
+    cfg: effectiveReply.replyCfg,
     dispatcherOptions: {
       deliver: async (
         payload: { text?: string; mediaUrl?: string; mediaUrls?: string[]; audioAsVoice?: boolean },
         info?: { kind?: 'tool' | 'block' | 'final' },
       ) => {
         const kind = info?.kind;
-        if (kind && kind !== 'final') return;
         const hasPayload = Boolean(
           payload?.text ||
             payload?.mediaUrl ||
@@ -149,11 +148,14 @@ export async function handleBncrNativeCommand(params: {
           route,
           payload: {
             ...payload,
-            kind: kind as 'block' | 'final' | undefined,
+            kind: kind as 'tool' | 'block' | 'final' | undefined,
           },
         });
       },
     },
+    replyOptions: {
+      disableBlockStreaming: !effectiveReply.blockStreaming,
+    },
   });
 
   if (!responded) {

package/src/messaging/inbound/dispatch.ts

@@ -5,6 +5,7 @@ import {
   withTaskSessionKey,
 } from '../../core/targets.ts';
 import { handleBncrNativeCommand } from './commands.ts';
+import { buildBncrReplyConfig } from './reply-config.ts';
 
 type ParsedInbound = ReturnType<typeof import('./parse.ts')['parseBncrInboundParams']>;
 
@@ -179,19 +180,17 @@ export async function dispatchBncrInbound(params: {
   setInboundActivity(accountId, inboundAt);
   scheduleSave();
 
+  const effectiveReply = buildBncrReplyConfig(cfg);
+
   await api.runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
     ctx: ctxPayload,
-    cfg,
-    replyOptions: {
-      disableBlockStreaming: true,
-    },
+    cfg: effectiveReply.replyCfg,
     dispatcherOptions: {
       deliver: async (
         payload: { text?: string; mediaUrl?: string; mediaUrls?: string[]; audioAsVoice?: boolean },
         info?: { kind?: 'tool' | 'block' | 'final' },
       ) => {
         const kind = info?.kind;
-        if (kind && kind !== 'final') return;
 
         await enqueueFromReply({
           accountId,
@@ -199,7 +198,7 @@ export async function dispatchBncrInbound(params: {
           route,
           payload: {
             ...payload,
-            kind: kind as 'block' | 'final' | undefined,
+            kind: kind as 'tool' | 'block' | 'final' | undefined,
           },
         });
       },
@@ -207,6 +206,9 @@ export async function dispatchBncrInbound(params: {
         logger?.error?.(`bncr reply failed: ${String(err)}`);
       },
     },
+    replyOptions: {
+      disableBlockStreaming: !effectiveReply.blockStreaming,
+    },
   });
 
   return {

package/src/messaging/inbound/reply-config.ts

@@ -0,0 +1,50 @@
+type BncrReplyConfigResult = {
+  blockStreaming: boolean;
+  replyCfg: any;
+};
+
+function parseBooleanLike(value: unknown): boolean | undefined {
+  if (typeof value === 'boolean') return value;
+  if (typeof value === 'number') {
+    if (value === 1) return true;
+    if (value === 0) return false;
+    return undefined;
+  }
+  if (typeof value !== 'string') return undefined;
+
+  const normalized = value.trim().toLowerCase();
+  if (!normalized) return undefined;
+  if (['true', 'on', '1', 'yes'].includes(normalized)) return true;
+  if (['false', 'off', '0', 'no'].includes(normalized)) return false;
+  return undefined;
+}
+
+export function resolveBncrBlockStreaming(cfg: any): boolean {
+  const channelValue = parseBooleanLike(cfg?.channels?.bncr?.blockStreaming);
+  if (channelValue !== undefined) return channelValue;
+
+  const globalValue = parseBooleanLike(cfg?.agents?.defaults?.blockStreamingDefault);
+  if (globalValue !== undefined) return globalValue;
+
+  return true;
+}
+
+export function buildBncrReplyConfig(cfg: any): BncrReplyConfigResult {
+  const blockStreaming = resolveBncrBlockStreaming(cfg);
+
+  const replyCfg = {
+    ...cfg,
+    agents: {
+      ...(cfg?.agents ?? {}),
+      defaults: {
+        ...(cfg?.agents?.defaults ?? {}),
+      },
+    },
+  };
+
+  if (replyCfg.agents.defaults.blockStreamingBreak == null) {
+    replyCfg.agents.defaults.blockStreamingBreak = 'message_end';
+  }
+
+  return { blockStreaming, replyCfg };
+}