@openclaw/msteams 2026.9.2 → 2026.9.3

package/dist/api.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_channel = require("./channel-CWwr9KeE.cjs");
-const require_channel_setup = require("./channel.setup-v4zhsO2d.cjs");
+const require_channel = require("./channel-Cdm6-HsU.cjs");
+const require_channel_setup = require("./channel.setup-ChwkwdLk.cjs");
 exports.createMSTeamsSetupWizardBase = require_channel_setup.createMSTeamsSetupWizardBase;
 exports.msteamsPlugin = require_channel.msteamsPlugin;
 exports.msteamsSetupAdapter = require_channel_setup.msteamsSetupAdapter;

package/dist/{approval-card-ClrTjCsL.cjs → approval-card-CPNH_q3P.cjs}

@@ -1,15 +1,7 @@
-const require_rolldown_runtime = require("./rolldown-runtime-VH7oDXx4.cjs");
 let openclaw_plugin_sdk_string_coerce_runtime = require("openclaw/plugin-sdk/string-coerce-runtime");
-let node_crypto = require("node:crypto");
-node_crypto = require_rolldown_runtime.__toESM(node_crypto, 1);
-let openclaw_plugin_sdk_collection_runtime = require("openclaw/plugin-sdk/collection-runtime");
+let openclaw_plugin_sdk_approval_runtime = require("openclaw/plugin-sdk/approval-runtime");
 //#region extensions/msteams/src/approval-card-actions.ts
