@openclaw/msteams 2026.7.2-beta.7 → 2026.8.1-beta.3

package/dist/{src-B_BdEvcr.cjs → src-C127-DcQ.cjs}

@@ -1,22 +1,23 @@
-const require_polls = require("./polls-BWKNpBSg.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-D6vf50IK.cjs");
 const require_runtime = require("./runtime-gZTAuFux.cjs");
 require("./runtime-api.cjs");
-const require_resolve_allowlist = require("./resolve-allowlist-CEj9sABO.cjs");
-const require_channel = require("./channel-C7QxRjBW.cjs");
-const require_setup_surface = require("./setup-surface-ByWjaXEn.cjs");
-const require_sso_token_store = require("./sso-token-store-TKYk_Ms7.cjs");
-const require_messenger = require("./messenger-DTiaLTDO.cjs");
+const require_resolve_allowlist = require("./resolve-allowlist-CIfWUwuc.cjs");
+const require_channel = require("./channel-KpWENcgK.cjs");
+const require_channel_setup = require("./channel.setup-mOFtsfYz.cjs");
+const require_polls = require("./polls-DvuJvaDG.cjs");
+const require_sso_token_store = require("./sso-token-store-ChhO1f4i.cjs");
+const require_messenger = require("./messenger-IISPSOvj.cjs");
 let openclaw_plugin_sdk_channel_outbound = require("openclaw/plugin-sdk/channel-outbound");
 let openclaw_plugin_sdk_string_coerce_runtime = require("openclaw/plugin-sdk/string-coerce-runtime");
 let openclaw_plugin_sdk_allow_from = require("openclaw/plugin-sdk/allow-from");
+let openclaw_plugin_sdk_provider_http = require("openclaw/plugin-sdk/provider-http");
 let openclaw_plugin_sdk_media_runtime = require("openclaw/plugin-sdk/media-runtime");
 let openclaw_plugin_sdk_ssrf_runtime = require("openclaw/plugin-sdk/ssrf-runtime");
-let openclaw_plugin_sdk_provider_http = require("openclaw/plugin-sdk/provider-http");
 let openclaw_plugin_sdk_number_runtime = require("openclaw/plugin-sdk/number-runtime");
 let openclaw_plugin_sdk_text_utility_runtime = require("openclaw/plugin-sdk/text-utility-runtime");
 let openclaw_plugin_sdk_routing = require("openclaw/plugin-sdk/routing");
 let node_crypto = require("node:crypto");
-node_crypto = require_polls.__toESM(node_crypto, 1);
+node_crypto = require_rolldown_runtime.__toESM(node_crypto, 1);
 let openclaw_plugin_sdk_error_runtime = require("openclaw/plugin-sdk/error-runtime");
 let openclaw_plugin_sdk_channel_inbound = require("openclaw/plugin-sdk/channel-inbound");
 let openclaw_plugin_sdk_channel_ingress_runtime = require("openclaw/plugin-sdk/channel-ingress-runtime");
@@ -26,7 +27,9 @@ let openclaw_plugin_sdk_agent_runtime = require("openclaw/plugin-sdk/agent-runti
 let openclaw_plugin_sdk_extension_shared = require("openclaw/plugin-sdk/extension-shared");
 let openclaw_plugin_sdk_plugin_runtime = require("openclaw/plugin-sdk/plugin-runtime");
 let openclaw_plugin_sdk_dedupe_runtime = require("openclaw/plugin-sdk/dedupe-runtime");
+let openclaw_plugin_sdk_plugin_state_runtime = require("openclaw/plugin-sdk/plugin-state-runtime");
 let openclaw_plugin_sdk_collection_runtime = require("openclaw/plugin-sdk/collection-runtime");
+let openclaw_plugin_sdk_gateway_runtime = require("openclaw/plugin-sdk/gateway-runtime");
 let openclaw_plugin_sdk_channel_pairing = require("openclaw/plugin-sdk/channel-pairing");
 let openclaw_plugin_sdk_account_id = require("openclaw/plugin-sdk/account-id");
 let openclaw_plugin_sdk_runtime_group_policy = require("openclaw/plugin-sdk/runtime-group-policy");
@@ -86,11 +89,11 @@ async function runFeedbackReflection(params) {
 			thumbedDownResponse: params.thumbedDownResponse,
 			userComment: params.userComment,
 			cooldownMs,
-			onRecordError: (err) => log.debug?.("reflection session record failed", { error: require_setup_surface.formatUnknownError(err) }),
-			onDispatchError: (err) => log.debug?.("reflection reply error", { error: require_setup_surface.formatUnknownError(err) })
+			onRecordError: (err) => log.debug?.("reflection session record failed", { error: require_channel_setup.formatUnknownError(err) }),
+			onDispatchError: (err) => log.debug?.("reflection reply error", { error: require_channel_setup.formatUnknownError(err) })
 		});
 	} catch (err) {
-		log.error("reflection dispatch failed", { error: require_setup_surface.formatUnknownError(err) });
+		log.error("reflection dispatch failed", { error: require_channel_setup.formatUnknownError(err) });
 		return;
 	}
 	if (reflection.status === "cooldown") {
@@ -113,7 +116,7 @@ async function runFeedbackReflection(params) {
 			learning: reflection.learning
 		});
 	} catch (err) {
-		log.debug?.("failed to store reflection learning", { error: require_setup_surface.formatUnknownError(err) });
+		log.debug?.("failed to store reflection learning", { error: require_channel_setup.formatUnknownError(err) });
 	}
 	const conversationType = (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalLowercaseString)(params.conversationRef.conversation?.conversationType);
 	if (!(conversationType === "personal" && reflection.followUp && Boolean(reflection.userMessage))) {
@@ -130,7 +133,7 @@ async function runFeedbackReflection(params) {
 		}, { serviceUrlBoundary: require_resolve_allowlist.resolveMSTeamsSdkCloudOptions(cfg.channels?.msteams) });
 		log.info("sent reflection follow-up", { sessionKey });
 	} catch (err) {
-		log.debug?.("failed to send reflection follow-up", { error: require_setup_surface.formatUnknownError(err) });
+		log.debug?.("failed to send reflection follow-up", { error: require_channel_setup.formatUnknownError(err) });
 	}
 }
 //#endregion
@@ -237,50 +240,53 @@ async function resolveMSTeamsSenderAccess(params) {
 		channelName: activity.channelData?.channel?.name,
 		allowNameMatching
 	});
