@xmoxmo/bncr 0.2.5 → 0.2.6

package/src/messaging/inbound/session-label.ts

@@ -0,0 +1,115 @@
+import {
+  recordSessionMetaFromInbound,
+  updateSessionStoreEntry,
+} from 'openclaw/plugin-sdk/session-store-runtime';
+import { emitBncrLogLine } from '../../core/logging.ts';
+
+type RecordInboundSessionFn = (args: any) => Promise<unknown> | unknown;
+
+export function buildBncrInboundSessionIdentityPatch(args: {
+  channelId: string;
+  accountId: string;
+  chatType: 'direct' | 'group';
+  displayTo: string;
+  senderId: string;
+}) {
+  const { channelId, accountId, chatType, displayTo, senderId } = args;
+  return {
+    label: displayTo,
+    channel: channelId,
+    chatType,
+    origin: {
+      label: displayTo,
+      provider: channelId,
+      surface: channelId,
+      chatType,
+      from: senderId,
+      to: displayTo,
+      accountId,
+    },
+    deliveryContext: {
+      channel: channelId,
+      to: displayTo,
+      accountId,
+    },
+    route: {
+      channel: channelId,
+      accountId,
+      target: { to: displayTo },
+    },
+    lastTo: displayTo,
+  };
+}
+
+function normalizeNonEmptyString(value: unknown): string | null {
+  const normalized = String(value ?? '').trim();
+  return normalized || null;
+}
+
+export async function correctBncrInboundSessionLabel(args: {
+  storePath: string;
+  sessionKey: string;
+  expectedLabel: string;
+}) {
+  const storePath = normalizeNonEmptyString(args.storePath);
+  const sessionKey = normalizeNonEmptyString(args.sessionKey);
+  const expectedLabel = normalizeNonEmptyString(args.expectedLabel);
+  if (!storePath || !sessionKey || !expectedLabel) return;
+
+  try {
+    await updateSessionStoreEntry({
+      storePath,
+      sessionKey,
+      update: (entry: any) => {
+        if (entry?.label === expectedLabel) return null;
+        return { label: expectedLabel };
+      },
+    });
+  } catch (err) {
+    emitBncrLogLine('warn', `[bncr] inbound session label correction failed: ${String(err)}`);
+  }
+}
+
+export async function recordAndPatchBncrInboundSessionEntry(args: {
+  storePath: string;
+  sessionKey: string;
+  ctx?: Record<string, unknown>;
+  patch: Record<string, unknown>;
+}) {
+  const storePath = normalizeNonEmptyString(args.storePath);
+  const sessionKey = normalizeNonEmptyString(args.sessionKey);
+  if (!storePath || !sessionKey) return;
+
+  try {
+    if (args.ctx) {
+      await recordSessionMetaFromInbound({
+        storePath,
+        sessionKey,
+        ctx: args.ctx as any,
+        createIfMissing: true,
+      });
+    }
+    await updateSessionStoreEntry({
+      storePath,
+      sessionKey,
+      update: () => args.patch,
+    });
+  } catch (err) {
+    emitBncrLogLine('warn', `[bncr] inbound session patch failed: ${String(err)}`);
+  }
+}
+
+export function wrapBncrInboundRecordSessionLabelCorrection(args: {
+  recordInboundSession: RecordInboundSessionFn;
+  expectedLabel: string;
+}): RecordInboundSessionFn {
+  return async (recordArgs: any) => {
+    const result = await args.recordInboundSession(recordArgs);
+    await correctBncrInboundSessionLabel({
+      storePath: recordArgs?.storePath,
+      sessionKey: recordArgs?.sessionKey,
+      expectedLabel: args.expectedLabel,
+    });
+    return result;
+  };
+}

package/src/messaging/outbound/diagnostics.ts

