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

package/dist/{accounts-ITTlduDO.js → accounts-B2NRPlqr.js}

@@ -1,6 +1,7 @@
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveChannelPreviewStreamMode, resolveChannelStreamingBlockCoalesce, resolveChannelStreamingBlockEnabled, resolveChannelStreamingChunkMode } from "openclaw/plugin-sdk/channel-outbound";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
+import { buildTimeoutAbortSignal } from "openclaw/plugin-sdk/extension-shared";
 import { fetchWithSsrFGuard, ssrfPolicyFromPrivateNetworkOptIn } from "openclaw/plugin-sdk/ssrf-runtime";
 import { createAccountListHelpers, hasConfiguredAccountValue } from "openclaw/plugin-sdk/account-helpers";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
@@ -8,10 +9,11 @@ import { resolveMergedAccountConfig } from "openclaw/plugin-sdk/account-resoluti
 import { buildSecretInputSchema, hasConfiguredSecretInput, normalizeResolvedSecretInputString, normalizeSecretInputString } from "openclaw/plugin-sdk/secret-input";
 import { readProviderJsonResponse, readResponseTextLimited } from "openclaw/plugin-sdk/provider-http";
 import { readResponseWithLimit } from "openclaw/plugin-sdk/response-limit-runtime";
-import { sleep } from "openclaw/plugin-sdk/runtime-env";
+import { retryAsync } from "openclaw/plugin-sdk/retry-runtime";
 import { z } from "zod";
 //#region extensions/mattermost/src/mattermost/client.ts
 const MATTERMOST_ERROR_BODY_LIMIT_BYTES = 8 * 1024;
