@openclaw/irc 2026.7.2-beta.5 → 2026.7.33

package/dist/{channel-BZclM5wY.js → .setup/channel-SaGThQQW.mjs}

@@ -1,30 +1,29 @@
-import { t as IrcChannelConfigSchema } from "./config-schema-BPoye3--.js";
-import { t as getIrcRuntime } from "./runtime-xy-FcjJC.js";
-import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-D_DC3YWj.js";
+import { t as IrcChannelConfigSchema } from "./config-schema-BQXbFpTD.mjs";
+import { t as getIrcRuntime } from "./runtime-DZfYm3vY.mjs";
+import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-DdKIs_mx.mjs";
 import { createAccountListHelpers, describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
 import { formatNormalizedAllowFromEntries } from "openclaw/plugin-sdk/allow-from";
 import { adaptScopedAccountAccessor, createScopedChannelConfigAdapter, createScopedDmSecurityResolver } from "openclaw/plugin-sdk/channel-config-helpers";
-import { buildChannelOutboundSessionRoute, createChatChannelPlugin, parseOptionalDelimitedEntries } from "openclaw/plugin-sdk/channel-core";
-import { buildMutableAllowEntryDetector, collectStandardAllowlistLists, composeAccountWarningCollectors, createAllowlistProviderOpenWarningCollector, createDangerousNameMatchingMutableAllowlistWarningCollector, resolveScopeKeyCaseInsensitive, resolveScopeRequireMention, resolveScopeToolsPolicy } from "openclaw/plugin-sdk/channel-policy";
+import { buildChannelOutboundSessionRoute, createChatChannelPlugin, parseOptionalDelimitedEntries, tryReadSecretFileSync } from "openclaw/plugin-sdk/channel-core";
+import { composeAccountWarningCollectors, createAllowlistProviderOpenWarningCollector, createDangerousNameMatchingMutableAllowlistWarningCollector } from "openclaw/plugin-sdk/channel-policy";
 import { createChannelDirectoryAdapter, createResolvedDirectoryEntriesLister } from "openclaw/plugin-sdk/directory-runtime";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { buildBaseChannelStatusSummary, createComputedAccountStatusAdapter, createDefaultChannelRuntimeState } from "openclaw/plugin-sdk/status-helpers";
-import { resolveAccountWithDefaultFallback } from "openclaw/plugin-sdk/account-core";
 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 { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
-import { tryReadSecretFileSync } from "openclaw/plugin-sdk/secret-file-runtime";
 import { normalizeResolvedSecretInputString } from "openclaw/plugin-sdk/secret-input";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, normalizeOptionalString, normalizeStringEntries, normalizeStringifiedOptionalString, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { createAccountStatusSink, createMessageReceiptFromOutboundResults, defineChannelMessageAdapter, runPassiveAccountLifecycle, sanitizeForPlainText } from "openclaw/plugin-sdk/channel-outbound";
+import { createAccountStatusSink, createMessageReceiptFromOutboundResults, defineChannelMessageAdapter, sanitizeForPlainText } from "openclaw/plugin-sdk/channel-outbound";
 import { PAIRING_APPROVED_MESSAGE } from "openclaw/plugin-sdk/channel-status";
 import { chunkTextForOutbound, convertMarkdownTables, sanitizeAssistantVisibleText } from "openclaw/plugin-sdk/text-chunking";
+import { runStoppablePassiveMonitor } from "openclaw/plugin-sdk/extension-shared";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import net from "node:net";
 import tls from "node:tls";
 import { withTimeout } from "openclaw/plugin-sdk/security-runtime";
 import { randomUUID } from "node:crypto";
-import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, normalizeAccountId as normalizeAccountId$1 } from "openclaw/plugin-sdk/routing";
 import { applyAccountNameToChannelSection, createAllowFromSection, createPromptParsedAllowFromForAccount, createSetupInputPresenceValidator, createSetupTranslator, createStandardChannelSetupStatus, createTopLevelChannelAllowFromSetter, createTopLevelChannelDmPolicySetter, formatDocsLink, patchScopedAccountConfig, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup";
 //#region extensions/irc/src/accounts.ts
@@ -44,12 +43,20 @@ function parseIntEnv(value) {
 	if (parsed === void 0 || parsed > 65535) return;
 	return parsed;
 }
-const { listAccountIds: listIrcAccountIds, resolveDefaultAccountId: resolveDefaultIrcAccountId, resolveAccountConfig: mergeIrcAccountConfig } = createAccountListHelpers("irc", {
+const { listAccountIds: listIrcAccountIds, resolveDefaultAccountId: resolveDefaultIrcAccountId } = createAccountListHelpers("irc", {
 	normalizeAccountId,
-	omitKeys: ["defaultAccount"],
-	nestedObjectKeys: ["nickserv"],
 	hasImplicitDefaultAccount: (cfg) => Boolean((cfg.channels?.irc?.host?.trim() || process.env.IRC_HOST?.trim()) && (cfg.channels?.irc?.nick?.trim() || process.env.IRC_NICK?.trim()))
 });
+function mergeIrcAccountConfig(cfg, accountId) {
+	return resolveMergedAccountConfig({
+		channelConfig: cfg.channels?.irc,
+		accounts: cfg.channels?.irc?.accounts,
+		accountId,
+		omitKeys: ["defaultAccount"],
+		normalizeAccountId,
+		nestedObjectKeys: ["nickserv"]
+	});
+}
 function resolvePassword(accountId, merged) {
 	if (accountId === DEFAULT_ACCOUNT_ID) {
 		const envPassword = process.env.IRC_PASSWORD?.trim();
@@ -59,25 +66,11 @@ function resolvePassword(accountId, merged) {
 		};
 	}
 	if (merged.passwordFile?.trim()) {
-		let diagnostic;
-		const filePassword = tryReadSecretFileSync(merged.passwordFile, "IRC password file", {
-			rejectSymlink: true,
-			credentialDiagnostic: {
-				configPath: `channels.irc.accounts.${accountId}.passwordFile`,
-				report: (value) => {
-					diagnostic = value;
-				}
-			}
-		});
+		const filePassword = tryReadSecretFileSync(merged.passwordFile, "IRC password file", { rejectSymlink: true });
 		if (filePassword) return {
 			password: filePassword,
 			source: "passwordFile"
 		};
-		return {
-			password: "",
-			source: "passwordFile",
-			diagnostic
-		};
 	}
 	const configPassword = normalizeResolvedSecretInputString({
 		value: merged.password,
@@ -101,28 +94,17 @@ function resolveNickServConfig(accountId, nickserv) {
 		value: base.password,
 		path: `channels.irc.accounts.${accountId}.nickserv.password`
 	}) || envPassword || "";
-	let diagnostic;
-	if (!resolvedPassword && passwordFile) resolvedPassword = tryReadSecretFileSync(passwordFile, "IRC NickServ password file", {
-		rejectSymlink: true,
-		credentialDiagnostic: {
-			configPath: `channels.irc.accounts.${accountId}.nickserv.passwordFile`,
-			report: (value) => {
-				diagnostic = value;
-			}
-		}
-	}) ?? "";
+	if (!resolvedPassword && passwordFile) resolvedPassword = tryReadSecretFileSync(passwordFile, "IRC NickServ password file", { rejectSymlink: true }) ?? "";
 	return {
-		config: {
-			...base,
-			service: normalizeOptionalString(base.service),
-			passwordFile: passwordFile || void 0,
-			password: resolvedPassword || void 0,
-			registerEmail: base.registerEmail?.trim() || envRegisterEmail || void 0
-		},
-		diagnostic
+		...base,
+		service: normalizeOptionalString(base.service),
+		passwordFile: passwordFile || void 0,
+		password: resolvedPassword || void 0,
+		registerEmail: base.registerEmail?.trim() || envRegisterEmail || void 0
 	};
 }
 function resolveIrcAccount(params) {
+	const hasExplicitAccountId = Boolean(params.accountId?.trim());
 	const baseEnabled = params.cfg.channels?.irc?.enabled !== false;
 	const resolve = (accountId) => {
 		const merged = mergeIrcAccountConfig(params.cfg, accountId);
@@ -137,8 +119,7 @@ function resolveIrcAccount(params) {
 		const username = (merged.username?.trim() || (accountId === DEFAULT_ACCOUNT_ID ? process.env.IRC_USERNAME?.trim() : "") || nick || "openclaw").trim();
 		const realname = (merged.realname?.trim() || (accountId === DEFAULT_ACCOUNT_ID ? process.env.IRC_REALNAME?.trim() : "") || "OpenClaw").trim();
 		const passwordResolution = resolvePassword(accountId, merged);
-		const nickservResolution = resolveNickServConfig(accountId, merged.nickserv);
-		const diagnostics = [passwordResolution.diagnostic, nickservResolution.diagnostic].filter((diagnostic) => Boolean(diagnostic));
+		const nickserv = resolveNickServConfig(accountId, merged.nickserv);
 		const config = {
 			...merged,
 			channels: merged.channels ?? envChannels,
@@ -148,7 +129,7 @@ function resolveIrcAccount(params) {
 			nick,
 			username,
 			realname,
-			nickserv: nickservResolution.config
+			nickserv
 		};
 		return {
 			accountId,
@@ -163,18 +144,17 @@ function resolveIrcAccount(params) {
 			realname,
 			password: passwordResolution.password,
 			passwordSource: passwordResolution.source,
-			tokenStatus: diagnostics.length > 0 ? "configured_unavailable" : passwordResolution.password || nickservResolution.config.password ? "available" : "missing",
-			...diagnostics.length > 0 ? { credentialDiagnostics: diagnostics } : {},
 			config
 		};
 	};
-	return resolveAccountWithDefaultFallback({
-		accountId: params.accountId,
-		normalizeAccountId,
-		resolvePrimary: resolve,
-		hasCredential: (account) => account.configured,
-		resolveDefaultAccountId: () => resolveDefaultIrcAccountId(params.cfg)
-	});
+	const primary = resolve(normalizeAccountId(params.accountId));
+	if (hasExplicitAccountId) return primary;
+	if (primary.configured) return primary;
+	const fallbackId = resolveDefaultIrcAccountId(params.cfg);
+	if (fallbackId === primary.accountId) return primary;
+	const fallback = resolve(fallbackId);
+	if (!fallback.configured) return primary;
+	return fallback;
 }
 function listEnabledIrcAccounts(cfg) {
 	return listIrcAccountIds(cfg).map((accountId) => resolveIrcAccount({
@@ -182,17 +162,42 @@ function listEnabledIrcAccounts(cfg) {
 		accountId
 	})).filter((account) => account.enabled);
 }
+//#endregion
+//#region extensions/irc/src/doctor.ts
+function asObjectRecord(value) {
+	return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function isIrcMutableAllowEntry(raw) {
+	const text = normalizeLowercaseStringOrEmpty(raw);
+	if (!text || text === "*") return false;
+	return !text.replace(/^irc:/, "").replace(/^user:/, "").trim().includes("@");
+}
 const collectIrcMutableAllowlistWarnings = createDangerousNameMatchingMutableAllowlistWarningCollector({
 	channel: "irc",
-	detector: buildMutableAllowEntryDetector({ stableIdPattern: /^(?:(?:irc|user):)*[^@]*@/i }),
-	collectLists: (scope) => collectStandardAllowlistLists(scope, {
-		includeGroups: true,
-		groupField: "allowFrom"
-	})
+	detector: isIrcMutableAllowEntry,
+	collectLists: (scope) => {
+		const lists = [{
+			pathLabel: `${scope.prefix}.allowFrom`,
+			list: scope.account.allowFrom
+		}, {
+			pathLabel: `${scope.prefix}.groupAllowFrom`,
+			list: scope.account.groupAllowFrom
+		}];
+		const groups = asObjectRecord(scope.account.groups);
+		if (groups) for (const [groupKey, groupRaw] of Object.entries(groups)) {
+			const group = asObjectRecord(groupRaw);
+			if (!group) continue;
+			lists.push({
+				pathLabel: `${scope.prefix}.groups.${groupKey}.allowFrom`,
+				list: group.allowFrom
+			});
+		}
+		return lists;
+	}
 });
 //#endregion
 //#region extensions/irc/src/gateway.ts
-const loadIrcChannelRuntime$1 = createLazyRuntimeModule(() => import("./channel-runtime-CRzAwKGK.js"));
+const loadIrcChannelRuntime$1 = createLazyRuntimeModule(() => import("./channel-runtime-DBtfWzX8.mjs"));
 async function startIrcGatewayAccount(ctx) {
 	const account = ctx.account;
 	const statusSink = createAccountStatusSink({
@@ -202,7 +207,7 @@ async function startIrcGatewayAccount(ctx) {
 	if (!account.configured) throw new Error(`IRC is not configured for account "${account.accountId}" (need host and nick in channels.irc).`);
 	ctx.log?.info?.(`[${account.accountId}] starting IRC provider (${account.host}:${account.port}${account.tls ? " tls" : ""})`);
 	const { monitorIrcProvider } = await loadIrcChannelRuntime$1();
-	await runPassiveAccountLifecycle({
+	await runStoppablePassiveMonitor({
 		abortSignal: ctx.abortSignal,
 		start: async () => await monitorIrcProvider({
 			accountId: account.accountId,
@@ -210,10 +215,7 @@ async function startIrcGatewayAccount(ctx) {
 			runtime: ctx.runtime,
 			abortSignal: ctx.abortSignal,
 			statusSink
-		}),
-		stop: async (monitor) => {
-			await monitor.stop();
-		}
+		})
 	});
 }
 //#endregion
@@ -547,7 +549,7 @@ async function connectIrcClient(options) {
 			if (line.command === "PRIVMSG") {
 				const targetParam = line.params[0];
 				const target = targetParam ? targetParam.trim() : "";
-				const text = line.trailing ?? line.params[1] ?? "";
+				const text = line.trailing != null ? line.trailing : "";
 				const prefix = parseIrcPrefix(line.prefix);
 				const senderNick = prefix.nick ? prefix.nick.trim() : "";
 				if (!target || !senderNick || !text.trim()) continue;
@@ -555,7 +557,6 @@ async function connectIrcClient(options) {
 					senderNick,
 					senderUser: prefix.user ? prefix.user.trim() : void 0,
 					senderHost: prefix.host ? prefix.host.trim() : void 0,
-					connectedNick: currentNick,
 					target,
 					text,
 					rawLine
@@ -795,47 +796,42 @@ const ircOutboundBaseAdapter = {
 };
 //#endregion
 //#region extensions/irc/src/policy.ts
-function resolveIrcGroupScope(params) {
-	const { "*": wildcard, ...groups } = params.groups ?? {};
-	const project = (entry) => ({
-		requireMention: entry.requireMention,
-		tools: entry.tools
-	});
-	const tree = {
-		defaults: wildcard ? project(wildcard) : void 0,
-		scopes: Object.fromEntries(Object.entries(groups).map(([key, entry]) => [key, project(entry)]))
+function resolveIrcGroupMatch(params) {
+	const groups = params.groups ?? {};
+	const hasConfiguredGroups = Object.keys(groups).length > 0;
+	const direct = groups[params.target];
+	if (direct) return {
+		allowed: true,
+		groupConfig: direct,
+		wildcardConfig: groups["*"],
+		hasConfiguredGroups
 	};
-	const key = resolveScopeKeyCaseInsensitive(tree, params.target);
-	return {
-		tree,
-		path: key ? [key] : []
+	const targetLower = normalizeLowercaseStringOrEmpty(params.target);
+	const directKey = Object.keys(groups).find((key) => normalizeLowercaseStringOrEmpty(key) === targetLower);
+	if (directKey) {
+		const matched = groups[directKey];
+		if (matched) return {
+			allowed: true,
+			groupConfig: matched,
+			wildcardConfig: groups["*"],
+			hasConfiguredGroups
+		};
+	}
+	const wildcard = groups["*"];
+	if (wildcard) return {
+		allowed: true,
+		wildcardConfig: wildcard,
+		hasConfiguredGroups
 	};
-}
-function resolveIrcGroupMatch(params) {
-	const { path } = resolveIrcGroupScope(params);
-	const key = path[0];
-	const groupConfig = key ? params.groups?.[key] : void 0;
-	const wildcardConfig = params.groups?.["*"];
 	return {
-		allowed: Boolean(groupConfig ?? wildcardConfig),
-		groupConfig,
-		wildcardConfig,
-		hasConfiguredGroups: Object.keys(params.groups ?? {}).length > 0
+		allowed: false,
+		hasConfiguredGroups
 	};
 }
-function resolveIrcGroupRequireMention(params) {
-	const { tree, path } = resolveIrcGroupScope(params);
-	return resolveScopeRequireMention({
-		tree,
-		path
-	});
-}
-function resolveIrcGroupToolPolicy(params) {
-	const { tree, path } = resolveIrcGroupScope(params);
-	return resolveScopeToolsPolicy({
-		tree,
-		path
-	});
+function resolveIrcRequireMention(params) {
+	if (params.groupConfig?.requireMention !== void 0) return params.groupConfig.requireMention;
+	if (params.wildcardConfig?.requireMention !== void 0) return params.wildcardConfig.requireMention;
+	return true;
 }
 //#endregion
 //#region extensions/irc/src/probe.ts
@@ -933,7 +929,6 @@ function setIrcGroupAccess(cfg, accountId, policy, entries, normalizeGroupEntry)
 	});
 }
 const ircSetupAdapter = {
-	singleAccountKeysToMove: ["password"],
 	resolveAccountId: ({ accountId }) => normalizeAccountId$1(accountId),
 	applyAccountName: ({ cfg, accountId, name }) => applyAccountNameToChannelSection({
 		cfg,
@@ -970,75 +965,6 @@ const ircSetupAdapter = {
 		});
 	}
 };
-const ircSetupContract = defineChannelSetupContract({
-	fields: {
-		host: {
-			kind: "string",
-			cli: {
-				flags: "--host <host>",
-				description: "IRC server host"
-			}
-		},
-		port: {
-			kind: "string",
-			cli: {
-				flags: "--port <port>",
-				description: "IRC server port"
-			}
-		},
-		tls: {
-			kind: "boolean",
-			cli: {
-				flags: "--tls",
-				description: "Use TLS for IRC"
-			}
-		},
-		nick: {
-			kind: "string",
-			cli: {
-				flags: "--nick <nick>",
-				description: "IRC nickname"
-			}
-		},
-		username: {
-			kind: "string",
-			cli: {
-				flags: "--username <name>",
-				description: "IRC username"
-			}
-		},
-		realname: {
-			kind: "string",
-			cli: {
-				flags: "--realname <name>",
-				description: "IRC real name"
-			}
-		},
-		channels: {
-			kind: "string-list",
-			cli: {
-				flags: "--channels <names>",
-				description: "IRC channels"
-			}
-		},
-		password: {
-			kind: "string",
-			sensitive: true,
-			cli: {
-				flags: "--password <password>",
-				description: "IRC server password"
-			}
-		},
-		useEnv: {
-			kind: "boolean",
-			cli: {
-				flags: "--use-env",
-				description: "Use IRC environment configuration"
-			}
-		}
-	},
-	legacyAdapter: ircSetupAdapter
-});
 //#endregion
 //#region extensions/irc/src/setup-surface.ts
 const t = createSetupTranslator();
@@ -1232,7 +1158,8 @@ const ircSetupWizard = {
 				return String(defaultPort);
 			},
 			validate: ({ value }) => {
-				const parsed = parseStrictPositiveInteger(normalizeStringifiedOptionalString(value) ?? "");
+				const raw = normalizeStringifiedOptionalString(value) ?? "";
+				const parsed = parseStrictPositiveInteger(raw);
 				return parsed !== void 0 && parsed <= 65535 ? void 0 : "Use a port between 1 and 65535";
 			},
 			normalizeValue: ({ value }) => String(parsePort(value, 6697)),
@@ -1404,7 +1331,7 @@ const meta = {
 	systemImage: "number",
 	markdownCapable: true
 };
-const loadIrcChannelRuntime = createLazyRuntimeModule(() => import("./channel-runtime-CRzAwKGK.js"));
+const loadIrcChannelRuntime = createLazyRuntimeModule(() => import("./channel-runtime-DBtfWzX8.mjs"));
 function normalizePairingTarget(raw) {
 	const normalized = normalizeIrcAllowEntry(raw);
 	if (!normalized) return "";
@@ -1460,7 +1387,7 @@ const resolveIrcDmPolicy = createScopedDmSecurityResolver({
 	policyPathSuffix: "dmPolicy",
 	normalizeEntry: (raw) => normalizeIrcAllowEntry(raw)
 });
-const collectIrcSecurityWarnings = composeAccountWarningCollectors(createAllowlistProviderOpenWarningCollector({
+const collectIrcGroupPolicyWarnings = createAllowlistProviderOpenWarningCollector({
 	providerConfigPresent: (cfg) => cfg.channels?.irc !== void 0,
 	resolveGroupPolicy: (account) => account.config.groupPolicy,
 	buildOpenWarning: {
@@ -1468,7 +1395,8 @@ const collectIrcSecurityWarnings = composeAccountWarningCollectors(createAllowli
 		openBehavior: "allows all channels and senders (mention-gated)",
 		remediation: "Prefer channels.irc.groupPolicy=\"allowlist\" with channels.irc.groups"
 	}
-}), (account) => !account.config.tls && "- IRC TLS is disabled (channels.irc.tls=false); traffic and credentials are plaintext.", (account) => account.config.nickserv?.register && "- IRC NickServ registration is enabled (channels.irc.nickserv.register=true); this sends \"REGISTER\" on every connect. Disable after first successful registration.", (account) => account.config.nickserv?.register && !account.config.nickserv.password?.trim() && "- IRC NickServ registration is enabled but no NickServ password is resolved; set channels.irc.nickserv.password, channels.irc.nickserv.passwordFile, or IRC_NICKSERV_PASSWORD.");
+});
+const collectIrcSecurityWarnings = composeAccountWarningCollectors(collectIrcGroupPolicyWarnings, (account) => !account.config.tls && "- IRC TLS is disabled (channels.irc.tls=false); traffic and credentials are plaintext.", (account) => account.config.nickserv?.register && "- IRC NickServ registration is enabled (channels.irc.nickserv.register=true); this sends \"REGISTER\" on every connect. Disable after first successful registration.", (account) => account.config.nickserv?.register && !account.config.nickserv.password?.trim() && "- IRC NickServ registration is enabled but no NickServ password is resolved; set channels.irc.nickserv.password, channels.irc.nickserv.passwordFile, or IRC_NICKSERV_PASSWORD.");
 const ircPlugin = createChatChannelPlugin({
 	base: {
 		id: "irc",
@@ -1477,7 +1405,6 @@ const ircPlugin = createChatChannelPlugin({
 			quickstartAllowFrom: true
 		},
 		setup: ircSetupAdapter,
-		setupContract: ircSetupContract,
 		setupWizard: ircSetupWizard,
 		capabilities: {
 			chatTypes: ["direct", "group"],
@@ -1498,8 +1425,7 @@ const ircPlugin = createChatChannelPlugin({
 					port: account.port,
 					tls: account.tls,
 					nick: account.nick,
-					passwordSource: account.passwordSource,
-					tokenStatus: account.tokenStatus
+					passwordSource: account.passwordSource
 				}
 			})
 		},
@@ -1518,10 +1444,14 @@ const ircPlugin = createChatChannelPlugin({
 					accountId
 				});
 				if (!groupId) return true;
-				return resolveIrcGroupRequireMention({
+				const match = resolveIrcGroupMatch({
 					groups: account.config.groups,
 					target: groupId
 				});
+				return resolveIrcRequireMention({
+					groupConfig: match.groupConfig,
+					wildcardConfig: match.wildcardConfig
+				});
 			},
 			resolveToolPolicy: ({ cfg, accountId, groupId }) => {
 				const account = resolveIrcAccount({
@@ -1529,10 +1459,11 @@ const ircPlugin = createChatChannelPlugin({
 					accountId
 				});
 				if (!groupId) return;
-				return resolveIrcGroupToolPolicy({
+				const match = resolveIrcGroupMatch({
 					groups: account.config.groups,
 					target: groupId
 				});
+				return match.groupConfig?.tools ?? match.wildcardConfig?.tools;
 			}
 		},
 		messaging: {
@@ -1606,8 +1537,7 @@ const ircPlugin = createChatChannelPlugin({
 					port: account.port,
 					tls: account.tls,
 					nick: account.nick,
-					passwordSource: account.passwordSource,
-					tokenStatus: account.tokenStatus
+					passwordSource: account.passwordSource
 				}
 			})
 		}),
@@ -1635,13 +1565,24 @@ const ircPlugin = createChatChannelPlugin({
 		base: ircOutboundBaseAdapter,
 		attachedResults: {
 			channel: "irc",
-			sendText: ({ onDeliveryResult: _onDeliveryResult, ...ctx }) => ircMessageAdapter.send.text(ctx),
-			sendMedia: ({ onDeliveryResult: _onDeliveryResult, mediaUrl, ...ctx }) => ircMessageAdapter.send.media({
-				...ctx,
-				mediaUrl: mediaUrl ?? ""
-			})
+			sendText: async ({ cfg, to, text, accountId, replyToId }) => {
+				const { sendMessageIrc } = await loadIrcChannelRuntime();
+				return await sendMessageIrc(to, text, {
+					cfg,
+					accountId: accountId ?? void 0,
+					replyTo: replyToId ?? void 0
+				});
+			},
+			sendMedia: async ({ cfg, to, text, mediaUrl, accountId, replyToId }) => {
+				const { sendMessageIrc } = await loadIrcChannelRuntime();
+				return await sendMessageIrc(to, mediaUrl ? `${text}\n\nAttachment: ${mediaUrl}` : text, {
+					cfg,
+					accountId: accountId ?? void 0,
+					replyTo: replyToId ?? void 0
+				});
+			}
 		}
 	}
 });
 //#endregion
-export { resolveIrcAccount as _, resolveIrcGroupRequireMention as a, isChannelTarget as c, connectIrcClient as d, parseIrcLine as f, resolveDefaultIrcAccountId as g, listIrcAccountIds as h, resolveIrcGroupMatch as i, normalizeIrcAllowEntry as l, listEnabledIrcAccounts as m, ircSetupWizard as n, sendMessageIrc as o, parseIrcPrefix as p, ircSetupAdapter as r, buildIrcAllowlistCandidates as s, ircPlugin as t, buildIrcConnectOptions as u };
+export { resolveIrcRequireMention as a, isChannelTarget as c, connectIrcClient as d, makeIrcMessageId as f, resolveIrcAccount as g, resolveDefaultIrcAccountId as h, resolveIrcGroupMatch as i, normalizeIrcAllowEntry as l, listIrcAccountIds as m, ircSetupWizard as n, sendMessageIrc as o, listEnabledIrcAccounts as p, ircSetupAdapter as r, buildIrcAllowlistCandidates as s, ircPlugin as t, buildIrcConnectOptions as u };

package/dist/.setup/channel-plugin-api-04wlnIps.mjs

@@ -0,0 +1,3 @@
+import { t as ircPlugin } from "./channel-SaGThQQW.mjs";
+import "../channel-plugin-api.js";
+export { ircPlugin };