-const approvalCardBindings = /* @__PURE__ */ new Map();
-const approvalCardResolvingTokens = /* @__PURE__ */ new Set();
-const MSTEAMS_APPROVAL_CARD_BINDING_MAX_ENTRIES = 1024;
-function createMSTeamsApprovalToken() {
-	return node_crypto.default.randomBytes(18).toString("base64url");
-}
+const msTeamsApprovalControls = (0, openclaw_plugin_sdk_approval_runtime.createNativeApprovalControlRegistry)({ releaseClaimOnLookupExpiry: true });
 function readMSTeamsApprovalActionToken(value) {
 	if (!(0, openclaw_plugin_sdk_string_coerce_runtime.isRecord)(value)) return null;
 	const action = (0, openclaw_plugin_sdk_string_coerce_runtime.isRecord)(value.action) ? value.action : void 0;
@@ -17,43 +9,6 @@ function readMSTeamsApprovalActionToken(value) {
 	if (submitted.openclawAction !== "approval") return null;
 	return (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(submitted.token) ?? null;
 }
-function registerMSTeamsApprovalCardBinding(binding) {
-	if (binding.expiresAtMs <= Date.now()) return false;
-	approvalCardBindings.delete(binding.token);
-	approvalCardBindings.set(binding.token, binding);
-	(0, openclaw_plugin_sdk_collection_runtime.pruneMapToMaxSize)(approvalCardBindings, MSTEAMS_APPROVAL_CARD_BINDING_MAX_ENTRIES);
-	return true;
-}
-function getMSTeamsApprovalCardBinding(token) {
-	const binding = approvalCardBindings.get(token);
-	if (!binding) return null;
-	if (binding.expiresAtMs <= Date.now()) {
-		approvalCardBindings.delete(token);
-		approvalCardResolvingTokens.delete(token);
-		return null;
-	}
-	return binding;
-}
-function claimMSTeamsApprovalCardBinding(token) {
-	const binding = getMSTeamsApprovalCardBinding(token);
-	if (!binding) return { kind: "missing" };
-	if (approvalCardResolvingTokens.has(token)) return { kind: "in-flight" };
-	approvalCardResolvingTokens.add(token);
-	return {
-		kind: "claimed",
-		binding
-	};
-}
-function completeMSTeamsApprovalCardBinding(token) {
-	approvalCardResolvingTokens.delete(token);
-	approvalCardBindings.delete(token);
-}
-function releaseMSTeamsApprovalCardBinding(token) {
-	approvalCardResolvingTokens.delete(token);
-}
-function unregisterMSTeamsApprovalCardBindings(tokens) {
-	for (const token of tokens) completeMSTeamsApprovalCardBinding(token);
-}
 //#endregion
 //#region extensions/msteams/src/approval-card.ts
 function buildCardHeading(title, subtitle) {
@@ -146,15 +101,12 @@ function buildAdaptiveCard(body, actions) {
 		...actions?.length ? { actions } : {}
 	};
 }
-function formatApprovalDecision(decision) {
-	return decision === "allow-once" ? "Allowed once" : decision === "allow-always" ? "Allowed always" : "Denied";
-}
 function buildMSTeamsPendingApprovalCard(params) {
 	const { view, nowMs } = params;
 	const kindLabel = view.approvalKind === "plugin" ? "Plugin" : view.approvalKind === "system-agent" ? "OpenClaw Change" : "Exec";
 	const actionTokens = [];
 	const actions = view.actions.map(({ decision, label }) => {
-		const token = createMSTeamsApprovalToken();
+		const token = msTeamsApprovalControls.createToken();
 		actionTokens.push({
 			token,
 			decision
@@ -187,7 +139,7 @@ function buildMSTeamsResolvedApprovalCard(view) {
 	const kindLabel = view.approvalKind === "plugin" ? "Plugin" : view.approvalKind === "system-agent" ? "OpenClaw Change" : "Exec";
 	const resolvedBy = (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(view.resolvedBy);
 	return buildAdaptiveCard([
-		...buildCardHeading(`${kindLabel} Approval: ${view.approvalKind === "system-agent" && view.terminalStatus === "cancelled" ? "Cancelled" : view.approvalKind === "system-agent" && view.applicationStatus === "applied" ? "Applied" : view.approvalKind === "system-agent" && view.applicationStatus === "not-applied" ? "Not applied" : formatApprovalDecision(view.decision)}`, resolvedBy ? `Resolved by ${resolvedBy}` : "Resolved"),
+		...buildCardHeading(`${kindLabel} Approval: ${(0, openclaw_plugin_sdk_approval_runtime.formatChannelApprovalResolvedLabel)(view)}`, resolvedBy ? `Resolved by ${resolvedBy}` : "Resolved"),
 		...buildApprovalSubject(view),
 		buildApprovalMetadata(view.approvalId, view.metadata)
 	]);
@@ -203,7 +155,7 @@ function buildMSTeamsCanonicalApprovalTerminalCard(result) {
 	const { approval } = result;
 	const { presentation } = approval;
 	const kindLabel = presentation.kind === "exec" ? "Exec" : presentation.kind === "plugin" ? "Plugin" : "System Agent";
-	const outcome = approval.status === "allowed" ? formatApprovalDecision(approval.decision) : approval.status === "denied" ? "Denied" : approval.status === "expired" ? "Expired" : "Cancelled";
+	const outcome = approval.status === "allowed" ? (0, openclaw_plugin_sdk_approval_runtime.formatApprovalDecisionLabel)(approval.decision) : approval.status === "denied" ? "Denied" : approval.status === "expired" ? "Expired" : "Cancelled";
 	const subject = presentation.kind === "exec" ? [{
 		type: "TextBlock",
 		text: "Command",
@@ -269,22 +221,10 @@ Object.defineProperty(exports, "buildMSTeamsResolvedApprovalCard", {
 		return buildMSTeamsResolvedApprovalCard;
 	}
 });
-Object.defineProperty(exports, "claimMSTeamsApprovalCardBinding", {
-	enumerable: true,
-	get: function() {
-		return claimMSTeamsApprovalCardBinding;
-	}
-});
-Object.defineProperty(exports, "completeMSTeamsApprovalCardBinding", {
+Object.defineProperty(exports, "msTeamsApprovalControls", {
 	enumerable: true,
 	get: function() {
-		return completeMSTeamsApprovalCardBinding;
-	}
-});
-Object.defineProperty(exports, "getMSTeamsApprovalCardBinding", {
-	enumerable: true,
-	get: function() {
-		return getMSTeamsApprovalCardBinding;
+		return msTeamsApprovalControls;
 	}
 });
 Object.defineProperty(exports, "readMSTeamsApprovalActionToken", {
@@ -293,21 +233,3 @@ Object.defineProperty(exports, "readMSTeamsApprovalActionToken", {
 		return readMSTeamsApprovalActionToken;
 	}
 });
-Object.defineProperty(exports, "registerMSTeamsApprovalCardBinding", {
-	enumerable: true,
-	get: function() {
-		return registerMSTeamsApprovalCardBinding;
-	}
-});
-Object.defineProperty(exports, "releaseMSTeamsApprovalCardBinding", {
-	enumerable: true,
-	get: function() {
-		return releaseMSTeamsApprovalCardBinding;
-	}
-});
-Object.defineProperty(exports, "unregisterMSTeamsApprovalCardBindings", {
-	enumerable: true,
-	get: function() {
-		return unregisterMSTeamsApprovalCardBindings;
-	}
-});

package/dist/{approval-handler.runtime-zm3viYLZ.cjs → approval-handler.runtime-CoTQG4FS.cjs}

@@ -1,7 +1,7 @@
 const require_resolve_allowlist = require("./resolve-allowlist-CoKmLXYe.cjs");
-const require_channel = require("./channel-CWwr9KeE.cjs");
-const require_approval_card = require("./approval-card-ClrTjCsL.cjs");
-const require_send = require("./send-DNTNV8Oa.cjs");
+const require_channel = require("./channel-Cdm6-HsU.cjs");
+const require_approval_card = require("./approval-card-CPNH_q3P.cjs");
+const require_send = require("./send-Bw4W8RO7.cjs");
 let openclaw_plugin_sdk_account_id = require("openclaw/plugin-sdk/account-id");
 let openclaw_plugin_sdk_approval_native_runtime = require("openclaw/plugin-sdk/approval-native-runtime");
 let openclaw_plugin_sdk_approval_handler_runtime = require("openclaw/plugin-sdk/approval-handler-runtime");
@@ -79,7 +79,7 @@ const msTeamsApprovalNativeRuntime = (0, openclaw_plugin_sdk_approval_handler_ru
 	interactions: {
 		bindPending: ({ entry, request, approvalKind, view, pendingPayload }) => {
 			const tokens = [];
-			for (const actionToken of entry.actionTokens) if (require_approval_card.registerMSTeamsApprovalCardBinding({
+			for (const actionToken of entry.actionTokens) if (require_approval_card.msTeamsApprovalControls.register({
 				token: actionToken.token,
 				accountId: entry.accountId,
 				approvalId: request.id,
@@ -92,8 +92,8 @@ const msTeamsApprovalNativeRuntime = (0, openclaw_plugin_sdk_approval_handler_ru
 			})) tokens.push(actionToken.token);
 			return tokens.length > 0 ? tokens : null;
 		},
-		unbindPending: ({ binding }) => require_approval_card.unregisterMSTeamsApprovalCardBindings(binding),
-		cancelDelivered: ({ entry }) => require_approval_card.unregisterMSTeamsApprovalCardBindings(entry.actionTokens.map(({ token }) => token))
+		unbindPending: ({ binding }) => require_approval_card.msTeamsApprovalControls.unregister(binding),
+		cancelDelivered: ({ entry }) => require_approval_card.msTeamsApprovalControls.unregister(entry.actionTokens.map(({ token }) => token))
 	},
 	observe: { onDeliveryError: ({ cfg, error, plannedTarget, request, approvalKind, pendingPayload }) => {
 		log.error(`msteams approvals: failed to deliver request ${request.id}: ${String(error)}`);

package/dist/{channel-CWwr9KeE.cjs → channel-Cdm6-HsU.cjs}

@@ -2,7 +2,7 @@ require("./runtime-api.cjs");
 const require_resolve_allowlist = require("./resolve-allowlist-CoKmLXYe.cjs");
 const require_directory_contract_api = require("./directory-contract-api.cjs");
 const require_thread_session = require("./thread-session-p8FNgohv.cjs");
-const require_channel_setup = require("./channel.setup-v4zhsO2d.cjs");
+const require_channel_setup = require("./channel.setup-ChwkwdLk.cjs");
 let openclaw_plugin_sdk_approval_handler_adapter_runtime = require("openclaw/plugin-sdk/approval-handler-adapter-runtime");
 let openclaw_plugin_sdk_channel_core = require("openclaw/plugin-sdk/channel-core");
 let openclaw_plugin_sdk_channel_outbound = require("openclaw/plugin-sdk/channel-outbound");
@@ -330,7 +330,7 @@ const msTeamsLazyApprovalNativeRuntime = (0, openclaw_plugin_sdk_approval_handle
 		request
 	}),
 	load: async () => {
-		const { msTeamsApprovalNativeRuntime } = await Promise.resolve().then(() => require("./approval-handler.runtime-zm3viYLZ.cjs"));
+		const { msTeamsApprovalNativeRuntime } = await Promise.resolve().then(() => require("./approval-handler.runtime-CoTQG4FS.cjs"));
 		return msTeamsApprovalNativeRuntime;
 	}
 });
@@ -781,7 +781,7 @@ const collectMSTeamsSecurityFindings = openclaw_plugin_sdk_channel_policy.create
 	severity: "critical",
 	title: "MS Teams security warning"
 });
-const loadMSTeamsChannelRuntime = (0, openclaw_plugin_sdk_lazy_runtime.createLazyRuntimeNamedExport)(() => Promise.resolve().then(() => require("./channel.runtime-CoRvy4hG.cjs")), "msTeamsChannelRuntime");
+const loadMSTeamsChannelRuntime = (0, openclaw_plugin_sdk_lazy_runtime.createLazyRuntimeNamedExport)(() => Promise.resolve().then(() => require("./channel.runtime-__5ZQlfG.cjs")), "msTeamsChannelRuntime");
 function jsonActionResult(data) {
 	return {
 		content: [{
@@ -1524,7 +1524,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 			})
 		}),
 		gateway: { startAccount: async (ctx) => {
-			const { monitorMSTeamsProvider } = await Promise.resolve().then(() => require("./src-B01LZcb5.cjs"));
+			const { monitorMSTeamsProvider } = await Promise.resolve().then(() => require("./src-B--Qc6lj.cjs"));
 			const port = ctx.cfg.channels?.msteams?.webhook?.port ?? 3978;
 			const statusSink = (0, openclaw_plugin_sdk_channel_outbound.createAccountStatusSink)({
 				accountId: ctx.accountId,

package/dist/channel-config-api.cjs

@@ -1,3 +1,3 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_config_schema = require("./config-schema-MyN2lamA.cjs");
+const require_config_schema = require("./config-schema-D22Lr1Qk.cjs");
 exports.MSTeamsChannelConfigSchema = require_config_schema.MSTeamsChannelConfigSchema;

package/dist/channel-plugin-api.cjs

@@ -1,3 +1,3 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_channel = require("./channel-CWwr9KeE.cjs");
+const require_channel = require("./channel-Cdm6-HsU.cjs");
 exports.msteamsPlugin = require_channel.msteamsPlugin;

package/dist/{channel.runtime-CoRvy4hG.cjs → channel.runtime-__5ZQlfG.cjs}

@@ -1,10 +1,10 @@
 require("./runtime-api.cjs");
 const require_resolve_allowlist = require("./resolve-allowlist-CoKmLXYe.cjs");
-const require_channel = require("./channel-CWwr9KeE.cjs");
-const require_channel_setup = require("./channel.setup-v4zhsO2d.cjs");
+const require_channel = require("./channel-Cdm6-HsU.cjs");
+const require_channel_setup = require("./channel.setup-ChwkwdLk.cjs");
 const require_polls = require("./polls-BBdZPx_R.cjs");
-const require_send = require("./send-DNTNV8Oa.cjs");
-const require_reaction_types = require("./reaction-types-7LiO1RI1.cjs");
+const require_send = require("./send-Bw4W8RO7.cjs");
+const require_reaction_types = require("./reaction-types-zP91Ncwk.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_reply_payload = require("openclaw/plugin-sdk/reply-payload");

package/dist/{channel.setup-v4zhsO2d.cjs → channel.setup-ChwkwdLk.cjs}

@@ -1,6 +1,6 @@
 const require_resolve_allowlist = require("./resolve-allowlist-CoKmLXYe.cjs");
 require("./secret-input-C65t6kjM.cjs");
-const require_config_schema = require("./config-schema-MyN2lamA.cjs");
+const require_config_schema = require("./config-schema-D22Lr1Qk.cjs");
 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_account_id = require("openclaw/plugin-sdk/account-id");

package/dist/{config-schema-MyN2lamA.cjs → config-schema-D22Lr1Qk.cjs}

@@ -138,19 +138,10 @@ const MSTeamsConfigSchema = zod.z.object({
 		connectionName: zod.z.string().optional()
 	}).strict().optional()
 }).strict().superRefine((value, ctx) => {
-	(0, openclaw_plugin_sdk_channel_config_schema.requireOpenAllowFrom)({
-		policy: value.dmPolicy,
-		allowFrom: value.allowFrom,
-		ctx,
-		path: ["allowFrom"],
-		message: "channels.msteams.dmPolicy=\"open\" requires channels.msteams.allowFrom to include \"*\""
-	});
-	(0, openclaw_plugin_sdk_channel_config_schema.requireAllowlistAllowFrom)({
-		policy: value.dmPolicy,
-		allowFrom: value.allowFrom,
-		ctx,
-		path: ["allowFrom"],
-		message: "channels.msteams.dmPolicy=\"allowlist\" requires channels.msteams.allowFrom to contain at least one sender ID"
+	(0, openclaw_plugin_sdk_channel_config_schema.refineChannelDmPolicy)({
+		channelId: "msteams",
+		value,
+		ctx
 	});
 	if (value.sso?.enabled === true && !value.sso.connectionName?.trim()) ctx.addIssue({
 		code: zod.z.ZodIssueCode.custom,

package/dist/{messenger-DM07DC3W.cjs → messenger-DbWgzI01.cjs}

@@ -2,7 +2,7 @@ const require_rolldown_runtime = require("./rolldown-runtime-VH7oDXx4.cjs");
 const require_runtime = require("./runtime-gZTAuFux.cjs");
 require("./runtime-api.cjs");
 const require_resolve_allowlist = require("./resolve-allowlist-CoKmLXYe.cjs");
-const require_channel_setup = require("./channel.setup-v4zhsO2d.cjs");
+const require_channel_setup = require("./channel.setup-ChwkwdLk.cjs");
 const require_polls = require("./polls-BBdZPx_R.cjs");
 let openclaw_plugin_sdk_lazy_runtime = require("openclaw/plugin-sdk/lazy-runtime");
 let openclaw_plugin_sdk_string_coerce_runtime = require("openclaw/plugin-sdk/string-coerce-runtime");
@@ -18,6 +18,7 @@ node_crypto = require_rolldown_runtime.__toESM(node_crypto, 1);
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
 let openclaw_plugin_sdk_runtime_env = require("openclaw/plugin-sdk/runtime-env");
+let openclaw_plugin_sdk_blob_runtime = require("openclaw/plugin-sdk/blob-runtime");
 let openclaw_plugin_sdk_global_singleton = require("openclaw/plugin-sdk/global-singleton");
 let openclaw_plugin_sdk_error_runtime = require("openclaw/plugin-sdk/error-runtime");
 let openclaw_plugin_sdk_reply_chunking = require("openclaw/plugin-sdk/reply-chunking");
@@ -153,7 +154,7 @@ async function uploadToConsentUrl(params) {
 			"Content-Type": params.contentType ?? "application/octet-stream",
 			"Content-Range": `bytes 0-${params.buffer.length - 1}/${params.buffer.length}`
 		},
-		body: new Uint8Array(params.buffer)
+		body: new Blob([(0, openclaw_plugin_sdk_blob_runtime.bufferToBlobPart)(params.buffer)])
 	}, params.timeoutMs ?? require_resolve_allowlist.resolveMSTeamsSharePointUploadTimeoutMs(params.buffer.length), fetchFn);
 	await res.body?.cancel().catch(() => void 0);
 	if (!res.ok) throw new Error(`File upload to consent URL failed: ${res.status} ${res.statusText}`);
@@ -244,9 +245,13 @@ async function withPendingUploadLock(options, run) {
 async function readUploadRows(id, metaStore, chunkStore) {
 	const meta = await metaStore.lookup(buildMetaKey(id));
 	if (!meta) return;
+	if (!Number.isSafeInteger(meta.chunkCount) || meta.chunkCount < 1 || meta.chunkCount > MAX_CHUNKS_PER_UPLOAD) return;
+	const records = await chunkStore.lookupMany?.(Array.from({ length: meta.chunkCount }, (_, index) => buildChunkKey(id, index)));
 	const chunks = [];
 	for (let index = 0; index < meta.chunkCount; index += 1) {
-		const chunk = await chunkStore.lookup(buildChunkKey(id, index));
+		const result = records?.[index];
+		if (result && !result.ok) throw result.error;
+		const chunk = records ? result?.value : await chunkStore.lookup(buildChunkKey(id, index));
 		if (!chunk || chunk.id !== id || chunk.index !== index) return;
 		chunks.push(Buffer.from(chunk.dataBase64, "base64"));
 	}
@@ -551,25 +556,25 @@ function createTokenPrefix(text, label) {
 	return prefix;
 }
 function restoreTokens(text, prefix, values) {
+	if (!text.includes(prefix)) return text;
 	const escapedPrefix = prefix.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
 	return text.replace(new RegExp(`${escapedPrefix}(\\d+)${TOKEN_END}`, "gu"), (_token, index) => values[Number(index)] ?? "");
 }
 function rewriteMarkdownIR(ir, edits) {
-	const ordered = [...edits].toSorted((a, b) => a.start - b.start);
+	const ordered = edits.toSorted((a, b) => a.start - b.start);
+	const cumulativeDeltas = [];
+	const exactEdits = /* @__PURE__ */ new Map();
 	let text = "";
 	let cursor = 0;
+	let delta = 0;
 	for (const edit of ordered) {
 		text += ir.text.slice(cursor, edit.start) + edit.text;
 		cursor = edit.end;
-	}
-	text += ir.text.slice(cursor);
-	const cumulativeDeltas = [];
-	let delta = 0;
-	for (const edit of ordered) {
 		delta += edit.text.length - (edit.end - edit.start);
 		cumulativeDeltas.push(delta);
+		exactEdits.set(`${edit.start}:${edit.end}`, edit);
 	}
-	const exactEdits = new Map(ordered.map((edit) => [`${edit.start}:${edit.end}`, edit]));
+	text += ir.text.slice(cursor);
 	const mapOffset = (offset) => {
 		let low = 0;
 		let high = ordered.length;
@@ -666,43 +671,22 @@ function scanDelimitedMarkdown(text, start, nestedOpener) {
 	}
 	return fallbackNext === void 0 ? void 0 : { next: fallbackNext };
 }
-function protectMarkdownImages(text, tokenPrefix, images) {
-	let protectedText = "";
-	let cursor = 0;
-	let searchFrom = 0;
-	while (searchFrom < text.length) {
-		const start = text.indexOf("![", searchFrom);
-		if (start < 0) break;
-		const scan = scanDelimitedMarkdown(text, start, "![");
-		if (!scan) break;
-		if ("next" in scan) {
-			searchFrom = scan.next;
-			continue;
-		}
-		protectedText += text.slice(cursor, start);
-		const index = images.push(text.slice(start, scan.end)) - 1;
-		protectedText += `${tokenPrefix}i${index}${TOKEN_END}`;
-		cursor = scan.end;
-		searchFrom = scan.end;
-	}
-	return protectedText + text.slice(cursor);
-}
-function protectMSTeamsMentions(text, tokenPrefix, mentions) {
+function protectDelimitedMarkdown(text, opener, tokenPrefix, values) {
 	let protectedText = "";
 	let cursor = 0;
 	let searchFrom = 0;
 	while (searchFrom < text.length) {
-		const start = text.indexOf("@[", searchFrom);
+		const start = text.indexOf(opener, searchFrom);
 		if (start < 0) break;
-		const scan = scanDelimitedMarkdown(text, start, "@[");
+		const scan = scanDelimitedMarkdown(text, start, opener);
 		if (!scan) break;
 		if ("next" in scan) {
 			searchFrom = scan.next;
 			continue;
 		}
 		protectedText += text.slice(cursor, start);
-		const index = mentions.push(text.slice(start, scan.end)) - 1;
-		protectedText += `${tokenPrefix}m${index}${TOKEN_END}`;
+		const index = values.push(text.slice(start, scan.end)) - 1;
+		protectedText += `${tokenPrefix}${index}${TOKEN_END}`;
 		cursor = scan.end;
 		searchFrom = scan.end;
 	}
@@ -880,6 +864,7 @@ function protectMSTeamsCode(ir, tokenPrefix, code, protectedValues) {
 	};
 }
 function formatMSTeamsMarkdown(markdown, tableMode) {
+	if (markdown === "") return markdown;
 	const rawTables = [];
 	const escapedMarkdown = [];
 	const codeRegions = [];
@@ -887,10 +872,10 @@ function formatMSTeamsMarkdown(markdown, tableMode) {
 	const mentions = [];
 	const entities = [];
 	const tokenPrefix = createTokenPrefix(markdown, "msteamsformat");
-	const mentionsProtected = protectMSTeamsMentions(protectMarkdownImages(markdown.replace(MARKDOWN_ENTITY_RE, (entity) => {
+	const mentionsProtected = protectDelimitedMarkdown(protectDelimitedMarkdown(markdown.replace(MARKDOWN_ENTITY_RE, (entity) => {
 		const index = entities.push(entity) - 1;
 		return `${tokenPrefix}h${index}${TOKEN_END}`;
-	}), tokenPrefix, images), tokenPrefix, mentions);
+	}), "![", `${tokenPrefix}i`, images), "@[", `${tokenPrefix}m`, mentions);
 	const tableInput = (0, openclaw_plugin_sdk_text_chunking.convertMarkdownTables)(mentionsProtected, tableMode);
 	const protectedMarkdown = (tableMode === "off" ? protectRawTablesOutsideFences(tableInput, tokenPrefix, rawTables) : tableInput).replace(ESCAPED_MARKDOWN_RE, (escaped) => {
 		const index = escapedMarkdown.push(escaped) - 1;
@@ -1009,7 +994,7 @@ async function uploadToSharePoint(params) {
 					Authorization: `Bearer ${token}`,
 					"Content-Type": params.contentType ?? "application/octet-stream"
 				},
-				body: new Uint8Array(params.buffer),
+				body: new Blob([(0, openclaw_plugin_sdk_blob_runtime.bufferToBlobPart)(params.buffer)]),
 				signal
 			});
 			if (!res.ok) throw await require_resolve_allowlist.createMSTeamsHttpError(res, "SharePoint upload failed");
@@ -1225,15 +1210,6 @@ function extractMessageId(response) {
 	return id;
 }
 //#endregion
-//#region extensions/msteams/src/ai-entity.ts
-/** AI-generated content entity added to every outbound AI message. */
-const AI_GENERATED_ENTITY = {
-	type: "https://schema.org/Message",
-	"@type": "Message",
-	"@id": "",
-	additionalType: ["AIGeneratedContent"]
-};
-//#endregion
 //#region extensions/msteams/src/mentions.ts
 /**
 * Check whether an ID looks like a valid Teams user/bot identifier.
@@ -1282,6 +1258,24 @@ function parseMentions(text) {
 	};
 }
 //#endregion
+//#region extensions/msteams/src/message-activity.ts
+const AI_GENERATED_ENTITY = {
+	type: "https://schema.org/Message",
+	"@type": "Message",
+	"@context": "https://schema.org",
+	"@id": "",
+	additionalType: ["AIGeneratedContent"]
+};
+/** Build final transport text and its matching entities after Markdown rendering. */
+function buildMSTeamsMessageActivity(text) {
+	const parsed = parseMentions(text ?? "");
+	return {
+		type: "message",
+		...text === void 0 ? {} : { text: parsed.text },
+		entities: [...parsed.entities, AI_GENERATED_ENTITY]
+	};
+}
+//#endregion
 //#region extensions/msteams/src/revoked-context.ts
 async function withRevokedProxyFallback(params) {
 	try {
@@ -1551,13 +1545,8 @@ function renderReplyPayloadsToMessages(replies, options) {
 	return out;
 }
 async function buildActivity(msg, conversationRef, tokenProvider, sharePointSiteId, mediaMaxBytes, options) {
-	const activity = { type: "message" };
+	const activity = buildMSTeamsMessageActivity(msg.text);
 	activity.channelData = { feedbackLoopEnabled: options?.feedbackLoopEnabled ?? false };
-	if (msg.text) {
-		const { text: formattedText, entities } = parseMentions(msg.text);
-		activity.text = formattedText;
-		activity.entities = [...entities.length > 0 ? entities : [], AI_GENERATED_ENTITY];
-	} else activity.entities = [AI_GENERATED_ENTITY];
 	if (msg.mediaUrl) {
 		let contentUrl = msg.mediaUrl;
 		let contentType = await getMimeType(msg.mediaUrl);
@@ -1728,6 +1717,12 @@ Object.defineProperty(exports, "buildFileInfoCard", {
 		return buildFileInfoCard;
 	}
 });
+Object.defineProperty(exports, "buildMSTeamsMessageActivity", {
+	enumerable: true,
+	get: function() {
+		return buildMSTeamsMessageActivity;
+	}
+});
 Object.defineProperty(exports, "buildTeamsFileInfoCard", {
 	enumerable: true,
 	get: function() {

package/dist/{reaction-types-7LiO1RI1.cjs → reaction-types-zP91Ncwk.cjs}

@@ -69,12 +69,8 @@ async function fetchThreadReplies(token, groupId, channelId, messageId, limit =
 		...deadline ? { deadline } : {}
 	})).value ?? [];
 }
-/**
-* Format thread messages into a context string for the agent.
-* Skips the current message (by id) and blank messages.
-*/
-function formatThreadContext(messages, currentMessageId) {
-	const lines = [];
+function buildThreadContext(messages, currentMessageId) {
+	const context = [];
 	for (const msg of messages) {
 		if (msg.id && msg.id === currentMessageId) continue;
 		const sender = msg.from?.user?.displayName ?? msg.from?.application?.displayName ?? "unknown";
@@ -82,9 +78,13 @@ function formatThreadContext(messages, currentMessageId) {
 		const rawContent = msg.body?.content ?? "";
 		const content = contentType === "html" ? stripHtmlFromTeamsMessage(rawContent) : rawContent.trim();
 		if (!content) continue;
-		lines.push(`${sender}: ${content}`);
+		context.push({
+			message_id: msg.id,
+			sender,
+			body: content
+		});
 	}
-	return lines.join("\n");
+	return context;
 }
 //#endregion
 //#region extensions/msteams/src/reaction-types.ts
@@ -107,6 +107,12 @@ function resolveMSTeamsReactionEmoji(raw) {
 	return getMSTeamsReactionEmoji(normalized) ?? normalized;
 }
 //#endregion
+Object.defineProperty(exports, "buildThreadContext", {
+	enumerable: true,
+	get: function() {
+		return buildThreadContext;
+	}
+});
 Object.defineProperty(exports, "fetchChannelMessage", {
 	enumerable: true,
 	get: function() {
@@ -125,12 +131,6 @@ Object.defineProperty(exports, "fetchThreadReplies", {
 		return fetchThreadReplies;
 	}
 });
-Object.defineProperty(exports, "formatThreadContext", {
-	enumerable: true,
-	get: function() {
-		return formatThreadContext;
-	}
-});
 Object.defineProperty(exports, "getMSTeamsReactionEmoji", {
 	enumerable: true,
 	get: function() {

package/dist/{send-DNTNV8Oa.cjs → send-Bw4W8RO7.cjs}

@@ -1,10 +1,10 @@
 const require_runtime = require("./runtime-gZTAuFux.cjs");
 require("./runtime-api.cjs");
 const require_resolve_allowlist = require("./resolve-allowlist-CoKmLXYe.cjs");
-const require_channel = require("./channel-CWwr9KeE.cjs");
-const require_channel_setup = require("./channel.setup-v4zhsO2d.cjs");
+const require_channel = require("./channel-Cdm6-HsU.cjs");
+const require_channel_setup = require("./channel.setup-ChwkwdLk.cjs");
 const require_polls = require("./polls-BBdZPx_R.cjs");
-const require_messenger = require("./messenger-DM07DC3W.cjs");
+const require_messenger = require("./messenger-DbWgzI01.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_markdown_table_runtime = require("openclaw/plugin-sdk/markdown-table-runtime");
@@ -349,8 +349,7 @@ async function sendMessageMSTeams(params) {
 			const messageId = await sendProactiveActivityRaw({
 				ctx,
 				activity: {
-					type: "message",
-					text: messageText || void 0,
+					...require_messenger.buildMSTeamsMessageActivity(messageText || void 0),
 					attachments: [fileCardAttachment]
 				}
 			});
@@ -523,9 +522,11 @@ async function editMessageMSTeams(params) {
 	return updateMSTeamsMessageActivity({
 		...params,
 		activity: {
-			type: "message",
-			id: params.activityId,
-			text: params.text
+			...require_messenger.buildMSTeamsMessageActivity(require_messenger.formatMSTeamsMarkdown(params.text, (0, openclaw_plugin_sdk_markdown_table_runtime.resolveMarkdownTableMode)({
+				cfg: params.cfg,
+				channel: "msteams"
+			}))),
+			id: params.activityId
 		}
 	});
 }

package/dist/setup-plugin-api.cjs

@@ -1,3 +1,3 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_channel_setup = require("./channel.setup-v4zhsO2d.cjs");
+const require_channel_setup = require("./channel.setup-ChwkwdLk.cjs");
 exports.msteamsSetupPlugin = require_channel_setup.msteamsSetupPlugin;

package/dist/{src-B01LZcb5.cjs → src-B--Qc6lj.cjs}

@@ -2,14 +2,14 @@ const require_rolldown_runtime = require("./rolldown-runtime-VH7oDXx4.cjs");
 const require_runtime = require("./runtime-gZTAuFux.cjs");
 require("./runtime-api.cjs");
 const require_resolve_allowlist = require("./resolve-allowlist-CoKmLXYe.cjs");
-const require_channel = require("./channel-CWwr9KeE.cjs");
+const require_channel = require("./channel-Cdm6-HsU.cjs");
 const require_thread_session = require("./thread-session-p8FNgohv.cjs");
-const require_channel_setup = require("./channel.setup-v4zhsO2d.cjs");
+const require_channel_setup = require("./channel.setup-ChwkwdLk.cjs");
 const require_polls = require("./polls-BBdZPx_R.cjs");
 const require_sso_token_store = require("./sso-token-store-DTeYxubp.cjs");
-const require_approval_card = require("./approval-card-ClrTjCsL.cjs");
-const require_messenger = require("./messenger-DM07DC3W.cjs");
-const require_reaction_types = require("./reaction-types-7LiO1RI1.cjs");
+const require_approval_card = require("./approval-card-CPNH_q3P.cjs");
+const require_messenger = require("./messenger-DbWgzI01.cjs");
+const require_reaction_types = require("./reaction-types-zP91Ncwk.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");
@@ -22,7 +22,6 @@ let openclaw_plugin_sdk_text_utility_runtime = require("openclaw/plugin-sdk/text
 let openclaw_plugin_sdk_routing = require("openclaw/plugin-sdk/routing");
 let node_crypto = require("node:crypto");
 node_crypto = require_rolldown_runtime.__toESM(node_crypto, 1);
-let openclaw_plugin_sdk_collection_runtime = require("openclaw/plugin-sdk/collection-runtime");
 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_approval_gateway_runtime = require("openclaw/plugin-sdk/approval-gateway-runtime");
@@ -35,6 +34,7 @@ let openclaw_plugin_sdk_extension_shared = require("openclaw/plugin-sdk/extensio
 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_runtime_group_policy = require("openclaw/plugin-sdk/runtime-group-policy");
@@ -188,7 +188,7 @@ async function maybeHandleMSTeamsApprovalCardSubmit(params) {
 		ignored("missing card token");
 		return true;
 	}
-	const binding = require_approval_card.getMSTeamsApprovalCardBinding(token);
+	const binding = require_approval_card.msTeamsApprovalControls.get(token);
 	if (!binding) {
 		ignored("unknown or expired card token");
 		return true;
@@ -220,15 +220,8 @@ async function maybeHandleMSTeamsApprovalCardSubmit(params) {
 		ignored(`unauthorized actor ${senderId || "unknown"}`);
 		return true;
 	}
-	const claim = require_approval_card.claimMSTeamsApprovalCardBinding(token);
-	if (claim.kind !== "claimed") {
-		ignored(claim.kind === "in-flight" ? "card token resolve already in flight" : "card token already consumed");
-		return true;
-	}
-	const consumed = claim.binding;
-	let result;
-	try {
-		result = await (0, openclaw_plugin_sdk_approval_gateway_runtime.resolveApprovalOverGateway)({
+	const outcome = await require_approval_card.msTeamsApprovalControls.settle(token, async (consumed) => {
+		const result = await (0, openclaw_plugin_sdk_approval_gateway_runtime.resolveApprovalOverGateway)({
 			cfg: deps.cfg,
 			approvalId: consumed.approvalId,
 			approvalKind: consumed.approvalKind,
@@ -245,16 +238,13 @@ async function maybeHandleMSTeamsApprovalCardSubmit(params) {
 				content: require_approval_card.buildMSTeamsCanonicalApprovalTerminalCard(result)
 			}]
 		});
-	} catch (error) {
-		if ((0, openclaw_plugin_sdk_error_runtime.isApprovalNotFoundError)(error)) {
-			require_approval_card.completeMSTeamsApprovalCardBinding(token);
-			ignored(`approval expired or no longer exists id=${consumed.approvalId}`);
-			return true;
-		}
-		require_approval_card.releaseMSTeamsApprovalCardBinding(token);
-		throw error;
+		return result;
+	});
+	if (outcome.kind !== "settled") {
+		ignored(outcome.kind === "missing" ? "card token already consumed" : outcome.kind === "in-flight" ? "card token resolve already in flight" : `approval expired or no longer exists id=${outcome.binding.approvalId}`);
+		return true;
 	}
-	require_approval_card.completeMSTeamsApprovalCardBinding(token);
+	const { binding: consumed, result } = outcome;
 	deps.log.info("msteams approval resolved", {
 		approvalId: consumed.approvalId,
 		approvalKind: consumed.approvalKind,
@@ -1771,23 +1761,25 @@ function createTeamsReplyStreamController(params) {
 	let pendingFinalPayload;
 	let emittedText = "";
 	let acknowledgedText = "";
+	let acknowledgedLogicalText = "";
 	let acknowledgedStreamId;
 	let replacementFinalPending = false;
 	let replacementEmitFailed = false;
 	let replacementSettlementPending = false;
 	let replacementTextAwaitingAcknowledgement;
 	let deferredReplacementEntries = [];
-	let finalMetadataQueued = false;
+	let queuedFinalActivity;
 	let failedSegmentFallbackPrepared = false;
 	const streamEvents = stream?.events;
 	let streamChunkSubscription;
 	if (typeof streamEvents?.on === "function" && typeof streamEvents.off === "function") streamChunkSubscription = streamEvents.on("chunk", (activity) => {
 		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;
+		const replacementAcknowledgement = typeof activity.text === "string" && replacementAcknowledgementPending && activity.text === replacementTextAwaitingAcknowledgement?.text;
+		if (activity.type !== "typing" || activity.channelData?.streamType !== "streaming" || !activity.id || !activity.text || acknowledgedStreamId !== void 0 && activity.id !== acknowledgedStreamId || (replacementAcknowledgementPending ? !replacementAcknowledgement : !activity.text.startsWith(acknowledgedText)) || !replacementAcknowledgement && !emittedText.startsWith(activity.text)) return;
 		acknowledgedStreamId = activity.id;
 		acknowledgedText = activity.text;
-		if (activity.text === replacementTextAwaitingAcknowledgement) replacementTextAwaitingAcknowledgement = void 0;
+		acknowledgedLogicalText = replacementAcknowledgement ? replacementTextAwaitingAcknowledgement.logicalText : activity.text;
+		if (replacementAcknowledgement) replacementTextAwaitingAcknowledgement = void 0;
 	});
 	const wasCanceled = () => canceledLocally || Boolean(stream?.canceled);
 	const releaseStreamChunkSubscription = () => {
@@ -1804,8 +1796,8 @@ function createTeamsReplyStreamController(params) {
 		};
 	};
 	const fallbackPayloadAfterAcknowledgedText = (payload) => {
-		if (!acknowledgedText || typeof payload.text !== "string" || !payload.text.startsWith(acknowledgedText)) return payload;
-		const remainingText = payload.text.slice(acknowledgedText.length);
+		if (!acknowledgedLogicalText || typeof payload.text !== "string" || !payload.text.startsWith(acknowledgedLogicalText)) return payload;
+		const remainingText = payload.text.slice(acknowledgedLogicalText.length);
 		const hasMedia = Boolean(payload.mediaUrl || payload.mediaUrls?.length);
 		if (!remainingText && !hasMedia) return;
 		return {
@@ -1821,15 +1813,7 @@ function createTeamsReplyStreamController(params) {
 		} : payload;
 	};
 	const finalStreamActivity = (text) => ({
-		type: "message",
-		...text ? { text } : {},
-		entities: [{
-			type: "https://schema.org/Message",
-			"@type": "Message",
-			"@context": "https://schema.org",
-			"@id": "",
-			additionalType: ["AIGeneratedContent"]
-		}],
+		...require_messenger.buildMSTeamsMessageActivity(text === void 0 ? void 0 : require_messenger.formatMSTeamsMarkdown(text, params.tableMode ?? "code")),
 		channelData: params.feedbackLoopEnabled ? { feedbackLoopEnabled: true } : {}
 	});
 	const deferredReplacementLogicalContent = () => {
@@ -1874,7 +1858,7 @@ function createTeamsReplyStreamController(params) {
 				pendingFinalPayload = { text: payload.text };
 				return;
 			}
-			if (streamFinalizationPending) return;
+			if (streamFinalizationPending || nativeDeliveryClaimed) return;
 			const fullText = payload.text;
 			let prefixLength = 0;
 			while (prefixLength < emittedText.length && prefixLength < fullText.length && emittedText[prefixLength] === fullText[prefixLength]) prefixLength += 1;
@@ -1950,9 +1934,13 @@ function createTeamsReplyStreamController(params) {
 				});
 				pendingFinalPayload = fallbackPayloadForSuppressedFinal(payload);
 				try {
-					replacementTextAwaitingAcknowledgement = payload.text;
-					stream.emit(finalStreamActivity(payload.text));
-					finalMetadataQueued = true;
+					const activity = finalStreamActivity(payload.text);
+					replacementTextAwaitingAcknowledgement = {
+						text: activity.text,
+						logicalText: payload.text
+					};
+					stream.emit(activity);
+					queuedFinalActivity = activity;
 					emittedText = payload.text;
 					tokensEmitted = false;
 					return;
@@ -1971,31 +1959,17 @@ function createTeamsReplyStreamController(params) {
 					return;
 				}
 			}
-			if (tokensEmitted && !streamFailed) {
-				const hasMedia = Boolean(payload.mediaUrl || payload.mediaUrls?.length);
-				pendingFinalPayload = fallbackPayloadForSuppressedFinal(payload);
-				streamFinalizationPending = true;
-				tokensEmitted = false;
-				return hasMedia ? {
-					...payload,
-					text: void 0
-				} : void 0;
-			}
 			if (streamFailed) {
 				const fallback = failedSegmentFallbackPrepared ? payload : fallbackPayloadAfterAcknowledgedText(payload);
 				failedSegmentFallbackPrepared = true;
 				pendingFinalPayload = void 0;
 				return fallback;
 			}
-			if (streamMode === "progress" && payload.text) try {
+			if (streamMode === "progress" && payload.text && !nativeDispatchStarted) try {
 				stream.emit(payload.text);
+				emittedText = payload.text;
 				nativeDispatchStarted = true;
-				pendingFinalPayload = fallbackPayloadForSuppressedFinal(payload);
-				streamFinalizationPending = true;
-				return Boolean(payload.mediaUrl || payload.mediaUrls?.length) ? {
-					...payload,
-					text: void 0
-				} : void 0;
+				tokensEmitted = true;
 			} catch (err) {
 				if (isStreamCancelledError(err)) {
 					canceledLocally = true;
@@ -2003,6 +1977,16 @@ function createTeamsReplyStreamController(params) {
 				}
 				params.log?.debug?.(`progress-mode finalize failed: ${(0, openclaw_plugin_sdk_error_runtime.coerceErrorMessage)(err)}`);
 			}
+			if (tokensEmitted) {
+				const hasMedia = Boolean(payload.mediaUrl || payload.mediaUrls?.length);
+				pendingFinalPayload = fallbackPayloadForSuppressedFinal(payload);
+				streamFinalizationPending = true;
+				tokensEmitted = false;
+				return hasMedia ? {
+					...payload,
+					text: void 0
+				} : void 0;
+			}
 			return payload;
 		},
 		claimNativeDelivery() {
@@ -2031,15 +2015,34 @@ function createTeamsReplyStreamController(params) {
 						kind: "replacement",
 						payload: pendingFinalPayload
 					});
-					replacementTextAwaitingAcknowledgement = pendingFinalPayload.text;
+					const activity = finalStreamActivity(pendingFinalPayload.text);
+					replacementTextAwaitingAcknowledgement = {
+						text: activity.text,
+						logicalText: pendingFinalPayload.text
+					};
 					logicalContent = deferredReplacementLogicalContent();
-					stream.emit(finalStreamActivity(pendingFinalPayload.text));
-					finalMetadataQueued = true;
+					stream.emit(activity);
+					queuedFinalActivity = activity;
 					emittedText = pendingFinalPayload.text;
 				}
 				logicalContent ??= replacementSettlementPending ? deferredReplacementLogicalContent() : void 0;
-				const content = pendingFinalPayload?.text ?? (emittedText || void 0);
-				if (!finalMetadataQueued) stream.emit(finalStreamActivity());
+				const logicalText = pendingFinalPayload?.text ?? (emittedText || void 0);
+				const finalActivity = queuedFinalActivity ?? finalStreamActivity(logicalText);
+				const content = finalActivity.text;
+				logicalContent ??= content !== logicalText ? logicalText : void 0;
+				if (!queuedFinalActivity) {
+					if (content !== void 0 && content !== emittedText) {
+						stream.clearText();
+						replacementTextAwaitingAcknowledgement = {
+							text: content,
+							logicalText
+						};
+						stream.emit(finalActivity);
+					} else stream.emit({
+						...finalActivity,
+						text: void 0
+					});
+				}
 				const result = await stream.close();
 				streamFinalizationPending = false;
 				if (!result) {
@@ -2092,7 +2095,8 @@ function createTeamsReplyStreamController(params) {
 					...postNativePayloads.length > 0 ? { postNativePayloads } : {}
 				};
 			} finally {
-				finalMetadataQueued = false;
+				failedSegmentFallbackPrepared = true;
+				queuedFinalActivity = void 0;
 				replacementEmitFailed = false;
 				replacementFinalPending = false;
 				replacementSettlementPending = false;
@@ -2185,6 +2189,7 @@ function createMSTeamsReplyDispatcher(params) {
 	const feedbackLoopEnabled = params.cfg.channels?.msteams?.feedbackEnabled !== false;
 	const hookRunner = (0, openclaw_plugin_sdk_plugin_runtime.getGlobalHookRunner)();
 	const streamController = createTeamsReplyStreamController({
+		tableMode,
 		allowProviderPreview: !((hookRunner?.hasHooks("reply_payload_sending") ?? false) || (hookRunner?.hasHooks("message_sending") ?? false)),
 		conversationType,
 		context: params.context,
@@ -2200,6 +2205,8 @@ function createMSTeamsReplyDispatcher(params) {
 	const blockStreamingEnabled = blockStreamingResolved ?? false;
 	const typingIndicatorEnabled = typeof msteamsCfg?.typingIndicator === "boolean" ? msteamsCfg.typingIndicator : true;
 	const pendingDeliveries = [];
+	let pendingSettlement;
+	const findPendingNativeDelivery = () => pendingDeliveries.find((candidate) => candidate.native && !candidate.nativeSettled);
 	const joinAcceptedContents = (contents) => contents.filter((content) => Boolean(content)).join("\n");
 	const sendMessages = async (messages) => {
 		return require_messenger.sendMSTeamsMessages({
@@ -2342,9 +2349,11 @@ function createMSTeamsReplyDispatcher(params) {
 	const delivery = {
 		observeMessageSent: true,
 		deliver: async (payload) => {
+			if (pendingSettlement) await pendingSettlement;
 			const preparedPayload = streamController.preparePayload(payload);
 			const native = streamController.claimNativeDelivery();
-			const messages = preparedPayload ? renderReplyPayload(preparedPayload) : [];
+			if (preparedPayload && !native && findPendingNativeDelivery()) await settleDelivery();
+			const messages = preparedPayload && !streamController.wasCanceled() ? renderReplyPayload(preparedPayload) : [];
 			if (!native && messages.length === 0) return {
 				visibleReplySent: false,
 				suppression: { reason: "no_visible_result" }
@@ -2370,9 +2379,9 @@ function createMSTeamsReplyDispatcher(params) {
 			});
 		}
 	};
-	const settleDelivery = async () => {
+	const settleDelivery = () => pendingSettlement ??= Promise.resolve().then(async () => {
 		await flushPendingMessages();
-		const nativeDelivery = pendingDeliveries.find((candidate) => candidate.native && !candidate.nativeSettled);
+		const nativeDelivery = findPendingNativeDelivery();
 		if (!nativeDelivery) {
 			await streamController.finalize();
 			return;
@@ -2406,7 +2415,9 @@ function createMSTeamsReplyDispatcher(params) {
 		} catch (error) {
 			params.log.warn?.("failed to record sent Teams message id", { error: require_channel_setup.formatUnknownError(error) });
 		}
-	};
+	}).finally(() => {
+		pendingSettlement = void 0;
+	});
 	const shouldSuppressDefaultToolProgressMessages = streamController.hasStream() && teamsStreamMode === "progress";
 	const progressCallbacks = streamController.hasStream() ? {
 		onReasoningStream: async (payload) => {
@@ -2592,7 +2603,6 @@ async function dispatchMSTeamsInboundTurn(params) {
 			allowNameMatching
 		}).allowed
 	}) : true;
-	const bodyForAgent = threadContext ? `[Thread history]\n${threadContext}\n[/Thread history]\n\n${agentBody}` : agentBody;
 	const nativeChannelId = isChannel && teamAadGroupId ? `${teamAadGroupId}/${graphChannelId}` : void 0;
 	const boundIngress = await resolveMSTeamsSenderAccess({
 		cfg,
@@ -2611,13 +2621,25 @@ async function dispatchMSTeamsInboundTurn(params) {
 		channelIngress: boundIngress.channelIngress,
 		channel: "msteams",
 		contextVisibility: contextVisibilityMode,
-		supplemental: { quote: quoteInfo ? {
-			id: quoteInfo.id ?? activity.replyToId ?? void 0,
-			body: quoteBodyFull ?? quoteInfo.body,
-			sender: quoteInfo.sender,
-			senderAllowed: quoteSenderAllowed,
-			isQuote: true
-		} : void 0 },
+		supplemental: {
+			channelStructuredContext: threadContext.length ? [{
+				label: "Thread history",
+				source: "msteams",
+				type: "chat_window",
+				sessionTranscriptMode: "preserve",
+				payload: {
+					order: "chronological",
+					messages: threadContext
+				}
+			}] : void 0,
+			quote: quoteInfo ? {
+				id: quoteInfo.id ?? activity.replyToId ?? void 0,
+				body: quoteBodyFull ?? quoteInfo.body,
+				sender: quoteInfo.sender,
+				senderAllowed: quoteSenderAllowed,
+				isQuote: true
+			} : void 0
+		},
 		media: await (0, openclaw_plugin_sdk_channel_inbound.toInboundMediaFactsWithMetadata)(inboundMedia),
 		messageId: activity.id,
 		timestamp: timestamp?.getTime() ?? Date.now(),
@@ -2648,7 +2670,7 @@ async function dispatchMSTeamsInboundTurn(params) {
 		},
 		message: {
 			body: combinedBody,
-			bodyForAgent,
+			bodyForAgent: agentBody,
 			inboundHistory,
 			rawBody,
 			commandBody
@@ -2709,7 +2731,7 @@ async function dispatchMSTeamsInboundTurn(params) {
 					id: activity.id ?? `${teamsFrom}:${Date.now()}`,
 					timestamp: timestamp?.getTime(),
 					rawText: rawBody,
-					textForAgent: bodyForAgent,
+					textForAgent: agentBody,
 					textForCommands: commandBody,
 					raw: activity
 				}),
@@ -3052,7 +3074,7 @@ async function resolveMSTeamsThreadContext(params) {
 	} catch (err) {
 		params.log.debug?.("failed to fetch full quoted message text", { error: require_channel_setup.formatUnknownError(err) });
 	}
-	let threadContext;
+	let threadContext = [];
 	const threadParentId = params.routing.threadRootId;
 	if (threadParentId && threadParentId !== activity.id && params.isChannel && teamAadGroupId) try {
 		const graphToken = await require_resolve_allowlist.withMSTeamsRequestDeadline({
@@ -3103,7 +3125,7 @@ async function resolveMSTeamsThreadContext(params) {
 			kind: "thread",
 			isSenderAllowed: isThreadSenderAllowed
 		});
-		threadContext = require_reaction_types.formatThreadContext(threadMessages, activity.id) || void 0;
+		threadContext = require_reaction_types.buildThreadContext(threadMessages, activity.id);
 	} catch (err) {
 		params.log.debug?.("failed to fetch thread history", { error: require_channel_setup.formatUnknownError(err) });
 	}

package/openclaw.plugin.json

@@ -2,7 +2,23 @@
   "id": "msteams",
   "doctorContract": {
     "configRepair": true,
-    "stateMigrations": true
+    "stateMigrations": [
+      {
+        "id": "msteams-conversations-json-to-plugin-state"
+      },
+      {
+        "id": "msteams-polls-json-to-plugin-state"
+      },
+      {
+        "id": "msteams-sso-tokens-json-to-plugin-state"
+      },
+      {
+        "id": "msteams-delegated-token-json-to-plugin-state"
+      },
+      {
+        "id": "msteams-feedback-learnings-json-to-plugin-state"
+      }
+    ]
   },
   "name": "Microsoft Teams",
   "description": "OpenClaw Microsoft Teams channel plugin for bot conversations.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/msteams",
-  "version": "2026.9.2",
+  "version": "2026.9.3",
   "description": "OpenClaw Microsoft Teams channel plugin for bot conversations.",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "openclaw": "workspace:*"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.9.2"
+    "openclaw": ">=2026.9.3"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -72,10 +72,10 @@
       "minHostVersion": ">=2026.4.10"
     },
     "compat": {
-      "pluginApi": ">=2026.9.2"
+      "pluginApi": ">=2026.9.3"
     },
     "build": {
-      "openclawVersion": "2026.9.2",
+      "openclawVersion": "2026.9.3",
       "runtimeFormat": "cjs"
     },
     "release": {