@openclaw/clickclack 2026.7.2-beta.4 → 2026.7.2-beta.5

package/README.md

@@ -106,6 +106,11 @@ defaults to the account workspace, and `section` defaults to `Sessions`.
 `controlUrlBase` adds a link back to `/chat?session=<session-key>` in the
 OpenClaw Control UI.
 
+ClickClack-managed embed URLs explicitly advertise host-theme support. The
+Control UI uses that provider-owned capability to apply its full palette before
+the sidebar first paints and to stream live palette changes without rewriting
+opaque or signed discussion URLs from other providers.
+
 Enable discussions on exactly one ClickClack account. Multiple enabled
 discussion accounts are rejected because the session discussion provider does
 not have an account selector.

package/dist/api.js

@@ -1,3 +1,3 @@
-import { S as resolveDefaultClickClackAccountId, b as listEnabledClickClackAccounts, d as createClickClackClient, m as clickClackConfigSchema, v as DEFAULT_ACCOUNT_ID, x as resolveClickClackAccount, y as listClickClackAccountIds } from "./setup-surface-Baf26N-D.js";
-import { T as setClickClackRuntime, n as buildClickClackTarget, r as parseClickClackTarget, t as clickClackPlugin, w as getClickClackRuntime } from "./channel-BDq0KWDB.js";
+import { S as resolveDefaultClickClackAccountId, b as listEnabledClickClackAccounts, d as createClickClackClient, m as clickClackConfigSchema, v as DEFAULT_ACCOUNT_ID, x as resolveClickClackAccount, y as listClickClackAccountIds } from "./setup-surface-CD6MUC1g.js";
+import { D as setClickClackRuntime, E as getClickClackRuntime, n as buildClickClackTarget, r as parseClickClackTarget, t as clickClackPlugin } from "./channel-DfcFlLjC.js";
 export { DEFAULT_ACCOUNT_ID, buildClickClackTarget, clickClackConfigSchema, clickClackPlugin, createClickClackClient, getClickClackRuntime, listClickClackAccountIds, listEnabledClickClackAccounts, parseClickClackTarget, resolveClickClackAccount, resolveDefaultClickClackAccountId, setClickClackRuntime };

package/dist/{channel-BDq0KWDB.js → channel-DfcFlLjC.js}

