@openclaw/clickclack 2026.9.5 → 2026.9.7

package/dist/.setup/{channel-yIQ_PUDD.mjs → channel-Bcwtohk7.mjs}

@@ -1,106 +1,177 @@
-import { _ as DEFAULT_ACCOUNT_ID, b as resolveClickClackAccount, c as resolveWorkspaceId, f as normalizeClickClackCorrelationId, g as clickClackMeta, h as clickClackConfigAdapter, l as ClickClackHttpError, m as CLICKCLACK_CHANNEL_ID, n as clickClackSetupContract, p as clickClackConfigSchema, s as resolveChannelId, t as clickClackSetupWizard, u as createClickClackClient, y as listEnabledClickClackAccounts } from "./setup-surface-BBl3rvVx.mjs";
+import { n as __reExport, t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
+import { c as CLICKCLACK_CHANNEL_ID, d as DEFAULT_ACCOUNT_ID, f as isClickClackAccountCurrent, g as resolveClickClackAccountConfig, h as resolveClickClackAccount, l as clickClackConfigAdapter, m as listEnabledClickClackAccounts, n as clickClackSetupContract, s as clickClackConfigSchema, t as clickClackSetupWizard, u as clickClackMeta } from "./setup-surface-BW1Q06w5.mjs";
+import { i as createClickClackClient, n as resolveWorkspaceId, o as normalizeClickClackCorrelationId, r as ClickClackHttpError, t as resolveChannelId } from "./resolve-BHGLohni.mjs";
 import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-BKkzzjBA.mjs";
 import { resolveChannelMediaMaxBytes } from "openclaw/plugin-sdk/account-helpers";
 import { parseDateStringTimestampMs } from "openclaw/plugin-sdk/number-runtime";
 import { mergePairLoopGuardConfig } from "openclaw/plugin-sdk/pair-loop-guard-runtime";
 import { readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { buildChannelOutboundSessionRoute, buildThreadAwareOutboundSessionRoute, createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
-import { buildChannelProgressDraftLine, createChannelMessageReplyPipeline, createMessageReceiptFromOutboundResults, defineChannelMessageAdapter, deriveDurableFinalDeliveryRequirements } from "openclaw/plugin-sdk/channel-outbound";
+import { buildChannelProgressDraftLine, createChannelMessageReplyPipeline, createMessageReceiptFromOutboundResults, defineChannelMessageAdapter, deriveDurableFinalDeliveryRequirements, formatChannelProgressDraftLineForEntry, isCompleteAgentPreamble } from "openclaw/plugin-sdk/channel-outbound";
 import { createComputedAccountStatusAdapter, createDefaultChannelRuntimeState } from "openclaw/plugin-sdk/status-helpers";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { channelReadyPatch, channelStoppedPatch } from "openclaw/plugin-sdk/gateway-runtime";
 import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { rawDataToString } from "openclaw/plugin-sdk/webhook-ingress";
-import { resolveStableChannelMessageIngress } from "openclaw/plugin-sdk/channel-ingress-runtime";
+import { isDeepStrictEqual } from "node:util";
+import { parseAccessGroupAllowFromEntry } from "openclaw/plugin-sdk/access-groups";
+import { formatNormalizedAllowFromEntries, resolveAllowlistMatchByCandidates } from "openclaw/plugin-sdk/allow-from";
 import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
 import { createHash, randomUUID } from "node:crypto";
 import { truncateCodePoints } from "openclaw/plugin-sdk/text-utility-runtime";
-import { buildMentionRegexes, normalizeMentionText } from "openclaw/plugin-sdk/channel-mention-gating";
 import { createPluginRuntimeStore } from "openclaw/plugin-sdk/runtime-store";
 import { listNativeCommandSpecsForConfig } from "openclaw/plugin-sdk/native-command-registry";
 import { buildChannelInboundEventContext, createChannelInboundEnvelopeBuilder, createChannelPartialDeliveryError, recordChannelBotPairLoopAndCheckSuppression } from "openclaw/plugin-sdk/channel-inbound";
 import { extensionForMime } from "openclaw/plugin-sdk/media-mime";
 import { loadOutboundMediaFromUrl } from "openclaw/plugin-sdk/outbound-media";
 import { FormatCapabilityProfile, renderMarkdownWithMarkers, sanitizeAssistantVisibleText } from "openclaw/plugin-sdk/text-chunking";
+//#region src/channels/mention-gating.ts
+function resolveBotThreadMentionPolicy(params) {
+	if (!params.isBotOwnedThread || params.requireMentionInBotThreads === void 0) return {
+		requireMention: params.requireMention,
+		implicitMentionKinds: params.implicitMentionKinds
+	};
+	return {
+		requireMention: params.requireMentionInBotThreads,
+		implicitMentionKinds: params.requireMentionInBotThreads ? params.implicitMentionKinds?.filter((kind) => kind === "native") : params.implicitMentionKinds
+	};
+}
+//#endregion
+//#region \0openclaw:bundled-sdk:openclaw/plugin-sdk/channel-mention-gating
+var channel_mention_gating_exports = /* @__PURE__ */ __exportAll({ resolveBotThreadMentionPolicy: () => resolveBotThreadMentionPolicy });
+import * as import_openclaw_plugin_sdk_channel_mention_gating from "openclaw/plugin-sdk/channel-mention-gating";
+__reExport(channel_mention_gating_exports, import_openclaw_plugin_sdk_channel_mention_gating);
+//#endregion
 //#region extensions/clickclack/src/discussions/binding-generation.ts
-const DISCUSSION_GENERATIONS_NAMESPACE = "discussion-binding-generations";
-const MAX_PENDING_DISCUSSION_GENERATIONS = 1e4;
+const GENERATION_STORE_OPTIONS = {
+	namespace: "discussion-binding-generations",
+	maxEntries: 1e4,
+	overflowPolicy: "reject-new"
+};
 const storesByRuntime$2 = /* @__PURE__ */ new WeakMap();
-function getGenerationStore(runtime) {
-	const existing = storesByRuntime$2.get(runtime);
-	if (existing) return existing;
-	const created = runtime.state.openSyncKeyedStore({
-		namespace: DISCUSSION_GENERATIONS_NAMESPACE,
-		maxEntries: MAX_PENDING_DISCUSSION_GENERATIONS,
-		overflowPolicy: "reject-new"
+function withGenerationStore(runtime, run) {
+	let owner = storesByRuntime$2.get(runtime);
+	if (!owner) {
+		const store = runtime.state.openKeyedStore(GENERATION_STORE_OPTIONS);
+		owner = {
+			store,
+			...!store.observe || !store.compareAndApply ? { native: runtime.state.openSyncKeyedStore(GENERATION_STORE_OPTIONS) } : {},
+			tail: Promise.resolve()
+		};
+		storesByRuntime$2.set(runtime, owner);
+	}
+	const currentOwner = owner;
+	const current = owner.tail.then(() => run(currentOwner));
+	owner.tail = current.then(() => void 0, () => void 0);
+	return current;
+}
+function mutateGeneration(runtime, sessionKey, decide) {
+	return withGenerationStore(runtime, async ({ store, native }) => {
+		if (native) {
+			const current = native.lookup(sessionKey);
+			const next = decide(current);
+			if (next.value !== current) {
+				if (next.value) native.register(sessionKey, next.value);
+				else native.delete(sessionKey);
+			}
+			return next.result;
+		}
+		const { observe, compareAndApply } = store;
+		if (!observe || !compareAndApply) throw new Error("ClickClack generation comparison capabilities changed");
+		let observed = await observe(sessionKey);
+		for (;;) {
+			const next = decide(observed.value);
+			const outcome = await compareAndApply(sessionKey, observed.comparison, next.value === observed.value ? {
+				operation: "update",
+				action: "keep"
+			} : next.value ? {
+				operation: "update",
+				action: "set",
+				value: next.value
+			} : {
+				operation: "delete",
+				action: "delete"
+			});
+			if (outcome.status !== "conflict") return next.result;
+			observed = outcome.current;
+		}
 	});
-	storesByRuntime$2.set(runtime, created);
-	return created;
 }
 /** Reserves a generation so an interrupted channel create can be adopted on retry. */
 function reserveDiscussionBindingGeneration(params) {
-	const store = getGenerationStore(params.runtime);
-	const existing = store.lookup(params.sessionKey);
-	const existingAccountId = existing?.accountId ?? existing?.pending?.accountId;
-	const existingCredentialFingerprint = existing?.credentialFingerprint ?? existing?.pending?.credentialFingerprint;
-	if (existing?.destinationIdentity === params.destinationIdentity && existingAccountId === params.accountId && existingCredentialFingerprint === params.credentialFingerprint) {
-		if (!existing.accountId || !existing.credentialFingerprint) store.register(params.sessionKey, {
-			...existing,
-			accountId: params.accountId,
-			credentialFingerprint: params.credentialFingerprint
-		});
-		return existing.generation;
-	}
-	const generation = (params.createGeneration ?? randomUUID)();
-	store.register(params.sessionKey, {
-		accountId: params.accountId,
-		credentialFingerprint: params.credentialFingerprint,
-		destinationIdentity: params.destinationIdentity,
-		generation
+	let generation;
+	return mutateGeneration(params.runtime, params.sessionKey, (existing) => {
+		const existingAccountId = existing?.accountId ?? existing?.pending?.accountId;
+		const existingCredentialFingerprint = existing?.credentialFingerprint ?? existing?.pending?.credentialFingerprint;
+		if (existing?.destinationIdentity === params.destinationIdentity && existingAccountId === params.accountId && existingCredentialFingerprint === params.credentialFingerprint) return {
+			value: existing.accountId && existing.credentialFingerprint ? existing : {
+				...existing,
+				accountId: params.accountId,
+				credentialFingerprint: params.credentialFingerprint
+			},
+			result: existing.generation
+		};
+		generation ??= (params.createGeneration ?? randomUUID)();
+		return {
+			value: {
+				accountId: params.accountId,
+				credentialFingerprint: params.credentialFingerprint,
+				destinationIdentity: params.destinationIdentity,
+				generation
+			},
+			result: generation
+		};
 	});
-	return generation;
 }
 /** Clears only the completed reservation; future opens must mint a new ownership ref. */
 function clearDiscussionBindingGeneration(params) {
-	const store = getGenerationStore(params.runtime);
-	const existing = store.lookup(params.sessionKey);
-	if (!existing) return;
-	if (params.expectedGeneration && existing.generation !== params.expectedGeneration) return;
-	store.delete(params.sessionKey);
+	return mutateGeneration(params.runtime, params.sessionKey, (existing) => ({
+		value: existing && params.expectedGeneration && existing.generation !== params.expectedGeneration ? existing : void 0,
+		result: void 0
+	}));
 }
 /** Quarantines a destination before the first fallible channel create. */
 function recordPendingDiscussionOpen(params) {
-	const store = getGenerationStore(params.runtime);
-	const existing = store.lookup(params.sessionKey);
-	if (!existing || existing.generation !== params.generation) throw new Error("ClickClack discussion generation changed before channel creation");
-	if (existing.accountId !== params.pending.accountId || existing.credentialFingerprint !== params.pending.credentialFingerprint) throw new Error("ClickClack discussion ownership changed before channel creation");
-	store.register(params.sessionKey, {
-		...existing,
-		pending: params.pending
+	return mutateGeneration(params.runtime, params.sessionKey, (existing) => {
+		if (!existing || existing.generation !== params.generation) throw new Error("ClickClack discussion generation changed before channel creation");
+		if (existing.accountId !== params.pending.accountId || existing.credentialFingerprint !== params.pending.credentialFingerprint) throw new Error("ClickClack discussion ownership changed before channel creation");
+		return {
+			value: {
+				...existing,
+				pending: params.pending
+			},
+			result: void 0
+		};
 	});
 }
 function listPendingDiscussionOpens(runtime) {
-	return getGenerationStore(runtime).entries().flatMap((entry) => entry.value.pending ? [{
+	return withGenerationStore(runtime, async ({ store }) => (await store.entries()).flatMap((entry) => entry.value.pending ? [{
 		sessionKey: entry.key,
 		generation: entry.value.generation,
 		...entry.value.pending
-	}] : []);
+	}] : []));
 }
 /** Stops destination-wide quarantine after the exact remote channel is known. */
 function clearPendingDiscussionOpen(params) {
-	const store = getGenerationStore(params.runtime);
-	const existing = store.lookup(params.sessionKey);
-	if (!existing || existing.generation !== params.expectedGeneration || !existing.pending) return;
-	store.register(params.sessionKey, {
-		accountId: existing.accountId ?? existing.pending.accountId,
-		credentialFingerprint: existing.credentialFingerprint ?? existing.pending.credentialFingerprint,
-		destinationIdentity: existing.destinationIdentity,
-		generation: existing.generation
+	return mutateGeneration(params.runtime, params.sessionKey, (existing) => {
+		if (!existing || existing.generation !== params.expectedGeneration || !existing.pending) return {
+			value: existing,
+			result: void 0
+		};
+		return {
+			value: {
+				accountId: existing.accountId ?? existing.pending.accountId,
+				credentialFingerprint: existing.credentialFingerprint ?? existing.pending.credentialFingerprint,
+				destinationIdentity: existing.destinationIdentity,
+				generation: existing.generation
+			},
+			result: void 0
+		};
 	});
 }
-function hasPendingDiscussionOpenForDestination(params) {
+async function hasPendingDiscussionOpenForDestination(params) {
 	const serverBaseUrl = params.serverBaseUrl.replace(/\/+$/u, "");
-	return listPendingDiscussionOpens(params.runtime).some((pending) => pending.serverBaseUrl === serverBaseUrl && pending.workspaceId === params.workspaceId);
+	return (await listPendingDiscussionOpens(params.runtime)).some((pending) => pending.serverBaseUrl === serverBaseUrl && pending.workspaceId === params.workspaceId);
 }
 //#endregion
 //#region extensions/clickclack/src/discussions/naming.ts
@@ -402,14 +473,19 @@ function isClickClackDiscussionChannelRevoked(params) {
 }
 //#endregion
 //#region extensions/clickclack/src/discussions/routing.ts
-function resolveClickClackDiscussionRoute(params) {
-	if (isClickClackDiscussionChannelRevoked(params)) return { state: "revoked" };
+async function resolveClickClackDiscussionRoute(params) {
 	const store = getClickClackDiscussionBindingStore(params.runtime);
-	const matched = store.getByChannel(params.serverBaseUrl, params.channelId);
-	if (!matched) return { state: hasPendingDiscussionOpenForDestination(params) ? "revoked" : "unbound" };
+	let matched = store.getByChannel(params.serverBaseUrl, params.channelId);
+	let pending = false;
+	if (!matched) {
+		pending = await hasPendingDiscussionOpenForDestination(params);
+		matched = store.getByChannel(params.serverBaseUrl, params.channelId);
+	}
+	if (isClickClackDiscussionChannelRevoked(params)) return { state: "revoked" };
+	if (!matched) return { state: pending ? "revoked" : "unbound" };
 	if (matched.binding.accountId !== params.accountId) return { state: "revoked" };
 	if (matched.binding.serverBaseUrl !== params.serverBaseUrl.replace(/\/+$/u, "")) return { state: "revoked" };
-	if (resolveDiscussionBindingAccount(params.config, matched.binding).state !== "active") return { state: "revoked" };
+	if (resolveDiscussionBindingAccount(params.runtime.config.current(), matched.binding).state !== "active") return { state: "revoked" };
 	let binding;
 	try {
 		binding = attachBindingToCurrentActiveSession({
@@ -454,45 +530,20 @@ function resolveClickClackDiscussionRoute(params) {
 }
 //#endregion
 //#region extensions/clickclack/src/group-policy.ts
-/**
-* Resolves bot-authored message policy using the same exact, wildcard, and
-* account-level precedence as mention gating.
-*/
-function resolveClickClackBotPolicy(params) {
+function resolveClickClackGroupPolicy(params) {
 	const { account, channelId } = params;
 	const channelKey = channelId?.trim();
 	const groups = channelKey ? account.groups : void 0;
 	const wildcard = groups?.["*"];
 	const exact = channelKey ? groups?.[channelKey] : void 0;
 	return {
+		requireMention: exact?.requireMention ?? wildcard?.requireMention ?? account.requireMention === true,
+		requireMentionInBotThreads: exact?.requireMentionInBotThreads ?? wildcard?.requireMentionInBotThreads ?? account.requireMentionInBotThreads,
+		mentionPatterns: exact?.mentionPatterns ?? wildcard?.mentionPatterns ?? account.mentionPatterns ?? [],
 		allowBots: exact?.allowBots ?? wildcard?.allowBots ?? account.allowBots ?? false,
 		botLoopProtection: mergePairLoopGuardConfig(account.botLoopProtection, wildcard?.botLoopProtection, exact?.botLoopProtection)
 	};
 }
-/**
-* Resolves the effective group policy for a ClickClack channel.
-*
-* Lookup order:
-*  1. Exact channel ID in `groups`
-*  2. Wildcard `'*'` entry in `groups`
-*  3. Account-level `requireMention` / `mentionPatterns`
-*  4. Backward-compatible default: { requireMention: false, mentionPatterns: [] }
-*/
-function resolveClickClackGroupPolicy(params) {
-	const { account, channelId } = params;
-	const accountPolicy = {
-		requireMention: account.requireMention === true,
-		mentionPatterns: account.mentionPatterns ?? []
-	};
-	const channelKey = channelId?.trim();
-	const groups = channelKey ? account.groups : void 0;
-	const wildcard = groups?.["*"];
-	const exact = channelKey ? groups?.[channelKey] : void 0;
-	return {
-		requireMention: exact?.requireMention ?? wildcard?.requireMention ?? accountPolicy.requireMention,
-		mentionPatterns: exact?.mentionPatterns ?? wildcard?.mentionPatterns ?? accountPolicy.mentionPatterns
-	};
-}
 //#endregion
 //#region extensions/clickclack/src/mention-facts.ts
 /**
@@ -515,7 +566,7 @@ function buildLocalMentionRegexes(params) {
 			}
 		}
 	};
-	return buildMentionRegexes(syntheticCfg, void 0, {
+	return (0, channel_mention_gating_exports.buildMentionRegexes)(syntheticCfg, void 0, {
 		provider: "clickclack",
 		conversationId: params.channelId
 	});
@@ -546,7 +597,7 @@ function resolveClickClackMentionFacts(params) {
 		wasMentioned: false,
 		hasAnyMention: false
 	};
-	const sharedMentionRegexes = buildMentionRegexes(cfg, agentId, {
+	const sharedMentionRegexes = (0, channel_mention_gating_exports.buildMentionRegexes)(cfg, agentId, {
 		provider: "clickclack",
 		conversationId: channelId
 	});
@@ -556,7 +607,7 @@ function resolveClickClackMentionFacts(params) {
 		channelId
 	});
 	const mentionRegexes = [...sharedMentionRegexes, ...localMentionRegexes];
-	const bodyForRegex = normalizeMentionText(body);
+	const bodyForRegex = (0, channel_mention_gating_exports.normalizeMentionText)(body);
 	const hasConfiguredMention = mentionRegexes.some((regex) => regex.test(bodyForRegex));
 	const mentionHandles = resolveMentionHandles(body);
 	const normalizedBotHandle = botHandle?.replace(/^@/u, "").trim().toLowerCase();
@@ -622,10 +673,6 @@ function looksLikeClickClackTarget(raw) {
 }
 //#endregion
 //#region extensions/clickclack/src/access.ts
-/**
-* Maps ClickClack senders and conversations onto the shared channel ingress
-* allowlist/command authorization contract.
-*/
 const CHANNEL_ID$2 = "clickclack";
 function normalizeClickClackUserId(value) {
 	const trimmed = value.trim();
@@ -640,6 +687,19 @@ const clickClackIngressIdentity = {
 	isWildcardEntry: (entry) => normalizeClickClackUserId(entry) === "*",
 	entryIdPrefix: "clickclack-user"
 };
+async function isClickClackBotOwnedThread(params) {
+	const { account, message } = params;
+	if (!account.botUserId || !message.parent_message_id || !message.thread_root_id || message.thread_root_id === message.id || !message.channel_id || message.direct_conversation_id || message.workspace_id !== account.workspace) return false;
+	try {
+		const root = await createClickClackClient({
+			baseUrl: account.apiEndpoint,
+			token: account.token
+		}).message(message.thread_root_id);
+		return root.id === message.thread_root_id && root.thread_root_id === root.id && !root.parent_message_id && !root.direct_conversation_id && root.workspace_id === message.workspace_id && root.channel_id === message.channel_id && root.author_id === account.botUserId;
+	} catch {
+		return false;
+	}
+}
 function resolveClickClackBotLoopConversationId(params) {
 	if (params.message.parent_message_id && params.message.thread_root_id) return params.message.thread_root_id;
 	return params.isDirect ? params.message.direct_conversation_id ?? params.message.author_id : params.message.channel_id ?? params.message.thread_root_id ?? params.message.author_id;
@@ -684,7 +744,7 @@ function resolveAccountAgentRoute(params) {
 		lastRoutePolicy: sessionKey === mainSessionKey ? "main" : "session"
 	};
 }
-function resolvePreparedInboundRoute(params) {
+async function resolvePreparedInboundRoute(params) {
 	const runtime = getClickClackRuntime();
 	const isDirect = Boolean(params.message.direct_conversation_id);
 	const target = buildClickClackTarget(isDirect ? {
@@ -702,9 +762,8 @@ function resolvePreparedInboundRoute(params) {
 		target,
 		isDirect
 	});
-	const discussionResolution = !isDirect && params.message.channel_id ? resolveClickClackDiscussionRoute({
+	const discussionResolution = !isDirect && params.message.channel_id ? await resolveClickClackDiscussionRoute({
 		runtime,
-		config: params.config,
 		accountId: params.account.accountId,
 		serverBaseUrl: params.account.baseUrl,
 		workspaceId: params.message.workspace_id,
@@ -730,13 +789,37 @@ function resolvePreparedInboundRoute(params) {
 */
 async function resolveClickClackInboundAccess(params) {
 	const runtime = getClickClackRuntime();
-	const cfg = params.config;
-	const preparedRoute = resolvePreparedInboundRoute(params);
-	const shouldCheckCommand = runtime.channel.commands.shouldComputeCommandAuthorized(params.message.body, cfg);
-	const effectiveGroupPolicy = resolveClickClackGroupPolicy({
+	const rootPolicyConfigured = resolveClickClackGroupPolicy({
 		account: params.account,
 		channelId: params.message.channel_id
+	}).requireMentionInBotThreads !== void 0;
+	const isCurrent = () => isClickClackAccountCurrent({
+		cfg: runtime.config.current(),
+		account: params.account
+	});
+	const isBotOwnedThread = rootPolicyConfigured && await isClickClackBotOwnedThread(params);
+	const routeConfig = rootPolicyConfigured ? runtime.config.current() : params.config;
+	const routeAccountConfig = rootPolicyConfigured ? resolveClickClackAccountConfig(routeConfig, params.account.accountId) : params.account;
+	const preparedRoute = await resolvePreparedInboundRoute({
+		...params,
+		config: routeConfig,
+		account: {
+			...params.account,
+			agentId: routeAccountConfig.agentId
+		}
 	});
+	const cfg = rootPolicyConfigured ? runtime.config.current() : params.config;
+	const accountPolicy = rootPolicyConfigured ? resolveClickClackAccountConfig(cfg, params.account.accountId) : params.account;
+	const effectiveGroupPolicy = resolveClickClackGroupPolicy({
+		account: accountPolicy,
+		channelId: params.message.channel_id
+	});
+	const threadMentionPolicy = resolveBotThreadMentionPolicy({
+		isBotOwnedThread,
+		requireMentionInBotThreads: effectiveGroupPolicy.requireMentionInBotThreads,
+		requireMention: effectiveGroupPolicy.requireMention
+	});
+	const shouldCheckCommand = runtime.channel.commands.shouldComputeCommandAuthorized(params.message.body, cfg);
 	const mentionFacts = resolveClickClackMentionFacts({
 		isDirect: preparedRoute.isDirect,
 		body: params.message.body,
@@ -746,23 +829,22 @@ async function resolveClickClackInboundAccess(params) {
 		agentId: preparedRoute.route.agentId,
 		channelId: params.message.channel_id
 	});
-	if (params.message.kind !== void 0 && params.message.kind !== "message") return {
+	if (!isCurrent() || params.message.kind !== void 0 && params.message.kind !== "message") return {
 		shouldDispatch: false,
+		isCurrent,
 		commandAuthorized: false,
-		requireMention: effectiveGroupPolicy.requireMention,
+		requireMention: threadMentionPolicy.requireMention,
 		mentionFacts,
 		preparedRoute
 	};
-	const effectiveBotPolicy = resolveClickClackBotPolicy({
-		account: params.account,
-		channelId: params.message.channel_id
-	});
 	const isBotAuthor = params.message.author?.kind === "bot";
-	const ingressAllowFrom = isBotAuthor ? params.account.allowFrom.filter((entry) => normalizeClickClackUserId(entry) !== "*") : params.account.allowFrom;
-	if (!(!isBotAuthor || effectiveBotPolicy.allowBots === true || effectiveBotPolicy.allowBots === "mentions" && (preparedRoute.isDirect || mentionFacts.wasMentioned))) return {
+	const allowFrom = accountPolicy.allowFrom ?? ["*"];
+	const ingressAllowFrom = isBotAuthor ? allowFrom.filter((entry) => normalizeClickClackUserId(entry) !== "*") : allowFrom;
+	if (!(!isBotAuthor || effectiveGroupPolicy.allowBots === true || effectiveGroupPolicy.allowBots === "mentions" && (preparedRoute.isDirect || mentionFacts.wasMentioned))) return {
 		shouldDispatch: false,
+		isCurrent,
 		commandAuthorized: false,
-		requireMention: effectiveGroupPolicy.requireMention,
+		requireMention: threadMentionPolicy.requireMention,
 		mentionFacts,
 		preparedRoute
 	};
@@ -777,16 +859,16 @@ async function resolveClickClackInboundAccess(params) {
 		receiverId: params.account.botUserId,
 		eventId: params.message.id,
 		...botLoopNowMs !== void 0 ? { nowMs: botLoopNowMs } : {},
-		config: effectiveBotPolicy.botLoopProtection,
+		config: effectiveGroupPolicy.botLoopProtection,
 		defaultsConfig: cfg.channels?.defaults?.botLoopProtection,
 		defaultEnabled: true
 	} : void 0;
-	const allowTextCommands = params.account.replyMode === "agent" && runtime.channel.commands.shouldHandleTextCommands({
+	const allowTextCommands = accountPolicy.replyMode !== "model" && runtime.channel.commands.shouldHandleTextCommands({
 		cfg,
 		surface: CHANNEL_ID$2,
 		commandSource: "text"
 	});
-	const resolved = await resolveStableChannelMessageIngress({
+	const resolved = await runtime.channel.inbound.ingress.resolveStable({
 		channelId: CHANNEL_ID$2,
 		accountId: params.account.accountId,
 		identity: clickClackIngressIdentity,
@@ -799,6 +881,7 @@ async function resolveClickClackInboundAccess(params) {
 		contextBinding: {
 			agentId: preparedRoute.route.agentId,
 			sessionKey: preparedRoute.route.sessionKey,
+			nativeChannelId: params.message.channel_id || params.message.direct_conversation_id,
 			messageId: params.message.id,
 			inboundEventKind: "user_request"
 		},
@@ -807,7 +890,7 @@ async function resolveClickClackInboundAccess(params) {
 		groupPolicy: "allowlist",
 		mentionFacts,
 		policy: { activation: {
-			requireMention: effectiveGroupPolicy.requireMention,
+			requireMention: threadMentionPolicy.requireMention,
 			allowTextCommands
 		} },
 		command: shouldCheckCommand ? {
@@ -815,10 +898,68 @@ async function resolveClickClackInboundAccess(params) {
 			modeWhenAccessGroupsOff: "configured"
 		} : false
 	});
+	const isAdmissionCurrent = () => {
+		if (!isCurrent()) return false;
+		const currentCfg = runtime.config.current();
+		const currentAccountPolicy = resolveClickClackAccountConfig(currentCfg, params.account.accountId);
+		const currentGroupPolicy = resolveClickClackGroupPolicy({
+			account: currentAccountPolicy,
+			channelId: params.message.channel_id
+		});
+		const currentAllowFrom = currentAccountPolicy.allowFrom ?? ["*"];
+		const currentIngressAllowFrom = isBotAuthor ? currentAllowFrom.filter((entry) => normalizeClickClackUserId(entry) !== "*") : currentAllowFrom;
+		const directSenderAllowed = resolveAllowlistMatchByCandidates({
+			allowList: formatNormalizedAllowFromEntries({
+				allowFrom: currentIngressAllowFrom.filter((entry) => parseAccessGroupAllowFromEntry(entry) === null),
+				normalizeEntry: normalizeClickClackUserId
+			}),
+			candidates: [{
+				value: normalizeClickClackUserId(params.message.author_id) ?? void 0,
+				source: "id"
+			}]
+		}).allowed;
+		const staticGroupAllowed = currentIngressAllowFrom.some((entry) => {
+			const name = parseAccessGroupAllowFromEntry(entry);
+			if (!name) return false;
+			const group = currentCfg.accessGroups?.[name];
+			return group?.type === "message.senders" && resolved.state.allowlists[preparedRoute.isDirect ? "dm" : "group"].accessGroups.matched.includes(name) && isDeepStrictEqual(group, cfg.accessGroups?.[name]);
+		});
+		if (!directSenderAllowed && !staticGroupAllowed) return false;
+		const currentMentionFacts = resolveClickClackMentionFacts({
+			isDirect: preparedRoute.isDirect,
+			body: params.message.body,
+			mentionPatterns: currentGroupPolicy.mentionPatterns,
+			botHandle: params.account.botHandle,
+			cfg: currentCfg,
+			agentId: preparedRoute.route.agentId,
+			channelId: params.message.channel_id
+		});
+		if (isBotAuthor && currentGroupPolicy.allowBots !== true && !(currentGroupPolicy.allowBots === "mentions" && (preparedRoute.isDirect || currentMentionFacts.wasMentioned))) return false;
+		const currentThreadPolicy = resolveBotThreadMentionPolicy({
+			isBotOwnedThread,
+			requireMentionInBotThreads: currentGroupPolicy.requireMentionInBotThreads,
+			requireMention: currentGroupPolicy.requireMention
+		});
+		return !(0, channel_mention_gating_exports.resolveInboundMentionDecision)({
+			facts: currentMentionFacts,
+			policy: {
+				isGroup: !preparedRoute.isDirect,
+				requireMention: currentThreadPolicy.requireMention,
+				allowTextCommands: allowTextCommands && currentAccountPolicy.replyMode !== "model" && runtime.channel.commands.shouldHandleTextCommands({
+					cfg: currentCfg,
+					surface: CHANNEL_ID$2,
+					commandSource: "text"
+				}),
+				hasControlCommand: shouldCheckCommand && runtime.channel.commands.shouldComputeCommandAuthorized(params.message.body, currentCfg),
+				commandAuthorized: resolved.commandAccess.authorized
+			}
+		}).shouldSkip;
+	};
 	return {
-		shouldDispatch: !preparedRoute.revoked && resolved.ingress.admission === "dispatch",
+		shouldDispatch: isAdmissionCurrent() && !preparedRoute.revoked && resolved.ingress.admission === "dispatch",
+		isCurrent: isAdmissionCurrent,
 		commandAuthorized: resolved.commandAccess.requested ? resolved.commandAccess.authorized : resolved.senderAccess.allowed,
-		requireMention: effectiveGroupPolicy.requireMention,
+		requireMention: threadMentionPolicy.requireMention,
 		mentionFacts,
 		botLoopProtection,
 		preparedRoute,
@@ -887,20 +1028,7 @@ async function syncClickClackCommandMenu(params) {
 * Publishes agent activity (streamed commentary + tool progress) into
 * ClickClack as durable `agent_commentary` / `agent_tool` message rows,
 * coalesced so one logical step becomes one row instead of a row per frame.
-*
-* Ported from the clickglass agent-bridge sidecar, adapted from gateway
-* websocket frames to the in-process `replyOptions.onItemEvent` seam:
-*
-* - Commentary/reasoning arrives as cumulative text snapshots per item id.
-*   Each segment becomes one durable row: POSTed when the segment starts
-*   streaming and PATCHed (debounced) as the snapshot grows, so prose
-*   interleaves chronologically with tool rows.
-* - Tool/step items can emit several frames (start/update/complete) for the
-*   same call, sometimes with lane-prefixed ids (`tool:X`, `command:X`).
-*   Normalize the prefix away to one key per call, POST one row on the first
-*   frame, and PATCH it when a later frame carries a strictly longer body.
 */
-/** Debounce window for PATCHing streaming commentary snapshots. */
 const CLICKCLACK_COMMENTARY_FLUSH_MS = 700;
 /** Item kinds rendered as agent_tool rows; everything else is commentary. */
 const TOOL_ITEM_KINDS = /* @__PURE__ */ new Set([
@@ -938,7 +1066,7 @@ function commentaryBody(payload) {
 	return text;
 }
 function activityBody(payload) {
-	const line = buildChannelProgressDraftLine({
+	const line = formatChannelProgressDraftLineForEntry(void 0, {
 		event: "item",
 		itemId: payload.itemId,
 		toolCallId: payload.toolCallId,
@@ -951,7 +1079,7 @@ function activityBody(payload) {
 		progressText: payload.progressText,
 		meta: payload.meta,
 		commandBearing: payload.commandBearing
-	})?.text?.trim();
+	})?.trim();
 	if (line) return line;
 	const head = payload.name?.trim() || payload.title?.trim();
 	const text = payload.progressText?.trim() || payload.summary?.trim();
@@ -1009,9 +1137,19 @@ function createClickClackActivityPublisher(params) {
 	};
 	const handleCommentary = (payload) => {
 		const body = commentaryBody(payload);
-		if (!body.trim()) return;
 		const key = payload.itemId?.trim() || "turn";
 		let segment = commentaryByItem.get(key);
+		if (!body.trim()) {
+			if (segment) {
+				clearTimeout(segment.timer);
+				commentaryByItem.delete(key);
+				const retracted = segment;
+				enqueue(async () => {
+					if (retracted.messageId) await params.client.updateMessageBody(retracted.messageId, "");
+				});
+			}
+			return;
+		}
 		if (!segment) {
 			segment = {
 				body: "",
@@ -1019,7 +1157,7 @@ function createClickClackActivityPublisher(params) {
 			};
 			commentaryByItem.set(key, segment);
 		}
-		if (body.length < segment.body.length || body === segment.body) return;
+		if (body === segment.body) return;
 		segment.body = body;
 		segment.dirty = true;
 		if (!segment.timer) segment.timer = setTimeout(() => {
@@ -1028,20 +1166,19 @@ function createClickClackActivityPublisher(params) {
 		}, flushMs);
 	};
 	const toolRowKey = (payload) => {
-		const toolCallId = payload.toolCallId?.trim();
-		if (toolCallId) return toolCallId;
-		return (payload.itemId?.trim() ?? "").replace(/^(tool|command):/, "");
+		return payload.itemId?.trim() || payload.toolCallId?.trim() || "";
 	};
 	const handleDiscreteItem = (payload) => {
 		const body = activityBody(payload);
 		if (!body) return;
-		const kind = TOOL_ITEM_KINDS.has(payload.kind?.trim().toLowerCase() ?? "") ? "agent_tool" : "agent_commentary";
+		const kind = TOOL_ITEM_KINDS.has(normalizedItemKind(payload)) ? "agent_tool" : "agent_commentary";
 		flushAllCommentary();
-		const key = `${kind}:${toolRowKey(payload)}`;
+		const itemKey = toolRowKey(payload);
+		const key = `${kind}:${itemKey}`;
 		const existing = toolRows.get(key);
-		if (!existing || !toolRowKey(payload)) {
+		if (!existing || !itemKey) {
 			const row = { body };
-			if (toolRowKey(payload)) toolRows.set(key, row);
+			if (itemKey) toolRows.set(key, row);
 			enqueue(async () => {
 				const posted = await postRow(kind, row.body);
 				row.messageId = posted.id;
@@ -1049,7 +1186,7 @@ function createClickClackActivityPublisher(params) {
 			});
 			return;
 		}
-		if (body.length <= existing.body.length) return;
+		if (body === existing.body) return;
 		existing.body = body;
 		enqueue(async () => {
 			if (existing.messageId && existing.body !== existing.sentBody) {
@@ -1060,6 +1197,18 @@ function createClickClackActivityPublisher(params) {
 	};
 	return {
 		onItemEvent: (payload) => {
+			if (payload.hideFromChannelProgress || payload.suppressChannelProgress || payload.suppressDurableProgress) {
+				const key = toolRowKey(payload);
+				const row = key ? toolRows.get(`agent_tool:${key}`) : void 0;
+				if (row) {
+					toolRows.delete(`agent_tool:${key}`);
+					enqueue(async () => {
+						if (row.messageId) await params.client.updateMessageBody(row.messageId, "");
+					});
+				}
+				return false;
+			}
+			if (payload.kind === "preamble" && !isCompleteAgentPreamble(payload)) return false;
 			const kind = normalizedItemKind(payload);
 			if (STREAMING_COMMENTARY_ITEM_KINDS.has(kind)) {
 				handleCommentary(payload);
@@ -1410,6 +1559,7 @@ function normalizedKind(payload) {
 	return kind;
 }
 function progressText(payload) {
+	if (payload.kind !== "preamble" && payload.title) return payload.title;
 	const line = buildChannelProgressDraftLine({
 		event: "item",
 		itemId: payload.itemId,
@@ -1433,21 +1583,11 @@ function isFinal(payload) {
 	return phase === "end" || status === "completed" || status === "failed" || status === "blocked";
 }
 function createLineIdResolver() {
-	const lineIdsByIdentity = /* @__PURE__ */ new Map();
 	const anonymousLinesByKind = /* @__PURE__ */ new Map();
 	let anonymousSequence = 0;
 	return (payload) => {
-		const identities = [payload.itemId?.replace(/^(tool|command):/, ""), payload.toolCallId].map((value) => value?.trim()).filter((value) => Boolean(value));
-		const existingId = identities.map((identity) => lineIdsByIdentity.get(identity)).find(Boolean);
-		if (existingId) {
-			for (const identity of identities) lineIdsByIdentity.set(identity, existingId);
-			return existingId;
-		}
-		if (identities.length > 0) {
-			const id = `item:${identities[0]}`;
-			for (const identity of identities) lineIdsByIdentity.set(identity, id);
-			return id;
-		}
+		const identity = payload.itemId?.trim() || payload.toolCallId?.trim();
+		if (identity) return `item:${identity}`;
 		const kind = normalizedKind(payload);
 		const anonymousLines = anonymousLinesByKind.get(kind) ?? [];
 		const line = (payload.phase?.trim().toLowerCase() === "start" ? void 0 : anonymousLines.toReversed().find((line) => line.active)) ?? (() => {
@@ -1574,7 +1714,19 @@ function createClickClackAgentProgressPublisher(params) {
 		},
 		onItemEvent(payload) {
 			if (!started || cleared) return false;
+			if (payload.suppressChannelProgress || payload.kind === "preamble" && !isCompleteAgentPreamble(payload)) return false;
 			const id = resolveLineId(payload);
+			if (payload.hideFromChannelProgress) {
+				if (seenLines.delete(id)) enqueueLine(id, {
+					op: "update",
+					line: {
+						id,
+						kind: normalizedKind(payload),
+						text: ""
+					}
+				});
+				return false;
+			}
 			const final = isFinal(payload);
 			const kind = normalizedKind(payload);
 			const retractsExistingCommentary = kind === "commentary" && seenLines.has(id) && payload.progressText !== void 0 && payload.progressText.trim() === "";
@@ -1587,7 +1739,7 @@ function createClickClackAgentProgressPublisher(params) {
 				id,
 				kind,
 				text: retractsExistingCommentary ? "" : progressText(payload),
-				status: payload.status?.trim() || (final ? "completed" : "running")
+				status: payload.status?.trim() || (final ? "blocked" : "running")
 			};
 			if (payload.name?.trim()) line.tool_name = payload.name.trim();
 			enqueueLine(id, {
@@ -1615,7 +1767,7 @@ function createClickClackAgentProgressPublisher(params) {
 const CHANNEL_ID$1 = "clickclack";
 const CLICKCLACK_MESSAGE_ID_PATTERN = /^msg_[0-9a-hjkmnp-tv-z]{26}$/u;
 function hasClickClackReplyMedia(payload) {
-	return Boolean(payload.mediaUrl?.trim() || payload.mediaUrls?.some((mediaUrl) => typeof mediaUrl === "string" && mediaUrl.trim()));
+	return Boolean(payload.mediaUrl?.trim() || payload.mediaUrls?.some((mediaUrl) => mediaUrl.trim()));
 }
 function resolveClickClackAgentRunId(messageId) {
 	return CLICKCLACK_MESSAGE_ID_PATTERN.test(messageId) ? `${CHANNEL_ID$1}:${messageId}` : void 0;
@@ -1663,10 +1815,6 @@ async function dispatchModelReply(params) {
 		correlationId: params.correlationId
 	});
 }
-/**
-* Dispatches one already-fetched ClickClack message through the configured
-* reply mode for its account.
-*/
 async function handleClickClackInbound(params) {
 	const runtime = getClickClackRuntime();
 	const message = params.message;
@@ -1675,7 +1823,7 @@ async function handleClickClackInbound(params) {
 		config: params.config,
 		message
 	});
-	if (!access.shouldDispatch || !access.channelIngress) return;
+	if (!access.shouldDispatch || !access.channelIngress || !access.isCurrent()) return;
 	const conversationId = message.channel_id || message.direct_conversation_id;
 	if (!conversationId) return;
 	const { discussionRoute, isDirect, route, target } = access.preparedRoute;
@@ -1729,7 +1877,7 @@ async function handleClickClackInbound(params) {
 	}
 	let turnProvenance;
 	let activity;
-	if (params.account.agentActivity && (message.channel_id || message.direct_conversation_id)) activity = createClickClackActivityPublisher({
+	if (params.account.agentActivity) activity = createClickClackActivityPublisher({
 		client: createClickClackClient({
 			baseUrl: params.account.apiEndpoint,
 			token: params.account.token,
@@ -1841,7 +1989,7 @@ async function handleClickClackInbound(params) {
 		delivery: {
 			deliver: async (payload) => {
 				if (hasClickClackReplyMedia(payload)) throw new Error("ClickClack media reply requires durable delivery");
-				const text = payload && typeof payload === "object" && "text" in payload ? payload.text ?? "" : "";
+				const text = payload.text ?? "";
 				if (!text.trim()) return;
 				await sendClickClackText({
 					cfg: params.config,
@@ -2112,10 +2260,6 @@ async function startClickClackGatewayAccount(ctx) {
 }
 //#endregion
 //#region extensions/clickclack/src/channel.ts
-/**
-* ClickClack channel plugin definition: target parsing, account config, status,
-* gateway startup, and outbound delivery wiring.
-*/
 const CHANNEL_ID = CLICKCLACK_CHANNEL_ID;
 const clickClackMessageAdapter = defineChannelMessageAdapter({
 	id: CHANNEL_ID,
@@ -2137,16 +2281,8 @@ const clickClackMessageAdapter = defineChannelMessageAdapter({
 	send: {
 		text: async (ctx) => {
 			const messageId = await sendClickClackText({
-				cfg: ctx.cfg,
-				accountId: ctx.accountId,
-				to: ctx.to,
-				text: ctx.text,
-				threadId: ctx.threadId,
-				replyToId: ctx.replyToId,
-				deliveryQueueId: ctx.deliveryQueueId,
-				deliveryPartIndex: ctx.deliveryPartIndex,
-				onPlatformSendDispatch: ctx.onPlatformSendDispatch,
-				assertDirectAdapterHandoff: ctx.assertDirectAdapterHandoff
+				...ctx,
+				cfg: ctx.cfg
 			});
 			const threadId = ctx.threadId == null ? void 0 : String(ctx.threadId);
 			const replyToId = ctx.replyToId ?? void 0;
@@ -2165,21 +2301,8 @@ const clickClackMessageAdapter = defineChannelMessageAdapter({
 		},
 		media: async (ctx) => {
 			const messageId = await sendClickClackMedia({
-				cfg: ctx.cfg,
-				accountId: ctx.accountId,
-				to: ctx.to,
-				text: ctx.text,
-				mediaUrl: ctx.mediaUrl,
-				mediaAccess: ctx.mediaAccess,
-				mediaLocalRoots: ctx.mediaLocalRoots,
-				mediaReadFile: ctx.mediaReadFile,
-				threadId: ctx.threadId,
-				replyToId: ctx.replyToId,
-				deliveryQueueId: ctx.deliveryQueueId,
-				deliveryPartIndex: ctx.deliveryPartIndex,
-				onPlatformSendDispatch: ctx.onPlatformSendDispatch,
-				assertDirectAdapterHandoff: ctx.assertDirectAdapterHandoff,
-				onDeliveryResult: ctx.onDeliveryResult
+				...ctx,
+				cfg: ctx.cfg
 			});
 			const threadId = ctx.threadId == null ? void 0 : String(ctx.threadId);
 			const replyToId = ctx.replyToId ?? void 0;
@@ -2198,9 +2321,6 @@ const clickClackMessageAdapter = defineChannelMessageAdapter({
 		}
 	}
 });
-/**
-* Channel plugin instance registered by the bundled ClickClack entry.
-*/
 const clickClackPlugin = createChatChannelPlugin({
 	base: {
 		id: CHANNEL_ID,
@@ -2290,37 +2410,19 @@ const clickClackPlugin = createChatChannelPlugin({
 		base: { deliveryMode: "direct" },
 		attachedResults: {
 			channel: CHANNEL_ID,
-			sendText: async ({ cfg, to, text, accountId, threadId, replyToId, deliveryQueueId, deliveryPartIndex, onPlatformSendDispatch, assertDirectAdapterHandoff }) => {
+			sendText: async (ctx) => {
 				return { messageId: await sendClickClackText({
-					cfg,
-					accountId,
-					to,
-					text,
-					threadId,
-					replyToId,
-					deliveryQueueId,
-					deliveryPartIndex,
-					onPlatformSendDispatch,
-					assertDirectAdapterHandoff
+					...ctx,
+					cfg: ctx.cfg
 				}) ?? "" };
 			},
-			sendMedia: async ({ cfg, to, text, mediaUrl, mediaAccess, mediaLocalRoots, mediaReadFile, accountId, threadId, replyToId, deliveryQueueId, deliveryPartIndex, onPlatformSendDispatch, assertDirectAdapterHandoff, onDeliveryResult }) => {
+			sendMedia: async (ctx) => {
+				const { mediaUrl, onDeliveryResult } = ctx;
 				if (!mediaUrl) throw new Error("ClickClack media send requires mediaUrl");
 				return { messageId: await sendClickClackMedia({
-					cfg,
-					accountId,
-					to,
-					text,
+					...ctx,
+					cfg: ctx.cfg,
 					mediaUrl,
-					mediaAccess,
-					mediaLocalRoots,
-					mediaReadFile,
-					threadId,
-					replyToId,
-					deliveryQueueId,
-					deliveryPartIndex,
-					onPlatformSendDispatch,
-					assertDirectAdapterHandoff,
 					onDeliveryResult: onDeliveryResult ? ({ messageId: acceptedMessageId, receipt }) => onDeliveryResult({
 						channel: CHANNEL_ID,
 						messageId: acceptedMessageId,