@xmoxmo/bncr 0.6.7 → 0.6.9

package/src/channel.ts

@@ -201,6 +201,7 @@ import {
   createBncrOutboxDiagnosticsHelpers,
   createBncrRuntimeAckObservabilityBuilder,
 } from './plugin/runtime-diagnostics-snapshot.ts';
+import { buildRouteSceneKey } from './plugin/scene-registry.ts';
 import { BNCR_SETUP_SURFACE } from './plugin/setup.ts';
 import type { BncrHistoryShardRow } from './plugin/sqlite-state.ts';
 import { createBncrStateTransientRuntimeGroup } from './plugin/state-transient-runtime-group.ts';
@@ -309,6 +310,12 @@ class BncrBridgeRuntime {
   getSceneRegistry(): Map<string, BncrSceneRecord> {
     return this.sceneRegistry;
   }
+  resolveOutboundAgentId(route: BncrRoute): string {
+    return (
+      asString(this.sceneRegistry.get(buildRouteSceneKey(route))?.agentId).trim() ||
+      this.defaultPublicAgentId()
+    );
+  }
   private conversationHistories: BncrConversationHistoryMap = new Map();
   private outboundReplayCache: BncrOutboundReplayCache = new Map();
   private routeAliases = new Map<
@@ -348,6 +355,7 @@ class BncrBridgeRuntime {
   // 内置健康/回归计数（替代独立脚本）
   private startedAt = now();
   private stopped = false;
+  private serviceStarted = false;
   private connectEventsByAccount = new Map<string, number>();
   private inboundEventsByAccount = new Map<string, number>();
   private activityEventsByAccount = new Map<string, number>();
@@ -840,8 +848,21 @@ class BncrBridgeRuntime {
     return BNCR_DEBUG_VERBOSE;
   }
 
-  startService = async (ctx: OpenClawPluginServiceContext, debug?: boolean) => {
-    await startBncrBridgeService(
+  getRuntimeObservation() {
+    const activeChannelAccounts = this.channelAccountWorkers.size;
+    return {
+      serviceRunning: this.serviceStarted,
+      channelRunning: activeChannelAccounts > 0,
+      activeChannelAccounts,
+    };
+  }
+
+  startService = async (
+    ctx: OpenClawPluginServiceContext,
+    debug?: boolean,
+    isStartCurrent?: () => boolean,
+  ) => {
+    const started = await startBncrBridgeService(
       {
         bridgeId: this.bridgeId,
         setStopped: (value) => {
@@ -865,11 +886,19 @@ class BncrBridgeRuntime {
           (((cfg as BncrChannelConfigRoot | null | undefined)?.channels || null)?.[CHANNEL_ID] as
             | Record<string, unknown>
             | undefined) || {},
+        resumeOutboxDrain: () => {
+          if (this.outbox.size === 0 || this.connections.size === 0) return;
+          this.schedulePushDrain(0);
+        },
+        isStartCurrent,
       },
       ctx,
       debug,
     );
+    if (!started || this.stopped || !(isStartCurrent?.() ?? true)) return false;
     this.startHistoryShardWorker();
+    this.serviceStarted = true;
+    return true;
   };
 
   stopService = async () => {
@@ -887,6 +916,7 @@ class BncrBridgeRuntime {
   }
 
   private cleanupRuntimeWaitersAndTimers(reason: string) {
+    this.serviceStarted = false;
     this.stopHistoryShardWorker(reason);
     this.clientRpcRuntime.shutdown();
     cleanupBncrBridgeRuntime(

package/src/messaging/outbound/session-route.ts

@@ -27,12 +27,11 @@ type BncrOutboundSessionRoute = ChannelOutboundSessionRoute & BncrChannelRouteRe
 type ResolveBncrOutboundSessionRouteParams = {
   cfg: BncrChannelConfigRoot;
   channel: string;
-  agentId: string;
   accountId?: string;
   target: string;
   resolvedTarget?: { to?: string } | null;
   threadId?: string | number | null;
-  canonicalAgentId: string;
+  resolveAgentId: (route: BncrRoute) => string;
   resolveRouteBySession?: (raw: string, accountId: string) => BncrRoute | null;
 };
 
@@ -76,15 +75,14 @@ export function resolveBncrOutboundSessionRoute(params: ResolveBncrOutboundSessi
 
   if (!route) return null;
 
-  const canonicalAgentId =
-    asString(params.canonicalAgentId).trim() || asString(params.agentId).trim() || 'main';
+  const agentId = asString(params.resolveAgentId(route)).trim() || 'public';
   const peerId = routeScopeToHex(route);
-  const sessionKey = buildCanonicalBncrSessionKey(route, canonicalAgentId);
+  const sessionKey = buildCanonicalBncrSessionKey(route, agentId);
   const displayTo = formatDisplayScope(route);
 
   const built = buildOpenClawChannelOutboundSessionRoute({
     cfg: params.cfg,
-    agentId: canonicalAgentId,
+    agentId,
     channel: params.channel,
     accountId: params.accountId,
     peer: {

package/src/plugin/bridge-lifecycle.ts

@@ -59,13 +59,15 @@ export function startBncrBridgeService(
     getChannelConfigRoot: (
       cfg: BncrChannelConfigRoot,
     ) => BncrChannelPolicyConfig | null | undefined;
+    resumeOutboxDrain?: () => void;
+    isStartCurrent?: () => boolean;
   },
   ctx: OpenClawPluginServiceContext,
   debug?: boolean,
 ) {
-  runtime.setStopped(false);
   runtime.setStatePath(path.join(ctx.stateDir, 'bncr-bridge-state.json'));
   return (async () => {
+    const isStartCurrent = () => runtime.isStartCurrent?.() ?? true;
     try {
       const cfg = runtime.getRuntimeConfig();
       runtime.initializeCanonicalAgentId(cfg);
@@ -76,8 +78,10 @@ export function startBncrBridgeService(
       // ignore startup canonical agent initialization errors
     }
     await runtime.loadState();
+    if (!isStartCurrent()) return false;
     if (process.env.BNCR_SQLITE_CUTOVER === '1' && runtime.cutoverToSqlite) {
       const cutover = await runtime.cutoverToSqlite();
+      if (!isStartCurrent()) return false;
       runtime.logInfo(
         'sqlite',
         `cutover completed backup=${cutover.backupPath || 'none'} storeMode=${cutover.storeMode}`,
@@ -85,6 +89,8 @@ export function startBncrBridgeService(
     }
     if (typeof debug === 'boolean') runtime.setDebugFlag(debug);
     await runtime.refreshDebugFlagFromConfig({ forceLog: true });
+    if (!isStartCurrent()) return false;
+    runtime.setStopped(false);
     const bootDiag = runtime.buildIntegratedDiagnostics(BNCR_DEFAULT_ACCOUNT_ID);
     runtime.logInfo(
       'startup',
@@ -95,7 +101,12 @@ export function startBncrBridgeService(
       `service started bridge=${runtime.bridgeId} diag.ok=${bootDiag.regression.ok} routes=${bootDiag.regression.totalKnownRoutes} pending=${bootDiag.health.pending} dead=${bootDiag.health.deadLetter}`,
       { debugOnly: true },
     );
-  })();
+    runtime.resumeOutboxDrain?.();
+    return true;
+  })().catch((error) => {
+    runtime.setStopped(true);
+    throw error;
+  });
 }
 
 export function cleanupBncrBridgeRuntime(

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

@@ -34,6 +34,7 @@ export type BncrChannelPluginBridge = {
     channelId: string;
     peer: { kind: 'direct'; id: string };
   }) => string;
+  resolveOutboundAgentId: (route: BncrRoute) => string;
   resolveRouteBySession: (raw: string, accountId: string) => BncrRoute | null;
   getChannelSummary: (defaultAccountId: string) => Record<string, unknown>;
   getAccountRuntimeSnapshot: (accountId: string) => BncrStatusRuntimeSnapshot;
@@ -90,14 +91,7 @@ export function createBncrChannelPluginBridgeGroup(runtime: {
   const getMessagingBridge = () => {
     const bridge = runtime.getBridge();
     return {
-      canonicalAgentId: undefined,
-      ensureCanonicalAgentId: (params: { cfg: BncrChannelConfigRoot; accountId: string }) =>
-        bridge.ensureCanonicalAgentId({
-          cfg: params.cfg,
-          accountId: params.accountId,
-          channelId: runtime.channelId,
-          peer: { kind: 'direct', id: params.accountId },
-        }),
+      resolveOutboundAgentId: (route: BncrRoute) => bridge.resolveOutboundAgentId(route),
       resolveRouteBySession: (raw: string, accountId: string) =>
         bridge.resolveRouteBySession(raw, accountId),
     };

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

@@ -3,13 +3,13 @@ import { Type } from 'typebox';
 import { listAccountIds, normalizeAccountId, resolveAccount } from '../core/accounts.ts';
 import { BncrConfigSchema } from '../core/config-schema.ts';
 import { resolveBncrChannelPolicy } from '../core/policy.ts';
+import type { BncrRoute } from '../core/types.ts';
 import type { ReplyPayloadInput } from '../messaging/outbound/reply-enqueue.ts';
 import type { OutboundReplyTargetPolicy } from '../messaging/outbound/reply-target-policy.ts';
 import type { OpenClawChannelToolSend, openClawJsonResult } from '../openclaw/sdk-helpers.ts';
 import { readOpenClawStringParam } from '../openclaw/sdk-helpers.ts';
 import type { BncrBridgeCallBridge } from './bridge-call.ts';
 import type {
-  BncrChannelConfigRoot,
   BncrChannelSendContext,
   BncrMessageToolSchemaContribution,
   BncrSceneRecord,
@@ -81,8 +81,7 @@ export function createBncrChannelPluginSurfaceGroup(runtime: {
   };
   getOutboundBridge: () => BncrOutboundBridge;
   getMessagingBridge: () => {
-    canonicalAgentId: undefined;
-    ensureCanonicalAgentId: (params: { cfg: BncrChannelConfigRoot; accountId: string }) => string;
+    resolveOutboundAgentId: (route: BncrRoute) => string;
     resolveRouteBySession: (raw: string, accountId: string) => BncrVerifiedTarget['route'] | null;
   };
   getStatusBridge: () => {

package/src/plugin/messaging.ts

@@ -15,8 +15,7 @@ function formatBncrHumanDisplay(route: BncrRoute): string {
 }
 
 type BncrMessagingRuntimeBridge = {
-  canonicalAgentId?: string;
-  ensureCanonicalAgentId: (params: { cfg: BncrChannelConfigRoot; accountId: string }) => string;
+  resolveOutboundAgentId: (route: BncrRoute) => string;
   resolveRouteBySession: (raw: string, accountId: string) => BncrRoute | null;
 };
 
@@ -44,6 +43,7 @@ type BncrMessagingSessionTargetArgs = {
 };
 
 type BncrMessagingOutboundSessionRouteArgs = {
+  /** Host-reported owner. BNCR resolves ownership from its persisted scene registry instead. */
   agentId: string;
   target: string;
   resolvedTarget?: { to?: string } | null;
@@ -99,21 +99,9 @@ function resolveMessagingAccountId(accountId: unknown) {
   return normalizeAccountId(asSanitizedString(accountId || BNCR_DEFAULT_ACCOUNT_ID));
 }
 
-function resolveMessagingCanonicalAgentId(
-  runtimeBridge: BncrMessagingRuntimeBridge,
-  cfg: BncrChannelConfigRoot,
-  accountId: string,
-) {
-  return runtimeBridge.canonicalAgentId || runtimeBridge.ensureCanonicalAgentId({ cfg, accountId });
-}
-
-export function createBncrMessagingExplicitTargetParser(
-  getBridge: () => BncrMessagingRuntimeBridge,
-) {
+export function createBncrMessagingExplicitTargetParser() {
   return ({ raw }: BncrMessagingExplicitTargetArgs) => {
-    const runtimeBridge = getBridge();
-    const canonicalAgentId = runtimeBridge.canonicalAgentId || 'main';
-    const parsed = parseExplicitTarget(asSanitizedString(raw).trim(), { canonicalAgentId });
+    const parsed = parseExplicitTarget(asSanitizedString(raw).trim());
     if (!parsed) return null;
     const chatType: ChatType = parsed.route?.groupId ? 'group' : 'direct';
     return {
@@ -125,16 +113,12 @@ export function createBncrMessagingExplicitTargetParser(
   };
 }
 
-export function createBncrMessagingSessionTargetResolver(
-  getBridge: () => BncrMessagingRuntimeBridge,
-) {
+export function createBncrMessagingSessionTargetResolver() {
   return ({ id }: BncrMessagingSessionTargetArgs) => {
     const raw = asSanitizedString(id).trim();
     if (!raw) return undefined;
-    const runtimeBridge = getBridge();
-    const canonicalAgentId = runtimeBridge.canonicalAgentId || 'main';
 
-    const parsed = parseExplicitTarget(raw, { canonicalAgentId });
+    const parsed = parseExplicitTarget(raw);
     if (!parsed) {
       return raw || undefined;
     }
@@ -146,17 +130,10 @@ export function createBncrMessagingOutboundSessionRouteResolver(
   getBridge: () => BncrMessagingRuntimeBridge,
 ) {
   return (params: BncrMessagingOutboundSessionRouteArgs) => {
-    const accountId = resolveMessagingAccountId(params?.accountId);
     const runtimeBridge = getBridge();
-    const canonicalAgentId = resolveMessagingCanonicalAgentId(
-      runtimeBridge,
-      params?.cfg,
-      accountId,
-    );
     return resolveBncrOutboundSessionRoute({
       channel: 'bncr',
       cfg: params.cfg,
-      agentId: params.agentId,
       accountId: params.accountId ?? undefined,
       target: params.target,
       resolvedTarget: params.resolvedTarget,
@@ -164,7 +141,7 @@ export function createBncrMessagingOutboundSessionRouteResolver(
         params.threadId === null || params.threadId === undefined
           ? undefined
           : asSanitizedString(params.threadId),
-      canonicalAgentId,
+      resolveAgentId: (route) => runtimeBridge.resolveOutboundAgentId(route),
       resolveRouteBySession: (raw: string, acc: string) =>
         runtimeBridge.resolveRouteBySession(raw, acc),
     });
@@ -175,9 +152,9 @@ export function createBncrMessagingSurface(getBridge: () => BncrMessagingRuntime
   return {
     // 接收任意标签输入；不在 normalize 阶段做格式门槛，统一下沉到发送前验证。
     normalizeTarget: normalizeBncrMessagingTarget,
-    parseExplicitTarget: createBncrMessagingExplicitTargetParser(getBridge),
+    parseExplicitTarget: createBncrMessagingExplicitTargetParser(),
     formatTargetDisplay: formatBncrMessagingTargetDisplay,
-    resolveSessionTarget: createBncrMessagingSessionTargetResolver(getBridge),
+    resolveSessionTarget: createBncrMessagingSessionTargetResolver(),
     resolveOutboundSessionRoute: createBncrMessagingOutboundSessionRouteResolver(getBridge),
     targetResolver: createBncrMessagingTargetResolver(getBridge),
   };

package/src/plugin/scene-registry.ts

@@ -1,3 +1,5 @@
+import type { BncrRoute } from '../core/types.ts';
+import { asString } from '../core/value-sanitize.ts';
 import type {
   BncrGroupReplyMode,
   BncrSceneKind,
@@ -30,10 +32,19 @@ function defaultGroupReplyMode(kind: BncrSceneKind): BncrGroupReplyMode | undefi
   return kind === 'group' ? 'admin' : undefined;
 }
 
+export function buildRouteSceneKey(route: BncrRoute): string {
+  const platform = asString(route.platform).trim();
+  const groupId = asString(route.groupId).trim() || '0';
+  const userId = asString(route.userId).trim() || '0';
+  return groupId !== '0' ? `${platform}:${groupId}` : `${platform}:${userId}`;
+}
+
 export function buildSceneKey(parsed: ParsedInbound): string {
-  return parsed.peer.kind === 'group'
-    ? `${parsed.platform}:${parsed.groupId}`
-    : `${parsed.platform}:${parsed.userId}`;
+  return buildRouteSceneKey({
+    platform: parsed.platform,
+    groupId: parsed.groupId || '0',
+    userId: parsed.userId || '0',
+  });
 }
 
 function buildSceneRecord(args: {