-	return {
-		...await (0, openclaw_plugin_sdk_channel_ingress_runtime.resolveStableChannelMessageIngress)({
-			channelId: "msteams",
-			accountId: pairing.accountId,
-			identity: msteamsIngressIdentity,
-			cfg: params.cfg,
-			readStoreAllowFrom: pairing.readAllowFromStore,
-			subject: {
-				stableId: senderId,
-				aliases: {
-					"sender-name": senderName,
-					...!isDirectMessage ? { "conversation-id": conversationId } : {}
-				}
-			},
-			conversation: {
-				kind: isDirectMessage ? "direct" : convType === "channel" ? "channel" : "group",
-				id: conversationId,
-				parentId: activity.channelData?.team?.id
-			},
-			route: (0, openclaw_plugin_sdk_channel_ingress_runtime.channelIngressRoutes)(!isDirectMessage && channelGate.allowlistConfigured && {
-				id: "msteams:team-channel",
-				kind: "nestedAllowlist",
-				allowed: channelGate.allowed,
-				precedence: 0,
-				matchId: "msteams-route",
-				...channelGate.allowed && groupPolicy === "allowlist" ? {
-					senderPolicy: "deny-when-empty",
-					senderAllowFromSource: "effective-group"
-				} : {}
-			}),
-			dmPolicy,
-			groupPolicy,
-			policy: {
-				groupAllowFromFallbackToAllowFrom: true,
-				mutableIdentifierMatching: allowNameMatching ? "enabled" : "disabled"
-			},
-			allowFrom: configuredDmAllowFrom,
-			groupAllowFrom,
-			command: {
-				allowTextCommands: true,
-				hasControlCommand: params.hasControlCommand === true,
-				directGroupAllowFrom: isDirectMessage ? "effective" : "none"
+	const resolved = await (0, openclaw_plugin_sdk_channel_ingress_runtime.resolveStableChannelMessageIngress)({
+		channelId: "msteams",
+		accountId: pairing.accountId,
+		identity: msteamsIngressIdentity,
+		cfg: params.cfg,
+		readStoreAllowFrom: pairing.readAllowFromStore,
+		subject: {
+			stableId: senderId,
+			aliases: {
+				"sender-name": senderName,
+				...!isDirectMessage ? { "conversation-id": conversationId } : {}
 			}
+		},
+		conversation: {
+			kind: isDirectMessage ? "direct" : convType === "channel" ? "channel" : "group",
+			id: conversationId,
+			threadId: params.conversationThreadId
+		},
+		...params.contextBinding ? { contextBinding: params.contextBinding } : {},
+		route: (0, openclaw_plugin_sdk_channel_ingress_runtime.channelIngressRoutes)(!isDirectMessage && channelGate.allowlistConfigured && {
+			id: "msteams:team-channel",
+			kind: "nestedAllowlist",
+			allowed: channelGate.allowed,
+			precedence: 0,
+			matchId: "msteams-route",
+			...channelGate.allowed && groupPolicy === "allowlist" ? {
+				senderPolicy: "deny-when-empty",
+				senderAllowFromSource: "effective-group"
+			} : {}
 		}),
+		dmPolicy,
+		groupPolicy,
+		policy: {
+			groupAllowFromFallbackToAllowFrom: true,
+			mutableIdentifierMatching: allowNameMatching ? "enabled" : "disabled"
+		},
+		allowFrom: configuredDmAllowFrom,
+		groupAllowFrom,
+		command: {
+			allowTextCommands: true,
+			hasControlCommand: params.hasControlCommand === true,
+			directGroupAllowFrom: isDirectMessage ? "effective" : "none"
+		}
+	});
+	return {
+		...resolved,
+		channelIngress: resolved,
 		pairing,
 		isDirectMessage,
 		conversationId,
@@ -325,7 +331,7 @@ async function admitMSTeamsMessage(params) {
 		});
 		if (senderAccess.decision === "pairing") {
 			params.conversationStore.upsert(params.conversationId, params.conversationRef).catch((err) => {
-				params.log.debug?.("failed to save conversation reference", { error: require_setup_surface.formatUnknownError(err) });
+				params.log.debug?.("failed to save conversation reference", { error: require_channel_setup.formatUnknownError(err) });
 			});
 			if (await pairing.upsertPairingRequest({
 				id: senderId,
@@ -381,7 +387,7 @@ async function admitMSTeamsMessage(params) {
 			params.log.debug?.("dropping group message (groupPolicy: allowlist, no allowlist)", { conversationId: params.conversationId });
 			return null;
 		}
-		if (!senderAccess.allowed && senderAccess.reasonCode === "group_policy_not_allowlisted") {
+		if (!senderAccess.allowed) {
 			const allowMatch = require_channel.resolveMSTeamsAllowlistMatch({
 				allowFrom: effectiveGroupAllowFrom,
 				senderId,
@@ -411,7 +417,7 @@ async function admitMSTeamsMessage(params) {
 		return null;
 	}
 	params.conversationStore.upsert(params.conversationId, params.conversationRef).catch((err) => {
-		params.log.debug?.("failed to save conversation reference", { error: require_setup_surface.formatUnknownError(err) });
+		params.log.debug?.("failed to save conversation reference", { error: require_channel_setup.formatUnknownError(err) });
 	});
 	return {
 		...access,
@@ -473,7 +479,7 @@ async function fetchBotFrameworkAttachmentInfo(params) {
 			timeoutMs: require_resolve_allowlist.resolveMSTeamsRequestTimeoutMs(params.deadline)
 		});
 	} catch (err) {
-		params.logger?.warn?.("msteams botFramework attachmentInfo fetch failed", { error: err instanceof Error ? err.message : String(err) });
+		params.logger?.warn?.("msteams botFramework attachmentInfo fetch failed", { error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err) });
 		return;
 	}
 	if (!response.ok) {
@@ -484,7 +490,7 @@ async function fetchBotFrameworkAttachmentInfo(params) {
 	try {
 		return await (0, openclaw_plugin_sdk_provider_http.readProviderJsonResponse)(response, "msteams botFramework attachmentInfo");
 	} catch (err) {
-		params.logger?.warn?.("msteams botFramework attachmentInfo parse failed", { error: err instanceof Error ? err.message : String(err) });
+		params.logger?.warn?.("msteams botFramework attachmentInfo parse failed", { error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err) });
 		return;
 	}
 }
@@ -506,7 +512,7 @@ async function saveBotFrameworkAttachmentView(params) {
 			timeoutMs: require_resolve_allowlist.resolveMSTeamsRequestTimeoutMs(params.deadline)
 		});
 	} catch (err) {
-		params.logger?.warn?.("msteams botFramework attachmentView fetch failed", { error: err instanceof Error ? err.message : String(err) });
+		params.logger?.warn?.("msteams botFramework attachmentView fetch failed", { error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err) });
 		return;
 	}
 	if (!response.ok) {
@@ -519,7 +525,7 @@ async function saveBotFrameworkAttachmentView(params) {
 		contentLength = (0, openclaw_plugin_sdk_media_runtime.parseMediaContentLength)(response.headers.get("content-length"));
 	} catch (err) {
 		await response.body?.cancel().catch(() => void 0);
-		params.logger?.warn?.("msteams botFramework attachmentView invalid content-length", { error: err instanceof Error ? err.message : String(err) });
+		params.logger?.warn?.("msteams botFramework attachmentView invalid content-length", { error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err) });
 		return;
 	}
 	if (contentLength !== null && contentLength > params.maxBytes) {
@@ -536,7 +542,7 @@ async function saveBotFrameworkAttachmentView(params) {
 			originalFilename: params.preserveFilenames ? params.fileNameHint : void 0
 		});
 	} catch (err) {
-		params.logger?.warn?.("msteams botFramework attachmentView save failed", { error: err instanceof Error ? err.message : String(err) });
+		params.logger?.warn?.("msteams botFramework attachmentView save failed", { error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err) });
 		return;
 	} finally {
 		await response.body?.cancel().catch(() => void 0);
@@ -564,7 +570,7 @@ async function downloadMSTeamsBotFrameworkAttachment(params) {
 			work: () => tokenProvider.getAccessToken(BOT_FRAMEWORK_SCOPE)
 		});
 	} catch (err) {
-		params.logger?.warn?.("msteams botFramework token acquisition failed", { error: err instanceof Error ? err.message : String(err) });
+		params.logger?.warn?.("msteams botFramework token acquisition failed", { error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err) });
 		return;
 	}
 	if (!accessToken) return;
@@ -665,7 +671,7 @@ async function downloadMSTeamsBotFrameworkAttachments(params) {
 			sourceId: attachmentId
 		});
 		params.logger?.warn?.("msteams botFramework attachment download failed", {
-			error: err instanceof Error ? err.message : String(err),
+			error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err),
 			attachmentId
 		});
 	}
@@ -878,9 +884,6 @@ function scopeCandidatesForUrl(url) {
 		return ["https://api.botframework.com", "https://graph.microsoft.com"];
 	}
 }
