refactor(setup): share allowlist wizard proxies

steipete · steipete · commit 7ab074631b53 · 2026-03-17T05:17:52.000Z
diff --git a/extensions/discord/src/setup-core.ts b/extensions/discord/src/setup-core.ts
@@ -1,3 +1,5 @@
+import { createPatchedAccountSetupAdapter } from "../../../src/channels/plugins/setup-helpers.js";
+import { createAllowlistSetupWizardProxy } from "../../../src/channels/plugins/setup-wizard-proxy.js";
 import type { DiscordGuildEntry } from "openclaw/plugin-sdk/config-runtime";
 import {
   applyAccountNameToChannelSection,
@@ -347,3 +349,13 @@ export function createDiscordSetupWizardProxy(
     disable: (cfg: OpenClawConfig) => setSetupChannelEnabled(cfg, channel, false),
   } satisfies ChannelSetupWizard;
 }
+export function createDiscordSetupWizardProxy(
+  loadWizard: () => Promise<{ discordSetupWizard: ChannelSetupWizard }>,
+) {
+  return createAllowlistSetupWizardProxy({
+    loadWizard: async () => (await loadWizard()).discordSetupWizard,
+    createBase: createDiscordSetupWizardBase,
+    fallbackResolvedGroupAllowlist: (entries) =>
+      entries.map((input) => ({ input, resolved: false })),
+  });
+}
diff --git a/extensions/slack/src/setup-core.ts b/extensions/slack/src/setup-core.ts
@@ -1,3 +1,5 @@
+import { createPatchedAccountSetupAdapter } from "../../../src/channels/plugins/setup-helpers.js";
+import { createAllowlistSetupWizardProxy } from "../../../src/channels/plugins/setup-wizard-proxy.js";
 import {
   applyAccountNameToChannelSection,
   DEFAULT_ACCOUNT_ID,
@@ -390,3 +392,12 @@ export function createSlackSetupWizardProxy(
     disable: (cfg: OpenClawConfig) => setSetupChannelEnabled(cfg, channel, false),
   } satisfies ChannelSetupWizard;
 }
+export function createSlackSetupWizardProxy(
+  loadWizard: () => Promise<{ slackSetupWizard: ChannelSetupWizard }>,
+) {
+  return createAllowlistSetupWizardProxy({
+    loadWizard: async () => (await loadWizard()).slackSetupWizard,
+    createBase: createSlackSetupWizardBase,
+    fallbackResolvedGroupAllowlist: (entries) => entries,
+  });
+}
diff --git a/src/channels/plugins/setup-wizard-proxy.ts b/src/channels/plugins/setup-wizard-proxy.ts
@@ -0,0 +1,61 @@
+import type { OpenClawConfig } from "../../config/config.js";
+import type { ChannelSetupDmPolicy } from "./setup-wizard-types.js";
+import type { ChannelSetupWizard } from "./setup-wizard.js";
+
+type PromptAllowFromParams = Parameters<NonNullable<ChannelSetupDmPolicy["promptAllowFrom"]>>[0];
+type ResolveAllowFromEntriesParams = Parameters<
+  NonNullable<ChannelSetupWizard["allowFrom"]>["resolveEntries"]
+>[0];
+type ResolveAllowFromEntriesResult = Awaited<
+  ReturnType<NonNullable<ChannelSetupWizard["allowFrom"]>["resolveEntries"]>
+>;
+type ResolveGroupAllowlistParams = Parameters<
+  NonNullable<NonNullable<ChannelSetupWizard["groupAccess"]>["resolveAllowlist"]>
+>[0];
+
+export function createAllowlistSetupWizardProxy<TGroupResolved>(params: {
+  loadWizard: () => Promise<ChannelSetupWizard>;
+  createBase: (handlers: {
+    promptAllowFrom: (params: PromptAllowFromParams) => Promise<OpenClawConfig>;
+    resolveAllowFromEntries: (
+      params: ResolveAllowFromEntriesParams,
+    ) => Promise<ResolveAllowFromEntriesResult>;
+    resolveGroupAllowlist: (params: ResolveGroupAllowlistParams) => Promise<TGroupResolved>;
+  }) => ChannelSetupWizard;
+  fallbackResolvedGroupAllowlist: (entries: string[]) => TGroupResolved;
+}) {
+  return params.createBase({
+    promptAllowFrom: async ({ cfg, prompter, accountId }) => {
+      const wizard = await params.loadWizard();
+      if (!wizard.dmPolicy?.promptAllowFrom) {
+        return cfg;
+      }
+      return await wizard.dmPolicy.promptAllowFrom({ cfg, prompter, accountId });
+    },
+    resolveAllowFromEntries: async ({ cfg, accountId, credentialValues, entries }) => {
+      const wizard = await params.loadWizard();
+      if (!wizard.allowFrom) {
+        return entries.map((input) => ({ input, resolved: false, id: null }));
+      }
+      return await wizard.allowFrom.resolveEntries({
+        cfg,
+        accountId,
+        credentialValues,
+        entries,
+      });
+    },
+    resolveGroupAllowlist: async ({ cfg, accountId, credentialValues, entries, prompter }) => {
+      const wizard = await params.loadWizard();
+      if (!wizard.groupAccess?.resolveAllowlist) {
+        return params.fallbackResolvedGroupAllowlist(entries);
+      }
+      return (await wizard.groupAccess.resolveAllowlist({
+        cfg,
+        accountId,
+        credentialValues,
+        entries,
+        prompter,
+      })) as TGroupResolved;
+    },
+  });
+}
