@openclaw/msteams 2026.10.2 → 2026.10.5-beta.2

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

@@ -1,9 +1,9 @@
 const require_rolldown_runtime = require("./rolldown-runtime-BloeesfJ.cjs");
 require("../runtime-api.cjs");
-const require_resolve_allowlist = require("./resolve-allowlist-Ct9yxQUw.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-ClI-lSyG.cjs");
-const require_channel_setup = require("./channel.setup-ss0TO-ap.cjs");
+const require_thread_session = require("./thread-session-B74FC1Id.cjs");
+const require_channel_setup = require("./channel.setup-BjbHugkL.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");
@@ -80,76 +80,17 @@ function actionError(message) {
 }
 //#endregion
 //#region extensions/msteams/src/policy.ts
-const teamScopeKey = (teamKey) => (0, openclaw_plugin_sdk_channel_policy.scopeKey)(["team", teamKey]);
-const channelScopeKey = (teamKey, channelKey) => (0, openclaw_plugin_sdk_channel_policy.scopeKey)(["team", teamKey], ["channel", channelKey]);
-function buildMSTeamsToolPolicyTree(teams) {
-	const scopes = {};
-	for (const [teamKey, team] of Object.entries(teams ?? {})) {
-		scopes[teamScopeKey(teamKey)] = {
-			tools: team.tools,
-			toolsBySender: team.toolsBySender
-		};
-		for (const [channelKey, channel] of Object.entries(team.channels ?? {})) scopes[channelScopeKey(teamKey, channelKey)] = {
-			tools: channel.tools,
-			toolsBySender: channel.toolsBySender
-		};
-	}
-	return { scopes };
-}
-function resolveMSTeamsToolPolicyScope(params) {
-	const teams = params.cfg.teams ?? {};
-	const tree = buildMSTeamsToolPolicyTree(teams);
-	const teamMatch = (0, openclaw_plugin_sdk_channel_targets.resolveChannelEntryMatchWithFallback)({
-		entries: teams,
-		keys: (0, openclaw_plugin_sdk_channel_targets.buildChannelKeyCandidates)(params.groupSpace?.trim()),
+function matchMSTeamsPolicyEntry(entries, ...keys) {
+	return (0, openclaw_plugin_sdk_channel_targets.resolveChannelEntryMatchWithFallback)({
+		entries,
+		keys: (0, openclaw_plugin_sdk_channel_targets.buildChannelKeyCandidates)(...keys),
 		wildcardKey: "*",
 		normalizeKey: openclaw_plugin_sdk_channel_targets.normalizeChannelSlug
 	});
-	const matchedTeamKey = teamMatch.matchKey ?? teamMatch.key;
-	if (teamMatch.entry && matchedTeamKey) {
-		const channelMatch = (0, openclaw_plugin_sdk_channel_targets.resolveChannelEntryMatchWithFallback)({
-			entries: teamMatch.entry.channels ?? {},
-			keys: (0, openclaw_plugin_sdk_channel_targets.buildChannelKeyCandidates)(params.groupId?.trim()),
-			wildcardKey: "*",
-			normalizeKey: openclaw_plugin_sdk_channel_targets.normalizeChannelSlug
-		});
-		const matchedChannelKey = channelMatch.matchKey ?? channelMatch.key;
-		return {
-			tree,
-			path: [teamScopeKey(matchedTeamKey), ...channelMatch.entry && matchedChannelKey ? [channelScopeKey(matchedTeamKey, matchedChannelKey)] : []]
-		};
-	}
-	return {
-		tree,
-		path: []
-	};
 }
-function resolveMSTeamsCrossTeamScanScope(params) {
-	const teams = params.cfg.teams ?? {};
-	const tree = buildMSTeamsToolPolicyTree(teams);
-	const groupId = params.groupId?.trim();
-	if (!groupId) return {
-		tree,
-		path: []
-	};
-	const channelCandidates = (0, openclaw_plugin_sdk_channel_targets.buildChannelKeyCandidates)(groupId);
-	for (const [teamKey, team] of Object.entries(teams)) {
-		const channelMatch = (0, openclaw_plugin_sdk_channel_targets.resolveChannelEntryMatchWithFallback)({
-			entries: team.channels ?? {},
-			keys: channelCandidates,
-			wildcardKey: "*",
-			normalizeKey: openclaw_plugin_sdk_channel_targets.normalizeChannelSlug
-		});
-		const matchedChannelKey = channelMatch.matchKey ?? channelMatch.key;
-		if (channelMatch.entry && matchedChannelKey) return {
-			tree,
-			path: [teamScopeKey(teamKey), channelScopeKey(teamKey, matchedChannelKey)]
-		};
-	}
-	return {
-		tree,
-		path: []
-	};
+function selectMSTeamsPolicyEntry(entries, key) {
+	const match = matchMSTeamsPolicyEntry(entries, key?.trim());
+	return match.matchKey ?? match.key ? match.entry : void 0;
 }
 function resolveMSTeamsRouteConfig(params) {
 	const teamId = params.teamId?.trim();
@@ -158,23 +99,11 @@ function resolveMSTeamsRouteConfig(params) {
 	const channelName = params.channelName?.trim();
 	const teams = params.cfg?.teams ?? {};
 	const allowlistConfigured = Object.keys(teams).length > 0;
-	const teamCandidates = (0, openclaw_plugin_sdk_channel_targets.buildChannelKeyCandidates)(teamId, params.allowNameMatching ? teamName : void 0, params.allowNameMatching && teamName ? (0, openclaw_plugin_sdk_channel_targets.normalizeChannelSlug)(teamName) : void 0);
-	const teamMatch = (0, openclaw_plugin_sdk_channel_targets.resolveChannelEntryMatchWithFallback)({
-		entries: teams,
-		keys: teamCandidates,
-		wildcardKey: "*",
-		normalizeKey: openclaw_plugin_sdk_channel_targets.normalizeChannelSlug
-	});
+	const teamMatch = matchMSTeamsPolicyEntry(teams, teamId, params.allowNameMatching ? teamName : void 0, params.allowNameMatching && teamName ? (0, openclaw_plugin_sdk_channel_targets.normalizeChannelSlug)(teamName) : void 0);
 	const teamConfig = teamMatch.entry;
 	const channels = teamConfig?.channels ?? {};
 	const channelAllowlistConfigured = Object.keys(channels).length > 0;
-	const channelCandidates = (0, openclaw_plugin_sdk_channel_targets.buildChannelKeyCandidates)(conversationId, params.allowNameMatching ? channelName : void 0, params.allowNameMatching && channelName ? (0, openclaw_plugin_sdk_channel_targets.normalizeChannelSlug)(channelName) : void 0);
-	const channelMatch = (0, openclaw_plugin_sdk_channel_targets.resolveChannelEntryMatchWithFallback)({
-		entries: channels,
-		keys: channelCandidates,
-		wildcardKey: "*",
-		normalizeKey: openclaw_plugin_sdk_channel_targets.normalizeChannelSlug
-	});
+	const channelMatch = matchMSTeamsPolicyEntry(channels, conversationId, params.allowNameMatching ? channelName : void 0, params.allowNameMatching && channelName ? (0, openclaw_plugin_sdk_channel_targets.normalizeChannelSlug)(channelName) : void 0);
 	const channelConfig = channelMatch.entry;
 	return {
 		teamConfig,
@@ -195,32 +124,27 @@ function resolveMSTeamsRouteConfig(params) {
 function resolveMSTeamsGroupToolPolicy(params) {
 	const cfg = params.cfg.channels?.msteams;
 	if (!cfg) return;
-	const scope = resolveMSTeamsToolPolicyScope({
-		cfg,
-		groupSpace: params.groupSpace,
-		groupId: params.groupId
-	});
-	const senderScope = {
+	const teams = cfg.teams ?? {};
+	const team = selectMSTeamsPolicyEntry(teams, params.groupSpace);
+	const channel = team && selectMSTeamsPolicyEntry(team.channels ?? {}, params.groupId);
+	const resolve = (selectedTeam, selectedChannel) => (0, openclaw_plugin_sdk_channel_policy.resolveScopeToolsPolicy)({
+		tree: { scopes: {
+			team: selectedTeam ?? {},
+			channel: selectedChannel ?? {}
+		} },
+		path: ["team", "channel"],
 		senderPolicyMode: params.senderPolicyMode,
 		senderId: params.senderId,
 		senderName: params.senderName,
 		senderUsername: params.senderUsername,
 		senderE164: params.senderE164
-	};
-	const resolved = (0, openclaw_plugin_sdk_channel_policy.resolveScopeToolsPolicy)({
-		...scope,
-		...senderScope
-	});
-	if (resolved !== void 0) return resolved;
-	if (scope.path.length > 1) return;
-	const scanScope = resolveMSTeamsCrossTeamScanScope({
-		cfg,
-		groupId: params.groupId
-	});
-	return (0, openclaw_plugin_sdk_channel_policy.resolveScopeToolsPolicy)({
-		...scanScope,
-		...senderScope
 	});
+	const resolved = resolve(team, channel);
+	if (resolved !== void 0 || channel) return resolved;
+	if (params.groupId?.trim()) for (const candidate of Object.values(teams)) {
+		const matched = selectMSTeamsPolicyEntry(candidate.channels ?? {}, params.groupId);
+		if (matched) return resolve(candidate, matched);
+	}
 }
 function resolveMSTeamsReplyPolicy(params) {
 	if (params.isDirectMessage) return {
@@ -379,7 +303,7 @@ const msTeamsLazyApprovalNativeRuntime = (0, openclaw_plugin_sdk_approval_handle
 		request
 	}),
 	load: async () => {
-		const { msTeamsApprovalNativeRuntime } = await Promise.resolve().then(() => require("./approval-handler.runtime-C-RJ3wXc.cjs"));
+		const { msTeamsApprovalNativeRuntime } = await Promise.resolve().then(() => require("./approval-handler.runtime-bUN9icMr.cjs"));
 		return msTeamsApprovalNativeRuntime;
 	}
 });
@@ -475,22 +399,15 @@ function normalizePathSeparators(pathname) {
 	if (collapsed.length <= 1) return collapsed;
 	return collapsed.replace(/\/+$/, "");
 }
-function resolveDotSegments(pathname) {
-	try {
-		return new URL(pathname, "http://localhost").pathname;
-	} catch {
-		return pathname;
-	}
-}
 function normalizePathForSecurity(pathname) {
-	return normalizePathSeparators(normalizeLowercaseStringOrEmpty$1(resolveDotSegments(pathname))) || "/";
+	return normalizePathSeparators(normalizeLowercaseStringOrEmpty$1(URL.parse(pathname, "http://localhost")?.pathname ?? pathname)) || "/";
 }
-function buildCanonicalPathCandidates(pathname, maxDecodePasses = MAX_PATH_DECODE_PASSES) {
+function buildCanonicalPathCandidates(pathname) {
 	const candidates = /* @__PURE__ */ new Set([normalizePathForSecurity(pathname)]);
 	let decoded = pathname;
 	let malformedEncoding = false;
 	let decodePasses = 0;
-	for (let pass = 0; pass < maxDecodePasses; pass++) {
+	for (let pass = 0; pass < MAX_PATH_DECODE_PASSES; pass++) {
 		let nextDecoded;
 		try {
 			nextDecoded = decodeURIComponent(decoded);
@@ -574,7 +491,7 @@ function resolveMSTeamsWebhookPathIssue({ cfg, env }) {
 	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 probes" : /[:*{}\\]/.test(path) ? "uses Express pattern syntax that requires the compatibility listener" : void 0;
+	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.");
 }
@@ -587,7 +504,7 @@ const isMSTeamsMutableAllowEntry = (0, openclaw_plugin_sdk_channel_policy.buildM
 const collectMSTeamsMutableAllowlistWarnings = (0, openclaw_plugin_sdk_channel_policy.createDangerousNameMatchingMutableAllowlistWarningCollector)({
 	channel: "msteams",
 	detector: isMSTeamsMutableAllowEntry,
-	collectLists: (scope) => (0, openclaw_plugin_sdk_channel_policy.collectStandardAllowlistLists)(scope)
+	collectLists: openclaw_plugin_sdk_channel_policy.collectStandardAllowlistLists
 });
 function runMSTeamsWebhookDoctorSequence({ cfg, env }) {
 	const channel = cfg.channels?.msteams;
@@ -777,13 +694,13 @@ function normalizeUserTarget(target) {
 function isStableUserId(value) {
 	return /^[0-9a-f-]{16,}$/i.test(value);
 }
-async function resolveAllowedDmTarget(cfg, target) {
+async function resolveDmTarget(cfg, target, directOperator = false) {
 	const teams = cfg.channels?.msteams;
 	if (teams?.dmPolicy === "disabled") return;
 	const userId = normalizeUserTarget(target);
 	if (!userId) return;
-	const normalizedEntries = (teams?.allowFrom ?? []).map((entry) => normalizeUserTarget(entry.replace(/^(msteams|teams):/i, "")));
-	const allowAll = (teams?.dmPolicy ?? "pairing") === "open" || normalizedEntries.includes("*");
+	const normalizedEntries = (directOperator ? [] : teams?.allowFrom ?? []).map((entry) => normalizeUserTarget(entry.replace(/^(msteams|teams):/i, "")));
+	const allowAll = directOperator || (teams?.dmPolicy ?? "pairing") === "open" || normalizedEntries.includes("*");
 	if (isStableUserId(userId)) return allowAll || normalizedEntries.some((entry) => entry === userId) ? `user:${userId}` : void 0;
 	if (!(0, openclaw_plugin_sdk_dangerous_name_runtime.isDangerousNameMatchingEnabled)(teams)) return;
 	try {
@@ -797,22 +714,6 @@ async function resolveAllowedDmTarget(cfg, target) {
 		return;
 	}
 }
-async function resolveDirectDmTarget(cfg, target) {
-	if (cfg.channels?.msteams?.dmPolicy === "disabled") return;
-	const userId = normalizeUserTarget(target);
-	if (!userId) return;
-	if (isStableUserId(userId)) return `user:${userId}`;
-	if (!(0, openclaw_plugin_sdk_dangerous_name_runtime.isDangerousNameMatchingEnabled)(cfg.channels?.msteams)) return;
-	try {
-		const [resolved] = await require_resolve_allowlist.resolveMSTeamsUserAllowlist({
-			cfg,
-			entries: [userId]
-		});
-		return resolved?.resolved && resolved.id ? `user:${resolved.id}` : void 0;
-	} catch {
-		return;
-	}
-}
 function resolveMSTeamsReadGroupPolicy(cfg) {
 	const teams = cfg.channels?.msteams;
 	return teams ? teams.groupPolicy ?? (0, openclaw_plugin_sdk_runtime_group_policy.resolveDefaultGroupPolicy)(cfg) ?? "allowlist" : "disabled";
@@ -879,16 +780,19 @@ async function resolveAllowedChannelTarget(cfg, target) {
 	if (!stableTarget || !teams?.teams) return;
 	const [stableTeamId, stableChannelId] = stableTarget.split("/", 2);
 	if (!stableTeamId || !stableChannelId) return;
+	return await isMappedChannelAllowed(cfg, stableTeamId, stableChannelId) ? stableTarget : void 0;
+}
+async function isMappedChannelAllowed(cfg, teamId, conversationId) {
+	const teams = cfg.channels?.msteams;
+	if (!teams?.teams) return false;
 	try {
-		const botFrameworkTeamKey = await resolveConfiguredBotFrameworkTeamKey(cfg, stableTeamId);
-		if (botFrameworkTeamKey) {
-			if (resolveMSTeamsRouteConfig({
-				cfg: teams,
-				teamId: botFrameworkTeamKey,
-				conversationId: stableChannelId
-			}).allowed) return stableTarget;
-		}
-		if (!hasMutableChannelConfig(cfg)) return;
+		const botFrameworkTeamKey = await resolveConfiguredBotFrameworkTeamKey(cfg, teamId);
+		if (botFrameworkTeamKey && resolveMSTeamsRouteConfig({
+			cfg: teams,
+			teamId: botFrameworkTeamKey,
+			conversationId
+		}).allowed) return true;
+		if (!hasMutableChannelConfig(cfg)) return false;
 		const resolved = await require_resolve_allowlist.resolveMSTeamsTeamsConfig({
 			cfg,
 			teamIdMode: "graph",
@@ -899,11 +803,11 @@ async function resolveAllowedChannelTarget(cfg, target) {
 				...teams,
 				teams: resolved.teams
 			},
-			teamId: stableTeamId,
-			conversationId: stableChannelId
-		}).allowed ? stableTarget : void 0;
+			teamId,
+			conversationId
+		}).allowed;
 	} catch {
-		return;
+		return false;
 	}
 }
 function bothUnknownScopesAllowed(cfg) {
@@ -923,7 +827,7 @@ async function assertMSTeamsReadTargetAllowed(params) {
 	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 resolveDirectDmTarget(params.cfg, target) : 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 resolveAllowedDmTarget(params.cfg, target) : isChat ? bothUnknownScopesAllowed(params.cfg) ? target : void 0 : false;
+	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;
 	if (!allowedTarget) throw new openclaw_plugin_sdk_channel_actions.ToolAuthorizationError("Microsoft Teams read target is not allowed.");
 	return allowedTarget;
 }
@@ -944,33 +848,7 @@ async function assertMSTeamsTeamEnumerationAllowed(params) {
 	}))[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;
-	let allowed = directRoute.allowlistConfigured ? directRoute.allowed : groupPolicy === "open";
-	if (!allowed && teams?.teams) try {
-		const botFrameworkTeamKey = await resolveConfiguredBotFrameworkTeamKey(params.cfg, stableTeamId);
-		if (botFrameworkTeamKey) allowed = resolveMSTeamsRouteConfig({
-			cfg: teams,
-			teamId: botFrameworkTeamKey,
-			conversationId: "__openclaw_all_channels__"
-		}).allowed;
-		if (!allowed && hasMutableChannelConfig(params.cfg)) {
-			const resolved = await require_resolve_allowlist.resolveMSTeamsTeamsConfig({
-				cfg: params.cfg,
-				teamIdMode: "graph",
-				teams: teams.teams
-			});
-			allowed = resolveMSTeamsRouteConfig({
-				cfg: {
-					...teams,
-					teams: resolved.teams
-				},
-				teamId: stableTeamId,
-				conversationId: "__openclaw_all_channels__"
-			}).allowed;
-		}
-	} catch {
-		allowed = false;
-	}
-	if (!allowed) 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(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.");
 	return stableTeamId;
 }
 //#endregion
@@ -1047,7 +925,7 @@ const collectMSTeamsSecurityFindings = openclaw_plugin_sdk_channel_policy.create
 	severity: "warn",
 	title: "MS Teams security warning"
 });
-const loadMSTeamsChannelRuntime = (0, openclaw_plugin_sdk_lazy_runtime.createLazyRuntimeNamedExport)(() => Promise.resolve().then(() => require("./channel.runtime-D9jrw2SN.cjs")), "msTeamsChannelRuntime");
+const loadMSTeamsChannelRuntime = (0, openclaw_plugin_sdk_lazy_runtime.createLazyRuntimeNamedExport)(() => Promise.resolve().then(() => require("./channel.runtime-DWRAolil.cjs")), "msTeamsChannelRuntime");
 const MSTEAMS_REACTION_TYPES = [
 	"like",
 	"heart",
@@ -1074,38 +952,15 @@ function resolveGraphActionTarget(params, currentChannelId, currentGraphChannelI
 	if (currentGraphTarget) return currentGraphTarget;
 	return currentChatType === "channel" ? "" : currentChannelTarget ?? "";
 }
-function resolveMSTeamsActionTarget(params) {
-	return params.graphOnly ? resolveGraphActionTarget(params.toolParams, params.currentChannelId, params.currentGraphChannelId, params.currentChatType) : resolveActionTarget(params.toolParams, params.currentChannelId);
-}
-async function runWithRequiredActionTarget(params) {
-	const to = resolveMSTeamsActionTarget(params);
-	if (!to) return actionError(`${params.actionLabel} requires a target (to).`);
-	return await params.run(to);
-}
-async function runWithRequiredActionMessageTarget(params) {
-	const to = resolveMSTeamsActionTarget(params);
-	const messageIdRaw = params.allowCurrentMessageIdFallback === true && msteamsContextTargetsMatch(to, {
-		currentChannelId: params.currentChannelId ?? void 0,
-		currentMessagingTarget: params.currentGraphChannelId ?? void 0
+function resolveMSTeamsActionMessageId(ctx, to, allowCurrentMessageIdFallback = false) {
+	const messageId = 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)({
-		args: params.toolParams,
-		toolContext: { currentMessageId: params.currentMessageId ?? void 0 }
-	}) : (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(params.toolParams.messageId) ?? "";
-	const messageId = messageIdRaw == null ? "" : String(messageIdRaw).trim();
-	if (!to || !messageId) return actionError(`${params.actionLabel} requires a target (to) and messageId.`);
-	return await params.run({
-		to,
-		messageId
-	});
-}
-async function runWithRequiredActionPinnedMessageTarget(params) {
-	const to = resolveMSTeamsActionTarget(params);
-	const pinnedMessageId = typeof params.toolParams.pinnedMessageId === "string" ? params.toolParams.pinnedMessageId.trim() : (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(params.toolParams.messageId) ?? "";
-	if (!to || !pinnedMessageId) return actionError(`${params.actionLabel} requires a target (to) and pinnedMessageId.`);
-	return await params.run({
-		to,
-		pinnedMessageId
-	});
+		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);
@@ -1330,214 +1185,170 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 						presentation,
 						text: resolveActionContent(ctx.params)
 					});
-					return await runWithRequiredActionTarget({
-						actionLabel: "Card send",
-						toolParams: ctx.params,
-						run: async (to) => {
-							const { sendAdaptiveCardMSTeams } = await loadMSTeamsChannelRuntime();
-							const result = await sendAdaptiveCardMSTeams({
-								cfg: ctx.cfg,
-								to,
-								card,
-								assertDirectAdapterHandoff: ctx.assertDirectAdapterHandoff,
-								onPlatformSendDispatch: ctx.onPlatformSendDispatch
-							});
-							return jsonActionResult({
-								ok: true,
-								channel: "msteams",
-								messageId: result.messageId,
-								conversationId: result.conversationId
-							});
-						}
+					const to = resolveActionTarget(ctx.params);
+					if (!to) return actionError("Card send requires a target (to).");
+					const { sendAdaptiveCardMSTeams } = await loadMSTeamsChannelRuntime();
+					const result = await sendAdaptiveCardMSTeams({
+						cfg: ctx.cfg,
+						to,
+						card,
+						assertDirectAdapterHandoff: ctx.assertDirectAdapterHandoff,
+						onPlatformSendDispatch: ctx.onPlatformSendDispatch
+					});
+					return jsonActionResult({
+						ok: true,
+						channel: "msteams",
+						messageId: result.messageId,
+						conversationId: result.conversationId
 					});
 				}
 				if (ctx.action === "upload-file") {
 					const mediaUrl = resolveActionUploadFilePath(ctx.params);
 					if (!mediaUrl) return actionError("Upload-file requires media, filePath, or path.");
-					return await runWithRequiredActionTarget({
-						actionLabel: "Upload-file",
-						toolParams: ctx.params,
-						currentChannelId: ctx.toolContext?.currentChannelId,
-						run: async (to) => {
-							const { sendMessageMSTeams } = await loadMSTeamsChannelRuntime();
-							const result = await sendMessageMSTeams({
-								cfg: ctx.cfg,
-								to,
-								text: resolveActionContent(ctx.params),
-								mediaUrl,
-								filename: (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.filename) ?? (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.title),
-								mediaAccess: ctx.mediaAccess,
-								mediaLocalRoots: ctx.mediaLocalRoots,
-								mediaReadFile: ctx.mediaReadFile,
-								assertDirectAdapterHandoff: ctx.assertDirectAdapterHandoff,
-								onPlatformSendDispatch: ctx.onPlatformSendDispatch
-							});
-							return jsonActionResult({
-								ok: true,
-								channel: "msteams",
-								action: "upload-file",
-								messageId: result.messageId,
-								conversationId: result.conversationId,
-								...result.pendingUploadId ? { pendingUploadId: result.pendingUploadId } : {}
-							});
-						}
+					const to = resolveActionTarget(ctx.params, ctx.toolContext?.currentChannelId);
+					if (!to) return actionError("Upload-file requires a target (to).");
+					const { sendMessageMSTeams } = await loadMSTeamsChannelRuntime();
+					const result = await sendMessageMSTeams({
+						cfg: ctx.cfg,
+						to,
+						text: resolveActionContent(ctx.params),
+						mediaUrl,
+						filename: (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.filename) ?? (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.title),
+						mediaAccess: ctx.mediaAccess,
+						mediaLocalRoots: ctx.mediaLocalRoots,
+						mediaReadFile: ctx.mediaReadFile,
+						assertDirectAdapterHandoff: ctx.assertDirectAdapterHandoff,
+						onPlatformSendDispatch: ctx.onPlatformSendDispatch
+					});
+					return jsonActionResult({
+						ok: true,
+						channel: "msteams",
+						action: "upload-file",
+						messageId: result.messageId,
+						conversationId: result.conversationId,
+						...result.pendingUploadId ? { pendingUploadId: result.pendingUploadId } : {}
 					});
 				}
 				if (ctx.action === "edit" || ctx.action === "delete") {
 					const action = ctx.action;
 					const content = action === "edit" ? resolveActionContent(ctx.params) : "";
 					if (action === "edit" && !content) return actionError("Edit requires content.");
-					return await runWithRequiredActionMessageTarget({
-						actionLabel: action === "edit" ? "Edit" : "Delete",
-						toolParams: ctx.params,
-						currentChannelId: ctx.toolContext?.currentChannelId,
-						run: async (target) => {
-							const to = await authorizeActionTarget(target.to);
-							const runtime = await loadMSTeamsChannelRuntime();
-							const params = {
-								cfg: ctx.cfg,
-								to,
-								activityId: target.messageId
-							};
-							return jsonMSTeamsConversationResult((action === "edit" ? await runtime.editMessageMSTeams({
-								...params,
-								text: content
-							}) : await runtime.deleteMessageMSTeams(params)).conversationId);
-						}
-					});
+					const target = resolveActionTarget(ctx.params, ctx.toolContext?.currentChannelId);
+					const messageId = (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.messageId) ?? "";
+					if (!target || !messageId) return actionError(`${action === "edit" ? "Edit" : "Delete"} requires a target (to) and messageId.`);
+					const to = await authorizeActionTarget(target);
+					const runtime = await loadMSTeamsChannelRuntime();
+					const params = {
+						cfg: ctx.cfg,
+						to,
+						activityId: messageId
+					};
+					return jsonMSTeamsConversationResult((action === "edit" ? await runtime.editMessageMSTeams({
+						...params,
+						text: content
+					}) : await runtime.deleteMessageMSTeams(params)).conversationId);
 				}
-				const graphActionTarget = {
-					toolParams: ctx.action === "search" || ctx.action === "member-info" ? {
-						...ctx.params,
-						to: resolveActionTarget(ctx.params) || (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.channelId)
-					} : ctx.params,
-					currentChannelId: ctx.toolContext?.currentChannelId,
-					currentGraphChannelId: (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.toolContext?.currentGraphChannelId) ?? (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.toolContext?.currentMessagingTarget),
-					currentChatType: ctx.toolContext?.currentChatType,
-					currentMessageId: ctx.toolContext?.currentMessageId,
-					graphOnly: true
-				};
+				const graphTo = resolveGraphActionTarget(ctx.action === "search" || ctx.action === "member-info" ? {
+					...ctx.params,
+					to: resolveActionTarget(ctx.params) || (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.channelId)
+				} : 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;
-					return await runWithRequiredActionMessageTarget({
-						actionLabel: {
-							read: "Read",
-							pin: "Pin",
-							reactions: "Reactions"
-						}[action],
-						...graphActionTarget,
-						allowCurrentMessageIdFallback: action === "reactions",
-						run: async (target) => {
-							const to = await authorizeActionTarget(target.to);
-							const runtime = await loadMSTeamsChannelRuntime();
-							const params = {
-								cfg: ctx.cfg,
-								to,
-								messageId: target.messageId
-							};
-							if (action === "read") {
-								const message = await runtime.getMessageMSTeams(params);
-								return jsonMSTeamsOkActionResult(action, { message });
-							}
-							if (action === "pin") return jsonMSTeamsActionResult(action, await runtime.pinMessageMSTeams(params));
-							return jsonMSTeamsOkActionResult(action, await runtime.listReactionsMSTeams(params));
-						}
+					const messageId = resolveMSTeamsActionMessageId(ctx, graphTo, action === "reactions");
+					if (!graphTo || !messageId) return actionError(`${{
+						read: "Read",
+						pin: "Pin",
+						reactions: "Reactions"
+					}[action]} requires a target (to) and messageId.`);
+					const to = await authorizeActionTarget(graphTo);
+					const runtime = await loadMSTeamsChannelRuntime();
+					const params = {
+						cfg: ctx.cfg,
+						to,
+						messageId
+					};
+					if (action === "read") return jsonMSTeamsOkActionResult(action, { message: await runtime.getMessageMSTeams(params) });
+					if (action === "pin") return jsonMSTeamsActionResult(action, await runtime.pinMessageMSTeams(params));
+					return jsonMSTeamsOkActionResult(action, await runtime.listReactionsMSTeams(params));
+				}
+				if (ctx.action === "unpin") {
+					const pinnedMessageId = typeof ctx.params.pinnedMessageId === "string" ? ctx.params.pinnedMessageId.trim() : (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.messageId) ?? "";
+					if (!graphTo || !pinnedMessageId) return actionError("Unpin requires a target (to) and pinnedMessageId.");
+					const to = await authorizeActionTarget(graphTo);
+					const { unpinMessageMSTeams } = await loadMSTeamsChannelRuntime();
+					return jsonMSTeamsActionResult("unpin", await unpinMessageMSTeams({
+						cfg: ctx.cfg,
+						to,
+						pinnedMessageId
+					}));
+				}
+				if (ctx.action === "list-pins") {
+					if (!graphTo) return actionError("List-pins requires a target (to).");
+					const to = await authorizeActionTarget(graphTo);
+					const { listPinsMSTeams } = await loadMSTeamsChannelRuntime();
+					return jsonMSTeamsOkActionResult("list-pins", await listPinsMSTeams({
+						cfg: ctx.cfg,
+						to
+					}));
+				}
+				if (ctx.action === "react") {
+					const messageId = resolveMSTeamsActionMessageId(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;
+					if (!emoji) return {
+						isError: true,
+						...(0, openclaw_plugin_sdk_tool_results.textResult)(`React requires an emoji (reaction type). Valid types: ${MSTEAMS_REACTION_TYPES.join(", ")}.`, {
+							error: "React requires an emoji (reaction type).",
+							validTypes: [...MSTEAMS_REACTION_TYPES]
+						})
+					};
+					const to = await authorizeActionTarget(graphTo);
+					const runtime = await loadMSTeamsChannelRuntime();
+					const result = await (remove ? runtime.unreactMessageMSTeams : runtime.reactMessageMSTeams)({
+						cfg: ctx.cfg,
+						to,
+						messageId,
+						reactionType: emoji
+					});
+					return jsonMSTeamsActionResult("react", {
+						...remove ? { removed: true } : {},
+						reactionType: emoji,
+						...result
 					});
 				}
-				if (ctx.action === "unpin") return await runWithRequiredActionPinnedMessageTarget({
-					actionLabel: "Unpin",
-					...graphActionTarget,
-					run: async (target) => {
-						const to = await authorizeActionTarget(target.to);
-						const { unpinMessageMSTeams } = await loadMSTeamsChannelRuntime();
-						return jsonMSTeamsActionResult("unpin", await unpinMessageMSTeams({
-							cfg: ctx.cfg,
-							to,
-							pinnedMessageId: target.pinnedMessageId
-						}));
-					}
-				});
-				if (ctx.action === "list-pins") return await runWithRequiredActionTarget({
-					actionLabel: "List-pins",
-					...graphActionTarget,
-					run: async (to) => {
-						const allowedTarget = await authorizeActionTarget(to);
-						const { listPinsMSTeams } = await loadMSTeamsChannelRuntime();
-						return jsonMSTeamsOkActionResult("list-pins", await listPinsMSTeams({
-							cfg: ctx.cfg,
-							to: allowedTarget
-						}));
-					}
-				});
-				if (ctx.action === "react") return await runWithRequiredActionMessageTarget({
-					actionLabel: "React",
-					...graphActionTarget,
-					allowCurrentMessageIdFallback: true,
-					run: async (target) => {
-						const emoji = typeof ctx.params.emoji === "string" ? ctx.params.emoji.trim() : "";
-						const remove = typeof ctx.params.remove === "boolean" ? ctx.params.remove : false;
-						if (!emoji) return {
-							isError: true,
-							...(0, openclaw_plugin_sdk_tool_results.textResult)(`React requires an emoji (reaction type). Valid types: ${MSTEAMS_REACTION_TYPES.join(", ")}.`, {
-								error: "React requires an emoji (reaction type).",
-								validTypes: [...MSTEAMS_REACTION_TYPES]
-							})
-						};
-						const to = await authorizeActionTarget(target.to);
-						const runtime = await loadMSTeamsChannelRuntime();
-						const result = await (remove ? runtime.unreactMessageMSTeams : runtime.reactMessageMSTeams)({
-							cfg: ctx.cfg,
-							to,
-							messageId: target.messageId,
-							reactionType: emoji
-						});
-						return jsonMSTeamsActionResult("react", {
-							...remove ? { removed: true } : {},
-							reactionType: emoji,
-							...result
-						});
-					}
-				});
-				if (ctx.action === "search") return await runWithRequiredActionTarget({
-					actionLabel: "Search",
-					...graphActionTarget,
-					run: async (to) => {
-						const allowedTarget = await authorizeActionTarget(to);
-						const query = (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.query);
-						if (!query) return actionError("Search requires a target (to) and query.");
-						const limit = (0, openclaw_plugin_sdk_channel_actions.readPositiveIntegerParam)(ctx.params, "limit");
-						const from = typeof ctx.params.from === "string" ? ctx.params.from.trim() : void 0;
-						const { searchMessagesMSTeams } = await loadMSTeamsChannelRuntime();
-						return jsonMSTeamsOkActionResult("search", await searchMessagesMSTeams({
-							cfg: ctx.cfg,
-							to: allowedTarget,
-							query,
-							from: from || void 0,
-							limit
-						}));
-					}
-				});
+				if (ctx.action === "search") {
+					if (!graphTo) return actionError("Search requires a target (to).");
+					const to = await authorizeActionTarget(graphTo);
+					const query = (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.query);
+					if (!query) return actionError("Search requires a target (to) and query.");
+					const limit = (0, openclaw_plugin_sdk_channel_actions.readPositiveIntegerParam)(ctx.params, "limit");
+					const from = typeof ctx.params.from === "string" ? ctx.params.from.trim() : void 0;
+					const { searchMessagesMSTeams } = await loadMSTeamsChannelRuntime();
+					return jsonMSTeamsOkActionResult("search", await searchMessagesMSTeams({
+						cfg: ctx.cfg,
+						to,
+						query,
+						from: from || void 0,
+						limit
+					}));
+				}
 				if (ctx.action === "member-info") {
 					const userId = (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.userId) ?? "";
 					if (!userId) return actionError("member-info requires a userId.");
-					return await runWithRequiredActionTarget({
-						actionLabel: "member-info",
-						...graphActionTarget,
-						run: async (target) => {
-							const to = await authorizeActionTarget(target);
-							const currentRequesterId = isCurrentMSTeamsReadTarget({
-								ctx,
-								target: to
-							}) ? ctx.requesterSenderId : void 0;
-							const { getMemberInfoMSTeams } = await loadMSTeamsChannelRuntime();
-							return jsonMSTeamsOkActionResult("member-info", await getMemberInfoMSTeams({
-								cfg: ctx.cfg,
-								to,
-								userId,
-								currentRequesterId
-							}));
-						}
-					});
+					if (!graphTo) return actionError("member-info requires a target (to).");
+					const to = await authorizeActionTarget(graphTo);
+					const currentRequesterId = isCurrentMSTeamsReadTarget({
+						ctx,
+						target: to
+					}) ? ctx.requesterSenderId : void 0;
+					const { getMemberInfoMSTeams } = await loadMSTeamsChannelRuntime();
+					return jsonMSTeamsOkActionResult("member-info", await getMemberInfoMSTeams({
+						cfg: ctx.cfg,
+						to,
+						userId,
+						currentRequesterId
+					}));
 				}
 				if (ctx.action === "channel-list") {
 					const teamId = (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.teamId) ?? "";
@@ -1570,42 +1381,31 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 					const action = ctx.action;
 					const userId = (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.userId);
 					if (!userId) return actionError(`${action} requires a userId.`);
-					return await runWithRequiredActionTarget({
-						actionLabel: action,
-						toolParams: ctx.params,
-						currentChannelId: ctx.toolContext?.currentChannelId,
-						run: async (to) => {
-							const role = action === "addParticipant" ? (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.role) : void 0;
-							const runtime = await loadMSTeamsChannelRuntime();
-							const params = {
-								cfg: ctx.cfg,
-								to,
-								userId
-							};
-							const result = action === "addParticipant" ? await runtime.addParticipantMSTeams({
-								...params,
-								role
-							}) : await runtime.removeParticipantMSTeams(params);
-							return jsonMSTeamsOkActionResult(action, result);
-						}
-					});
+					const to = resolveActionTarget(ctx.params, ctx.toolContext?.currentChannelId);
+					if (!to) return actionError(`${action} requires a target (to).`);
+					const role = action === "addParticipant" ? (0, openclaw_plugin_sdk_string_coerce_runtime.normalizeOptionalString)(ctx.params.role) : void 0;
+					const runtime = await loadMSTeamsChannelRuntime();
+					const params = {
+						cfg: ctx.cfg,
+						to,
+						userId
+					};
+					return jsonMSTeamsOkActionResult(action, action === "addParticipant" ? await runtime.addParticipantMSTeams({
+						...params,
+						role
+					}) : await runtime.removeParticipantMSTeams(params));
 				}
 				if (ctx.action === "renameGroup") {
 					const name = typeof ctx.params.name === "string" ? ctx.params.name.trim() : "";
 					if (!name) return actionError("renameGroup requires a name.");
-					return await runWithRequiredActionTarget({
-						actionLabel: "renameGroup",
-						toolParams: ctx.params,
-						currentChannelId: ctx.toolContext?.currentChannelId,
-						run: async (to) => {
-							const { renameGroupMSTeams } = await loadMSTeamsChannelRuntime();
-							return jsonMSTeamsOkActionResult("renameGroup", await renameGroupMSTeams({
-								cfg: ctx.cfg,
-								to,
-								name
-							}));
-						}
-					});
+					const to = resolveActionTarget(ctx.params, ctx.toolContext?.currentChannelId);
+					if (!to) return actionError("renameGroup requires a target (to).");
+					const { renameGroupMSTeams } = await loadMSTeamsChannelRuntime();
+					return jsonMSTeamsOkActionResult("renameGroup", await renameGroupMSTeams({
+						cfg: ctx.cfg,
+						to,
+						name
+					}));
 				}
 				return null;
 			})
@@ -1645,7 +1445,7 @@ const msteamsPlugin = (0, openclaw_plugin_sdk_channel_core.createChatChannelPlug
 			})
 		}),
 		gateway: { startAccount: async (ctx) => {
-			const { monitorMSTeamsProvider } = await Promise.resolve().then(() => require("./monitor-DfSPCRkk.cjs"));
+			const { monitorMSTeamsProvider } = await Promise.resolve().then(() => require("./monitor-C9x_CJhY.cjs"));
 			const webhookPath = ctx.cfg.channels?.msteams?.webhook?.path || "/api/messages";
 			const statusSink = (0, openclaw_plugin_sdk_channel_outbound.createAccountStatusSink)({
 				accountId: ctx.accountId,