-function isRedirectStatus(status) {
-	return status === 301 || status === 302 || status === 303 || status === 307 || status === 308;
-}
 async function resolveInlineDataImageMime(inline) {
 	const mime = (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalLowercaseString)(await require_runtime.getMSTeamsRuntime().media.detectMime({
 		buffer: inline.data,
@@ -903,7 +906,7 @@ async function fetchWithAuthFallback(params) {
 	const tokenProvider = params.tokenProvider;
 	if (firstAttempt.status !== 401 && firstAttempt.status !== 403) return firstAttempt;
 	if (!require_resolve_allowlist.isUrlAllowed(params.url, params.policy.authAllowHosts)) return firstAttempt;
-	await firstAttempt.body?.cancel();
+	let fallbackAttempt = firstAttempt;
 	const scopes = scopeCandidatesForUrl(params.url);
 	const fetchFn = params.fetchFn ?? fetch;
 	for (const scope of scopes) try {
@@ -926,15 +929,11 @@ async function fetchWithAuthFallback(params) {
 			resolveFn: params.resolveFn,
 			timeoutMs: require_resolve_allowlist.resolveMSTeamsRequestTimeoutMs(params.deadline)
 		});
-		if (authAttempt.ok) return authAttempt;
-		if (isRedirectStatus(authAttempt.status)) return authAttempt;
-		if (authAttempt.status !== 401 && authAttempt.status !== 403) {
-			await authAttempt.body?.cancel();
-			continue;
-		}
-		await authAttempt.body?.cancel();
+		await fallbackAttempt.body?.cancel().catch(() => void 0);
+		if (authAttempt.ok || require_resolve_allowlist.isRedirectStatus(authAttempt.status)) return authAttempt;
+		fallbackAttempt = authAttempt;
 	} catch {}
-	return firstAttempt;
+	return fallbackAttempt;
 }
 /**
 * Download all file attachments from a Teams message (images, documents, etc.).
@@ -1015,7 +1014,7 @@ async function downloadMSTeamsAttachments(params) {
 				}, candidate.sourceId));
 			} catch (err) {
 				out.push(withSourceId({ kind: candidate.mediaKind }, candidate.sourceId));
-				params.logger?.warn?.("msteams inline attachment decode failed", { error: err instanceof Error ? err.message : String(err) });
+				params.logger?.warn?.("msteams inline attachment decode failed", { error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err) });
 			}
 			continue;
 		}
@@ -1047,7 +1046,7 @@ async function downloadMSTeamsAttachments(params) {
 			out.push(withSourceId(media, candidate.sourceId));
 		} catch (err) {
 			out.push(withSourceId({ kind: candidate.mediaKind }, candidate.sourceId));
-			const msg = err instanceof Error ? err.message : String(err);
+			const msg = (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err);
 			params.logger?.warn?.(`msteams attachment download failed host=${safeHostForLog(candidate.url)} error=${msg}`);
 		}
 	}
@@ -1086,6 +1085,10 @@ function buildMSTeamsGraphMessageUrl(params) {
 	if (!chatId) return;
 	return `${require_resolve_allowlist.GRAPH_ROOT}/chats/${encodeURIComponent(chatId)}/messages/${encodeURIComponent(messageId)}`;
 }
+async function releaseGraphResponse(response, release) {
+	if (!response.bodyUsed) response.body?.cancel().catch(() => void 0);
+	await release();
+}
 async function fetchGraphCollection(params) {
 	const fetchFn = params.fetchFn ?? fetch;
 	const { response, release } = await (0, openclaw_plugin_sdk_ssrf_runtime.fetchWithSsrFGuard)({
@@ -1098,13 +1101,10 @@ async function fetchGraphCollection(params) {
 	});
 	try {
 		const status = response.status;
-		if (!response.ok) {
-			await response.body?.cancel().catch(() => void 0);
-			return {
-				status,
-				items: []
-			};
-		}
+		if (!response.ok) return {
+			status,
+			items: []
+		};
 		try {
 			return {
 				status,
@@ -1117,7 +1117,7 @@ async function fetchGraphCollection(params) {
 			};
 		}
 	} finally {
-		await release();
+		await releaseGraphResponse(response, release);
 	}
 }
 function normalizeGraphAttachment(att) {
@@ -1149,7 +1149,7 @@ async function downloadGraphHostedContent(params) {
 			deadline: params.deadline
 		});
 	} catch (err) {
-		params.logger?.warn?.("msteams graph hostedContents fetch failed", { error: err instanceof Error ? err.message : String(err) });
+		params.logger?.warn?.("msteams graph hostedContents fetch failed", { error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err) });
 		return {
 			media: [],
 			count: 0
@@ -1194,11 +1194,11 @@ async function downloadGraphHostedContent(params) {
 					sourceId: item.id
 				});
 			} finally {
-				await release();
+				await releaseGraphResponse(valRes, release);
 			}
 		} catch (err) {
 			out.push(createGraphHostedContentFact(item));
-			params.logger?.warn?.("msteams graph hostedContent value fetch failed", { error: err instanceof Error ? err.message : String(err) });
+			params.logger?.warn?.("msteams graph hostedContent value fetch failed", { error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err) });
 			continue;
 		}
 	}
@@ -1227,9 +1227,9 @@ async function downloadMSTeamsGraphMedia(params) {
 	} catch (err) {
 		params.logger?.debug?.("graph media token acquisition failed", {
 			messageUrl,
-			error: err instanceof Error ? err.message : String(err)
+			error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err)
 		});
-		params.logger?.warn?.("msteams graph token acquisition failed", { error: err instanceof Error ? err.message : String(err) });
+		params.logger?.warn?.("msteams graph token acquisition failed", { error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err) });
 		return {
 			media: [],
 			messageUrl,
@@ -1260,10 +1260,10 @@ async function downloadMSTeamsGraphMedia(params) {
 				} catch (err) {
 					params.logger?.debug?.("graph media message parse failed", {
 						messageUrl,
-						error: err instanceof Error ? err.message : String(err)
+						error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err)
 					});
 					params.logger?.warn?.("msteams graph message parse failed", {
-						error: err instanceof Error ? err.message : String(err),
+						error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err),
 						messageUrl
 					});
 					msgData = {};
@@ -1275,14 +1275,14 @@ async function downloadMSTeamsGraphMedia(params) {
 				status: messageStatus
 			});
 		} finally {
-			await release();
+			await releaseGraphResponse(msgRes, release);
 		}
 	} catch (err) {
 		params.logger?.debug?.("graph media message fetch failed", {
 			messageUrl,
-			error: err instanceof Error ? err.message : String(err)
+			error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err)
 		});
-		params.logger?.warn?.("msteams graph message fetch failed", { error: err instanceof Error ? err.message : String(err) });
+		params.logger?.warn?.("msteams graph message fetch failed", { error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err) });
 	}
 	for (const att of referenceAttachments) {
 		const name = att.name ?? "file";
@@ -1348,7 +1348,7 @@ async function downloadMSTeamsGraphMedia(params) {
 		} catch (err) {
 			sharePointMedia.push(unavailableMedia);
 			params.logger?.warn?.("msteams SharePoint reference download failed", {
-				error: err instanceof Error ? err.message : String(err),
+				error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err),
 				name
 			});
 		}
@@ -1387,7 +1387,7 @@ async function downloadMSTeamsGraphMedia(params) {
 		});
 	} catch (err) {
 		params.logger?.warn?.("msteams graph attachment download failed", {
-			error: err instanceof Error ? err.message : String(err),
+			error: (0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err),
 			messageUrl
 		});
 	}
@@ -1593,7 +1593,7 @@ async function prepareMSTeamsInboundContent(params) {
 			})
 		});
 	} catch (err) {
-		params.log.debug?.("failed to resolve inbound Teams media", { error: require_setup_surface.formatUnknownError(err) });
+		params.log.debug?.("failed to resolve inbound Teams media", { error: require_channel_setup.formatUnknownError(err) });
 	}
 	const inboundMedia = mergeMSTeamsMediaFacts(params.advertisedMedia, mediaList);
 	const nativeMediaForComparison = [...params.advertisedMedia, ...mediaList.slice(params.advertisedMedia.length).map((media) => ({
@@ -1654,12 +1654,22 @@ function createTeamsReplyStreamController(params) {
 	let emittedText = "";
 	let acknowledgedText = "";
 	let acknowledgedStreamId;
+	let replacementFinalPending = false;
+	let replacementEmitFailed = false;
+	let replacementSettlementPending = false;
+	let replacementTextAwaitingAcknowledgement;
+	let deferredReplacementEntries = [];
+	let finalMetadataQueued = false;
+	let failedSegmentFallbackPrepared = false;
 	const streamEvents = stream?.events;
 	let streamChunkSubscription;
 	if (typeof streamEvents?.on === "function" && typeof streamEvents.off === "function") streamChunkSubscription = streamEvents.on("chunk", (activity) => {
-		if (activity.type !== "typing" || activity.channelData?.streamType !== "streaming" || !activity.id || !activity.text || acknowledgedStreamId !== void 0 && activity.id !== acknowledgedStreamId || !activity.text.startsWith(acknowledgedText) || !emittedText.startsWith(activity.text)) return;
+		const replacementAcknowledgementPending = replacementTextAwaitingAcknowledgement !== void 0;
+		const replacementAcknowledgement = typeof activity.text === "string" && replacementAcknowledgementPending && activity.text === replacementTextAwaitingAcknowledgement;
+		if (activity.type !== "typing" || activity.channelData?.streamType !== "streaming" || !activity.id || !activity.text || acknowledgedStreamId !== void 0 && activity.id !== acknowledgedStreamId || (replacementAcknowledgementPending ? !replacementAcknowledgement : !activity.text.startsWith(acknowledgedText)) || !emittedText.startsWith(activity.text)) return;
 		acknowledgedStreamId = activity.id;
 		acknowledgedText = activity.text;
+		if (activity.text === replacementTextAwaitingAcknowledgement) replacementTextAwaitingAcknowledgement = void 0;
 	});
 	const wasCanceled = () => canceledLocally || Boolean(stream?.canceled);
 	const releaseStreamChunkSubscription = () => {
@@ -1667,6 +1677,14 @@ function createTeamsReplyStreamController(params) {
 		streamEvents?.off(streamChunkSubscription);
 		streamChunkSubscription = void 0;
 	};
+	const acknowledgedNativeDelivery = () => {
+		if (!acknowledgedStreamId || !acknowledgedText) return { visibleReplySent: false };
+		return {
+			visibleReplySent: true,
+			content: acknowledgedText,
+			messageId: acknowledgedStreamId
+		};
+	};
 	const fallbackPayloadAfterAcknowledgedText = (payload) => {
 		if (!acknowledgedText || typeof payload.text !== "string" || !payload.text.startsWith(acknowledgedText)) return payload;
 		const remainingText = payload.text.slice(acknowledgedText.length);
@@ -1684,6 +1702,35 @@ function createTeamsReplyStreamController(params) {
 			mediaUrls: void 0
 		} : payload;
 	};
+	const finalStreamActivity = (text) => ({
+		type: "message",
+		...text ? { text } : {},
+		entities: [{
+			type: "https://schema.org/Message",
+			"@type": "Message",
+			"@context": "https://schema.org",
+			"@id": "",
+			additionalType: ["AIGeneratedContent"]
+		}],
+		channelData: params.feedbackLoopEnabled ? { feedbackLoopEnabled: true } : {}
+	});
+	const deferredReplacementLogicalContent = () => {
+		return deferredReplacementEntries.map((entry) => entry.payload.text).filter((text) => Boolean(text)).join("\n") || void 0;
+	};
+	const takeDeferredReplacementPayloads = (replacementFallback) => {
+		const payloads = deferredReplacementEntries.flatMap((entry) => {
+			if (entry.kind === "payload") return [entry.payload];
+			const hasMedia = Boolean(entry.payload.mediaUrl || entry.payload.mediaUrls?.length);
+			const text = replacementFallback?.text;
+			if (!text && !hasMedia) return [];
+			return [{
+				...entry.payload,
+				text: text || void 0
+			}];
+		});
+		deferredReplacementEntries = [];
+		return payloads;
+	};
 	/**
 	* Render the current informative status line into the streaming card. Pulls
 	* the rotating "Thinking..." label from msteams config (or the plugin-sdk
@@ -1708,14 +1755,19 @@ function createTeamsReplyStreamController(params) {
 				canceledLocally = true;
 				return;
 			}
-			params.log?.debug?.(`stream informative update failed: ${err instanceof Error ? err.message : String(err)}`);
+			params.log?.debug?.(`stream informative update failed: ${(0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err)}`);
 		}
 	};
 	const progressDraftGate = (0, openclaw_plugin_sdk_channel_outbound.createChannelProgressDraftGate)({ onStart: renderInformativeUpdate });
 	return {
 		async onReplyStart() {},
 		onPartialReply(payload) {
-			if (!stream || !payload.text || wasCanceled() || streamMode !== "partial" || streamFinalizationPending) return;
+			if (!stream || !payload.text || wasCanceled() || streamMode !== "partial") return;
+			if (replacementSettlementPending && replacementFinalPending) {
+				pendingFinalPayload = { text: payload.text };
+				return;
+			}
+			if (streamFinalizationPending) return;
 			const fullText = payload.text;
 			let prefixLength = 0;
 			while (prefixLength < emittedText.length && prefixLength < fullText.length && emittedText[prefixLength] === fullText[prefixLength]) prefixLength += 1;
@@ -1724,7 +1776,13 @@ function createTeamsReplyStreamController(params) {
 			if (!delta) return;
 			if (previousRemainder.trim()) {
 				stream.clearText();
-				streamFailed = true;
+				if (streamFailed) {
+					streamFinalizationPending = true;
+					return;
+				}
+				replacementFinalPending = true;
+				replacementSettlementPending = true;
+				pendingFinalPayload = { text: fullText };
 				streamFinalizationPending = true;
 				return;
 			}
@@ -1739,7 +1797,7 @@ function createTeamsReplyStreamController(params) {
 					return;
 				}
 				streamFailed = true;
-				params.log?.warn?.(`msteams stream emit failed, falling back to block delivery: ${err instanceof Error ? err.message : String(err)}`);
+				params.log?.warn?.(`msteams stream emit failed, falling back to block delivery: ${(0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err)}`);
 			}
 		},
 		/**
@@ -1781,6 +1839,49 @@ function createTeamsReplyStreamController(params) {
 		preparePayload(payload) {
 			if (!stream) return payload;
 			if (wasCanceled()) return;
+			if (replacementSettlementPending) {
+				if (!replacementFinalPending) {
+					deferredReplacementEntries.push({
+						kind: "payload",
+						payload
+					});
+					return;
+				}
+				if (!payload.text) {
+					deferredReplacementEntries.push({
+						kind: "payload",
+						payload
+					});
+					return;
+				}
+				replacementFinalPending = false;
+				deferredReplacementEntries.push({
+					kind: "replacement",
+					payload
+				});
+				pendingFinalPayload = fallbackPayloadForSuppressedFinal(payload);
+				try {
+					replacementTextAwaitingAcknowledgement = payload.text;
+					stream.emit(finalStreamActivity(payload.text));
+					finalMetadataQueued = true;
+					emittedText = payload.text;
+					tokensEmitted = false;
+					return;
+				} catch (err) {
+					replacementTextAwaitingAcknowledgement = void 0;
+					tokensEmitted = false;
+					if (isStreamCancelledError(err)) {
+						canceledLocally = true;
+						pendingFinalPayload = void 0;
+						deferredReplacementEntries = [];
+						return;
+					}
+					streamFailed = true;
+					replacementEmitFailed = true;
+					params.log?.warn?.(`msteams stream replacement failed, falling back to block delivery: ${(0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err)}`);
+					return;
+				}
+			}
 			if (tokensEmitted && !streamFailed) {
 				const hasMedia = Boolean(payload.mediaUrl || payload.mediaUrls?.length);
 				pendingFinalPayload = fallbackPayloadForSuppressedFinal(payload);
@@ -1792,11 +1893,9 @@ function createTeamsReplyStreamController(params) {
 				} : void 0;
 			}
 			if (streamFailed) {
-				const fallback = fallbackPayloadAfterAcknowledgedText(payload);
+				const fallback = failedSegmentFallbackPrepared ? payload : fallbackPayloadAfterAcknowledgedText(payload);
+				failedSegmentFallbackPrepared = true;
 				pendingFinalPayload = void 0;
-				acknowledgedText = "";
-				acknowledgedStreamId = void 0;
-				releaseStreamChunkSubscription();
 				return fallback;
 			}
 			if (streamMode === "progress" && payload.text) try {
@@ -1813,7 +1912,7 @@ function createTeamsReplyStreamController(params) {
 					canceledLocally = true;
 					return;
 				}
-				params.log?.debug?.(`progress-mode finalize failed: ${err instanceof Error ? err.message : String(err)}`);
+				params.log?.debug?.(`progress-mode finalize failed: ${(0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err)}`);
 			}
 			return payload;
 		},
@@ -1828,74 +1927,88 @@ function createTeamsReplyStreamController(params) {
 				releaseStreamChunkSubscription();
 				return { visibleReplySent: false };
 			}
-			const content = wasCanceled() ? acknowledgedText || void 0 : pendingFinalPayload?.text ?? (emittedText || void 0);
+			let logicalContent;
 			try {
 				if (wasCanceled()) {
 					pendingFinalPayload = void 0;
+					deferredReplacementEntries = [];
 					streamFinalizationPending = false;
-					return {
-						visibleReplySent: content !== void 0,
-						...content === void 0 ? {} : { content }
-					};
+					return acknowledgedNativeDelivery();
 				}
-				if (!streamFinalizationPending) return {
-					visibleReplySent: true,
-					...content === void 0 ? {} : { content }
-				};
-				const finalEntities = [{
-					type: "https://schema.org/Message",
-					"@type": "Message",
-					"@context": "https://schema.org",
-					"@id": "",
-					additionalType: ["AIGeneratedContent"]
-				}];
-				const finalChannelData = params.feedbackLoopEnabled ? { feedbackLoopEnabled: true } : {};
-				stream.emit({
-					type: "message",
-					entities: finalEntities,
-					channelData: finalChannelData
-				});
+				if (!streamFinalizationPending) return acknowledgedNativeDelivery();
+				if (replacementSettlementPending && replacementFinalPending && pendingFinalPayload?.text) {
+					replacementFinalPending = false;
+					deferredReplacementEntries.push({
+						kind: "replacement",
+						payload: pendingFinalPayload
+					});
+					replacementTextAwaitingAcknowledgement = pendingFinalPayload.text;
+					logicalContent = deferredReplacementLogicalContent();
+					stream.emit(finalStreamActivity(pendingFinalPayload.text));
+					finalMetadataQueued = true;
+					emittedText = pendingFinalPayload.text;
+				}
+				logicalContent ??= replacementSettlementPending ? deferredReplacementLogicalContent() : void 0;
+				const content = pendingFinalPayload?.text ?? (emittedText || void 0);
+				if (!finalMetadataQueued) stream.emit(finalStreamActivity());
 				const result = await stream.close();
 				streamFinalizationPending = false;
 				if (!result) {
 					const fallback = pendingFinalPayload;
 					pendingFinalPayload = void 0;
-					const fallbackPayload = fallback && !wasCanceled() ? fallbackPayloadAfterAcknowledgedText(fallback) : void 0;
+					const canceled = wasCanceled();
+					const replacementFallback = replacementSettlementPending && fallback && !canceled ? fallbackPayloadAfterAcknowledgedText(fallback) : void 0;
+					const fallbackPayload = !replacementSettlementPending && fallback && !canceled ? fallbackPayloadAfterAcknowledgedText(fallback) : void 0;
+					const postNativePayloads = replacementSettlementPending && !canceled ? takeDeferredReplacementPayloads(replacementFallback) : [];
+					if (canceled) deferredReplacementEntries = [];
 					return {
-						visibleReplySent: true,
-						...content === void 0 ? {} : { content },
-						...fallbackPayload ? { fallbackPayload } : {}
+						...acknowledgedNativeDelivery(),
+						...!canceled && logicalContent ? { logicalContent } : {},
+						...fallbackPayload ? { fallbackPayload } : {},
+						...postNativePayloads.length > 0 ? { postNativePayloads } : {}
 					};
 				}
+				const replacementFallback = replacementSettlementPending && replacementEmitFailed && pendingFinalPayload ? fallbackPayloadAfterAcknowledgedText(pendingFinalPayload) : void 0;
 				pendingFinalPayload = void 0;
-				const messageId = require_messenger.extractMessageId(result) ?? void 0;
+				const messageId = require_messenger.extractMessageId(result) ?? acknowledgedStreamId;
+				const postNativePayloads = replacementSettlementPending ? takeDeferredReplacementPayloads(replacementFallback) : [];
+				const nativeContent = replacementEmitFailed ? acknowledgedText || void 0 : content;
 				return {
-					visibleReplySent: true,
-					...content === void 0 ? {} : { content },
-					...messageId ? { messageId } : {}
+					visibleReplySent: replacementEmitFailed ? Boolean(nativeContent) : true,
+					...nativeContent === void 0 ? {} : { content: nativeContent },
+					...logicalContent ? { logicalContent } : {},
+					...messageId && (!replacementEmitFailed || nativeContent) ? { messageId } : {},
+					...postNativePayloads.length > 0 ? { postNativePayloads } : {}
 				};
 			} catch (err) {
 				if (isStreamCancelledError(err)) {
 					canceledLocally = true;
 					pendingFinalPayload = void 0;
+					deferredReplacementEntries = [];
 					streamFinalizationPending = false;
-					return {
-						visibleReplySent: true,
-						...content === void 0 ? {} : { content }
-					};
+					return acknowledgedNativeDelivery();
 				}
 				streamFailed = true;
 				streamFinalizationPending = false;
-				params.log?.warn?.(`msteams stream finalize failed: ${err instanceof Error ? err.message : String(err)}`);
+				params.log?.warn?.(`msteams stream finalize failed: ${(0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err)}`);
 				const fallback = pendingFinalPayload;
 				pendingFinalPayload = void 0;
-				const fallbackPayload = fallback ? fallbackPayloadAfterAcknowledgedText(fallback) : void 0;
+				const replacementFallback = replacementSettlementPending && fallback ? fallbackPayloadAfterAcknowledgedText(fallback) : void 0;
+				const fallbackPayload = !replacementSettlementPending && fallback ? fallbackPayloadAfterAcknowledgedText(fallback) : void 0;
+				const postNativePayloads = replacementSettlementPending ? takeDeferredReplacementPayloads(replacementFallback) : [];
 				return {
-					visibleReplySent: true,
-					...content === void 0 ? {} : { content },
-					...fallbackPayload ? { fallbackPayload } : {}
+					...acknowledgedNativeDelivery(),
+					...logicalContent ? { logicalContent } : {},
+					...fallbackPayload ? { fallbackPayload } : {},
+					...postNativePayloads.length > 0 ? { postNativePayloads } : {}
 				};
 			} finally {
+				finalMetadataQueued = false;
+				replacementEmitFailed = false;
+				replacementFinalPending = false;
+				replacementSettlementPending = false;
+				replacementTextAwaitingAcknowledgement = void 0;
+				deferredReplacementEntries = [];
 				releaseStreamChunkSubscription();
 			}
 		},
@@ -1998,6 +2111,7 @@ function createMSTeamsReplyDispatcher(params) {
 	const blockStreamingEnabled = blockStreamingResolved ?? false;
 	const typingIndicatorEnabled = typeof msteamsCfg?.typingIndicator === "boolean" ? msteamsCfg.typingIndicator : true;
 	const pendingDeliveries = [];
+	const joinAcceptedContents = (contents) => contents.filter((content) => Boolean(content)).join("\n");
 	const sendMessages = async (messages) => {
 		return require_messenger.sendMSTeamsMessages({
 			replyStyle: params.replyStyle,
@@ -2021,15 +2135,16 @@ function createMSTeamsReplyDispatcher(params) {
 		});
 	};
 	const queueDeliveryFailureSystemEvent = (failure) => {
-		const classification = require_setup_surface.classifyMSTeamsSendError(failure.error);
-		const errorText = require_setup_surface.formatUnknownError(failure.error);
+		const classification = require_channel_setup.classifyMSTeamsSendError(failure.error);
+		const errorText = require_channel_setup.formatUnknownError(failure.error);
 		const failedAll = failure.failed >= failure.total;
+		const ambiguous = classification.kind === "ambiguous";
 		const sentences = [
-			`Microsoft Teams delivery failed: ${failedAll ? "the previous reply was not delivered" : `${failure.failed} of ${failure.total} message blocks were not delivered`}.`,
-			`The user may not have received ${failedAll ? "that reply" : "the full reply"}.`,
+			`Microsoft Teams delivery failed: ${ambiguous ? failedAll ? "the delivery outcome is unknown for the previous reply" : `the delivery outcome is unknown for ${failure.failed} of ${failure.total} message blocks` : failedAll ? "the previous reply was not delivered" : `${failure.failed} of ${failure.total} message blocks were not delivered`}.`,
+			ambiguous ? void 0 : `The user may not have received ${failedAll ? "that reply" : "the full reply"}.`,
 			`Error: ${errorText}.`,
 			classification.statusCode != null ? `Status: ${classification.statusCode}.` : void 0,
-			classification.kind === "transient" || classification.kind === "throttled" ? "Retrying later may succeed." : void 0
+			require_channel_setup.formatMSTeamsDeliveryFailureGuidance(classification)
 		].filter(Boolean);
 		core.system.enqueueSystemEvent(sentences.join(" "), {
 			sessionKey: params.sessionKey,
@@ -2046,11 +2161,13 @@ function createMSTeamsReplyDispatcher(params) {
 		});
 	};
 	const deliveryOutcome = (delivery) => {
-		const messageIds = [...delivery.nativeMessageId ? [delivery.nativeMessageId] : [], ...delivery.messageIds];
+		const acceptedParts = [...delivery.nativeResult ? [delivery.nativeResult] : [], ...delivery.blockResults];
+		const messageIds = acceptedParts.flatMap((part) => part.messageIds);
+		const content = delivery.errors.length > 0 ? joinAcceptedContents(acceptedParts.map((part) => part.content)) : delivery.content;
 		return {
-			visibleReplySent: delivery.visibleReplySent,
+			visibleReplySent: acceptedParts.length > 0,
 			...messageIds.length > 0 ? { messageIds } : {},
-			...delivery.visibleReplySent && delivery.content !== void 0 ? { content: delivery.content } : {}
+			...acceptedParts.length > 0 && content !== void 0 ? { content } : {}
 		};
 	};
 	const settlePendingDelivery = (delivery) => {
@@ -2062,7 +2179,7 @@ function createMSTeamsReplyDispatcher(params) {
 			return;
 		}
 		const error = delivery.errors.find((candidate) => !(candidate instanceof openclaw_plugin_sdk_error_runtime.PlatformMessageNotDispatchedError)) ?? delivery.errors[0];
-		delivery.finalization.reject(delivery.visibleReplySent ? (0, openclaw_plugin_sdk_channel_inbound.createChannelPartialDeliveryError)(error, {
+		delivery.finalization.reject(outcome.visibleReplySent ? (0, openclaw_plugin_sdk_channel_inbound.createChannelPartialDeliveryError)(error, {
 			...outcome,
 			visibleReplySent: true
 		}) : error);
@@ -2072,12 +2189,11 @@ function createMSTeamsReplyDispatcher(params) {
 			messages,
 			finalization: (0, openclaw_plugin_sdk_extension_shared.createDeferred)(),
 			content: payload.text,
+			blockResults: [],
 			native,
 			nativeSettled: !native,
 			blockSettled: messages.length === 0,
 			settled: false,
-			visibleReplySent: false,
-			messageIds: [],
 			errors: []
 		};
 		pendingDeliveries.push(delivery);
@@ -2093,9 +2209,11 @@ function createMSTeamsReplyDispatcher(params) {
 			const sentIds = [];
 			for (const msg of toSend) try {
 				const msgIds = await sendMessages([msg]);
-				delivery.visibleReplySent ||= msgIds.length > 0;
 				const validIds = msgIds.filter((id) => id.trim() && id !== "unknown");
-				delivery.messageIds.push(...validIds);
+				if (msgIds.length > 0) delivery.blockResults.push({
+					messageIds: validIds,
+					...msg.text ? { content: msg.text } : {}
+				});
 				sentIds.push(...validIds);
 			} catch (msgError) {
 				failed += 1;
@@ -2119,7 +2237,7 @@ function createMSTeamsReplyDispatcher(params) {
 			if (sentIds.length > 0) try {
 				params.onSentMessageIds?.(sentIds);
 			} catch (error) {
-				params.log.warn?.("failed to record sent Teams message ids", { error: require_setup_surface.formatUnknownError(error) });
+				params.log.warn?.("failed to record sent Teams message ids", { error: require_channel_setup.formatUnknownError(error) });
 			}
 		}
 	};
@@ -2151,9 +2269,9 @@ function createMSTeamsReplyDispatcher(params) {
 			};
 		},
 		onError: (err, info) => {
-			const errMsg = require_setup_surface.formatUnknownError(err);
-			const classification = require_setup_surface.classifyMSTeamsSendError(err);
-			const hint = require_setup_surface.formatMSTeamsSendErrorHint(classification);
+			const errMsg = require_channel_setup.formatUnknownError(err);
+			const classification = require_channel_setup.classifyMSTeamsSendError(err);
+			const hint = require_channel_setup.formatMSTeamsSendErrorHint(classification);
 			params.runtime.error?.(`msteams ${info.kind} reply failed: ${errMsg}${hint ? ` (${hint})` : ""}`);
 			params.log.error("reply failed", {
 				kind: info.kind,
@@ -2179,11 +2297,16 @@ function createMSTeamsReplyDispatcher(params) {
 			settlePendingDelivery(nativeDelivery);
 			return;
 		}
-		nativeDelivery.visibleReplySent ||= nativeResult.visibleReplySent;
-		nativeDelivery.nativeMessageId = nativeResult.messageId;
-		if (nativeResult.content !== void 0) nativeDelivery.content = nativeResult.content;
-		if (nativeResult.fallbackPayload) {
-			nativeDelivery.messages.push(...renderReplyPayload(nativeResult.fallbackPayload));
+		if (nativeResult.visibleReplySent) nativeDelivery.nativeResult = {
+			messageIds: nativeResult.messageId ? [nativeResult.messageId] : [],
+			...nativeResult.content !== void 0 ? { content: nativeResult.content } : {}
+		};
+		const hasPostNativePayloads = Boolean(nativeResult.postNativePayloads?.length);
+		if (nativeResult.logicalContent !== void 0) nativeDelivery.content = nativeResult.logicalContent;
+		else if (nativeResult.content !== void 0 && (!nativeResult.fallbackPayload && !hasPostNativePayloads || nativeDelivery.content === void 0)) nativeDelivery.content = nativeResult.content;
+		const afterNativePayloads = [...nativeResult.fallbackPayload ? [nativeResult.fallbackPayload] : [], ...nativeResult.postNativePayloads ?? []];
+		if (afterNativePayloads.length > 0) {
+			nativeDelivery.messages.push(...afterNativePayloads.flatMap((payload) => renderReplyPayload(payload)));
 			nativeDelivery.blockSettled = nativeDelivery.messages.length === 0;
 		}
 		nativeDelivery.nativeSettled = true;
@@ -2192,7 +2315,7 @@ function createMSTeamsReplyDispatcher(params) {
 		if (nativeResult.messageId) try {
 			params.onSentMessageIds?.([nativeResult.messageId]);
 		} catch (error) {
-			params.log.warn?.("failed to record sent Teams message id", { error: require_setup_surface.formatUnknownError(error) });
+			params.log.warn?.("failed to record sent Teams message id", { error: require_channel_setup.formatUnknownError(error) });
 		}
 	};
 	const previewToolProgressEnabled = (0, openclaw_plugin_sdk_channel_outbound.resolveChannelStreamingPreviewToolProgress)(msteamsCfg, true, teamsStreamMode);
@@ -2201,10 +2324,10 @@ function createMSTeamsReplyDispatcher(params) {
 	const progressCallbacks = streamController.hasStream() ? {
 		onReasoningStream: async (payload) => {
 			const text = typeof payload?.text === "string" ? payload.text : void 0;
-			if (!text) return;
+			if (!text) return false;
 			if (payload?.isReasoningSnapshot !== true) {
 				await streamController.pushProgressLine(text);
-				return;
+				return false;
 			}
 			await streamController.pushProgressLine((0, openclaw_plugin_sdk_channel_outbound.buildChannelProgressDraftLine)({
 				event: "item",
@@ -2213,6 +2336,7 @@ function createMSTeamsReplyDispatcher(params) {
 				title: "Reasoning",
 				progressText: text
 			}));
+			return false;
 		},
 		onToolStart: async (payload) => {
 			const name = typeof payload?.name === "string" ? payload.name : void 0;
@@ -2225,6 +2349,7 @@ function createMSTeamsReplyDispatcher(params) {
 				...typeof payload?.phase === "string" ? { phase: payload.phase } : {},
 				...payload?.args && typeof payload.args === "object" ? { args: payload.args } : {}
 			}, detailMode === "explain" || detailMode === "raw" ? { detailMode } : void 0), name ? { toolName: name } : void 0);
+			return false;
 		},
 		onItemEvent: async (payload) => {
 			await streamController.pushProgressLine((0, openclaw_plugin_sdk_channel_outbound.buildChannelProgressDraftLineForEntry)(msteamsCfg, {
@@ -2240,13 +2365,15 @@ function createMSTeamsReplyDispatcher(params) {
 				...typeof payload?.progressText === "string" ? { progressText: payload.progressText } : {},
 				...typeof payload?.meta === "string" ? { meta: payload.meta } : {}
 			}));
+			return false;
 		},
 		onPlanUpdate: async (payload) => {
-			if (payload?.phase !== "update") return;
+			if (payload?.phase !== "update") return false;
 			await streamController.pushPlanProgress((0, openclaw_plugin_sdk_channel_outbound.normalizeAgentPlanSteps)(payload.steps), { explanation: typeof payload.explanation === "string" ? payload.explanation : void 0 });
+			return false;
 		},
 		onApprovalEvent: async (payload) => {
-			if (payload?.phase !== "requested") return;
+			if (payload?.phase !== "requested") return false;
 			await streamController.pushProgressLine((0, openclaw_plugin_sdk_channel_outbound.buildChannelProgressDraftLine)({
 				event: "approval",
 				phase: payload.phase,
@@ -2255,10 +2382,11 @@ function createMSTeamsReplyDispatcher(params) {
 				...typeof payload?.reason === "string" ? { reason: payload.reason } : {},
 				...typeof payload?.message === "string" ? { message: payload.message } : {}
 			}));
+			return false;
 		},
 		onCommandOutput: async (payload) => {
-			if (payload?.phase !== "end") return;
-			await streamController.pushProgressLine((0, openclaw_plugin_sdk_channel_outbound.buildChannelProgressDraftLine)({
+			if (payload?.phase !== "end") return false;
+			await streamController.pushProgressLine((0, openclaw_plugin_sdk_channel_outbound.buildChannelProgressDraftLineForEntry)(msteamsCfg, {
 				event: "command-output",
 				...typeof payload?.itemId === "string" ? { itemId: payload.itemId } : {},
 				...typeof payload?.toolCallId === "string" ? { toolCallId: payload.toolCallId } : {},
@@ -2268,9 +2396,10 @@ function createMSTeamsReplyDispatcher(params) {
 				...typeof payload?.status === "string" ? { status: payload.status } : {},
 				...typeof payload?.exitCode === "number" ? { exitCode: payload.exitCode } : {}
 			}));
+			return false;
 		},
 		onPatchSummary: async (payload) => {
-			if (payload?.phase !== "end") return;
+			if (payload?.phase !== "end") return false;
 			await streamController.pushProgressLine((0, openclaw_plugin_sdk_channel_outbound.buildChannelProgressDraftLine)({
 				event: "patch",
 				...typeof payload?.itemId === "string" ? { itemId: payload.itemId } : {},
@@ -2283,6 +2412,7 @@ function createMSTeamsReplyDispatcher(params) {
 				...Array.isArray(payload?.deleted) && payload.deleted.every((s) => typeof s === "string") ? { deleted: payload.deleted } : {},
 				...typeof payload?.summary === "string" ? { summary: payload.summary } : {}
 			}));
+			return false;
 		}
 	} : {};
 	return {
@@ -2292,7 +2422,10 @@ function createMSTeamsReplyDispatcher(params) {
 		},
 		delivery,
 		replyOptions: {
-			...streamController.hasStream() ? { onPartialReply: (payload) => streamController.onPartialReply(payload) } : {},
+			...streamController.hasStream() ? { onPartialReply: (payload) => {
+				streamController.onPartialReply(payload);
+				return false;
+			} } : {},
 			...progressCallbacks,
 			...shouldSuppressDefaultToolProgressMessages ? { suppressDefaultToolProgressMessages: true } : {},
 			disableBlockStreaming: blockStreamingResolved == null ? void 0 : !blockStreamingResolved,
@@ -2310,14 +2443,7 @@ const sentMessages = (0, openclaw_plugin_sdk_dedupe_runtime.createPersistentDedu
 		namespace: "msteams.sent-messages",
 		maxEntries: 1e3,
 		openStore: (options) => require_runtime.getOptionalMSTeamsRuntime()?.state.openKeyedStore(options),
-		logError: (error) => {
-			try {
-				require_runtime.getOptionalMSTeamsRuntime()?.logging.getChildLogger({
-					plugin: "msteams",
-					feature: "sent-message-state"
-				}).warn("Microsoft Teams persistent sent-message state failed", { error: String(error) });
-			} catch {}
-		},
+		logError: (0, openclaw_plugin_sdk_plugin_state_runtime.createPluginStateErrorReporter)(require_runtime.getOptionalMSTeamsRuntime, "msteams", "sent-message-state", "Microsoft Teams persistent sent-message state failed"),
 		readTimestamp: (record) => record.sentAt
 	}
 });
@@ -2389,7 +2515,21 @@ async function dispatchMSTeamsInboundTurn(params) {
 	}) : true;
 	const bodyForAgent = threadContext ? `[Thread history]\n${threadContext}\n[/Thread history]\n\n${agentBody}` : agentBody;
 	const nativeChannelId = isChannel && teamAadGroupId ? `${teamAadGroupId}/${graphChannelId}` : void 0;
-	const ctxPayload = (0, openclaw_plugin_sdk_channel_inbound.buildChannelInboundEventContext)({
+	const boundIngress = await resolveMSTeamsSenderAccess({
+		cfg,
+		activity,
+		hasControlCommand: admission.isControlCommand,
+		conversationThreadId: facts.threadId,
+		contextBinding: {
+			agentId: route.agentId,
+			sessionKey: route.sessionKey,
+			...activity.id ? { messageId: activity.id } : {},
+			...nativeChannelId ? { nativeChannelId } : {},
+			inboundEventKind: "user_request"
+		}
+	});
+	const ctxPayload = core.channel.inbound.buildContext({
+		channelIngress: boundIngress.channelIngress,
 		channel: "msteams",
 		contextVisibility: contextVisibilityMode,
 		supplemental: { quote: quoteInfo ? {
@@ -2422,6 +2562,8 @@ async function dispatchMSTeamsInboundTurn(params) {
 		},
 		reply: {
 			to: teamsTo,
+			originatingTo: `conversation:${conversationId}`,
+			messageThreadId: facts.threadId ?? void 0,
 			replyToId: activity.replyToId ?? void 0,
 			nativeChannelId
 		},
@@ -2502,7 +2644,7 @@ async function dispatchMSTeamsInboundTurn(params) {
 					},
 					ctxPayload,
 					record: { onRecordError: (err) => {
-						logVerboseMessage(`msteams: failed updating session meta: ${require_setup_surface.formatUnknownError(err)}`);
+						logVerboseMessage(`msteams: failed updating session meta: ${require_channel_setup.formatUnknownError(err)}`);
 					} },
 					history: {
 						isGroup: isRoomish,
@@ -2521,18 +2663,15 @@ async function dispatchMSTeamsInboundTurn(params) {
 		});
 		const dispatchResult = turnResult.dispatched ? turnResult.dispatchResult : void 0;
 		const counts = (0, openclaw_plugin_sdk_channel_inbound.resolveInboundReplyDispatchCounts)(dispatchResult);
-		log.info("dispatch complete", {
-			queuedFinal: dispatchResult?.queuedFinal ?? false,
-			counts
-		});
+		log.info("dispatch complete", { counts });
 		if ((0, openclaw_plugin_sdk_channel_inbound.hasFinalInboundReplyDispatch)(dispatchResult)) logVerboseMessage(`msteams: delivered ${counts.final} repl${counts.final === 1 ? "y" : "ies"} to ${teamsTo}`);
 		return {
 			kind: "completed",
 			finalResponses: counts.final
 		};
 	} catch (err) {
-		log.error("dispatch failed", { error: require_setup_surface.formatUnknownError(err) });
-		runtime.error(`msteams dispatch failed: ${require_setup_surface.formatUnknownError(err)}`);
+		log.error("dispatch failed", { error: require_channel_setup.formatUnknownError(err) });
+		runtime.error(`msteams dispatch failed: ${require_channel_setup.formatUnknownError(err)}`);
 		if (facts.turnAdoptionLifecycle) throw err;
 		try {
 			await context.sendActivity("⚠️ Something went wrong. Please try again.");
@@ -2797,7 +2936,7 @@ function prepareMSTeamsThreadRouting(params) {
 		}).catch((err) => {
 			params.log.debug?.("failed to resolve Teams AAD group ID", {
 				teamId: conversationTeamId,
-				error: require_setup_surface.formatUnknownError(err)
+				error: require_channel_setup.formatUnknownError(err)
 			});
 		});
 		teamAadGroupId = await teamGroupIdPromise;
@@ -2831,7 +2970,7 @@ async function resolveMSTeamsThreadContext(params) {
 			work: () => require_messenger.fetchChatMessageText(graphToken, params.conversationId, quoteMessageId, deadline)
 		});
 	} catch (err) {
-		params.log.debug?.("failed to fetch full quoted message text", { error: require_setup_surface.formatUnknownError(err) });
+		params.log.debug?.("failed to fetch full quoted message text", { error: require_channel_setup.formatUnknownError(err) });
 	}
 	let threadContext;
 	const threadParentId = activity.replyToId;
@@ -2848,8 +2987,8 @@ async function resolveMSTeamsThreadContext(params) {
 		});
 		const parentMsg = parentResult.status === "fulfilled" ? parentResult.value : void 0;
 		const replies = repliesResult.status === "fulfilled" ? repliesResult.value : [];
-		if (parentResult.status === "rejected") params.log.debug?.("failed to fetch parent message", { error: require_setup_surface.formatUnknownError(parentResult.reason) });
-		if (repliesResult.status === "rejected") params.log.debug?.("failed to fetch thread replies", { error: require_setup_surface.formatUnknownError(repliesResult.reason) });
+		if (parentResult.status === "rejected") params.log.debug?.("failed to fetch parent message", { error: require_channel_setup.formatUnknownError(parentResult.reason) });
+		if (repliesResult.status === "rejected") params.log.debug?.("failed to fetch thread replies", { error: require_channel_setup.formatUnknownError(repliesResult.reason) });
 		const isThreadSenderAllowed = (message) => (0, openclaw_plugin_sdk_channel_inbound.resolveInboundSupplementalSenderAllowed)({
 			isGroup: params.isChannel,
 			groupPolicy: params.groupPolicy,
@@ -2886,7 +3025,7 @@ async function resolveMSTeamsThreadContext(params) {
 		});
 		threadContext = require_messenger.formatThreadContext(threadMessages, activity.id) || void 0;
 	} catch (err) {
-		params.log.debug?.("failed to fetch thread history", { error: require_setup_surface.formatUnknownError(err) });
+		params.log.debug?.("failed to fetch thread history", { error: require_channel_setup.formatUnknownError(err) });
 	}
 	quoteSenderName ??= params.quoteInfo?.sender;
 	return {
@@ -2965,7 +3104,7 @@ function createMSTeamsMessageHandler(deps) {
 			} catch (err) {
 				log.error("failed to record poll vote", {
 					pollId: pollVote.pollId,
-					error: require_setup_surface.formatUnknownError(err)
+					error: require_channel_setup.formatUnknownError(err)
 				});
 			}
 			return;
@@ -3142,7 +3281,7 @@ function createMSTeamsMessageHandler(deps) {
 			});
 		},
 		onError: (err) => {
-			runtime.error(`msteams debounce flush failed: ${require_setup_surface.formatUnknownError(err)}`);
+			runtime.error(`msteams debounce flush failed: ${require_channel_setup.formatUnknownError(err)}`);
 		}
 	});
 	return async function handleTeamsMessage(context, turnAdoptionLifecycle) {
@@ -3166,7 +3305,8 @@ function createMSTeamsReactionHandler(deps) {
 	const msteamsCfg = cfg.channels?.msteams;
 	return async function handleReaction(context, direction) {
 		const activity = context.activity;
-		const reactions = direction === "added" ? activity.reactionsAdded ?? [] : activity.reactionsRemoved ?? [];
+		const rawReactions = direction === "added" ? activity.reactionsAdded : activity.reactionsRemoved;
+		const reactions = Array.isArray(rawReactions) ? rawReactions : [];
 		if (reactions.length === 0) {
 			log.debug?.("reaction activity has no reactions; skipping");
 			return;
@@ -3376,7 +3516,7 @@ function registerMSTeamsHandlers(handler, deps) {
 			return result;
 		} catch (err) {
 			if (turnAdoptionLifecycle) throw err;
-			deps.runtime.error(`msteams handler failed: ${require_setup_surface.formatUnknownError(err)}`);
+			deps.runtime.error(`msteams handler failed: ${require_channel_setup.formatUnknownError(err)}`);
 		}
 		if (!nextRan) await runNext();
 	});
@@ -3402,7 +3542,7 @@ function registerMSTeamsHandlers(handler, deps) {
 					});
 					deps.log.info("sent welcome card");
 				} catch (err) {
-					deps.log.debug?.("failed to send welcome card", { error: require_setup_surface.formatUnknownError(err) });
+					deps.log.debug?.("failed to send welcome card", { error: require_channel_setup.formatUnknownError(err) });
 				}
 			} else if (!isPersonal && msteamsCfg?.groupWelcomeCard === true) {
 				const botName = ctx.activity?.recipient?.name ?? void 0;
@@ -3410,7 +3550,7 @@ function registerMSTeamsHandlers(handler, deps) {
 					await ctx.sendActivity(buildGroupWelcomeText(botName));
 					deps.log.info("sent group welcome message");
 				} catch (err) {
-					deps.log.debug?.("failed to send group welcome", { error: require_setup_surface.formatUnknownError(err) });
+					deps.log.debug?.("failed to send group welcome", { error: require_channel_setup.formatUnknownError(err) });
 				}
 			} else deps.log.debug?.("skipping welcome (disabled by config or conversation type)");
 		} else deps.log.debug?.("member added", { member: member.id });
@@ -3546,7 +3686,7 @@ async function runMSTeamsFeedbackInvokeHandler(context, deps) {
 		userComment,
 		log: deps.log
 	}).catch((err) => {
-		deps.log.error("feedback reflection failed", { error: require_setup_surface.formatUnknownError(err) });
+		deps.log.error("feedback reflection failed", { error: require_channel_setup.formatUnknownError(err) });
 	});
 	return true;
 }
@@ -3623,7 +3763,7 @@ async function handleMSTeamsFileConsentInvoke(context, log) {
 		} catch (err) {
 			log.error("file upload failed", {
 				uploadId,
-				error: require_setup_surface.formatUnknownError(err)
+				error: require_channel_setup.formatUnknownError(err)
 			});
 			await context.sendActivity("File upload failed. Please try again.");
 		} finally {
@@ -3656,10 +3796,28 @@ async function runMSTeamsFileConsentInvokeHandler(context, log) {
 			}
 		});
 	} catch (err) {
-		log.debug?.("file consent handler error", { error: require_setup_surface.formatUnknownError(err) });
+		log.debug?.("file consent handler error", { error: require_channel_setup.formatUnknownError(err) });
 	}
 }
 //#endregion
+//#region extensions/msteams/src/monitor-status.ts
+function publishMSTeamsBlocked(statusSink, lastError) {
+	statusSink?.((0, openclaw_plugin_sdk_gateway_runtime.channelBlockedPatch)(lastError, { running: true }));
+}
+function publishMSTeamsReady(statusSink, now = Date.now()) {
+	statusSink?.((0, openclaw_plugin_sdk_gateway_runtime.channelReadyPatch)({ lastConnectedAt: now }));
+}
+function publishMSTeamsRecovering(statusSink, lastError) {
+	statusSink?.({
+		connected: false,
+		lifecycle: "recovering",
+		lastError
+	});
+}
+function publishMSTeamsStopped(statusSink) {
+	statusSink?.((0, openclaw_plugin_sdk_gateway_runtime.channelStoppedPatch)());
+}
+//#endregion
 //#region extensions/msteams/src/msteams-ingress.ts
 const MSTEAMS_INGRESS_VERSION = 1;
 const MSTEAMS_INGRESS_DRAIN_INTERVAL_MS = 500;
@@ -3695,9 +3853,6 @@ function parseClaimedActivity(payload, claimedId) {
 	if (facts.eventId !== claimedId) throw new MSTeamsIngressPayloadError("invalid-activity", "Microsoft Teams activity id changed after durable admission.");
 	return parsed;
 }
-function errorText(error) {
-	return error instanceof Error ? error.message : String(error);
-}
 function createMSTeamsIngress(options) {
 	const queue = options.queue ?? require_runtime.getMSTeamsRuntime().state.openChannelIngressQueue({ accountId: options.accountId });
 	const liveContexts = /* @__PURE__ */ new Map();
@@ -3746,15 +3901,15 @@ function createMSTeamsIngress(options) {
 					reason: error.reason,
 					message: error.message
 				};
-				return require_setup_surface.classifyMSTeamsSendError(error).kind === "auth" ? {
+				return require_channel_setup.classifyMSTeamsSendError(error).kind === "auth" ? {
 					reason: "authentication-failed",
-					message: errorText(error)
+					message: (0, openclaw_plugin_sdk_error_runtime.formatErrorMessage)(error)
 				} : null;
 			},
 			onLog: (message) => options.runtime.error?.(`msteams: ${message}`)
 		},
 		createStoppedError: () => /* @__PURE__ */ new Error("Microsoft Teams ingress stopped."),
-		onError: (error) => options.runtime.error?.(`msteams ingress drain failed: ${errorText(error)}`)
+		onError: (error) => options.runtime.error?.(`msteams ingress drain failed: ${(0, openclaw_plugin_sdk_error_runtime.formatErrorMessage)(error)}`)
 	});
 	let stopTask;
 	return {
@@ -3799,6 +3954,54 @@ function createMSTeamsIngress(options) {
 	};
 }
 //#endregion
