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

package/dist/{setup-surface-Baf26N-D.js → setup-surface-DAy8vDJK.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, 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
@@ -39,36 +38,48 @@ 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());
 	}
 });
+function mergeClickClackGroups(...sources) {
+	const merged = /* @__PURE__ */ new Map();
+	for (const source of sources) for (const [rawKey, value] of Object.entries(source ?? {})) {
+		const key = rawKey.trim();
+		if (!key) continue;
+		merged.set(key, {
+			...merged.get(key),
+			...value.requireMention !== void 0 ? { requireMention: value.requireMention } : {},
+			...value.mentionPatterns !== void 0 ? { mentionPatterns: value.mentionPatterns } : {}
+		});
+	}
+	return Object.fromEntries(merged);
+}
 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 mergedWithGroups = channel?.groups || account?.groups ? {
+		...merged,
+		groups: mergeClickClackGroups(channel?.groups, account?.groups)
+	} : merged;
 	const accountTokenFile = account?.tokenFile?.trim();
 	if (accountTokenFile) return {
-		...merged,
+		...mergedWithGroups,
 		token: account?.token,
 		tokenFile: accountTokenFile
 	};
 	if (hasConfiguredAccountValue(account?.token)) return {
-		...merged,
+		...mergedWithGroups,
 		token: account?.token,
 		tokenFile: void 0
 	};
-	return merged;
+	return mergedWithGroups;
 }
 function resolveClickClackToken(params) {
 	const tokenFile = params.tokenFile?.trim();
@@ -144,6 +155,9 @@ function resolveClickClackAccount(params) {
 			...controlUrlBase ? { controlUrlBase } : {},
 			section: merged.discussions?.section?.trim() || DEFAULT_DISCUSSIONS_SECTION
 		},
+		requireMention: merged.requireMention === true,
+		mentionPatterns: merged.mentionPatterns ?? [],
+		groups: mergeClickClackGroups(merged.groups),
 		config: {
 			...merged,
 			allowFrom: merged.allowFrom ?? ["*"]
@@ -206,6 +220,12 @@ const ClickClackAccountConfigSchema = z.object({
 	reconnectMs: z.number().int().min(100).max(6e4).optional(),
 	agentActivity: z.boolean().optional(),
 	commandMenu: z.boolean().optional(),
+	requireMention: z.boolean().optional(),
+	mentionPatterns: z.array(z.string()).optional(),
+	groups: z.record(z.string(), z.object({
+		requireMention: z.boolean().optional(),
+		mentionPatterns: z.array(z.string()).optional()
+	}).strict()).optional(),
 	discussions: z.object({
 		enabled: z.boolean().optional(),
 		workspace: z.string().optional(),
@@ -672,69 +692,31 @@ function formatClickClackSetupCodeClaimError(error) {
 }
 function applyClickClackSetupConfigPatch(params) {
 	const accountId = normalizeAccountId(params.accountId);
-	const namedConfig = applyAccountNameToChannelSection({
-		cfg: accountId === DEFAULT_ACCOUNT_ID ? params.cfg : moveSingleAccountChannelSectionToDefaultAccount({
-			cfg: params.cfg,
+	return patchScopedAccountConfig({
+		cfg: prepareScopedSetupConfig({
+			cfg: accountId === DEFAULT_ACCOUNT_ID ? params.cfg : moveSingleAccountChannelSectionToDefaultAccount({
+				cfg: params.cfg,
+				channelKey: channel$1,
+				setupSurface: clickClackSetupAdapter
+			}),
 			channelKey: channel$1,
-			setupSurface: clickClackSetupAdapter
+			accountId,
+			name: params.name,
+			migrateBaseName: accountId !== DEFAULT_ACCOUNT_ID
 		}),
 		channelKey: channel$1,
 		accountId,
-		name: params.name
-	});
-	return applySetupAccountConfigPatch({
-		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 +733,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-CP-QZ5bt.js");
 			claim = await claimClickClackSetupCode({
 				claimUrl,
 				code: setup.code,

package/openclaw.plugin.json

@@ -6,16 +6,6 @@
   "channels": [
     "clickclack"
   ],
-  "contracts": {
-    "tools": [
-      "discussion"
-    ]
-  },
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {}
-  },
   "channelConfigs": {
     "clickclack": {
       "schema": {
@@ -165,6 +155,36 @@
           "commandMenu": {
             "type": "boolean"
           },
+          "requireMention": {
+            "type": "boolean"
+          },
+          "mentionPatterns": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "groups": {
+            "type": "object",
+            "propertyNames": {
+              "type": "string"
+            },
+            "additionalProperties": {
+              "type": "object",
+              "properties": {
+                "requireMention": {
+                  "type": "boolean"
+                },
+                "mentionPatterns": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          },
           "discussions": {
             "type": "object",
             "properties": {
@@ -335,6 +355,36 @@
                 "commandMenu": {
                   "type": "boolean"
                 },
+                "requireMention": {
+                  "type": "boolean"
+                },
+                "mentionPatterns": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "groups": {
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {
+                    "type": "object",
+                    "properties": {
+                      "requireMention": {
+                        "type": "boolean"
+                      },
+                      "mentionPatterns": {
+                        "type": "array",
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    },
+                    "additionalProperties": false
+                  }
+                },
                 "discussions": {
                   "type": "object",
                   "properties": {
@@ -365,7 +415,17 @@
         "additionalProperties": false
       },
       "label": "ClickClack",
-      "description": "self-hosted chat via first-class ClickClack bot tokens."
+      "description": "ClickClack channel accounts and group activation policy."
     }
+  },
+  "contracts": {
+    "tools": [
+      "discussion"
+    ]
+  },
+  "configSchema": {
+    "type": "object",
+    "additionalProperties": false,
+    "properties": {}
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/clickclack",
-  "version": "2026.7.2-beta.4",
+  "version": "2026.7.2-beta.7",
   "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.7"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -136,10 +136,10 @@
       "allowInvalidConfigRecovery": true
     },
     "compat": {
-      "pluginApi": ">=2026.7.2-beta.4"
+      "pluginApi": ">=2026.7.2-beta.7"
     },
     "build": {
-      "openclawVersion": "2026.7.2-beta.4",
+      "openclawVersion": "2026.7.2-beta.7",
       "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"
-      }
-    }
-  }
-}