@xmoxmo/bncr 0.6.6 → 0.6.8

package/src/channel.ts

@@ -348,6 +348,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 +841,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 +879,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 +909,7 @@ class BncrBridgeRuntime {
   }
 
   private cleanupRuntimeWaitersAndTimers(reason: string) {
+    this.serviceStarted = false;
     this.stopHistoryShardWorker(reason);
     this.clientRpcRuntime.shutdown();
     cleanupBncrBridgeRuntime(

package/src/messaging/inbound/commands.ts

@@ -11,6 +11,7 @@ import {
 import { dispatchOpenClawReplyWithBufferedBlockDispatcher } from '../../openclaw/reply-runtime.ts';
 import { resolveOpenClawAgentRoute } from '../../openclaw/routing-runtime.ts';
 import { performBncrGatewaySessionReset } from '../../openclaw/session-reset-runtime.ts';
+import { addNativeElevation, removeNativeElevation } from '../../plugin/config.ts';
 import { mergeBncrOwnerAllowFromIntoConfig } from './command-owner.ts';
 import type {
   BncrEnqueueFromReply,
@@ -774,74 +775,83 @@ export async function handleBncrNativeCommand(params: {
     },
     { debugOnly: true, debugEnabled: nativeCommandDebugEnabled },
   );
-  await resolveBncrChannelInboundRuntime(api).run({
-    channel: channelId,
-    accountId,
-    raw: parsed,
-    adapter: {
-      ingest: () => ({
-        id: msgId ?? `${displayTo}:${Date.now()}`,
-        timestamp: Date.now(),
-        rawText: body,
-        textForAgent: ctxPayload.BodyForAgent,
-        textForCommands: ctxPayload.CommandBody,
-        raw: parsed,
-      }),
-      resolveTurn: () => {
-        const sessionMetaBarrier = createBncrSessionMetaTaskBarrier();
-        return {
-          channel: channelId,
-          accountId,
-          routeSessionKey: resolvedRoute.sessionKey,
-          storePath,
-          ctxPayload,
-          recordInboundSession: wrapBncrInboundRecordSessionLabelCorrection({
-            recordInboundSession: recordBncrInboundSession as (
-              ...args: unknown[]
-            ) => Promise<unknown> | unknown,
-            expectedPatch: sessionIdentityPatch,
-          }),
-          record: {
-            updateLastRoute,
-            onRecordError: (err: unknown) => {
-              buildNativeCommandRecordErrorLogger(err);
-            },
-            trackSessionMetaTask: (task: Promise<unknown>) => {
-              sessionMetaBarrier.track(task);
-            },
-          },
-          runDispatch: async () => {
-            await sessionMetaBarrier.wait();
-            return dispatchOpenClawReplyWithBufferedBlockDispatcher(api, {
-              ctx: ctxPayload,
-              cfg: effectiveReply.replyCfg,
-              dispatcherOptions: {
-                deliver: createNativeCommandReplyDeliverer({
-                  command: command.command,
-                  accountId,
-                  sessionKey,
-                  to: displayTo,
-                  msgId: msgId || undefined,
-                  effectiveReply,
-                  route,
-                  enqueueFromReply,
-                  nativeCommandDebugEnabled,
-                  onResponded: () => responded,
-                  markResponded: () => {
-                    responded = true;
-                  },
-                }),
+  if (dispatchToOpenClaw && senderIdForContext) {
+    addNativeElevation(senderIdForContext);
+  }
+  try {
+    await resolveBncrChannelInboundRuntime(api).run({
+      channel: channelId,
+      accountId,
+      raw: parsed,
+      adapter: {
+        ingest: () => ({
+          id: msgId ?? `${displayTo}:${Date.now()}`,
+          timestamp: Date.now(),
+          rawText: body,
+          textForAgent: ctxPayload.BodyForAgent,
+          textForCommands: ctxPayload.CommandBody,
+          raw: parsed,
+        }),
+        resolveTurn: () => {
+          const sessionMetaBarrier = createBncrSessionMetaTaskBarrier();
+          return {
+            channel: channelId,
+            accountId,
+            routeSessionKey: resolvedRoute.sessionKey,
+            storePath,
+            ctxPayload,
+            recordInboundSession: wrapBncrInboundRecordSessionLabelCorrection({
+              recordInboundSession: recordBncrInboundSession as (
+                ...args: unknown[]
+              ) => Promise<unknown> | unknown,
+              expectedPatch: sessionIdentityPatch,
+            }),
+            record: {
+              updateLastRoute,
+              onRecordError: (err: unknown) => {
+                buildNativeCommandRecordErrorLogger(err);
               },
-              replyOptions: {
-                disableBlockStreaming: !effectiveReply.blockStreaming,
-                shouldEmitToolResult: effectiveReply.allowTool ? () => true : undefined,
+              trackSessionMetaTask: (task: Promise<unknown>) => {
+                sessionMetaBarrier.track(task);
               },
-            });
-          },
-        };
+            },
+            runDispatch: async () => {
+              await sessionMetaBarrier.wait();
+              return dispatchOpenClawReplyWithBufferedBlockDispatcher(api, {
+                ctx: ctxPayload,
+                cfg: effectiveReply.replyCfg,
+                dispatcherOptions: {
+                  deliver: createNativeCommandReplyDeliverer({
+                    command: command.command,
+                    accountId,
+                    sessionKey,
+                    to: displayTo,
+                    msgId: msgId || undefined,
+                    effectiveReply,
+                    route,
+                    enqueueFromReply,
+                    nativeCommandDebugEnabled,
+                    onResponded: () => responded,
+                    markResponded: () => {
+                      responded = true;
+                    },
+                  }),
+                },
+                replyOptions: {
+                  disableBlockStreaming: !effectiveReply.blockStreaming,
+                  shouldEmitToolResult: effectiveReply.allowTool ? () => true : undefined,
+                },
+              });
+            },
+          };
+        },
       },
-    },
-  });
+    });
+  } finally {
+    if (dispatchToOpenClaw && senderIdForContext && !parsed.isAdmin) {
+      removeNativeElevation(senderIdForContext);
+    }
+  }
 
   if (!responded) {
     // Self-service commands must never fall back to the agent — doing so

package/src/messaging/inbound/conversation-history.ts

@@ -5,7 +5,7 @@ import {
   type HistoryEntry,
   type HistoryMediaEntry,
 } from 'openclaw/plugin-sdk/reply-history';
-import { normalizeAccountId } from '../../core/accounts.ts';
+import { BNCR_DEFAULT_ACCOUNT_ID, normalizeAccountId } from '../../core/accounts.ts';
 import { formatOpenClawAgentEnvelope } from '../../openclaw/reply-runtime.ts';
 import type { BncrInboundApi } from './contracts.ts';
 import type { ParsedInbound } from './dispatch-prep.ts';
@@ -121,6 +121,33 @@ export function buildBncrConversationHistoryKeyFromRoute(args: {
   return null;
 }
 
+/**
+ * Migrate legacy scene-only history keys (`tgBot:10001`) to the current
+ * account-scoped format (`Primary:tgBot:10001`). Keys that already carry an
+ * accountId prefix are returned unchanged.
+ */
+export function normalizePersistedHistoryKey(key: string): string {
+  const raw = String(key || '').trim();
+  if (!raw) return raw;
+  const firstColon = raw.indexOf(':');
+  const secondColon = raw.indexOf(':', firstColon + 1);
+  if (firstColon <= 0 || secondColon < 0) return `${BNCR_DEFAULT_ACCOUNT_ID}:${raw}`;
+  return `${normalizeAccountId(raw.slice(0, firstColon))}:${raw.slice(firstColon + 1)}`;
+}
+
+export function resolvePersistedHistoryAccountId(key: string): string {
+  const normalized = normalizePersistedHistoryKey(key);
+  const separator = normalized.indexOf(':');
+  return normalizeAccountId(separator > 0 ? normalized.slice(0, separator) : undefined);
+}
+
+export function resolvePersistedHistoryKey(key: string, accountId: string): string {
+  const normalized = normalizePersistedHistoryKey(key);
+  const separator = normalized.indexOf(':');
+  const sceneKey = separator > 0 ? normalized.slice(separator + 1) : normalized;
+  return `${normalizeAccountId(accountId)}:${sceneKey}`;
+}
+
 /**
  * Extract the scene key (platform:userId or platform:groupId) from a history
  * key that may contain an accountId prefix. Legacy scene-only keys pass

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/config.ts

@@ -7,6 +7,17 @@ import {
 import { resolveBncrChannelPolicy } from '../core/policy.ts';
 import { setOpenClawAccountEnabledInConfigSection } from '../openclaw/sdk-helpers.ts';
 
+// 临时提权集合：非管理员用户执行原生命令时动态注入，命令完成后移除
+const pendingNativeElevation = new Set<string>();
+
+export function addNativeElevation(senderId: string): void {
+  if (senderId) pendingNativeElevation.add(senderId);
+}
+
+export function removeNativeElevation(senderId: string): void {
+  if (senderId) pendingNativeElevation.delete(senderId);
+}
+
 type BncrConfigSurfaceRoot = {
   channels?: {
     [CHANNEL_ID]?: {
@@ -53,4 +64,11 @@ export const BNCR_CONFIG_SURFACE = {
       configured: true,
     };
   },
+  resolveAllowFrom: ({ cfg }: { cfg: BncrConfigSurfaceRoot; accountId?: string | null }) => {
+    const policy = resolveBncrChannelPolicy(cfg?.channels?.[CHANNEL_ID] || {});
+    const base = policy.allowFrom;
+    if (pendingNativeElevation.size === 0) return base.length ? base : undefined;
+    const merged = [...base, ...pendingNativeElevation];
+    return merged.length ? merged : undefined;
+  },
 };

package/src/plugin/inbound-handlers.ts

@@ -1,4 +1,5 @@
 import type { GatewayRequestHandlerOptions } from 'openclaw/plugin-sdk/core';
+import { runDetachedWebhookWork } from 'openclaw/plugin-sdk/webhook-request-guards';
 import { buildCanonicalBncrSessionKey } from '../core/targets.ts';
 import type { BncrConnection, BncrRoute } from '../core/types.ts';
 import type { BncrConversationHistoryMap } from '../messaging/inbound/conversation-history.ts';
@@ -171,6 +172,7 @@ export type BncrInboundHandlersRuntime = {
     defaultPublicAgentId: string;
     now: () => number;
   }) => Promise<unknown>;
+  runInboundDetached?: (run: () => Promise<unknown>) => Promise<unknown>;
 };
 
 export function createBncrInboundHandlers(runtime: Omit<BncrInboundHandlersRuntime, 'respond'>) {
@@ -326,8 +328,12 @@ export function createBncrInboundHandlers(runtime: Omit<BncrInboundHandlersRunti
       );
       runtime.flushOnInboundAccepted(accountId);
 
-      void runtime
-        .dispatchInbound({
+      const runInboundDetached = runtime.runInboundDetached ?? runDetachedWebhookWork;
+      // Ack-first handlers must run follow-up work on an independent admitted
+      // root. Otherwise the host releases this request admission after respond,
+      // and later native/agent queue submissions are mistaken for draining.
+      void runInboundDetached(async () => {
+        await runtime.dispatchInbound({
           cfg,
           parsed,
           canonicalAgentId,
@@ -340,10 +346,10 @@ export function createBncrInboundHandlers(runtime: Omit<BncrInboundHandlersRunti
           defaultAdminAgentId,
           defaultPublicAgentId: runtime.defaultPublicAgentId(),
           now: runtime.now,
-        })
-        .catch((err) => {
-          runtime.logError('inbound', `process failed: ${String(err)}`, { debugOnly: true });
         });
+      }).catch((err) => {
+        runtime.logError('inbound', `process failed: ${String(err)}`, { debugOnly: true });
+      });
     },
   };
 }

package/src/plugin/sqlite-state.ts

@@ -1,12 +1,17 @@
 import { createHash } from 'node:crypto';
 import { DatabaseSync } from 'node:sqlite';
-import { BNCR_DEFAULT_ACCOUNT_ID, normalizeAccountId } from '../core/accounts.ts';
+import { normalizeAccountId } from '../core/accounts.ts';
 import {
   dumpRegisterDriftSnapshot,
   normalizeRegisterDriftSnapshot,
   type RegisterDriftSnapshot,
 } from '../core/register-trace.ts';
 import type { BncrRoute, OutboxEntry } from '../core/types.ts';
+import {
+  normalizePersistedHistoryKey,
+  resolvePersistedHistoryAccountId,
+  resolvePersistedHistoryKey,
+} from '../messaging/inbound/conversation-history.ts';
 import type {
   BncrGroupReplyMode,
   BncrPersistedAccountTimestamp,
@@ -792,28 +797,6 @@ function deriveHistoryKeyFromRoute(args: {
   return null;
 }
 
-function normalizePersistedHistoryKey(key: string): string {
-  const raw = String(key || '').trim();
-  if (!raw) return raw;
-  const firstColon = raw.indexOf(':');
-  const secondColon = raw.indexOf(':', firstColon + 1);
-  if (firstColon <= 0 || secondColon < 0) return `${BNCR_DEFAULT_ACCOUNT_ID}:${raw}`;
-  return `${normalizeAccountId(raw.slice(0, firstColon))}:${raw.slice(firstColon + 1)}`;
-}
-
-function resolvePersistedHistoryAccountId(key: string): string {
-  const normalized = normalizePersistedHistoryKey(key);
-  const separator = normalized.indexOf(':');
-  return normalizeAccountId(separator > 0 ? normalized.slice(0, separator) : undefined);
-}
-
-function resolvePersistedHistoryKey(key: string, accountId: string): string {
-  const normalized = normalizePersistedHistoryKey(key);
-  const separator = normalized.indexOf(':');
-  const sceneKey = separator > 0 ? normalized.slice(separator + 1) : normalized;
-  return `${normalizeAccountId(accountId)}:${sceneKey}`;
-}
-
 function parseMediaJson(value: string) {
   try {
     const parsed = JSON.parse(value ?? '[]');

package/src/plugin/state-store.ts

@@ -1,7 +1,6 @@
 import { createHash } from 'node:crypto';
 import { readFile, rename } from 'node:fs/promises';
 import { basename, dirname, join } from 'node:path';
-import { BNCR_DEFAULT_ACCOUNT_ID, normalizeAccountId } from '../core/accounts.ts';
 import {
   dumpRegisterDriftSnapshot,
   normalizeRegisterDriftSnapshot,
@@ -11,9 +10,12 @@ import {
   type BncrConversationHistoryMap,
   buildBncrBotReplyMessageId,
   buildBncrConversationHistoryKeyFromRoute,
+  normalizePersistedHistoryKey,
   resetConversationHistoryVersions,
   resolveBncrHistoryLimit,
   resolveBncrSceneKeyFromHistoryKey,
+  resolvePersistedHistoryAccountId,
+  resolvePersistedHistoryKey,
 } from '../messaging/inbound/conversation-history.ts';
 import {
   getConversationHistorySerialOwner,
@@ -53,35 +55,6 @@ import type {
 const GROUP_REPLY_MODES = new Set<BncrGroupReplyMode>(['admin', 'mention', 'hybrid', 'all']);
 const DEFAULT_PERSISTED_CONVERSATION_HISTORY_LIMIT = 50;
 
-/**
- * Migrate legacy scene-only history keys (`tgBot:10001`) to the current
- * account-scoped format (`Primary:tgBot:10001`). Keys that already carry an
- * accountId prefix are returned unchanged.
- */
-function normalizePersistedHistoryKey(key: string): string {
-  const raw = String(key || '').trim();
-  if (!raw) return raw;
-  const firstColon = raw.indexOf(':');
-  const secondColon = raw.indexOf(':', firstColon + 1);
-  if (firstColon <= 0 || secondColon < 0) return `${BNCR_DEFAULT_ACCOUNT_ID}:${raw}`;
-  return `${normalizeAccountId(raw.slice(0, firstColon))}:${raw.slice(firstColon + 1)}`;
-}
-
-function resolvePersistedHistoryAccountId(key: string): string {
-  const normalized = normalizePersistedHistoryKey(key);
-  const separator = normalized.indexOf(':');
-  return separator > 0
-    ? normalized.slice(0, separator).trim() || BNCR_DEFAULT_ACCOUNT_ID
-    : BNCR_DEFAULT_ACCOUNT_ID;
-}
-
-function resolvePersistedHistoryKey(key: string, accountId: string): string {
-  const normalized = normalizePersistedHistoryKey(key);
-  const separator = normalized.indexOf(':');
-  const sceneKey = separator > 0 ? normalized.slice(separator + 1) : normalized;
-  return `${normalizeAccountId(accountId)}:${sceneKey}`;
-}
-
 type BncrPersistedStateStoreInput = {
   outbox?: unknown;
   deadLetter?: unknown;