@openclaw/clickclack 2026.9.6 → 2026.9.7

package/dist/.setup/{setup-surface-BBl3rvVx.mjs → setup-surface-BW1Q06w5.mjs}

@@ -1,4 +1,3 @@
-import { createRequire } from "node:module";
 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 { resolveNormalizedAccountEntry } from "openclaw/plugin-sdk/account-resolution-runtime";
@@ -12,26 +11,10 @@ import { getChatChannelMeta } from "openclaw/plugin-sdk/channel-plugin-common";
 import { ChannelBotLoopProtectionSchema, buildChannelAllowBotsSchema, buildChannelConfigSchema, buildMultiAccountChannelSchema } from "openclaw/plugin-sdk/channel-config-schema";
 import { z } from "zod";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
-import { bufferToBlobPart } from "openclaw/plugin-sdk/blob-runtime";
-import { redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
-import { readProviderJsonResponse, readResponseTextLimited } from "openclaw/plugin-sdk/provider-http";
-import path from "node:path";
 import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, applyAccountNameToChannelSection, baseUrlTextInput, createSetupTranslator, createStandardChannelSetupStatus, defineTokenCredential, formatDocsLink, hasConfiguredSecretInput, moveSingleAccountChannelSectionToDefaultAccount, patchScopedAccountConfig, prepareScopedSetupConfig, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup";
 import { createSetupInputPresenceValidator } from "openclaw/plugin-sdk/setup-runtime";
 import net from "node:net";
-//#region \0rolldown/runtime.js
-var __defProp = Object.defineProperty;
-var __exportAll = (all, no_symbols) => {
-	let target = {};
-	for (var name in all) __defProp(target, name, {
-		get: all[name],
-		enumerable: true
-	});
-	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
-	return target;
-};
-//#endregion
 //#region extensions/clickclack/src/accounts.ts
 /**
 * Resolves ClickClack account configuration from root channel config, named
@@ -59,6 +42,7 @@ function mergeClickClackGroups(...sources) {
 		merged.set(key, {
 			...merged.get(key),
 			...value.requireMention !== void 0 ? { requireMention: value.requireMention } : {},
+			...value.requireMentionInBotThreads !== void 0 ? { requireMentionInBotThreads: value.requireMentionInBotThreads } : {},
 			...value.mentionPatterns !== void 0 ? { mentionPatterns: value.mentionPatterns } : {},
 			...value.allowBots !== void 0 ? { allowBots: value.allowBots } : {},
 			...mergedBotLoopProtection ? { botLoopProtection: mergedBotLoopProtection } : {}
@@ -87,6 +71,21 @@ function resolveClickClackAccountConfig(cfg, accountId) {
 	};
 	return mergedWithGroups;
 }
+function resolveClickClackAccountEndpoints(config) {
+	const baseUrl = config.baseUrl?.trim().replace(/\/$/, "") ?? "";
+	return {
+		baseUrl,
+		apiEndpoint: config.apiBaseUrl?.trim().replace(/\/$/, "") || baseUrl
+	};
+}
+/** Pins inbound authority to the configured identity that started the transport. */
+function isClickClackAccountCurrent(params) {
+	const { cfg, account } = params;
+	if (!cfg.channels?.clickclack || cfg.channels.clickclack.enabled === false || !listClickClackAccountIds(cfg).includes(account.accountId)) return false;
+	const current = resolveClickClackAccountConfig(cfg, account.accountId);
+	const endpoints = resolveClickClackAccountEndpoints(current);
+	return current.enabled !== false && Boolean(endpoints.baseUrl && current.workspace?.trim()) && endpoints.baseUrl === account.baseUrl && endpoints.apiEndpoint === account.apiEndpoint && current.workspace?.trim() === account.config.workspace?.trim() && normalizeOptionalString(current.botUserId) === normalizeOptionalString(account.config.botUserId);
+}
 function resolveClickClackToken(params) {
 	const tokenFile = params.tokenFile?.trim();
 	if (tokenFile) {
@@ -159,7 +158,7 @@ function resolveClickClackAccount(params) {
 	const accountId = normalizeAccountId(params.accountId);
 	const merged = resolveClickClackAccountConfig(params.cfg, accountId);
 	const enabled = params.cfg.channels?.clickclack?.enabled !== false && merged.enabled !== false;
-	const baseUrl = merged.baseUrl?.trim().replace(/\/$/, "") ?? "";
+	const { baseUrl, apiEndpoint } = resolveClickClackAccountEndpoints(merged);
 	const token = resolveClickClackToken({
 		cfg: params.cfg,
 		value: merged.token,
@@ -170,7 +169,6 @@ function resolveClickClackAccount(params) {
 	const workspace = merged.workspace?.trim() ?? "";
 	const discussionsWorkspace = merged.discussions?.workspace?.trim() || workspace;
 	const controlUrlBase = merged.discussions?.controlUrlBase?.trim();
-	const apiEndpoint = merged.apiBaseUrl?.trim().replace(/\/$/, "") || baseUrl;
 	return {
 		accountId,
 		enabled,
@@ -201,6 +199,7 @@ function resolveClickClackAccount(params) {
 			section: merged.discussions?.section?.trim() || DEFAULT_DISCUSSIONS_SECTION
 		},
 		requireMention: merged.requireMention === true,
+		requireMentionInBotThreads: merged.requireMentionInBotThreads,
 		mentionPatterns: merged.mentionPatterns ?? [],
 		allowBots: merged.allowBots ?? false,
 		botLoopProtection: merged.botLoopProtection,
@@ -274,9 +273,11 @@ const ClickClackAccountConfigSchema = z.object({
 	nativeProgress: z.boolean().optional(),
 	commandMenu: z.boolean().optional(),
 	requireMention: z.boolean().optional(),
+	requireMentionInBotThreads: z.boolean().optional(),
 	mentionPatterns: z.array(z.string()).optional(),
 	groups: z.record(z.string(), z.object({
 		requireMention: z.boolean().optional(),
+		requireMentionInBotThreads: z.boolean().optional(),
 		mentionPatterns: z.array(z.string()).optional(),
 		allowBots: buildChannelAllowBotsSchema({ allowMentions: true }),
 		botLoopProtection: ChannelBotLoopProtectionSchema.optional()
@@ -293,361 +294,24 @@ const ClickClackConfigSchema = buildMultiAccountChannelSchema(ClickClackAccountC
 * Config schema exported to core so `openclaw doctor` and config validation
 * understand both default and named ClickClack accounts.
 */
-const clickClackConfigSchema = buildChannelConfigSchema(ClickClackConfigSchema);
-//#endregion
-//#region extensions/clickclack/src/ws-runtime.ts
-const require = createRequire(import.meta.url);
-const WebSocket = require(path.join(path.dirname(require.resolve("ws/package.json")), "index.js"));
-//#endregion
-//#region extensions/clickclack/src/http-client.ts
-/**
-* Thin ClickClack REST/websocket client used by gateway, resolver, and outbound
-* delivery code.
-*/
-/**
-* Serializes optional provenance into the wire fields. Unknown JSON fields
-* are ignored by servers without the provenance columns, so these are safe
-* to send unconditionally when present.
-*/
-function provenanceFields(provenance) {
-	const fields = {};
-	if (provenance?.model?.trim()) fields.author_model = provenance.model.trim();
-	if (provenance?.thinking?.trim()) fields.author_thinking = provenance.thinking.trim();
-	if (provenance?.runtime?.trim()) fields.author_runtime = provenance.runtime.trim();
-	return fields;
-}
-const CLICKCLACK_ERROR_BODY_LIMIT_BYTES = 8192;
-const CLICKCLACK_CORRELATION_ID_MAX_LENGTH = 128;
-const CLICKCLACK_CORRELATION_ID_PATTERN = /^[A-Za-z0-9._:-]+$/u;
-const CLICKCLACK_CORRELATION_ID_HEADER = "X-Correlation-ID";
-const CLICKCLACK_INBOUND_JSON_LIMIT_BYTES = 16777216;
-const CLICKCLACK_WEBSOCKET_HANDSHAKE_TIMEOUT_MS = 3e4;
-const CLICKCLACK_EPHEMERAL_REQUEST_TIMEOUT_MS = 15e3;
-const CLICKCLACK_MESSAGE_PAGE_LIMIT = 200;
-const CLICKCLACK_DISCUSSION_ROOT_PAGE_LIMIT = 8;
-const CLICKCLACK_DISCUSSION_THREAD_REQUEST_LIMIT = 24;
-function compareMessages(left, right) {
-	return left.created_at.localeCompare(right.created_at) || left.id.localeCompare(right.id);
-}
-function keepLatestMessages(messages, limit) {
-	return messages.toSorted(compareMessages).slice(-limit);
-}
-var ClickClackHttpError = class extends Error {
-	constructor(status, detail, headers) {
-		super(`ClickClack ${status}: ${detail}`);
-		this.status = status;
-		this.headers = headers;
-	}
-};
-/** Matches the workspace/name uniqueness error returned by current ClickClack servers. */
-function isClickClackChannelNameConflict(error) {
-	if (!(error instanceof ClickClackHttpError) || error.status !== 400 && error.status !== 409) return false;
-	const message = error.message.toLowerCase();
-	return (message.includes("unique") || message.includes("duplicate")) && message.includes("channel") && /workspace.*name|name.*workspace/u.test(message);
-}
-/** Accepts the same bounded request-correlation shape as the ClickClack API. */
-function normalizeClickClackCorrelationId(value) {
-	if (typeof value !== "string") return;
-	const normalized = value.trim();
-	if (!normalized || normalized.length > CLICKCLACK_CORRELATION_ID_MAX_LENGTH || !CLICKCLACK_CORRELATION_ID_PATTERN.test(normalized)) return;
-	return normalized;
-}
-/**
-* Creates a typed client for the ClickClack API using bearer-token auth.
-*/
-function createClickClackClient(options) {
-	const baseUrl = options.baseUrl.replace(/\/$/, "");
-	const fetcher = options.fetch ?? fetch;
-	const correlationId = normalizeClickClackCorrelationId(options.correlationId);
-	const headers = {
-		Authorization: `Bearer ${options.token}`,
-		Accept: "application/json"
-	};
-	async function request(path, init = {}, requestOptions = {}) {
-		const requestHeaders = new Headers(init.headers);
-		for (const [key, value] of Object.entries(headers)) requestHeaders.set(key, value);
-		if (correlationId) requestHeaders.set(CLICKCLACK_CORRELATION_ID_HEADER, correlationId);
-		if (init.body && !(init.body instanceof FormData)) requestHeaders.set("Content-Type", "application/json");
-		const controller = requestOptions.timeoutMs !== void 0 && !init.signal ? new AbortController() : void 0;
-		const timeout = controller ? setTimeout(() => controller.abort(), requestOptions.timeoutMs) : void 0;
-		try {
-			const response = await fetcher(`${baseUrl}${path}`, {
-				...init,
-				...controller ? { signal: controller.signal } : {},
-				headers: requestHeaders
-			});
-			if (!response.ok) {
-				const detail = await readResponseTextLimited(response, CLICKCLACK_ERROR_BODY_LIMIT_BYTES);
-				throw new ClickClackHttpError(response.status, redactToolPayloadText(detail), new Headers(response.headers));
-			}
-			if (requestOptions.responseMode === "none") {
-				try {
-					await response.body?.cancel();
-				} catch {}
-				return;
-			}
-			return await readProviderJsonResponse(response, "ClickClack response", { maxBytes: CLICKCLACK_INBOUND_JSON_LIMIT_BYTES });
-		} finally {
-			if (timeout) clearTimeout(timeout);
-		}
-	}
-	async function fetchEventPage(workspaceId, pageOptions = {}) {
-		const query = new URLSearchParams({ workspace_id: workspaceId });
-		if (pageOptions.afterCursor) query.set("after_cursor", pageOptions.afterCursor);
-		if (pageOptions.limit !== void 0) query.set("limit", String(pageOptions.limit));
-		if (pageOptions.includeTail) query.set("include_tail", "true");
-		const data = await request(`/api/realtime/events?${query.toString()}`);
-		return {
-			events: data.events,
-			...typeof data.tail_cursor === "string" ? { tailCursor: data.tail_cursor } : {}
-		};
+const clickClackConfigSchema = buildChannelConfigSchema(ClickClackConfigSchema, { uiHints: {
+	requireMentionInBotThreads: {
+		label: "Require Mention in Bot Threads",
+		help: "Override mention requirements in threads rooted in this bot's messages. Unset keeps the normal mention policy."
+	},
+	"groups.*.requireMentionInBotThreads": {
+		label: "Require Mention in Bot Threads",
+		help: "Override the account policy for threads rooted in this bot's messages in this channel."
+	},
+	"accounts.*.requireMentionInBotThreads": {
+		label: "Require Mention in Bot Threads",
+		help: "Override mention requirements in threads rooted in this bot's messages. Unset inherits the channel configuration."
+	},
+	"accounts.*.groups.*.requireMentionInBotThreads": {
+		label: "Require Mention in Bot Threads",
+		help: "Override the account policy for threads rooted in this bot's messages in this channel."
 	}
-	return {
-		me: async () => {
-			return (await request("/api/me")).user;
-		},
-		setBotCommands: async (commands) => {
-			return (await request("/api/bots/self/commands", {
-				method: "PUT",
-				body: JSON.stringify({ commands })
-			})).bot_commands;
-		},
-		workspaces: async () => {
-			return (await request("/api/workspaces")).workspaces;
-		},
-		channels: async (workspaceId) => {
-			return (await request(`/api/workspaces/${encodeURIComponent(workspaceId)}/channels`)).channels;
-		},
-		createChannel: async (workspaceId, channel) => {
-			return (await request(`/api/workspaces/${encodeURIComponent(workspaceId)}/channels`, {
-				method: "POST",
-				body: JSON.stringify(channel)
-			})).channel;
-		},
-		updateChannel: async (channelId, patch) => {
-			return (await request(`/api/channels/${encodeURIComponent(channelId)}`, {
-				method: "PATCH",
-				body: JSON.stringify(patch)
-			})).channel;
-		},
-		channelMessages: async (channelId, afterSeq, limit = 20) => {
-			return (await request(`/api/channels/${encodeURIComponent(channelId)}/messages?after_seq=${afterSeq}&limit=${limit}`)).messages;
-		},
-		latestChannelMessages: async (channelId, limit = 30) => {
-			const boundedLimit = Math.max(1, Math.min(CLICKCLACK_MESSAGE_PAGE_LIMIT, limit));
-			let beforeSeq;
-			let latest = [];
-			let rootPageCount = 0;
-			let threadRequestCount = 0;
-			let truncated = false;
-			while (true) {
-				rootPageCount += 1;
-				const query = new URLSearchParams({ limit: String(CLICKCLACK_MESSAGE_PAGE_LIMIT) });
-				if (beforeSeq !== void 0) query.set("before_seq", String(beforeSeq));
-				const page = await request(`/api/channels/${encodeURIComponent(channelId)}/messages?${query.toString()}`);
-				for (const root of page.messages) {
-					latest = keepLatestMessages([...latest, root], boundedLimit);
-					const lastReplyAt = root.thread_state?.last_reply_at;
-					const cutoff = latest.length === boundedLimit ? latest[0]?.created_at : void 0;
-					if (!root.thread_state?.reply_count || lastReplyAt !== void 0 && cutoff !== void 0 && lastReplyAt < cutoff) continue;
-					if (threadRequestCount >= CLICKCLACK_DISCUSSION_THREAD_REQUEST_LIMIT) {
-						truncated = true;
-						continue;
-					}
-					threadRequestCount += 1;
-					const threadQuery = new URLSearchParams({ limit: String(CLICKCLACK_MESSAGE_PAGE_LIMIT) });
-					const thread = await request(`/api/messages/${encodeURIComponent(root.id)}/thread?${threadQuery.toString()}`);
-					if (thread.replies.length < root.thread_state.reply_count) {
-						truncated = true;
-						continue;
-					}
-					latest = keepLatestMessages([...latest, ...thread.replies], boundedLimit);
-				}
-				if (!page.has_older) return {
-					messages: latest,
-					truncated
-				};
-				if (rootPageCount >= CLICKCLACK_DISCUSSION_ROOT_PAGE_LIMIT) return {
-					messages: latest,
-					truncated: true
-				};
-				if (page.messages.length === 0 || !Number.isSafeInteger(page.oldest_seq) || page.oldest_seq < 0 || page.oldest_seq === beforeSeq) throw new Error("ClickClack message pagination did not advance");
-				beforeSeq = page.oldest_seq;
-			}
-		},
-		directMessages: async (conversationId, afterSeq, limit = 20) => {
-			return (await request(`/api/dms/${encodeURIComponent(conversationId)}/messages?after_seq=${afterSeq}&limit=${limit}`)).messages;
-		},
-		thread: async (messageId) => await request(`/api/messages/${encodeURIComponent(messageId)}/thread`),
-		message: async (messageId) => {
-			return (await request(`/api/messages/${encodeURIComponent(messageId)}`)).message;
-		},
-		findMessageByNonce: async (params) => {
-			const query = new URLSearchParams({
-				workspace_id: params.workspaceId,
-				nonce: params.nonce
-			});
-			try {
-				return (await request(`/api/messages/by-nonce?${query.toString()}`)).message;
-			} catch (error) {
-				if (error instanceof ClickClackHttpError && error.status === 404) {
-					if (error.headers.get("X-ClickClack-Message-Nonce") === "supported") return;
-					throw new Error("ClickClack server does not support durable message nonce lookup", { cause: error });
-				}
-				throw error;
-			}
-		},
-		createChannelMessage: async (channelId, body, opts) => {
-			return (await request(`/api/channels/${encodeURIComponent(channelId)}/messages`, {
-				method: "POST",
-				body: JSON.stringify({
-					body,
-					...opts?.quotedMessageId ? { quoted_message_id: opts.quotedMessageId } : {},
-					...opts?.nonce ? { nonce: opts.nonce } : {},
-					...provenanceFields(opts?.provenance)
-				})
-			})).message;
-		},
-		createThreadReply: async (messageId, body, opts) => {
-			return (await request(`/api/messages/${encodeURIComponent(messageId)}/thread/replies`, {
-				method: "POST",
-				body: JSON.stringify({
-					body,
-					...opts?.nonce ? { nonce: opts.nonce } : {},
-					...provenanceFields(opts?.provenance)
-				})
-			})).message;
-		},
-		createDirectConversation: async (workspaceId, memberIds) => {
-			return (await request("/api/dms", {
-				method: "POST",
-				body: JSON.stringify({
-					workspace_id: workspaceId,
-					member_ids: memberIds
-				})
-			})).conversation;
-		},
-		createUpload: async (params) => {
-			const form = new FormData();
-			const bytes = bufferToBlobPart(params.buffer);
-			form.append("file", new Blob([bytes], { type: params.contentType }), params.filename);
-			const query = new URLSearchParams({ workspace_id: params.workspaceId });
-			if (params.nonce) query.set("nonce", params.nonce);
-			return (await request(`/api/uploads?${query.toString()}`, {
-				method: "POST",
-				body: form
-			})).upload;
-		},
-		findUploadByNonce: async (params) => {
-			const query = new URLSearchParams({
-				workspace_id: params.workspaceId,
-				nonce: params.nonce
-			});
-			try {
-				return (await request(`/api/uploads/by-nonce?${query.toString()}`)).upload;
-			} catch (error) {
-				if (error instanceof ClickClackHttpError && error.status === 404) {
-					if (error.headers.get("X-ClickClack-Upload-Nonce") === "supported") return;
-					throw new Error("ClickClack server does not support durable upload nonce lookup", { cause: error });
-				}
-				throw error;
-			}
-		},
-		attachUpload: async (messageId, uploadId) => {
-			await request(`/api/messages/${encodeURIComponent(messageId)}/attachments`, {
-				method: "POST",
-				body: JSON.stringify({ upload_id: uploadId })
-			});
-		},
-		/**
-		* POSTs a durable agent activity row (agent_commentary / agent_tool)
-		* through the normal message create path. Requires a bot token carrying
-		* the agent_activity:write scope on the ClickClack side.
-		*/
-		createActivityMessage: async (params) => {
-			if (!params.channelId && !params.conversationId) throw new Error("createActivityMessage requires a channelId or conversationId");
-			return (await request(params.channelId ? `/api/channels/${encodeURIComponent(params.channelId)}/messages` : `/api/dms/${encodeURIComponent(params.conversationId ?? "")}/messages`, {
-				method: "POST",
-				body: JSON.stringify({
-					body: params.body,
-					kind: params.kind,
-					turn_id: params.turnId,
-					...provenanceFields(params.provenance)
-				})
-			})).message;
-		},
-		/** PATCHes the body of an existing message (activity row coalescing). */
-		updateMessageBody: async (messageId, body) => {
-			return (await request(`/api/messages/${encodeURIComponent(messageId)}`, {
-				method: "PATCH",
-				body: JSON.stringify({ body })
-			})).message;
-		},
-		/**
-		* Publishes an ephemeral realtime signal such as native agent progress.
-		* These frames are intentionally not persisted as messages.
-		*/
-		publishEphemeral: async (params) => {
-			await request("/api/realtime/ephemeral", {
-				method: "POST",
-				body: JSON.stringify({
-					workspace_id: params.workspaceId,
-					...params.channelId ? { channel_id: params.channelId } : {},
-					...params.conversationId ? { direct_conversation_id: params.conversationId } : {},
-					type: params.type,
-					payload: params.payload ?? {}
-				})
-			}, {
-				timeoutMs: CLICKCLACK_EPHEMERAL_REQUEST_TIMEOUT_MS,
-				responseMode: "none"
-			});
-		},
-		createDirectMessage: async (conversationId, body, opts) => {
-			return (await request(`/api/dms/${encodeURIComponent(conversationId)}/messages`, {
-				method: "POST",
-				body: JSON.stringify({
-					body,
-					...opts?.quotedMessageId ? { quoted_message_id: opts.quotedMessageId } : {},
-					...opts?.nonce ? { nonce: opts.nonce } : {}
-				})
-			})).message;
-		},
-		events: async (workspaceId, afterCursor) => (await fetchEventPage(workspaceId, { afterCursor })).events,
-		eventPage: fetchEventPage,
-		websocket: (workspaceId, afterCursor) => {
-			const url = new URL(`${baseUrl}/api/realtime/ws`);
-			url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
-			url.searchParams.set("workspace_id", workspaceId);
-			if (afterCursor) url.searchParams.set("after_cursor", afterCursor);
-			return new WebSocket(url, {
-				headers: { Authorization: `Bearer ${options.token}` },
-				handshakeTimeout: CLICKCLACK_WEBSOCKET_HANDSHAKE_TIMEOUT_MS,
-				maxPayload: CLICKCLACK_INBOUND_JSON_LIMIT_BYTES
-			});
-		}
-	};
-}
-//#endregion
-//#region extensions/clickclack/src/resolve.ts
-/**
-* Resolves a workspace slug/name/id from config to a ClickClack workspace id.
-*/
-async function resolveWorkspaceId(client, workspace) {
-	if (workspace.startsWith("wsp_")) return workspace;
-	const found = (await client.workspaces()).find((candidate) => candidate.id === workspace || candidate.slug === workspace || candidate.name === workspace);
-	if (!found) throw new Error(`ClickClack workspace not found: ${workspace}`);
-	return found.id;
-}
-/**
-* Resolves a channel name/id from config or target input to a ClickClack
-* channel id.
-*/
-async function resolveChannelId(client, workspaceId, channel) {
-	if (channel.startsWith("chn_")) return channel;
-	const found = (await client.channels(workspaceId)).find((candidate) => candidate.id === channel || candidate.name === channel);
-	if (!found) throw new Error(`ClickClack channel not found: ${channel}`);
-	return found.id;
-}
+} });
 //#endregion
 //#region extensions/clickclack/src/setup-contract.ts
 const CLICKCLACK_SETUP_CODE_CLAIM_PATH = "/api/bot-setup-codes/claim";
@@ -735,6 +399,7 @@ function parseClickClackSetupCodeInput(params) {
 	if (!rawCode) throw new Error("ClickClack --code must not be empty.");
 	let code = rawCode;
 	let baseUrl;
+	let exactClaimUrl;
 	if (/^[a-z][a-z\d+.-]*:\/\//iu.test(rawCode)) {
 		let setupUrl;
 		try {
@@ -748,7 +413,6 @@ function parseClickClackSetupCodeInput(params) {
 		code = setupUrl.hash.slice(1);
 		if (!code) throw new Error("ClickClack setup URL is missing its #CODE fragment.");
 		setupUrl.hash = "";
-		let exactClaimUrl;
 		if (setupUrl.pathname.endsWith("/api/bot-setup-codes/claim")) {
 			const exactEndpoint = requireClickClackSetupClaimUrl(setupUrl.toString());
 			baseUrl = exactEndpoint.apiBaseUrl;
@@ -757,22 +421,17 @@ function parseClickClackSetupCodeInput(params) {
 		if (params.baseUrl) {
 			if (requireClickClackSetupCodeBaseUrl(params.baseUrl) !== baseUrl) throw new Error("ClickClack --base-url does not match the server in the setup-code URL.");
 		}
-		const normalizedCode = normalizeClickClackSetupCode(code);
-		if (!normalizedCode) throw new Error("ClickClack setup code must contain 12 valid base32 characters.");
-		return {
-			code: normalizedCode,
-			baseUrl,
-			...exactClaimUrl ? { exactClaimUrl } : {}
-		};
+	} else {
+		code = code.startsWith("#") ? code.slice(1) : code;
+		if (!params.baseUrl) throw new Error("A bare ClickClack setup code requires --base-url.");
+		baseUrl = requireClickClackSetupCodeBaseUrl(params.baseUrl);
 	}
-	code = code.startsWith("#") ? code.slice(1) : code;
-	if (!params.baseUrl) throw new Error("A bare ClickClack setup code requires --base-url.");
-	baseUrl = requireClickClackSetupCodeBaseUrl(params.baseUrl);
 	const normalizedCode = normalizeClickClackSetupCode(code);
 	if (!normalizedCode) throw new Error("ClickClack setup code must contain 12 valid base32 characters.");
 	return {
 		code: normalizedCode,
-		baseUrl
+		baseUrl,
+		...exactClaimUrl ? { exactClaimUrl } : {}
 	};
 }
 function formatClickClackSetupCodeClaimError(error) {
@@ -819,7 +478,7 @@ const clickClackSetupAdapter = {
 		const setupInput = input;
 		if (!setupInput.code?.trim()) return setupInput;
 		if (setupInput.token?.trim() || setupInput.tokenFile?.trim() || setupInput.useEnv) throw new Error(SETUP_CODE_CONFLICT_ERROR);
-		let setup = parseClickClackSetupCodeInput({
+		const setup = parseClickClackSetupCodeInput({
 			code: setupInput.code,
 			baseUrl: setupInput.baseUrl
 		});
@@ -827,7 +486,7 @@ const clickClackSetupAdapter = {
 		const claimUrl = setup.exactClaimUrl && !privateApiBaseUrl ? setup.exactClaimUrl : buildClickClackSetupClaimUrl(privateApiBaseUrl ?? setup.baseUrl);
 		let claim;
 		try {
-			const { claimClickClackSetupCode } = await import("./setup-claim-t5SbtvZy.mjs");
+			const { claimClickClackSetupCode } = await import("./setup-claim-Cx8knvXs.mjs");
 			claim = await claimClickClackSetupCode({
 				claimUrl,
 				code: setup.code,
@@ -836,14 +495,10 @@ const clickClackSetupAdapter = {
 		} catch (error) {
 			throw formatClickClackSetupCodeClaimError(error);
 		}
-		setup = {
-			...setup,
-			baseUrl: claim.api_base_url ?? setup.baseUrl
-		};
 		const { code: _code, tokenFile: _tokenFile, useEnv: _useEnv, ...remainingInput } = setupInput;
 		return {
 			...remainingInput,
-			baseUrl: setup.baseUrl,
+			baseUrl: claim.api_base_url ?? setup.baseUrl,
 			token: claim.token,
 			workspace: claim.workspace.id,
 			...claim.defaults.defaultTo !== void 0 ? { defaultTo: claim.defaults.defaultTo } : {},
@@ -913,7 +568,7 @@ const clickClackSetupAdapter = {
 		});
 	},
 	afterAccountConfigWritten: async ({ cfg, accountId, runtime }) => {
-		const { verifyClickClackAccountAfterSetup } = await Promise.resolve().then(() => setup_verify_exports);
+		const { verifyClickClackAccountAfterSetup } = await import("./setup-verify-Msgd70_M.mjs");
 		await verifyClickClackAccountAfterSetup({
 			cfg,
 			accountId,
@@ -994,115 +649,6 @@ const clickClackSetupContract = defineChannelSetupContract({
 	legacyAdapter: clickClackSetupAdapter
 });
 //#endregion
-//#region extensions/clickclack/src/setup-verify.ts
-var setup_verify_exports = /* @__PURE__ */ __exportAll({
-	checkClickClackSetupConnection: () => checkClickClackSetupConnection,
-	verifyClickClackAccountAfterSetup: () => verifyClickClackAccountAfterSetup
-});
-const GATEWAY_RUNNING_MESSAGE = "OpenClaw is running — ClickClack will connect automatically.";
-const GATEWAY_NOT_RUNNING_MESSAGE = "Start OpenClaw to connect: openclaw gateway";
-const GATEWAY_UNKNOWN_MESSAGE = "If OpenClaw is running it connects automatically; otherwise start it with: openclaw gateway";
-function isHttpStatus(error, status) {
-	return typeof error === "object" && error !== null && "status" in error && error.status === status;
-}
-function isWorkspaceNotFound(error) {
-	return error instanceof Error && error.message.startsWith("ClickClack workspace not found:");
-}
-function usesUnavailableImplicitEnvToken(account, tokenOverride) {
-	return account.accountId === DEFAULT_ACCOUNT_ID && Boolean(account.baseUrl && account.workspace) && !tokenOverride && !account.token && !hasConfiguredSecretInput(account.config.token) && !account.config.tokenFile?.trim();
-}
-async function checkClickClackSetupConnection(params) {
-	let workspaceInput = "";
-	try {
-		const account = resolveClickClackAccount({
-			cfg: params.cfg,
-			accountId: params.accountId
-		});
-		workspaceInput = account.workspace;
-		const token = params.token?.trim() || account.token;
-		if (usesUnavailableImplicitEnvToken(account, token)) return { status: "skipped-env-token" };
-		if (!account.baseUrl || !account.workspace || !token) return { status: "skipped-unconfigured" };
-		const client = createClickClackClient({
-			baseUrl: account.apiEndpoint,
-			token
-		});
-		const me = await client.me();
-		const workspaceId = await resolveWorkspaceId(client, account.workspace);
-		const workspace = (await client.workspaces()).find((candidate) => candidate.id === workspaceId);
-		if (!workspace) throw new Error(`ClickClack workspace not found: ${account.workspace}`);
-		return {
-			status: "connected",
-			handle: me.handle,
-			workspaceName: workspace.name
-		};
-	} catch (error) {
-		if (isHttpStatus(error, 401)) return { status: "invalid-token" };
-		if (isWorkspaceNotFound(error)) return {
-			status: "workspace-not-found",
-			workspace: workspaceInput
-		};
-		return {
-			status: "failed",
-			error: formatErrorMessage(error)
-		};
-	}
-}
-function isGatewayNotRunningError(error) {
-	if (typeof error === "object" && error !== null && "name" in error && "kind" in error && "code" in error && error.name === "GatewayTransportError" && error.kind === "closed" && error.code === 1006) return true;
-	const message = formatErrorMessage(error).toLowerCase();
-	return message.includes("econnrefused") || message.includes("connection refused");
-}
-async function probeClickClackGatewayStatus() {
-	try {
-		const { callGatewayFromCli } = await import("openclaw/plugin-sdk/gateway-runtime");
-		await callGatewayFromCli("health", {
-			timeout: "1000",
-			json: true
-		}, void 0, {
-			expectFinal: false,
-			progress: false
-		});
-		return "running";
-	} catch (error) {
-		return isGatewayNotRunningError(error) ? "not-running" : "unavailable";
-	}
-}
-function formatClickClackConnectionLog(result) {
-	switch (result.status) {
-		case "connected": return `Connected as @${result.handle} — workspace ${result.workspaceName} resolved.`;
-		case "invalid-token": return "ClickClack rejected the bot token (401). Copy a current token and rerun setup.";
-		case "workspace-not-found": return `Workspace "${result.workspace}" was not found. Check the id, slug, or name, list available workspaces, and rerun setup.`;
-		case "failed": return `Connection check failed: ${result.error}. Setup was saved; fix the connection and rerun setup.`;
-		case "skipped-env-token": return "Token comes from CLICKCLACK_BOT_TOKEN; verification skipped.";
-		case "skipped-unconfigured": return;
-	}
-}
-function formatClickClackGatewayLog(status) {
-	switch (status) {
-		case "running": return GATEWAY_RUNNING_MESSAGE;
-		case "not-running": return GATEWAY_NOT_RUNNING_MESSAGE;
-		case "unavailable": return GATEWAY_UNKNOWN_MESSAGE;
-	}
-	return GATEWAY_UNKNOWN_MESSAGE;
-}
-async function verifyClickClackAccountAfterSetup(params) {
-	try {
-		const message = formatClickClackConnectionLog(await checkClickClackSetupConnection({
-			cfg: params.cfg,
-			accountId: params.accountId
-		}));
-		if (message) params.runtime.log(message);
-	} catch (error) {
-		params.runtime.log(`Connection check failed: ${formatErrorMessage(error)}. Setup was saved; fix the connection and rerun setup.`);
-	}
-	try {
-		const status = await probeClickClackGatewayStatus();
-		params.runtime.log(formatClickClackGatewayLog(status));
-	} catch {
-		params.runtime.log(GATEWAY_UNKNOWN_MESSAGE);
-	}
-}
-//#endregion
 //#region extensions/clickclack/src/setup-surface.ts
 const t = createSetupTranslator();
 const channel = "clickclack";
@@ -1204,6 +750,7 @@ const clickClackSetupWizard = {
 		})
 	}],
 	finalize: async ({ cfg, accountId, credentialValues, prompter }) => {
+		const { checkClickClackSetupConnection } = await import("./setup-verify-Msgd70_M.mjs");
 		const result = await checkClickClackSetupConnection({
 			cfg,
 			accountId,
@@ -1223,4 +770,4 @@ const clickClackSetupWizard = {
 	disable: (cfg) => setSetupChannelEnabled(cfg, channel, false)
 };
 //#endregion
-export { DEFAULT_ACCOUNT_ID$2 as _, isClickClackSetupLoopbackHost as a, resolveClickClackAccount as b, resolveWorkspaceId as c, isClickClackChannelNameConflict as d, normalizeClickClackCorrelationId as f, clickClackMeta as g, clickClackConfigAdapter as h, buildClickClackSetupClaimUrl as i, ClickClackHttpError as l, CLICKCLACK_CHANNEL_ID as m, clickClackSetupContract as n, requireClickClackSetupApiBaseUrl as o, clickClackConfigSchema as p, CLICKCLACK_SETUP_CODE_CLAIM_PATH as r, resolveChannelId as s, clickClackSetupWizard as t, createClickClackClient as u, listClickClackAccountIds as v, resolveDefaultClickClackAccountId as x, listEnabledClickClackAccounts as y };
+export { resolveDefaultClickClackAccountId as _, isClickClackSetupLoopbackHost as a, CLICKCLACK_CHANNEL_ID as c, DEFAULT_ACCOUNT_ID$2 as d, isClickClackAccountCurrent as f, resolveClickClackAccountConfig as g, resolveClickClackAccount as h, buildClickClackSetupClaimUrl as i, clickClackConfigAdapter as l, listEnabledClickClackAccounts as m, clickClackSetupContract as n, requireClickClackSetupApiBaseUrl as o, listClickClackAccountIds as p, CLICKCLACK_SETUP_CODE_CLAIM_PATH as r, clickClackConfigSchema as s, clickClackSetupWizard as t, clickClackMeta as u };