+const MATTERMOST_REQUEST_TIMEOUT_MS = 3e4;
 const MATTERMOST_TEXT_RESPONSE_LIMIT_BYTES = 64 * 1024;
 const NULL_BODY_STATUSES = /* @__PURE__ */ new Set([
 	101,
@@ -103,17 +105,42 @@ function createMattermostClient(params) {
 	if (!baseUrl) throw new Error("Mattermost baseUrl is required");
 	const apiBaseUrl = `${baseUrl}/api/v4`;
 	const token = params.botToken.trim();
+	const requestTimeoutMs = resolveTimerTimeoutMs(params.timeoutMs, MATTERMOST_REQUEST_TIMEOUT_MS);
 	const externalFetchImpl = params.fetchImpl;
 	const guardedFetchImpl = async (input, init) => {
+		const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
+		const { timeoutMs: initTimeoutMs, ...requestInit } = init ?? {};
+		const timeoutMs = resolveTimerTimeoutMs(initTimeoutMs, requestTimeoutMs);
 		const { response, release } = await fetchWithSsrFGuard({
-			url: typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url,
-			init,
+			url,
+			init: requestInit,
 			auditContext: "mattermost-api",
-			policy: ssrfPolicyFromPrivateNetworkOptIn(params.allowPrivateNetwork)
+			policy: ssrfPolicyFromPrivateNetworkOptIn(params.allowPrivateNetwork),
+			signal: requestInit.signal ?? void 0,
+			timeoutMs
 		});
 		return responseWithRelease(response, release);
 	};
-	const fetchImpl = externalFetchImpl ?? guardedFetchImpl;
+	const fetchImpl = (externalFetchImpl ? async (input, init) => {
+		const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
+		const { timeoutMs: initTimeoutMs, ...requestInit } = init ?? {};
+		const { signal: timeoutSignal, cleanup } = buildTimeoutAbortSignal({
+			timeoutMs: resolveTimerTimeoutMs(initTimeoutMs, requestTimeoutMs),
+			operation: "mattermost-api",
+			url
+		});
+		const callerSignal = requestInit.signal ?? void 0;
+		const signal = callerSignal && timeoutSignal ? AbortSignal.any([callerSignal, timeoutSignal]) : callerSignal ?? timeoutSignal;
+		try {
+			return responseWithRelease(await externalFetchImpl(input, {
+				...requestInit,
+				signal
+			}), async () => cleanup());
+		} catch (error) {
+			cleanup();
+			throw error;
+		}
+	} : void 0) ?? guardedFetchImpl;
 	const request = async (path, init) => {
 		const url = buildMattermostApiUrl(baseUrl, path);
 		const headers = new Headers(init?.headers);
@@ -163,11 +190,12 @@ async function sendMattermostTyping(client, params) {
 		body: JSON.stringify(payload)
 	});
 }
-async function createMattermostDirectChannel(client, userIds, signal) {
+async function createMattermostDirectChannel(client, userIds, signal, timeoutMs) {
 	return await client.request("/channels/direct", {
 		method: "POST",
 		body: JSON.stringify(userIds),
-		signal
+		signal,
+		timeoutMs
 	});
 }
 const DM_REPLY_DELIVERY_BARRIER_SLACK_MS = 6e4;
@@ -229,26 +257,24 @@ const RETRYABLE_NETWORK_MESSAGE_SNIPPETS = [
 async function createMattermostDirectChannelWithRetry(client, userIds, options = {}) {
 	const { maxRetries = 3, initialDelayMs = 1e3, maxDelayMs = 1e4, timeoutMs: rawTimeoutMs = 3e4, onRetry } = options;
 	const timeoutMs = resolveTimerTimeoutMs(rawTimeoutMs, 3e4);
-	let lastError;
-	for (let attempt = 0; attempt <= maxRetries; attempt++) try {
+	return await retryAsync(async () => {
 		const controller = new AbortController();
 		const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
 		try {
-			return await createMattermostDirectChannel(client, userIds, controller.signal);
+			return await createMattermostDirectChannel(client, userIds, controller.signal, timeoutMs);
+		} catch (err) {
+			throw err instanceof Error ? err : new Error(String(err));
 		} finally {
 			clearTimeout(timeoutId);
 		}
-	} catch (err) {
-		lastError = err instanceof Error ? err : new Error(String(err));
-		if (attempt >= maxRetries) break;
-		if (!isRetryableError(lastError)) throw lastError;
-		const exponentialDelay = initialDelayMs * 2 ** attempt;
-		const jitter = Math.random() * exponentialDelay;
-		const delayMs = Math.min(exponentialDelay + jitter, maxDelayMs);
-		if (onRetry) onRetry(attempt + 1, delayMs, lastError);
-		await sleep(delayMs);
-	}
-	throw lastError ?? /* @__PURE__ */ new Error("Failed to create DM channel after retries");
+	}, {
+		attempts: maxRetries + 1,
+		minDelayMs: Math.min(initialDelayMs, maxDelayMs),
+		maxDelayMs,
+		jitter: "full",
+		shouldRetry: (err) => isRetryableError(err),
+		onRetry: (info) => onRetry?.(info.attempt, info.delayMs, info.err)
+	});
 }
 function isRetryableError(error) {
 	const candidates = collectErrorCandidates(error);
@@ -258,7 +284,9 @@ function isRetryableError(error) {
 	for (const message of messages) {
 		const clientErrorMatch = message.match(/mattermost api (4\d{2})\b/);
 		if (!clientErrorMatch) continue;
-		const statusCode = Number.parseInt(clientErrorMatch[1], 10);
+		const statusCodeText = clientErrorMatch[1];
+		if (!statusCodeText) continue;
+		const statusCode = Number.parseInt(statusCodeText, 10);
 		if (statusCode >= 400 && statusCode < 500) return false;
 	}
 	if (messages.some((message) => /mattermost api \d{3}\b/.test(message))) return false;
@@ -418,17 +446,19 @@ function resolveMattermostAccount(params) {
 		oncharPrefixes: merged.oncharPrefixes,
 		requireMention,
 		textChunkLimit: merged.textChunkLimit,
-		chunkMode: resolveChannelStreamingChunkMode(merged) ?? merged.chunkMode,
+		chunkMode: resolveChannelStreamingChunkMode(merged),
 		streamingMode: resolveChannelPreviewStreamMode(merged, "partial"),
-		blockStreaming: resolveChannelStreamingBlockEnabled(merged) ?? merged.blockStreaming,
-		blockStreamingCoalesce: resolveChannelStreamingBlockCoalesce(merged) ?? merged.blockStreamingCoalesce
+		blockStreaming: resolveChannelStreamingBlockEnabled(merged),
+		blockStreamingCoalesce: resolveChannelStreamingBlockCoalesce(merged)
 	};
 }
 /**
 * Resolve the effective replyToMode for a given chat type.
-* Mattermost auto-threading only applies to channel and group messages.
+* Direct messages stay flat unless explicitly opted into a per-chat-type mode.
 */
 function resolveMattermostReplyToMode(account, kind) {
+	const scopedMode = account.config.replyToModeByChatType?.[kind];
+	if (scopedMode !== void 0) return scopedMode;
 	if (kind === "direct") return "off";
 	return account.config.replyToMode ?? "off";
 }

package/dist/channel-plugin-api.js

@@ -1,5 +1,5 @@
-import { a as describeMattermostAccount, c as mattermostMeta, i as MattermostChannelConfigSchema, n as mattermostSetupWizard, o as isMattermostConfigured, r as mattermostSetupAdapter, s as mattermostConfigAdapter, t as mattermostPlugin } from "./channel-plugin-runtime-DhS8rwfs.js";
-import { t as resolveMattermostGatewayAuthBypassPaths } from "./gateway-auth-bypass-BIXLORHU.js";
+import { a as describeMattermostAccount, c as mattermostMeta, i as MattermostChannelConfigSchema, n as mattermostSetupWizard, o as isMattermostConfigured, r as mattermostSetupAdapter, s as mattermostConfigAdapter, t as mattermostPlugin } from "./channel-plugin-runtime-BkzZgYxP.js";
+import { t as resolveMattermostGatewayAuthBypassPaths } from "./gateway-auth-bypass-CL1PxV3z.js";
 //#region extensions/mattermost/src/channel.setup.ts
 const mattermostSetupPlugin = {
 	id: "mattermost",
@@ -23,7 +23,7 @@ const mattermostSetupPlugin = {
 		isConfigured: isMattermostConfigured,
 		describeAccount: describeMattermostAccount
 	},
-	gateway: { resolveGatewayAuthBypassPaths: ({ cfg }) => resolveMattermostGatewayAuthBypassPaths(cfg) },
+	gateway: { resolveGatewayAuthBypassPaths: resolveMattermostGatewayAuthBypassPaths },
 	setup: mattermostSetupAdapter,
 	setupWizard: mattermostSetupWizard
 };

package/dist/{channel-plugin-runtime-DhS8rwfs.js → channel-plugin-runtime-BkzZgYxP.js}

@@ -1,29 +1,29 @@
-import { C as hasConfiguredSecretInput, S as buildSecretInputSchema, g as normalizeMattermostBaseUrl, i as resolveMattermostReplyToMode, n as resolveDefaultMattermostAccountId, r as resolveMattermostAccount, t as listMattermostAccountIds } from "./accounts-ITTlduDO.js";
-import { t as resolveMattermostGatewayAuthBypassPaths } from "./gateway-auth-bypass-BIXLORHU.js";
-import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-ttH0DCuq.js";
-import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-Cx0LUNXy.js";
+import { C as hasConfiguredSecretInput, S as buildSecretInputSchema, g as normalizeMattermostBaseUrl, i as resolveMattermostReplyToMode, n as resolveDefaultMattermostAccountId, r as resolveMattermostAccount, t as listMattermostAccountIds } from "./accounts-B2NRPlqr.js";
+import { t as resolveMattermostGatewayAuthBypassPaths } from "./gateway-auth-bypass-CL1PxV3z.js";
+import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-BaUvVh8e.js";
+import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-B4R5Bmhv.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { formatNormalizedAllowFromEntries } from "openclaw/plugin-sdk/allow-from";
 import { createLoggedPairingApprovalNotifier } from "openclaw/plugin-sdk/channel-pairing";
 import { createAccountStatusSink, createChannelMessageAdapterFromOutbound } from "openclaw/plugin-sdk/channel-outbound";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, buildChannelOutboundSessionRoute, buildThreadAwareOutboundSessionRoute, stripChannelTargetPrefix, stripTargetKindPrefix } from "openclaw/plugin-sdk/core";
-import { createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
-import { createDangerousNameMatchingMutableAllowlistWarningCollector, createRestrictSendersChannelSecurity, resolveChannelGroupRequireMention } from "openclaw/plugin-sdk/channel-policy";
+import { createChannelConfigUiHints, createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
+import { buildChannelGroupsScopeTree, createDangerousNameMatchingMutableAllowlistWarningCollector, createRestrictSendersChannelSecurity, resolveScopeRequireMention } from "openclaw/plugin-sdk/channel-policy";
 import { attachChannelToResult, createAttachedChannelResultAdapter } from "openclaw/plugin-sdk/channel-send-result";
 import { createChannelDirectoryAdapter } from "openclaw/plugin-sdk/directory-runtime";
 import { buildPassiveProbedChannelStatusSummary } from "openclaw/plugin-sdk/extension-shared";
-import { normalizeMessagePresentation, renderMessagePresentationFallbackText, resolveMessagePresentationControlValue } from "openclaw/plugin-sdk/interactive-runtime";
+import { normalizeMessagePresentation, renderMessagePresentationFallbackText, resolveMessagePresentationButtonAction, resolveMessagePresentationControlValue } from "openclaw/plugin-sdk/interactive-runtime";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { resolvePayloadMediaUrls, sendTextMediaPayload } from "openclaw/plugin-sdk/reply-payload";
 import { isPrivateNetworkOptInEnabled } from "openclaw/plugin-sdk/ssrf-runtime";
 import { createComputedAccountStatusAdapter, createDefaultChannelRuntimeState } from "openclaw/plugin-sdk/status-helpers";
 import { chunkTextForOutbound, sanitizeAssistantVisibleText } from "openclaw/plugin-sdk/text-chunking";
-import { createResolvedApproverActionAuthAdapter, resolveApprovalApprovers } from "openclaw/plugin-sdk/approval-auth-runtime";
+import { createChannelApprovalAuth } from "openclaw/plugin-sdk/approval-auth-runtime";
 import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { z } from "zod";
 import { adaptScopedAccountAccessor, createScopedChannelConfigAdapter } from "openclaw/plugin-sdk/channel-config-helpers";
-import { BlockStreamingCoalesceSchema, DmPolicySchema, GroupPolicySchema, MarkdownConfigSchema, buildChannelConfigSchema, requireOpenAllowFrom } from "openclaw/plugin-sdk/channel-config-primitives";
+import { BlockStreamingCoalesceSchema, DmPolicySchema, GroupPolicySchema, MarkdownConfigSchema, buildChannelConfigSchema, requireOpenAllowFrom } from "openclaw/plugin-sdk/channel-config-schema";
 import { applyAccountNameToChannelSection, applySetupAccountConfigPatch, createSetupTranslator, createStandardChannelSetupStatus, formatDocsLink, migrateBaseNameToDefaultAccount } from "openclaw/plugin-sdk/setup";
 import { createSetupInputPresenceValidator } from "openclaw/plugin-sdk/setup-runtime";
 //#region extensions/mattermost/src/approval-auth.ts
@@ -32,20 +32,16 @@ function normalizeMattermostApproverId(value) {
 	const lowered = normalizeLowercaseStringOrEmpty(String(value).trim().replace(/^(mattermost|user):/i, "").replace(/^@/, "").trim());
 	return MATTERMOST_USER_ID_RE.test(lowered) ? lowered : void 0;
 }
-const mattermostApprovalAuth = createResolvedApproverActionAuthAdapter({
+const mattermostApprovalAuth = createChannelApprovalAuth({
 	channelLabel: "Mattermost",
-	resolveApprovers: ({ cfg, accountId }) => {
-		const account = resolveMattermostAccount({
+	resolveInputs: ({ cfg, accountId }) => {
+		return { allowFrom: resolveMattermostAccount({
 			cfg,
 			accountId
-		}).config;
-		return resolveApprovalApprovers({
-			allowFrom: account.allowFrom,
-			normalizeApprover: normalizeMattermostApproverId
-		});
+		}).config.allowFrom };
 	},
-	normalizeSenderId: (value) => normalizeMattermostApproverId(value)
-});
+	normalizeApprover: normalizeMattermostApproverId
+}).approvalAuth;
 //#endregion
 //#region extensions/mattermost/src/channel-config-shared.ts
 const mattermostMeta = {
@@ -162,17 +158,24 @@ const MattermostStreamingBlockSchema = z.object({
 	enabled: z.boolean().optional(),
 	coalesce: BlockStreamingCoalesceSchema.optional()
 }).strict();
-const MattermostStreamingSchema = z.union([
-	MattermostStreamingModeSchema,
-	z.boolean(),
-	z.object({
-		mode: MattermostStreamingModeSchema.optional(),
-		chunkMode: z.enum(["length", "newline"]).optional(),
-		preview: MattermostStreamingPreviewSchema.optional(),
-		progress: MattermostStreamingProgressSchema.optional(),
-		block: MattermostStreamingBlockSchema.optional()
-	}).strict()
+const MattermostStreamingSchema = z.object({
+	mode: MattermostStreamingModeSchema.optional(),
+	chunkMode: z.enum(["length", "newline"]).optional(),
+	preview: MattermostStreamingPreviewSchema.optional(),
+	progress: MattermostStreamingProgressSchema.optional(),
+	block: MattermostStreamingBlockSchema.optional()
+}).strict();
+const MattermostReplyToModeSchema = z.enum([
+	"off",
+	"first",
+	"all",
+	"batched"
 ]);
+const MattermostReplyToModeByChatTypeSchema = z.object({
+	direct: MattermostReplyToModeSchema.optional(),
+	group: MattermostReplyToModeSchema.optional(),
+	channel: MattermostReplyToModeSchema.optional()
+}).strict();
 const MattermostAccountSchemaBase = z.object({
 	name: z.string().optional(),
 	capabilities: z.array(z.string()).optional(),
@@ -194,16 +197,9 @@ const MattermostAccountSchemaBase = z.object({
 	groupAllowFrom: z.array(z.union([z.string(), z.number()])).optional(),
 	groupPolicy: GroupPolicySchema.optional().default("allowlist"),
 	textChunkLimit: z.number().int().positive().optional(),
-	chunkMode: z.enum(["length", "newline"]).optional(),
 	streaming: MattermostStreamingSchema.optional(),
-	blockStreaming: z.boolean().optional(),
-	blockStreamingCoalesce: BlockStreamingCoalesceSchema.optional(),
-	replyToMode: z.enum([
-		"off",
-		"first",
-		"all",
-		"batched"
-	]).optional(),
+	replyToMode: MattermostReplyToModeSchema.optional(),
+	replyToModeByChatType: MattermostReplyToModeByChatTypeSchema.optional(),
 	responsePrefix: z.string().optional(),
 	actions: z.object({ reactions: z.boolean().optional() }).optional(),
 	commands: MattermostSlashCommandsSchema,
@@ -241,10 +237,10 @@ const MattermostChannelConfigSchema = buildChannelConfigSchema(MattermostAccount
 		label: "Mattermost",
 		help: "Mattermost channel provider configuration for bot auth, access policy, slash commands, and preview streaming."
 	},
-	dmPolicy: {
-		label: "Mattermost DM Policy",
-		help: "Direct message access control (\"pairing\" recommended). \"open\" requires channels.mattermost.allowFrom=[\"*\"]."
-	},
+	...createChannelConfigUiHints({
+		channelLabel: "Mattermost",
+		dmPolicy: { channelKey: "mattermost" }
+	}),
 	streaming: {
 		label: "Mattermost Streaming Mode",
 		help: "Unified Mattermost stream preview mode: \"off\" | \"partial\" | \"block\" | \"progress\". \"progress\" keeps a single editable progress draft until final delivery."
@@ -253,30 +249,10 @@ const MattermostChannelConfigSchema = buildChannelConfigSchema(MattermostAccount
 		label: "Mattermost Streaming Mode",
 		help: "Canonical Mattermost preview mode: \"off\" | \"partial\" | \"block\" | \"progress\"."
 	},
-	"streaming.progress.label": {
-		label: "Mattermost Progress Label",
-		help: "Initial progress draft title. Use \"auto\" for built-in single-word labels, a custom string, or false to hide the title."
-	},
-	"streaming.progress.labels": {
-		label: "Mattermost Progress Label Pool",
-		help: "Candidate labels for streaming.progress.label=\"auto\". Leave unset to use OpenClaw built-in progress labels."
-	},
-	"streaming.progress.maxLines": {
-		label: "Mattermost Progress Max Lines",
-		help: "Maximum number of compact progress lines to keep below the draft label (default: 8)."
-	},
-	"streaming.progress.maxLineChars": {
-		label: "Mattermost Progress Max Line Chars",
-		help: "Maximum characters per compact progress line before truncation (default: 120). Prose cuts at word boundaries; commands and paths keep useful suffixes."
-	},
-	"streaming.progress.toolProgress": {
-		label: "Mattermost Progress Tool Lines",
-		help: "Show compact tool/progress lines in progress draft mode (default: true). Set false to keep only the label until final delivery."
-	},
-	"streaming.progress.commandText": {
-		label: "Mattermost Progress Command Text",
-		help: "Command/exec detail in progress draft lines: \"raw\" preserves released behavior; \"status\" shows only the tool label."
-	},
+	...createChannelConfigUiHints({
+		channelLabel: "Mattermost",
+		progress: {}
+	}),
 	"streaming.preview.toolProgress": {
 		label: "Mattermost Draft Tool Progress",
 		help: "Show tool/progress activity in the live draft preview post (default: true). Set false to hide interim tool updates while the draft preview stays active."
@@ -325,13 +301,11 @@ function resolveMattermostGroupRequireMention(params) {
 		cfg: params.cfg,
 		accountId: params.accountId
 	});
-	const requireMentionOverride = typeof params.requireMentionOverride === "boolean" ? params.requireMentionOverride : account.requireMention;
-	return resolveChannelGroupRequireMention({
-		cfg: params.cfg,
-		channel: "mattermost",
-		groupId: params.groupId,
-		accountId: params.accountId,
-		requireMentionOverride
+	return resolveScopeRequireMention({
+		tree: buildChannelGroupsScopeTree(params.cfg, "mattermost", params.accountId),
+		path: params.groupId ? [params.groupId] : [],
+		requireMentionOverride: params.requireMentionOverride ?? account.requireMention,
+		overrideOrder: "after-config"
 	});
 }
 //#endregion
@@ -568,7 +542,7 @@ const mattermostSetupWizard = {
 };
 //#endregion
 //#region extensions/mattermost/src/channel.ts
-const loadMattermostChannelRuntime = createLazyRuntimeModule(() => import("./channel.runtime-D0SJSEei.js"));
+const loadMattermostChannelRuntime = createLazyRuntimeModule(() => import("./channel.runtime-Cbs451W2.js"));
 function buildMattermostPresentationButtons(presentation) {
 	return presentation.blocks.filter((block) => block.type === "buttons").map((block) => block.buttons.flatMap((button) => {
 		if (button.action) return [];
@@ -590,8 +564,11 @@ const MATTERMOST_PRESENTATION_CAPABILITIES = {
 	divider: false,
 	limits: { text: { markdownDialect: "markdown" } }
 };
-function hasMattermostPresentationButtons(presentation) {
-	return buildMattermostPresentationButtons(presentation).some((row) => row.length > 0);
+function hasMattermostPresentationNavigation(presentation) {
+	return presentation.blocks.some((block) => block.type === "buttons" && block.buttons.some((button) => {
+		const action = resolveMessagePresentationButtonAction(button);
+		return action?.type === "url" || action?.type === "web-app";
+	}));
 }
 function readMattermostPresentationButtons(payload) {
 	const buttons = (payload.channelData?.mattermost)?.presentationButtons;
@@ -902,20 +879,21 @@ const mattermostOutbound = {
 	renderPresentation: ({ payload, presentation }) => {
 		if (payload.mediaUrls && payload.mediaUrls.length > 1) return null;
 		const buttons = buildMattermostPresentationButtons(presentation);
-		if (!hasMattermostPresentationButtons(presentation)) return null;
+		const hasButtons = buttons.some((row) => row.length > 0);
+		if (!hasButtons && !hasMattermostPresentationNavigation(presentation)) return null;
 		return {
 			...payload,
 			text: renderMessagePresentationFallbackText({
 				text: payload.text,
 				presentation
 			}),
-			channelData: {
+			...hasButtons ? { channelData: {
 				...payload.channelData,
 				mattermost: {
 					...payload.channelData?.mattermost,
 					presentationButtons: buttons
 				}
-			}
+			} } : {}
 		};
 	},
 	sendPayload: async (ctx) => {
@@ -1100,7 +1078,7 @@ const mattermostPlugin = createChatChannelPlugin({
 			})
 		}),
 		gateway: {
-			resolveGatewayAuthBypassPaths: ({ cfg }) => resolveMattermostGatewayAuthBypassPaths(cfg),
+			resolveGatewayAuthBypassPaths: resolveMattermostGatewayAuthBypassPaths,
 			startAccount: async (ctx) => {
 				const account = ctx.account;
 				const statusSink = createAccountStatusSink({
@@ -1150,9 +1128,10 @@ const mattermostPlugin = createChatChannelPlugin({
 		}),
 		resolveReplyTransport: ({ threadId, replyToId, replyToIsExplicit, replyDelivery }) => {
 			const ambientThreadId = threadId != null ? String(threadId) : void 0;
-			const resolvedThreadId = replyDelivery?.chatType === "direct" ? void 0 : replyDelivery ? replyToIsExplicit ? replyToId ?? ambientThreadId : ambientThreadId ?? replyToId ?? void 0 : ambientThreadId ?? replyToId;
+			const isFlatDirect = replyDelivery?.chatType === "direct" && replyDelivery.replyToMode === "off";
+			const resolvedThreadId = isFlatDirect ? void 0 : replyDelivery ? replyToIsExplicit ? replyToId ?? ambientThreadId : ambientThreadId ?? replyToId ?? void 0 : ambientThreadId ?? replyToId;
 			return {
-				replyToId: replyDelivery?.chatType === "direct" ? null : resolvedThreadId,
+				replyToId: isFlatDirect ? null : resolvedThreadId,
 				threadId: resolvedThreadId ?? null
 			};
 		}

package/dist/channel-plugin-runtime.js

@@ -1,2 +1,2 @@
-import { t as mattermostPlugin } from "./channel-plugin-runtime-DhS8rwfs.js";
+import { t as mattermostPlugin } from "./channel-plugin-runtime-BkzZgYxP.js";
 export { mattermostPlugin };