@openclaw/msteams 2026.10.5-beta.3 → 2026.10.10-beta.1

package/dist/.setup/{channel-Cifn9fsv.cjs → channel-B7Gy3QUW.cjs}

@@ -1,9 +1,9 @@
 const require_rolldown_runtime = require("./rolldown-runtime-BloeesfJ.cjs");
+const require_resolve_allowlist = require("./resolve-allowlist-tYgAHx0t.cjs");
 require("../runtime-api.cjs");
-const require_resolve_allowlist = require("./resolve-allowlist-DdDBVCzl.cjs");
 const require_directory_contract_api = require("../directory-contract-api.cjs");
-const require_thread_session = require("./thread-session-B74FC1Id.cjs");
-const require_channel_setup = require("./channel.setup-BjbHugkL.cjs");
+const require_thread_session = require("./thread-session-C7KTMwLU.cjs");
+const require_channel_setup = require("./channel.setup-B5ClEcNI.cjs");
 let openclaw_plugin_sdk_approval_handler_adapter_runtime = require("openclaw/plugin-sdk/approval-handler-adapter-runtime");
 let openclaw_plugin_sdk_channel_actions = require("openclaw/plugin-sdk/channel-actions");
 let openclaw_plugin_sdk_channel_core = require("openclaw/plugin-sdk/channel-core");
