@workclaw/openclaw-workclaw 1.0.16 → 1.0.18

package/src/gateway/workclaw-gateway.ts

@@ -1,525 +1,367 @@
-import type { OpenclawWorkclawAccountConfig, OpenclawWorkclawConfig, ResolvedOpenclawWorkclawAccount, WorkClawBaseConfig } from '../types.js'
-import type { MessageDispatcherContext } from './message-dispatcher.js'
-import { buildAccountMap, resolveAccountByUserIdAndAgentId } from '../accounts.js'
-import { clearOpenclawWorkclawTokenCache, openOpenclawWorkclawConnection } from '../connection/workclaw-client.js'
+import type { ResolvedWorkclawAccount, WorkclawConfig, WorkclawAccountConfig, WorkClawBaseConfig } from "../types.js";
 import {
-  clearOpenclawWorkclawWsConnection,
-  clearReconnectScheduler,
-  createLogger,
-  finishConnecting,
-  getAllDispatchersByAppKey,
-  getAppKeyByAccountId,
-  getDispatcherByAppKeyAndAccountId,
-  getOpenclawWorkclawWsConnection,
-  getReconnectScheduler,
-  registerAccountContext,
-  setOpenclawWorkclawLoggerFromContext,
-  setOpenclawWorkclawWsConnection,
-  setReconnectScheduler,
-  tryStartConnecting,
-  unregisterAccountContext,
-} from '../runtime.js'
-import { parseWorkClawMessage } from './message-context.js'
-import { dispatchOpenclawWorkclawMessage } from './message-dispatcher.js'
-import { createReconnectScheduler } from './reconnect.js'
-
-export interface OpenclawWorkclawGatewayOptions {
-  accountId: string
-  account: ResolvedOpenclawWorkclawAccount
-  cfg: any
-  log?: any
+    getWorkclawWsConnection,
+    clearWorkclawWsConnection,
+    createLogger,
+    setWorkclawLoggerFromContext,
+    registerAccountContext,
+    unregisterAccountContext,
+    getAppKeyByAccountId,
+    getAllDispatchersByAppKey,
+    getDispatcherByAppKeyAndAccountId,
+    getReconnectScheduler,
+    setReconnectScheduler,
+    clearReconnectScheduler,
+    tryStartConnecting,
+    finishConnecting,
+    setWorkclawConnectionConfig,
+    clearWorkclawConnectionConfig,
+    type TryStartConnectingResult,
+} from "../runtime.js";
+import { sendMessageWorkclaw } from "../outbound/index.js";
+import { clearWorkclawTokenCache, getWorkclawAccessToken, getWorkclawModelConfigByAppKey } from "../connection/workclaw-client.js";
+import { buildAccountMap, resolveAccountByUserIdAndAgentId } from "../accounts.js";
+import { dispatchWorkclawMessage, type MessageDispatcherContext } from "./message-dispatcher.js";
+import { parseWorkClawMessage } from "./message-context.js";
+import { createReconnectScheduler } from "./reconnect.js";
+
+export interface WorkclawGatewayOptions {
+    accountId: string;
+    account: ResolvedWorkclawAccount;
+    cfg: any;
+    log?: {
+        info?: (msg: string) => void;
+        warn?: (msg: string) => void;
+        error?: (msg: string) => void;
+        debug?: (msg: string) => void;
+    };
 }
 
