cclawd 1.0.4 → 1.0.6

package/extensions/mfa-auth/index.ts

@@ -176,19 +176,16 @@ export default function register(api: OpenClawPluginApi) {
         const targetSessionKey =
           parsedChannel === "webchat" || parsedChannel === "web" ? userId : sessionKey;
 
-        try {
-          await sendAuthMessage(
+        sendAuthMessage(
           parsedChannel,
           parsedAccountId,
           parsedTo || userId,
           "✅ 二次认证成功，请重新发送之前的命令（或回复'确认'）即可执行。",
           userId,
-            targetSessionKey,
-          );
-        } catch (err) {
-          authManager.restoreNotification(userId, notificationInfo);
-          api.logger.error(`[mfa-auth] Failed to send success notification: ${err}`);
-        }
+          targetSessionKey,
+        ).catch((err) =>
+          api.logger.error(`[mfa-auth] Failed to send success notification: ${err}`),
+        );
       }
 
       return undefined;
@@ -278,7 +275,7 @@ export default function register(api: OpenClawPluginApi) {
     }
 
     if (parsedChannel && parsedChannel !== "web") {
-      if (false) {
+      if (parsedChannel !== "feishu") {
         api.logger.warn(
           `[mfa-auth] Channel ${parsedChannel} not supported, skipping auth notification`,
         );
@@ -356,19 +353,16 @@ export default function register(api: OpenClawPluginApi) {
           ? "✅ 重新认证成功，请继续对话。"
           : "✅ 首次认证成功，请继续对话。";
 
-        try {
-          await sendAuthMessage(
+        sendAuthMessage(
           parsedChannel,
           parsedAccountId,
           parsedTo || userId,
           messageText,
           userId,
           sessionKey,
-          );
-        } catch (err) {
-          authManager.restoreNotification(userId, notificationInfo);
-          api.logger.error(`[mfa-auth] Failed to send success notification: ${err}`);
-        }
+        ).catch((err) =>
+          api.logger.error(`[mfa-auth] Failed to send success notification: ${err}`),
+        );
       }
 
       return;
@@ -439,7 +433,7 @@ export default function register(api: OpenClawPluginApi) {
     }
 
     if (parsedChannel && parsedChannel !== "web") {
-      if (false) {
+      if (parsedChannel !== "feishu") {
         api.logger.warn(
           `[mfa-auth] Channel ${parsedChannel} not supported, skipping auth notification`,
         );
@@ -488,21 +482,11 @@ export default function register(api: OpenClawPluginApi) {
         `[mfa-auth] Parsed: channel=${parsedChannel}, accountId=${parsedAccountId}, to=${parsedTo}`,
       );
 
-      const ctxAny = ctx as Record<string, unknown>;
-      const contextSessionKey =
-        typeof ctxAny.sessionKey === "string" && ctxAny.sessionKey.trim().length > 0
-          ? ctxAny.sessionKey.trim()
-          : typeof ctxAny.conversationId === "string" && ctxAny.conversationId.trim().length > 0
-            ? ctxAny.conversationId.trim()
-            : "";
-
-      // Prefer real runtime session key from context to avoid injecting into
-      // synthetic IDs like "gateway-client" that have no transcript file.
+      // For webchat, use userId as sessionKey
       const sessionKey =
-        contextSessionKey ||
-        (parsedChannel === "webchat" || parsedChannel === "web"
-          ? `${parsedChannel}:${parsedAccountId}:${parsedTo || userId}`
-          : `${parsedChannel}:${parsedAccountId}:${userId}`);
+        parsedChannel === "webchat" || parsedChannel === "web"
+          ? userId
+          : `${parsedChannel}:${parsedAccountId}:${userId}`;
 
       api.logger.info(`[mfa-auth] Using sessionKey for reauth: ${sessionKey}`);
 
@@ -567,7 +551,7 @@ export default function register(api: OpenClawPluginApi) {
         }
       }
 
-      if (!parsedChannel) {
+      if (!parsedChannel || parsedChannel !== "feishu") {
         api.logger.warn(`[mfa-auth] Channel ${parsedChannel} not supported`);
         return { text: "❌ 当前渠道不支持认证。" };
       }
@@ -672,19 +656,16 @@ function startPollingForAuth(
             ? "✅ 首次认证成功，请继续对话。"
             : "✅ 二次认证成功，请重新发送之前的命令（或回复'确认'）即可执行。";
 
-        try {
-          await sendAuthMessage(
+        sendAuthMessage(
           context.channel,
           context.accountId,
           context.to || userId,
           messageText,
           userId,
           context.sessionKey,
-          );
-        } catch (err) {
-          authManager.restoreNotification(userId, notificationInfo);
-          api.logger.error(`[mfa-auth] Failed to send success notification from polling: ${err}`);
-        }
+        ).catch((err) =>
+          api.logger.error(`[mfa-auth] Failed to send success notification from polling: ${err}`),
+        );
       }
       return;
     }

package/extensions/mfa-auth/src/auth-manager.ts

@@ -252,10 +252,6 @@ export class AuthManager {
     return null;
   }
 
-  restoreNotification(userId: string, info: NotificationInfo): void {
-    this.pendingNotifications.set(userId, info);
-  }
-
   isUserVerified(userId: string): boolean {
     return this.isUserVerifiedForSensitiveOps(userId);
   }

package/extensions/mfa-auth/src/notification-service.ts

@@ -29,8 +29,8 @@ class NotificationService {
       return;
     }
 
-    if (channel === "webchat" || channel === "web" || channel === "main" || channel === "desktop") {
-      console.log(`[mfa-auth] ${channel} channel: sending notification via WebSocket`);
+    if (channel === "webchat" || channel === "web") {
+      console.log(`[mfa-auth] Web/webchat channel: sending notification via WebSocket`);
       await this.sendToWebChat(session, message);
       return;
     }
@@ -159,11 +159,7 @@ class NotificationService {
               return;
             }
             const errMsg = String(response?.error?.message ?? "").toLowerCase();
-            const shouldTryNext =
-              errMsg.includes("session not found") ||
-              errMsg.includes("transcript file not found") ||
-              errMsg.includes("failed to write transcript") ||
-              errMsg.includes("unavailable");
+            const shouldTryNext = errMsg.includes("session not found");
             if (shouldTryNext && injectIndex + 1 < candidateSessionKeys.length) {
               injectIndex += 1;
               sendInject(candidateSessionKeys[injectIndex]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cclawd",
-    "version": "1.0.4",
+    "version": "1.0.6",
     "description": "Multi-channel AI gateway with extensible messaging integrations",
     "keywords": [],
     "homepage": "https://github.com/openclaw/openclaw#readme",

package/dist/compact.runtime-DGRl4st4.js

@@ -1,39 +0,0 @@
-import "./paths-CehYKFsO.js";
-import "./paths-DkxwiA8g.js";
-import "./subsystem-DfXy5gUB.js";
-import "./workspace-DGIcKCCW.js";
-import "./logger-CbUVl62f.js";
-import "./model-selection-CMEj8bpy.js";
-import "./github-copilot-token-8N63GdbE.js";
-import "./boolean-C7Ct_klp.js";
-import "./env-lw2hsIUY.js";
-import "./frontmatter-C_obXuTp.js";
-import "./send-BKO1-P1t.js";
-import "./send-4rRrSKp9.js";
-import { n as compactEmbeddedPiSessionDirect } from "./pi-embedded-CHNPEUAv.js";
-import "./tokens-6ul2IrzG.js";
-import "./deliver-B6eTtXSk.js";
-import "./diagnostic-BZmAxdu9.js";
-import "./send-V1MRV7QF.js";
-import "./pi-model-discovery-D-r5y7kV.js";
-import "./image-Bt49ybRv.js";
-import "./audio-transcription-runner-CQU4Eg1M.js";
-import "./fetch-CMLoICyN.js";
-import "./fetch-guard-DCj3k042.js";
-import "./api-key-rotation-Dg3JlNDQ.js";
-import "./proxy-fetch-BOh1PLOW.js";
-import "./ir-CVtBjUiL.js";
-import "./render-IRnn-2gt.js";
-import "./target-errors-CeBF8Pws.js";
-import "./commands-registry-CyLMCPuP.js";
-import "./skill-commands-B55LOaMB.js";
-import "./fetch-CeWULXBI.js";
-import "./channel-activity-dT3cYb0e.js";
-import "./tables-BAGqh2XD.js";
-import "./send-EDBPXjTT.js";
-import "./outbound-attachment-CVJwpypG.js";
-import "./send-K2mAG7KC.js";
-import "./fetch-C0iyt-Iz.js";
-import "./manager-DSfEj66R.js";
-import "./query-expansion-BErUY8P2.js";
-export { compactEmbeddedPiSessionDirect };

package/dist/deps-send-whatsapp.runtime-B1KJ7YOp.js

@@ -1,43 +0,0 @@
-import "./paths-CehYKFsO.js";
-import "./paths-DkxwiA8g.js";
-import "./subsystem-DfXy5gUB.js";
-import "./workspace-DGIcKCCW.js";
-import "./logger-CbUVl62f.js";
-import "./model-selection-CMEj8bpy.js";
-import "./github-copilot-token-8N63GdbE.js";
-import "./boolean-C7Ct_klp.js";
-import "./env-lw2hsIUY.js";
-import "./frontmatter-C_obXuTp.js";
-import "./send-BKO1-P1t.js";
-import "./send-4rRrSKp9.js";
-import "./pi-embedded-CHNPEUAv.js";
-import "./tokens-6ul2IrzG.js";
-import "./deliver-B6eTtXSk.js";
-import "./diagnostic-BZmAxdu9.js";
-import "./send-V1MRV7QF.js";
-import "./pi-model-discovery-D-r5y7kV.js";
-import "./image-Bt49ybRv.js";
-import "./audio-transcription-runner-CQU4Eg1M.js";
-import "./fetch-CMLoICyN.js";
-import "./fetch-guard-DCj3k042.js";
-import "./api-key-rotation-Dg3JlNDQ.js";
-import "./proxy-fetch-BOh1PLOW.js";
-import "./ir-CVtBjUiL.js";
-import "./render-IRnn-2gt.js";
-import "./target-errors-CeBF8Pws.js";
-import "./commands-registry-CyLMCPuP.js";
-import "./skill-commands-B55LOaMB.js";
-import "./fetch-CeWULXBI.js";
-import "./channel-activity-dT3cYb0e.js";
-import "./tables-BAGqh2XD.js";
-import "./send-EDBPXjTT.js";
-import "./outbound-attachment-CVJwpypG.js";
-import "./send-K2mAG7KC.js";
-import "./fetch-C0iyt-Iz.js";
-import "./manager-DSfEj66R.js";
-import "./query-expansion-BErUY8P2.js";
-import { t as sendMessageWhatsApp } from "./outbound-BxIJyMzV.js";
-import "./session-CuVCho2m.js";
-import "./login-D0fUoX-p.js";
-import "./web-BRSmQdtm.js";
-export { sendMessageWhatsApp };

package/dist/plugin-sdk/active-listener-CN-tMEvN.js

@@ -1,35 +0,0 @@
-import { Ft as DEFAULT_ACCOUNT_ID } from "./paths-BtVqCdw4.js";
-import { Ul as formatCliCommand } from "./config-B9ODwgpz.js";
-//#region src/web/active-listener.ts
-const listeners = /* @__PURE__ */ new Map();
-function resolveWebAccountId(accountId) {
-	return (accountId ?? "").trim() || "default";
-}
-function requireActiveWebListener(accountId) {
-	const id = resolveWebAccountId(accountId);
-	const listener = listeners.get(id) ?? null;
-	if (!listener) throw new Error(`No active WhatsApp Web listener (account: ${id}). Start the gateway, then link WhatsApp with: ${formatCliCommand(`openclaw channels login --channel whatsapp --account ${id}`)}.`);
-	return {
-		accountId: id,
-		listener
-	};
-}
-function setActiveWebListener(accountIdOrListener, maybeListener) {
-	const { accountId, listener } = typeof accountIdOrListener === "string" ? {
-		accountId: accountIdOrListener,
-		listener: maybeListener ?? null
-	} : {
-		accountId: DEFAULT_ACCOUNT_ID,
-		listener: accountIdOrListener ?? null
-	};
-	const id = resolveWebAccountId(accountId);
-	if (!listener) listeners.delete(id);
-	else listeners.set(id, listener);
-	if (id === "default") {}
-}
-function getActiveWebListener(accountId) {
-	const id = resolveWebAccountId(accountId);
-	return listeners.get(id) ?? null;
-}
-//#endregion
-export { requireActiveWebListener as n, setActiveWebListener as r, getActiveWebListener as t };

package/dist/plugin-sdk/api-key-rotation-CimGYMBc.js

@@ -1,176 +0,0 @@
-import { Hs as formatErrorMessage, Vt as normalizeProviderId } from "./config-B9ODwgpz.js";
-//#region src/infra/gemini-auth.ts
-/**
-* Shared Gemini authentication utilities.
-*
-* Supports both traditional API keys and OAuth JSON format.
-*/
-/**
-* Parse Gemini API key and return appropriate auth headers.
-*
-* OAuth format: `{"token": "...", "projectId": "..."}`
-*
-* @param apiKey - Either a traditional API key string or OAuth JSON
-* @returns Headers object with appropriate authentication
-*/
-function parseGeminiAuth(apiKey) {
-	if (apiKey.startsWith("{")) try {
-		const parsed = JSON.parse(apiKey);
-		if (typeof parsed.token === "string" && parsed.token) return { headers: {
-			Authorization: `Bearer ${parsed.token}`,
-			"Content-Type": "application/json"
-		} };
-	} catch {}
-	return { headers: {
-		"x-goog-api-key": apiKey,
-		"Content-Type": "application/json"
-	} };
-}
-//#endregion
-//#region src/agents/live-auth-keys.ts
-const KEY_SPLIT_RE = /[\s,;]+/g;
-const GOOGLE_LIVE_SINGLE_KEY = "OPENCLAW_LIVE_GEMINI_KEY";
-const PROVIDER_PREFIX_OVERRIDES = {
-	google: "GEMINI",
-	"google-vertex": "GEMINI"
-};
-const PROVIDER_API_KEY_CONFIG = {
-	anthropic: {
-		liveSingle: "OPENCLAW_LIVE_ANTHROPIC_KEY",
-		listVar: "OPENCLAW_LIVE_ANTHROPIC_KEYS",
-		primaryVar: "ANTHROPIC_API_KEY",
-		prefixedVar: "ANTHROPIC_API_KEY_"
-	},
-	google: {
-		liveSingle: GOOGLE_LIVE_SINGLE_KEY,
-		listVar: "GEMINI_API_KEYS",
-		primaryVar: "GEMINI_API_KEY",
-		prefixedVar: "GEMINI_API_KEY_"
-	},
-	"google-vertex": {
-		liveSingle: GOOGLE_LIVE_SINGLE_KEY,
-		listVar: "GEMINI_API_KEYS",
-		primaryVar: "GEMINI_API_KEY",
-		prefixedVar: "GEMINI_API_KEY_"
-	},
-	openai: {
-		liveSingle: "OPENCLAW_LIVE_OPENAI_KEY",
-		listVar: "OPENAI_API_KEYS",
-		primaryVar: "OPENAI_API_KEY",
-		prefixedVar: "OPENAI_API_KEY_"
-	}
-};
-function parseKeyList(raw) {
-	if (!raw) return [];
-	return raw.split(KEY_SPLIT_RE).map((value) => value.trim()).filter(Boolean);
-}
-function collectEnvPrefixedKeys(prefix) {
-	const keys = [];
-	for (const [name, value] of Object.entries(process.env)) {
-		if (!name.startsWith(prefix)) continue;
-		const trimmed = value?.trim();
-		if (!trimmed) continue;
-		keys.push(trimmed);
-	}
-	return keys;
-}
-function resolveProviderApiKeyConfig(provider) {
-	const normalized = normalizeProviderId(provider);
-	const custom = PROVIDER_API_KEY_CONFIG[normalized];
-	const base = PROVIDER_PREFIX_OVERRIDES[normalized] ?? normalized.toUpperCase().replace(/-/g, "_");
-	const liveSingle = custom?.liveSingle ?? `OPENCLAW_LIVE_${base}_KEY`;
-	const listVar = custom?.listVar ?? `${base}_API_KEYS`;
-	const primaryVar = custom?.primaryVar ?? `${base}_API_KEY`;
-	const prefixedVar = custom?.prefixedVar ?? `${base}_API_KEY_`;
-	if (normalized === "google" || normalized === "google-vertex") return {
-		liveSingle,
-		listVar,
-		primaryVar,
-		prefixedVar,
-		fallbackVars: ["GOOGLE_API_KEY"]
-	};
-	return {
-		liveSingle,
-		listVar,
-		primaryVar,
-		prefixedVar,
-		fallbackVars: []
-	};
-}
-function collectProviderApiKeys(provider) {
-	const config = resolveProviderApiKeyConfig(provider);
-	const forcedSingle = config.liveSingle ? process.env[config.liveSingle]?.trim() : void 0;
-	if (forcedSingle) return [forcedSingle];
-	const fromList = parseKeyList(config.listVar ? process.env[config.listVar] : void 0);
-	const primary = config.primaryVar ? process.env[config.primaryVar]?.trim() : void 0;
-	const fromPrefixed = config.prefixedVar ? collectEnvPrefixedKeys(config.prefixedVar) : [];
-	const fallback = config.fallbackVars.map((envVar) => process.env[envVar]?.trim()).filter(Boolean);
-	const seen = /* @__PURE__ */ new Set();
-	const add = (value) => {
-		if (!value) return;
-		if (seen.has(value)) return;
-		seen.add(value);
-	};
-	for (const value of fromList) add(value);
-	add(primary);
-	for (const value of fromPrefixed) add(value);
-	for (const value of fallback) add(value);
-	return Array.from(seen);
-}
-function isApiKeyRateLimitError(message) {
-	const lower = message.toLowerCase();
-	if (lower.includes("rate_limit")) return true;
-	if (lower.includes("rate limit")) return true;
-	if (lower.includes("429")) return true;
-	if (lower.includes("quota exceeded") || lower.includes("quota_exceeded")) return true;
-	if (lower.includes("resource exhausted") || lower.includes("resource_exhausted")) return true;
-	if (lower.includes("too many requests")) return true;
-	return false;
-}
-//#endregion
-//#region src/agents/api-key-rotation.ts
-function dedupeApiKeys(raw) {
-	const seen = /* @__PURE__ */ new Set();
-	const keys = [];
-	for (const value of raw) {
-		const apiKey = value.trim();
-		if (!apiKey || seen.has(apiKey)) continue;
-		seen.add(apiKey);
-		keys.push(apiKey);
-	}
-	return keys;
-}
-function collectProviderApiKeysForExecution(params) {
-	const { primaryApiKey, provider } = params;
-	return dedupeApiKeys([primaryApiKey?.trim() ?? "", ...collectProviderApiKeys(provider)]);
-}
-async function executeWithApiKeyRotation(params) {
-	const keys = dedupeApiKeys(params.apiKeys);
-	if (keys.length === 0) throw new Error(`No API keys configured for provider "${params.provider}".`);
-	let lastError;
-	for (let attempt = 0; attempt < keys.length; attempt += 1) {
-		const apiKey = keys[attempt];
-		try {
-			return await params.execute(apiKey);
-		} catch (error) {
-			lastError = error;
-			const message = formatErrorMessage(error);
-			if (!(params.shouldRetry ? params.shouldRetry({
-				apiKey,
-				error,
-				attempt,
-				message
-			}) : isApiKeyRateLimitError(message)) || attempt + 1 >= keys.length) break;
-			params.onRetry?.({
-				apiKey,
-				error,
-				attempt,
-				message
-			});
-		}
-	}
-	if (lastError === void 0) throw new Error(`Failed to run API request for ${params.provider}.`);
-	throw lastError;
-}
-//#endregion
-export { executeWithApiKeyRotation as n, parseGeminiAuth as r, collectProviderApiKeysForExecution as t };

package/dist/plugin-sdk/audio-preflight-C-xXBoE2.js

@@ -1,51 +0,0 @@
-import "./paths-BtVqCdw4.js";
-import "./config-B9ODwgpz.js";
-import "./paths-eFexkPEh.js";
-import "./github-copilot-token-Cxf8QYZb.js";
-import { B as shouldLogVerbose, R as logVerbose } from "./logger-D6zRubj0.js";
-import "./env-b9k1PHMI.js";
-import "./fetch-guard-4UVSZ0uS.js";
-import "./local-roots-adnEg9zb.js";
-import { i as normalizeMediaAttachments, m as isAudioAttachment, o as resolveMediaAttachmentLocalRoots, t as runAudioTranscription } from "./audio-transcription-runner-CTIHpebA.js";
-import "./image-Ch6M4tnJ.js";
-import "./api-key-rotation-CimGYMBc.js";
-import "./proxy-fetch-CJEmoBxi.js";
-//#region src/media-understanding/audio-preflight.ts
-/**
-* Transcribes the first audio attachment BEFORE mention checking.
-* This allows voice notes to be processed in group chats with requireMention: true.
-* Returns the transcript or undefined if transcription fails or no audio is found.
-*/
-async function transcribeFirstAudio(params) {
-	const { ctx, cfg } = params;
-	const audioConfig = cfg.tools?.media?.audio;
-	if (!audioConfig || audioConfig.enabled === false) return;
-	const attachments = normalizeMediaAttachments(ctx);
-	if (!attachments || attachments.length === 0) return;
-	const firstAudio = attachments.find((att) => att && isAudioAttachment(att) && !att.alreadyTranscribed);
-	if (!firstAudio) return;
-	if (shouldLogVerbose()) logVerbose(`audio-preflight: transcribing attachment ${firstAudio.index} for mention check`);
-	try {
-		const { transcript } = await runAudioTranscription({
-			ctx,
-			cfg,
-			attachments,
-			agentDir: params.agentDir,
-			providers: params.providers,
-			activeModel: params.activeModel,
-			localPathRoots: resolveMediaAttachmentLocalRoots({
-				cfg,
-				ctx
-			})
-		});
-		if (!transcript) return;
-		firstAudio.alreadyTranscribed = true;
-		if (shouldLogVerbose()) logVerbose(`audio-preflight: transcribed ${transcript.length} chars from attachment ${firstAudio.index}`);
-		return transcript;
-	} catch (err) {
-		if (shouldLogVerbose()) logVerbose(`audio-preflight: transcription failed: ${String(err)}`);
-		return;
-	}
-}
-//#endregion
-export { transcribeFirstAudio };