@xmoxmo/bncr 0.4.5 → 0.4.7

package/dist/index.js

@@ -840,6 +840,12 @@ var plugin = {
       owner = adopted.owner;
       previousOwner = adopted.previousOwner;
       gatewayRuntime.currentBridge = bridge;
+      if (rebuilt) {
+        gatewayRuntime.serviceRegistered = false;
+        gatewayRuntime.channelRegistered = false;
+        gatewayRuntime.serviceOwnerApiInstanceId = void 0;
+        gatewayRuntime.channelOwnerApiInstanceId = void 0;
+      }
     } else {
       runtime2 = loadBncrRuntimeSync();
       bridge = gatewayRuntime.currentBridge || getExistingBridgeSingleton();

package/index.ts

@@ -101,6 +101,12 @@ const plugin = {
       owner = adopted.owner;
       previousOwner = adopted.previousOwner;
       gatewayRuntime.currentBridge = bridge;
+      if (rebuilt) {
+        gatewayRuntime.serviceRegistered = false;
+        gatewayRuntime.channelRegistered = false;
+        gatewayRuntime.serviceOwnerApiInstanceId = undefined;
+        gatewayRuntime.channelOwnerApiInstanceId = undefined;
+      }
     } else {
       runtime = loadBncrRuntimeSync();
       bridge = gatewayRuntime.currentBridge || getExistingBridgeSingleton();

package/package.json

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

package/src/channel.ts

@@ -26,6 +26,7 @@ import {
 import { summarizeOutboxEntry } from './core/outbox-summary.ts';
 import { normalizePersistedOutboxEntry as normalizePersistedOutboxEntryFromRuntime } from './core/persisted-outbox-entry.ts';
 import {
+  buildCanonicalBncrSessionKey,
   formatDisplayScope,
   normalizeStoredSessionKey,
   parseRouteLike,
@@ -40,6 +41,7 @@ import type {
   FileSendTransferState,
   OutboxEntry,
 } from './core/types.ts';
+import type { BncrGroupHistoryMap } from './messaging/inbound/group-history.ts';
 import type { parseBncrInboundParams } from './messaging/inbound/parse.ts';
 import { buildEnqueueFromReplyDebugInfo } from './messaging/outbound/diagnostics.ts';
 import { buildBncrMediaOutboundFrame } from './messaging/outbound/media.ts';
@@ -149,6 +151,7 @@ import type {
   BncrBridgeRuntimePaths,
   BncrChannelConfigRoot,
   BncrChannelSendContext,
+  BncrSceneRecord,
   FileAckPayloadState,
   PersistedState,
 } from './plugin/channel-runtime-types.ts';
@@ -284,6 +287,8 @@ class BncrBridgeRuntime {
     string,
     { accountId: string; route: BncrRoute; updatedAt: number }
   >();
+  private sceneRegistry = new Map<string, BncrSceneRecord>();
+  private groupHistories: BncrGroupHistoryMap = new Map();
   private routeAliases = new Map<
     string,
     { accountId: string; route: BncrRoute; updatedAt: number }
@@ -972,6 +977,19 @@ class BncrBridgeRuntime {
     return this.bridgeSupportRuntime.ensureCanonicalAgentId(args);
   }
 
+  private defaultAdminAgentId(args: {
+    cfg: BncrChannelConfigRoot;
+    accountId: string;
+    peer?: unknown;
+    channelId?: string;
+  }): string {
+    return this.ensureCanonicalAgentId(args);
+  }
+
+  private defaultPublicAgentId(): string {
+    return 'public';
+  }
+
   private countInvalidOutboxSessionKeys(accountId: string): number {
     return countInvalidOutboxSessionKeysFromRuntime({
       accountId,
@@ -1530,6 +1548,9 @@ class BncrBridgeRuntime {
         sessionKey: string;
         inboundText: string;
         hasMedia: boolean;
+        resolvedAgentId: string;
+        shouldDispatch: boolean;
+        shouldAccumulate: boolean;
       }
     | {
         ok: false;
@@ -1542,11 +1563,20 @@ class BncrBridgeRuntime {
       parsed: args.parsed,
       canonicalAgentId: args.canonicalAgentId,
       asString,
+      now,
       getRuntimeConfig: (api) => getOpenClawRuntimeConfig(api as OpenClawChannelRuntimeApiHolder),
       resolveAgentRoute: (params) =>
         resolveOpenClawAgentRoute(this.api as OpenClawChannelRuntimeApiHolder, params),
       buildInboundResponsePayload,
       markInboundDedupSeen: (key) => this.markInboundDedupSeen(key),
+      sceneRegistry: this.sceneRegistry,
+      defaultAdminAgentId: this.defaultAdminAgentId({
+        cfg: getOpenClawRuntimeConfig(this.api as OpenClawChannelRuntimeApiHolder),
+        accountId: args.parsed.accountId,
+        peer: args.parsed.peer,
+        channelId: CHANNEL_ID,
+      }),
+      defaultPublicAgentId: this.defaultPublicAgentId(),
     });
   }
 
@@ -1867,6 +1897,8 @@ class BncrBridgeRuntime {
     maxDeadLetterEntries: MAX_DEAD_LETTER_ENTRIES,
     maxSessionRouteEntries: MAX_SESSION_ROUTE_ENTRIES,
     maxAccountActivityEntries: MAX_ACCOUNT_ACTIVITY_ENTRIES,
+    sceneRegistry: this.sceneRegistry,
+    groupHistories: this.groupHistories,
     outbox: this.outbox,
     getDeadLetter: () => this.deadLetter,
     setDeadLetter: (entries) => {
@@ -2319,9 +2351,10 @@ class BncrBridgeRuntime {
   }
 
   // 严谨目标解析：
-  // 1) 标准 to 仅认 Bncr:<platform>:<groupId>:<userId> / Bncr:<platform>:<userId>
+  // 1) 标准 to 仅认 Bncr:<platform>:0:<userId> / Bncr:<platform>:<groupId>:0
   // 2) 仍接受 strict sessionKey 作为内部兼容输入
-  // 3) 其他旧格式直接失败，并输出标准格式提示日志
+  // 3) 输入侧额外兼容 Bncr:<platform>:user:<userId> / Bncr:<platform>:group:<groupId>
+  // 4) 其他旧格式直接失败，并输出标准格式提示日志
   resolveVerifiedTarget(
     rawTarget: string,
     accountId: string,
@@ -2850,6 +2883,10 @@ class BncrBridgeRuntime {
       buildInboundAcceptedLifecycleDebugInfo,
       ...inboundActivityRuntime,
       ensureCanonicalAgentId: (args) => this.ensureCanonicalAgentId(args),
+      defaultAdminAgentId: (args) => this.defaultAdminAgentId(args),
+      defaultPublicAgentId: () => this.defaultPublicAgentId(),
+      sceneRegistry: this.sceneRegistry,
+      groupHistories: this.groupHistories,
       prepareInboundAcceptance: (args) => this.prepareInboundAcceptance(args),
       logInboundSummary: (args) => this.logInboundSummary(args),
       flushPushQueueBestEffort: (args) => this.flushPushQueueBestEffort(args),
@@ -2858,6 +2895,8 @@ class BncrBridgeRuntime {
       enqueueFromReply: (args: Parameters<BncrBridgeRuntime['enqueueFromReply']>[0]) =>
         this.enqueueFromReply(args),
       scheduleSave: () => this.scheduleSave(),
+      buildCanonicalSessionKey: (route: BncrRoute) =>
+        buildCanonicalBncrSessionKey(route, this.canonicalAgentId || 'main'),
       fileRecvTransfers: this.fileRecvTransfers,
       inboundFileTransferMaxBytes: INBOUND_FILE_TRANSFER_MAX_BYTES,
       inboundFileTransferMaxChunks: INBOUND_FILE_TRANSFER_MAX_CHUNKS,

package/src/core/targets.ts

@@ -36,6 +36,14 @@ export function asTargetString(value: unknown, fallback = ''): string {
 
 export function parseRouteFromStandardDisplayScope(scope: string): BncrRoute | null {
   const parts = asTargetString(scope).trim().split(':');
+  if (parts.length === 3) {
+    const [platform, kind, id] = parts;
+    if (!platform || !kind || !id) return null;
+    if (kind === 'User') return { platform, groupId: '0', userId: id };
+    if (kind === 'Group') return { platform, groupId: id, userId: '0' };
+    if (kind.toLowerCase() === 'user' || kind.toLowerCase() === 'group') return null;
+  }
+
   if (parts.length === 2) {
     const [platform, userId] = parts;
     if (!platform || !userId) return null;
@@ -45,12 +53,33 @@ export function parseRouteFromStandardDisplayScope(scope: string): BncrRoute | n
   if (parts.length === 3) {
     const [platform, groupId, userId] = parts;
     if (!platform || !groupId || !userId) return null;
+    if (groupId !== '0' && userId !== '0') {
+      // Legacy group routes may still include the triggering userId; collapse them
+      // back to the shared group route so old targets remain deliverable.
+      return { platform, groupId, userId: '0' };
+    }
     return { platform, groupId, userId };
   }
 
   return null;
 }
 
+function parseGroupScope(scope: string): { platform: string; groupId: string } | null {
+  const parts = asTargetString(scope).trim().split(':');
+  if (parts.length !== 2) return null;
+  const [platform, groupId] = parts;
+  if (!platform || !groupId) return null;
+  return { platform, groupId };
+}
+
+function parseDirectScope(scope: string): { platform: string; userId: string } | null {
+  const parts = asTargetString(scope).trim().split(':');
+  if (parts.length !== 2) return null;
+  const [platform, userId] = parts;
+  if (!platform || !userId) return null;
+  return { platform, userId };
+}
+
 export function normalizeDisplayScopePrefix(scope: string): string {
   const raw = asTargetString(scope).trim();
   if (!raw) return '';
@@ -102,11 +131,22 @@ export function routeScopeToHex(route: BncrRoute): string {
   return Buffer.from(raw, 'utf8').toString('hex').toLowerCase();
 }
 
+export function groupScopeToHex(route: BncrRoute): string {
+  const raw = `${route.platform}:${route.groupId}`;
+  return Buffer.from(raw, 'utf8').toString('hex').toLowerCase();
+}
+
+export function directScopeToHex(route: BncrRoute): string {
+  const raw = `${route.platform}:${route.userId}`;
+  return Buffer.from(raw, 'utf8').toString('hex').toLowerCase();
+}
+
 export function parseRouteFromScope(scope: string): BncrRoute | null {
   const parts = asTargetString(scope).trim().split(':');
   if (parts.length < 3) return null;
   const [platform, groupId, userId] = parts;
   if (!platform || !groupId || !userId) return null;
+  if (groupId !== '0' && userId !== '0') return null;
   return { platform, groupId, userId };
 }
 
@@ -122,6 +162,34 @@ export function parseRouteFromHexScope(scopeHex: string): BncrRoute | null {
   }
 }
 
+export function parseGroupRouteFromHexScope(scopeHex: string): BncrRoute | null {
+  const rawHex = asTargetString(scopeHex).trim();
+  if (!isLowerHex(rawHex)) return null;
+
+  try {
+    const decoded = Buffer.from(rawHex, 'hex').toString('utf8');
+    const parsed = parseGroupScope(decoded);
+    if (!parsed) return null;
+    return { platform: parsed.platform, groupId: parsed.groupId, userId: '0' };
+  } catch {
+    return null;
+  }
+}
+
+export function parseDirectRouteFromHexScope(scopeHex: string): BncrRoute | null {
+  const rawHex = asTargetString(scopeHex).trim();
+  if (!isLowerHex(rawHex)) return null;
+
+  try {
+    const decoded = Buffer.from(rawHex, 'hex').toString('utf8');
+    const parsed = parseDirectScope(decoded);
+    if (!parsed) return null;
+    return { platform: parsed.platform, groupId: '0', userId: parsed.userId };
+  } catch {
+    return null;
+  }
+}
+
 export function parseStrictBncrSessionKey(input: string): {
   inputSessionKey: string;
   inputAgentId: string;
@@ -143,9 +211,24 @@ export function parseStrictBncrSessionKey(input: string): {
 
   if (isLowerHex(payload)) {
     scopeHex = payload.toLowerCase();
-    route = parseRouteFromHexScope(scopeHex);
+    route =
+      inputKind === 'group'
+        ? parseGroupRouteFromHexScope(scopeHex)
+        : parseDirectRouteFromHexScope(scopeHex) || parseRouteFromHexScope(scopeHex);
   } else {
-    route = parseRouteFromScope(payload);
+    route =
+      inputKind === 'group'
+        ? (() => {
+            const parsed = parseGroupScope(payload);
+            return parsed
+              ? { platform: parsed.platform, groupId: parsed.groupId, userId: '0' }
+              : null;
+          })()
+        : (() => {
+            const direct = parseDirectScope(payload);
+            if (direct) return { platform: direct.platform, groupId: '0', userId: direct.userId };
+            return parseRouteFromScope(payload);
+          })();
     if (route) scopeHex = routeScopeToHex(route);
   }
 
@@ -237,13 +320,17 @@ export function parseRouteFromDisplayScope(scope: string): BncrRoute | null {
 
   const payload = raw.match(/^Bncr:(.+)$/)?.[1];
   if (!payload) return null;
-  return parseRouteFromStandardDisplayScope(payload);
+  const route = parseRouteFromStandardDisplayScope(payload);
+  if (!route) return null;
+  return route;
 }
 
 export function buildCanonicalBncrSessionKey(route: BncrRoute, canonicalAgentId: string): string {
   const agentId = asTargetString(canonicalAgentId).trim() || 'main';
-  const kind = resolveCanonicalSessionKind();
-  return `agent:${agentId}:bncr:${kind}:${routeScopeToHex(route)}`;
+  if (route.groupId !== '0') {
+    return `agent:${agentId}:bncr:group:${groupScopeToHex(route)}`;
+  }
+  return `agent:${agentId}:bncr:direct:${directScopeToHex(route)}`;
 }
 
 export function normalizeStoredSessionKey(
@@ -266,17 +353,17 @@ export function normalizeStoredSessionKey(
   let route: BncrRoute | null = null;
   let passthroughAgentId: string | null = null;
 
-  const strict = parseStrictBncrSessionKey(base);
-  if (strict) {
-    route = strict.route;
-    passthroughAgentId = strict.inputAgentId;
+  const legacy = parseLegacySessionKey(base);
+  if (legacy) {
+    route = legacy.route;
+    passthroughAgentId = legacy.inputAgentId || null;
   }
 
   if (!route) {
-    const legacy = parseLegacySessionKey(base);
-    if (legacy) {
-      route = legacy.route;
-      passthroughAgentId = legacy.inputAgentId || null;
+    const strict = parseStrictBncrSessionKey(base);
+    if (strict) {
+      route = strict.route;
+      passthroughAgentId = strict.inputAgentId;
     }
   }
 
@@ -322,6 +409,7 @@ export function parseRouteLike(input: unknown): BncrRoute | null {
   const groupId = asTargetString(routeInput?.groupId || '').trim();
   const userId = asTargetString(routeInput?.userId || '').trim();
   if (!platform || !groupId || !userId) return null;
+  if (groupId !== '0' && userId !== '0') return null;
   return { platform, groupId, userId };
 }
 
@@ -333,10 +421,11 @@ export type BncrExplicitTargetSource =
   | 'route-scope';
 
 export function formatDisplayScope(route: BncrRoute): string {
-  if (route.groupId === '0' && route.userId !== '0') {
-    return `Bncr:${route.platform}:${route.userId}`;
-  }
-  return `Bncr:${route.platform}:${route.groupId}:${route.userId}`;
+  const platform = asTargetString(route?.platform).trim();
+  const groupId = asTargetString(route?.groupId || '0').trim() || '0';
+  const userId = asTargetString(route?.userId || '0').trim() || '0';
+  if (groupId !== '0') return `Bncr:${platform}:${groupId}:0`;
+  return `Bncr:${platform}:0:${userId}`;
 }
 
 export function buildDisplayScopeCandidates(route: BncrRoute): string[] {