@openclaw/qqbot 2026.7.1-beta.6 → 2026.7.2-beta.1

package/dist/{gateway-pJQppxe4.js → gateway-be5-Ckdc.js}

@@ -1,14 +1,15 @@
-import { C as getNextMsgSeq, D as downloadFile, F as StreamInputMode, I as StreamInputState, M as getMaxUploadSize, P as StreamContentType, T as openLocalFile, a as createRawInputNotifyFn, b as stopBackgroundTokenRefresh, c as getMessageApi, d as initSender, f as onMessageSent, g as sendText, h as sendMedia, i as clearTokenCache, j as getImageMimeType, k as formatFileSize, l as getPluginUserAgent, m as sendInputNotify, n as acknowledgeInteraction, o as getAccessToken, p as registerAccount, r as buildDeliveryTarget, s as getGatewayUrl, t as accountToCreds, u as initApiConfig, x as withTokenRetry, y as startBackgroundTokenRefresh } from "./sender-CjDuU-uz.js";
+import { B as StreamContentType, F as formatFileSize, H as StreamInputState, L as getImageMimeType, N as downloadFile, R as getMaxUploadSize, V as StreamInputMode, a as createRawInputNotifyFn, b as stopBackgroundTokenRefresh, c as getMessageApi, d as initSender, f as onMessageSent, g as sendText, h as sendMedia, i as clearTokenCache, j as openLocalFile, k as getNextMsgSeq, l as getPluginUserAgent, m as sendInputNotify, n as acknowledgeInteraction, o as getAccessToken, p as registerAccount, r as buildDeliveryTarget, s as getGatewayUrl, t as accountToCreds, u as initApiConfig, w as claimMessageReply, x as withTokenRetry, y as startBackgroundTokenRefresh } from "./sender-0vqsivoI.js";
 import { c as getPlatformAdapter, i as normalizeOptionalString$1, n as normalizeLowercaseStringOrEmpty$1, o as readStringField, s as sanitizeFileName, t as asOptionalObjectRecord } from "./string-normalize-R_0cKO7Q.js";
-import { c as setBridgeLogger, o as ensurePlatformAdapter } from "./config-schema-JZEf1dvB.js";
-import { a as authorizeQQBotApprovalAction, i as toGatewayAccount, n as createQQBotMarkdownChunker, p as parseApprovalButtonData, r as openQQBotSyncKeyedStore } from "./channel-D1UztsnG.js";
-import { d as resolveAccountBase } from "./config-C1qZbh0K.js";
-import { a as formatErrorMessage, i as formatDuration, n as debugLog, r as debugWarn, t as debugError } from "./log-DEtcoDWe.js";
-import { n as getQQBotRuntimeForEngine, t as getQQBotRuntime } from "./runtime-DodcT_fQ.js";
-import { t as buildQQBotStateKey } from "./state-keys-CQKlAFyo.js";
-import { a as resolveMentionPatterns, c as getPluginVersion, d as PRIVATE_CHAT_ONLY_TEXT, f as classifyCoreCommandForGroup, i as resolveGroupSettings, l as initCommands, n as resolveGroupCommandLevelFromAccountConfig, r as resolveGroupConfig, s as getFrameworkVersion, u as matchSlashCommand } from "./group-o0GmovSf.js";
-import { B as normalizePath, C as resolveUserFacingMediaError, F as getQQBotMediaDir, L as getTempDir, M as checkSilkWasmAvailable, N as getHomeDir, P as getQQBotDataDir, R as isLocalPath, S as resolveWorkspaceScopedLocalRoots, _ as sendVideoMsg, b as resolveOutboundMediaLocalRoots, c as isCronReminderPayload, d as normalizeMediaTags, g as sendPhoto, h as sendDocument, j as setOutboundAudioPort, k as DEFAULT_MEDIA_SEND_ERROR, l as isMediaPayload, o as decodeMediaPath, r as sendMedia$1, s as encodePayloadForCron, u as parseQQBotPayload, v as sendVoice, x as resolveWorkspacePathCandidates, y as resolveTrustedOutboundMediaPath, z as isWindows } from "./outbound-BIrfvvFJ.js";
+import { c as setBridgeLogger, o as ensurePlatformAdapter } from "./config-schema-B5Mle_87.js";
+import { a as authorizeQQBotApprovalAction, i as toGatewayAccount, n as createQQBotMarkdownChunker, p as parseApprovalButtonData, r as openQQBotSyncKeyedStore } from "./channel-BbwpkiY3.js";
+import { d as resolveAccountBase } from "./config-CpOXnoEc.js";
+import { a as formatErrorMessage, i as formatDuration, n as debugLog, r as debugWarn, t as debugError } from "./log-Da4jz75I.js";
+import { n as getQQBotRuntimeForEngine, t as getQQBotRuntime } from "./runtime-Du28LbOJ.js";
+import { t as buildQQBotStateKey } from "./state-keys-jLJ2SmJA.js";
+import { a as resolveMentionPatterns, c as getPluginVersion, d as PRIVATE_CHAT_ONLY_TEXT, f as classifyCoreCommandForGroup, i as resolveGroupSettings, l as initCommands, n as resolveGroupCommandLevelFromAccountConfig, r as resolveGroupConfig, s as getFrameworkVersion, u as matchSlashCommand } from "./group-Dbpnjalm.js";
+import { A as getQQBotMediaDir, C as resolveUserFacingMediaError, D as checkSilkWasmAvailable, E as setOutboundAudioPort, F as normalizePath, M as getTempDir, N as isLocalPath, O as getHomeDir, P as isWindows, S as resolveWorkspaceScopedLocalRoots, _ as sendVideoMsg, b as resolveOutboundMediaLocalRoots, c as isCronReminderPayload, d as normalizeMediaTags, g as sendPhoto, h as sendDocument, k as getQQBotDataDir, l as isMediaPayload, o as decodeMediaPath, r as sendMedia$1, s as encodePayloadForCron, u as parseQQBotPayload, v as sendVoice, w as DEFAULT_MEDIA_SEND_ERROR, x as resolveWorkspacePathCandidates, y as resolveTrustedOutboundMediaPath } from "./outbound-BLl8Tsu7.js";
 import { n as runWithRequestContext } from "./request-context-Bm7PTBD1.js";
