@openclaw/clickclack 2026.9.8 → 2026.10.1-beta.2

package/dist/.setup/{runtime-api-BvP8DrPQ.mjs → runtime-api-Dm_MQHNq.mjs}

@@ -1,10 +1,12 @@
-import { h as resolveClickClackAccount, p as listClickClackAccountIds } from "./setup-surface-BW1Q06w5.mjs";
-import { C as slugifyDiscussionLabel, D as listPendingDiscussionOpens, E as clearPendingDiscussionOpen, O as recordPendingDiscussionOpen, S as resolveDiscussionLabel, T as clearDiscussionBindingGeneration, _ as getClickClackDiscussionBindingStore, b as fallbackDiscussionLabel, c as markClickClackDiscussionChannelIdentityRevoked, d as discussionInfoForBinding, f as normalizedServerBaseUrl, g as bindingMatchesActiveSessionIncarnation, h as attachBindingToCurrentActiveSession, k as reserveDiscussionBindingGeneration, l as markClickClackDiscussionChannelRevoked, o as clearClickClackDiscussionChannelRevoked, p as resolveDiscussionBindingAccount, s as isClickClackDiscussionChannelRevoked, u as discussionAccounts, v as discussionCredentialFingerprint, w as truncateDiscussionDisplayTitle, x as isDiscussionSessionKey, y as discussionExternalRef } from "./channel-Bcwtohk7.mjs";
-import { a as isClickClackChannelNameConflict, i as createClickClackClient, r as ClickClackHttpError } from "./resolve-BHGLohni.mjs";
+import { h as resolveClickClackAccount, p as listClickClackAccountIds } from "./setup-surface-DcF_7-VV.mjs";
+import { C as slugifyDiscussionLabel, D as listPendingDiscussionOpens, E as clearPendingDiscussionOpen, O as recordPendingDiscussionOpen, S as resolveDiscussionLabel, T as clearDiscussionBindingGeneration, _ as getClickClackDiscussionBindingStore, b as fallbackDiscussionLabel, c as markClickClackDiscussionChannelIdentityRevoked, d as discussionInfoForBinding, f as normalizedServerBaseUrl, g as bindingMatchesActiveSessionIncarnation, h as attachBindingToCurrentActiveSession, k as reserveDiscussionBindingGeneration, l as markClickClackDiscussionChannelRevoked, o as clearClickClackDiscussionChannelRevoked, p as resolveDiscussionBindingAccount, s as isClickClackDiscussionChannelRevoked, u as discussionAccounts, v as discussionCredentialFingerprint, w as truncateDiscussionDisplayTitle, x as isDiscussionSessionKey, y as discussionExternalRef } from "./channel-DI3hKiSg.mjs";
+import { a as createClickClackClient, i as ClickClackHttpError, o as isClickClackChannelNameConflict, t as findClickClackWorkspace } from "./resolve-DPtjHQHt.mjs";
 import "../api.js";
 import { randomUUID } from "node:crypto";
+import { createAsyncLock } from "openclaw/plugin-sdk/async-lock-runtime";
 import { buildControlUiSessionPath, registerSessionDiscussionProvider } from "openclaw/plugin-sdk/session-discussion";
 import { createSessionVisibilityChecker } from "openclaw/plugin-sdk/session-visibility";
+import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { resolveSessionAgentIdStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { textResult } from "openclaw/plugin-sdk/tool-results";
 //#region extensions/clickclack/src/discussions/binding-retention.ts
@@ -121,77 +123,55 @@ const RECONCILE_RETRY_MAX_MS = 6e4;
 * traffic can never postpone one); a failed run sets a not-before floor with
 * growing backoff that later events cannot undercut; events during an
 * in-flight run collapse into one follow-up scheduled after settlement; and