-export async function startOpenclawWorkclawGateway(options: OpenclawWorkclawGatewayOptions): Promise<void> {
-  const { account, log } = options
+export async function startWorkclawGateway(options: WorkclawGatewayOptions): Promise<void> {
+    const { accountId, account, cfg, log } = options;
 
-  const logger = createLogger('', log)
-  setOpenclawWorkclawLoggerFromContext(logger)
+    const logger = createLogger("", log);
+    setWorkclawLoggerFromContext(logger);
 
-  const rawConfig = account.config as unknown as OpenclawWorkclawConfig & OpenclawWorkclawAccountConfig
-  const connectionMode = rawConfig.connectionMode || 'websocket'
-  const wsStrategy = rawConfig.wsConnectionStrategy || 'per-account'
+    const rawConfig = account.config as unknown as WorkclawConfig & WorkclawAccountConfig;
+    const connectionMode = rawConfig.connectionMode || "websocket";
+    const wsStrategy = rawConfig.wsConnectionStrategy || "per-account";
 
-  if (connectionMode !== 'websocket') {
-    throw new Error(`Unsupported connectionMode: ${connectionMode}`)
-  }
+    if (connectionMode !== "websocket") {
+        throw new Error(`Unsupported connectionMode: ${connectionMode}`);
+    }
 
-  if (wsStrategy === 'per-appKey') {
-    await startSharedWebSocket(options)
-  }
-  else {
-    await startPerAccountWebSocket(options)
-  }
+    if (wsStrategy === "per-appKey") {
+        await startSharedWebSocket(options);
+    } else {
+        await startPerAccountWebSocket(options);
+    }
 }
 
 /**
  * per-account 模式: 每个账号独立 WebSocket 连接
  */
-async function startPerAccountWebSocket(options: OpenclawWorkclawGatewayOptions): Promise<void> {
-  const { accountId, account, cfg, log } = options
-
-  const logger = createLogger('', log)
-  const rawConfig = account.config as unknown as OpenclawWorkclawConfig & OpenclawWorkclawAccountConfig
-
-  const baseConfig: WorkClawBaseConfig = {
-    baseUrl: rawConfig.baseUrl,
-    websocketUrl: rawConfig.websocketUrl,
-    appKey: rawConfig.appKey,
-    appSecret: rawConfig.appSecret,
-    localIp: rawConfig.localIp,
-    allowInsecureTls: rawConfig.allowInsecureTls,
-    requestTimeout: rawConfig.requestTimeout,
-  }
-
-  const accountConfig: OpenclawWorkclawAccountConfig = {
-    agentId: rawConfig.agentId,
-    userId: rawConfig.userId,
-    openConversationId: rawConfig.openConversationId,
-  }
-
-  const appKeyRaw = baseConfig.appKey ?? ''
-  const appSecretRaw = baseConfig.appSecret ?? ''
-
-  buildAccountMap(cfg)
-
-  logger.info(
-    `Gateway start (per-account) accountId=${accountId} baseUrl=${baseConfig.baseUrl ?? ''} websocketUrl=${baseConfig.websocketUrl ?? ''} localIp=${baseConfig.localIp ?? ''} allowInsecureTls=${baseConfig.allowInsecureTls} requestTimeout=${baseConfig.requestTimeout ?? ''} appKeyPrefix=${appKeyRaw ? `${appKeyRaw.slice(0, 8)}...` : 'missing'} appSecretLen=${appSecretRaw.length}`,
-  )
-
-  const ctx: MessageDispatcherContext = {
-    accountId,
-    account,
-    cfg,
-    baseConfig,
-    accountConfig,
-    log: logger,
-    scheduleReconnect: () => {
-      // eslint-disable-next-line ts/no-use-before-define
-      scheduler.scheduleReconnect()
-    },
-  }
-
-  const handleMessage = (data: string): void | Promise<void> => {
-    dispatchOpenclawWorkclawMessage(data, ctx).catch((err) => {
-      logger.error(`Dispatch error: ${String(err)}`)
-    })
-  }
-
-  const scheduler = createReconnectScheduler({
-    key: accountId,
-    config: baseConfig,
-    log: logger,
-    onMessage: handleMessage,
-  })
-
-  try {
-    const tokenCacheKey = baseConfig.appKey || accountId
-    const connConfig = {
-      baseUrl: baseConfig.baseUrl || '',
-      websocketUrl: baseConfig.websocketUrl,
-      appKey: baseConfig.appKey,
-      appSecret: baseConfig.appSecret,
-      localIp: baseConfig.localIp,
-      allowInsecureTls: baseConfig.allowInsecureTls,
-      requestTimeout: baseConfig.requestTimeout,
-    }
-
-    const { endpoint, ticket } = await openOpenclawWorkclawConnection(tokenCacheKey, connConfig)
-    logger.info(`Gateway Connection opened endpoint=${endpoint} ticketLen=${ticket?.length ?? 0}`)
-    const url = `${endpoint}?ticket=${encodeURIComponent(ticket)}`
-
-    const { Agent } = await import('undici')
-    const dispatcher = connConfig.allowInsecureTls
-      ? new Agent({ connect: { rejectUnauthorized: false } })
-      : undefined
-    const wsOptions = dispatcher ? { dispatcher } : undefined
-
-    const ws = new (await import('undici')).WebSocket(url, wsOptions)
-    setOpenclawWorkclawWsConnection(accountId, ws)
-
-    await new Promise<void>((resolve, reject) => {
-      const timeout = setTimeout(() => reject(new Error('websocket connection timeout')), 30000)
-
-      ws.onopen = () => {
-        clearTimeout(timeout)
-        logger.info(`Gateway WebSocket connected`)
-        resolve()
-      }
-
-      ws.onerror = (event: any) => {
-        clearTimeout(timeout)
-        const errorMsg = String(event?.message ?? event)
-        logger.error(`Gateway WebSocket error: ${errorMsg}`)
-        reject(new Error(errorMsg))
-      }
-
-      ws.onclose = (event: any) => {
-        clearTimeout(timeout)
-        reject(new Error(`websocket closed before ready code=${event?.code ?? ''} reason=${event?.reason ?? ''}`))
-      }
-    })
-
-    ws.onmessage = (event: any) => {
-      const data = typeof event.data === 'string' ? event.data : String(event.data ?? '')
-      logger.info(`Gateway WebSocket message received bytes=${data.length}`)
-      handleMessage(data)
-    }
+async function startPerAccountWebSocket(options: WorkclawGatewayOptions): Promise<void> {
+    const { accountId, account, cfg, log } = options;
+
+    const logger = createLogger("", log);
+    const rawConfig = account.config as unknown as WorkclawConfig & WorkclawAccountConfig;
+
+    const baseConfig: WorkClawBaseConfig = {
+        baseUrl: rawConfig.baseUrl,
+        websocketUrl: rawConfig.websocketUrl,
+        appKey: rawConfig.appKey,
+        appSecret: rawConfig.appSecret,
+        localIp: rawConfig.localIp,
+        allowInsecureTls: rawConfig.allowInsecureTls,
+        requestTimeout: rawConfig.requestTimeout,
+    };
+
+    const accountConfig: WorkclawAccountConfig = {
+        agentId: rawConfig.agentId,
+        userId: rawConfig.userId,
+        openConversationId: rawConfig.openConversationId,
+    };
+
+    const appKeyRaw = baseConfig.appKey ?? "";
+    const appSecretRaw = baseConfig.appSecret ?? "";
+
+    buildAccountMap(cfg);
+
+    logger.info(
+        `Gateway start (per-account) accountId=${accountId} baseUrl=${baseConfig.baseUrl ?? ""} websocketUrl=${baseConfig.websocketUrl ?? ""} localIp=${baseConfig.localIp ?? ""} allowInsecureTls=${baseConfig.allowInsecureTls} requestTimeout=${baseConfig.requestTimeout ?? ""} appKeyPrefix=${appKeyRaw ? `${appKeyRaw.slice(0, 8)}...` : "missing"} appSecretLen=${appSecretRaw.length}`,
+    );
+
+    const ctx: MessageDispatcherContext = {
+        accountId,
+        account,
+        cfg,
+        baseConfig,
+        accountConfig,
+        log: logger,
+        scheduleReconnect: () => scheduler.scheduleReconnect(),
+    };
+
+    const handleMessage = (data: string) => {
+        dispatchWorkclawMessage(data, ctx).catch((err) => {
+            logger.error(`Dispatch error: ${String(err)}`);
+        });
+    };
+
+    const scheduler = createReconnectScheduler({
+        key: accountId,
+        config: baseConfig,
+        log: logger,
+        onMessage: handleMessage,
+    });
+
+    await scheduler.connect();
+
+    // Cache the connection config to prevent cfg mutation issues during message sends
+    setWorkclawConnectionConfig(accountId, {
+        appKey: baseConfig.appKey ?? "",
+        appSecret: baseConfig.appSecret ?? "",
+        baseUrl: baseConfig.baseUrl,
+        websocketUrl: baseConfig.websocketUrl,
+        localIp: baseConfig.localIp,
+        allowInsecureTls: baseConfig.allowInsecureTls,
+        requestTimeout: baseConfig.requestTimeout,
+    });
+}
 
-    ws.onclose = (event: any) => {
-      logger.warn(`Gateway WebSocket closed scheduling reconnect... accountId=${accountId} code=${event?.code ?? ''} reason=${event?.reason ?? ''}`)
-      clearOpenclawWorkclawWsConnection(accountId)
-      scheduler.scheduleReconnect()
+/**
+ * per-appKey 模式: 多个账号共享一个 WebSocket 连接
+ */
+async function startSharedWebSocket(options: WorkclawGatewayOptions): Promise<void> {
+    const { accountId, account, cfg, log } = options;
+
+    const logger = createLogger("", log);
+    const rawConfig = account.config as unknown as WorkclawConfig & WorkclawAccountConfig;
+
+    const baseConfig: WorkClawBaseConfig = {
+        baseUrl: rawConfig.baseUrl,
+        websocketUrl: rawConfig.websocketUrl,
+        appKey: rawConfig.appKey,
+        appSecret: rawConfig.appSecret,
+        localIp: rawConfig.localIp,
+        allowInsecureTls: rawConfig.allowInsecureTls,
+        requestTimeout: rawConfig.requestTimeout,
+    };
+
+    const accountConfig: WorkclawAccountConfig = {
+        agentId: rawConfig.agentId,
+        userId: rawConfig.userId,
+        openConversationId: rawConfig.openConversationId,
+    };
+
+    const appKey = baseConfig.appKey || accountId;
+    const appKeyRaw = baseConfig.appKey ?? "";
+
+    buildAccountMap(cfg);
+
+    logger.info(
+        `Gateway start (per-appKey) accountId=${accountId} appKey=${appKeyRaw ? `${appKeyRaw.slice(0, 8)}...` : "missing"} baseUrl=${baseConfig.baseUrl ?? ""} websocketUrl=${baseConfig.websocketUrl ?? ""}`,
+    );
+
+    // 注册账号上下文
+    const ctx: MessageDispatcherContext = {
+        accountId,
+        account,
+        cfg,
+        baseConfig,
+        accountConfig,
+        log: logger,
+        scheduleReconnect: () => {
+            const scheduler = getReconnectScheduler(appKey);
+            scheduler?.scheduleReconnect();
+        },
+    };
+
+    registerAccountContext(appKey, accountId, ctx);
+
+    // 检查是否已存在该 appKey 的 WebSocket
+    const existingWs = getWorkclawWsConnection(appKey);
+    if (existingWs) {
+        logger.info(`Gateway (per-appKey) using existing WebSocket for appKey=${appKey}`);
+        return;
     }
 
-    ws.onerror = (event: any) => {
-      logger.error(`Gateway WebSocket error: ${String(event?.message ?? event)}`)
-    }
-  }
-  catch (err) {
-    const errorStr = String(err)
-    logger.error(`Gateway connect failed: ${errorStr}`)
-
-    if (errorStr.includes('访问过于频繁')) {
-      logger.warn(`Rate limited, scheduling reconnect...`)
-      scheduler.scheduleReconnect()
-      throw err
+    // 尝试获取连接锁，防止竞态条件
+    const startResult = tryStartConnecting(appKey);
+
+    if (!startResult.isConnector) {
+        // 另一个账号正在连接（成功或失败中），等待共享的 connectingPromise
+        logger.info(`Gateway (per-appKey) another account is connecting, waiting... appKey=${appKey}`);
+        const resultWs = await startResult.connectingPromise;
+        if (resultWs) {
+            logger.info(`Gateway (per-appKey) connection established by another account, using it appKey=${appKey}`);
+            return;
+        }
+        // 连接失败（resultWs === null），当前账号作为新 connector 重试
+        logger.warn(`Gateway (per-appKey) connection attempt failed, will create own connection appKey=${appKey}`);
+    } else {
+        // 是 connector，创建连接
+        logger.info(`Gateway (per-appKey) acquired connector lock, creating connection appKey=${appKey}`);
     }
 
-    const isAuthError
-      = errorStr.includes('"errCode":2001')
-        || errorStr.includes('"code":2001')
-        || errorStr.includes('鉴权失败')
-        || errorStr.includes('invalid credentials')
-        || errorStr.includes('unauthorized')
-
-    if (isAuthError) {
-      logger.error(`Authentication failed, not scheduling reconnect`)
-      scheduler.stopReconnect()
-      throw err
+    // 需要创建新的 WebSocket（只有获取到锁的账号才执行到这里）
+    const scheduler = createReconnectScheduler({
+        key: appKey,
+        config: baseConfig,
+        log: logger,
+        onMessage: (data: string) => {
+            handleSharedMessage(appKey, data, cfg, logger);
+        },
+        onClose: () => {
+            scheduler.scheduleReconnect();
+        },
+        // 旧代码在 setWorkclawWsConnection 后、ws.onopen 前就调用 finishConnecting，
+        // 这个回调模拟同样的时机：ws 已存入 runtime，通知所有等待者
+        onConnectingStarted: (ws: any) => {
+            finishConnecting(appKey, ws);
+        },
+    });
+    setReconnectScheduler(appKey, scheduler);
+
+    try {
+        await scheduler.connect();
+    } catch (err) {
+        // 连接失败，通知所有等待者重试（不传 ws 表示失败）
+        finishConnecting(appKey);
+        throw err;
     }
 
-    scheduler.scheduleReconnect()
-    throw err
-  }
+    // Cache the connection config to prevent cfg mutation issues during message sends
+    // In per-appKey mode, each account still has its own config cached by accountId
+    setWorkclawConnectionConfig(accountId, {
+        appKey: baseConfig.appKey ?? "",
+        appSecret: baseConfig.appSecret ?? "",
+        baseUrl: baseConfig.baseUrl,
+        websocketUrl: baseConfig.websocketUrl,
+        localIp: baseConfig.localIp,
+        allowInsecureTls: baseConfig.allowInsecureTls,
+        requestTimeout: baseConfig.requestTimeout,
+    });
 }
 
 /**
- * per-appKey 模式: 多个账号共享一个 WebSocket 连接
+ * per-appKey 模式下处理共享 WebSocket 消息
  */
-async function startSharedWebSocket(options: OpenclawWorkclawGatewayOptions): Promise<void> {
-  const { accountId, account, cfg, log } = options
-
-  const logger = createLogger('', log)
-  const rawConfig = account.config as unknown as OpenclawWorkclawConfig & OpenclawWorkclawAccountConfig
-
-  const baseConfig: WorkClawBaseConfig = {
-    baseUrl: rawConfig.baseUrl,
-    websocketUrl: rawConfig.websocketUrl,
-    appKey: rawConfig.appKey,
-    appSecret: rawConfig.appSecret,
-    localIp: rawConfig.localIp,
-    allowInsecureTls: rawConfig.allowInsecureTls,
-    requestTimeout: rawConfig.requestTimeout,
-  }
-
-  const accountConfig: OpenclawWorkclawAccountConfig = {
-    agentId: rawConfig.agentId,
-    userId: rawConfig.userId,
-    openConversationId: rawConfig.openConversationId,
-  }
-
-  const appKey = baseConfig.appKey || accountId
-  const appKeyRaw = baseConfig.appKey ?? ''
-
-  buildAccountMap(cfg)
-
-  logger.info(
-    `Gateway start (per-appKey) accountId=${accountId} appKey=${appKeyRaw ? `${appKeyRaw.slice(0, 8)}...` : 'missing'} baseUrl=${baseConfig.baseUrl ?? ''} websocketUrl=${baseConfig.websocketUrl ?? ''}`,
-  )
-
-  // 注册账号上下文
-  const ctx: MessageDispatcherContext = {
-    accountId,
-    account,
-    cfg,
-    baseConfig,
-    accountConfig,
-    log: logger,
-    scheduleReconnect: () => {
-      const scheduler = getReconnectScheduler(appKey)
-      scheduler?.scheduleReconnect()
-    },
-  }
-
-  registerAccountContext(appKey, accountId, ctx)
-
-  // 检查是否已存在该 appKey 的 WebSocket
-  const existingWs = getOpenclawWorkclawWsConnection(appKey)
-  if (existingWs) {
-    logger.info(`Gateway (per-appKey) using existing WebSocket for appKey=${appKey}`)
-    return
-  }
-
-  // 尝试获取连接锁，防止竞态条件
-  const isConnector = tryStartConnecting(appKey)
-  if (!isConnector) {
-    // 另一个账号正在连接，等待完成
-    logger.info(`Gateway (per-appKey) another account is connecting, waiting... appKey=${appKey}`)
-    // 等待直到连接建立完成（通过轮询）
-    const maxWait = 30000
-    const interval = 500
-    const startTime = Date.now()
-    while (Date.now() - startTime < maxWait) {
-      const ws = getOpenclawWorkclawWsConnection(appKey)
-      if (ws) {
-        logger.info(`Gateway (per-appKey) connection established by another account, using it appKey=${appKey}`)
-        return
-      }
-      await new Promise(resolve => setTimeout(resolve, interval))
-    }
-    logger.warn(`Gateway (per-appKey) wait timeout, will create own connection appKey=${appKey}`)
-    // 如果等待超时，由当前账号创建连接
-  }
-
-  // 需要创建新的 WebSocket（只有获取到锁的账号才执行到这里）
-  const scheduler = createReconnectScheduler({
-    key: appKey,
-    config: baseConfig,
-    log: logger,
-    onMessage: (data: string) => {
-      handleSharedMessage(appKey, data, cfg, logger)
-    },
-    onReconnectSuccess: () => {
-      // 重连成功后重置退避时间
-    },
-  })
-  setReconnectScheduler(appKey, scheduler)
-
-  try {
-    const tokenCacheKey = baseConfig.appKey || accountId
-    const connConfig = {
-      baseUrl: baseConfig.baseUrl || '',
-      websocketUrl: baseConfig.websocketUrl,
-      appKey: baseConfig.appKey,
-      appSecret: baseConfig.appSecret,
-      localIp: baseConfig.localIp,
-      allowInsecureTls: baseConfig.allowInsecureTls,
-      requestTimeout: baseConfig.requestTimeout,
-    }
+function handleSharedMessage(appKey: string, data: string, cfg: any, logger: any): void {
+    const parsed = parseWorkClawMessage(data, logger);
 
-    const { endpoint, ticket } = await openOpenclawWorkclawConnection(tokenCacheKey, connConfig)
-    logger.info(`Gateway (per-appKey) Connection opened endpoint=${endpoint} ticketLen=${ticket?.length ?? 0}`)
-    const url = `${endpoint}?ticket=${encodeURIComponent(ticket)}`
-
-    const { Agent } = await import('undici')
-    const dispatcher = connConfig.allowInsecureTls
-      ? new Agent({ connect: { rejectUnauthorized: false } })
-      : undefined
-    const wsOptions = dispatcher ? { dispatcher } : undefined
-
-    const ws = new (await import('undici')).WebSocket(url, wsOptions)
-    setOpenclawWorkclawWsConnection(appKey, ws)
-    finishConnecting(appKey) // 连接已建立，释放锁
-
-    await new Promise<void>((resolve, reject) => {
-      const timeout = setTimeout(() => reject(new Error('websocket connection timeout')), 30000)
-
-      ws.onopen = () => {
-        clearTimeout(timeout)
-        logger.info(`Gateway (per-appKey) WebSocket connected`)
-        resolve()
-      }
-
-      ws.onerror = (event: any) => {
-        clearTimeout(timeout)
-        const errorMsg = String(event?.message ?? event)
-        logger.error(`Gateway (per-appKey) WebSocket error: ${errorMsg}`)
-        reject(new Error(errorMsg))
-      }
-
-      ws.onclose = (event: any) => {
-        clearTimeout(timeout)
-        reject(new Error(`websocket closed before ready code=${event?.code ?? ''} reason=${event?.reason ?? ''}`))
-      }
-    })
-
-    ws.onmessage = (event: any) => {
-      const data = typeof event.data === 'string' ? event.data : String(event.data ?? '')
-      logger.info(`Gateway (per-appKey) WebSocket message received bytes=${data.length}`)
-      logger.info?.(`Gateway (per-appKey) received message: ${data}`)
-      handleSharedMessage(appKey, data, cfg, logger)
+    if (!parsed) {
+        logger.warn?.(`Gateway (per-appKey) failed to parse message`);
+        return;
     }
 
-    ws.onclose = (event: any) => {
-      logger.warn(`Gateway (per-appKey) WebSocket closed scheduling reconnect... appKey=${appKey} code=${event?.code ?? ''} reason=${event?.reason ?? ''}`)
-      clearOpenclawWorkclawWsConnection(appKey)
-      scheduler.scheduleReconnect()
+    // ping/pong/disconnect 无需路由
+    if (parsed.type === "ping") {
+        const ws = getWorkclawWsConnection(appKey);
+        if (ws && ws.readyState === 1) { // OPEN
+            const pongResponse = {
+                code: 200,
+                message: "pong",
+                metadata: { contentType: "application/json" },
+                data: JSON.stringify(parsed.pongData),
+            };
+            ws.send(JSON.stringify(pongResponse));
+        }
+        return;
     }
 
-    ws.onerror = (event: any) => {
-      logger.error(`Gateway (per-appKey) WebSocket error: ${String(event?.message ?? event)}`)
-    }
-  }
-  catch (err) {
-    finishConnecting(appKey) // 连接失败，释放锁
-    const errorStr = String(err)
-    logger.error(`Gateway (per-appKey) connect failed: ${errorStr}`)
-
-    if (errorStr.includes('访问过于频繁')) {
-      logger.warn(`Rate limited, scheduling reconnect...`)
-      scheduler.scheduleReconnect()
-      throw err
+    if (parsed.type === "disconnect") {
+        const ws = getWorkclawWsConnection(appKey);
+        ws?.close();
+        return;
     }
 
-    const isAuthError
-      = errorStr.includes('"errCode":2001')
-        || errorStr.includes('"code":2001')
-        || errorStr.includes('鉴权失败')
-        || errorStr.includes('invalid credentials')
-        || errorStr.includes('unauthorized')
-
-    if (isAuthError) {
-      logger.error(`Authentication failed, not scheduling reconnect`)
-      scheduler.stopReconnect()
-      throw err
+    // logger.info?.(`Gateway (per-appKey) received message: ${data}`);
+
+
+    // 根据消息类型确定 userId 和 agentId
+    let userId: string = "";
+    let agentId: string = "";
+
+    if (parsed.type === "agent_message" && parsed.message) {
+        userId = String(parsed.message.userId || "");
+        agentId = String(parsed.message.agentId || "");
+    } else if (parsed.type === "agent_created") {
+        // agent_created 触发新账号创建
+        const allDispatchers = getAllDispatchersByAppKey(appKey);
+        if (allDispatchers && allDispatchers.size > 0) {
+            const firstDispatcher = allDispatchers.values().next().value;
+            dispatchWorkclawMessage(data, firstDispatcher.ctx).catch((err) => {
+                logger.error?.(`Dispatch error: ${String(err)}`);
+            });
+        }
+        return;
+    } else if (parsed.type === "agent_updated" || parsed.type === "agent_deleted") {
+        userId = String(parsed.eventData?.futureId || parsed.eventData?.userId || "");
+        agentId = String(parsed.eventData?.id || parsed.eventData?.agentId || "");
+    } else if (parsed.type === "tools_list" || parsed.type === "skills_list" || parsed.type === "skills_event") {
+        userId = String(parsed.eventData?.userId || "");
+        agentId = String(parsed.eventData?.agentId || "");
+    } else if (parsed.type === "init_agent") {
+        userId = String(parsed.eventData?.futureId || parsed.eventData?.userId || "");
+        agentId = String(parsed.eventData?.id || parsed.eventData?.agentId || "");
+        /**
+         * 在 init_agent 中，配置文件的agentId 为空,所有无法通过 resolveAccountByUserIdAndAgentId 查找账户
+         */
+
+        const accountId = "default";
+        const dispatcher = getDispatcherByAppKeyAndAccountId(appKey, accountId);
+        if (dispatcher) {
+            dispatchWorkclawMessage(data, dispatcher.ctx).catch((err) => {
+                logger.error?.(`Dispatch error: ${String(err)}`);
+            });
+        } else {
+            logger.warn?.(`Gateway (per-appKey) no dispatcher for accountId=${accountId}`);
+        }
+        return;
+    } else {
+        // 未知消息类型，忽略
+        return;
     }
 
-    scheduler.scheduleReconnect()
-    throw err
-  }
-}
-
-/**
- * per-appKey 模式下处理共享 WebSocket 消息
- */
-function handleSharedMessage(appKey: string, data: string, cfg: any, logger: any): void {
-  const parsed = parseWorkClawMessage(data, logger)
-
-  if (!parsed) {
-    logger.warn?.(`Gateway (per-appKey) failed to parse message`)
-    return
-  }
-
-  // ping/pong/disconnect 无需路由
-  if (parsed.type === 'ping') {
-    const ws = getOpenclawWorkclawWsConnection(appKey)
-    if (ws && ws.readyState === 1) { // OPEN
-      const pongResponse = {
-        code: 200,
-        message: 'pong',
-        metadata: { contentType: 'application/json' },
-        data: JSON.stringify(parsed.pongData),
-      }
-      ws.send(JSON.stringify(pongResponse))
-    }
-    return
-  }
-
-  if (parsed.type === 'disconnect') {
-    const ws = getOpenclawWorkclawWsConnection(appKey)
-    ws?.close()
-    return
-  }
-
-  logger.info?.(`Gateway (per-appKey) received message: ${data}`)
-
-  // 根据消息类型确定 userId 和 agentId
-  let userId: string = ''
-  let agentId: string = ''
-
-  if (parsed.type === 'agent_message' && parsed.message) {
-    userId = String(parsed.message.userId || '')
-    agentId = String(parsed.message.agentId || '')
-  }
-  else if (parsed.type === 'agent_created') {
-    // agent_created 触发新账号创建
-    const allDispatchers = getAllDispatchersByAppKey(appKey)
-    if (allDispatchers && allDispatchers.size > 0) {
-      const firstDispatcher = allDispatchers.values().next().value
-      if (firstDispatcher) {
-        dispatchOpenclawWorkclawMessage(data, firstDispatcher.ctx).catch((err) => {
-          logger.error?.(`Dispatch error: ${String(err)}`)
-        })
-      }
+    const accountId = resolveAccountByUserIdAndAgentId(cfg, userId, agentId);
+    if (!accountId) {
+        logger.warn?.(`Gateway (per-appKey) no account found for userId=${userId} agentId=${agentId}`);
+        return;
     }
-    return
-  }
-  else if (parsed.type === 'agent_updated' || parsed.type === 'agent_deleted') {
-    userId = String(parsed.eventData?.futureId || parsed.eventData?.userId || '')
-    agentId = String(parsed.eventData?.id || parsed.eventData?.agentId || '')
-  }
-  else if (parsed.type === 'tools_list' || parsed.type === 'skills_list') {
-    userId = String(parsed.eventData?.userId || '')
-    agentId = String(parsed.eventData?.agentId || '')
-  }
-  else if(parsed.type === "skills_event") {
-    userId = String(parsed.eventData?.data?.userId || "");
-    agentId = String(parsed.eventData?.data?.mainId || "");
-  }
-  else if (parsed.type === 'init_agent') {
-    userId = String(parsed.eventData?.futureId || parsed.eventData?.userId || '')
-    agentId = String(parsed.eventData?.id || parsed.eventData?.agentId || '')
-    /**
-     * 在 init_agent 中，配置文件的agentId 为空,所有无法通过 resolveAccountByUserIdAndAgentId 查找账户
-     */
-
-    const accountId = 'default'
-    const dispatcher = getDispatcherByAppKeyAndAccountId(appKey, accountId)
+
+    const dispatcher = getDispatcherByAppKeyAndAccountId(appKey, accountId);
     if (dispatcher) {
-      dispatchOpenclawWorkclawMessage(data, dispatcher.ctx).catch((err) => {
-        logger.error?.(`Dispatch error: ${String(err)}`)
-      })
-    }
-    else {
-      logger.warn?.(`Gateway (per-appKey) no dispatcher for accountId=${accountId}`)
+        dispatchWorkclawMessage(data, dispatcher.ctx).catch((err) => {
+            logger.error?.(`Dispatch error: ${String(err)}`);
+        });
+    } else {
+        logger.warn?.(`Gateway (per-appKey) no dispatcher for accountId=${accountId}`);
     }
-    return
-  }
-  else {
-    // 未知消息类型，忽略
-    return
-  }
-
-  const accountId = resolveAccountByUserIdAndAgentId(cfg, userId, agentId)
-  if (!accountId) {
-    logger.warn?.(`Gateway (per-appKey) no account found for userId=${userId} agentId=${agentId}`)
-    return
-  }
-
-  const dispatcher = getDispatcherByAppKeyAndAccountId(appKey, accountId)
-  if (dispatcher) {
-    dispatchOpenclawWorkclawMessage(data, dispatcher.ctx).catch((err) => {
-      logger.error?.(`Dispatch error: ${String(err)}`)
-    })
-  }
-  else {
-    logger.warn?.(`Gateway (per-appKey) no dispatcher for accountId=${accountId}`)
-  }
 }
 
-export function stopOpenclawWorkclawGateway(accountId: string, wsStrategy?: string): void {
-  if (wsStrategy === 'per-appKey') {
-    const appKey = getAppKeyByAccountId(accountId)
-    if (!appKey)
-      return
-
-    unregisterAccountContext(appKey, accountId)
-
-    if (getAllDispatchersByAppKey(appKey)?.size === 0) {
-      const ws = getOpenclawWorkclawWsConnection(appKey)
-      ws?.close()
-      clearOpenclawWorkclawWsConnection(appKey)
-
-      const scheduler = getReconnectScheduler(appKey)
-      scheduler?.stopReconnect()
-      clearReconnectScheduler(appKey)
+export function stopWorkclawGateway(accountId: string, wsStrategy?: string): void {
+    if (wsStrategy === "per-appKey") {
+        const appKey = getAppKeyByAccountId(accountId);
+        if (!appKey) return;
+
+        unregisterAccountContext(appKey, accountId);
+
+        if (getAllDispatchersByAppKey(appKey)?.size === 0) {
+            const ws = getWorkclawWsConnection(appKey);
+            ws?.close();
+            clearWorkclawWsConnection(appKey);
+
+            const scheduler = getReconnectScheduler(appKey);
+            scheduler?.stopReconnect();
+            clearReconnectScheduler(appKey);
+        }
+        clearWorkclawConnectionConfig(accountId);
+    } else {
+        const ws = getWorkclawWsConnection(accountId);
+        if (ws) ws.close();
+        clearWorkclawWsConnection(accountId);
+        clearWorkclawTokenCache(accountId);
+        clearWorkclawConnectionConfig(accountId);
     }
-  }
-  else {
-    const ws = getOpenclawWorkclawWsConnection(accountId)
-    if (ws)
-      ws.close()
-    clearOpenclawWorkclawWsConnection(accountId)
-    clearOpenclawWorkclawTokenCache(accountId)
-  }
 }