refactor: share channel setup promotion keys · openclaw/openclaw@9813ff2

Recent Commits to openclaw:main

vincentkoc · 2026-05-29 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,10 @@`
`1`	`1`	`import { z, type ZodType } from "zod";`
`2`	`2`	`import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`3`	`3`	`import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../../routing/session-key.js";`
	`4`	`+import {`
	`5`	`+collectSingleAccountPromotionEntries,`
	`6`	`+isSetupSingleAccountPromotionKey,`
	`7`	`+} from "./setup-promotion-keys.js";`
`4`	`8`	`import type { ChannelSetupAdapter } from "./types.adapters.js";`
`5`	`9`	`import type { ChannelSetupInput } from "./types.core.js";`
`6`	`10`
`@@ -10,65 +14,6 @@ type ChannelSectionBase = {`
`10`	`14`	`accounts?: Record<string, Record<string, unknown>>;`
`11`	`15`	`};`
`12`	`16`
`13`		`-const COMMON_SINGLE_ACCOUNT_KEYS_TO_MOVE = new Set([`
`14`		`-"name",`
`15`		`-"token",`
`16`		`-"tokenFile",`
`17`		`-"botToken",`
`18`		`-"appToken",`
`19`		`-"account",`
`20`		`-"signalNumber",`
`21`		`-"authDir",`
`22`		`-"cliPath",`
`23`		`-"dbPath",`
`24`		`-"httpUrl",`
`25`		`-"httpHost",`
`26`		`-"httpPort",`
`27`		`-"webhookPath",`
`28`		`-"webhookUrl",`
`29`		`-"webhookSecret",`
`30`		`-"service",`
`31`		`-"region",`
`32`		`-"homeserver",`
`33`		`-"userId",`
`34`		`-"accessToken",`
`35`		`-"password",`
`36`		`-"deviceName",`
`37`		`-"url",`
`38`		`-"code",`
`39`		`-"dmPolicy",`
`40`		`-"allowFrom",`
`41`		`-"groupPolicy",`
`42`		`-"groupAllowFrom",`
`43`		`-"defaultTo",`
`44`		`-"streaming",`
`45`		`-"deviceId",`
`46`		`-"avatarUrl",`
`47`		`-"initialSyncLimit",`
`48`		`-"encryption",`
`49`		`-"allowlistOnly",`
`50`		`-"allowBots",`
`51`		`-"blockStreaming",`
`52`		`-"replyToMode",`
`53`		`-"threadReplies",`
`54`		`-"textChunkLimit",`
`55`		`-"chunkMode",`
`56`		`-"responsePrefix",`
`57`		`-"ackReaction",`
`58`		`-"ackReactionScope",`
`59`		`-"reactionNotifications",`
`60`		`-"threadBindings",`
`61`		`-"startupVerification",`
`62`		`-"startupVerificationCooldownHours",`
`63`		`-"mediaMaxMb",`
`64`		`-"autoJoin",`
`65`		`-"autoJoinAllowlist",`
`66`		`-"dm",`
`67`		`-"groups",`
`68`		`-"rooms",`
`69`		`-"actions",`
`70`		`-]);`
`71`		`-`
`72`	`17`	`const NAMED_ACCOUNT_PROMOTION_KEYS_BY_CHANNEL: Record<string, readonly string[]> = {`
`73`	`18`	`matrix: [`
`74`	`19`	`"name",`
`@@ -502,16 +447,8 @@ function resolveSingleAccountKeysToMove(params: {`
`502`	`447`	`channelKey: string;`
`503`	`448`	`channel: Record<string, unknown>;`
`504`	`449`	`}): string[] {`
`505`		`-const hasNamedAccounts = Object.keys(`
`506`		`-(params.channel.accounts as Record<string, unknown>) ?? {},`
`507`		`-).some(Boolean);`
`508`		`-const entries = Object.entries(params.channel)`
`509`		`-.filter(`
`510`		`-([key, value]) =>`
`511`		`-key !== "accounts" && key !== "defaultAccount" && key !== "enabled" && value !== undefined,`
`512`		`-)`
`513`		`-.map(([key]) => key);`
`514`		`-const keysToMove = entries.filter((key) => COMMON_SINGLE_ACCOUNT_KEYS_TO_MOVE.has(key));`
	`450`	`+const { entries, hasNamedAccounts } = collectSingleAccountPromotionEntries(params.channel);`
	`451`	`+const keysToMove = entries.filter(isSetupSingleAccountPromotionKey);`
`515`	`452`	`if (!hasNamedAccounts \|\| keysToMove.length === 0) {`
`516`	`453`	`return keysToMove;`
`517`	`454`	`}`