@@ -17,12 +17,12 @@ let openclaw_plugin_sdk_lazy_runtime = require("openclaw/plugin-sdk/lazy-runtime
 let openclaw_plugin_sdk_status_helpers = require("openclaw/plugin-sdk/status-helpers");
 let openclaw_plugin_sdk_string_coerce_runtime = require("openclaw/plugin-sdk/string-coerce-runtime");
 let openclaw_plugin_sdk_tool_results = require("openclaw/plugin-sdk/tool-results");
-let typebox = require("typebox");
 let openclaw_plugin_sdk_account_id = require("openclaw/plugin-sdk/account-id");
 let openclaw_plugin_sdk_text_chunking = require("openclaw/plugin-sdk/text-chunking");
 let openclaw_plugin_sdk_reply_reference = require("openclaw/plugin-sdk/reply-reference");
 let openclaw_plugin_sdk_approval_delivery_runtime = require("openclaw/plugin-sdk/approval-delivery-runtime");
 let openclaw_plugin_sdk_approval_native_runtime = require("openclaw/plugin-sdk/approval-native-runtime");
+let typebox = require("typebox");
 let openclaw_plugin_sdk_channel_targets = require("openclaw/plugin-sdk/channel-targets");
 let openclaw_plugin_sdk_dangerous_name_runtime = require("openclaw/plugin-sdk/dangerous-name-runtime");
 let openclaw_plugin_sdk_runtime_group_policy = require("openclaw/plugin-sdk/runtime-group-policy");
@@ -122,7 +122,7 @@ function resolveMSTeamsRouteConfig(params) {
 	};
 }
 function resolveMSTeamsGroupToolPolicy(params) {
-	const cfg = params.cfg.channels?.msteams;
+	const cfg = require_resolve_allowlist.resolveMSTeamsAccountConfig(params.cfg, params.accountId);
 	if (!cfg) return;
 	const teams = cfg.teams ?? {};
 	const team = selectMSTeamsPolicyEntry(teams, params.groupSpace);
@@ -229,8 +229,7 @@ function resolveMSTeamsAutoThreadId(params) {
 //#endregion
 //#region extensions/msteams/src/approval-native.ts
 function isMSTeamsApprovalTransportEnabled(params) {
-	if (params.accountId && (0, openclaw_plugin_sdk_account_id.normalizeAccountId)(params.accountId) !== openclaw_plugin_sdk_account_id.DEFAULT_ACCOUNT_ID) return false;
-	const account = require_channel_setup.resolveMSTeamsAccount(params.cfg);
+	const account = require_resolve_allowlist.resolveMSTeamsAccount(params);
 	return account.enabled && account.configured && account.tokenStatus === "available";
 }
 const msTeamsMessagingTargetResolvers = (0, openclaw_plugin_sdk_approval_native_runtime.createNativeApprovalMessagingTargetResolvers)({
@@ -254,12 +253,12 @@ const msTeamsApprovalTargetResolvers = {
 		} : null;
 	}
 };
-const msTeamsApprovalRouteGates = (0, openclaw_plugin_sdk_approval_native_runtime.createNativeApprovalChannelRouteGates)({
+const msTeamsApprovalRouteGates = (0, openclaw_plugin_sdk_approval_native_runtime.createNativeApprovalChannelRouteGatesAsync)({
 	channel: "msteams",
 	defaultForwardingMode: "session",
 	isTransportEnabled: isMSTeamsApprovalTransportEnabled,
 	listAccountIds: require_channel_setup.msteamsConfigAdapter.listAccountIds,
-	resolveDefaultAccountId: () => openclaw_plugin_sdk_account_id.DEFAULT_ACCOUNT_ID,
+	resolveDefaultAccountId: require_resolve_allowlist.resolveDefaultMSTeamsAccountId,
 	normalizeForwardTarget: msTeamsApprovalTargetResolvers.normalizeForwardTarget,
 	resolveTurnSourceTarget: msTeamsApprovalTargetResolvers.resolveTurnSourceTarget
 });
@@ -269,8 +268,8 @@ function isMSTeamsNativeApprovalClientEnabled(params) {
 		nativeSessionOnly: true
 	}) && require_thread_session.getMSTeamsApprovalApprovers(params).length > 0;
 }
-function shouldHandleMSTeamsNativeApprovalRequest(params) {
-	return msTeamsApprovalRouteGates.shouldHandleApprovalRequest(params) && require_thread_session.getMSTeamsApprovalApprovers(params).length > 0 && Boolean(msTeamsApprovalTargetResolvers.resolveTurnSourceTarget(params.request));
+async function shouldHandleMSTeamsNativeApprovalRequest(params) {
+	return await msTeamsApprovalRouteGates.shouldHandleApprovalRequest(params) && require_thread_session.getMSTeamsApprovalApprovers(params).length > 0 && Boolean(msTeamsApprovalTargetResolvers.resolveTurnSourceTarget(params.request));
 }
 function shouldSuppressLocalMSTeamsExecApprovalPrompt(params) {
 	return (0, openclaw_plugin_sdk_approval_native_runtime.shouldSuppressLocalNativeExecApprovalPrompt)({
@@ -278,14 +277,14 @@ function shouldSuppressLocalMSTeamsExecApprovalPrompt(params) {
 		isNativeDeliveryEnabled: isMSTeamsNativeApprovalClientEnabled
 	});
 }
-const resolveMSTeamsOriginTarget = (0, openclaw_plugin_sdk_approval_native_runtime.createChannelNativeOriginTargetResolver)({
+const resolveMSTeamsOriginTarget = (0, openclaw_plugin_sdk_approval_native_runtime.createChannelNativeOriginTargetResolverAsync)({
 	channel: "msteams",
 	shouldHandleRequest: shouldHandleMSTeamsNativeApprovalRequest,
 	resolveTurnSourceTarget: msTeamsApprovalTargetResolvers.resolveTurnSourceTarget,
 	resolveSessionTarget: msTeamsApprovalTargetResolvers.resolveSessionTarget,
 	normalizeTarget: msTeamsApprovalTargetResolvers.normalizeTarget
 });
-const msTeamsLazyApprovalNativeRuntime = (0, openclaw_plugin_sdk_approval_handler_adapter_runtime.createLazyChannelApprovalNativeRuntimeAdapter)({
+const msTeamsLazyApprovalNativeRuntime = (0, openclaw_plugin_sdk_approval_handler_adapter_runtime.createLazyChannelApprovalNativeRuntimeAdapterAsync)({
 	capabilityBoundary: true,
 	eventKinds: [
 		"exec",
@@ -303,11 +302,11 @@ const msTeamsLazyApprovalNativeRuntime = (0, openclaw_plugin_sdk_approval_handle
 		request
 	}),
 	load: async () => {
-		const { msTeamsApprovalNativeRuntime } = await Promise.resolve().then(() => require("./approval-handler.runtime-bUN9icMr.cjs"));
+		const { msTeamsApprovalNativeRuntime } = await Promise.resolve().then(() => require("./approval-handler.runtime-DccVf5AY.cjs"));
 		return msTeamsApprovalNativeRuntime;
 	}
 });
-const resolveMSTeamsApproverDmTargets = (0, openclaw_plugin_sdk_approval_native_runtime.createChannelApproverDmTargetResolver)({
+const resolveMSTeamsApproverDmTargets = (0, openclaw_plugin_sdk_approval_native_runtime.createChannelApproverDmTargetResolverAsync)({
 	shouldHandleRequest: shouldHandleMSTeamsNativeApprovalRequest,
 	resolveApprovers: require_thread_session.getMSTeamsApprovalApprovers,
 	mapApprover: (approver, params) => ({
@@ -316,7 +315,7 @@ const resolveMSTeamsApproverDmTargets = (0, openclaw_plugin_sdk_approval_native_
 	})
 });
 const msTeamsApprovalCapability = {
-	...(0, openclaw_plugin_sdk_approval_delivery_runtime.createApproverRestrictedNativeApprovalCapability)({
+	...(0, openclaw_plugin_sdk_approval_delivery_runtime.createApproverRestrictedNativeApprovalCapabilityAsync)({
 		channel: "msteams",
 		channelLabel: "Microsoft Teams",
 		describeExecApprovalSetup: () => "Approve it from the Web UI for now. Microsoft Teams supports native approvals when the bot is configured. Configure `channels.msteams.allowFrom` or `channels.msteams.defaultTo` with Microsoft Entra object ID approvers.",
@@ -339,17 +338,52 @@ const msTeamsApprovalCapability = {
 			action: "approve",
 			approvalKind: "plugin"
 		})?.authorized ?? false,
-		isNativeDeliveryEnabled: isMSTeamsNativeApprovalClientEnabled,
+		isNativeDeliveryEnabled: async (params) => isMSTeamsNativeApprovalClientEnabled(params),
 		resolveNativeDeliveryMode: () => "channel",
 		requireMatchingTurnSourceChannel: true,
 		resolveSuppressionAccountId: ({ target, request }) => (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(target.accountId) ?? (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(request.request.turnSourceAccountId),
 		resolveOriginTarget: resolveMSTeamsOriginTarget,
 		resolveApproverDmTargets: resolveMSTeamsApproverDmTargets,
-		nativeRuntime: msTeamsLazyApprovalNativeRuntime
+		nativeRuntimeAsync: msTeamsLazyApprovalNativeRuntime
 	}),
-	authorizeActorAction: (params) => require_thread_session.msTeamsApprovalAuth.authorizeActorAction?.(params)
+	authorizeActorActionAsync: async (params) => require_thread_session.msTeamsApprovalAuth.authorizeActorAction?.(params)
 };
 //#endregion
+//#region extensions/msteams/src/channel-message-tool.ts
+function describeMSTeamsMessageTool({ cfg, accountId }) {
+	const account = require_resolve_allowlist.resolveMSTeamsAccount({
+		cfg,
+		accountId
+	});
+	const enabled = account.enabled && account.configured && account.tokenStatus === "available";
+	return {
+		actions: enabled ? [
+			"upload-file",
+			"poll",
+			"edit",
+			"delete",
+			"pin",
+			"unpin",
+			"list-pins",
+			"read",
+			"react",
+			"reactions",
+			"search",
+			"member-info",
+			"channel-list",
+			"channel-info",
+			"addParticipant",
+			"removeParticipant",
+			"renameGroup"
+		] : [],
+		capabilities: enabled ? ["presentation"] : [],
+		schema: enabled ? {
+			actions: ["unpin"],
+			properties: { pinnedMessageId: typebox.Type.Optional(typebox.Type.String({ description: "Pinned message resource ID for unpin (from pin or list-pins, not the chat message ID)." })) }
+		} : null
+	};
+}
+//#endregion
 //#region src/gateway/gateway-http-route-contracts.ts
 const GATEWAY_PROBE_ROUTES = /* @__PURE__ */ new Map([
 	["/health", "live"],
@@ -482,18 +516,39 @@ var gateway_config_runtime_exports = /* @__PURE__ */ require_rolldown_runtime.__
 require_rolldown_runtime.__reExport(gateway_config_runtime_exports, require("openclaw/plugin-sdk/gateway-config-runtime"));
 //#endregion
 //#region extensions/msteams/src/webhook-route.ts
+function resolveMSTeamsWebhookCollisionIssue(cfg) {
+	const owners = /* @__PURE__ */ new Map();
+	for (const accountId of require_resolve_allowlist.listMSTeamsAccountIds(cfg)) {
+		const account = require_resolve_allowlist.resolveMSTeamsAccountConfig(cfg, accountId);
+		if (account.enabled === false) continue;
+		const path = account.webhook?.path || "/api/messages";
+		const paths = accountId === openclaw_plugin_sdk_account_id.DEFAULT_ACCOUNT_ID && path !== "/api/messages" ? [path, "/api/messages"] : [path];
+		for (const routePath of paths) {
+			const canonical = resolvePluginRoutePathContext(routePath).canonicalPath;
+			const owner = owners.get(canonical);
+			if (owner && owner !== accountId) return "Microsoft Teams webhook path " + routePath + " is shared by accounts " + owner + " and " + accountId + ". Configure distinct webhook.path values.";
+			owners.set(canonical, accountId);
+		}
+	}
+}
 function resolveMSTeamsLegacyWebhook(config) {
 	return config?.legacyWebhook || void 0;
 }
-function resolveMSTeamsWebhookPathIssue({ cfg, env }) {
-	const channel = cfg.channels?.msteams;
+function resolveMSTeamsLegacyWebhookConfigPath(cfg, accountId) {
+	const accountKey = require_resolve_allowlist.resolveMSTeamsAccountEntryKey(cfg.channels?.msteams?.accounts, accountId);
+	return accountKey && cfg.channels?.msteams?.accounts?.[accountKey]?.legacyWebhook ? `${require_resolve_allowlist.resolveMSTeamsAccountConfigPath(cfg, accountId)}.legacyWebhook` : "channels.msteams.legacyWebhook";
+}
+function resolveMSTeamsWebhookPathIssue({ cfg, env, accountId = openclaw_plugin_sdk_account_id.DEFAULT_ACCOUNT_ID, accountConfig = require_resolve_allowlist.resolveMSTeamsAccountConfig(cfg, accountId) }) {
+	const channel = accountConfig;
 	const path = channel?.webhook?.path || "/api/messages";
 	const legacy = resolveMSTeamsLegacyWebhook(channel);
 	const pathname = URL.parse(path, "http://localhost")?.pathname ?? path;
 	const probe = classifyGatewayProbePath(pathname);
 	const reason = isProtectedPluginRoutePathFromContext(resolvePluginRoutePathContext(pathname)) ? "requires Gateway authentication on the main HTTP listener" : probe !== "namespace" && probe !== "outside" ? "is reserved for Gateway checks" : /[:*{}\\]/.test(path) ? "uses Express pattern syntax that requires the compatibility listener" : void 0;
 	if (!reason) return;
-	return `Microsoft Teams webhook path ${path} ${reason}. Set channels.msteams.webhook.path to /api/messages and update the Azure Bot messaging endpoint or reverse-proxy upstream to Gateway port ${(0, gateway_config_runtime_exports.resolveGatewayPort)(cfg, env)}/api/messages; verify delivery before removing channels.msteams.legacyWebhook.` + (legacy ? ` Compatibility port ${legacy.port} continues serving the current path.` : " The compatibility listener is disabled, so this path cannot receive Teams callbacks.");
+	const configPath = require_resolve_allowlist.resolveMSTeamsAccountConfigPath(cfg, accountId);
+	const recoveryPath = accountId === openclaw_plugin_sdk_account_id.DEFAULT_ACCOUNT_ID ? "/api/messages" : `/api/messages/${accountId}`;
+	return `Microsoft Teams webhook path ${path} ${reason}. Set ${configPath}.webhook.path to ${recoveryPath} and update the Azure Bot messaging endpoint or reverse-proxy upstream to Gateway port ${(0, gateway_config_runtime_exports.resolveGatewayPort)(cfg, env)}${recoveryPath}.` + (legacy ? ` Compatibility port ${legacy.port} continues serving the current path; verify delivery before removing ${resolveMSTeamsLegacyWebhookConfigPath(cfg, accountId)}.` : " The compatibility listener is disabled, so this path cannot receive Teams callbacks.");
 }
 //#endregion
 //#region extensions/msteams/src/doctor.ts
@@ -513,22 +568,31 @@ function runMSTeamsWebhookDoctorSequence({ cfg, env }) {
 		warningNotes: [],
 		infoNotes: []
 	};
-	const pathIssue = resolveMSTeamsWebhookPathIssue({
-		cfg,
-		env
-	});
-	if (pathIssue) return {
-		changeNotes: [],
-		warningNotes: [pathIssue],
-		infoNotes: []
-	};
-	const path = channel.webhook?.path || "/api/messages";
+	const warningNotes = [];
+	const infoNotes = [];
 	const port = (0, gateway_config_runtime_exports.resolveGatewayPort)(cfg, env);
-	const legacy = resolveMSTeamsLegacyWebhook(channel);
+	for (const accountId of require_resolve_allowlist.listMSTeamsAccountIds(cfg)) {
+		const accountConfig = require_resolve_allowlist.resolveMSTeamsAccountConfig(cfg, accountId);
+		if (accountConfig.enabled === false) continue;
+		const pathIssue = resolveMSTeamsWebhookPathIssue({
+			cfg,
+			env,
+			accountId,
+			accountConfig
+		});
+		if (pathIssue) {
+			warningNotes.push(pathIssue);
+			continue;
+		}
+		const path = accountConfig.webhook?.path || "/api/messages";
+		const legacy = resolveMSTeamsLegacyWebhook(accountConfig);
+		const label = accountId === openclaw_plugin_sdk_account_id.DEFAULT_ACCOUNT_ID ? "Microsoft Teams" : `Microsoft Teams (${accountId})`;
+		infoNotes.push(legacy ? `${label}: compatibility port ${legacy.port} continues forwarding to Gateway route ${path}. To use only the Gateway listener, update the Azure Bot messaging endpoint or reverse-proxy upstream to Gateway port ${port}${path}, verify delivery, then remove the ${resolveMSTeamsLegacyWebhookConfigPath(cfg, accountId)} pin to close the old port.` : `${label} webhooks use Gateway port ${port}${path}; no compatibility listener is configured. Point the Azure Bot messaging endpoint or reverse-proxy upstream to this route.`);
+	}
 	return {
 		changeNotes: [],
-		warningNotes: [],
-		infoNotes: [legacy ? `Microsoft Teams: compatibility port ${legacy.port} continues forwarding to Gateway route ${path}. To use only the Gateway listener, update the Azure Bot messaging endpoint or reverse-proxy upstream to Gateway port ${port}${path}, verify delivery, then remove the channels.msteams.legacyWebhook pin to close the old port.` : `Microsoft Teams webhooks use Gateway port ${port}${path}; no compatibility listener is configured. Point the Azure Bot messaging endpoint or reverse-proxy upstream to this route.`]
+		warningNotes,
+		infoNotes
 	};
 }
 const msteamsDoctor = {
@@ -678,6 +742,16 @@ function sameAccount(ctx) {
 	const requester = (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.requesterAccountId);
 	return requester !== void 0 && requester === requested;
 }
+function resolveReadPolicyAccountId(cfg, ctx) {
+	return (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx?.accountId) ?? require_resolve_allowlist.resolveDefaultMSTeamsAccountId(cfg);
+}
+function resolveReadPolicyConfig(cfg, accountId) {
+	return require_resolve_allowlist.withAccountScopedMSTeamsConfig({
+		cfg,
+		accountId,
+		accountConfig: require_resolve_allowlist.resolveMSTeamsAccountConfig(cfg, accountId)
+	});
+}
 function isCurrentMSTeamsReadTarget(params) {
 	if ((0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(params.ctx.toolContext?.currentChannelProvider)?.toLowerCase() !== "msteams" || !sameAccount(params.ctx)) return false;
 	const candidates = [
@@ -694,7 +768,7 @@ function normalizeUserTarget(target) {
 function isStableUserId(value) {
 	return /^[0-9a-f-]{16,}$/i.test(value);
 }
-async function resolveDmTarget(cfg, target, directOperator = false) {
+async function resolveDmTarget(cfg, accountId, target, directOperator = false) {
 	const teams = cfg.channels?.msteams;
 	if (teams?.dmPolicy === "disabled") return;
 	const userId = normalizeUserTarget(target);
@@ -706,6 +780,7 @@ async function resolveDmTarget(cfg, target, directOperator = false) {
 	try {
 		const [resolvedTarget, ...resolvedEntries] = await require_resolve_allowlist.resolveMSTeamsUserAllowlist({
 			cfg,
+			accountId,
 			entries: [userId, ...normalizedEntries.filter((entry) => entry !== "*")]
 		});
 		if (!resolvedTarget?.resolved || !resolvedTarget.id) return;
@@ -735,24 +810,25 @@ function hasMutableChannelConfig(cfg) {
 		return Object.keys(teamConfig?.channels ?? {}).some((channelKey) => channelKey !== "*" && !isStableChannelKey(channelKey));
 	});
 }
-async function resolveConfiguredBotFrameworkTeamKey(cfg, graphTeamId) {
+async function resolveConfiguredBotFrameworkTeamKey(cfg, accountId, graphTeamId) {
 	const configuredTeams = cfg.channels?.msteams?.teams;
 	if (!configuredTeams) return;
 	const stableConfiguredKeys = Object.keys(configuredTeams).filter((teamKey) => teamKey !== "*" && /^19:.+@thread\./i.test(teamKey));
 	if (stableConfiguredKeys.length === 0) return;
-	const token = await require_resolve_allowlist.resolveGraphToken(cfg);
+	const token = await require_resolve_allowlist.resolveGraphToken(cfg, { accountId });
 	const channelResult = await require_resolve_allowlist.listChannelsForTeamWithPageInfo(token, graphTeamId);
 	if (channelResult.truncated) return;
 	const channelIds = new Set(channelResult.items.map((channel) => channel.id?.trim()).filter((channelId) => Boolean(channelId)));
 	const matches = stableConfiguredKeys.filter((teamKey) => channelIds.has(teamKey));
 	return matches.length === 1 ? matches[0] : void 0;
 }
-async function resolveStableChannelTarget(cfg, target) {
+async function resolveStableChannelTarget(cfg, accountId, target) {
 	if (isStableGraphChannelTarget(target)) return target;
 	if (!(0, openclaw_plugin_sdk_dangerous_name_runtime.isDangerousNameMatchingEnabled)(cfg.channels?.msteams)) return;
 	try {
 		const [resolved] = await require_resolve_allowlist.resolveMSTeamsChannelAllowlist({
 			cfg,
+			accountId,
 			entries: [target]
 		});
 		return resolved?.resolved && resolved.graphTeamId && resolved.channelId ? `${resolved.graphTeamId}/${resolved.channelId}` : void 0;
@@ -760,7 +836,7 @@ async function resolveStableChannelTarget(cfg, target) {
 		return;
 	}
 }
-async function resolveAllowedChannelTarget(cfg, target) {
+async function resolveAllowedChannelTarget(cfg, accountId, target) {
 	const teams = cfg.channels?.msteams;
 	const groupPolicy = resolveMSTeamsReadGroupPolicy(cfg);
 	if (groupPolicy === "disabled") return;
@@ -774,19 +850,19 @@ async function resolveAllowedChannelTarget(cfg, target) {
 		channelName: channelId,
 		allowNameMatching: (0, openclaw_plugin_sdk_dangerous_name_runtime.isDangerousNameMatchingEnabled)(teams)
 	});
-	const stableTarget = await resolveStableChannelTarget(cfg, target);
+	const stableTarget = await resolveStableChannelTarget(cfg, accountId, target);
 	if (!directRoute.allowlistConfigured && groupPolicy !== "open" && stableTarget) throw new openclaw_plugin_sdk_channel_actions.ToolAuthorizationError("Microsoft Teams read target is not allowed. Configure channels.msteams.teams.<team>.channels for this channel, or deliberately set channels.msteams.groupPolicy to \"open\".");
 	if (directRoute.allowed) return stableTarget;
 	if (!stableTarget || !teams?.teams) return;
 	const [stableTeamId, stableChannelId] = stableTarget.split("/", 2);
 	if (!stableTeamId || !stableChannelId) return;
-	return await isMappedChannelAllowed(cfg, stableTeamId, stableChannelId) ? stableTarget : void 0;
+	return await isMappedChannelAllowed(cfg, accountId, stableTeamId, stableChannelId) ? stableTarget : void 0;
 }
-async function isMappedChannelAllowed(cfg, teamId, conversationId) {
+async function isMappedChannelAllowed(cfg, accountId, teamId, conversationId) {
 	const teams = cfg.channels?.msteams;
 	if (!teams?.teams) return false;
 	try {
-		const botFrameworkTeamKey = await resolveConfiguredBotFrameworkTeamKey(cfg, teamId);
+		const botFrameworkTeamKey = await resolveConfiguredBotFrameworkTeamKey(cfg, accountId, teamId);
 		if (botFrameworkTeamKey && resolveMSTeamsRouteConfig({
 			cfg: teams,
 			teamId: botFrameworkTeamKey,
@@ -795,6 +871,7 @@ async function isMappedChannelAllowed(cfg, teamId, conversationId) {
 		if (!hasMutableChannelConfig(cfg)) return false;
 		const resolved = await require_resolve_allowlist.resolveMSTeamsTeamsConfig({
 			cfg,
+			accountId,
 			teamIdMode: "graph",
 			teams: teams.teams
 		});
@@ -815,25 +892,32 @@ function bothUnknownScopesAllowed(cfg) {
 	return resolveMSTeamsReadGroupPolicy(cfg) === "open" && (teams?.dmPolicy ?? "pairing") === "open";
 }
 async function assertMSTeamsReadTargetAllowed(params) {
+	const accountId = resolveReadPolicyAccountId(params.cfg, params.ctx);
+	const cfg = resolveReadPolicyConfig(params.cfg, accountId);
 	const target = normalizeTarget(params.target);
 	const isChannel = target.includes("/");
 	const isDm = /^user:/i.test(target);
 	const isChat = require_resolve_allowlist.looksLikeMSTeamsConversationId(target);
 	const current = isCurrentMSTeamsReadTarget({
-		ctx: params.ctx,
+		ctx: {
+			...params.ctx,
+			accountId
+		},
 		target
 	});
 	const directOperator = params.ctx.conversationReadOrigin === "direct-operator";
 	const currentChatType = params.ctx.toolContext?.currentChatType;
-	const groupEnabled = resolveMSTeamsReadGroupPolicy(params.cfg) !== "disabled";
-	const dmEnabled = params.cfg.channels?.msteams?.dmPolicy !== "disabled";
-	const allowedTarget = directOperator ? isChannel ? groupEnabled ? await resolveStableChannelTarget(params.cfg, target) : void 0 : isDm ? await resolveDmTarget(params.cfg, target, true) : isChat && groupEnabled && dmEnabled ? target : void 0 : current ? (isChannel ? groupEnabled : isDm || currentChatType === "direct" ? dmEnabled : currentChatType === "group" || currentChatType === "channel" ? groupEnabled : groupEnabled && dmEnabled) ? target : void 0 : isChannel ? await resolveAllowedChannelTarget(params.cfg, target) : isDm ? await resolveDmTarget(params.cfg, target) : isChat ? bothUnknownScopesAllowed(params.cfg) ? target : void 0 : false;
+	const groupEnabled = resolveMSTeamsReadGroupPolicy(cfg) !== "disabled";
+	const dmEnabled = cfg.channels?.msteams?.dmPolicy !== "disabled";
+	const allowedTarget = directOperator ? isChannel ? groupEnabled ? await resolveStableChannelTarget(cfg, accountId, target) : void 0 : isDm ? await resolveDmTarget(cfg, accountId, target, true) : isChat && groupEnabled && dmEnabled ? target : void 0 : current ? (isChannel ? groupEnabled : isDm || currentChatType === "direct" ? dmEnabled : currentChatType === "group" || currentChatType === "channel" ? groupEnabled : groupEnabled && dmEnabled) ? target : void 0 : isChannel ? await resolveAllowedChannelTarget(cfg, accountId, target) : isDm ? await resolveDmTarget(cfg, accountId, target) : isChat ? bothUnknownScopesAllowed(cfg) ? target : void 0 : false;
 	if (!allowedTarget) throw new openclaw_plugin_sdk_channel_actions.ToolAuthorizationError("Microsoft Teams read target is not allowed.");
 	return allowedTarget;
 }
 async function assertMSTeamsTeamEnumerationAllowed(params) {
-	const teams = params.cfg.channels?.msteams;
-	const groupPolicy = resolveMSTeamsReadGroupPolicy(params.cfg);
+	const accountId = resolveReadPolicyAccountId(params.cfg, params.ctx);
+	const cfg = resolveReadPolicyConfig(params.cfg, accountId);
+	const teams = cfg.channels?.msteams;
+	const groupPolicy = resolveMSTeamsReadGroupPolicy(cfg);
 	if (groupPolicy === "disabled") throw new openclaw_plugin_sdk_channel_actions.ToolAuthorizationError("Microsoft Teams channel list is not allowed.");
 	const directRoute = resolveMSTeamsRouteConfig({
 		cfg: teams,
@@ -843,12 +927,13 @@ async function assertMSTeamsTeamEnumerationAllowed(params) {
 		allowNameMatching: (0, openclaw_plugin_sdk_dangerous_name_runtime.isDangerousNameMatchingEnabled)(teams)
 	});
 	const stableTeamId = isStableGraphTeamId(params.teamId) ? params.teamId : (0, openclaw_plugin_sdk_dangerous_name_runtime.isDangerousNameMatchingEnabled)(teams) ? (await require_resolve_allowlist.resolveMSTeamsChannelAllowlist({
-		cfg: params.cfg,
+		cfg,
+		accountId,
 		entries: [params.teamId]
 	}))[0]?.graphTeamId : void 0;
 	if (!stableTeamId) throw new openclaw_plugin_sdk_channel_actions.ToolAuthorizationError("Microsoft Teams channel list requires access to every channel in the team.");
 	if (params.ctx?.conversationReadOrigin === "direct-operator") return stableTeamId;
-	if (!((directRoute.allowlistConfigured ? directRoute.allowed : groupPolicy === "open") || await isMappedChannelAllowed(params.cfg, stableTeamId, "__openclaw_all_channels__"))) throw new openclaw_plugin_sdk_channel_actions.ToolAuthorizationError("Microsoft Teams channel list requires access to every channel in the team.");
+	if (!((directRoute.allowlistConfigured ? directRoute.allowed : groupPolicy === "open") || await isMappedChannelAllowed(cfg, accountId, stableTeamId, "__openclaw_all_channels__"))) throw new openclaw_plugin_sdk_channel_actions.ToolAuthorizationError("Microsoft Teams channel list requires access to every channel in the team.");
 	return stableTeamId;
 }
 //#endregion
@@ -914,18 +999,13 @@ const TEAMS_GRAPH_PERMISSION_HINTS = {
 	"Sites.Read.All": "files (SharePoint)",
 	"Files.Read.All": "files (OneDrive)"
 };
-const collectMSTeamsSecurityWarnings = (0, openclaw_plugin_sdk_channel_policy.createAllowlistProviderGroupPolicyWarningCollector)({
-	providerConfigPresent: (cfg) => cfg.channels?.msteams !== void 0,
-	resolveGroupPolicy: ({ cfg }) => cfg.channels?.msteams?.groupPolicy,
-	collect: ({ groupPolicy }) => groupPolicy === "open" ? ["- MS Teams groups: groupPolicy=\"open\" allows any member to trigger (mention-gated). Set channels.msteams.groupPolicy=\"allowlist\" + channels.msteams.groupAllowFrom to restrict senders."] : []
-});
 const collectMSTeamsSecurityFindings = openclaw_plugin_sdk_channel_policy.createConditionalWarningCollector.findings({
-	collectWarnings: collectMSTeamsSecurityWarnings,
+	collectWarnings: require_channel_setup.collectMSTeamsSecurityWarnings,
 	checkId: "channels.msteams.groups.open",
 	severity: "warn",
 	title: "MS Teams security warning"
 });
-const loadMSTeamsChannelRuntime = (0, openclaw_plugin_sdk_lazy_runtime.createLazyRuntimeNamedExport)(() => Promise.resolve().then(() => require("./channel.runtime-DWRAolil.cjs")), "msTeamsChannelRuntime");
+const loadMSTeamsChannelRuntime = (0, openclaw_plugin_sdk_lazy_runtime.createLazyRuntimeNamedExport)(() => Promise.resolve().then(() => require("./channel.runtime-DzKeQAqd.cjs")), "msTeamsChannelRuntime");
 const MSTEAMS_REACTION_TYPES = [
 	"like",
 	"heart",
@@ -952,44 +1032,21 @@ function resolveGraphActionTarget(params, currentChannelId, currentGraphChannelI
 	if (currentGraphTarget) return currentGraphTarget;
 	return currentChatType === "channel" ? "" : currentChannelTarget ?? "";
 }
-function resolveMSTeamsActionMessageId(ctx, to, allowCurrentMessageIdFallback = false) {
-	const messageId = allowCurrentMessageIdFallback && msteamsContextTargetsMatch(to, {
+function resolveMSTeamsActionMessage(ctx, to, allowCurrentMessageIdFallback = false) {
+	const canUseCurrentMessageId = allowCurrentMessageIdFallback && msteamsContextTargetsMatch(to, {
 		currentChannelId: ctx.toolContext?.currentChannelId ?? void 0,
 		currentMessagingTarget: (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.toolContext?.currentGraphChannelId) ?? (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.toolContext?.currentMessagingTarget)
-	}) ? (0, openclaw_plugin_sdk_channel_actions.resolveReactionMessageId)({
+	});
+	const resolved = canUseCurrentMessageId ? (0, openclaw_plugin_sdk_channel_actions.resolveReactionMessageId)({
 		args: ctx.params,
 		toolContext: { currentMessageId: ctx.toolContext?.currentMessageId ?? void 0 }
 	}) : (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.messageId) ?? "";
-	return messageId == null ? "" : String(messageId).trim();
-}
-function describeMSTeamsMessageTool({ cfg }) {
-	const account = require_channel_setup.resolveMSTeamsAccount(cfg);
-	const enabled = account.enabled && account.configured && account.tokenStatus === "available";
+	const messageId = resolved == null ? "" : String(resolved).trim();
+	const currentMessageId = ctx.toolContext?.currentMessageId;
+	const threadRootId = canUseCurrentMessageId && ctx.toolContext?.currentChatType === "channel" && currentMessageId != null && messageId === String(currentMessageId).trim() ? (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.toolContext.currentThreadTs) : void 0;
 	return {
-		actions: enabled ? [
-			"upload-file",
-			"poll",
-			"edit",
-			"delete",
-			"pin",
-			"unpin",
-			"list-pins",
-			"read",
-			"react",
-			"reactions",
-			"search",
-			"member-info",
-			"channel-list",
-			"channel-info",
-			"addParticipant",
-			"removeParticipant",
-			"renameGroup"
-		] : [],
-		capabilities: enabled ? ["presentation"] : [],
-		schema: enabled ? {
-			actions: ["unpin"],
-			properties: { pinnedMessageId: typebox.Type.Optional(typebox.Type.String({ description: "Pinned message resource ID for unpin (from pin or list-pins, not the chat message ID)." })) }
-		} : null
+		messageId,
+		...threadRootId ? { threadRootId } : {}
 	};
 }
 const msteamsChannelOutbound = {
@@ -1057,7 +1114,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 				listGroupsLive: (runtime) => runtime.listMSTeamsDirectoryGroupsLive
 			})
 		}),
-		resolver: { resolveTargets: async ({ cfg, inputs, kind, runtime }) => {
+		resolver: { resolveTargets: async ({ cfg, accountId, inputs, kind, runtime }) => {
 			const results = inputs.map((input) => ({
 				input,
 				resolved: false,
@@ -1065,94 +1122,85 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 				name: void 0,
 				note: void 0
 			}));
-			const resolvePending = async (pending, resolveEntries, applyResolvedEntry) => {
-				if (pending.length === 0) return;
-				try {
-					(await resolveEntries(pending.map((entry) => entry.query))).forEach((entry, idx) => {
-						const target = results[pending[idx]?.index ?? -1];
-						if (!target) return;
-						applyResolvedEntry(target, entry);
-					});
-				} catch (err) {
-					runtime.error?.(`msteams resolve failed: ${String(err)}`);
-					for (const { index } of pending) results[index].note = "lookup failed";
+			const pending = [];
+			for (const entry of results) {
+				const trimmed = entry.input.trim();
+				if (!trimmed) {
+					entry.note = "empty input";
+					continue;
 				}
-			};
-			if (kind === "user") {
-				const pending = [];
-				results.forEach((entry, index) => {
-					const trimmed = entry.input.trim();
-					if (!trimmed) {
-						entry.note = "empty input";
-						return;
-					}
+				if (kind === "user") {
 					const cleaned = require_resolve_allowlist.normalizeMSTeamsUserInput(trimmed);
 					if (/^[0-9a-fA-F-]{16,}$/.test(cleaned) || cleaned.includes("@")) {
 						entry.resolved = true;
 						entry.id = cleaned;
-						return;
-					}
-					pending.push({
+					} else pending.push({
 						query: cleaned,
-						index
+						target: entry
 					});
-				});
-				await resolvePending(pending, (entries) => require_resolve_allowlist.resolveMSTeamsUserAllowlist({
-					cfg,
-					entries
-				}), (target, entry) => {
-					target.resolved = entry.resolved;
-					target.id = entry.id;
-					target.name = entry.name;
-					target.note = entry.note;
-				});
-				return results;
-			}
-			const pending = [];
-			results.forEach((entry, index) => {
-				const trimmed = entry.input.trim();
-				if (!trimmed) {
-					entry.note = "empty input";
-					return;
+					continue;
 				}
 				const conversationId = require_resolve_allowlist.parseMSTeamsConversationId(trimmed);
 				if (conversationId !== null) {
 					entry.resolved = Boolean(conversationId);
 					entry.id = conversationId || void 0;
 					entry.note = conversationId ? "conversation id" : "empty conversation id";
-					return;
+					continue;
 				}
 				const parsed = require_resolve_allowlist.parseMSTeamsTeamChannelInput(trimmed);
 				if (!parsed.team) {
 					entry.note = "missing team";
-					return;
+					continue;
 				}
 				const query = parsed.channel ? `${parsed.team}/${parsed.channel}` : parsed.team;
 				pending.push({
 					query,
-					index
+					target: entry
 				});
-			});
-			await resolvePending(pending, (entries) => require_resolve_allowlist.resolveMSTeamsChannelAllowlist({
-				cfg,
-				entries
-			}), (target, entry) => {
-				if (!entry.resolved || !entry.teamId) {
-					target.resolved = false;
-					target.note = entry.note;
-					return;
-				}
-				target.resolved = true;
-				if (entry.channelId) {
-					target.id = `${entry.teamId}/${entry.channelId}`;
-					target.name = entry.channelName && entry.teamName ? `${entry.teamName}/${entry.channelName}` : entry.channelName ?? entry.teamName;
-				} else {
-					target.id = entry.teamId;
-					target.name = entry.teamName;
-					target.note = "team id";
-				}
-				if (entry.note) target.note = entry.note;
-			});
+			}
+			if (pending.length === 0) return results;
+			const entries = pending.map((entry) => entry.query);
+			try {
+				if (kind === "user") (await require_resolve_allowlist.resolveMSTeamsUserAllowlist({
+					cfg,
+					accountId,
+					entries
+				})).forEach((entry, index) => {
+					const target = pending[index]?.target;
+					if (target) {
+						target.resolved = entry.resolved;
+						target.id = entry.id;
+						target.name = entry.name;
+						target.note = entry.note;
+					}
+				});
+				else (await require_resolve_allowlist.resolveMSTeamsChannelAllowlist({
+					cfg,
+					accountId,
+					entries
+				})).forEach((entry, index) => {
+					const target = pending[index]?.target;
+					if (!target) return;
+					if (!entry.resolved || !entry.teamId) {
+						target.resolved = false;
+						target.note = entry.note;
+						return;
+					}
+					target.resolved = true;
+					if (entry.channelId) {
+						target.id = `${entry.teamId}/${entry.channelId}`;
+						target.name = entry.channelName && entry.teamName ? `${entry.teamName}/${entry.channelName}` : entry.channelName ?? entry.teamName;
+					} else {
+						target.id = entry.teamId;
+						target.name = entry.teamName;
+						target.note = "team id";
+					}
+					if (entry.note) target.note = entry.note;
+				});
+			} catch (err) {
+				runtime.error?.(`msteams resolve failed: ${String(err)}`);
+				for (const { target } of pending) target.note = "lookup failed";
+			}
 			return results;
 		} },
 		actions: {
@@ -1174,9 +1222,15 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const authError = requireMSTeamsGroupManagementAuthorization(ctx);
 					if (authError) return authError;
 				}
+				const accountId = ctx.accountId ?? require_resolve_allowlist.resolveDefaultMSTeamsAccountId(ctx.cfg);
+				const actionAccountId = ctx.accountId ?? (accountId === openclaw_plugin_sdk_account_id.DEFAULT_ACCOUNT_ID ? void 0 : accountId);
+				const actionContext = {
+					...ctx,
+					accountId
+				};
 				const authorizeActionTarget = (target) => assertMSTeamsReadTargetAllowed({
 					cfg: ctx.cfg,
-					ctx,
+					ctx: actionContext,
 					target
 				});
 				const presentation = ctx.action === "send" ? (0, openclaw_plugin_sdk_interactive_runtime.normalizeMessagePresentation)(ctx.params.presentation) : void 0;
@@ -1190,6 +1244,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const { sendAdaptiveCardMSTeams } = await loadMSTeamsChannelRuntime();
 					const result = await sendAdaptiveCardMSTeams({
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						to,
 						card,
 						assertDirectAdapterHandoff: ctx.assertDirectAdapterHandoff,
@@ -1210,6 +1265,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const { sendMessageMSTeams } = await loadMSTeamsChannelRuntime();
 					const result = await sendMessageMSTeams({
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						to,
 						text: resolveActionContent(ctx.params),
 						mediaUrl,
@@ -1240,6 +1296,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const runtime = await loadMSTeamsChannelRuntime();
 					const params = {
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						to,
 						activityId: messageId
 					};
@@ -1254,7 +1311,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 				} : ctx.params, ctx.toolContext?.currentChannelId, (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.toolContext?.currentGraphChannelId) ?? (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.toolContext?.currentMessagingTarget), ctx.toolContext?.currentChatType);
 				if (ctx.action === "read" || ctx.action === "pin" || ctx.action === "reactions") {
 					const action = ctx.action;
-					const messageId = resolveMSTeamsActionMessageId(ctx, graphTo, action === "reactions");
+					const { messageId, threadRootId } = resolveMSTeamsActionMessage(ctx, graphTo, action === "reactions");
 					if (!graphTo || !messageId) return actionError(`${{
 						read: "Read",
 						pin: "Pin",
@@ -1264,8 +1321,10 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const runtime = await loadMSTeamsChannelRuntime();
 					const params = {
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						to,
-						messageId
+						messageId,
+						threadRootId
 					};
 					if (action === "read") return jsonMSTeamsOkActionResult(action, { message: await runtime.getMessageMSTeams(params) });
 					if (action === "pin") return jsonMSTeamsActionResult(action, await runtime.pinMessageMSTeams(params));
@@ -1278,6 +1337,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const { unpinMessageMSTeams } = await loadMSTeamsChannelRuntime();
 					return jsonMSTeamsActionResult("unpin", await unpinMessageMSTeams({
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						to,
 						pinnedMessageId
 					}));
@@ -1288,11 +1348,12 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const { listPinsMSTeams } = await loadMSTeamsChannelRuntime();
 					return jsonMSTeamsOkActionResult("list-pins", await listPinsMSTeams({
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						to
 					}));
 				}
 				if (ctx.action === "react") {
-					const messageId = resolveMSTeamsActionMessageId(ctx, graphTo, true);
+					const { messageId, threadRootId } = resolveMSTeamsActionMessage(ctx, graphTo, true);
 					if (!graphTo || !messageId) return actionError("React requires a target (to) and messageId.");
 					const emoji = typeof ctx.params.emoji === "string" ? ctx.params.emoji.trim() : "";
 					const remove = typeof ctx.params.remove === "boolean" ? ctx.params.remove : false;
@@ -1307,8 +1368,10 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const runtime = await loadMSTeamsChannelRuntime();
 					const result = await (remove ? runtime.unreactMessageMSTeams : runtime.reactMessageMSTeams)({
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						to,
 						messageId,
+						threadRootId,
 						reactionType: emoji
 					});
 					return jsonMSTeamsActionResult("react", {
@@ -1327,6 +1390,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const { searchMessagesMSTeams } = await loadMSTeamsChannelRuntime();
 					return jsonMSTeamsOkActionResult("search", await searchMessagesMSTeams({
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						to,
 						query,
 						from: from || void 0,
@@ -1339,12 +1403,13 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					if (!graphTo) return actionError("member-info requires a target (to).");
 					const to = await authorizeActionTarget(graphTo);
 					const currentRequesterId = isCurrentMSTeamsReadTarget({
-						ctx,
+						ctx: actionContext,
 						target: to
 					}) ? ctx.requesterSenderId : void 0;
 					const { getMemberInfoMSTeams } = await loadMSTeamsChannelRuntime();
 					return jsonMSTeamsOkActionResult("member-info", await getMemberInfoMSTeams({
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						to,
 						userId,
 						currentRequesterId
@@ -1355,12 +1420,13 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					if (!teamId) return actionError("channel-list requires a teamId.");
 					const graphTeamId = await assertMSTeamsTeamEnumerationAllowed({
 						cfg: ctx.cfg,
-						ctx,
+						ctx: actionContext,
 						teamId
 					});
 					const { listChannelsMSTeams } = await loadMSTeamsChannelRuntime();
 					return jsonMSTeamsOkActionResult("channel-list", await listChannelsMSTeams({
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						teamId: graphTeamId
 					}));
 				}
@@ -1373,6 +1439,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const { getChannelInfoMSTeams } = await loadMSTeamsChannelRuntime();
 					return jsonMSTeamsOkActionResult("channel-info", { channelInfo: (await getChannelInfoMSTeams({
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						teamId: graphTeamId,
 						channelId: graphChannelId
 					})).channel });
@@ -1387,6 +1454,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const runtime = await loadMSTeamsChannelRuntime();
 					const params = {
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						to,
 						userId
 					};
@@ -1403,6 +1471,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const { renameGroupMSTeams } = await loadMSTeamsChannelRuntime();
 					return jsonMSTeamsOkActionResult("renameGroup", await renameGroupMSTeams({
 						cfg: ctx.cfg,
+						accountId: actionAccountId,
 						to,
 						name
 					}));
@@ -1413,7 +1482,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 		status: (0, openclaw_plugin_sdk_status_helpers.createComputedAccountStatusAdapter)({
 			defaultRuntime: (0, openclaw_plugin_sdk_channel_status.createDefaultChannelRuntimeState)(openclaw_plugin_sdk_account_id.DEFAULT_ACCOUNT_ID, { port: null }),
 			buildChannelSummary: ({ snapshot }) => (0, openclaw_plugin_sdk_channel_status.buildProbeChannelStatusSummary)(snapshot, { port: snapshot.port ?? null }),
-			probeAccount: async ({ cfg }) => await (await loadMSTeamsChannelRuntime()).probeMSTeams(cfg.channels?.msteams),
+			probeAccount: async ({ account }) => await (await loadMSTeamsChannelRuntime()).probeMSTeams(account.config, { accountId: account.accountId }),
 			formatCapabilitiesProbe: ({ probe }) => {
 				const lines = [];
 				const appId = (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(probe?.appId);
@@ -1445,41 +1514,52 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 			})
 		}),
 		gateway: { startAccount: async (ctx) => {
-			const { monitorMSTeamsProvider } = await Promise.resolve().then(() => require("./monitor-C9x_CJhY.cjs"));
-			const webhookPath = ctx.cfg.channels?.msteams?.webhook?.path || "/api/messages";
+			const { monitorMSTeamsProvider } = await Promise.resolve().then(() => require("./monitor-CzRI-Hsc.cjs"));
+			const account = require_resolve_allowlist.resolveMSTeamsAccount({
+				cfg: ctx.cfg,
+				accountId: ctx.accountId
+			});
+			const accountId = account.accountId;
+			const webhookPath = account.config.webhook?.path || "/api/messages";
 			const statusSink = (0, openclaw_plugin_sdk_channel_outbound.createAccountStatusSink)({
-				accountId: ctx.accountId,
+				accountId,
 				setStatus: ctx.setStatus
 			});
-			ctx.log?.info(`starting provider (Gateway route ${webhookPath})`);
+			ctx.log?.info("starting provider account " + accountId + " (Gateway route " + webhookPath + ")");
 			if (isMSTeamsNativeApprovalClientEnabled({
 				cfg: ctx.cfg,
-				accountId: ctx.accountId
+				accountId
 			})) (0, openclaw_plugin_sdk_channel_runtime_context.registerChannelRuntimeContext)({
 				channelRuntime: ctx.channelRuntime,
 				channelId: "msteams",
-				accountId: ctx.accountId,
+				accountId,
 				capability: openclaw_plugin_sdk_approval_handler_adapter_runtime.CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY,
 				context: {},
 				abortSignal: ctx.abortSignal
 			});
 			return monitorMSTeamsProvider({
 				cfg: ctx.cfg,
+				accountId,
+				msteamsCfg: account.config,
 				runtime: ctx.runtime,
 				abortSignal: ctx.abortSignal,
 				statusSink
 			});
 		} }
 	},
-	security: { collectWarnings: ({ cfg }) => collectMSTeamsSecurityFindings({ cfg }) },
+	security: { collectWarnings: ({ cfg, accountId }) => collectMSTeamsSecurityFindings({
+		cfg,
+		accountId
+	}) },
 	pairing: { text: {
 		idLabel: "msteamsUserId",
 		message: openclaw_plugin_sdk_channel_status.PAIRING_APPROVED_MESSAGE,
 		normalizeAllowEntry: (0, openclaw_plugin_sdk_channel_pairing.createPairingPrefixStripper)(/^(msteams|user):/i),
-		notify: async ({ cfg, id, message }) => {
+		notify: async ({ cfg, accountId, id, message }) => {
 			const { sendMessageMSTeams } = await loadMSTeamsChannelRuntime();
 			await sendMessageMSTeams({
 				cfg,
+				accountId,
 				to: id,
 				text: message
 			});
@@ -1502,8 +1582,8 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 				hasRepliedRef
 			};
 		},
-		resolveAutoThreadId: ({ cfg, to, toolContext }) => resolveMSTeamsAutoThreadId({
-			cfg: cfg.channels?.msteams,
+		resolveAutoThreadId: ({ cfg, accountId, to, toolContext }) => resolveMSTeamsAutoThreadId({
+			cfg: require_resolve_allowlist.resolveMSTeamsAccountConfig(cfg, accountId),
 			to,
 			toolContext
 		})
@@ -1565,6 +1645,12 @@ Object.defineProperty(exports, "resolveMSTeamsRouteConfig", {
 		return resolveMSTeamsRouteConfig;
 	}
 });
+Object.defineProperty(exports, "resolveMSTeamsWebhookCollisionIssue", {
+	enumerable: true,
+	get: function() {
+		return resolveMSTeamsWebhookCollisionIssue;
+	}
+});
 Object.defineProperty(exports, "resolveMSTeamsWebhookPathIssue", {
 	enumerable: true,
 	get: function() {