+//#region extensions/msteams/src/replay-context.ts
+function createMSTeamsReplayContext(activity, app, serviceUrlBoundary) {
+	const rawConversationId = activity.conversation?.id ?? "";
+	const conversationId = require_resolve_allowlist.normalizeMSTeamsConversationId(rawConversationId);
+	const conversationType = activity.conversation?.conversationType ?? "personal";
+	const normalizedConversationType = conversationType.toLowerCase();
+	const threadActivityId = normalizedConversationType === "channel" ? require_resolve_allowlist.extractMSTeamsConversationMessageId(rawConversationId) ?? activity.replyToId : void 0;
+	const quoteActivityId = normalizedConversationType === "channel" || normalizedConversationType === "groupchat" ? activity.id : void 0;
+	const tenantId = activity.channelData?.tenant?.id ?? activity.conversation?.tenantId;
+	const reference = {
+		activityId: activity.id,
+		user: activity.from,
+		agent: activity.recipient,
+		conversation: {
+			id: conversationId,
+			conversationType,
+			...tenantId ? { tenantId } : {}
+		},
+		channelId: activity.channelId,
+		serviceUrl: activity.serviceUrl,
+		locale: activity.locale,
+		...tenantId ? { tenantId } : {},
+		...activity.from?.aadObjectId ? { aadObjectId: activity.from.aadObjectId } : {}
+	};
+	const proactiveOptions = {
+		...quoteActivityId ? { quoteActivityId } : {},
+		...threadActivityId ? { threadActivityId } : {},
+		serviceUrlBoundary
+	};
+	const sendActivity = (outbound) => require_messenger.sendMSTeamsActivityWithReference(app, reference, outbound, proactiveOptions);
+	return {
+		activity,
+		sendActivity,
+		sendActivities: async (activities) => {
+			const results = [];
+			for (const outbound of activities) results.push(await sendActivity(outbound));
+			return results;
+		},
+		updateActivity: async (outbound) => {
+			return await require_messenger.updateMSTeamsActivityWithReference(app, reference, typeof outbound.id === "string" ? outbound.id : "", outbound, proactiveOptions);
+		},
+		deleteActivity: async (activityId) => {
+			await require_messenger.deleteMSTeamsActivityWithReference(app, reference, activityId, proactiveOptions);
+		},
+		getTeamDetails: (teamId) => app.api.teams.getById(teamId)
+	};
+}
+//#endregion
 //#region extensions/msteams/src/webhook-timeouts.ts
 const MSTEAMS_WEBHOOK_INACTIVITY_TIMEOUT_MS = 3e4;
 const MSTEAMS_WEBHOOK_REQUEST_TIMEOUT_MS = 3e4;