Original file line number	Diff line number	Diff line change
`@@ -2,45 +2,16 @@ import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../../routing/session-ke`
`2`	`2`	`import { normalizeOptionalString } from "../../shared/string-coerce.js";`
`3`	`3`	`import { getBundledChannelPlugin, hasBundledChannelPackageSetupFeature } from "./bundled.js";`
`4`	`4`	`import { getLoadedChannelPlugin } from "./registry.js";`
	`5`	`+import {`
	`6`	`+collectSingleAccountPromotionEntries,`
	`7`	`+isCommonSingleAccountPromotionKey,`
	`8`	`+} from "./setup-promotion-keys.js";`
`5`	`9`
`6`	`10`	`type ChannelSectionBase = {`
`7`	`11`	`defaultAccount?: string;`
`8`	`12`	`accounts?: Record<string, Record<string, unknown>>;`
`9`	`13`	`};`
`10`	`14`
`11`		`-const COMMON_SINGLE_ACCOUNT_KEYS_TO_MOVE = new Set([`
`12`		`-"name",`
`13`		`-"token",`
`14`		`-"tokenFile",`
`15`		`-"botToken",`
`16`		`-"appToken",`
`17`		`-"account",`
`18`		`-"signalNumber",`
`19`		`-"authDir",`
`20`		`-"cliPath",`
`21`		`-"dbPath",`
`22`		`-"httpUrl",`
`23`		`-"httpHost",`
`24`		`-"httpPort",`
`25`		`-"webhookPath",`
`26`		`-"webhookUrl",`
`27`		`-"webhookSecret",`
`28`		`-"service",`
`29`		`-"region",`
`30`		`-"homeserver",`
`31`		`-"userId",`
`32`		`-"accessToken",`
`33`		`-"password",`
`34`		`-"deviceName",`
`35`		`-"url",`
`36`		`-"code",`
`37`		`-"dmPolicy",`
`38`		`-"allowFrom",`
`39`		`-"groupPolicy",`
`40`		`-"groupAllowFrom",`
`41`		`-"defaultTo",`
`42`		`-]);`
`43`		`-`
`44`	`15`	`type ChannelSetupPromotionSurface = {`
`45`	`16`	`singleAccountKeysToMove?: readonly string[];`
`46`	`17`	`namedAccountPromotionKeys?: readonly string[];`
`@@ -68,15 +39,11 @@ function getBundledChannelSetupPromotionSurface(`
`68`	`39`	`return asPromotionSurface(getBundledChannelPlugin(channelKey)?.setup);`
`69`	`40`	`}`
`70`	`41`
`71`		`-function isStaticSingleAccountPromotionKey(key: string): boolean {`
`72`		`-return COMMON_SINGLE_ACCOUNT_KEYS_TO_MOVE.has(key);`
`73`		`-}`
`74`		`-`
`75`	`42`	`export function shouldMoveSingleAccountChannelKey(params: {`
`76`	`43`	`channelKey: string;`
`77`	`44`	`key: string;`
`78`	`45`	`}): boolean {`
`79`		`-if (isStaticSingleAccountPromotionKey(params.key)) {`
	`46`	`+if (isCommonSingleAccountPromotionKey(params.key)) {`
`80`	`47`	`return true;`
`81`	`48`	`}`
`82`	`49`	`const loadedContractKeys = getLoadedChannelSetupPromotionSurface(`
`@@ -98,15 +65,7 @@ export function resolveSingleAccountKeysToMove(params: {`
`98`	`65`	`channelKey: string;`
`99`	`66`	`channel: Record<string, unknown>;`
`100`	`67`	`}): string[] {`
`101`		`-const hasNamedAccounts = Object.keys(`
`102`		`-(params.channel.accounts as Record<string, unknown>) ?? {},`
`103`		`-).some(Boolean);`
`104`		`-const entries = Object.entries(params.channel)`
`105`		`-.filter(`
`106`		`-([key, value]) =>`
`107`		`-key !== "accounts" && key !== "defaultAccount" && key !== "enabled" && value !== undefined,`
`108`		`-)`
`109`		`-.map(([key]) => key);`
	`68`	`+const { entries, hasNamedAccounts } = collectSingleAccountPromotionEntries(params.channel);`
`110`	`69`	`if (entries.length === 0) {`
`111`	`70`	`return [];`
`112`	`71`	`}`
`@@ -123,7 +82,7 @@ export function resolveSingleAccountKeysToMove(params: {`
`123`	`82`	`};`
`124`	`83`
`125`	`84`	`const keysToMove = entries.filter((key) => {`
`126`		`-if (isStaticSingleAccountPromotionKey(key)) {`
	`85`	`+if (isCommonSingleAccountPromotionKey(key)) {`
