@openclaw/slack 2026.7.2-beta.7 → 2026.8.1-beta.2

package/dist/{policy-PRysPn23.js → policy-TapwbeaT.js}

@@ -1,5 +1,4 @@
-import { l as normalizeSlackSlug, t as buildSlackChannelPolicyScope } from "./group-policy-NQZti9t-.js";
-import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { d as resolveSlackUserAllowListForTeam, l as normalizeSlackSlug, n as buildSlackChannelPolicyScope, t as buildSlackChannelIdCandidates } from "./group-policy-c4RP9bjc.js";
 import { applyChannelMatchMeta, buildChannelKeyCandidates } from "openclaw/plugin-sdk/channel-targets";
 import { mergePairLoopGuardConfig } from "openclaw/plugin-sdk/pair-loop-guard-runtime";
 //#region extensions/slack/src/monitor/channel-config.ts
@@ -18,14 +17,9 @@ function resolveSlackChannelConfig(params) {
 	const keys = channelKeys ?? Object.keys(entries);
 	const normalizedName = channelName ? normalizeSlackSlug(channelName) : "";
 	const directName = channelName ? channelName.trim() : "";
-	const channelIdLower = normalizeLowercaseStringOrEmpty(channelId);
-	const channelIdUpper = channelId.toUpperCase();
-	const channelTarget = `channel:${channelId}`;
-	const channelTargetLower = `channel:${channelIdLower}`;
-	const channelTargetUpper = `channel:${channelIdUpper}`;
 	const match = buildSlackChannelPolicyScope({
 		channels: entries,
-		candidates: buildChannelKeyCandidates(channelId, channelIdLower !== channelId ? channelIdLower : void 0, channelIdUpper !== channelId ? channelIdUpper : void 0, channelTarget, channelTargetLower !== channelTarget ? channelTargetLower : void 0, channelTargetUpper !== channelTarget ? channelTargetUpper : void 0, allowNameMatching ? channelName ? `#${directName}` : void 0 : void 0, allowNameMatching ? directName : void 0, allowNameMatching ? normalizedName : void 0)
+		candidates: buildChannelKeyCandidates(...buildSlackChannelIdCandidates(channelId, params.teamId, { allowUnscoped: params.allowUnscoped }), allowNameMatching ? channelName ? `#${directName}` : void 0 : void 0, allowNameMatching ? directName : void 0, allowNameMatching ? normalizedName : void 0)
 	});
 	const { entry: matched, wildcardEntry: fallback } = match;
 	const requireMentionDefault = defaultRequireMention ?? true;
@@ -42,17 +36,27 @@ function resolveSlackChannelConfig(params) {
 	const requireMention = firstDefined(resolved.requireMention, fallback?.requireMention, requireMentionDefault) ?? requireMentionDefault;
 	const ignoreOtherMentions = firstDefined(resolved.ignoreOtherMentions, fallback?.ignoreOtherMentions);
 	const allowBots = firstDefined(resolved.allowBots, fallback?.allowBots);
+	const replyToMode = firstDefined(resolved.replyToMode, fallback?.replyToMode);
+	const botLoopProtection = mergePairLoopGuardConfig(fallback?.botLoopProtection, matched?.botLoopProtection);
+	const users = resolveSlackUserAllowListForTeam({
+		allowList: firstDefined(resolved.users, fallback?.users),
+		teamId: params.teamId,
+		preserveUnmatchedScopedEntries: true
+	});
+	const skills = firstDefined(resolved.skills, fallback?.skills);
+	const systemPrompt = firstDefined(resolved.systemPrompt, fallback?.systemPrompt);
+	const presenceEvents = firstDefined(resolved.presenceEvents, fallback?.presenceEvents);
 	return applyChannelMatchMeta({
 		allowed,
 		requireMention,
 		ignoreOtherMentions,
-		replyToMode: firstDefined(resolved.replyToMode, fallback?.replyToMode),
+		replyToMode,
 		allowBots,
-		botLoopProtection: mergePairLoopGuardConfig(fallback?.botLoopProtection, matched?.botLoopProtection),
-		users: firstDefined(resolved.users, fallback?.users),
-		skills: firstDefined(resolved.skills, fallback?.skills),
-		systemPrompt: firstDefined(resolved.systemPrompt, fallback?.systemPrompt),
-		presenceEvents: firstDefined(resolved.presenceEvents, fallback?.presenceEvents)
+		botLoopProtection,
+		users: users.length > 0 ? users : void 0,
+		skills,
+		systemPrompt,
+		presenceEvents
 	}, match);
 }
 //#endregion

package/dist/{probe-CgDsSops.js → probe-HoEg_WxB.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { u as formatSlackBotTokenIdentityWarning } from "./accounts-CHAeNZOX.js";
-import "./target-parsing-N6lHogYZ.js";
+import { u as formatSlackBotTokenIdentityWarning } from "./accounts-CK4AVI2_.js";
+import "./target-parsing-BnMD2ZqZ.js";
 import { createRequire } from "node:module";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1 } from "openclaw/plugin-sdk/account-id";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -8,7 +8,8 @@ import { runChannelProbe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { PAIRING_APPROVED_MESSAGE, projectCredentialSnapshotFields, resolveConfiguredFromRequiredCredentialStatuses } from "openclaw/plugin-sdk/channel-status";
 import { createHash } from "node:crypto";
 import { WebClient } from "@slack/web-api";
-import { addActiveManagedProxyTlsOptions, resolveEnvHttpProxyAgentOptions } from "openclaw/plugin-sdk/fetch-runtime";
+import { addActiveManagedProxyTlsOptions, resolveEnvHttpProxyAgentOptions, resolveFetch } from "openclaw/plugin-sdk/fetch-runtime";
+import { isDebugProxyGlobalFetchPatchInstalled } from "openclaw/plugin-sdk/proxy-capture";
 import { redactSensitiveText } from "openclaw/plugin-sdk/logging-core";
 //#region extensions/slack/src/channel-api.ts
 const SLACK_CHANNEL_META = {
@@ -54,7 +55,8 @@ function resolveSlackProxyDispatcher() {
 		return;
 	}
 }
-function createSlackDispatcherFetch(dispatcher) {
+function buildSlackFetch(dispatcher) {
+	if (!dispatcher || isDebugProxyGlobalFetchPatchInstalled()) return resolveFetch();
 	const { fetch: slackFetch } = loadSlackUndiciRuntime();
 	return ((input, init) => {
 		const slackInput = input;
@@ -70,13 +72,14 @@ function resolveSlackApiUrlFromEnv() {
 }
 function applySlackApiUrlAndProxyOptions(options, dispatcher) {
 	const slackApiUrl = options.slackApiUrl ?? resolveSlackApiUrlFromEnv();
-	if (dispatcher && !options.fetch) options.fetch = createSlackDispatcherFetch(dispatcher);
+	if (dispatcher && !options.fetch) options.fetch = buildSlackFetch(dispatcher);
 	if (slackApiUrl !== void 0) options.slackApiUrl = slackApiUrl;
 	else delete options.slackApiUrl;
 }
 function resolveSlackWebClientOptions(options = {}, dispatcher = resolveSlackProxyDispatcher()) {
 	const resolved = Object.assign({}, options);
 	applySlackApiUrlAndProxyOptions(resolved, dispatcher);
+	resolved.fetch ??= buildSlackFetch(dispatcher);
 	resolved.retryConfig ??= SLACK_DEFAULT_RETRY_OPTIONS;
 	return resolved;
 }
@@ -102,20 +105,42 @@ function resolveSlackLookupClientOptions(options = {}, dispatcher = resolveSlack
 //#endregion
 //#region extensions/slack/src/client.ts
 const SLACK_WRITE_CLIENT_CACHE_MAX = 32;
+const SLACK_STARTUP_AUTH_TIMEOUT_MS = 1e4;
+const SLACK_STARTUP_AUTH_RETRY_BUDGET_MS = 35e3;
 const slackWriteClientCache = /* @__PURE__ */ new Map();
-let slackListenerUploadCompletionClientCache = /* @__PURE__ */ new WeakMap();
+const slackListenerUploadCompletionClientCache = /* @__PURE__ */ new WeakMap();
 function createSlackWebClient(token, options = {}) {
 	return new WebClient(token, resolveSlackWebClientOptions(options));
 }
 function createSlackReadClient(token, options = {}) {
 	return new WebClient(token, resolveSlackReadClientOptions(options));
 }
+function createSlackStartupAuthFetch(baseFetch) {
+	const deadline = Date.now() + SLACK_STARTUP_AUTH_RETRY_BUDGET_MS;
+	return async (input, init) => {
+		const response = await baseFetch(input, init);
+		if (response.status !== 429) return response;
+		const retryAfter = Number.parseInt(response.headers.get("retry-after") ?? "", 10);
+		const remainingMs = Math.max(0, deadline - Date.now());
+		if (!Number.isFinite(retryAfter) || retryAfter * 1e3 <= remainingMs) return response;
+		await new Promise((resolve) => {
+			setTimeout(resolve, remainingMs);
+		});
+		throw new Error("Slack startup auth retry budget exhausted after rate limit");
+	};
+}
 function createSlackStartupAuthClient(token, options = {}) {
-	return createSlackWebClient(token, {
-		...options,
-		rejectRateLimitedCalls: true,
-		retryConfig: { retries: 0 },
-		timeout: 1e4
+	const resolvedOptions = resolveSlackWebClientOptions(options);
+	const baseFetch = resolvedOptions.fetch;
+	if (!baseFetch) throw new Error("Slack startup auth fetch is unavailable");
+	return new WebClient(token, {
+		...resolvedOptions,
+		fetch: createSlackStartupAuthFetch(baseFetch),
+		retryConfig: {
+			...SLACK_DEFAULT_RETRY_OPTIONS,
+			maxRetryTime: SLACK_STARTUP_AUTH_RETRY_BUDGET_MS
+		},
+		timeout: SLACK_STARTUP_AUTH_TIMEOUT_MS
 	});
 }
 function createSlackLookupClient(token, options = {}) {
@@ -128,8 +153,7 @@ function createSlackTokenCacheKey(token) {
 	return `sha256:${createHash("sha256").update(token).digest("base64url")}`;
 }
 function slackWriteClientCacheKey(token, options) {
-	const tokenKey = createSlackTokenCacheKey(token);
-	return options.slackApiUrl ? `${tokenKey}:api:${options.slackApiUrl}` : tokenKey;
+	return `${createSlackTokenCacheKey(token)}${options.slackApiUrl ? `:api:${options.slackApiUrl}` : ""}${options.teamId ? `:team:${options.teamId.trim().toLowerCase()}` : ""}`;
 }
 function getSlackWriteClient(token, options = {}) {
 	const resolvedOptions = resolveSlackWriteClientOptions(options);
@@ -169,10 +193,6 @@ function getSlackListenerUploadCompletionClient(params) {
 	});
 	return client;
 }
-function clearSlackWriteClientCacheForTest() {
-	slackWriteClientCache.clear();
-	slackListenerUploadCompletionClientCache = /* @__PURE__ */ new WeakMap();
-}
 //#endregion
 //#region extensions/slack/src/errors.ts
 const NO_ERROR_DETAIL = "no error detail";
@@ -342,4 +362,4 @@ async function probeSlack(token, timeoutMs = 2500, opts) {
 	}));
 }
 //#endregion
-export { resolveConfiguredFromRequiredCredentialStatuses as S, resolveSlackWriteClientOptions as _, createSlackLookupClient as a, getChatChannelMeta as b, createSlackTokenCacheKey as c, getSlackListenerUploadCompletionClient as d, getSlackWriteClient as f, resolveSlackWebClientOptions as g, resolveSlackProxyDispatcher as h, clearSlackWriteClientCacheForTest as i, createSlackWebClient as l, SLACK_WRITE_RETRY_OPTIONS as m, probe_exports as n, createSlackReadClient as o, SLACK_DEFAULT_RETRY_OPTIONS as p, formatSlackError as r, createSlackStartupAuthClient as s, probeSlack as t, createSlackWriteClient as u, DEFAULT_ACCOUNT_ID$1 as v, projectCredentialSnapshotFields as x, PAIRING_APPROVED_MESSAGE as y };
+export { resolveConfiguredFromRequiredCredentialStatuses as S, resolveSlackWriteClientOptions as _, createSlackReadClient as a, getChatChannelMeta as b, createSlackWebClient as c, getSlackWriteClient as d, SLACK_DEFAULT_RETRY_OPTIONS as f, resolveSlackWebClientOptions as g, resolveSlackProxyDispatcher as h, createSlackLookupClient as i, createSlackWriteClient as l, resolveSlackLookupClientOptions as m, probe_exports as n, createSlackStartupAuthClient as o, SLACK_WRITE_RETRY_OPTIONS as p, formatSlackError as r, createSlackTokenCacheKey as s, probeSlack as t, getSlackListenerUploadCompletionClient as u, DEFAULT_ACCOUNT_ID$1 as v, projectCredentialSnapshotFields as x, PAIRING_APPROVED_MESSAGE as y };