@@ -3820,6 +4023,7 @@ async function monitorMSTeamsProvider(opts) {
 	let msteamsCfg = cfg.channels?.msteams;
 	if (!msteamsCfg?.enabled) {
 		log.debug?.("msteams provider disabled");
+		publishMSTeamsBlocked(opts.statusSink, "Microsoft Teams provider is disabled");
 		return {
 			app: null,
 			shutdown: async () => {}
@@ -3828,6 +4032,7 @@ async function monitorMSTeamsProvider(opts) {
 	const creds = require_resolve_allowlist.resolveMSTeamsCredentials(msteamsCfg);
 	if (!creds) {
 		log.error("msteams credentials not configured");
+		publishMSTeamsBlocked(opts.statusSink, "Microsoft Teams credentials are not configured");
 		return {
 			app: null,
 			shutdown: async () => {}
@@ -3901,7 +4106,7 @@ async function monitorMSTeamsProvider(opts) {
 			(0, openclaw_plugin_sdk_allow_from.summarizeMapping)("msteams channels", resolved.mapping, resolved.unresolved, runtime);
 		}
 	} catch (err) {
-		runtime.error?.(`msteams resolve failed; mutable allowlist entries are disabled. ${require_setup_surface.formatUnknownError(err)}`);
+		runtime.error?.(`msteams resolve failed; mutable allowlist entries are disabled. ${require_channel_setup.formatUnknownError(err)}`);
 	}
 	if (configuredGroupAllowFrom == null && groupAllowFrom) groupAllowFrom = (0, openclaw_plugin_sdk_allow_from.mergeAllowlist)({
 		existing: groupAllowFrom,
@@ -3922,9 +4127,10 @@ async function monitorMSTeamsProvider(opts) {
 	};
 	const port = msteamsCfg.webhook?.port ?? 3978;
 	const textLimit = core.channel.text.resolveTextChunkLimit(cfg, "msteams");
-	const MB = 1024 * 1024;
-	const agentDefaults = cfg.agents?.defaults;
-	const mediaMaxBytes = typeof agentDefaults?.mediaMaxMb === "number" && agentDefaults.mediaMaxMb > 0 ? Math.floor(agentDefaults.mediaMaxMb * MB) : 8 * MB;
+	const mediaMaxBytes = (0, openclaw_plugin_sdk_media_runtime.resolveChannelMediaMaxBytes)({
+		cfg,
+		resolveChannelLimitMb: ({ cfg: channelCfg }) => channelCfg.channels?.msteams?.mediaMaxMb
+	}) ?? 8 * 1024 * 1024;
 	const conversationStore = opts.conversationStore ?? require_polls.createMSTeamsConversationStoreState();
 	const pollStore = opts.pollStore ?? require_polls.createMSTeamsPollStoreState();
 	log.info(`starting provider (port ${port})`);
@@ -4054,7 +4260,7 @@ async function monitorMSTeamsProvider(opts) {
 				} catch (err) {
 					log.error("failed to record poll vote", {
 						pollId: vote.pollId,
-						error: require_setup_surface.formatUnknownError(err)
+						error: require_channel_setup.formatUnknownError(err)
 					});
 					return {
 						statusCode: 500,
@@ -4077,7 +4283,7 @@ async function monitorMSTeamsProvider(opts) {
 				value: "OK"
 			};
 		} catch (err) {
-			log.error("msteams card.action failed", { error: require_setup_surface.formatUnknownError(err) });
+			log.error("msteams card.action failed", { error: require_channel_setup.formatUnknownError(err) });
 			return {
 				statusCode: 500,
 				type: "application/vnd.microsoft.error",
@@ -4145,7 +4351,7 @@ async function monitorMSTeamsProvider(opts) {
 				hasExpiry: Boolean(ctx.token.expiration)
 			});
 		})().catch((err) => {
-			log.error("msteams sso token persistence failed", { error: require_setup_surface.formatUnknownError(err) });
+			log.error("msteams sso token persistence failed", { error: require_channel_setup.formatUnknownError(err) });
 		});
 	});
 	app.on("message.submit", async (ctx) => {
@@ -4166,32 +4372,37 @@ async function monitorMSTeamsProvider(opts) {
 		try {
 			await handler.run(adaptedCtx);
 		} catch (err) {
-			log.error("msteams non-turn activity failed", { error: require_setup_surface.formatUnknownError(err) });
+			log.error("msteams non-turn activity failed", { error: require_channel_setup.formatUnknownError(err) });
 		}
 	});
 	await app.initialize();
 	ingress.start();
+	const privateQaRuntime = require_resolve_allowlist.resolveMSTeamsPrivateQaRuntime();
 	const httpServer = await new Promise((resolve, reject) => {
-		const server = expressApp.listen(port, (err) => err ? reject(err) : resolve(server));
+		const onListen = (err) => err ? reject(err) : resolve(server);
+		const server = privateQaRuntime ? expressApp.listen(port, privateQaRuntime.listenHost, onListen) : expressApp.listen(port, onListen);
 	}).catch(async (err) => {
-		log.error("msteams server error", { error: require_setup_surface.formatUnknownError(err) });
+		log.error("msteams server error", { error: require_channel_setup.formatUnknownError(err) });
 		await ingress.stop();
 		throw err;
 	});
 	log.info(`msteams provider started on port ${port}`);
+	publishMSTeamsReady(opts.statusSink);
 	applyMSTeamsWebhookTimeouts(httpServer);
 	httpServer.on("error", (err) => {
-		log.error("msteams server error", { error: require_setup_surface.formatUnknownError(err) });
+		log.error("msteams server error", { error: require_channel_setup.formatUnknownError(err) });
+		publishMSTeamsRecovering(opts.statusSink, require_channel_setup.formatUnknownError(err));
 	});
 	const shutdown = async () => {
 		log.info("shutting down msteams provider");
 		await new Promise((resolve) => {
 			httpServer.close((err) => {
-				if (err) log.debug?.("msteams server close error", { error: require_setup_surface.formatUnknownError(err) });
+				if (err) log.debug?.("msteams server close error", { error: require_channel_setup.formatUnknownError(err) });
 				resolve();
 			});
 		});
 		await ingress.stop();
+		publishMSTeamsStopped(opts.statusSink);
 	};
 	await (0, openclaw_plugin_sdk_channel_outbound.keepHttpServerTaskAlive)({
 		server: httpServer,
@@ -4247,47 +4458,6 @@ function buildActivityHandler() {
 	};
 	return handler;
 }
-function createMSTeamsReplayContext(activity, app, serviceUrlBoundary) {
-	const rawConversationId = activity.conversation?.id ?? "";
-	const conversationId = require_resolve_allowlist.normalizeMSTeamsConversationId(rawConversationId);
-	const conversationType = activity.conversation?.conversationType ?? "personal";
-	const threadActivityId = conversationType.toLowerCase() === "channel" ? require_resolve_allowlist.extractMSTeamsConversationMessageId(rawConversationId) ?? activity.replyToId : void 0;
-	const tenantId = activity.channelData?.tenant?.id ?? activity.conversation?.tenantId;
-	const reference = {
-		activityId: activity.id,
-		user: activity.from,
-		agent: activity.recipient,
-		conversation: {
-			id: conversationId,
-			conversationType,
-			...tenantId ? { tenantId } : {}
-		},
-		channelId: activity.channelId,
-		serviceUrl: activity.serviceUrl,
-		locale: activity.locale,
-		...tenantId ? { tenantId } : {},
-		...activity.from?.aadObjectId ? { aadObjectId: activity.from.aadObjectId } : {}
-	};
-	const proactiveOptions = {
-		...threadActivityId ? { threadActivityId } : {},
-		serviceUrlBoundary
-	};
-	const sendActivity = (outbound) => require_messenger.sendMSTeamsActivityWithReference(app, reference, outbound, proactiveOptions);
-	return {
-		activity,
-		sendActivity,
-		sendActivities: async (activities) => {
-			const results = [];
-			for (const outbound of activities) results.push(await sendActivity(outbound));
-			return results;
-		},
-		updateActivity: async (outbound) => await require_messenger.updateMSTeamsActivityWithReference(app, reference, typeof outbound.id === "string" ? outbound.id : "", outbound, proactiveOptions),
-		deleteActivity: async (activityId) => {
-			await require_messenger.deleteMSTeamsActivityWithReference(app, reference, activityId, proactiveOptions);
-		},
-		getTeamDetails: (teamId) => app.api.teams.getById(teamId)
-	};
-}
 /**
 * Adapt a new @microsoft/teams.apps SDK context to the MSTeamsTurnContext interface
 * our handlers expect. The new SDK uses reply()/send() instead of sendActivity().