+import { createTypingKeepaliveLoop } from "openclaw/plugin-sdk/channel-outbound";
 import { uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { isImplicitSameChatApprovalAuthorization } from "openclaw/plugin-sdk/approval-auth-runtime";
@@ -18,11 +19,12 @@ import * as os$1 from "node:os";
 import { readProviderJsonResponse, readResponseTextLimited } from "openclaw/plugin-sdk/provider-http";
 import { fetchWithSsrFGuard } from "openclaw/plugin-sdk/ssrf-runtime";
 import crypto from "node:crypto";
-import { readRegularFileSync, resolveLocalPathFromRootsSync } from "openclaw/plugin-sdk/security-runtime";
+import { compileSafeRegexDetailed, readRegularFileSync, resolveLocalPathFromRootsSync } from "openclaw/plugin-sdk/security-runtime";
 import * as path$1 from "node:path";
 import path from "node:path";
-import { mimeTypeFromFilePath } from "openclaw/plugin-sdk/media-mime";
+import { mimeTypeFromFilePath, normalizeMimeType } from "openclaw/plugin-sdk/media-mime";
 import { MAX_TIMER_TIMEOUT_MS, finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
+import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { getRuntimeConfig } from "openclaw/plugin-sdk/runtime-config-snapshot";
 import { resolveRuntimeServiceVersion } from "openclaw/plugin-sdk/cli-runtime";
 import WebSocket from "ws";
@@ -1079,9 +1081,9 @@ function isSlashCommand(msg) {
 */
 function mergeGroupMessages(batch) {
 	if (batch.length === 0) throw new Error("mergeGroupMessages: empty batch");
-	if (batch.length === 1) return batch[0];
-	const first = batch[0];
-	const last = batch[batch.length - 1];
+	if (batch.length === 1) return expectDefined(batch.at(0), "single-message merge batch");
+	const first = expectDefined(batch.at(0), "non-empty merge batch first message");
+	const last = expectDefined(batch.at(-1), "non-empty merge batch last message");
 	const mergedContent = batch.map((m) => `[${m.senderName ?? m.senderId}]: ${m.content}`).join("\n");
 	const mergedAttachments = [];
 	for (const m of batch) if (m.attachments?.length) mergedAttachments.push(...m.attachments);
@@ -1275,6 +1277,14 @@ function createMessageQueue(ctx) {
 //#endregion
 //#region extensions/qqbot/src/engine/gateway/reconnect.ts
 /**
+* WebSocket reconnection state machine and close-code handler.
+*
+* Encapsulates the reconnect delay scheduling, quick-disconnect detection,
+* and close-code interpretation that both plugin versions share.
+*
+* Zero external dependencies — uses only the constants from `./constants.ts`.
+*/
+/**
 * Reconnection state machine.
 *
 * Usage:
@@ -1314,7 +1324,7 @@ var ReconnectState = class {
 	* @returns Delay in milliseconds.
 	*/
 	getNextDelay(customDelay) {
-		const delay = customDelay ?? RECONNECT_DELAYS[Math.min(this.attempts, RECONNECT_DELAYS.length - 1)];
+		const delay = customDelay ?? expectDefined(RECONNECT_DELAYS[Math.min(this.attempts, RECONNECT_DELAYS.length - 1)], "non-empty reconnect delay schedule");
 		this.attempts++;
 		this.log?.debug?.(`Reconnecting ${this.accountId} in ${delay}ms (attempt ${this.attempts})`);
 		return delay;
@@ -1356,18 +1366,18 @@ var ReconnectState = class {
 			};
 		}
 		if (code === GatewayCloseCode.INVALID_SESSION || code === GatewayCloseCode.SEQ_OUT_OF_RANGE || code === GatewayCloseCode.SESSION_TIMEOUT) {
-			const codeDesc = {
+			const reason = expectDefined({
 				[GatewayCloseCode.INVALID_SESSION]: "session no longer valid",
 				[GatewayCloseCode.SEQ_OUT_OF_RANGE]: "invalid seq on resume",
 				[GatewayCloseCode.SESSION_TIMEOUT]: "session timed out"
-			};
-			this.log?.info(`Error ${code} (${codeDesc[code]}), will re-identify`);
+			}[code], "recognized session close code");
+			this.log?.info(`Error ${code} (${reason}), will re-identify`);
 			return {
 				shouldReconnect: !isAborted,
 				clearSession: true,
 				refreshToken: true,
 				fatal: false,
-				reason: codeDesc[code]
+				reason
 			};
 		}
 		if (code >= GatewayCloseCode.SERVER_ERROR_START && code <= GatewayCloseCode.SERVER_ERROR_END) {
@@ -1683,6 +1693,14 @@ var GatewayConnection = class {
 * of broad SDK text barrels.
 */
 const STT_ERROR_BODY_LIMIT_BYTES = 8 * 1024;
+const DEFAULT_STT_TIMEOUT_MS = 6e4;
+function resolveSTTTimeoutMs(...timeoutSeconds) {
+	for (const value of timeoutSeconds) {
+		const timeoutMs = finiteSecondsToTimerSafeMilliseconds(value);
+		if (timeoutMs !== void 0) return timeoutMs;
+	}
+	return DEFAULT_STT_TIMEOUT_MS;
+}
 /** Resolve the STT configuration from the nested config object. */
 function resolveSTTConfig(cfg) {
 	const channelStt = asOptionalObjectRecord(asOptionalObjectRecord(asOptionalObjectRecord(cfg.channels)?.qqbot)?.stt);
@@ -1696,10 +1714,12 @@ function resolveSTTConfig(cfg) {
 		if (baseUrl && apiKey) return {
 			baseUrl: baseUrl.replace(/\/+$/, ""),
 			apiKey,
-			model
+			model,
+			timeoutMs: resolveSTTTimeoutMs(providerCfg?.timeoutSeconds)
 		};
 	}
-	const audioModels = asOptionalObjectRecord(asOptionalObjectRecord(asOptionalObjectRecord(cfg.tools)?.media)?.audio)?.models;
+	const audio = asOptionalObjectRecord(asOptionalObjectRecord(asOptionalObjectRecord(cfg.tools)?.media)?.audio);
+	const audioModels = audio?.models;
 	const audioModelEntry = Array.isArray(audioModels) ? asOptionalObjectRecord(audioModels[0]) : void 0;
 	if (audioModelEntry) {
 		const providerId = readStringField(audioModelEntry, "provider") ?? "openai";
@@ -1710,7 +1730,8 @@ function resolveSTTConfig(cfg) {
 		if (baseUrl && apiKey) return {
 			baseUrl: baseUrl.replace(/\/+$/, ""),
 			apiKey,
-			model
+			model,
+			timeoutMs: resolveSTTTimeoutMs(audioModelEntry.timeoutSeconds, audio?.timeoutSeconds, providerCfg?.timeoutSeconds)
 		};
 	}
 	return null;
@@ -1728,6 +1749,7 @@ async function transcribeAudio(audioPath, cfg) {
 	const { response: resp, release } = await fetchWithSsrFGuard({
 		url: `${sttCfg.baseUrl}/audio/transcriptions`,
 		auditContext: "qqbot-stt",
+		timeoutMs: sttCfg.timeoutMs,
 		init: {
 			method: "POST",
 			headers: { Authorization: `Bearer ${sttCfg.apiKey}` },
@@ -1796,18 +1818,19 @@ async function processAttachments(attachments, ctx) {
 	});
 	const processTasks = (await Promise.all(downloadTasks)).map(async ({ att, attUrl, isVoice, localPath, audioPath }) => {
 		const asrReferText = normalizeOptionalString$1(att.asr_refer_text) ?? "";
+		const normalizedContentType = normalizeMimeType(att.content_type) ?? "";
 		const voiceSourceUrl = (isVoice && att.voice_wav_url ? att.voice_wav_url.startsWith("//") ? `https:${att.voice_wav_url}` : att.voice_wav_url : "") || attUrl;
 		const meta = {
 			voiceUrl: isVoice && voiceSourceUrl ? voiceSourceUrl : void 0,
 			asrReferText: isVoice && asrReferText ? asrReferText : void 0
 		};
 		if (localPath) {
-			if (att.content_type?.startsWith("image/")) {
+			if (normalizedContentType.startsWith("image/")) {
 				log?.debug?.(`Downloaded attachment to: ${localPath}`);
 				return {
 					localPath,
 					type: "image",
-					contentType: att.content_type,
+					contentType: normalizedContentType,
 					meta
 				};
 			}
@@ -1824,11 +1847,11 @@ async function processAttachments(attachments, ctx) {
 			};
 		}
 		log?.error(`Failed to download: ${attUrl}`);
-		if (att.content_type?.startsWith("image/")) return {
+		if (normalizedContentType.startsWith("image/")) return {
 			localPath: null,
 			type: "image-fallback",
 			attUrl,
-			contentType: att.content_type,
+			contentType: normalizedContentType,
 			meta
 		};
 		if (isVoice && asrReferText) {
@@ -2106,15 +2129,52 @@ function buildQualifiedTarget(event, isGroupChat) {
 //#endregion
 //#region extensions/qqbot/src/engine/group/mention.ts
 const MENTION_TAG_RE = /<@!?\w+>/;
+const MENTION_PATTERN_FLAGS = "i";
+const MAX_MENTION_PATTERN_CACHE_KEYS = 256;
+const MAX_MENTION_PATTERN_WARNING_KEYS = 256;
+const mentionPatternCompileCache = /* @__PURE__ */ new Map();
+const rejectedMentionPatternWarningCache = /* @__PURE__ */ new Set();
+function warnRejectedMentionPattern(pattern, reason) {
+	const key = `${MENTION_PATTERN_FLAGS}::${reason}::${pattern}`;
+	if (rejectedMentionPatternWarningCache.has(key)) return;
+	rejectedMentionPatternWarningCache.add(key);
+	if (rejectedMentionPatternWarningCache.size > MAX_MENTION_PATTERN_WARNING_KEYS) {
+		rejectedMentionPatternWarningCache.clear();
+		rejectedMentionPatternWarningCache.add(key);
+	}
+	debugWarn(`qqbot: mentionPattern rejected (${reason}): ${pattern}`);
+}
+function cacheMentionPatterns(cacheKey, regexes) {
+	mentionPatternCompileCache.set(cacheKey, regexes);
+	if (mentionPatternCompileCache.size > MAX_MENTION_PATTERN_CACHE_KEYS) {
+		mentionPatternCompileCache.clear();
+		mentionPatternCompileCache.set(cacheKey, regexes);
+	}
+	return regexes;
+}
+function compileMentionPatterns(patterns) {
+	if (patterns.length === 0) return [];
+	const cacheKey = patterns.join("");
+	const cached = mentionPatternCompileCache.get(cacheKey);
+	if (cached) return cached;
+	const regexes = [];
+	for (const pattern of patterns) {
+		const result = compileSafeRegexDetailed(pattern, MENTION_PATTERN_FLAGS);
+		if (result.reason === "empty") continue;
+		if (result.regex) {
+			regexes.push(result.regex);
+			continue;
+		}
+		warnRejectedMentionPattern(result.source, result.reason);
+	}
+	return cacheMentionPatterns(cacheKey, regexes);
+}
 function detectWasMentioned(input) {
 	const { eventType, mentions, content, mentionPatterns } = input;
 	if (mentions?.some((m) => m.is_you)) return true;
 	if (eventType === "GROUP_AT_MESSAGE_CREATE") return true;
-	if (mentionPatterns?.length && content) for (const pattern of mentionPatterns) {
-		if (!pattern) continue;
-		try {
-			if (new RegExp(pattern, "i").test(content)) return true;
-		} catch {}
+	if (mentionPatterns?.length && content) {
+		for (const regex of compileMentionPatterns(mentionPatterns)) if (regex.test(content)) return true;
 	}
 	return false;
 }
@@ -2253,7 +2313,7 @@ function buildUserMessage(input) {
 	const { event, userContent, quotePart, isGroupChat, groupInfo } = input;
 	if (groupInfo?.isMerged && groupInfo.mergedMessages?.length) {
 		const preceding = groupInfo.mergedMessages.slice(0, -1);
-		const lastMsg = groupInfo.mergedMessages[groupInfo.mergedMessages.length - 1];
+		const lastMsg = expectDefined(groupInfo.mergedMessages.at(-1), "non-empty merged group turn");
 		const atYouTag = groupInfo.gate.effectiveWasMentioned ? " (@you)" : "";
 		return buildMergedMessageContext({
 			precedingParts: preceding.map((m) => `[${formatSenderLabel(m)}] ${formatSub(m)}`),
@@ -2424,6 +2484,7 @@ function classifyMedia(processed) {
 	for (let i = 0; i < processed.imageUrls.length; i++) {
 		const u = processed.imageUrls[i];
 		const t = processed.imageMediaTypes[i] ?? "image/png";
+		if (u === void 0) continue;
 		if (u.startsWith("http://") || u.startsWith("https://")) {
 			remoteMediaUrls.push(u);
 			remoteMediaTypes.push(t);
@@ -2449,6 +2510,50 @@ function classifyMedia(processed) {
 	};
 }
 //#endregion
+//#region extensions/qqbot/src/engine/group/message-gating.ts
+/**
+* Group gate Layer 1 (ignoreOtherMentions) is QQ-specific and decided here;
+* Layer 2+3 (command gating + mention gating + command bypass) delegate to the
+* mention gate port backed by the SDK's `resolveInboundMentionDecision`.
+*/
+function resolveGroupMessageGate(params) {
+	if (params.ignoreOtherMentions && params.hasAnyMention && !params.wasMentioned && !params.implicitMention) return {
+		action: "drop_other_mention",
+		effectiveWasMentioned: false,
+		shouldBypassMention: false
+	};
+	const decision = params.mentionGatePort.resolveInboundMentionDecision({
+		facts: {
+			canDetectMention: true,
+			wasMentioned: params.wasMentioned,
+			hasAnyMention: params.hasAnyMention,
+			implicitMentionKinds: params.implicitMention ? ["reply_to_bot"] : []
+		},
+		policy: {
+			isGroup: true,
+			requireMention: params.requireMention,
+			allowTextCommands: params.allowTextCommands,
+			hasControlCommand: params.isControlCommand,
+			commandAuthorized: params.commandAuthorized
+		}
+	});
+	if (params.allowTextCommands && params.isControlCommand && !params.commandAuthorized) return {
+		action: "block_unauthorized_command",
+		effectiveWasMentioned: false,
+		shouldBypassMention: false
+	};
+	if (decision.shouldSkip) return {
+		action: "skip_no_mention",
+		effectiveWasMentioned: decision.effectiveWasMentioned,
+		shouldBypassMention: decision.shouldBypassMention
+	};
+	return {
+		action: "pass",
+		effectiveWasMentioned: decision.effectiveWasMentioned,
+		shouldBypassMention: decision.shouldBypassMention
+	};
+}
+//#endregion
 //#region extensions/qqbot/src/engine/gateway/stages/group-gate-stage.ts
 function runGroupGateStage(input) {
 	const { event, deps, accountId, agentId, sessionKey, userContent, processedAttachments } = input;
@@ -2487,7 +2592,7 @@ function runGroupGateStage(input) {
 	const content = (event.content ?? "").trim();
 	const isControlCommand = Boolean(deps.isControlCommand?.(content));
 	const commandAuthorized = deps.allowTextCommands !== false && input.access.commandAccess.authorized;
-	const gate = resolveGateWithPort({
+	const gate = resolveGroupMessageGate({
 		mentionGatePort: deps.adapters.mentionGate,
 		ignoreOtherMentions,
 		hasAnyMention: anyMention,
@@ -2543,43 +2648,6 @@ function runGroupGateStage(input) {
 		skipReason: gate.action
 	};
 }
-function resolveGateWithPort(params) {
-	if (params.ignoreOtherMentions && params.hasAnyMention && !params.wasMentioned && !params.implicitMention) return {
-		action: "drop_other_mention",
-		effectiveWasMentioned: false,
-		shouldBypassMention: false
-	};
-	const decision = params.mentionGatePort.resolveInboundMentionDecision({
-		facts: {
-			canDetectMention: true,
-			wasMentioned: params.wasMentioned,
-			hasAnyMention: params.hasAnyMention,
-			implicitMentionKinds: params.implicitMention ? ["reply_to_bot"] : []
-		},
-		policy: {
-			isGroup: true,
-			requireMention: params.requireMention,
-			allowTextCommands: params.allowTextCommands,
-			hasControlCommand: params.isControlCommand,
-			commandAuthorized: params.commandAuthorized
-		}
-	});
-	if (params.allowTextCommands && params.isControlCommand && !params.commandAuthorized) return {
-		action: "block_unauthorized_command",
-		effectiveWasMentioned: false,
-		shouldBypassMention: false
-	};
-	if (decision.shouldSkip) return {
-		action: "skip_no_mention",
-		effectiveWasMentioned: decision.effectiveWasMentioned,
-		shouldBypassMention: decision.shouldBypassMention
-	};
-	return {
-		action: "pass",
-		effectiveWasMentioned: decision.effectiveWasMentioned,
-		shouldBypassMention: decision.shouldBypassMention
-	};
-}
 function recordGroupHistory(params) {
 	const { historyMap, groupOpenid, historyLimit, event, userContent, historyPort, localPaths } = params;
 	if (!historyMap || historyLimit <= 0) return;
@@ -3032,7 +3100,7 @@ async function handleApprovalButtonInteraction(params) {
 		cfg,
 		account: params.account,
 		event: params.event,
-		approvalKind: resolveApprovalKind(params.parsed.approvalId),
+		approvalKind: params.parsed.approvalKind,
 		resolveCommandAuthorized: params.resolveCommandAuthorized
 	});
 	if (!authorization.authorized) {
@@ -3040,19 +3108,65 @@ async function handleApprovalButtonInteraction(params) {
 		params.log?.info(`Approval button rejected: id=${params.parsed.approvalId}`);
 		return;
 	}
-	await acknowledgeApprovalInteraction(params.creds, params.event, params.log);
+	await acknowledgeApprovalInteraction(params.creds, params.event, params.log, { content: "Approval response received." });
 	const adapter = getPlatformAdapter();
 	if (!adapter.resolveApproval) {
+		await reportApprovalInteractionOutcome({
+			creds: params.creds,
+			event: params.event,
+			log: params.log,
+			content: "Approval is unavailable."
+		});
 		params.log?.error("resolveApproval not available on PlatformAdapter");
 		return;
 	}
 	try {
-		if (await adapter.resolveApproval(params.parsed.approvalId, params.parsed.decision)) params.log?.info(`Approval resolved: id=${params.parsed.approvalId}, decision=${params.parsed.decision}`);
-		else params.log?.error(`Approval resolve failed: id=${params.parsed.approvalId}`);
+		const result = await adapter.resolveApproval(params.parsed);
+		const canonicalDecision = "decision" in result.approval ? `, decision=${result.approval.decision}` : "";
+		const canonicalOutcome = formatCanonicalApprovalOutcome(result.approval);
+		await reportApprovalInteractionOutcome({
+			creds: params.creds,
+			event: params.event,
+			log: params.log,
+			content: result.applied ? `Approval resolved: ${canonicalOutcome}.` : `This approval was already resolved: ${canonicalOutcome}.`
+		});
+		params.log?.info(result.applied ? `Approval resolved: id=${result.approval.id}, status=${result.approval.status}${canonicalDecision}` : `Approval already resolved: id=${result.approval.id}, status=${result.approval.status}${canonicalDecision}`);
 	} catch (err) {
+		await reportApprovalInteractionOutcome({
+			creds: params.creds,
+			event: params.event,
+			log: params.log,
+			content: "Approval could not be resolved."
+		});
 		params.log?.error(`Approval resolve failed: id=${params.parsed.approvalId}: ${err instanceof Error ? err.message : String(err)}`);
 	}
 }
+async function reportApprovalInteractionOutcome(params) {
+	const target = params.event.group_openid ? {
+		type: "group",
+		id: params.event.group_openid
+	} : params.event.user_openid ? {
+		type: "c2c",
+		id: params.event.user_openid
+	} : params.event.channel_id ? {
+		type: "channel",
+		id: params.event.channel_id
+	} : null;
+	if (!target) {
+		params.log?.info(`Approval interaction outcome: ${params.content}`);
+		return;
+	}
+	try {
+		await sendText(target, params.content, params.creds, { msgId: params.event.data.resolved.message_id });
+	} catch (err) {
+		params.log?.error(`Approval outcome delivery failed: ${err instanceof Error ? err.message : String(err)}`);
+	}
+}
+function formatCanonicalApprovalOutcome(approval) {
+	if (approval.status === "allowed") return approval.decision === "allow-always" ? "Allowed always" : "Allowed once";
+	if (approval.status === "denied") return "Denied";
+	return approval.status === "expired" ? "Expired" : "Cancelled";
+}
 async function acknowledgeApprovalInteraction(creds, event, log, data) {
 	try {
 		await acknowledgeInteraction(creds, event.id, 0, data);
@@ -3135,9 +3249,6 @@ function resolveApprovalActorSenderIds(event) {
 		return normalized ? [normalized] : [];
 	}));
 }
-function resolveApprovalKind(approvalId) {
-	return approvalId.toLowerCase().startsWith("plugin:") ? "plugin" : "exec";
-}
 /** Execute an async handler, ACK with the result, and handle errors. */
 async function handleWithAck(creds, event, log, label, handler) {
 	try {
@@ -3217,7 +3328,11 @@ function parseWebpSize(buffer) {
 	if (riff !== "RIFF" || webp !== "WEBP") return null;
 	const chunkType = buffer.toString("ascii", 12, 16);
 	if (chunkType === "VP8 ") {
-		if (buffer.length >= 30 && buffer[23] === 157 && buffer[24] === 1 && buffer[25] === 42) return {
+		if (buffer.length >= 30 && buffer.subarray(23, 26).equals(Buffer$1.from([
+			157,
+			1,
+			42
+		]))) return {
 			width: buffer.readUInt16LE(26) & 16383,
 			height: buffer.readUInt16LE(28) & 16383
 		};
@@ -3233,8 +3348,8 @@ function parseWebpSize(buffer) {
 	}
 	if (chunkType === "VP8X") {
 		if (buffer.length >= 30) return {
-			width: (buffer[24] | buffer[25] << 8 | buffer[26] << 16) + 1,
-			height: (buffer[27] | buffer[28] << 8 | buffer[29] << 16) + 1
+			width: buffer.readUIntLE(24, 3) + 1,
+			height: buffer.readUIntLE(27, 3) + 1
 		};
 	}
 	return null;
@@ -3274,13 +3389,13 @@ async function getImageSizeFromUrl(url, timeoutMs = 5e3) {
 				}
 			});
 			const size = parseImageSize(buffer);
-			if (size) debugLog(`[image-size] Got size from URL: ${size.width}x${size.height} - ${url.slice(0, 60)}...`);
+			if (size) debugLog(`[image-size] Got size from URL: ${size.width}x${size.height} - ${truncateUtf16Safe(url, 60)}...`);
 			return size;
 		} finally {
 			clearTimeout(timeoutId);
 		}
 	} catch (err) {
-		debugLog(`[image-size] Error fetching ${url.slice(0, 60)}...: ${formatErrorMessage(err)}`);
+		debugLog(`[image-size] Error fetching ${truncateUtf16Safe(url, 60)}...: ${formatErrorMessage(err)}`);
 		return null;
 	}
 }
@@ -3290,6 +3405,7 @@ function getImageSizeFromDataUrl(dataUrl) {
 		const matches = dataUrl.match(/^data:image\/[^;]+;base64,(.+)$/);
 		if (!matches) return null;
 		const base64Data = matches[1];
+		if (base64Data === void 0) return null;
 		const size = parseImageSize(Buffer$1.from(base64Data, "base64"));
 		if (size) debugLog(`[image-size] Got size from Base64: ${size.width}x${size.height}`);
 		return size;
@@ -3316,6 +3432,25 @@ function hasQQBotImageSize(markdownImage) {
 	return /!\[#\d+px\s+#\d+px\]/.test(markdownImage);
 }
 //#endregion
+//#region extensions/qqbot/src/engine/messaging/race-with-timeout.ts
+async function raceWithTimeout(operation, timeoutMs, onTimeout) {
+	let timedOut = false;
+	let timeout;
+	const state = { get timedOut() {
+		return timedOut;
+	} };
+	try {
+		return await Promise.race([operation(state), new Promise((resolve) => {
+			timeout = setTimeout(() => {
+				timedOut = true;
+				resolve(onTimeout());
+			}, timeoutMs);
+		})]);
+	} finally {
+		if (timeout !== void 0) clearTimeout(timeout);
+	}
+}
+//#endregion
 //#region extensions/qqbot/src/engine/messaging/outbound-deliver.ts
 /**
 * Outbound delivery helpers — core/ version.
@@ -3461,10 +3596,9 @@ async function sendVoiceWithTimeout(target, voicePath, account, mediaSender, log
 	const uploadFormats = account.config?.audioFormatPolicy?.uploadDirectFormats ?? account.config?.voiceDirectUploadFormats;
 	const transcodeEnabled = account.config?.audioFormatPolicy?.transcodeEnabled !== false;
 	const voiceTimeout = 45e3;
-	const ac = new AbortController();
 	try {
-		const result = await Promise.race([mediaSender.sendVoice(target, voicePath, uploadFormats, transcodeEnabled).then((r) => {
-			if (ac.signal.aborted) {
+		const result = await raceWithTimeout((timeoutState) => mediaSender.sendVoice(target, voicePath, uploadFormats, transcodeEnabled).then((r) => {
+			if (timeoutState.timedOut) {
 				log?.debug?.(`sendVoice completed after timeout, suppressing late delivery`);
 				return {
 					channel: "qqbot",
@@ -3472,15 +3606,10 @@ async function sendVoiceWithTimeout(target, voicePath, account, mediaSender, log
 				};
 			}
 			return r;
-		}), new Promise((resolve) => {
-			setTimeout(() => {
-				ac.abort();
-				resolve({
-					channel: "qqbot",
-					error: "Voice send timed out and was skipped"
-				});
-			}, voiceTimeout);
-		})]);
+		}), voiceTimeout, () => ({
+			channel: "qqbot",
+			error: "Voice send timed out and was skipped"
+		}));
 		if (result.error) {
 			log?.error(`sendVoice error: ${result.error}`);
 			return false;
@@ -3738,7 +3867,7 @@ async function sendMarkdownReply(textWithoutImages, imageUrls, mdMatches, bareUr
 			log?.error(`Failed to send Base64 image via Rich Media API: ${String(imgErr)}`);
 		}
 	}
-	const existingMdUrls = new Set(mdMatches.map((m) => m[2]));
+	const existingMdUrls = new Set(mdMatches.flatMap((m) => m[2] === void 0 ? [] : [m[2]]));
 	const imagesToAppend = [];
 	for (const url of httpImageUrls) if (!existingMdUrls.has(url)) try {
 		const size = await getImageSize(url);
@@ -3752,6 +3881,7 @@ async function sendMarkdownReply(textWithoutImages, imageUrls, mdMatches, bareUr
 	for (const m of mdMatches) {
 		const fullMatch = m[0];
 		const imgUrl = m[2];
+		if (fullMatch === void 0 || imgUrl === void 0) continue;
 		if (isHttpUrl(imgUrl) && !hasQQBotImageSize(fullMatch)) try {
 			const size = await getImageSize(imgUrl);
 			result = result.replace(fullMatch, formatQQBotMarkdownImage(imgUrl, size));
@@ -3888,7 +4018,7 @@ async function handleStructuredPayload(ctx, replyText, recordActivity, deps) {
 	return true;
 }
 function formatMediaTypeLabel(mediaType) {
-	return mediaType[0].toUpperCase() + mediaType.slice(1);
+	return mediaType.charAt(0).toUpperCase() + mediaType.slice(1);
 }
 function validateStructuredPayloadLocalPath(ctx, payloadPath, mediaType) {
 	const candidatePaths = resolveWorkspacePathCandidates(normalizePath(payloadPath), ctx.mediaAccess?.workspaceDir);
@@ -4279,7 +4409,7 @@ function fixPathEncoding(mediaPath, log) {
 				const code = decoded.charCodeAt(i);
 				if (code <= 255) bytes.push(code);
 				else {
-					const charBytes = Buffer.from(decoded[i], "utf8");
+					const charBytes = Buffer.from(decoded.charAt(i), "utf8");
 					bytes.push(...charBytes);
 				}
 			}
@@ -4308,7 +4438,9 @@ function isInsideCodeBlock(text, position) {
 	let fenceMatch;
 	let openFence = null;
 	while ((fenceMatch = fenceRegex.exec(text)) !== null) {
-		const ticks = fenceMatch[1].length;
+		const ticksText = fenceMatch[1];
+		if (ticksText === void 0) continue;
+		const ticks = ticksText.length;
 		if (!openFence) openFence = {
 			pos: fenceMatch.index,
 			ticks
@@ -4339,7 +4471,9 @@ function findFirstClosedMediaTag(text, log) {
 			continue;
 		}
 		const textBefore = text.slice(0, match.index);
-		const tagName = match[1].toLowerCase();
+		const rawTagName = match[1];
+		if (rawTagName === void 0) continue;
+		const tagName = rawTagName.toLowerCase();
 		let mediaPath = match[2]?.trim() ?? "";
 		mediaPath = normalizePath(mediaPath);
 		mediaPath = fixPathEncoding(mediaPath, log);
@@ -4403,12 +4537,10 @@ async function executeSendQueue(queue, ctx, options = {}) {
 			const transcodeEnabled = account.config?.audioFormatPolicy?.transcodeEnabled !== false;
 			const voiceTimeout = 45e3;
 			try {
-				const result = await Promise.race([sendVoice(mediaTarget, item.content, uploadFormats, transcodeEnabled), new Promise((resolve) => {
-					setTimeout(() => resolve({
-						channel: "qqbot",
-						error: "语音发送超时，已跳过"
-					}), voiceTimeout);
-				})]);
+				const result = await raceWithTimeout(() => sendVoice(mediaTarget, item.content, uploadFormats, transcodeEnabled), voiceTimeout, () => ({
+					channel: "qqbot",
+					error: "语音发送超时，已跳过"
+				}));
 				if (result.error) {
 					log?.error(`${prefix} sendVoice error: ${result.error}`);
 					await sendFallbackText(resolveUserFacingMediaError(result));
@@ -4514,7 +4646,7 @@ function stripIncompleteMediaTag(text) {
 	let searchIsClosing = false;
 	let fallbackPos = -1;
 	for (let i = lastLine.length - 1; i >= 0; i--) {
-		const ch = lastLine[i];
+		const ch = lastLine.charAt(i);
 		if (ch !== "<" && ch !== "＜") continue;
 		const after = lastLine.slice(i + 1);
 		const isClosing = after.startsWith("/");
@@ -4522,7 +4654,9 @@ function stripIncompleteMediaTag(text) {
 		const nameMatch = nameStr.match(/^(\w+)/);
 		if (searchTag) {
 			if (!nameMatch || isClosing) continue;
-			const cand = nameMatch[1].toLowerCase();
+			const candidateName = nameMatch[1];
+			if (candidateName === void 0) continue;
+			const cand = candidateName.toLowerCase();
 			if (!isMedia(cand)) continue;
 			if (hasClosingAfter(i, cand)) continue;
 			if (searchTag === "*") return cutAt(i);
@@ -4543,6 +4677,7 @@ function stripIncompleteMediaTag(text) {
 			continue;
 		}
 		const tag = nameMatch[1];
+		if (tag === void 0) continue;
 		const restAfterName = nameStr.slice(tag.length);
 		const hasGT = /[>＞]/.test(restAfterName);
 		if (!isMedia(tag) && !(couldBeMedia(tag) && !hasGT)) continue;
@@ -5152,6 +5287,11 @@ var StreamingController = class {
 				return;
 			}
 			const firstText = safeText;
+			if (!claimMessageReply(this.deps.replyToMsgId).allowed) {
+				this.logWarn(`stream budget unavailable; falling back to static delivery`);
+				this.transition("aborted", "doStartStreaming", "passive_budget_exhausted");
+				return;
+			}
 			const resp = await this.sendStreamChunk(firstText, StreamInputState.GENERATING, "doStartStreaming");
 			if (!resp.id) throw new Error(`Stream API returned no id: ${JSON.stringify(resp)}`);
 			this.streamMsgId = resp.id;
@@ -5248,15 +5388,12 @@ async function sendMediaQueue(queue, ctx) {
 }
 /**
 * 是否对私聊走 QQ 官方 C2C `stream_messages` 流式 API。
-* - `streaming: true` 等效于 `mode: "partial"` 且 `c2cStreamApi: true`。
-* - 仍支持对象里显式设 `c2cStreamApi: true` 以兼容旧配置；仅 C2C 场景生效。
+* - `streaming.nativeTransport: true` 启用；仅 C2C 场景生效。
+* - 旧的 `streaming: true` 布尔与 `c2cStreamApi` 键由 `openclaw doctor --fix` 迁移。
 */
 function shouldUseOfficialC2cStream(account, targetType) {
 	if (targetType !== "c2c") return false;
-	const s = account.config?.streaming;
-	if (s === true) return true;
-	if (s && typeof s === "object" && s.c2cStreamApi === true) return true;
-	return false;
+	return account.config?.streaming?.nativeTransport === true;
 }
 //#endregion
 //#region extensions/qqbot/src/engine/utils/audio.ts
@@ -5319,11 +5456,10 @@ async function convertSilkToWav(inputPath, outputDir) {
 		return null;
 	}
 	const strippedBuf = stripAmrHeader(fileBuf);
-	const rawData = new Uint8Array(strippedBuf.buffer, strippedBuf.byteOffset, strippedBuf.byteLength);
 	const silk = await loadSilkWasm();
-	if (!silk || !silk.isSilk(rawData)) return null;
+	if (!silk || !silk.isSilk(strippedBuf)) return null;
 	const sampleRate = 24e3;
-	const result = await silk.decode(rawData, sampleRate);
+	const result = await silk.decode(strippedBuf, sampleRate);
 	const wavBuffer = pcmToWav(result.data, sampleRate);
 	const dir = outputDir || path$1.dirname(inputPath);
 	if (!fs$1.existsSync(dir)) fs$1.mkdirSync(dir, { recursive: true });
@@ -5337,7 +5473,8 @@ async function convertSilkToWav(inputPath, outputDir) {
 }
 /** Check whether an attachment is a voice file (by MIME type or extension). */
 function isVoiceAttachment(att) {
-	if (att.content_type === "voice" || att.content_type?.startsWith("audio/")) return true;
+	const contentType = normalizeLowercaseStringOrEmpty$1(att.content_type);
+	if (contentType === "voice" || contentType.startsWith("audio/")) return true;
 	const ext = att.filename ? normalizeLowercaseStringOrEmpty$1(path$1.extname(att.filename)) : "";
 	return [
 		".amr",
@@ -5422,39 +5559,23 @@ async function audioFileToSilkBase64(filePath, directUploadFormats) {
 		debugLog(`[audio-convert] direct upload (QQ native format): ${ext} (${buf.length} bytes)`);
 		return buf.toString("base64");
 	}
-	if ([".slk", ".slac"].includes(ext)) {
-		const stripped = stripAmrHeader(buf);
-		const raw = new Uint8Array(stripped.buffer, stripped.byteOffset, stripped.byteLength);
-		if ((await loadSilkWasm())?.isSilk(raw)) {
-			debugLog(`[audio-convert] SILK file, direct use: ${filePath} (${buf.length} bytes)`);
-			return buf.toString("base64");
-		}
-	}
-	const rawCheck = new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
-	const strippedCheck = stripAmrHeader(buf);
-	const strippedRaw = new Uint8Array(strippedCheck.buffer, strippedCheck.byteOffset, strippedCheck.byteLength);
-	const silkForCheck = await loadSilkWasm();
-	if (silkForCheck?.isSilk(rawCheck) || silkForCheck?.isSilk(strippedRaw)) {
+	const stripped = stripAmrHeader(buf);
+	const silk = await loadSilkWasm();
+	if (silk?.isSilk(buf) || silk?.isSilk(stripped)) {
 		debugLog(`[audio-convert] SILK detected by header: ${filePath} (${buf.length} bytes)`);
 		return buf.toString("base64");
 	}
 	const targetRate = 24e3;
 	debugLog(`[audio-convert] fallback: trying WASM decoders for ${ext}`);
-	if (ext === ".pcm") {
-		const { silkBuffer } = await pcmToSilk(Buffer.from(buf.buffer, buf.byteOffset, buf.byteLength), targetRate);
-		return silkBuffer.toString("base64");
-	}
+	if (ext === ".pcm") return (await pcmToSilk(buf, targetRate)).toString("base64");
 	if (ext === ".wav" || buf.length >= 4 && buf.toString("ascii", 0, 4) === "RIFF") {
 		const wavInfo = parseWavFallback(buf);
-		if (wavInfo) {
-			const { silkBuffer } = await pcmToSilk(wavInfo, targetRate);
-			return silkBuffer.toString("base64");
-		}
+		if (wavInfo) return (await pcmToSilk(wavInfo, targetRate)).toString("base64");
 	}
 	if (ext === ".mp3" || ext === ".mpeg") {
 		const pcmBuf = await wasmDecodeMp3ToPCM(buf, targetRate);
 		if (pcmBuf) {
-			const { silkBuffer } = await pcmToSilk(pcmBuf, targetRate);
+			const silkBuffer = await pcmToSilk(pcmBuf, targetRate);
 			debugLog(`[audio-convert] WASM: MP3 → SILK done (${silkBuffer.length} bytes)`);
 			return silkBuffer.toString("base64");
 		}
@@ -5524,12 +5645,8 @@ async function waitForFile(filePath, timeoutMs = 3e4, pollMs = 500) {
 async function pcmToSilk(pcmBuffer, sampleRate) {
 	const silk = await loadSilkWasm();
 	if (!silk) throw new Error("silk-wasm is not available; cannot encode PCM to SILK");
-	const pcmData = new Uint8Array(pcmBuffer.buffer, pcmBuffer.byteOffset, pcmBuffer.byteLength);
-	const result = await silk.encode(pcmData, sampleRate);
-	return {
-		silkBuffer: Buffer.from(result.data.buffer, result.data.byteOffset, result.data.byteLength),
-		duration: result.duration
-	};
+	const result = await silk.encode(pcmBuffer, sampleRate);
+	return Buffer.from(result.data.buffer, result.data.byteOffset, result.data.byteLength);
 }
 /** Decode MP3 to PCM via mpg123-decoder WASM. */
 async function wasmDecodeMp3ToPCM(buf, targetRate) {
@@ -5546,20 +5663,21 @@ async function wasmDecodeMp3ToPCM(buf, targetRate) {
 		}
 		debugLog(`[audio-convert] WASM MP3 decode: samples=${decoded.samplesDecoded}, sampleRate=${decoded.sampleRate}, channels=${decoded.channelData.length}`);
 		let floatMono;
-		if (decoded.channelData.length === 1) floatMono = decoded.channelData[0];
+		if (decoded.channelData.length === 1) floatMono = expectDefined(decoded.channelData.at(0), "single decoded MP3 channel");
 		else {
 			floatMono = new Float32Array(decoded.samplesDecoded);
 			const channels = decoded.channelData.length;
 			for (let i = 0; i < decoded.samplesDecoded; i++) {
 				let sum = 0;
-				for (let ch = 0; ch < channels; ch++) sum += decoded.channelData[ch][i];
+				for (const channel of decoded.channelData) sum += expectDefined(channel.at(i), "decoded MP3 channel sample");
 				floatMono[i] = sum / channels;
 			}
 		}
 		const s16 = new Uint8Array(floatMono.length * 2);
 		const view = new DataView(s16.buffer);
 		for (let i = 0; i < floatMono.length; i++) {
-			const clamped = Math.max(-1, Math.min(1, floatMono[i]));
+			const sample = expectDefined(floatMono.at(i), "mono MP3 sample index");
+			const clamped = Math.max(-1, Math.min(1, sample));
 			const val = clamped < 0 ? clamped * 32768 : clamped * 32767;
 			view.setInt16(i * 2, Math.round(val), true);
 		}
@@ -5720,7 +5838,6 @@ const TOOL_MEDIA_SEND_TIMEOUT = 45e3;
 function shouldDeliverToolProgressImmediately(account, useOfficialC2cStream) {
 	if (useOfficialC2cStream) return true;
 	const streaming = account.config?.streaming;
-	if (streaming === true) return true;
 	return typeof streaming === "object" && streaming !== null && streaming.mode !== "off";
 }
 function immediateToolProgressText(payload) {
@@ -6132,11 +6249,7 @@ async function dispatchOutbound(inbound, deps) {
 						}
 					},
 					replyOptions: {
-						disableBlockStreaming: useOfficialC2cStream ? true : (() => {
-							const s = account.config?.streaming;
-							if (s === false) return true;
-							return typeof s === "object" && s !== null && s.mode === "off";
-						})(),
+						disableBlockStreaming: useOfficialC2cStream ? true : account.config?.streaming?.mode === "off",
 						...streamingController ? { onPartialReply: async (payload) => {
 							try {
 								await streamingController.onPartialReply(payload);
@@ -6262,41 +6375,35 @@ async function buildCtxPayload(inbound, runtime, cfg) {
 /**
 * Periodically refresh C2C typing state while a response is in progress.
 *
-* All I/O operations are injected via constructor parameters so this
-* module has zero external dependencies and can run in both plugin versions.
+* Interval scheduling comes from the core typing keepalive loop; this module
+* owns the QQ passive-reply budget accounting and token-refresh retry.
 */
 /** Refresh every 5s for the QQ API's 10s input-notify window. */
 const TYPING_INTERVAL_MS = 5e3;
+const FINAL_REPLY_RESERVE_COUNT = 1;
 var TypingKeepAlive = class {
-	constructor(getToken, clearCache, sendInputNotify, openid, msgId, log) {
+	constructor(getToken, clearCache, sendInputNotify, openid, msgId, log, claimPassiveReply = claimMessageReply) {
 		this.getToken = getToken;
 		this.clearCache = clearCache;
 		this.sendInputNotify = sendInputNotify;
 		this.openid = openid;
 		this.msgId = msgId;
 		this.log = log;
-		this.timer = null;
+		this.claimPassiveReply = claimPassiveReply;
 		this.stopped = false;
-		this.renewalsRemaining = 3;
+		this.loop = createTypingKeepaliveLoop({
+			intervalMs: TYPING_INTERVAL_MS,
+			onTick: () => this.send()
+		});
 	}
 	/** Start periodic keep-alive sends. */
 	start() {
-		if (this.stopped) return;
-		this.timer = setInterval(() => {
-			if (this.stopped) {
-				this.stop();
-				return;
-			}
-			this.send().catch(() => {});
-		}, TYPING_INTERVAL_MS);
+		if (!this.stopped) this.loop.start();
 	}
 	/** Stop periodic keep-alive sends. */
 	stop() {
 		this.stopped = true;
-		if (this.timer) {
-			clearInterval(this.timer);
-			this.timer = null;
-		}
+		this.loop.stop();
 	}
 	async send() {
 		try {
@@ -6313,16 +6420,18 @@ var TypingKeepAlive = class {
 		}
 	}
 	async sendAttempt(token) {
-		if (this.stopped || this.renewalsRemaining <= 0) {
+		if (this.stopped) return;
+		const claim = this.claimPassiveReply(this.msgId, FINAL_REPLY_RESERVE_COUNT);
+		if (!claim.allowed) {
+			this.log?.debug?.(`Typing keep-alive budget exhausted for ${this.openid}`);
 			this.stop();
 			return;
 		}
-		this.renewalsRemaining--;
 		try {
 			await this.sendInputNotify(token, this.openid, this.msgId, 10);
 			this.log?.debug?.(`Typing keep-alive sent to ${this.openid}`);
 		} finally {
-			if (this.renewalsRemaining <= 0) {
+			if (claim.remaining <= FINAL_REPLY_RESERVE_COUNT) {
 				this.log?.debug?.(`Typing keep-alive budget exhausted for ${this.openid}`);
 				this.stop();
 			}
@@ -6503,6 +6612,7 @@ async function startTypingForEvent(event, account, log) {
 		const creds = accountToCreds(account);
 		const rawNotifyFn = createRawInputNotifyFn(account.appId);
 		const sendNotifyAndStartKeepAlive = async () => {
+			if (!claimMessageReply(event.messageId, 1).allowed) return { keepAlive: null };
 			const resp = await sendInputNotify({
 				openid: event.senderId,
 				creds,