cclawd 1.0.7 → 1.0.8

package/extensions/mfa-auth/index.ts

@@ -1,1065 +1,712 @@
-import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
-import { authManager } from "./src/auth-manager.js";
-import { config } from "./src/config.js";
-import { dabbyClient } from "./src/dabby-client.js";
-import { NotificationService } from "./src/notification-service.js";
-import { qrCodeAuthProvider } from "./src/providers/qr-code.js";
-import { setNotifyCallback } from "./src/server.js";
-import type { AuthSession } from "./src/types.js";
-
-const notificationService = NotificationService.getInstance();
-const pendingAuthUsers = new Set<string>();
-
-function isWebchatChannel(channel: string | undefined): boolean {
-  if (!channel) {
-    return false;
-  }
-  const normalized = channel.trim().toLowerCase();
-  return normalized === "webchat" || normalized === "web";
-}
-
-function isPeerKindToken(value: string | undefined): boolean {
-  if (!value) {
-    return false;
-  }
-  const normalized = value.trim().toLowerCase();
-  return normalized === "direct" || normalized === "group" || normalized === "dm";
-}
-
-function parseSessionContextFromKey(sessionKey: string | undefined): {
-  channel?: string;
-  accountId?: string;
-  to?: string;
-} {
-  const parts = String(sessionKey || "")
-    .split(":")
-    .map((part) => part.trim())
-    .filter(Boolean);
-  if (parts.length === 0) {
-    return {};
-  }
-
-  const channel = parts[2];
-  let accountId = parts[3];
-  const to = parts[parts.length - 1];
-
-  // In common session keys, index 3 is peer kind (direct/group/dm), not account id.
-  if (isPeerKindToken(accountId)) {
-    accountId = undefined;
-  }
-
-  return {
-    channel: channel || undefined,
-    accountId: accountId || undefined,
-    to: to || undefined,
-  };
-}
-
-function addPendingAuthCandidates(...ids: Array<string | undefined>): void {
-  for (const id of expandAuthIdCandidates(ids)) {
-    pendingAuthUsers.add(id);
-  }
-}
-
-function findPendingAuthCandidate(eventTo: string, conversationId?: string): string | undefined {
-  for (const candidate of expandAuthIdCandidates([eventTo, conversationId])) {
-    if (pendingAuthUsers.has(candidate)) {
-      return candidate;
-    }
-  }
-  return undefined;
-}
-
-function normalizeAuthId(value: string | undefined): string {
-  const raw = String(value ?? "").trim();
-  if (!raw) {
-    return "";
-  }
-  const lower = raw.toLowerCase();
-  if (lower.startsWith("agent:main:")) {
-    return raw.slice("agent:main:".length);
-  }
-  if (lower.startsWith("webchat:")) {
-    return raw.slice("webchat:".length);
-  }
-  if (lower.startsWith("web:")) {
-    return raw.slice("web:".length);
-  }
-  return raw;
-}
-
-function expandAuthIdCandidates(values: Array<string | undefined>): string[] {
-  const result = new Set<string>();
-  for (const value of values) {
-    const raw = String(value ?? "").trim();
-    if (!raw) {
-      continue;
-    }
-    result.add(raw);
-    const normalized = normalizeAuthId(raw);
-    if (normalized) {
-      result.add(normalized);
-      result.add(`agent:main:${normalized}`);
-      result.add(`webchat:${normalized}`);
-      result.add(`web:${normalized}`);
-    }
-  }
-  return Array.from(result);
-}
-
-function authIdEquals(a: string | undefined, b: string | undefined): boolean {
-  const aa = String(a ?? "").trim();
-  const bb = String(b ?? "").trim();
-  if (!aa || !bb) {
-    return false;
-  }
-  return aa === bb || normalizeAuthId(aa) === normalizeAuthId(bb);
-}
-
-function resolvePendingAuthSession(candidateIds: string[]): {
-  matchedId: string;
-  session: AuthSession;
-} | null {
-  const uniqueCandidates = expandAuthIdCandidates(candidateIds);
-
-  for (const id of uniqueCandidates) {
-    const hasPendingCandidate = Array.from(pendingAuthUsers).some((pending) => authIdEquals(pending, id));
-    if (!hasPendingCandidate) {
-      continue;
-    }
-    const session =
-      authManager.getLatestSessionByUserId(id) ||
-      authManager.getLatestSessionByUserId(normalizeAuthId(id));
-    if (session?.metadata && typeof (session.metadata as Record<string, unknown>).qrCodeUrl === "string") {
-      return { matchedId: id, session };
-    }
-  }
-
-  let latest: { matchedId: string; session: AuthSession } | null = null;
-  for (const sessionId of authManager.getSessionIds()) {
-    const session = authManager.getSession(sessionId);
-    if (!session?.metadata) {
-      continue;
-    }
-    const metadata = session.metadata as Record<string, unknown>;
-    if (typeof metadata.qrCodeUrl !== "string") {
-      continue;
-    }
-    const matches = uniqueCandidates.some((candidate) => {
-      return (
-        authIdEquals(candidate, session.userId) ||
-        authIdEquals(candidate, String(session.originalContext.sessionKey ?? "")) ||
-        authIdEquals(candidate, String(session.originalContext.to ?? ""))
-      );
-    });
-    if (!matches) {
-      continue;
-    }
-    if (!latest || session.timestamp > latest.session.timestamp) {
-      latest = {
-        matchedId:
-          uniqueCandidates.find((candidate) => candidate === session.userId) || session.userId,
-        session,
-      };
-    }
-  }
-
-  return latest;
-}
-
-function resolveGlobalPendingFirstMessageSession(): AuthSession | null {
-  let latestPending: AuthSession | null = null;
-
-  for (const sessionId of authManager.getSessionIds()) {
-    const session = authManager.getSession(sessionId);
-    if (!session?.metadata) {
-      continue;
-    }
-
-    const metadata = session.metadata as Record<string, unknown>;
-    if (metadata.triggerType !== "first_message") {
-      continue;
-    }
-    if (typeof metadata.qrCodeUrl !== "string" || !metadata.qrCodeUrl.trim()) {
-      continue;
-    }
-    if (authManager.isUserVerifiedForFirstMessage(session.userId)) {
-      continue;
-    }
-
-    if (!latestPending || session.timestamp > latestPending.timestamp) {
-      latestPending = session;
-    }
-  }
-
-  return latestPending;
-}
-
-function buildFirstMessageChallengeText(metadata: Record<string, unknown>): string {
-  const qrCodeUrl = typeof metadata.qrCodeUrl === "string" ? metadata.qrCodeUrl : "";
-  const isReauth = metadata.isReauth === true;
-  if (isReauth) {
-    return `\u9700\u8981\u91cd\u65b0\u8ba4\u8bc1\n\n\u8bf7\u70b9\u51fb\u4e0b\u65b9\u94fe\u63a5\u5b8c\u6210\u626b\u7801\u8ba4\u8bc1\uff1a\n${qrCodeUrl}\n\n\u8ba4\u8bc1\u6709\u6548\u671f\uff1a${Math.floor(config.timeout / 60000)} \u5206\u949f\u3002`;
-  }
-  return `\u9996\u6b21\u5bf9\u8bdd\u9700\u8981\u8ba4\u8bc1\n\n\u8bf7\u70b9\u51fb\u4e0b\u65b9\u94fe\u63a5\u5b8c\u6210\u626b\u7801\u8ba4\u8bc1\uff1a\n${qrCodeUrl}\n\n\u8ba4\u8bc1\u6709\u6548\u671f\uff1a${Math.floor(config.timeout / 60000)} \u5206\u949f\u3002`;
-}
-
-function uniqueNonEmpty(values: Array<string | undefined>): string[] {
-  return Array.from(
-    new Set(
-      values
-        .map((value) => String(value ?? "").trim())
-        .filter(Boolean),
-    ),
-  );
-}
-
-function isAnyFirstMessageAliasVerified(userIds: string[]): string | undefined {
-  for (const userId of userIds) {
-    if (authManager.isUserVerifiedForFirstMessage(userId)) {
-      return userId;
-    }
-  }
-  return undefined;
-}
-
-function consumeNotificationByAliases(userIds: string[]): {
-  triggerType: "first_message" | "sensitive_operation";
-  isReauth: boolean;
-} | null {
-  for (const userId of userIds) {
-    const notification = authManager.checkAndConsumeNotification(userId);
-    if (notification) {
-      return notification;
-    }
-  }
-  return null;
-}
-
-function resolveInboundAuthUserId(params: {
-  channelId?: string;
-  from?: string;
-  senderId?: string;
-  conversationId?: string;
-  metadataTo?: string;
-  metadataOriginatingTo?: string;
-}): string {
-  const candidates = [
-    params.from,
-    params.senderId,
-    params.conversationId,
-    params.metadataOriginatingTo,
-    params.metadataTo,
-  ];
-  const firstNonEmpty = candidates
-    .map((value) => String(value ?? "").trim())
-    .find((value) => value.length > 0);
-
-  if (isWebchatChannel(params.channelId)) {
-    return firstNonEmpty || "unknown";
-  }
-  return firstNonEmpty || "unknown";
-}
-
-async function sendAuthMessage(
-  channel: string | undefined,
-  accountId: string | undefined,
-  to: string,
-  message: string,
-  userId: string,
-  overrideSessionKey?: string,
-): Promise<void> {
-  const session: AuthSession = {
-    userId,
-    sessionId: "notification",
-    authMethod: "qr-code",
-    timestamp: Date.now(),
-    originalContext: {
-      sessionKey: overrideSessionKey || `${channel || "web"}:${accountId || ""}:${userId}`,
-      senderId: userId,
-      commandBody: "",
-      channel: channel || "web",
-      accountId: accountId || "",
-      to,
-      toolName: "notification",
-      toolParams: {},
-      timestamp: Date.now(),
-      triggerType: "sensitive_operation",
-    },
-  };
-
-  await notificationService.sendAuthNotification(session, message);
-}
-
-export default function register(api: OpenClawPluginApi) {
-  console.log("[mfa-auth] Plugin registration started");
-  authManager.registerProvider(qrCodeAuthProvider);
-
-  notificationService.setConfig(api.config);
-
-  setNotifyCallback(async (session: AuthSession) => {
-    api.logger.info(`[mfa-auth] User ${session.userId} verified`);
-
-    if (!config.enableAuthNotification) {
-      api.logger.info(`[mfa-auth] Auth notification disabled, skipping message send.`);
-      return;
-    }
-
-    try {
-      const commandBody = session.originalContext.commandBody;
-      const triggerType = session.originalContext.triggerType || "sensitive_operation";
-
-      const isFirstMessageAuth = triggerType === "first_message";
-      const isReauth = commandBody.trim() === "/reauth";
-
-      let messageText = "";
-      if (isFirstMessageAuth) {
-        messageText = isReauth
-          ? "\u2705 \u91cd\u65b0\u8ba4\u8bc1\u6210\u529f\uff0c\u8bf7\u91cd\u65b0\u53d1\u9001\u6d88\u606f\u7ee7\u7eed\u5bf9\u8bdd\u3002"
-          : "\u2705 \u9996\u6b21\u8ba4\u8bc1\u6210\u529f\uff0c\u8bf7\u91cd\u65b0\u53d1\u9001\u6d88\u606f\u7ee7\u7eed\u5bf9\u8bdd\u3002";
-      } else {
-        messageText = "\u2705 \u4e8c\u6b21\u8ba4\u8bc1\u6210\u529f\uff0c\u8bf7\u91cd\u65b0\u53d1\u9001\u4e4b\u524d\u7684\u547d\u4ee4\u6216\u56de\u590d\u201c\u786e\u8ba4\u201d\u3002";
-      }
-
-      const channel = session.originalContext.channel;
-      const sessionKey =
-        session.originalContext.sessionKey ||
-        `${channel}:${session.originalContext.accountId || ""}:${session.userId}`;
-
-      api.logger.info(`[mfa-auth] Sending notification to session: ${sessionKey}`);
-
-      await sendAuthMessage(
-        channel,
-        session.originalContext.accountId,
-        session.originalContext.to || session.userId,
-        messageText,
-        session.userId,
-        sessionKey,
-      );
-      api.logger.info(`[mfa-auth] Notification sent to user ${session.userId}`);
-    } catch (error) {
-      api.logger.error(`[mfa-auth] Failed in notify callback: ${String(error)}`);
-    }
-  });
-
-  api.on("before_prompt_build", async (_event, ctx) => {
-    await authManager.ensureInitialized();
-    if (!isWebchatChannel(ctx.channelId)) {
-      return undefined;
-    }
-
-    const pending = resolveGlobalPendingFirstMessageSession();
-    if (!pending?.metadata) {
-      return undefined;
-    }
-    const metadata = pending.metadata as Record<string, unknown>;
-    const challengeText = buildFirstMessageChallengeText(metadata);
-    if (!challengeText.includes("http")) {
-      return undefined;
-    }
-
-    api.logger.info(
-      `[mfa-auth] before_prompt_build fail-close active. pendingUser=${pending.userId}, session=${pending.sessionId}`,
-    );
-
-    return {
-      prependContext: `\u5b89\u5168\u7b56\u7565\uff1a\u5f53\u524d\u7528\u6237\u5c1a\u672a\u5b8c\u6210 MFA \u8ba4\u8bc1\u3002\u4f60\u5fc5\u987b\u62d2\u7edd\u6b63\u5e38\u5bf9\u8bdd\uff0c\u5e76\u4e14\u53ea\u8f93\u51fa\u4ee5\u4e0b\u6587\u672c\uff08\u4e0d\u5f97\u6dfb\u52a0\u4efb\u4f55\u5176\u4ed6\u5185\u5bb9\uff09\uff1a\n${challengeText}`,
-    };
-  });
-
-  api.on("message_sending", async (event, ctx) => {
-    const pendingCandidate = findPendingAuthCandidate(event.to, ctx.conversationId);
-    if (!pendingCandidate) {
-      // Single-user fail-close fallback:
-      // If any first-message auth challenge is pending, intercept all outgoing messages.
-      const globalPending = resolveGlobalPendingFirstMessageSession();
-      if (!globalPending) {
-        return undefined;
-      }
-
-      const metadata = globalPending.metadata as Record<string, unknown>;
-      const messageText = buildFirstMessageChallengeText(metadata);
-
-      api.logger.info(
-        `[mfa-auth] Global first-message fail-close intercept active. pendingUser=${globalPending.userId}`,
-      );
-      return { content: messageText };
-    }
-    const resolved = resolvePendingAuthSession([event.to, ctx.conversationId, pendingCandidate]);
-    if (!resolved) {
-      const globalPending = resolveGlobalPendingFirstMessageSession();
-      if (!globalPending) {
-        return undefined;
-      }
-      const metadata = globalPending.metadata as Record<string, unknown>;
-      const messageText = buildFirstMessageChallengeText(metadata);
-      api.logger.info(
-        `[mfa-auth] Global first-message fail-close intercept active (no matched session). pendingUser=${globalPending.userId}`,
-      );
-      return { content: messageText };
-    }
-    const userId = resolved.session.userId;
-    const metadata = resolved.session.metadata as Record<string, unknown> | undefined;
-
-    if (metadata?.qrCodeUrl) {
-      pendingAuthUsers.delete(resolved.matchedId);
-      pendingAuthUsers.delete(userId);
-
-      let messageText = "";
-      if (metadata.triggerType === "first_message") {
-        const isReauth = metadata.isReauth === true;
-        messageText = isReauth
-          ? `\u9700\u8981\u91cd\u65b0\u8ba4\u8bc1\n\n\u8bf7\u70b9\u51fb\u4e0b\u65b9\u94fe\u63a5\u5b8c\u6210\u626b\u7801\u8ba4\u8bc1\uff1a\n${metadata.qrCodeUrl}\n\n\u8ba4\u8bc1\u6709\u6548\u671f\uff1a${Math.floor(config.timeout / 60000)} \u5206\u949f\u3002`
-          : `\u9996\u6b21\u5bf9\u8bdd\u9700\u8981\u8ba4\u8bc1\n\n\u8bf7\u70b9\u51fb\u4e0b\u65b9\u94fe\u63a5\u5b8c\u6210\u626b\u7801\u8ba4\u8bc1\uff1a\n${metadata.qrCodeUrl}\n\n\u8ba4\u8bc1\u6709\u6548\u671f\uff1a${Math.floor(config.timeout / 60000)} \u5206\u949f\u3002`;
-      } else if (metadata.triggerType === "sensitive_operation") {
-        messageText = `\u68c0\u6d4b\u5230\u654f\u611f\u64cd\u4f5c\uff0c\u9700\u4e8c\u6b21\u8ba4\u8bc1\u3002\n\n\u64cd\u4f5c\u5185\u5bb9\uff1a${metadata.commandPreview}\n\n\u8bf7\u70b9\u51fb\u4e0b\u65b9\u94fe\u63a5\u5b8c\u6210\u626b\u7801\u8ba4\u8bc1\uff1a\n${metadata.qrCodeUrl}\n\n\u8ba4\u8bc1\u6709\u6548\u671f\uff1a${Math.floor(config.timeout / 60000)} \u5206\u949f\u3002\n\n\u8ba4\u8bc1\u5b8c\u6210\u540e\uff0c\u8bf7\u91cd\u65b0\u53d1\u9001\u4e0a\u4e00\u6761\u547d\u4ee4\u6216\u56de\u590d\u201c\u786e\u8ba4\u201d\u3002`;
-      }
-
-      return { content: messageText };
-    }
-  });
-
-  api.on("before_tool_call", async (event, ctx) => {
-    await authManager.ensureInitialized();
-    if (!config.requireAuthOnSensitiveOperation) {
-      return undefined;
-    }
-
-    const { toolName, params } = event;
-
-    api.logger.info(`[mfa-auth] Tool call detected: ${toolName}`);
-
-    const sensitiveTools = ["bash", "exec", "runCommand", "command", "process"];
-    if (!sensitiveTools.includes(toolName)) {
-      api.logger.info(`[mfa-auth] Tool ${toolName} is not in sensitive list, allowing`);
-      return undefined;
-    }
-
-    const command =
-      typeof params?.command === "string"
-        ? params.command
-        : typeof params?.cmd === "string"
-          ? params.cmd
-          : typeof params?.input === "string"
-            ? params.input
-            : typeof params?.args === "string"
-              ? params.args
-              : "";
-
-    api.logger.info(`[mfa-auth] Extracted command from ${toolName}: ${command}`);
-
-    if (!command) {
-      api.logger.info(`[mfa-auth] No command found in params, allowing`);
-      return undefined;
-    }
-
-    const { isSensitive, preview } = checkSensitiveOperation(command);
-    if (!isSensitive) {
-      api.logger.info(`[mfa-auth] Command is not sensitive, allowing`);
-      return undefined;
-    }
-
-    const sessionKey = ctx.sessionKey || "";
-    const parsed = parseSessionContextFromKey(sessionKey);
-    const userId = isWebchatChannel(parsed.channel)
-      ? parsed.to || sessionKey || "unknown"
-      : sessionKey || "unknown";
-
-    if (authManager.isUserVerifiedForSensitiveOps(userId)) {
-      api.logger.info(`[mfa-auth] User ${userId} is verified for sensitive ops, allowing`);
-
-      const notificationInfo = authManager.checkAndConsumeNotification(userId);
-      if (notificationInfo) {
-        const parsedChannel = parsed.channel;
-        const parsedAccountId = parsed.accountId;
-        const parsedTo = parsed.to;
-
-        const targetSessionKey =
-          isWebchatChannel(parsedChannel) ? sessionKey || userId : sessionKey;
-
-        sendAuthMessage(
-          parsedChannel,
-          parsedAccountId,
-          parsedTo || userId,
-          "\u2705 \u4e8c\u6b21\u8ba4\u8bc1\u6210\u529f\uff0c\u8bf7\u91cd\u65b0\u53d1\u9001\u4e4b\u524d\u7684\u547d\u4ee4\u6216\u56de\u590d\u201c\u786e\u8ba4\u201d\u3002",
-          userId,
-          targetSessionKey,
-        ).catch((err) =>
-          api.logger.error(`[mfa-auth] Failed to send success notification: ${err}`),
-        );
-      }
-
-      return undefined;
-    }
-
-    api.logger.info(`[mfa-auth] User ${userId} is NOT verified for sensitive ops.`);
-
-    const parsedChannel = parsed.channel;
-    const parsedAccountId = parsed.accountId;
-    const parsedTo = parsed.to;
-
-    api.logger.info(
-      `[mfa-auth] Parsed from sessionKey: channel=${parsedChannel}, accountId=${parsedAccountId}, to=${parsedTo}`,
-    );
-
-    const session = await authManager.generateSession(userId, {
-      sessionKey,
-      senderId: userId,
-      commandBody: command,
-      channel: parsedChannel,
-      to: parsedTo,
-      accountId: parsedAccountId,
-      toolName,
-      toolParams: params,
-      timestamp: Date.now(),
-      triggerType: "sensitive_operation",
-    });
-
-    if (!session) {
-      api.logger.error(`[mfa-auth] Failed to generate session for user ${userId}`);
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
+import { authManager } from "./src/auth-manager.js";
+import { config } from "./src/config.js";
+import { dabbyClient } from "./src/dabby-client.js";
+import { NotificationService } from "./src/notification-service.js";
+import { qrCodeAuthProvider } from "./src/providers/qr-code.js";
+import { setNotifyCallback } from "./src/server.js";
+import type { AuthSession } from "./src/types.js";
+
+const notificationService = NotificationService.getInstance();
+const pendingAuthUsers = new Set<string>();
+
+async function sendAuthMessage(
+  channel: string | undefined,
+  accountId: string | undefined,
+  to: string,
+  message: string,
+  userId: string,
+  overrideSessionKey?: string,
+): Promise<void> {
+  const session: AuthSession = {
+    userId,
+    sessionId: "notification",
+    authMethod: "qr-code",
+    timestamp: Date.now(),
+    originalContext: {
+      sessionKey: overrideSessionKey || `${channel || "web"}:${accountId || ""}:${userId}`,
+      senderId: userId,
+      commandBody: "",
+      channel: channel || "web",
+      accountId: accountId || "",
+      to,
+      toolName: "notification",
+      toolParams: {},
+      timestamp: Date.now(),
+      triggerType: "sensitive_operation",
+    },
+  };
+
+  await notificationService.sendAuthNotification(session, message);
+}
+
+export default function register(api: OpenClawPluginApi) {
+  console.log("[mfa-auth] Plugin registration started");
+  authManager.registerProvider(qrCodeAuthProvider);
+
+  notificationService.setConfig(api.config);
+
+  setNotifyCallback(async (session: AuthSession) => {
+    api.logger.info(`[mfa-auth] User ${session.userId} verified`);
+
+    if (!config.enableAuthNotification) {
+      api.logger.info(`[mfa-auth] Auth notification disabled, skipping message send.`);
+      return;
+    }
+
+    try {
+      const commandBody = session.originalContext.commandBody;
+      const triggerType = session.originalContext.triggerType || "sensitive_operation";
+
+      const isFirstMessageAuth = triggerType === "first_message";
+      const isReauth = commandBody.trim() === "/reauth";
+
+      let messageText = "";
+      if (isFirstMessageAuth) {
+        messageText = isReauth
+          ? `🎉 重新认证成功！请重新发送消息以继续对话。`
+          : `🎉 首次认证成功！请重新发送消息以继续对话。`;
+      } else {
+        messageText = `✅ 二次认证成功！\n\n请回到聊天窗口，重新发送之前的命令（或回复'确认'）即可执行。`;
+      }
+
+      const channel = session.originalContext.channel;
+      const sessionKey =
+        session.originalContext.sessionKey ||
+        `${channel}:${session.originalContext.accountId || ""}:${session.userId}`;
+
+      api.logger.info(`[mfa-auth] Sending notification to session: ${sessionKey}`);
+
+      await sendAuthMessage(
+        channel,
+        session.originalContext.accountId,
+        session.originalContext.to || session.userId,
+        messageText,
+        session.userId,
+        sessionKey,
+      );
+      api.logger.info(`[mfa-auth] Notification sent to user ${session.userId}`);
+    } catch (error) {
+      api.logger.error(`[mfa-auth] Failed in notify callback: ${String(error)}`);
+    }
+  });
+
+  api.on("message_sending", async (event, ctx) => {
+    const userId = event.to || ctx.conversationId || "unknown";
+
+    if (pendingAuthUsers.has(userId)) {
+      const session = authManager.getLatestSessionByUserId(userId);
+      const metadata = session?.metadata as Record<string, unknown> | undefined;
+
+      if (metadata?.qrCodeUrl) {
+        pendingAuthUsers.delete(userId);
+
+        let messageText = "";
+        if (metadata.triggerType === "first_message") {
+          const isReauth = metadata.isReauth === true;
+          messageText = isReauth
+            ? `🔐 重新认证\n\n📱 请点击以下链接完成扫码认证:\n${metadata.qrCodeUrl}\n\n验证有效期: ${Math.floor(config.timeout / 60000)} 分钟`
+            : `🔐 首次对话需要进行认证\n\n为了您的账户安全，首次对话前需要完成身份验证。\n\n📱 请点击以下链接完成扫码认证:\n${metadata.qrCodeUrl}\n\n验证有效期: ${Math.floor(config.timeout / 60000)} 分钟`;
+        } else if (metadata.triggerType === "sensitive_operation") {
+          messageText = `🔐 该操作需要二次认证\n\n检测到敏感操作: ${metadata.commandPreview}\n\n📱 请点击以下链接完成扫码认证:\n${metadata.qrCodeUrl}\n\n验证有效期: ${Math.floor(config.timeout / 60000)} 分钟\n\n验证成功后，请回复"确认"或者重新发送之前的命令以继续执行。`;
+        }
+
+        return { content: messageText };
+      }
+    }
+  });
+
+  api.on("before_tool_call", async (event, ctx) => {
+    await authManager.ensureInitialized();
+    if (!config.requireAuthOnSensitiveOperation) {
+      return undefined;
+    }
+
+    const { toolName, params } = event;
+
+    api.logger.info(`[mfa-auth] Tool call detected: ${toolName}`);
+
+    const sensitiveTools = ["bash", "exec", "runCommand", "command", "process"];
+    if (!sensitiveTools.includes(toolName)) {
+      api.logger.info(`[mfa-auth] Tool ${toolName} is not in sensitive list, allowing`);
+      return undefined;
+    }
+
+    const command =
+      typeof params?.command === "string"
+        ? params.command
+        : typeof params?.cmd === "string"
+          ? params.cmd
+          : typeof params?.input === "string"
+            ? params.input
+            : typeof params?.args === "string"
+              ? params.args
+              : "";
+
+    api.logger.info(`[mfa-auth] Extracted command from ${toolName}: ${command}`);
+
+    if (!command) {
+      api.logger.info(`[mfa-auth] No command found in params, allowing`);
+      return undefined;
+    }
+
+    const { isSensitive, preview } = checkSensitiveOperation(command);
+    if (!isSensitive) {
+      api.logger.info(`[mfa-auth] Command is not sensitive, allowing`);
+      return undefined;
+    }
+
+    const userId = ctx.sessionKey || "unknown";
+
+    if (authManager.isUserVerifiedForSensitiveOps(userId)) {
+      api.logger.info(`[mfa-auth] User ${userId} is verified for sensitive ops, allowing`);
+
+      const notificationInfo = authManager.checkAndConsumeNotification(userId);
+      if (notificationInfo) {
+        const sessionKey = ctx.sessionKey || "";
+        const sessionKeyParts = sessionKey.split(":").filter(Boolean);
+        const parsedChannel = sessionKeyParts[2] || undefined;
+        let parsedAccountId = sessionKeyParts[3] || undefined;
+        const parsedTo = sessionKeyParts[sessionKeyParts.length - 1] || undefined;
+
+        if (parsedAccountId === "direct" || parsedAccountId === "group") {
+          parsedAccountId = undefined;
+        }
+
+        const targetSessionKey =
+          parsedChannel === "webchat" || parsedChannel === "web" ? userId : sessionKey;
+
+        sendAuthMessage(
+          parsedChannel,
+          parsedAccountId,
+          parsedTo || userId,
+          "✅ 二次认证成功，请重新发送之前的命令（或回复'确认'）即可执行。",
+          userId,
+          targetSessionKey,
+        ).catch((err) =>
+          api.logger.error(`[mfa-auth] Failed to send success notification: ${err}`),
+        );
+      }
+
       return undefined;
     }
 
+    api.logger.info(`[mfa-auth] User ${userId} is NOT verified for sensitive ops.`);
+
+    const sessionKey = ctx.sessionKey || "";
+    const sessionKeyParts = sessionKey.split(":").filter(Boolean);
+
+    const parsedChannel = sessionKeyParts[2] || undefined;
+    let parsedAccountId = sessionKeyParts[3] || undefined;
+    const parsedTo = sessionKeyParts[sessionKeyParts.length - 1] || undefined;
+
+    // Fix: If accountId is "direct" or "group", it's actually the peerKind, not an accountId.
+    // This happens when the sessionKey omits the accountId (using default account).
+    if (parsedAccountId === "direct" || parsedAccountId === "group") {
+      parsedAccountId = undefined;
+    }
+
     api.logger.info(
-      `[mfa-auth] Sensitive auth session created: sessionId=${session.sessionId}, hasQrCode=${Boolean(session.qrCodeUrl)}, certToken=${session.certToken ?? "n/a"}`,
+      `[mfa-auth] Parsed from sessionKey: channel=${parsedChannel}, accountId=${parsedAccountId}, to=${parsedTo}`,
     );
 
+    const session = await authManager.generateSession(userId, {
+      sessionKey,
+      senderId: userId,
+      commandBody: command,
+      channel: parsedChannel,
+      to: parsedTo,
+      accountId: parsedAccountId,
+      toolName,
+      toolParams: params,
+      timestamp: Date.now(),
+      triggerType: "sensitive_operation",
+    });
+
+    if (!session) {
+      api.logger.error(`[mfa-auth] Failed to generate session for user ${userId}`);
+      return undefined;
+    }
+
     api.logger.info(`[mfa-auth] Blocking sensitive tool call: ${toolName} from ${userId}`);
-
-    // For webchat, use userId as sessionKey instead of agent:main:<userId>
-    if (isWebchatChannel(parsedChannel)) {
-      const sessionKeyForWebchat = sessionKey || userId;
-      const authChallengeText = `检测到敏感操作，需二次认证。\n\n操作内容：${preview}\n\n请点击下方链接完成扫码认证：\n${session.qrCodeUrl}\n\n认证有效期：${Math.floor(config.timeout / 60000)} 分钟。\n\n认证完成后，请重新发送上一条命令或回复“确认”。`;
+
+    // For webchat, use userId as sessionKey instead of agent:main:<userId>
+    if (parsedChannel === "webchat" || parsedChannel === "web") {
+      const sessionKeyForWebchat = userId;
 
       try {
         await sendAuthMessage(
           parsedChannel,
           parsedAccountId,
           parsedTo || userId,
-          authChallengeText,
+          `🔐 该操作需要二次认证\n\n检测到敏感操作: ${preview}\n\n📱 请点击以下链接完成扫码认证:\n${session.qrCodeUrl}\n\n验证有效期: ${Math.floor(config.timeout / 60000)} 分钟\n\n验证成功后，请回复"确认"或者重新发送之前的命令以继续执行。`,
           userId,
           sessionKeyForWebchat,
         );
-        api.logger.info(
-          `[mfa-auth] Sent sensitive operation auth notification to webchat: sessionKey=${sessionKeyForWebchat}`,
-        );
-      } catch (error) {
-        api.logger.error(
-          `[mfa-auth] Failed to send webchat sensitive auth notification: ${String(error)}`,
-        );
-      }
-      // Also add to pending users as fallback
-      addPendingAuthCandidates(userId, sessionKeyForWebchat, parsedTo);
-      authManager.setSessionMetadata(session.sessionId, {
-        qrCodeUrl: session.qrCodeUrl,
-        triggerType: "sensitive_operation",
-        commandPreview: preview,
-      });
-
-      startPollingForAuth(api, userId, session.sessionId, {
-        triggerType: "sensitive_operation",
-        isReauth: false,
-        channel: parsedChannel,
-        accountId: parsedAccountId,
-        to: parsedTo,
-        sessionKey: sessionKeyForWebchat,
-      });
-
+        api.logger.info(
+          `[mfa-auth] Sent sensitive operation auth notification to webchat: sessionKey=${sessionKeyForWebchat}`,
+        );
+      } catch (error) {
+        api.logger.error(
+          `[mfa-auth] Failed to send webchat sensitive auth notification: ${String(error)}`,
+        );
+      }
+      // Also add to pending users as fallback
+      pendingAuthUsers.add(userId);
+      authManager.setSessionMetadata(session.sessionId, {
+        qrCodeUrl: session.qrCodeUrl,
+        triggerType: "sensitive_operation",
+        commandPreview: preview,
+      });
+
+      startPollingForAuth(api, userId, session.sessionId, {
+        triggerType: "sensitive_operation",
+        isReauth: false,
+        channel: parsedChannel,
+        accountId: parsedAccountId,
+        to: parsedTo,
+        sessionKey: sessionKeyForWebchat,
+      });
+
       return {
         block: true,
-        blockReason: authChallengeText,
+        blockReason: `🔐 该操作需要二次认证`,
       };
     }
 
-    const authChallengeText = `检测到敏感操作，需二次认证。\n\n操作内容：${preview}\n\n请点击下方链接完成扫码认证：\n${session.qrCodeUrl}\n\n认证有效期：${Math.floor(config.timeout / 60000)} 分钟。\n\n认证完成后，请重新发送上一条命令或回复“确认”。`;
-
     if (parsedChannel && parsedChannel !== "web") {
       if (parsedChannel !== "feishu") {
         api.logger.warn(
           `[mfa-auth] Channel ${parsedChannel} not supported, skipping auth notification`,
         );
       } else {
+        const messageText = `🔐 该操作需要二次认证\n\n检测到敏感操作: ${preview}\n\n📱 请点击以下链接完成扫码认证:\n${session.qrCodeUrl}\n\n验证有效期: ${Math.floor(config.timeout / 60000)} 分钟\n\n验证成功后，请回复"确认"或者重新发送之前的命令以继续执行。`;
+
         await sendAuthMessage(
           parsedChannel,
           parsedAccountId,
           parsedTo || userId,
-          authChallengeText,
+          messageText,
           userId,
         );
-
-        startPollingForAuth(api, userId, session.sessionId, {
-          triggerType: "sensitive_operation",
-          isReauth: false,
-          channel: parsedChannel,
-          accountId: parsedAccountId,
-          to: parsedTo,
-          sessionKey: ctx.sessionKey || "",
-        });
-      }
-    }
-
-    authManager.registerPendingExecution(userId, session.sessionId);
-
+
+        startPollingForAuth(api, userId, session.sessionId, {
+          triggerType: "sensitive_operation",
+          isReauth: false,
+          channel: parsedChannel,
+          accountId: parsedAccountId,
+          to: parsedTo,
+          sessionKey: ctx.sessionKey || "",
+        });
+      }
+    }
+
+    authManager.registerPendingExecution(userId, session.sessionId);
+
     return {
       block: true,
-      blockReason: authChallengeText,
+      blockReason: `🔐 该操作需要二次认证`,
     };
   });
-
-  api.on("message_received", async (event, ctx) => {
-    await authManager.ensureInitialized();
-    const metadata =
-      event.metadata && typeof event.metadata === "object"
-        ? (event.metadata as Record<string, unknown>)
-        : undefined;
-    const metadataSenderId =
-      typeof metadata?.senderId === "string" ? metadata.senderId : undefined;
-    const metadataTo = typeof metadata?.to === "string" ? metadata.to : undefined;
-    const metadataOriginatingTo =
-      typeof metadata?.originatingTo === "string" ? metadata.originatingTo : undefined;
-    const userId = resolveInboundAuthUserId({
-      channelId: ctx.channelId,
-      from: event.from,
-      senderId: metadataSenderId,
-      conversationId: ctx.conversationId,
-      metadataTo,
-      metadataOriginatingTo,
-    });
-    const authAliases = expandAuthIdCandidates([
-      event.from,
-      metadataSenderId,
-      ctx.conversationId,
-      metadataOriginatingTo,
-      metadataTo,
-      userId,
-    ]);
-
-    api.logger.info(
-      `[mfa-auth] First message auth check: config.requireAuthOnFirstMessage=${config.requireAuthOnFirstMessage}`,
-    );
-    if (config.debug) {
-      api.logger.info(
-        `[mfa-auth] Inbound auth aliases: userId=${userId}, from=${event.from}, senderId=${metadataSenderId}, conversationId=${ctx.conversationId}, metadata.to=${metadataTo}, metadata.originatingTo=${metadataOriginatingTo}, aliases=${authAliases.join(",")}`,
-      );
-    }
-
-    if (!config.requireAuthOnFirstMessage) {
-      api.logger.warn(`[mfa-auth] First message auth is disabled in config, skipping.`);
-      return;
-    }
-
-    const content = event.content || "";
-    const isReauthCommand = content.trim() === "/reauth";
-
-    if (isReauthCommand) {
-      api.logger.info(`[mfa-auth] /reauth command detected, skipping first message auth check`);
-      return;
-    }
-
-    const verifiedAlias = isAnyFirstMessageAliasVerified(authAliases);
-    if (verifiedAlias) {
-      api.logger.info(
-        `[mfa-auth] User ${userId} already verified for first message (matchedAlias=${verifiedAlias})`,
-      );
-
-      const notificationInfo = consumeNotificationByAliases(authAliases);
-      if (notificationInfo) {
-        const parsedChannel = ctx.channelId;
-        const parsedAccountId = ctx.accountId || "";
-        const parsedTo = isWebchatChannel(parsedChannel) ? userId : event.from;
-
-        let sessionKey = ctx.conversationId;
-        if (!sessionKey) {
-          if (parsedChannel === "webchat" || parsedChannel === "web") {
-            sessionKey = userId;
-          } else {
-            sessionKey = `${parsedChannel}:${parsedAccountId}:${userId}`;
-          }
-        }
-
-        const messageText = notificationInfo.isReauth
-          ? "\u2705 \u91cd\u65b0\u8ba4\u8bc1\u6210\u529f\uff0c\u8bf7\u7ee7\u7eed\u5bf9\u8bdd\u3002"
-          : "\u2705 \u9996\u6b21\u8ba4\u8bc1\u6210\u529f\uff0c\u8bf7\u7ee7\u7eed\u5bf9\u8bdd\u3002";
-
-        sendAuthMessage(
-          parsedChannel,
-          parsedAccountId,
-          parsedTo || userId,
-          messageText,
-          userId,
-          sessionKey,
-        ).catch((err) =>
-          api.logger.error(`[mfa-auth] Failed to send success notification: ${err}`),
-        );
-      }
-
-      return;
-    }
-
-    api.logger.info(`[mfa-auth] First message from unauthenticated user ${userId}, requiring auth`);
-    api.logger.info(
-      `[mfa-auth] Debug Context: channelId=${ctx.channelId}, conversationId=${ctx.conversationId}, accountId=${ctx.accountId}, from=${event.from}`,
-    );
-
-    const parsedChannel = ctx.channelId;
-    const parsedAccountId = ctx.accountId || "";
-    const parsedTo = isWebchatChannel(parsedChannel) ? userId : event.from;
-
-    // Use conversationId as sessionKey if available
-    // For webchat, try to use userId directly as sessionKey (common pattern)
-    let sessionKey = ctx.conversationId;
-    if (!sessionKey) {
-      if (isWebchatChannel(parsedChannel)) {
-        // For webchat, use userId as sessionKey (this is the most common pattern)
-        sessionKey = userId;
-        api.logger.info(`[mfa-auth] Using webchat sessionKey (userId): ${sessionKey}`);
-      } else {
-        // Fallback to channel:accountId:from format
-        sessionKey = `${parsedChannel}:${parsedAccountId}:${userId}`;
-      }
-    }
-
-    const session = await authManager.generateSession(userId, {
-      sessionKey,
-      senderId: userId,
-      commandBody: event.content || "",
-      channel: parsedChannel,
-      to: parsedTo,
-      accountId: parsedAccountId,
-      toolName: "",
-      toolParams: {},
-      timestamp: Date.now(),
-      triggerType: "first_message",
-    });
-
-    if (!session) {
-      api.logger.error(
-        `[mfa-auth] Failed to generate first message auth session for user ${userId}`,
-      );
-      return;
-    }
-
-    api.logger.info(`[mfa-auth] Blocking first message from ${userId}`);
-
-    if (isWebchatChannel(parsedChannel)) {
-      addPendingAuthCandidates(userId, sessionKey, parsedTo);
-      authManager.setSessionMetadata(session.sessionId, {
-        qrCodeUrl: session.qrCodeUrl,
-        triggerType: "first_message",
-      });
-
-      try {
-        await sendAuthMessage(
-          parsedChannel,
-          parsedAccountId,
-          parsedTo || userId,
-          `\u9996\u6b21\u5bf9\u8bdd\u9700\u8981\u8ba4\u8bc1\n\n\u4e3a\u4e86\u8d26\u53f7\u5b89\u5168\uff0c\u9996\u6b21\u5bf9\u8bdd\u524d\u9700\u8981\u5b8c\u6210\u8eab\u4efd\u9a8c\u8bc1\u3002\n\n\u8bf7\u70b9\u51fb\u4e0b\u65b9\u94fe\u63a5\u5b8c\u6210\u626b\u7801\u8ba4\u8bc1\uff1a\n${session.qrCodeUrl}\n\n\u8ba4\u8bc1\u6709\u6548\u671f\uff1a${Math.floor(config.timeout / 60000)} \u5206\u949f\u3002`,
-          userId,
-          sessionKey,
-        );
-      } catch (error) {
-        api.logger.error(
-          `[mfa-auth] Failed to send first-message auth link to webchat: ${String(error)}`,
-        );
-      }
-
-      startPollingForAuth(api, userId, session.sessionId, {
-        triggerType: "first_message",
-        isReauth: false,
-        channel: parsedChannel,
-        accountId: parsedAccountId,
-        to: parsedTo,
-        sessionKey: userId,
-      });
-
-      return;
-    }
-
-    if (parsedChannel && parsedChannel !== "web") {
-      if (parsedChannel !== "feishu") {
-        api.logger.warn(
-          `[mfa-auth] Channel ${parsedChannel} not supported, skipping auth notification`,
-        );
-      } else {
-        const messageText = `\u9996\u6b21\u5bf9\u8bdd\u9700\u8981\u8ba4\u8bc1\n\n\u4e3a\u4e86\u8d26\u53f7\u5b89\u5168\uff0c\u9996\u6b21\u5bf9\u8bdd\u524d\u9700\u8981\u5b8c\u6210\u8eab\u4efd\u9a8c\u8bc1\u3002\n\n\u8bf7\u70b9\u51fb\u4e0b\u65b9\u94fe\u63a5\u5b8c\u6210\u626b\u7801\u8ba4\u8bc1\uff1a\n${session.qrCodeUrl}\n\n\u8ba4\u8bc1\u6709\u6548\u671f\uff1a${Math.floor(config.timeout / 60000)} \u5206\u949f\u3002`;
-
-        await sendAuthMessage(
-          parsedChannel,
-          parsedAccountId,
-          parsedTo || userId,
-          messageText,
-          userId,
-          sessionKey,
-        );
-
-        startPollingForAuth(api, userId, session.sessionId, {
-          triggerType: "first_message",
-          isReauth: false,
-          channel: parsedChannel,
-          accountId: parsedAccountId,
-          to: parsedTo,
-          sessionKey: sessionKey,
-        });
-      }
-    }
-  });
-
-  api.registerCommand({
-    name: "reauth",
-    description: "\u91cd\u65b0\u8fdb\u884c\u9996\u6b21\u5bf9\u8bdd\u8ba4\u8bc1",
-    acceptsArgs: false,
-    requireAuth: false,
-    handler: async (ctx) => {
-      const rawCtx = ctx as unknown as Record<string, unknown>;
-      const ctxSessionKey = typeof rawCtx.sessionKey === "string" ? rawCtx.sessionKey : undefined;
-      const userId =
-        normalizeAuthId(ctx.from || ctx.senderId || ctx.to || ctxSessionKey || "unknown") ||
-        "unknown";
-      const authUserIds = expandAuthIdCandidates(
-        uniqueNonEmpty([ctx.from, ctx.senderId, ctx.to, ctxSessionKey, userId]),
-      );
-      api.logger.info(
-        `[mfa-auth] /reauth command received. userId=${userId}, aliases=${authUserIds.join(",")}, ctx.channel=${ctx.channel}, ctx.accountId=${ctx.accountId}, ctx.to=${ctx.to}`,
-      );
-
-      for (const authUserId of authUserIds) {
-        authManager.clearFirstMessageAuth(authUserId);
-      }
-
-      const parsedChannel = ctx.channel;
-      const parsedAccountId = ctx.accountId || "";
-      const parsedTo = ctx.to;
-
-      api.logger.info(
-        `[mfa-auth] Parsed: channel=${parsedChannel}, accountId=${parsedAccountId}, to=${parsedTo}`,
-      );
-
-      // For webchat, use userId as sessionKey
-      const sessionKey =
-        isWebchatChannel(parsedChannel)
-          ? ctxSessionKey || userId
-          : `${parsedChannel}:${parsedAccountId}:${userId}`;
-
-      api.logger.info(`[mfa-auth] Using sessionKey for reauth: ${sessionKey}`);
-
-      const session = await authManager.generateSession(userId, {
-        sessionKey,
-        senderId: userId,
-        commandBody: "/reauth",
-        channel: parsedChannel,
-        to: parsedTo,
-        accountId: parsedAccountId,
-        toolName: "",
-        toolParams: {},
-        timestamp: Date.now(),
-        triggerType: "first_message",
-      });
-
-      if (!session) {
-        api.logger.error(`[mfa-auth] Failed to generate reauth session for user ${userId}`);
-        return { text: "\u8ba4\u8bc1\u4f1a\u8bdd\u521b\u5efa\u5931\u8d25\uff0c\u8bf7\u7a0d\u540e\u91cd\u8bd5\u3002" };
-      }
-
-      api.logger.info(
-        `[mfa-auth] Reauth requested by user ${userId}, session=${session.sessionId}`,
-      );
-
-      const messageText = `\u9700\u8981\u91cd\u65b0\u8ba4\u8bc1\n\n\u8bf7\u70b9\u51fb\u4e0b\u65b9\u94fe\u63a5\u5b8c\u6210\u626b\u7801\u8ba4\u8bc1\uff1a\n${session.qrCodeUrl}\n\n\u8ba4\u8bc1\u6709\u6548\u671f\uff1a${Math.floor(config.timeout / 60000)} \u5206\u949f\u3002`;
-
-      // Use sendAuthMessage to ensure consistent delivery via WebSocket for WebChat
-      // This will use the new robust session resolution logic
-      if (isWebchatChannel(parsedChannel)) {
-        try {
-          addPendingAuthCandidates(userId, sessionKey, parsedTo);
-          authManager.setSessionMetadata(session.sessionId, {
-            qrCodeUrl: session.qrCodeUrl,
-            triggerType: "first_message",
-            isReauth: true,
-          });
-
-          await sendAuthMessage(
-            parsedChannel,
-            parsedAccountId,
-            parsedTo || userId,
-            messageText,
-            userId,
-            sessionKey,
-          );
-
-          startPollingForAuth(api, userId, session.sessionId, {
-            triggerType: "first_message",
-            isReauth: true,
-            channel: parsedChannel,
-            accountId: parsedAccountId,
-            to: parsedTo,
-            sessionKey: sessionKey,
-          });
-
-          return { text: messageText };
-        } catch (error) {
-          api.logger.error(`[mfa-auth] Failed to send reauth link to webchat: ${String(error)}`);
-          // Fallback to returning text directly if push fails, though this might be less reliable if session context is lost
-          return { text: messageText };
-        }
-      }
-
-      if (!parsedChannel || parsedChannel !== "feishu") {
-        api.logger.warn(`[mfa-auth] Channel ${parsedChannel} not supported`);
-        return { text: "\u5f53\u524d\u6e20\u9053\u6682\u4e0d\u652f\u6301\u6b64\u8ba4\u8bc1\u6d41\u7a0b\u3002" };
-      }
-
-      try {
-        api.logger.info(
-          `[mfa-auth] Sending reauth notification: channel=${parsedChannel}, to=${parsedTo}, accountId=${parsedAccountId}`,
-        );
-
-        await sendAuthMessage(
-          parsedChannel,
-          parsedAccountId,
-          parsedTo || userId,
-          `\u9700\u8981\u91cd\u65b0\u8ba4\u8bc1\n\n\u8bf7\u70b9\u51fb\u4e0b\u65b9\u94fe\u63a5\u5b8c\u6210\u626b\u7801\u8ba4\u8bc1\uff1a\n${session.qrCodeUrl}\n\n\u8ba4\u8bc1\u6709\u6548\u671f\uff1a${Math.floor(config.timeout / 60000)} \u5206\u949f\u3002`,
-          userId,
-        );
-
-        startPollingForAuth(api, userId, session.sessionId, {
-          triggerType: "first_message",
-          isReauth: true,
-          channel: parsedChannel,
-          accountId: parsedAccountId,
-          to: parsedTo,
-          sessionKey: sessionKey,
-        });
-
-        api.logger.info(`[mfa-auth] Reauth notification sent successfully`);
-        return { text: "\u8ba4\u8bc1\u94fe\u63a5\u5df2\u53d1\u9001\uff0c\u8bf7\u67e5\u770b\u6700\u65b0\u6d88\u606f\u3002" };
-      } catch (error) {
-        api.logger.error(`[mfa-auth] Failed to send reauth notification: ${String(error)}`);
-        return { text: "\u8ba4\u8bc1\u94fe\u63a5\u53d1\u9001\u5931\u8d25\uff0c\u8bf7\u7a0d\u540e\u91cd\u8bd5\u3002" };
-      }
-    },
-  });
-
-  api.logger.info("mfa-auth plugin loaded");
-}
-
-function startPollingForAuth(
-  api: OpenClawPluginApi,
-  userId: string,
-  sessionId: string,
-  context: {
-    triggerType: string;
-    isReauth: boolean;
-    channel?: string;
-    accountId?: string;
-    to?: string;
-    sessionKey?: string;
-  },
-) {
-  api.logger.info(
-    `[mfa-auth] Starting polling for auth status: userId=${userId}, sessionId=${sessionId}`,
-  );
-
-  const pollInterval = setInterval(async () => {
-    let isVerified = false;
-    if (context.triggerType === "first_message") {
-      isVerified = authManager.isUserVerifiedForFirstMessage(userId);
-    } else {
-      isVerified = authManager.isUserVerifiedForSensitiveOps(userId);
-    }
-
-    if (!isVerified) {
-      const session = authManager.getSession(sessionId);
-      if (session && session.certToken) {
-        try {
-          const authResult = await dabbyClient.getAuthResult(session.certToken);
-          if (authResult.status === "verified") {
-            api.logger.info(`[mfa-auth] Auth verification successful for session ${sessionId}`);
-            authManager.markUserVerified(
-              userId,
-              context.triggerType === "first_message" ? "first_message" : "sensitive_operation",
-              context.isReauth,
-            );
-            isVerified = true;
-          } else if (authResult.status === "failed" || authResult.status === "expired") {
-            api.logger.warn(
-              `[mfa-auth] Auth failed or expired for session ${sessionId}: ${authResult.error}`,
-            );
-            clearInterval(pollInterval);
-            return;
-          }
-        } catch (error) {
-          api.logger.error(
-            `[mfa-auth] Failed to check auth status for session ${sessionId}: ${String(error)}`,
-          );
-        }
-      }
-    }
-
-    if (isVerified) {
-      clearInterval(pollInterval);
-
-      const notificationInfo = authManager.checkAndConsumeNotification(userId);
-      if (notificationInfo) {
-        api.logger.info(`[mfa-auth] Polling detected verification for user ${userId}`);
-
-        const messageText = notificationInfo.isReauth
-          ? "\u2705 \u91cd\u65b0\u8ba4\u8bc1\u6210\u529f\uff0c\u8bf7\u7ee7\u7eed\u5bf9\u8bdd\u3002"
-          : notificationInfo.triggerType === "first_message"
-            ? "\u2705 \u9996\u6b21\u8ba4\u8bc1\u6210\u529f\uff0c\u8bf7\u7ee7\u7eed\u5bf9\u8bdd\u3002"
-            : "\u2705 \u4e8c\u6b21\u8ba4\u8bc1\u6210\u529f\uff0c\u8bf7\u91cd\u65b0\u53d1\u9001\u4e4b\u524d\u7684\u547d\u4ee4\u6216\u56de\u590d\u201c\u786e\u8ba4\u201d\u3002";
-
-        sendAuthMessage(
-          context.channel,
-          context.accountId,
-          context.to || userId,
-          messageText,
-          userId,
-          context.sessionKey,
-        ).catch((err) =>
-          api.logger.error(`[mfa-auth] Failed to send success notification from polling: ${err}`),
-        );
-      }
-      return;
-    }
-
-    const session = authManager.getSession(sessionId);
-    if (!session) {
-      clearInterval(pollInterval);
-      api.logger.info(
-        `[mfa-auth] Polling stopped: session ${sessionId} not found and user not verified`,
-      );
-    }
-  }, 2000);
-
-  setTimeout(() => {
-    clearInterval(pollInterval);
-  }, config.timeout + 10000);
-}
-
-function checkSensitiveOperation(text: string): { isSensitive: boolean; preview: string } {
-  const lowerText = text.toLowerCase();
-
-  if (config.debug) {
-    console.log(`[mfa-auth] Checking sensitive keywords for: ${text}`);
-    console.log(
-      `[mfa-auth] Sensitive keywords configured: ${JSON.stringify(config.sensitiveKeywords)}`,
-    );
-  }
-
-  for (const keyword of config.sensitiveKeywords) {
-    if (lowerText.includes(keyword.toLowerCase())) {
-      const preview = text;
-      if (config.debug) {
-        console.log(`[mfa-auth] Sensitive keyword matched: ${keyword}`);
-      }
-      return { isSensitive: true, preview };
-    }
-  }
-
-  if (config.debug) {
-    console.log(`[mfa-auth] No sensitive keyword matched`);
-  }
-
-  return { isSensitive: false, preview: "" };
-}
-
+
+  api.on("message_received", async (event, ctx) => {
+    await authManager.ensureInitialized();
+
+    api.logger.info(
+      `[mfa-auth] First message auth check: config.requireAuthOnFirstMessage=${config.requireAuthOnFirstMessage}`,
+    );
+
+    if (!config.requireAuthOnFirstMessage) {
+      api.logger.warn(`[mfa-auth] First message auth is disabled in config, skipping.`);
+      return;
+    }
+
+    const content = event.content || "";
+    const isReauthCommand = content.trim() === "/reauth";
+
+    if (isReauthCommand) {
+      api.logger.info(`[mfa-auth] /reauth command detected, skipping first message auth check`);
+      return;
+    }
+
+    const userId = event.from || ctx.conversationId || "unknown";
+
+    if (authManager.isUserVerifiedForFirstMessage(userId)) {
+      api.logger.info(`[mfa-auth] User ${userId} already verified for first message`);
+
+      const notificationInfo = authManager.checkAndConsumeNotification(userId);
+      if (notificationInfo) {
+        const parsedChannel = ctx.channelId;
+        const parsedAccountId = ctx.accountId || "";
+        const parsedTo = event.from;
+
+        let sessionKey = ctx.conversationId;
+        if (!sessionKey) {
+          if (parsedChannel === "webchat" || parsedChannel === "web") {
+            sessionKey = userId;
+          } else {
+            sessionKey = `${parsedChannel}:${parsedAccountId}:${event.from}`;
+          }
+        }
+
+        const messageText = notificationInfo.isReauth
+          ? "✅ 重新认证成功，请继续对话。"
+          : "✅ 首次认证成功，请继续对话。";
+
+        sendAuthMessage(
+          parsedChannel,
+          parsedAccountId,
+          parsedTo || userId,
+          messageText,
+          userId,
+          sessionKey,
+        ).catch((err) =>
+          api.logger.error(`[mfa-auth] Failed to send success notification: ${err}`),
+        );
+      }
+
+      return;
+    }
+
+    api.logger.info(`[mfa-auth] First message from unauthenticated user ${userId}, requiring auth`);
+    api.logger.info(
+      `[mfa-auth] Debug Context: channelId=${ctx.channelId}, conversationId=${ctx.conversationId}, accountId=${ctx.accountId}, from=${event.from}`,
+    );
+
+    const parsedChannel = ctx.channelId;
+    const parsedAccountId = ctx.accountId || "";
+    const parsedTo = event.from;
+
+    // Use conversationId as sessionKey if available
+    // For webchat, try to use userId directly as sessionKey (common pattern)
+    let sessionKey = ctx.conversationId;
+    if (!sessionKey) {
+      if (parsedChannel === "webchat" || parsedChannel === "web") {
+        // For webchat, use userId as sessionKey (this is the most common pattern)
+        sessionKey = userId;
+        api.logger.info(`[mfa-auth] Using webchat sessionKey (userId): ${sessionKey}`);
+      } else {
+        // Fallback to channel:accountId:from format
+        sessionKey = `${parsedChannel}:${parsedAccountId}:${event.from}`;
+      }
+    }
+
+    const session = await authManager.generateSession(userId, {
+      sessionKey,
+      senderId: userId,
+      commandBody: event.content || "",
+      channel: parsedChannel,
+      to: parsedTo,
+      accountId: parsedAccountId,
+      toolName: "",
+      toolParams: {},
+      timestamp: Date.now(),
+      triggerType: "first_message",
+    });
+
+    if (!session) {
+      api.logger.error(
+        `[mfa-auth] Failed to generate first message auth session for user ${userId}`,
+      );
+      return;
+    }
+
+    api.logger.info(`[mfa-auth] Blocking first message from ${userId}`);
+
+    if (parsedChannel === "webchat" || parsedChannel === "web") {
+      pendingAuthUsers.add(userId);
+      authManager.setSessionMetadata(session.sessionId, {
+        qrCodeUrl: session.qrCodeUrl,
+        triggerType: "first_message",
+      });
+
+      startPollingForAuth(api, userId, session.sessionId, {
+        triggerType: "first_message",
+        isReauth: false,
+        channel: parsedChannel,
+        accountId: parsedAccountId,
+        to: parsedTo,
+        sessionKey: userId,
+      });
+
+      return;
+    }
+
+    if (parsedChannel && parsedChannel !== "web") {
+      if (parsedChannel !== "feishu") {
+        api.logger.warn(
+          `[mfa-auth] Channel ${parsedChannel} not supported, skipping auth notification`,
+        );
+      } else {
+        const messageText = `🔐 首次对话需要进行认证\n\n为了您的账户安全，首次对话前需要完成身份验证。\n\n📱 请点击以下链接完成扫码认证:\n${session.qrCodeUrl}\n\n验证有效期: ${Math.floor(config.timeout / 60000)} 分钟`;
+
+        await sendAuthMessage(
+          parsedChannel,
+          parsedAccountId,
+          parsedTo || userId,
+          messageText,
+          userId,
+          sessionKey,
+        );
+
+        startPollingForAuth(api, userId, session.sessionId, {
+          triggerType: "first_message",
+          isReauth: false,
+          channel: parsedChannel,
+          accountId: parsedAccountId,
+          to: parsedTo,
+          sessionKey: sessionKey,
+        });
+      }
+    }
+  });
+
+  api.registerCommand({
+    name: "reauth",
+    description: "重新进行首次对话认证",
+    acceptsArgs: false,
+    requireAuth: false,
+    handler: async (ctx) => {
+      const userId = ctx.from || ctx.senderId || "unknown";
+      api.logger.info(
+        `[mfa-auth] /reauth command received. userId=${userId}, ctx.channel=${ctx.channel}, ctx.accountId=${ctx.accountId}, ctx.to=${ctx.to}`,
+      );
+
+      authManager.clearFirstMessageAuth(userId);
+
+      const parsedChannel = ctx.channel;
+      const parsedAccountId = ctx.accountId || "";
+      const parsedTo = ctx.to;
+
+      api.logger.info(
+        `[mfa-auth] Parsed: channel=${parsedChannel}, accountId=${parsedAccountId}, to=${parsedTo}`,
+      );
+
+      // For webchat, use userId as sessionKey
+      const sessionKey =
+        parsedChannel === "webchat" || parsedChannel === "web"
+          ? userId
+          : `${parsedChannel}:${parsedAccountId}:${userId}`;
+
+      api.logger.info(`[mfa-auth] Using sessionKey for reauth: ${sessionKey}`);
+
+      const session = await authManager.generateSession(userId, {
+        sessionKey,
+        senderId: userId,
+        commandBody: "/reauth",
+        channel: parsedChannel,
+        to: parsedTo,
+        accountId: parsedAccountId,
+        toolName: "",
+        toolParams: {},
+        timestamp: Date.now(),
+        triggerType: "first_message",
+      });
+
+      if (!session) {
+        api.logger.error(`[mfa-auth] Failed to generate reauth session for user ${userId}`);
+        return { text: "❌ 认证会话创建失败，请稍后重试。" };
+      }
+
+      api.logger.info(
+        `[mfa-auth] Reauth requested by user ${userId}, session=${session.sessionId}`,
+      );
+
+      const messageText = `🔐 重新认证\n\n📱 请点击以下链接完成扫码认证:\n${session.qrCodeUrl}\n\n验证有效期: ${Math.floor(config.timeout / 60000)} 分钟`;
+
+      // Use sendAuthMessage to ensure consistent delivery via WebSocket for WebChat
+      // This will use the new robust session resolution logic
+      if (parsedChannel === "webchat" || parsedChannel === "web") {
+        try {
+          pendingAuthUsers.add(userId);
+          authManager.setSessionMetadata(session.sessionId, {
+            qrCodeUrl: session.qrCodeUrl,
+            triggerType: "first_message",
+            isReauth: true,
+          });
+
+          await sendAuthMessage(
+            parsedChannel,
+            parsedAccountId,
+            parsedTo || userId,
+            messageText,
+            userId,
+            sessionKey,
+          );
+
+          startPollingForAuth(api, userId, session.sessionId, {
+            triggerType: "first_message",
+            isReauth: true,
+            channel: parsedChannel,
+            accountId: parsedAccountId,
+            to: parsedTo,
+            sessionKey: sessionKey,
+          });
+
+          return { text: "� 认证链接已发送，请查看最新消息。" };
+        } catch (error) {
+          api.logger.error(`[mfa-auth] Failed to send reauth link to webchat: ${String(error)}`);
+          // Fallback to returning text directly if push fails, though this might be less reliable if session context is lost
+          return { text: messageText };
+        }
+      }
+
+      if (!parsedChannel || parsedChannel !== "feishu") {
+        api.logger.warn(`[mfa-auth] Channel ${parsedChannel} not supported`);
+        return { text: "❌ 当前渠道不支持认证。" };
+      }
+
+      try {
+        api.logger.info(
+          `[mfa-auth] Sending reauth notification: channel=${parsedChannel}, to=${parsedTo}, accountId=${parsedAccountId}`,
+        );
+
+        await sendAuthMessage(
+          parsedChannel,
+          parsedAccountId,
+          parsedTo || userId,
+          `🔐 重新认证\n\n📱 请点击以下链接完成扫码认证:\n${session.qrCodeUrl}\n\n验证有效期: ${Math.floor(config.timeout / 60000)} 分钟`,
+          userId,
+        );
+
+        startPollingForAuth(api, userId, session.sessionId, {
+          triggerType: "first_message",
+          isReauth: true,
+          channel: parsedChannel,
+          accountId: parsedAccountId,
+          to: parsedTo,
+          sessionKey: sessionKey,
+        });
+
+        api.logger.info(`[mfa-auth] Reauth notification sent successfully`);
+        return { text: "📱 认证链接已发送，请查收。" };
+      } catch (error) {
+        api.logger.error(`[mfa-auth] Failed to send reauth notification: ${String(error)}`);
+        return { text: "❌ 认证链接发送失败，请稍后重试。" };
+      }
+    },
+  });
+
+  api.logger.info("mfa-auth plugin loaded");
+}
+
+function startPollingForAuth(
+  api: OpenClawPluginApi,
+  userId: string,
+  sessionId: string,
+  context: {
+    triggerType: string;
+    isReauth: boolean;
+    channel?: string;
+    accountId?: string;
+    to?: string;
+    sessionKey?: string;
+  },
+) {
+  api.logger.info(
+    `[mfa-auth] Starting polling for auth status: userId=${userId}, sessionId=${sessionId}`,
+  );
+
+  const pollInterval = setInterval(async () => {
+    let isVerified = false;
+    if (context.triggerType === "first_message") {
+      isVerified = authManager.isUserVerifiedForFirstMessage(userId);
+    } else {
+      isVerified = authManager.isUserVerifiedForSensitiveOps(userId);
+    }
+
+    if (!isVerified) {
+      const session = authManager.getSession(sessionId);
+      if (session && session.certToken) {
+        try {
+          const authResult = await dabbyClient.getAuthResult(session.certToken);
+          if (authResult.status === "verified") {
+            api.logger.info(`[mfa-auth] Auth verification successful for session ${sessionId}`);
+            authManager.markUserVerified(
+              userId,
+              context.triggerType === "first_message" ? "first_message" : "sensitive_operation",
+              context.isReauth,
+            );
+            isVerified = true;
+          } else if (authResult.status === "failed" || authResult.status === "expired") {
+            api.logger.warn(
+              `[mfa-auth] Auth failed or expired for session ${sessionId}: ${authResult.error}`,
+            );
+            clearInterval(pollInterval);
+            return;
+          }
+        } catch (error) {
+          api.logger.error(
+            `[mfa-auth] Failed to check auth status for session ${sessionId}: ${String(error)}`,
+          );
+        }
+      }
+    }
+
+    if (isVerified) {
+      clearInterval(pollInterval);
+
+      const notificationInfo = authManager.checkAndConsumeNotification(userId);
+      if (notificationInfo) {
+        api.logger.info(`[mfa-auth] Polling detected verification for user ${userId}`);
+
+        const messageText = notificationInfo.isReauth
+          ? "✅ 重新认证成功，请继续对话。"
+          : notificationInfo.triggerType === "first_message"
+            ? "✅ 首次认证成功，请继续对话。"
+            : "✅ 二次认证成功，请重新发送之前的命令（或回复'确认'）即可执行。";
+
+        sendAuthMessage(
+          context.channel,
+          context.accountId,
+          context.to || userId,
+          messageText,
+          userId,
+          context.sessionKey,
+        ).catch((err) =>
+          api.logger.error(`[mfa-auth] Failed to send success notification from polling: ${err}`),
+        );
+      }
+      return;
+    }
+
+    const session = authManager.getSession(sessionId);
+    if (!session) {
+      clearInterval(pollInterval);
+      api.logger.info(
+        `[mfa-auth] Polling stopped: session ${sessionId} not found and user not verified`,
+      );
+    }
+  }, 2000);
+
+  setTimeout(() => {
+    clearInterval(pollInterval);
+  }, config.timeout + 10000);
+}
+
+function checkSensitiveOperation(text: string): { isSensitive: boolean; preview: string } {
+  const lowerText = text.toLowerCase();
+
+  if (config.debug) {
+    console.log(`[mfa-auth] Checking sensitive keywords for: ${text}`);
+    console.log(
+      `[mfa-auth] Sensitive keywords configured: ${JSON.stringify(config.sensitiveKeywords)}`,
+    );
+  }
+
+  for (const keyword of config.sensitiveKeywords) {
+    if (lowerText.includes(keyword.toLowerCase())) {
+      const preview = text;
+      if (config.debug) {
+        console.log(`[mfa-auth] Sensitive keyword matched: ${keyword}`);
+      }
+      return { isSensitive: true, preview };
+    }
+  }
+
+  if (config.debug) {
+    console.log(`[mfa-auth] No sensitive keyword matched`);
+  }
+
+  return { isSensitive: false, preview: "" };
+}