-* `supersede()` invalidates callbacks from earlier activations so stop/start
-* cycles cannot corrupt the bookkeeping of the next one.
+* each service activation owns a separate scheduler scope and retry state.
 */
 var DiscussionReconcileScheduler = class {
 	#hooks;
-	#timers = /* @__PURE__ */ new Map();
 	#retryState = /* @__PURE__ */ new Map();
 	#inFlight = /* @__PURE__ */ new Set();
 	#followUps = /* @__PURE__ */ new Set();
-	#generation = 0;
-	constructor(hooks) {
+	constructor(scheduler, hooks) {
+		this.scheduler = scheduler;
 		this.#hooks = hooks;
 	}
-	/** Invalidates callbacks scheduled by prior activations. */
-	supersede() {
-		this.#generation += 1;
-	}
-	clear() {
-		for (const scheduled of this.#timers.values()) clearTimeout(scheduled.timer);
-		this.#timers.clear();
-		this.#retryState.clear();
-		this.#inFlight.clear();
-		this.#followUps.clear();
-	}
 	schedule(sessionKey, delayMs = RECONCILE_DEBOUNCE_MS) {
-		if (!this.#hooks.shouldSchedule(sessionKey)) return;
+		if (this.scheduler.signal.aborted) return;
 		if (this.#inFlight.has(sessionKey)) {
 			this.#followUps.add(sessionKey);
 			return;
 		}
 		const retry = this.#retryState.get(sessionKey);
-		const fireAt = Math.max(Date.now() + delayMs, retry?.notBefore ?? 0);
-		const existing = this.#timers.get(sessionKey);
-		if (existing) {
-			if (existing.fireAt <= fireAt) return;
-			clearTimeout(existing.timer);
-		}
-		const generation = this.#generation;
-		const timer = setTimeout(() => {
-			if (generation !== this.#generation) return;
-			this.#timers.delete(sessionKey);
-			this.#inFlight.add(sessionKey);
-			this.#hooks.run(sessionKey).then(() => {
-				if (generation !== this.#generation) return;
-				this.#retryState.delete(sessionKey);
-			}, (error) => {
-				if (generation !== this.#generation || !this.#hooks.shouldSchedule(sessionKey)) return;
-				const previous = this.#retryState.get(sessionKey);
-				const nextRetryMs = Math.min(previous === void 0 ? RECONCILE_RETRY_MS : previous.delayMs * 2, RECONCILE_RETRY_MAX_MS);
-				this.#retryState.set(sessionKey, {
-					delayMs: nextRetryMs,
-					notBefore: Date.now() + nextRetryMs
-				});
-				this.#hooks.warn(`discussion event reconcile failed for ${sessionKey}; retrying in ${nextRetryMs}ms: ${String(error)}`);
-				this.#followUps.add(sessionKey);
-			}).finally(() => {
-				if (generation !== this.#generation) return;
-				this.#inFlight.delete(sessionKey);
-				if (this.#followUps.delete(sessionKey)) this.schedule(sessionKey);
-			});
-		}, Math.max(fireAt - Date.now(), 0));
-		timer.unref?.();
-		this.#timers.set(sessionKey, {
-			fireAt,
-			timer
+		const fireAt = Math.max(this.scheduler.now() + delayMs, retry?.notBefore ?? 0);
+		this.scheduler.schedule({
+			id: `session:${sessionKey}`,
+			atMs: fireAt,
+			mode: "earliest",
+			run: async () => {
+				this.#inFlight.add(sessionKey);
+				try {
+					await this.#hooks.run(sessionKey);
+					this.#retryState.delete(sessionKey);
+				} catch (error) {
+					if (this.scheduler.signal.aborted) return;
+					const previous = this.#retryState.get(sessionKey);
+					const nextRetryMs = Math.min(previous === void 0 ? RECONCILE_RETRY_MS : previous.delayMs * 2, RECONCILE_RETRY_MAX_MS);
+					this.#retryState.set(sessionKey, {
+						delayMs: nextRetryMs,
+						notBefore: this.scheduler.now() + nextRetryMs
+					});
+					this.#hooks.warn(`discussion event reconcile failed for ${sessionKey}; retrying in ${nextRetryMs}ms: ${String(error)}`);
+					this.#followUps.add(sessionKey);
+				} finally {
+					this.#inFlight.delete(sessionKey);
+					if (!this.scheduler.signal.aborted && this.#followUps.delete(sessionKey)) this.schedule(sessionKey);
+				}
+			}
 		});
 	}
 };
 //#endregion
 //#region extensions/clickclack/src/discussions/service-open.ts
-const CHANNEL_NAME_MUTATION_ATTEMPTS$1 = 4;
+const CHANNEL_NAME_MUTATION_ATTEMPTS = 4;
 function isDefinitiveNoCreateHttpError(error) {
 	if (!(error instanceof ClickClackHttpError) || error.status < 400 || error.status >= 500) return false;
 	return ![
@@ -233,6 +213,26 @@ function assertChannelPatch(channel, patch) {
 		if ((key === "external_ref" || key === "external_url" || key === "sidebar_section" ? channel[key] ?? "" : channel[key]) !== expected) throw new Error(`ClickClack channel update did not apply ${key}`);
 	}
 }
+async function renameDiscussionChannel(params) {
+	for (let attempt = 0; attempt < CHANNEL_NAME_MUTATION_ATTEMPTS; attempt += 1) {
+		const patch = {
+			...params.patch,
+			name: await resolveAvailableChannelName({
+				...params,
+				ownChannelId: params.channelId
+			})
+		};
+		try {
+			params.assertCurrentAuthority?.();
+			const channel = await params.client.updateChannel(params.channelId, patch);
+			assertChannelPatch(channel, patch);
+			return channel;
+		} catch (error) {
+			if (!isClickClackChannelNameConflict(error) || attempt === 3) throw error;
+		}
+	}
+	throw new Error("ClickClack discussion channel name retries were exhausted");
+}
 function assertManagedChannelContract(channel, expected) {
 	const displayTitleMatches = !("display_title" in channel) || channel.display_title === expected.displayTitle;
 	if (channel.external_managed !== true || (channel.external_ref ?? "") !== (expected.externalRef ?? "") || (channel.sidebar_section ?? "") !== (expected.section ?? "") || (channel.external_url ?? "") !== (expected.externalUrl ?? "") || !displayTitleMatches) throw new Error(`ClickClack server does not support the managed discussion channel contract for ${expected.sessionKey}`);
@@ -249,7 +249,8 @@ async function openClickClackDiscussionBinding(params) {
 	if (!entry || entry.archivedAt !== void 0) return;
 	if (!entry.sessionId?.trim()) throw new Error("OpenClaw session does not yet have a concrete session id");
 	const client = params.clientFactory(account);
-	const workspace = (await client.workspaces()).find((candidate) => candidate.id === account.discussions.workspace || candidate.slug === account.discussions.workspace || candidate.name === account.discussions.workspace);
+	const workspaces = await client.workspaces();
+	const workspace = findClickClackWorkspace(workspaces, account.discussions.workspace);
 	if (!workspace) throw new Error(`ClickClack discussions workspace not found: ${account.discussions.workspace}`);
 	if (!workspace.route_id) throw new Error("ClickClack discussions workspace is missing its route id");
 	const serverBaseUrl = normalizedServerBaseUrl(account);
@@ -291,11 +292,16 @@ async function openClickClackDiscussionBinding(params) {
 			destinationIdentity,
 			createGeneration: params.bindingGenerationFactory
 		});
+		const generationScope = {
+			runtime,
+			sessionKey,
+			expectedGeneration: bindingGeneration
+		};
 		const externalRef = discussionExternalRef(params.installationId, sessionKey, destinationIdentity, bindingGeneration);
 		let adopted;
 		let managedFields;
 		let resolved;
-		for (let attempt = 0; attempt < CHANNEL_NAME_MUTATION_ATTEMPTS$1; attempt += 1) {
+		for (let attempt = 0; attempt < CHANNEL_NAME_MUTATION_ATTEMPTS; attempt += 1) {
 			adopted = channels.find((candidate) => candidate.external_managed === true && candidate.external_ref === externalRef);
 			managedFields = {
 				name: await resolveAvailableChannelName({
@@ -373,17 +379,9 @@ async function openClickClackDiscussionBinding(params) {
 						resolved = await client.updateChannel(recovered.id, managedFields);
 						break;
 					}
-					if (definitiveNoCreate) await clearDiscussionBindingGeneration({
-						runtime,
-						sessionKey,
-						expectedGeneration: bindingGeneration
-					});
+					if (definitiveNoCreate) await clearDiscussionBindingGeneration(generationScope);
 				} catch {
-					if (definitiveNoCreate && !adopted) await clearDiscussionBindingGeneration({
-						runtime,
-						sessionKey,
-						expectedGeneration: bindingGeneration
-					});
+					if (definitiveNoCreate && !adopted) await clearDiscussionBindingGeneration(generationScope);
 				}
 				throw error;
 			}
@@ -399,20 +397,12 @@ async function openClickClackDiscussionBinding(params) {
 			});
 			if (adopted) assertChannelPatch(resolved, managedFields);
 		} catch (error) {
-			await clearPendingDiscussionOpen({
-				runtime,
-				sessionKey,
-				expectedGeneration: bindingGeneration
-			});
+			await clearPendingDiscussionOpen(generationScope);
 			params.warn(`incompatible discussion channel remains quarantined: ${resolved.id}`);
 			throw error;
 		}
 		if (!resolved.route_id) {
-			await clearPendingDiscussionOpen({
-				runtime,
-				sessionKey,
-				expectedGeneration: bindingGeneration
-			});
+			await clearPendingDiscussionOpen(generationScope);
 			params.warn(`route-less discussion channel remains quarantined: ${resolved.id}`);
 			throw new Error("ClickClack discussion channel is missing its route id");
 		}
@@ -422,11 +412,7 @@ async function openClickClackDiscussionBinding(params) {
 			readConsistency: "latest"
 		});
 		if (!currentEntry?.sessionId || currentEntry.archivedAt !== void 0) {
-			await clearPendingDiscussionOpen({
-				runtime,
-				sessionKey,
-				expectedGeneration: bindingGeneration
-			});
+			await clearPendingDiscussionOpen(generationScope);
 			params.warn(`unattached discussion channel remains quarantined: ${channel.id}`);
 			throw new Error("OpenClaw session became inactive while opening its ClickClack discussion");
 		}
@@ -436,36 +422,23 @@ async function openClickClackDiscussionBinding(params) {
 		const currentExternalUrl = controlSessionUrl(account.discussions.controlUrlBase, sessionKey, account.agentId ?? agentId, config.session?.mainKey, currentLabel) ?? "";
 		let currentChannel = channel;
 		if (currentEntry.sessionId !== entry.sessionId || currentLabel !== label || currentDisplayTitle !== displayTitle || currentSection !== section || currentExternalUrl !== (externalUrl ?? "")) try {
-			for (let attempt = 0; attempt < CHANNEL_NAME_MUTATION_ATTEMPTS$1; attempt += 1) {
-				const latestManagedFields = {
+			currentChannel = await renameDiscussionChannel({
+				client,
+				workspaceId: workspace.id,
+				channelId: channel.id,
+				label: currentLabel,
+				sessionKey,
+				agentId,
+				patch: {
 					...managedFields,
-					name: await resolveAvailableChannelName({
-						client,
-						workspaceId: workspace.id,
-						label: currentLabel,
-						sessionKey,
-						agentId,
-						ownChannelId: channel.id
-					}),
 					external_url: currentExternalUrl,
 					sidebar_section: currentSection,
 					display_title: currentDisplayTitle
-				};
-				try {
-					assertCurrentAuthority();
-					currentChannel = await client.updateChannel(channel.id, latestManagedFields);
-					assertChannelPatch(currentChannel, latestManagedFields);
-					break;
-				} catch (error) {
-					if (!isClickClackChannelNameConflict(error) || attempt === 3) throw error;
-				}
-			}
-		} catch (error) {
-			await clearPendingDiscussionOpen({
-				runtime,
-				sessionKey,
-				expectedGeneration: bindingGeneration
+				},
+				assertCurrentAuthority
 			});
+		} catch (error) {
+			await clearPendingDiscussionOpen(generationScope);
 			params.warn(`unattached discussion channel remains quarantined: ${channel.id}`);
 			throw error;
 		}
@@ -491,11 +464,7 @@ async function openClickClackDiscussionBinding(params) {
 			assertCurrentAuthority();
 			store.set(sessionKey, nextBinding);
 		} catch (error) {
-			await clearPendingDiscussionOpen({
-				runtime,
-				sessionKey,
-				expectedGeneration: bindingGeneration
-			});
+			await clearPendingDiscussionOpen(generationScope);
 			params.warn(`unbound discussion channel remains quarantined: ${channel.id}`);
 			throw error;
 		}
@@ -524,7 +493,8 @@ async function reconcilePendingDiscussionOpen(params) {
 	const activeAccounts = discussionAccounts(cfg);
 	const retryAccount = activeAccounts.length === 1 ? activeAccounts[0] : void 0;
 	if (params.allowRetry !== false && entry?.sessionId && entry.archivedAt === void 0 && retryAccount && normalizedServerBaseUrl(retryAccount) === pending.serverBaseUrl && discussionCredentialFingerprint(retryAccount.token) === pending.credentialFingerprint) {
-		if ((await params.clientFactory(retryAccount).workspaces()).find((candidate) => candidate.id === retryAccount.discussions.workspace || candidate.slug === retryAccount.discussions.workspace || candidate.name === retryAccount.discussions.workspace)?.id === pending.workspaceId) {
+		const workspaces = await params.clientFactory(retryAccount).workspaces();
+		if (findClickClackWorkspace(workspaces, retryAccount.discussions.workspace)?.id === pending.workspaceId) {
 			await params.open(pending.sessionKey);
 			return;
 		}
@@ -555,7 +525,6 @@ async function reconcilePendingDiscussionOpen(params) {
 //#endregion
 //#region extensions/clickclack/src/discussions/service.ts
 const RECONCILE_INTERVAL_MS = 6e4;
-const CHANNEL_NAME_MUTATION_ATTEMPTS = 4;
 var ClickClackDiscussionService = class {
 	#runtime;
 	#store;
@@ -563,14 +532,10 @@ var ClickClackDiscussionService = class {
 	#installationId;
 	#bindingGenerationFactory;
 	#detachedBindings;
-	#timersEnabled;
-	#sessionLocks = /* @__PURE__ */ new Map();
-	#reconcileScheduler = new DiscussionReconcileScheduler({
-		shouldSchedule: () => !this.#closed,
-		run: async (sessionKey) => await this.reconcile(sessionKey),
-		warn: (message) => this.#logger().warn(message)
-	});
-	#channelMutationLock = Promise.resolve();
+	#sessionQueue = new KeyedAsyncQueue();
+	#scheduler;
+	#reconcileScheduler;
+	#withChannelMutationLock = createAsyncLock();
 	#timer;
 	#reconcileAllPromise;
 	#unsubscribeSessionsChanged;
@@ -592,31 +557,31 @@ var ClickClackDiscussionService = class {
 			store: this.#store,
 			maxRetained: options.maxRetainedDetachedBindings ?? 1e3
 		});
-		this.#timersEnabled = options.startTimer !== false;
 		this.provider = {
 			id: "clickclack",
 			info: async ({ sessionKey }) => await this.info(sessionKey),
 			open: async ({ sessionKey }) => await this.open(sessionKey)
 		};
-		if (options.gatewayEvents) this.bindGatewayEvents(options.gatewayEvents).catch((error) => {
-			this.#logger().warn(`discussion activation failed: ${String(error)}`);
-		});
-		if (this.#timersEnabled && !options.gatewayEvents) this.#withOperation(() => this.#ensureTimer()).catch((error) => {
-			this.#logger().warn(`discussion timer initialization failed: ${String(error)}`);
-		});
 	}
-	async bindGatewayEvents(gatewayEvents) {
+	async bindGatewayEvents(gatewayEvents, scheduler) {
 		const activation = ++this.#activation;
 		if (this.#cleanupPromise) await this.#cleanupPromise;
 		if (activation !== this.#activation) return;
+		if (this.#scheduler) await this.#scheduler.stop();
+		if (activation !== this.#activation) return;
 		this.#cleanupPromise = void 0;
 		this.#unsubscribeSessionsChanged?.();
 		this.#closed = false;
-		this.#reconcileScheduler.supersede();
+		this.#scheduler = scheduler.scope();
+		this.#timer = void 0;
+		this.#reconcileScheduler = new DiscussionReconcileScheduler(this.#scheduler, {
+			run: (sessionKey) => this.reconcile(sessionKey),
+			warn: (message) => this.#logger().warn(message)
+		});
 		this.#unsubscribeSessionsChanged = gatewayEvents?.onSessionsChanged((event) => {
 			this.#withOperation(async () => {
 				if (this.#store.get(event.sessionKey) || (await listPendingDiscussionOpens(this.#runtime)).some((pending) => pending.sessionKey === event.sessionKey)) {
-					if (activation === this.#activation) this.#reconcileScheduler.schedule(event.sessionKey);
+					if (activation === this.#activation) this.#reconcileScheduler?.schedule(event.sessionKey);
 				}
 			}).catch((error) => {
 				this.#logger().warn(`discussion event admission failed: ${String(error)}`);
@@ -625,7 +590,7 @@ var ClickClackDiscussionService = class {
 		await this.#withOperation(async () => {
 			for (const sessionKey of await this.#listReconcileSessionKeys()) {
 				if (activation !== this.#activation) return;
-				this.#reconcileScheduler.schedule(sessionKey, 0);
+				this.#reconcileScheduler?.schedule(sessionKey, 0);
 			}
 			await this.#ensureTimer();
 		});
@@ -634,7 +599,7 @@ var ClickClackDiscussionService = class {
 		return discussionAccounts(this.#currentConfig()).length === 1;
 	}
 	async info(sessionKey) {
-		return await this.#withOperation(() => this.#withSessionLock(sessionKey, async () => {
+		return await this.#withOperation(() => this.#sessionQueue.enqueue(sessionKey, async () => {
 			if (discussionAccounts(this.#currentConfig()).length !== 1) return { state: "none" };
 			const existing = this.#store.get(sessionKey);
 			if (existing) {
@@ -658,7 +623,7 @@ var ClickClackDiscussionService = class {
 		}));
 	}
 	async open(sessionKey) {
-		return await this.#withOperation(() => this.#withSessionLock(sessionKey, () => this.#open(sessionKey)));
+		return await this.#withOperation(() => this.#sessionQueue.enqueue(sessionKey, () => this.#open(sessionKey)));
 	}
 	async #open(sessionKey) {
 		this.#installationId ??= await getClickClackDiscussionInstallationId(this.#runtime);
@@ -706,7 +671,7 @@ var ClickClackDiscussionService = class {
 	}
 	async #reconcile(sessionKey) {
 		try {
-			await this.#withSessionLock(sessionKey, async () => {
+			await this.#sessionQueue.enqueue(sessionKey, async () => {
 				const binding = this.#store.get(sessionKey);
 				if (binding) await this.#reconcileBinding(sessionKey, binding);
 				const pending = (await listPendingDiscussionOpens(this.#runtime)).find((candidate) => candidate.sessionKey === sessionKey);
@@ -736,12 +701,10 @@ var ClickClackDiscussionService = class {
 		});
 	}
 	async readLatestMessages(sessionKey, limit) {
-		return await this.#withOperation(() => this.#withSessionLock(sessionKey, async () => {
+		return await this.#withOperation(() => this.#sessionQueue.enqueue(sessionKey, async () => {
 			const binding = this.#store.get(sessionKey);
 			if (!binding) return { text: "No discussion is bound to this session." };
 			const resolved = await this.#resolveBindingForUse(binding);
-			if (resolved.state === "retargeted") return { text: "No discussion is bound to this session." };
-			if (resolved.state === "stale") return { text: "No discussion is bound to this session." };
 			if (resolved.state !== "active") return { text: "No discussion is bound to this session." };
 			const attached = this.#refreshSessionAttachment(sessionKey, binding);
 			if (!attached) return { text: "No discussion is bound to this session." };
@@ -761,13 +724,9 @@ var ClickClackDiscussionService = class {
 		this.#activation += 1;
 		this.#unsubscribeSessionsChanged?.();
 		this.#unsubscribeSessionsChanged = void 0;
-		this.#reconcileScheduler.supersede();
-		this.#reconcileScheduler.clear();
-		if (this.#timer) {
-			clearInterval(this.#timer);
-			this.#timer = void 0;
-		}
-		this.#cleanupPromise ??= Promise.allSettled(this.#operations).then(() => void 0);
+		this.#reconcileScheduler = void 0;
+		this.#timer = void 0;
+		this.#cleanupPromise ??= Promise.allSettled([this.#scheduler?.stop(), ...this.#operations]).then(() => void 0);
 		return this.#cleanupPromise;
 	}
 	async #reconcileBinding(sessionKey, binding, resolvedAccount) {
@@ -821,26 +780,15 @@ var ClickClackDiscussionService = class {
 		if (Object.keys(patch).length === 0 && !labelChanged) return;
 		const client = this.#clientFactory(account);
 		let updated;
-		if (labelChanged) updated = await this.#withChannelMutationLock(async () => {
-			for (let attempt = 0; attempt < CHANNEL_NAME_MUTATION_ATTEMPTS; attempt += 1) {
-				patch.name = await resolveAvailableChannelName({
-					client,
-					workspaceId: currentBinding.workspaceId,
-					label,
-					sessionKey,
-					agentId: currentBinding.agentId,
-					ownChannelId: currentBinding.channelId
-				});
-				try {
-					const renamed = await client.updateChannel(currentBinding.channelId, patch);
-					assertChannelPatch(renamed, patch);
-					return renamed;
-				} catch (error) {
-					if (!isClickClackChannelNameConflict(error) || attempt === 3) throw error;
-				}
-			}
-			throw new Error("ClickClack discussion channel name retries were exhausted");
-		});
+		if (labelChanged) updated = await this.#withChannelMutationLock(() => renameDiscussionChannel({
+			client,
+			workspaceId: currentBinding.workspaceId,
+			channelId: currentBinding.channelId,
+			label,
+			sessionKey,
+			agentId: currentBinding.agentId,
+			patch
+		}));
 		else {
 			updated = await client.updateChannel(currentBinding.channelId, patch);
 			assertChannelPatch(updated, patch);
@@ -910,7 +858,8 @@ var ClickClackDiscussionService = class {
 	async #resolveBindingForUse(binding) {
 		const resolved = resolveDiscussionBindingAccount(this.#currentConfig(), binding);
 		if (resolved.state !== "active") return resolved;
-		const workspace = (await this.#clientFactory(resolved.account).workspaces()).find((candidate) => candidate.id === resolved.account.discussions.workspace || candidate.slug === resolved.account.discussions.workspace || candidate.name === resolved.account.discussions.workspace);
+		const workspaces = await this.#clientFactory(resolved.account).workspaces();
+		const workspace = findClickClackWorkspace(workspaces, resolved.account.discussions.workspace);
 		const current = resolveDiscussionBindingAccount(this.#currentConfig(), binding);
 		if (current.state !== "active") return current;
 		return workspace?.id === binding.workspaceId ? current : { state: "retargeted" };
@@ -924,18 +873,20 @@ var ClickClackDiscussionService = class {
 		const needsBindingPoll = this.#unsubscribeSessionsChanged === void 0 && this.#store.count() > 0;
 		if (this.#closed || !hasPendingOpens && !needsBindingPoll) {
 			if (this.#timer) {
-				clearInterval(this.#timer);
+				this.#timer.cancel();
 				this.#timer = void 0;
 			}
 			return;
 		}
-		if (!this.#timersEnabled || this.#timer) return;
-		this.#timer = setInterval(() => {
-			this.reconcileAll().catch((error) => {
+		if (!this.#scheduler || this.#scheduler.signal.aborted || this.#timer) return;
+		this.#timer = this.#scheduler.schedule({
+			id: "reconcile-all",
+			delayMs: RECONCILE_INTERVAL_MS,
+			everyMs: RECONCILE_INTERVAL_MS,
+			run: () => this.reconcileAll().catch((error) => {
 				this.#logger().warn(`discussion reconcile pass failed: ${String(error)}`);
-			});
-		}, RECONCILE_INTERVAL_MS);
-		this.#timer.unref?.();
+			})
+		});
 	}
 	async #listReconcileSessionKeys() {
 		return /* @__PURE__ */ new Set([...this.#store.entries().map(({ sessionKey }) => sessionKey), ...(await listPendingDiscussionOpens(this.#runtime)).map(({ sessionKey }) => sessionKey)]);
@@ -953,20 +904,6 @@ var ClickClackDiscussionService = class {
 		operation.then(() => this.#operations.delete(operation), () => this.#operations.delete(operation));
 		return operation;
 	}
-	async #withSessionLock(sessionKey, run) {
-		const current = (this.#sessionLocks.get(sessionKey) ?? Promise.resolve()).catch(() => void 0).then(run);
-		this.#sessionLocks.set(sessionKey, current);
-		try {
-			return await current;
-		} finally {
-			if (this.#sessionLocks.get(sessionKey) === current) this.#sessionLocks.delete(sessionKey);
-		}
-	}
-	async #withChannelMutationLock(run) {
-		const current = this.#channelMutationLock.catch(() => void 0).then(run);
-		this.#channelMutationLock = current;
-		return await current;
-	}
 };
 //#endregion
 //#region extensions/clickclack/src/discussions/tool-policy.ts
@@ -1050,7 +987,8 @@ function registerClickClackDiscussions(api) {
 	const service = new ClickClackDiscussionService(api.runtime);
 	api.registerService({
 		id: "clickclack-discussion-session-events",
-		start: ({ gatewayEvents }) => service.bindGatewayEvents(gatewayEvents),
+		apiVersion: 2,
+		start: ({ gatewayEvents, scheduler }) => service.bindGatewayEvents(gatewayEvents, scheduler),
 		stop: () => service.cleanup()
 	});
 	api.registerTool((context) => createClickClackDiscussionTool({

package/dist/.setup/secret-contract-CF7TKtkU.mjs

@@ -0,0 +1,26 @@
+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { collectConditionalChannelFieldAssignments, createChannelSecretContract, hasConfiguredSecretInputValue } from "openclaw/plugin-sdk/channel-secret-basic-runtime";
+//#region extensions/clickclack/src/secret-contract.ts
+const channelSecrets = createChannelSecretContract({
+	channelKey: "clickclack",
+	account: ["token"],
+	channel: ["token"],
+	collect(params) {
+		const { channel: clickclack } = params;
+		const baseTokenFile = normalizeOptionalString(clickclack.tokenFile) ?? "";
+		const accountTokenFile = (account) => normalizeOptionalString(account.tokenFile) ?? "";
+		const hasImplicitDefault = Boolean(normalizeOptionalString(clickclack.baseUrl)) && Boolean(normalizeOptionalString(clickclack.workspace));
+		collectConditionalChannelFieldAssignments({
+			...params,
+			field: "token",
+			topLevelActiveWithoutAccounts: baseTokenFile.length === 0,
+			topLevelInheritedAccountActive: ({ account, enabled }) => hasImplicitDefault && baseTokenFile.length === 0 || enabled && baseTokenFile.length === 0 && accountTokenFile(account).length === 0 && !hasConfiguredSecretInputValue(account.token, params.defaults),
+			accountActive: ({ account, enabled }) => enabled && accountTokenFile(account).length === 0,
+			topInactiveReason: "no enabled ClickClack account inherits this top-level token (tokenFile is configured).",
+			accountInactiveReason: "ClickClack account is disabled or tokenFile is configured."
+		});
+	}
+});
+const { secretTargetRegistryEntries, collectRuntimeConfigAssignments } = channelSecrets;
+//#endregion
+export { collectRuntimeConfigAssignments as n, secretTargetRegistryEntries as r, channelSecrets as t };

package/dist/.setup/{secret-contract-api-C1QwGlzF.mjs → secret-contract-api-CBcsgIYZ.mjs}

@@ -1,3 +1,3 @@
-import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries, t as channelSecrets } from "./secret-contract-BKkzzjBA.mjs";
+import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries, t as channelSecrets } from "./secret-contract-CF7TKtkU.mjs";
 import "../secret-contract-api.js";
 export { channelSecrets, collectRuntimeConfigAssignments, secretTargetRegistryEntries };

package/dist/.setup/{setup-claim-Cx8knvXs.mjs → setup-claim-Cfv5ikVH.mjs}

@@ -1,4 +1,4 @@
-import { a as isClickClackSetupLoopbackHost, i as buildClickClackSetupClaimUrl, o as requireClickClackSetupApiBaseUrl } from "./setup-surface-BW1Q06w5.mjs";
+import { a as isClickClackSetupLoopbackHost, i as buildClickClackSetupClaimUrl, o as requireClickClackSetupApiBaseUrl } from "./setup-surface-DcF_7-VV.mjs";
 import { withTimeout } from "openclaw/plugin-sdk/text-utility-runtime";
 import { createProviderOperationDeadline, readProviderJsonResponse, readResponseTextLimited, resolveProviderOperationTimeoutMs } from "openclaw/plugin-sdk/provider-http";
 import { fetchWithSsrFGuard, resolvePinnedHostnameWithPolicy, ssrfPolicyFromHttpBaseUrlAllowedHostname } from "openclaw/plugin-sdk/ssrf-runtime";

package/dist/.setup/{setup-plugin-api-BH_nw-AP.mjs → setup-plugin-api-BXhjNJRg.mjs}

@@ -1,2 +1,2 @@
-import { t as clickClackSetupPlugin } from "./setup-plugin-api-C9QcBJuW.mjs";
+import { t as clickClackSetupPlugin } from "./setup-plugin-api-CqfAb-CU.mjs";
 export { clickClackSetupPlugin };

package/dist/.setup/{setup-plugin-api-C9QcBJuW.mjs → setup-plugin-api-CqfAb-CU.mjs}

@@ -1,4 +1,4 @@
-import { l as clickClackConfigAdapter, n as clickClackSetupContract, s as clickClackConfigSchema, t as clickClackSetupWizard, u as clickClackMeta } from "./setup-surface-BW1Q06w5.mjs";
+import { l as clickClackConfigAdapter, n as clickClackSetupContract, s as clickClackConfigSchema, t as clickClackSetupWizard, u as clickClackMeta } from "./setup-surface-DcF_7-VV.mjs";
 //#region extensions/clickclack/src/channel.setup.ts
 const clickClackSetupPlugin = {
 	id: "clickclack",