@@ -119,15 +119,31 @@ export function buildOutboxAckDebugInfo(args: {
   connIds?: Iterable<string>;
   ownerConnId?: string;
   ownerClientId?: string;
+  sessionKey?: string;
+  to?: string;
+  ackStage?: string;
+  ackOutcome?: string;
+  reason?: string;
   kind?: string;
   event?: string;
+  ackTimeoutMs?: number;
+  adaptiveAckTimeoutEnabled?: boolean;
 }) {
   return {
     messageId: args.messageId,
     accountId: args.accountId,
+    ...(args.sessionKey ? { sessionKey: args.sessionKey } : {}),
+    ...(args.to ? { to: args.to } : {}),
     ...(args.kind ? { kind: args.kind } : {}),
     requireAck: args.requireAck,
     ackResult: args.ackResult,
+    ackStage: args.ackStage || 'message',
+    ackOutcome: args.ackOutcome || args.ackResult,
+    ...(args.reason ? { reason: args.reason } : {}),
+    ...(typeof args.ackTimeoutMs === 'number' ? { ackTimeoutMs: args.ackTimeoutMs } : {}),
+    ...(typeof args.adaptiveAckTimeoutEnabled === 'boolean'
+      ? { adaptiveAckTimeoutEnabled: args.adaptiveAckTimeoutEnabled }
+      : {}),
     onlineNow: args.onlineNow,
     recentInboundReachable: args.recentInboundReachable,
     ...(args.connIds ? { connIds: Array.from(args.connIds) } : {}),

package/src/messaging/outbound/media.ts

@@ -1,3 +1,5 @@
+import { normalizeOutboundReplyToId } from './reply-target-policy.ts';
+
 function asString(v: unknown, fallback = ''): string {
   if (typeof v === 'string') return v;
   if (v == null) return fallback;
@@ -64,7 +66,7 @@ export function buildBncrMediaOutboundFrame(params: {
     messageId: params.messageId,
     idempotencyKey: params.messageId,
     sessionKey: params.sessionKey,
-    replyToId: asString(params.replyToId || '').trim() || undefined,
+    replyToId: normalizeOutboundReplyToId({ kind: params.kind, replyToId: params.replyToId }) || undefined,
     message: {
       platform: params.route.platform,
       groupId: params.route.groupId,

package/src/messaging/outbound/queue-selectors.ts

@@ -25,8 +25,13 @@ export type OutboxFileTransferRouteSelection = {
   ownerConnId?: string;
 };
 
+function finiteNumberOr(value: unknown, fallback: number): number {
+  const n = Number(value);
+  return Number.isFinite(n) ? n : fallback;
+}
+
 export function computeOutboxRetryWait(nextAttemptAt: number, nowMs: number): number {
-  return Math.max(0, Number(nextAttemptAt || 0) - nowMs);
+  return Math.max(0, finiteNumberOr(nextAttemptAt, 0) - finiteNumberOr(nowMs, 0));
 }
 
 export function updateMinOutboxDelay(currentDelay: number | null, candidateDelay: number | null): number | null {
@@ -35,7 +40,7 @@ export function updateMinOutboxDelay(currentDelay: number | null, candidateDelay
 }
 
 export function clampOutboxDrainDelay(delayMs: number): number {
-  return Math.max(0, Math.min(Number(delayMs || 0), 30_000));
+  return Math.max(0, Math.min(finiteNumberOr(delayMs, 0), 30_000));
 }
 
 export function selectOutboxTargetAccounts(args: {

package/src/messaging/outbound/reasons.ts

@@ -38,6 +38,10 @@ export const OUTBOUND_SCHEDULE_SOURCE = {
   RETRY_REROUTE_WAIT: 'retry-reroute-wait',
   // Direct push failure kept entry in outbox and scheduled backoff.
   PUSH_FAIL_WAIT: 'push-fail-wait',
+  // Per-account flush processed its single-run item budget and yielded to the next drain.
+  ACCOUNT_BUDGET_YIELD: 'account-budget-yield',
+  // Per-account flush spent its single-run time budget and yielded to the next drain.
+  ACCOUNT_TIME_BUDGET_YIELD: 'account-time-budget-yield',
   // Account-local next delay was merged into bridge-global next delay.
   ACCOUNT_NEXT_DELAY_MERGE: 'account-next-delay-merge',
   // flushPushQueue(...) finished and armed the next bridge-level drain.

package/src/messaging/outbound/reply-enqueue.ts

@@ -1,6 +1,6 @@
 import type { BncrRoute, OutboxEntry } from '../../core/types.ts';
 import { buildReplyMediaFallbackDebugInfo } from './diagnostics.ts';
-import { normalizeReplyToId } from './media-dedupe.ts';
+import { normalizeOutboundReplyToId } from './reply-target-policy.ts';
 
 export type ReplyPayloadInput = {
   text?: string;
@@ -324,6 +324,6 @@ export function normalizeReplyPayload(
     asVoice: payload?.asVoice === true,
     audioAsVoice: payload?.audioAsVoice === true,
     kind: payload?.kind,
-    replyToId: normalizeReplyToId(payload?.replyToId),
+    replyToId: normalizeOutboundReplyToId({ kind: payload?.kind, replyToId: payload?.replyToId }),
   };
 }

package/src/messaging/outbound/reply-target-policy.ts

@@ -0,0 +1,13 @@
+import { normalizeReplyToId } from './media-dedupe.ts';
+
+export type OutboundReplyKind = 'tool' | 'block' | 'final';
+
+const STRIP_TOOL_REPLY_TO_ID = true;
+
+export function normalizeOutboundReplyToId(params: {
+  kind?: OutboundReplyKind;
+  replyToId?: string | null;
+}) {
+  if (params.kind === 'tool' && STRIP_TOOL_REPLY_TO_ID) return '';
+  return normalizeReplyToId(params.replyToId);
+}

package/src/messaging/outbound/retry-policy.ts

@@ -1,5 +1,11 @@
 import type { BncrRoute } from '../../channel.ts';
 
+function finiteNonNegativeIntegerOr(value: unknown, fallback: number): number {
+  const n = Number(value);
+  if (!Number.isFinite(n) || n < 0) return fallback;
+  return Math.floor(n);
+}
+
 export type RetryRerouteDecisionInput = {
   nowMs: number;
   maxRetry: number;
@@ -51,7 +57,9 @@ export function computeRetryRerouteDecision(
   const hasUntriedAlternative = availableConnIds.some((connId) => !attemptedConnIds.includes(connId));
   const shouldFastReroute = input.requireAck && input.currentFastReroutePending !== true && hasUntriedAlternative;
 
-  const nextRetryCount = Number(input.currentRetryCount || 0) + 1;
+  const currentRetryCount = finiteNonNegativeIntegerOr(input.currentRetryCount, 0);
+  const currentRouteAttemptRound = finiteNonNegativeIntegerOr(input.currentRouteAttemptRound, 0);
+  const nextRetryCount = currentRetryCount + 1;
   const lastAttemptAt = input.nowMs;
   const terminalReason =
     input.lastError || (input.requireAck ? 'push-ack-timeout' : 'push-delivery-unconfirmed');
@@ -67,7 +75,7 @@ export function computeRetryRerouteDecision(
 
   const nextAttemptAt = shouldFastReroute ? input.nowMs + 1_000 : input.nowMs + deps.backoffMs(nextRetryCount);
   const lastError = input.requireAck ? 'push-ack-timeout' : 'push-delivery-unconfirmed';
-  const routeAttemptRound = hasUntriedAlternative ? Number(input.currentRouteAttemptRound || 0) : Number(input.currentRouteAttemptRound || 0) + 1;
+  const routeAttemptRound = hasUntriedAlternative ? currentRouteAttemptRound : currentRouteAttemptRound + 1;
   const fastReroutePending = hasUntriedAlternative ? shouldFastReroute || input.currentFastReroutePending === true : false;
 
   return {
@@ -111,7 +119,8 @@ export function computePushFailureDecision(
   input: PushFailureDecisionInput,
   deps: { backoffMs: (retryCount: number) => number },
 ): PushFailureDecision {
-  const nextRetryCount = Number(input.currentRetryCount || 0) + 1;
+  const currentRetryCount = finiteNonNegativeIntegerOr(input.currentRetryCount, 0);
+  const nextRetryCount = currentRetryCount + 1;
   const lastAttemptAt = input.nowMs;
 
   if (nextRetryCount > input.maxRetry) {

package/src/messaging/outbound/send.ts

@@ -3,6 +3,7 @@ export async function sendBncrText(params: {
   accountId: string;
   to: string;
   text: string;
+  kind?: 'tool' | 'block' | 'final';
   replyToId?: string;
   mediaLocalRoots?: readonly string[];
   resolveVerifiedTarget: (
@@ -18,6 +19,7 @@ export async function sendBncrText(params: {
       text?: string;
       mediaUrl?: string;
       mediaUrls?: string[];
+      kind?: 'tool' | 'block' | 'final';
       replyToId?: string;
     };
     mediaLocalRoots?: readonly string[];
@@ -33,6 +35,7 @@ export async function sendBncrText(params: {
     route: verified.route,
     payload: {
       text: params.text,
+      kind: params.kind,
       replyToId: params.replyToId,
     },
     mediaLocalRoots: params.mediaLocalRoots,
@@ -54,6 +57,7 @@ export async function sendBncrMedia(params: {
   mediaUrls?: string[];
   asVoice?: boolean;
   audioAsVoice?: boolean;
+  kind?: 'tool' | 'block' | 'final';
   replyToId?: string;
   mediaLocalRoots?: readonly string[];
   resolveVerifiedTarget: (
@@ -71,6 +75,7 @@ export async function sendBncrMedia(params: {
       mediaUrls?: string[];
       asVoice?: boolean;
       audioAsVoice?: boolean;
+      kind?: 'tool' | 'block' | 'final';
       replyToId?: string;
     };
     mediaLocalRoots?: readonly string[];
@@ -90,6 +95,7 @@ export async function sendBncrMedia(params: {
       mediaUrls: params.mediaUrls?.length ? params.mediaUrls : undefined,
       asVoice: params.asVoice === true ? true : undefined,
       audioAsVoice: params.audioAsVoice === true ? true : undefined,
+      kind: params.kind,
       replyToId: params.replyToId,
     },
     mediaLocalRoots: params.mediaLocalRoots,