`127`	`86`	`return true;`
`128`	`87`	`}`
`129`	`88`	`return Boolean(`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,89 @@`
	`1`	`+const COMMON_SINGLE_ACCOUNT_PROMOTION_KEYS = [`
	`2`	`+"name",`
	`3`	`+"token",`
	`4`	`+"tokenFile",`
	`5`	`+"botToken",`
	`6`	`+"appToken",`
	`7`	`+"account",`
	`8`	`+"signalNumber",`
	`9`	`+"authDir",`
	`10`	`+"cliPath",`
	`11`	`+"dbPath",`
	`12`	`+"httpUrl",`
	`13`	`+"httpHost",`
	`14`	`+"httpPort",`
	`15`	`+"webhookPath",`
	`16`	`+"webhookUrl",`
	`17`	`+"webhookSecret",`
	`18`	`+"service",`
	`19`	`+"region",`
	`20`	`+"homeserver",`
	`21`	`+"userId",`
	`22`	`+"accessToken",`
	`23`	`+"password",`
	`24`	`+"deviceName",`
	`25`	`+"url",`
	`26`	`+"code",`
	`27`	`+"dmPolicy",`
	`28`	`+"allowFrom",`
	`29`	`+"groupPolicy",`
	`30`	`+"groupAllowFrom",`
	`31`	`+"defaultTo",`
	`32`	`+] as const;`
	`33`	`+`
	`34`	`+const SETUP_SINGLE_ACCOUNT_PROMOTION_KEYS = [`
	`35`	`+ ...COMMON_SINGLE_ACCOUNT_PROMOTION_KEYS,`
	`36`	`+"streaming",`
	`37`	`+"deviceId",`
	`38`	`+"avatarUrl",`
	`39`	`+"initialSyncLimit",`
	`40`	`+"encryption",`
	`41`	`+"allowlistOnly",`
	`42`	`+"allowBots",`
	`43`	`+"blockStreaming",`
	`44`	`+"replyToMode",`
	`45`	`+"threadReplies",`
	`46`	`+"textChunkLimit",`
	`47`	`+"chunkMode",`
	`48`	`+"responsePrefix",`
	`49`	`+"ackReaction",`
	`50`	`+"ackReactionScope",`
	`51`	`+"reactionNotifications",`
	`52`	`+"threadBindings",`
	`53`	`+"startupVerification",`
	`54`	`+"startupVerificationCooldownHours",`
	`55`	`+"mediaMaxMb",`
	`56`	`+"autoJoin",`
	`57`	`+"autoJoinAllowlist",`
	`58`	`+"dm",`
	`59`	`+"groups",`
	`60`	`+"rooms",`
	`61`	`+"actions",`
	`62`	`+] as const;`
	`63`	`+`
	`64`	`+const commonSingleAccountPromotionKeys = new Set<string>(COMMON_SINGLE_ACCOUNT_PROMOTION_KEYS);`
	`65`	`+const setupSingleAccountPromotionKeys = new Set<string>(SETUP_SINGLE_ACCOUNT_PROMOTION_KEYS);`
	`66`	`+`
	`67`	`+export function isCommonSingleAccountPromotionKey(key: string): boolean {`
	`68`	`+return commonSingleAccountPromotionKeys.has(key);`
	`69`	`+}`
	`70`	`+`
	`71`	`+export function isSetupSingleAccountPromotionKey(key: string): boolean {`
	`72`	`+return setupSingleAccountPromotionKeys.has(key);`
	`73`	`+}`
	`74`	`+`
	`75`	`+export function collectSingleAccountPromotionEntries(channel: Record<string, unknown>): {`
	`76`	`+entries: string[];`
	`77`	`+hasNamedAccounts: boolean;`
	`78`	`+} {`
	`79`	`+const hasNamedAccounts = Object.keys((channel.accounts as Record<string, unknown>) ?? {}).some(`
	`80`	`+Boolean,`
	`81`	`+);`
	`82`	`+const entries = Object.entries(channel)`
	`83`	`+.filter(`
	`84`	`+([key, value]) =>`
	`85`	`+key !== "accounts" && key !== "defaultAccount" && key !== "enabled" && value !== undefined,`
	`86`	`+)`
	`87`	`+.map(([key]) => key);`
	`88`	`+return { entries, hasNamedAccounts };`
	`89`	`+}`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main