@@ -1,4 +1,4 @@
-import { _ as clickClackMeta, b as listEnabledClickClackAccounts, c as resolveChannelId, d as createClickClackClient, g as clickClackConfigAdapter, h as CLICKCLACK_CHANNEL_ID, l as resolveWorkspaceId, m as clickClackConfigSchema, n as clickClackSetupAdapter, p as normalizeClickClackCorrelationId, r as clickClackSetupContract, t as clickClackSetupWizard, v as DEFAULT_ACCOUNT_ID, x as resolveClickClackAccount } from "./setup-surface-Baf26N-D.js";
+import { _ as clickClackMeta, b as listEnabledClickClackAccounts, c as resolveChannelId, d as createClickClackClient, g as clickClackConfigAdapter, h as CLICKCLACK_CHANNEL_ID, l as resolveWorkspaceId, m as clickClackConfigSchema, n as clickClackSetupAdapter, p as normalizeClickClackCorrelationId, r as clickClackSetupContract, t as clickClackSetupWizard, v as DEFAULT_ACCOUNT_ID, x as resolveClickClackAccount } from "./setup-surface-CD6MUC1g.js";
 import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-BKkzzjBA.js";
 import { buildChannelOutboundSessionRoute, buildThreadAwareOutboundSessionRoute, createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
 import { buildChannelProgressDraftLine, createMessageReceiptFromOutboundResults, defineChannelMessageAdapter, deriveDurableFinalDeliveryRequirements } from "openclaw/plugin-sdk/channel-outbound";
@@ -12,7 +12,7 @@ import { createChannelInboundEnvelopeBuilder } from "openclaw/plugin-sdk/channel
 import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
 import { createHash, randomUUID } from "node:crypto";
 import { loadOutboundMediaFromUrl } from "openclaw/plugin-sdk/outbound-media";
-import { renderMarkdownWithMarkers, sanitizeAssistantVisibleText } from "openclaw/plugin-sdk/text-chunking";
+import { FormatCapabilityProfile, renderMarkdownWithMarkers, sanitizeAssistantVisibleText } from "openclaw/plugin-sdk/text-chunking";
 //#region extensions/clickclack/src/runtime.ts
 /**
 * Runtime store for host-provided OpenClaw services used by the ClickClack
@@ -389,14 +389,22 @@ function hasPendingDiscussionOpenForDestination(params) {
 function shortSessionHash(sessionKey) {
 	return createHash("sha256").update(sessionKey).digest("hex").slice(0, 32);
 }
-function fallbackDiscussionLabel(sessionKey) {
-	return `s-${shortSessionHash(sessionKey)}`;
+function slugifyLabel(label) {
+	return label.normalize("NFKD").replace(/[\u0300-\u036f]/gu, "").toLowerCase().replace(/[^a-z0-9]+/gu, "-").replace(/^-+|-+$/gu, "").slice(0, 80).replace(/-+$/gu, "");
 }
-function resolveDiscussionLabel(label, sessionKey) {
-	return label?.trim() || fallbackDiscussionLabel(sessionKey);
+function fallbackDiscussionLabel(sessionKey, agentId) {
+	const agentSegment = agentId?.trim() ? slugifyLabel(agentId) : "";
+	const hash = shortSessionHash(sessionKey).slice(0, 8);
+	return `s-${agentSegment ? `${agentSegment}-` : ""}${hash}`;
+}
+function resolveDiscussionLabel(entry, sessionKey, agentId) {
+	return entry.label?.trim() || entry.displayName?.trim() || entry.subject?.trim() || fallbackDiscussionLabel(sessionKey, agentId);
+}
+function truncateDiscussionDisplayTitle(label) {
+	return Array.from(label).slice(0, 200).join("").trim();
 }
 function slugifyDiscussionLabel(label, sessionKey) {
-	return label.normalize("NFKD").replace(/[\u0300-\u036f]/gu, "").toLowerCase().replace(/[^a-z0-9]+/gu, "-").replace(/^-+|-+$/gu, "").slice(0, 80).replace(/-+$/gu, "") || fallbackDiscussionLabel(sessionKey);
+	return slugifyLabel(label) || fallbackDiscussionLabel(sessionKey);
 }
 function discussionSessionPeerId(identity) {
 	return `disc-${createHash("sha256").update([
@@ -575,6 +583,15 @@ function resolveDiscussionBindingAccount(cfg, binding) {
 		account
 	};
 }
+/** Public embed/open URLs for one bound discussion channel. */
+function discussionInfoForBinding(binding, account) {
+	const baseUrl = normalizedServerBaseUrl(account);
+	return {
+		state: "open",
+		embedUrl: `${baseUrl}/embed/channel/${encodeURIComponent(binding.workspaceRouteId)}/${encodeURIComponent(binding.channelRouteId)}?openclawHostTheme=1`,
+		openUrl: `${baseUrl}/app/${encodeURIComponent(binding.workspaceRouteId)}/${encodeURIComponent(binding.channelRouteId)}`
+	};
+}
 //#endregion
 //#region extensions/clickclack/src/discussions/revoked-channel-store.ts
 const REVOKED_CHANNELS_NAMESPACE = "discussion-revoked-channels";
@@ -708,32 +725,13 @@ function looksLikeClickClackTarget(raw) {
 * and direct messages.
 */
 const CLICKCLACK_MAX_UPLOAD_BYTES = 64 * 1024 * 1024;
-const CLICKCLACK_FORMAT_PROFILE = {
+const CLICKCLACK_FORMAT_PROFILE = FormatCapabilityProfile.define({
 	mechanism: "markdown",
-	constructs: {
-		bold: "native",
-		italic: "native",
-		underline: "native",
-		strikethrough: "native",
-		spoiler: "native",
-		codeInline: "native",
-		codeBlock: "native",
-		codeLanguage: "native",
-		linkLabel: "native",
-		heading: "native",
-		bulletList: "native",
-		orderedList: "native",
-		taskList: "native",
-		table: "native",
-		blockquote: "native",
-		image: "native",
-		mention: "native"
-	},
 	chunk: {
 		limit: 1024 * 1024,
 		unit: "bytes"
 	}
-};
+});
 function renderClickClackMarkdown(markdown) {
 	return renderMarkdownWithMarkers({
 		text: markdown,
@@ -1719,4 +1717,4 @@ const clickClackPlugin = createChatChannelPlugin({
 	}
 });
 //#endregion
-export { reserveDiscussionBindingGeneration as C, recordPendingDiscussionOpen as S, setClickClackRuntime as T, isDiscussionSessionKey as _, isClickClackDiscussionChannelRevoked as a, clearDiscussionBindingGeneration as b, discussionAccounts as c, bindingMatchesActiveSessionIncarnation as d, bindingMatchesSessionIncarnation as f, fallbackDiscussionLabel as g, discussionExternalRef as h, clearClickClackDiscussionChannelRevoked as i, normalizedServerBaseUrl as l, discussionCredentialFingerprint as m, buildClickClackTarget as n, markClickClackDiscussionChannelIdentityRevoked as o, getClickClackDiscussionBindingStore as p, parseClickClackTarget as r, markClickClackDiscussionChannelRevoked as s, clickClackPlugin as t, resolveDiscussionBindingAccount as u, resolveDiscussionLabel as v, getClickClackRuntime as w, listPendingDiscussionOpens as x, slugifyDiscussionLabel as y };
+export { listPendingDiscussionOpens as C, setClickClackRuntime as D, getClickClackRuntime as E, clearDiscussionBindingGeneration as S, reserveDiscussionBindingGeneration as T, fallbackDiscussionLabel as _, isClickClackDiscussionChannelRevoked as a, slugifyDiscussionLabel as b, discussionAccounts as c, resolveDiscussionBindingAccount as d, bindingMatchesActiveSessionIncarnation as f, discussionExternalRef as g, discussionCredentialFingerprint as h, clearClickClackDiscussionChannelRevoked as i, discussionInfoForBinding as l, getClickClackDiscussionBindingStore as m, buildClickClackTarget as n, markClickClackDiscussionChannelIdentityRevoked as o, bindingMatchesSessionIncarnation as p, parseClickClackTarget as r, markClickClackDiscussionChannelRevoked as s, clickClackPlugin as t, normalizedServerBaseUrl as u, isDiscussionSessionKey as v, recordPendingDiscussionOpen as w, truncateDiscussionDisplayTitle as x, resolveDiscussionLabel as y };

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as clickClackPlugin } from "./channel-BDq0KWDB.js";
+import { t as clickClackPlugin } from "./channel-DfcFlLjC.js";
 export { clickClackPlugin };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { t as registerClickClackDiscussions } from "./runtime-api-CV1cOqFO.js";
+import { t as registerClickClackDiscussions } from "./runtime-api-D1H9vheM.js";
 import { defineBundledChannelEntry } from "openclaw/plugin-sdk/channel-entry-contract";
 //#region extensions/clickclack/index.ts
 /**

package/dist/{runtime-api-CV1cOqFO.js → runtime-api-D1H9vheM.js}

@@ -1,11 +1,130 @@
-import { d as createClickClackClient, f as isClickClackChannelNameConflict, u as ClickClackHttpError, x as resolveClickClackAccount, y as listClickClackAccountIds } from "./setup-surface-Baf26N-D.js";
-import { C as reserveDiscussionBindingGeneration, S as recordPendingDiscussionOpen, _ as isDiscussionSessionKey, a as isClickClackDiscussionChannelRevoked, b as clearDiscussionBindingGeneration, c as discussionAccounts, d as bindingMatchesActiveSessionIncarnation, f as bindingMatchesSessionIncarnation, g as fallbackDiscussionLabel, h as discussionExternalRef, i as clearClickClackDiscussionChannelRevoked, l as normalizedServerBaseUrl, m as discussionCredentialFingerprint, o as markClickClackDiscussionChannelIdentityRevoked, p as getClickClackDiscussionBindingStore, s as markClickClackDiscussionChannelRevoked, u as resolveDiscussionBindingAccount, v as resolveDiscussionLabel, x as listPendingDiscussionOpens, y as slugifyDiscussionLabel } from "./channel-BDq0KWDB.js";
+import { d as createClickClackClient, f as isClickClackChannelNameConflict, u as ClickClackHttpError, x as resolveClickClackAccount, y as listClickClackAccountIds } from "./setup-surface-CD6MUC1g.js";
+import { C as listPendingDiscussionOpens, S as clearDiscussionBindingGeneration, T as reserveDiscussionBindingGeneration, _ as fallbackDiscussionLabel, a as isClickClackDiscussionChannelRevoked, b as slugifyDiscussionLabel, c as discussionAccounts, d as resolveDiscussionBindingAccount, f as bindingMatchesActiveSessionIncarnation, g as discussionExternalRef, h as discussionCredentialFingerprint, i as clearClickClackDiscussionChannelRevoked, l as discussionInfoForBinding, m as getClickClackDiscussionBindingStore, o as markClickClackDiscussionChannelIdentityRevoked, p as bindingMatchesSessionIncarnation, s as markClickClackDiscussionChannelRevoked, u as normalizedServerBaseUrl, v as isDiscussionSessionKey, w as recordPendingDiscussionOpen, x as truncateDiscussionDisplayTitle, y as resolveDiscussionLabel } from "./channel-DfcFlLjC.js";
 import "./api.js";
 import { resolveAgentIdFromSessionKey } from "openclaw/plugin-sdk/routing";
 import { randomUUID } from "node:crypto";
 import { registerSessionDiscussionProvider } from "openclaw/plugin-sdk/session-discussion";
 import { createSessionVisibilityChecker } from "openclaw/plugin-sdk/session-visibility";
+import { resolveDefaultAgentId } from "openclaw/plugin-sdk/agent-runtime";
 import { textResult } from "openclaw/plugin-sdk/tool-results";
+//#region extensions/clickclack/src/discussions/control-session-url.ts
+const SESSION_UUID_SUFFIX_RE = /([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/iu;
+const SHORT_SESSION_REF_RE = /^(?:.*-)?([0-9a-f]{8,32})$/iu;
+const VALID_AGENT_ID_RE = /^[a-z0-9][a-z0-9_-]{0,63}$/iu;
+const INVALID_AGENT_ID_CHARS_RE = /[^a-z0-9_-]+/giu;
+const FIXED_RESERVED_SESSION_RESTS = /* @__PURE__ */ new Set([
+	"main",
+	"global",
+	"boot",
+	"sessions"
+]);
+const SESSION_SLUG_MAX_LENGTH = 48;
+const DEFAULT_AGENT_ID = "main";
+const DEFAULT_MAIN_KEY = "main";
+function optionalString(value) {
+	return (value?.trim() ?? "") || null;
+}
+function normalizeAgentId$1(value) {
+	const trimmed = value.trim();
+	if (!trimmed) return DEFAULT_AGENT_ID;
+	if (VALID_AGENT_ID_RE.test(trimmed)) return trimmed.toLowerCase();
+	return trimmed.toLowerCase().replace(INVALID_AGENT_ID_CHARS_RE, "-").replace(/^-+|-+$/gu, "").slice(0, 64) || DEFAULT_AGENT_ID;
+}
+function normalizeBasePath(basePath) {
+	const trimmed = basePath.trim().replace(/^\/+|\/+$/gu, "");
+	return trimmed ? `/${trimmed}` : "";
+}
+function agentSessionKeyParts(sessionKey) {
+	const parts = sessionKey.split(":");
+	if (parts.length < 3 || parts[0]?.toLowerCase() !== "agent") return null;
+	const agentId = optionalString(parts[1]);
+	const restSegments = parts.slice(2);
+	if (!agentId || restSegments.some((segment) => !segment)) return null;
+	return {
+		agentId: normalizeAgentId$1(agentId),
+		rest: restSegments.join(":")
+	};
+}
+function encodePathSegment(segment) {
+	if (segment === ".") return "~dot";
+	if (segment === "..") return "~dotdot";
+	const encoded = encodeURIComponent(segment).replaceAll(".", "%2E");
+	return encoded.startsWith("~") ? `~${encoded}` : encoded;
+}
+function isReservedSessionRest(rest, mainKey) {
+	const normalized = rest.toLowerCase();
+	return FIXED_RESERVED_SESSION_RESTS.has(normalized) || normalized === (optionalString(mainKey)?.toLowerCase() ?? DEFAULT_MAIN_KEY);
+}
+function sessionSlug(displayName) {
+	const tokens = (displayName ?? "").toLowerCase().replace(/[^a-z0-9]+/gu, "-").replace(/^-+|-+$/gu, "").split("-").filter(Boolean);
+	while (tokens.length > 0 && /^[0-9a-f]+$/u.test(tokens.at(-1) ?? "")) tokens.pop();
+	return tokens.join("-").slice(0, SESSION_SLUG_MAX_LENGTH).replace(/-+$/gu, "");
+}
+function sessionKeyUuid(sessionKey) {
+	const uuid = (agentSessionKeyParts(sessionKey)?.rest)?.match(SESSION_UUID_SUFFIX_RE)?.[1];
+	return uuid ? uuid.toLowerCase().replaceAll("-", "") : null;
+}
+function sessionPath(params) {
+	const rawKey = optionalString(params.sessionKey);
+	const parsed = rawKey ? agentSessionKeyParts(rawKey) : null;
+	const fallbackAgentId = optionalString(params.fallbackAgentId);
+	const agentId = parsed?.agentId ?? (fallbackAgentId ? normalizeAgentId$1(fallbackAgentId) : null);
+	if (!rawKey || !agentId || !parsed && rawKey.toLowerCase().startsWith("agent:")) return null;
+	const namespace = `${normalizeBasePath(params.basePath)}/chat`;
+	const encodedAgentId = encodePathSegment(agentId);
+	const rest = parsed?.rest ?? rawKey;
+	const normalizedRest = rest.toLowerCase();
+	const mainKey = optionalString(params.mainKey)?.toLowerCase() ?? DEFAULT_MAIN_KEY;
+	if (!parsed && normalizedRest === DEFAULT_MAIN_KEY || normalizedRest === mainKey || normalizedRest === "global") return `${namespace}/${encodedAgentId}`;
+	const uuid = parsed ? sessionKeyUuid(rawKey) : null;
+	if (uuid) {
+		let length = 8;
+		const slug = sessionSlug(params.displayName);
+		let sessionRef = `${slug ? `${slug}-` : ""}${uuid.slice(0, length)}`;
+		while (length < uuid.length && isReservedSessionRest(sessionRef, params.mainKey)) {
+			length += 1;
+			sessionRef = `${slug ? `${slug}-` : ""}${uuid.slice(0, length)}`;
+		}
+		return isReservedSessionRest(sessionRef, params.mainKey) ? null : `${namespace}/${encodedAgentId}/${sessionRef}`;
+	}
+	const segments = rest.split(":");
+	if (segments.some((segment) => !segment)) return null;
+	if (segments.length === 1) {
+		const segment = segments[0] ?? "";
+		if (!isReservedSessionRest(segment, params.mainKey) && SHORT_SESSION_REF_RE.test(segment)) return `${namespace}/${encodedAgentId}/~key/${encodePathSegment(segment)}`;
+	}
+	return `${namespace}/${encodedAgentId}/${segments.map(encodePathSegment).join("/")}`;
+}
+function controlSessionUrl(baseUrl, sessionKey, fallbackAgentId, mainKey, displayName) {
+	if (!baseUrl) return;
+	const url = new URL(baseUrl);
+	const path = sessionPath({
+		sessionKey,
+		fallbackAgentId,
+		basePath: url.pathname,
+		displayName,
+		mainKey
+	});
+	if (!path) return;
+	url.pathname = path;
+	url.hash = "";
+	return url.toString();
+}
+//#endregion
+//#region extensions/clickclack/src/discussions/history-format.ts
+function discussionRecordJson(value) {
+	return JSON.stringify(value).replace(/[\u0085\u2028\u2029]/gu, (separator) => `\\u${separator.charCodeAt(0).toString(16).padStart(4, "0")}`);
+}
+/** Renders channel history as line-per-message records for the discussion tool. */
+function formatDiscussionHistory(history) {
+	const text = history.messages.map((message) => {
+		const author = message.author?.display_name || message.author?.handle || message.author_id || "Unknown";
+		return `timestamp=${discussionRecordJson(message.created_at)} [Author ${discussionRecordJson(author)} id=${discussionRecordJson(message.author_id)}] text=${discussionRecordJson(message.body)}`;
+	}).join("\n");
+	const truncationNote = history.truncated ? "\n[History scan reached its safety bound; older active threads may be omitted.]" : "";
+	return text ? `${text}${truncationNote}` : "";
+}
+//#endregion
 //#region extensions/clickclack/src/discussions/installation.ts
 const INSTALLATION_NAMESPACE = "discussion-installation";
 const INSTALLATION_KEY = "current";
@@ -23,6 +142,85 @@ function getClickClackDiscussionInstallationId(runtime) {
 	return store.lookup(INSTALLATION_KEY)?.id ?? id;
 }
 //#endregion
+//#region extensions/clickclack/src/discussions/reconcile-scheduler.ts
+const RECONCILE_DEBOUNCE_MS = 250;
+const RECONCILE_RETRY_MS = 1e3;
+const RECONCILE_RETRY_MAX_MS = 6e4;
+/**
+* Per-session debounced reconcile scheduling with failure backoff.
+* Contracts: bursts coalesce onto the earliest scheduled run (steady event
+* 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.
+*/
+var DiscussionReconcileScheduler = class {
+	#hooks;
+	#timers = /* @__PURE__ */ new Map();
+	#retryState = /* @__PURE__ */ new Map();
+	#inFlight = /* @__PURE__ */ new Set();
+	#followUps = /* @__PURE__ */ new Set();
+	#generation = 0;
+	constructor(hooks) {
+		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.#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
+		});
+	}
+};
+//#endregion
 //#region extensions/clickclack/src/discussions/service-open.ts
 const CHANNEL_NAME_MUTATION_ATTEMPTS$1 = 4;
 function isDefinitiveNoCreateHttpError(error) {
@@ -34,20 +232,16 @@ function isDefinitiveNoCreateHttpError(error) {
 		429
 	].includes(error.status);
 }
-function controlSessionUrl(baseUrl, sessionKey) {
-	if (!baseUrl) return;
-	const url = new URL(baseUrl);
-	url.pathname = `${url.pathname.replace(/\/+$/u, "")}/chat`;
-	url.hash = "";
-	url.searchParams.set("session", sessionKey);
-	return url.toString();
-}
 async function resolveAvailableChannelName(params) {
 	const desired = slugifyDiscussionLabel(params.label, params.sessionKey);
 	const channels = params.channels ?? await params.client.channels(params.workspaceId);
 	const occupied = new Set(channels.filter((channel) => channel.id !== params.ownChannelId).map((channel) => channel.name));
 	if (!occupied.has(desired)) return desired;
-	const fallback = fallbackDiscussionLabel(params.sessionKey);
+	for (let suffix = 2; suffix <= 20; suffix += 1) {
+		const candidate = `${desired}-${suffix}`;
+		if (!occupied.has(candidate)) return candidate;
+	}
+	const fallback = fallbackDiscussionLabel(params.sessionKey, params.agentId);
 	if (!occupied.has(fallback)) return fallback;
 	for (let suffix = 2;; suffix += 1) {
 		const candidate = `${fallback}-${suffix}`;
@@ -60,16 +254,19 @@ function assertChannelPatch(channel, patch) {
 		"external_managed",
 		"external_ref",
 		"external_url",
+		"display_title",
 		"name",
 		"sidebar_section"
 	]) {
 		const expected = patch[key];
 		if (expected === void 0) continue;
+		if (key === "display_title" && !(key in channel)) continue;
 		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}`);
 	}
 }
 function assertManagedChannelContract(channel, expected) {
-	if (channel.external_managed !== true || (channel.external_ref ?? "") !== (expected.externalRef ?? "") || (channel.sidebar_section ?? "") !== (expected.section ?? "") || (channel.external_url ?? "") !== (expected.externalUrl ?? "")) throw new Error(`ClickClack server does not support the managed discussion channel contract for ${expected.sessionKey}`);
+	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}`);
 }
 function assertManagedChannelListContract(channels) {
 	if (channels.some((channel) => typeof channel.external_managed !== "boolean" || channel.external_ref !== void 0 && typeof channel.external_ref !== "string" || channel.external_url !== void 0 && typeof channel.external_url !== "string" || channel.sidebar_section !== void 0 && typeof channel.sidebar_section !== "string")) throw new Error("ClickClack server does not advertise the managed discussion contract");
@@ -93,9 +290,13 @@ async function openClickClackDiscussionBinding(params) {
 		await params.reconcilePendingOpen(unresolved);
 		if (listPendingDiscussionOpens(runtime).some((pending) => pending.sessionKey === sessionKey)) throw new Error("A previous ClickClack discussion open is still unresolved; restore its credential and retry");
 	}
-	const label = resolveDiscussionLabel(entry.label, sessionKey);
+	const config = runtime.config.current();
+	const agentId = resolveAgentIdFromSessionKey(sessionKey, resolveDefaultAgentId(config));
+	const fallback = fallbackDiscussionLabel(sessionKey, agentId);
+	const label = resolveDiscussionLabel(entry, sessionKey, agentId);
+	const displayTitle = label === fallback ? "" : truncateDiscussionDisplayTitle(label);
 	const section = entry.category?.trim() || account.discussions.section;
-	const externalUrl = controlSessionUrl(account.discussions.controlUrlBase, sessionKey);
+	const externalUrl = controlSessionUrl(account.discussions.controlUrlBase, sessionKey, account.agentId ?? "main", config.session?.mainKey, label);
 	const archived = entry.archivedAt !== void 0;
 	return await params.withChannelMutationLock(async () => {
 		if (!store.hasCapacity(sessionKey)) throw new Error("ClickClack discussion binding capacity is exhausted");
@@ -120,13 +321,15 @@ async function openClickClackDiscussionBinding(params) {
 					workspaceId: workspace.id,
 					label,
 					sessionKey,
+					agentId,
 					channels,
 					ownChannelId: adopted?.id
 				}),
 				external_managed: true,
 				external_ref: externalRef,
 				external_url: externalUrl ?? "",
-				sidebar_section: section
+				sidebar_section: section,
+				display_title: displayTitle
 			};
 			recordPendingDiscussionOpen({
 				runtime,
@@ -213,7 +416,8 @@ async function openClickClackDiscussionBinding(params) {
 				sessionKey,
 				externalRef,
 				section,
-				externalUrl
+				externalUrl,
+				displayTitle
 			});
 			if (adopted) assertChannelPatch(resolved, {
 				...managedFields,
@@ -252,7 +456,7 @@ async function openClickClackDiscussionBinding(params) {
 		}
 		const nextBinding = {
 			accountId: account.accountId,
-			agentId: resolveAgentIdFromSessionKey(sessionKey),
+			agentId,
 			sessionId: entry.sessionId,
 			serverBaseUrl,
 			credentialFingerprint,
@@ -265,7 +469,8 @@ async function openClickClackDiscussionBinding(params) {
 			workspaceRouteId: workspace.route_id,
 			section,
 			archived,
-			label
+			label,
+			displayTitle: "display_title" in channel ? channel.display_title : void 0
 		};
 		const currentEntry = runtime.agent.session.getSessionEntry({
 			sessionKey,
@@ -307,17 +512,6 @@ async function openClickClackDiscussionBinding(params) {
 //#region extensions/clickclack/src/discussions/service.ts
 const RECONCILE_INTERVAL_MS = 6e4;
 const CHANNEL_NAME_MUTATION_ATTEMPTS = 4;
-function discussionInfoForBinding(binding, account) {
-	const baseUrl = normalizedServerBaseUrl(account);
-	return {
-		state: "open",
-		embedUrl: `${baseUrl}/embed/channel/${encodeURIComponent(binding.workspaceRouteId)}/${encodeURIComponent(binding.channelRouteId)}`,
-		openUrl: `${baseUrl}/app/${encodeURIComponent(binding.workspaceRouteId)}/${encodeURIComponent(binding.channelRouteId)}`
-	};
-}
-function discussionRecordJson(value) {
-	return JSON.stringify(value).replace(/[\u0085\u2028\u2029]/gu, (separator) => `\\u${separator.charCodeAt(0).toString(16).padStart(4, "0")}`);
-}
 var ClickClackDiscussionService = class {
 	#runtime;
 	#store;
@@ -326,9 +520,16 @@ var ClickClackDiscussionService = class {
 	#bindingGenerationFactory;
 	#timersEnabled;
 	#sessionLocks = /* @__PURE__ */ new Map();
+	#reconcileScheduler = new DiscussionReconcileScheduler({
+		shouldSchedule: (sessionKey) => !this.#closed && (this.#store.get(sessionKey) !== void 0 || listPendingDiscussionOpens(this.#runtime).some((pending) => pending.sessionKey === sessionKey)),
+		run: async (sessionKey) => await this.reconcile(sessionKey),
+		warn: (message) => this.#logger().warn(message)
+	});
 	#channelMutationLock = Promise.resolve();
 	#timer;
 	#reconcileAllPromise;
+	#unsubscribeSessionsChanged;
+	#closed = false;
 	constructor(runtime, options = {}) {
 		this.#runtime = runtime;
 		this.#store = getClickClackDiscussionBindingStore(runtime);
@@ -344,6 +545,17 @@ var ClickClackDiscussionService = class {
 			info: async ({ sessionKey }) => await this.info(sessionKey),
 			open: async ({ sessionKey }) => await this.open(sessionKey)
 		};
+		if (options.gatewayEvents) this.bindGatewayEvents(options.gatewayEvents);
+		if (this.#timersEnabled) this.#ensureTimer();
+	}
+	bindGatewayEvents(gatewayEvents) {
+		this.#unsubscribeSessionsChanged?.();
+		this.#closed = false;
+		this.#reconcileScheduler.supersede();
+		this.#unsubscribeSessionsChanged = gatewayEvents?.onSessionsChanged((event) => {
+			this.#reconcileScheduler.schedule(event.sessionKey);
+		});
+		for (const sessionKey of this.#listReconcileSessionKeys()) this.#reconcileScheduler.schedule(sessionKey, 0);
 		if (this.#timersEnabled) this.#ensureTimer();
 	}
 	hasEnabledAccount() {
@@ -391,44 +603,49 @@ var ClickClackDiscussionService = class {
 					if (current) return discussionInfoForBinding(current, resolved.account);
 				}
 			}
-			const binding = await openClickClackDiscussionBinding({
-				runtime: this.#runtime,
-				store: this.#store,
-				account,
-				clientFactory: this.#clientFactory,
-				installationId: this.#installationId,
-				bindingGenerationFactory: this.#bindingGenerationFactory,
-				sessionKey,
-				ensureTimer: () => this.#ensureTimer(),
-				reconcilePendingOpen: async (pending) => await this.#reconcilePendingOpen(pending, { allowRetry: false }),
-				withChannelMutationLock: async (run) => await this.#withChannelMutationLock(run),
-				finalizePendingBinding: (key, nextBinding) => this.#finalizePendingBinding(key, nextBinding),
-				warn: (message) => this.#logger().warn(message)
-			});
+			let binding;
+			try {
+				binding = await openClickClackDiscussionBinding({
+					runtime: this.#runtime,
+					store: this.#store,
+					account,
+					clientFactory: this.#clientFactory,
+					installationId: this.#installationId,
+					bindingGenerationFactory: this.#bindingGenerationFactory,
+					sessionKey,
+					ensureTimer: () => this.#ensureTimer(),
+					reconcilePendingOpen: async (pending) => await this.#reconcilePendingOpen(pending, { allowRetry: false }),
+					withChannelMutationLock: async (run) => await this.#withChannelMutationLock(run),
+					finalizePendingBinding: (key, nextBinding) => this.#finalizePendingBinding(key, nextBinding),
+					warn: (message) => this.#logger().warn(message)
+				});
+			} finally {
+				this.#ensureTimer();
+			}
 			if (!binding) return { state: "available" };
-			this.#ensureTimer();
 			return discussionInfoForBinding(binding, account);
 		});
 	}
 	async reconcile(sessionKey) {
-		await this.#withSessionLock(sessionKey, async () => {
-			const binding = this.#store.get(sessionKey);
-			if (binding) await this.#reconcileBinding(sessionKey, binding);
-		});
+		try {
+			await this.#withSessionLock(sessionKey, async () => {
+				const binding = this.#store.get(sessionKey);
+				if (binding) await this.#reconcileBinding(sessionKey, binding);
+			});
+			const pending = listPendingDiscussionOpens(this.#runtime).find((candidate) => candidate.sessionKey === sessionKey);
+			if (pending) await this.#reconcilePendingOpen(pending);
+		} finally {
+			this.#ensureTimer();
+		}
 	}
 	async reconcileAll() {
 		if (this.#reconcileAllPromise) return await this.#reconcileAllPromise;
 		this.#reconcileAllPromise = (async () => {
-			for (const { sessionKey } of this.#store.entries()) try {
+			for (const sessionKey of this.#listReconcileSessionKeys()) try {
 				await this.reconcile(sessionKey);
 			} catch (error) {
 				this.#logger().warn(`discussion reconcile failed for ${sessionKey}: ${String(error)}`);
 			}
-			for (const pending of listPendingDiscussionOpens(this.#runtime)) try {
-				await this.#reconcilePendingOpen(pending);
-			} catch (error) {
-				this.#logger().warn(`discussion pending-open reconcile failed for ${pending.sessionKey}: ${String(error)}`);
-			}
 		})().finally(() => {
 			this.#reconcileAllPromise = void 0;
 		});
@@ -447,18 +664,17 @@ var ClickClackDiscussionService = class {
 			serverBaseUrl: binding.serverBaseUrl,
 			channelId: binding.channelId
 		})) return { text: "No discussion is bound to this session." };
-		const history = await this.#clientFactory(resolved.account).latestChannelMessages(binding.channelId, limit);
-		const text = history.messages.map((message) => {
-			const author = message.author?.display_name || message.author?.handle || message.author_id || "Unknown";
-			return `timestamp=${discussionRecordJson(message.created_at)} [Author ${discussionRecordJson(author)} id=${discussionRecordJson(message.author_id)}] text=${discussionRecordJson(message.body)}`;
-		}).join("\n");
-		const truncationNote = history.truncated ? "\n[History scan reached its safety bound; older active threads may be omitted.]" : "";
 		return {
 			binding,
-			text: text ? `${text}${truncationNote}` : "The bound discussion has no messages yet."
+			text: formatDiscussionHistory(await this.#clientFactory(resolved.account).latestChannelMessages(binding.channelId, limit)) || "The bound discussion has no messages yet."
 		};
 	}
 	cleanup() {
+		this.#closed = true;
+		this.#unsubscribeSessionsChanged?.();
+		this.#unsubscribeSessionsChanged = void 0;
+		this.#reconcileScheduler.supersede();
+		this.#reconcileScheduler.clear();
 		if (this.#timer) {
 			clearInterval(this.#timer);
 			this.#timer = void 0;
@@ -499,12 +715,17 @@ var ClickClackDiscussionService = class {
 		}
 		const archived = entry ? entry.archivedAt !== void 0 : true;
 		const deleted = entry === void 0;
-		const label = entry ? resolveDiscussionLabel(entry.label, sessionKey) : binding.label;
+		const fallback = fallbackDiscussionLabel(sessionKey, binding.agentId);
+		const label = entry ? resolveDiscussionLabel(entry, sessionKey, binding.agentId) : binding.label;
 		const section = entry?.category?.trim() || account.discussions.section;
-		const externalUrl = controlSessionUrl(account.discussions.controlUrlBase, sessionKey) ?? "";
+		const externalUrl = controlSessionUrl(account.discussions.controlUrlBase, sessionKey, account.agentId ?? "main", this.#currentConfig().session?.mainKey, label) ?? "";
 		const patch = {};
 		if (archived !== binding.archived) patch.archived = archived;
 		const labelChanged = label !== binding.label;
+		const desiredDisplayTitle = label === fallback ? "" : truncateDiscussionDisplayTitle(label);
+		const serverSupportsDisplayTitle = this.#store.entries().some(({ binding: candidate }) => candidate.displayTitle !== void 0 && candidate.serverBaseUrl === binding.serverBaseUrl && candidate.accountId === binding.accountId);
+		const shouldBackfillDisplayTitle = desiredDisplayTitle !== "" && binding.displayTitle !== desiredDisplayTitle && serverSupportsDisplayTitle;
+		if (labelChanged || shouldBackfillDisplayTitle) patch.display_title = desiredDisplayTitle;
 		if (section !== binding.section) patch.sidebar_section = section;
 		if (externalUrl !== binding.externalUrl) patch.external_url = externalUrl;
 		if (Object.keys(patch).length === 0 && !labelChanged) {
@@ -512,24 +733,31 @@ var ClickClackDiscussionService = class {
 			return;
 		}
 		const client = this.#clientFactory(account);
-		if (labelChanged) await this.#withChannelMutationLock(async () => {
+		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: binding.workspaceId,
 					label,
 					sessionKey,
+					agentId: binding.agentId,
 					ownChannelId: binding.channelId
 				});
 				try {
-					assertChannelPatch(await client.updateChannel(binding.channelId, patch), patch);
-					return;
+					const renamed = await client.updateChannel(binding.channelId, patch);
+					assertChannelPatch(renamed, patch);
+					return renamed;
 				} catch (error) {
 					if (!isClickClackChannelNameConflict(error) || attempt === CHANNEL_NAME_MUTATION_ATTEMPTS - 1) throw error;
 				}
 			}
+			throw new Error("ClickClack discussion channel name retries were exhausted");
 		});
-		else assertChannelPatch(await client.updateChannel(binding.channelId, patch), patch);
+		else {
+			updated = await client.updateChannel(binding.channelId, patch);
+			assertChannelPatch(updated, patch);
+		}
 		if (deleted) {
 			this.#revokeAndDeleteBinding(sessionKey, binding);
 			return;
@@ -539,7 +767,8 @@ var ClickClackDiscussionService = class {
 			archived,
 			externalUrl,
 			label,
-			section
+			section,
+			displayTitle: "display_title" in updated ? updated.display_title : void 0
 		});
 	}
 	async #reconcilePendingOpen(pending, options = {}) {
@@ -637,19 +866,28 @@ var ClickClackDiscussionService = class {
 		return this.#runtime.config.current();
 	}
 	#ensureTimer() {
-		if (!this.#timersEnabled || this.#timer || this.#store.entries().length === 0 && listPendingDiscussionOpens(this.#runtime).length === 0) return;
+		const hasPendingOpens = listPendingDiscussionOpens(this.#runtime).length > 0;
+		const needsBindingPoll = this.#unsubscribeSessionsChanged === void 0 && this.#store.entries().length > 0;
+		if (this.#closed || !hasPendingOpens && !needsBindingPoll) {
+			if (this.#timer) {
+				clearInterval(this.#timer);
+				this.#timer = void 0;
+			}
+			return;
+		}
+		if (!this.#timersEnabled || this.#timer) return;
 		this.#timer = setInterval(() => {
 			this.reconcileAll().catch((error) => {
 				this.#logger().warn(`discussion reconcile pass failed: ${String(error)}`);
 			}).finally(() => {
-				if (this.#store.entries().length === 0 && listPendingDiscussionOpens(this.#runtime).length === 0 && this.#timer) {
-					clearInterval(this.#timer);
-					this.#timer = void 0;
-				}
+				this.#ensureTimer();
 			});
 		}, RECONCILE_INTERVAL_MS);
 		this.#timer.unref?.();
 	}
+	#listReconcileSessionKeys() {
+		return /* @__PURE__ */ new Set([...this.#store.entries().map(({ sessionKey }) => sessionKey), ...listPendingDiscussionOpens(this.#runtime).map(({ sessionKey }) => sessionKey)]);
+	}
 	#logger() {
 		return this.#runtime.logging.getChildLogger({
 			plugin: "clickclack",
@@ -751,6 +989,15 @@ function registerClickClackDiscussions(api) {
 		return;
 	}
 	const service = new ClickClackDiscussionService(api.runtime);
+	api.registerService({
+		id: "clickclack-discussion-session-events",
+		start: ({ gatewayEvents }) => {
+			service.bindGatewayEvents(gatewayEvents);
+		},
+		stop: () => {
+			service.cleanup();
+		}
+	});
 	api.registerTool((context) => createClickClackDiscussionTool({
 		service,
 		sessionKey: context.sessionKey

package/dist/runtime-api.js

@@ -1,4 +1,4 @@
-import { d as createClickClackClient, x as resolveClickClackAccount } from "./setup-surface-Baf26N-D.js";
-import { T as setClickClackRuntime, r as parseClickClackTarget } from "./channel-BDq0KWDB.js";
-import { t as registerClickClackDiscussions } from "./runtime-api-CV1cOqFO.js";
+import { d as createClickClackClient, x as resolveClickClackAccount } from "./setup-surface-CD6MUC1g.js";
+import { D as setClickClackRuntime, r as parseClickClackTarget } from "./channel-DfcFlLjC.js";
+import { t as registerClickClackDiscussions } from "./runtime-api-D1H9vheM.js";
 export { createClickClackClient, parseClickClackTarget, registerClickClackDiscussions, resolveClickClackAccount, setClickClackRuntime };

package/dist/{setup-claim-CJIUfZS7.js → setup-claim-BFU16zoo.js}

@@ -1,4 +1,4 @@
-import { a as buildClickClackSetupClaimUrl, o as isClickClackSetupLoopbackHost, s as requireClickClackSetupApiBaseUrl } from "./setup-surface-Baf26N-D.js";
+import { a as buildClickClackSetupClaimUrl, o as isClickClackSetupLoopbackHost, s as requireClickClackSetupApiBaseUrl } from "./setup-surface-CD6MUC1g.js";
 import { createProviderOperationDeadline, readProviderJsonResponse, readResponseTextLimited, resolveProviderOperationTimeoutMs } from "openclaw/plugin-sdk/provider-http";
 import { fetchWithSsrFGuard, resolvePinnedHostnameWithPolicy, ssrfPolicyFromHttpBaseUrlAllowedHostname } from "openclaw/plugin-sdk/ssrf-runtime";
 import { withTimeout } from "openclaw/plugin-sdk/text-utility-runtime";

package/dist/setup-plugin-api.js

@@ -1,4 +1,4 @@
-import { _ as clickClackMeta, g as clickClackConfigAdapter, m as clickClackConfigSchema, n as clickClackSetupAdapter, r as clickClackSetupContract, t as clickClackSetupWizard } from "./setup-surface-Baf26N-D.js";
+import { _ as clickClackMeta, g as clickClackConfigAdapter, m as clickClackConfigSchema, n as clickClackSetupAdapter, r as clickClackSetupContract, t as clickClackSetupWizard } from "./setup-surface-CD6MUC1g.js";
 //#region extensions/clickclack/src/channel.setup.ts
 const clickClackSetupPlugin = {
 	id: "clickclack",

package/dist/{setup-surface-Baf26N-D.js → setup-surface-CD6MUC1g.js}

@@ -1,6 +1,5 @@
 import { createAccountListHelpers, hasConfiguredAccountValue } from "openclaw/plugin-sdk/account-helpers";
 import { DEFAULT_ACCOUNT_ID, DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$2, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
-import { resolveMergedAccountConfig } from "openclaw/plugin-sdk/account-resolution";
 import { resolveNormalizedAccountEntry } from "openclaw/plugin-sdk/account-resolution-runtime";
 import { resolveIntegerOption } from "openclaw/plugin-sdk/number-runtime";
 import { resolveDefaultSecretProviderAlias } from "openclaw/plugin-sdk/provider-auth";
@@ -15,7 +14,7 @@ import { redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
 import { readProviderJsonResponse, readResponseTextLimited } from "openclaw/plugin-sdk/provider-http";
 import { WebSocket } from "ws";
 import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
-import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, applyAccountNameToChannelSection, applySetupAccountConfigPatch, baseUrlTextInput, createSetupTranslator, createStandardChannelSetupStatus, defineTokenCredential, formatDocsLink, hasConfiguredSecretInput, migrateBaseNameToDefaultAccount, moveSingleAccountChannelSectionToDefaultAccount, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup";
+import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, applyAccountNameToChannelSection, baseUrlTextInput, createSetupTranslator, createStandardChannelSetupStatus, defineTokenCredential, formatDocsLink, hasConfiguredSecretInput, migrateBaseNameToDefaultAccount, moveSingleAccountChannelSectionToDefaultAccount, patchScopedAccountConfig, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup";
 import { createSetupInputPresenceValidator } from "openclaw/plugin-sdk/setup-runtime";
 import net from "node:net";
 //#region \0rolldown/runtime.js
@@ -39,8 +38,10 @@ const DEFAULT_RECONNECT_MS = 1500;
 const MIN_RECONNECT_MS = 100;
 const MAX_RECONNECT_MS = 6e4;
 const DEFAULT_DISCUSSIONS_SECTION = "Sessions";
-const { listAccountIds: listClickClackAccountIds, resolveDefaultAccountId: resolveDefaultClickClackAccountId } = createAccountListHelpers("clickclack", {
+const { listAccountIds: listClickClackAccountIds, resolveDefaultAccountId: resolveDefaultClickClackAccountId, resolveAccountConfig: resolveMergedClickClackAccountConfig } = createAccountListHelpers("clickclack", {
 	normalizeAccountId,
+	omitKeys: ["defaultAccount"],
+	nestedObjectKeys: ["discussions"],
 	hasImplicitDefaultAccount: (cfg) => {
 		const channel = cfg.channels?.clickclack;
 		return Boolean(channel?.baseUrl?.trim() && (hasConfiguredAccountValue(channel.token) || Boolean(channel.tokenFile?.trim()) || Boolean(process.env.CLICKCLACK_BOT_TOKEN?.trim())) && channel.workspace?.trim());
@@ -48,14 +49,7 @@ const { listAccountIds: listClickClackAccountIds, resolveDefaultAccountId: resol
 });
 function resolveClickClackAccountConfig(cfg, accountId) {
 	const channel = cfg.channels?.clickclack;
-	const merged = resolveMergedAccountConfig({
-		channelConfig: cfg.channels?.clickclack,
-		accounts: channel?.accounts,
-		accountId,
-		omitKeys: ["defaultAccount"],
-		nestedObjectKeys: ["discussions"],
-		normalizeAccountId
-	});
+	const merged = resolveMergedClickClackAccountConfig(cfg, accountId);
 	const account = resolveNormalizedAccountEntry(channel?.accounts, accountId, normalizeAccountId);
 	const accountTokenFile = account?.tokenFile?.trim();
 	if (accountTokenFile) return {
@@ -682,59 +676,24 @@ function applyClickClackSetupConfigPatch(params) {
 		accountId,
 		name: params.name
 	});
-	return applySetupAccountConfigPatch({
+	return patchScopedAccountConfig({
 		cfg: accountId !== DEFAULT_ACCOUNT_ID ? migrateBaseNameToDefaultAccount({
 			cfg: namedConfig,
 			channelKey: channel$1
 		}) : namedConfig,
 		channelKey: channel$1,
 		accountId,
-		patch: params.patch
+		patch: params.patch,
+		...params.clearFields ? { clearFields: params.clearFields } : {}
 	});
 }
-function clearClickClackSetupConfigFields(params) {
-	const clickclack = params.cfg.channels?.clickclack;
-	if (!clickclack) return params.cfg;
-	const accountId = normalizeAccountId(params.accountId);
-	if (accountId === DEFAULT_ACCOUNT_ID) {
-		const nextClickClack = { ...clickclack };
-		for (const field of params.fields) delete nextClickClack[field];
-		return {
-			...params.cfg,
-			channels: {
-				...params.cfg.channels,
-				clickclack: nextClickClack
-			}
-		};
-	}
-	const currentAccount = clickclack.accounts?.[accountId];
-	if (!currentAccount) return params.cfg;
-	const nextAccount = { ...currentAccount };
-	for (const field of params.fields) delete nextAccount[field];
-	return {
-		...params.cfg,
-		channels: {
-			...params.cfg.channels,
-			clickclack: {
-				...clickclack,
-				accounts: {
-					...clickclack.accounts,
-					[accountId]: nextAccount
-				}
-			}
-		}
-	};
-}
 function applyClickClackCredentialConfig(params) {
 	const fieldsToClear = params.useEnv ? ["token", "tokenFile"] : params.tokenFile ? ["token"] : params.token !== void 0 ? ["tokenFile"] : [];
-	return clearClickClackSetupConfigFields({
-		cfg: applyClickClackSetupConfigPatch({
-			cfg: params.cfg,
-			accountId: params.accountId,
-			patch: params.useEnv ? {} : params.tokenFile ? { tokenFile: params.tokenFile } : params.token !== void 0 ? { token: params.token } : {}
-		}),
+	return applyClickClackSetupConfigPatch({
+		cfg: params.cfg,
 		accountId: params.accountId,
-		fields: fieldsToClear
+		clearFields: fieldsToClear,
+		patch: params.useEnv ? {} : params.tokenFile ? { tokenFile: params.tokenFile } : params.token !== void 0 ? { token: params.token } : {}
 	});
 }
 const clickClackSetupAdapter = {
@@ -751,7 +710,7 @@ const clickClackSetupAdapter = {
 		const claimUrl = setup.exactClaimUrl && !privateApiBaseUrl ? setup.exactClaimUrl : buildClickClackSetupClaimUrl(privateApiBaseUrl ?? setup.baseUrl);
 		let claim;
 		try {
-			const { claimClickClackSetupCode } = await import("./setup-claim-CJIUfZS7.js");
+			const { claimClickClackSetupCode } = await import("./setup-claim-BFU16zoo.js");
 			claim = await claimClickClackSetupCode({
 				claimUrl,
 				code: setup.code,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/clickclack",
-  "version": "2026.7.2-beta.4",
+  "version": "2026.7.2-beta.5",
   "description": "OpenClaw ClickClack channel plugin",
   "type": "module",
   "exports": {
@@ -13,7 +13,7 @@
     "zod": "4.4.3"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.7.2-beta.4"
+    "openclaw": ">=2026.7.2-beta.5"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -136,10 +136,10 @@
       "allowInvalidConfigRecovery": true
     },
     "compat": {
-      "pluginApi": ">=2026.7.2-beta.4"
+      "pluginApi": ">=2026.7.2-beta.5"
     },
     "build": {
-      "openclawVersion": "2026.7.2-beta.4",
+      "openclawVersion": "2026.7.2-beta.5",
       "bundledDist": false
     },
     "release": {
@@ -158,7 +158,6 @@
   "files": [
     "dist/**",
     "openclaw.plugin.json",
-    "npm-shrinkwrap.json",
     "README.md"
   ],
   "bundledDependencies": [

package/npm-shrinkwrap.json

@@ -1,54 +0,0 @@
-{
-  "name": "@openclaw/clickclack",
-  "version": "2026.7.2-beta.4",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@openclaw/clickclack",
-      "version": "2026.7.2-beta.4",
-      "dependencies": {
-        "ws": "8.21.1",
-        "zod": "4.4.3"
-      },
-      "peerDependencies": {
-        "openclaw": ">=2026.7.2-beta.4"
-      },
-      "peerDependenciesMeta": {
-        "openclaw": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ws": {
-      "version": "8.21.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.1.tgz",
-      "integrity": "sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/zod": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
-      "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    }
-  }
-}