fix(channels): refresh plugin registry after on-demand in...

Recent Commits to openclaw:main

vincentkoc · 2026-04-26 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ type ResolveInstallableChannelPluginResult = {`
`29`	`29`	`plugin?: ChannelPlugin;`
`30`	`30`	`catalogEntry?: ChannelPluginCatalogEntry;`
`31`	`31`	`configChanged: boolean;`
	`32`	`+pluginInstalled: boolean;`
`32`	`33`	`};`
`33`	`34`
`34`	`35`	`function resolveWorkspaceDir(cfg: OpenClawConfig) {`
`@@ -197,6 +198,7 @@ export async function resolveInstallableChannelPlugin(params: {`
`197`	`198`	`cfg: nextCfg,`
`198`	`199`	`catalogEntry,`
`199`	`200`	`configChanged: false,`
	`201`	`+pluginInstalled: false,`
`200`	`202`	`};`
`201`	`203`	`}`
`202`	`204`
`@@ -208,6 +210,7 @@ export async function resolveInstallableChannelPlugin(params: {`
`208`	`210`	`plugin: existing,`
`209`	`211`	`catalogEntry,`
`210`	`212`	`configChanged: false,`
	`213`	`+pluginInstalled: false,`
`211`	`214`	`};`
`212`	`215`	`}`
`213`	`216`
`@@ -227,6 +230,7 @@ export async function resolveInstallableChannelPlugin(params: {`
`227`	`230`	`plugin: scoped,`
`228`	`231`	`catalogEntry,`
`229`	`232`	`configChanged: false,`
	`233`	`+pluginInstalled: false,`
`230`	`234`	`};`
`231`	`235`	`}`
`232`	`236`
`@@ -258,6 +262,7 @@ export async function resolveInstallableChannelPlugin(params: {`
`258`	`262`	`? { ...catalogEntry, pluginId: installedPluginId }`
`259`	`263`	`: catalogEntry,`
`260`	`264`	`configChanged: nextCfg !== params.cfg,`
	`265`	`+pluginInstalled: installResult.installed,`
`261`	`266`	`};`
`262`	`267`	`}`
`263`	`268`	`}`
`@@ -268,5 +273,6 @@ export async function resolveInstallableChannelPlugin(params: {`
`268`	`273`	`plugin: existing,`
`269`	`274`	`catalogEntry,`
`270`	`275`	`configChanged: false,`
	`276`	`+pluginInstalled: false,`
`271`	`277`	`};`
`272`	`278`	`}`

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,10 @@ const pluginInstallMocks = vi.hoisted(() => ({`
`30`	`30`	`loadChannelSetupPluginRegistrySnapshotForChannel: vi.fn(),`
`31`	`31`	`}));`
`32`	`32`
	`33`	`+const registryRefreshMocks = vi.hoisted(() => ({`
	`34`	`+refreshPluginRegistryAfterConfigMutation: vi.fn(async () => undefined),`
	`35`	`+}));`
	`36`	`+`
`33`	`37`	`vi.mock("../channels/plugins/catalog.js", () => ({`
`34`	`38`	`listChannelPluginCatalogEntries: catalogMocks.listChannelPluginCatalogEntries,`
`35`	`39`	`}));`
`@@ -50,6 +54,8 @@ vi.mock("../channels/plugins/bundled.js", async () => {`
`50`	`54`
`51`	`55`	`vi.mock("./channel-setup/plugin-install.js", () => pluginInstallMocks);`
`52`	`56`
	`57`	`+vi.mock("../cli/plugins-registry-refresh.js", () => registryRefreshMocks);`
	`58`	`+`
`53`	`59`	`const runtime = createTestRuntime();`
`54`	`60`
`55`	`61`	`function listConfiguredAccountIds(`
`@@ -268,6 +274,7 @@ describe("channelsAddCommand", () => {`
`268`	`274`	`vi.mocked(loadChannelSetupPluginRegistrySnapshotForChannel).mockReturnValue(`
`269`	`275`	`createTestRegistry(),`
`270`	`276`	`);`
	`277`	`+registryRefreshMocks.refreshPluginRegistryAfterConfigMutation.mockClear();`
`271`	`278`	`setMinimalChannelsAddRegistryForTests();`
`272`	`279`	`});`
`273`	`280`
`@@ -481,6 +488,16 @@ describe("channelsAddCommand", () => {`
`481`	`488`	`expect(loadChannelSetupPluginRegistrySnapshotForChannel).toHaveBeenCalledWith(`
`482`	`489`	`expect.objectContaining({ installRuntimeDeps: false }),`
`483`	`490`	`);`
	`491`	`+expect(registryRefreshMocks.refreshPluginRegistryAfterConfigMutation).toHaveBeenCalledWith(`
	`492`	`+expect.objectContaining({`
	`493`	`+config: expect.objectContaining({`
	`494`	`+channels: expect.objectContaining({`
	`495`	`+"external-chat": expect.objectContaining({ enabled: true }),`
	`496`	`+}),`
	`497`	`+}),`
	`498`	`+reason: "source-changed",`
	`499`	`+}),`
	`500`	`+);`
`484`	`501`	`expectExternalChatEnabledConfigWrite();`
`485`	`502`	`expect(runtime.error).not.toHaveBeenCalled();`
`486`	`503`	`expect(runtime.exit).not.toHaveBeenCalled();`

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@ const catalogMocks = vi.hoisted(() => ({`
`19`	`19`	`listChannelPluginCatalogEntries: vi.fn((): ChannelPluginCatalogEntry[] => []),`
`20`	`20`	`}));`
`21`	`21`
	`22`	`+const registryRefreshMocks = vi.hoisted(() => ({`
	`23`	`+refreshPluginRegistryAfterConfigMutation: vi.fn(async () => undefined),`
	`24`	`+}));`
	`25`	`+`
`22`	`26`	`vi.mock("../channels/plugins/catalog.js", async () => {`
`23`	`27`	`const actual = await vi.importActual<typeof import("../channels/plugins/catalog.js")>(`
`24`	`28`	`"../channels/plugins/catalog.js",`
`@@ -48,6 +52,8 @@ vi.mock("./channel-setup/plugin-install.js", async () => {`
`48`	`52`	`return createMockChannelSetupPluginInstallModule(actual);`
`49`	`53`	`});`
`50`	`54`
	`55`	`+vi.mock("../cli/plugins-registry-refresh.js", () => registryRefreshMocks);`
	`56`	`+`
`51`	`57`	`const runtime = createTestRuntime();`
`52`	`58`
`53`	`59`	`describe("channelsRemoveCommand", () => {`
`@@ -79,6 +85,7 @@ describe("channelsRemoveCommand", () => {`
`79`	`85`	`vi.mocked(loadChannelSetupPluginRegistrySnapshotForChannel).mockReturnValue(`
`80`	`86`	`createTestRegistry(),`
`81`	`87`	`);`
	`88`	`+registryRefreshMocks.refreshPluginRegistryAfterConfigMutation.mockClear();`
`82`	`89`	`setActivePluginRegistry(createTestRegistry());`
`83`	`90`	`});`
`84`	`91`
`@@ -123,6 +130,11 @@ describe("channelsRemoveCommand", () => {`
`123`	`130`	`expect.objectContaining({ entry: catalogEntry }),`
`124`	`131`	`);`
`125`	`132`	`expect(loadChannelSetupPluginRegistrySnapshotForChannel).toHaveBeenCalledTimes(2);`
	`133`	`+expect(registryRefreshMocks.refreshPluginRegistryAfterConfigMutation).toHaveBeenCalledWith(`
	`134`	`+expect.objectContaining({`
	`135`	`+reason: "source-changed",`
	`136`	`+}),`
	`137`	`+);`
`126`	`138`	`expect(configMocks.writeConfigFile).toHaveBeenCalledWith(`
`127`	`139`	`expect.not.objectContaining({`
`128`	`140`	`channels: expect.objectContaining({`

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ const mocks = vi.hoisted(() => ({`
`8`	`8`	`readConfigFileSnapshot: vi.fn(),`
`9`	`9`	`applyPluginAutoEnable: vi.fn(),`
`10`	`10`	`replaceConfigFile: vi.fn(),`
	`11`	`+refreshPluginRegistryAfterConfigMutation: vi.fn(async () => undefined),`
`11`	`12`	`resolveMessageChannelSelection: vi.fn(),`
`12`	`13`	`resolveInstallableChannelPlugin: vi.fn(),`
`13`	`14`	`getChannelPlugin: vi.fn(),`
`@@ -27,6 +28,10 @@ vi.mock("../config/config.js", () => ({`
`27`	`28`	`replaceConfigFile: mocks.replaceConfigFile,`
`28`	`29`	`}));`
`29`	`30`
	`31`	`+vi.mock("../cli/plugins-registry-refresh.js", () => ({`
	`32`	`+refreshPluginRegistryAfterConfigMutation: mocks.refreshPluginRegistryAfterConfigMutation,`
	`33`	`+}));`
	`34`	`+`
`30`	`35`	`vi.mock("../config/plugin-auto-enable.js", () => ({`
`31`	`36`	`applyPluginAutoEnable: mocks.applyPluginAutoEnable,`
`32`	`37`	`}));`
`@@ -54,6 +59,7 @@ describe("channelsResolveCommand", () => {`
`54`	`59`	`vi.clearAllMocks();`
`55`	`60`	`mocks.loadConfig.mockReturnValue({ channels: {} });`
`56`	`61`	`mocks.readConfigFileSnapshot.mockResolvedValue({ hash: "config-1" });`
	`62`	`+mocks.refreshPluginRegistryAfterConfigMutation.mockResolvedValue(undefined);`
`57`	`63`	`mocks.applyPluginAutoEnable.mockImplementation(({ config }) => ({ config, changes: [] }));`
`58`	`64`	`mocks.replaceConfigFile.mockResolvedValue(undefined);`
`59`	`65`	`mocks.resolveCommandSecretRefsViaGateway.mockResolvedValue({`
`@@ -88,6 +94,7 @@ describe("channelsResolveCommand", () => {`
`88`	`94`	`cfg: installedCfg,`
`89`	`95`	`channelId: "whatsapp",`
`90`	`96`	`configChanged: true,`
	`97`	`+pluginInstalled: true,`
`91`	`98`	`plugin: {`
`92`	`99`	`id: "whatsapp",`
`93`	`100`	`resolver: { resolveTargets },`
`@@ -112,6 +119,12 @@ describe("channelsResolveCommand", () => {`
`112`	`119`	`nextConfig: installedCfg,`
`113`	`120`	`baseHash: "config-1",`
`114`	`121`	`});`
	`122`	`+expect(mocks.refreshPluginRegistryAfterConfigMutation).toHaveBeenCalledWith(`
	`123`	`+expect.objectContaining({`
	`124`	`+config: installedCfg,`
	`125`	`+reason: "source-changed",`
	`126`	`+}),`
	`127`	`+);`
`115`	`128`	`expect(resolveTargets).toHaveBeenCalledWith(`
`116`	`129`	`expect.objectContaining({`
`117`	`130`	`cfg: installedCfg,`

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import { moveSingleAccountChannelSectionToDefaultAccount } from "../../channels/`
`5`	`5`	`import type { ChannelSetupPlugin } from "../../channels/plugins/setup-wizard-types.js";`
`6`	`6`	`import type { ChannelPlugin } from "../../channels/plugins/types.plugin.js";`
`7`	`7`	`import type { ChannelId, ChannelSetupInput } from "../../channels/plugins/types.public.js";`
	`8`	`+import { refreshPluginRegistryAfterConfigMutation } from "../../cli/plugins-registry-refresh.js";`
`8`	`9`	`import { replaceConfigFile, type OpenClawConfig } from "../../config/config.js";`
`9`	`10`	`import {`
`10`	`11`	`PLUGIN_INSTALLS_CONFIG_PATH,`
`@@ -116,6 +117,7 @@ export async function channelsAddCommand(`
`116`	`117`	`const cfg = (configSnapshot.sourceConfig ?? configSnapshot.config) as OpenClawConfig;`
`117`	`118`	`const baseHash = configSnapshot.hash;`
`118`	`119`	`let nextConfig = cfg;`
	`120`	`+let pluginRegistrySourceChanged = false;`
`119`	`121`
`120`	`122`	`const useWizard = shouldUseWizard(params);`
`121`	`123`	`if (useWizard) {`
`@@ -258,6 +260,13 @@ export async function channelsAddCommand(`
`258`	`260`	`? { writeOptions: { unsetPaths: [Array.from(PLUGIN_INSTALLS_CONFIG_PATH)] } }`
`259`	`261`	`: {}),`
`260`	`262`	`});`
	`263`	`+if (shouldMovePluginInstalls) {`
	`264`	`+await refreshPluginRegistryAfterConfigMutation({`
	`265`	`+config: writtenConfig,`
	`266`	`+reason: "source-changed",`
	`267`	`+logger: { warn: (message) => runtime.log(message) },`
	`268`	`+});`
	`269`	`+}`
`261`	`270`	`await onboardChannels.runCollectedChannelOnboardingPostWriteHooks({`
`262`	`271`	`hooks: postWriteHooks.drain(),`
`263`	`272`	`cfg: writtenConfig,`
`@@ -320,6 +329,7 @@ export async function channelsAddCommand(`
`320`	`329`	`if (!result.installed) {`
`321`	`330`	`return;`
`322`	`331`	`}`
	`332`	`+pluginRegistrySourceChanged = true;`
`323`	`333`	`catalogEntry = {`
`324`	`334`	`...catalogEntry,`
`325`	`335`	`...(result.pluginId ? { pluginId: result.pluginId } : {}),`
`@@ -401,6 +411,13 @@ export async function channelsAddCommand(`
`401`	`411`	`? { writeOptions: { unsetPaths: [Array.from(PLUGIN_INSTALLS_CONFIG_PATH)] } }`
`402`	`412`	`: {}),`
`403`	`413`	`});`
	`414`	`+if (shouldMovePluginInstalls \|\| pluginRegistrySourceChanged) {`
	`415`	`+await refreshPluginRegistryAfterConfigMutation({`
	`416`	`+config: writtenConfig,`
	`417`	`+reason: "source-changed",`
	`418`	`+logger: { warn: (message) => runtime.log(message) },`
	`419`	`+});`
	`420`	`+}`
`404`	`421`	runtime.log(`Added ${plugin.meta.label ?? channelLabel(channel)} account "${accountId}".`);
`405`	`422`	`const afterAccountConfigWritten = plugin.setup?.afterAccountConfigWritten;`
`406`	`423`	`if (afterAccountConfigWritten) {`

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ const resolveDefaultAccountId = () => DEFAULT_ACCOUNT_ID;`
`12`	`12`	`const mocks = vi.hoisted(() => ({`
`13`	`13`	`readConfigFileSnapshot: vi.fn(),`
`14`	`14`	`replaceConfigFile: vi.fn(),`
	`15`	`+refreshPluginRegistryAfterConfigMutation: vi.fn(async () => undefined),`
`15`	`16`	`resolveInstallableChannelPlugin: vi.fn(),`
`16`	`17`	`}));`
`17`	`18`
`@@ -37,6 +38,10 @@ vi.mock("../../config/config.js", async () => {`
`37`	`38`	`};`
`38`	`39`	`});`
`39`	`40`
	`41`	`+vi.mock("../../cli/plugins-registry-refresh.js", () => ({`
	`42`	`+refreshPluginRegistryAfterConfigMutation: mocks.refreshPluginRegistryAfterConfigMutation,`
	`43`	`+}));`
	`44`	`+`
`40`	`45`	`vi.mock("../channel-setup/channel-plugin-resolution.js", () => ({`
`41`	`46`	`resolveInstallableChannelPlugin: mocks.resolveInstallableChannelPlugin,`
`42`	`47`	`}));`
`@@ -203,6 +208,7 @@ describe("channelsCapabilitiesCommand", () => {`
`203`	`208`	`channelId: "whatsapp",`
`204`	`209`	`plugin,`
`205`	`210`	`configChanged: true,`
	`211`	`+pluginInstalled: true,`
`206`	`212`	`});`
`207`	`213`	`vi.mocked(listChannelPlugins).mockReturnValue([]);`
`208`	`214`	`vi.mocked(getChannelPlugin).mockReturnValue(undefined);`
`@@ -221,6 +227,11 @@ describe("channelsCapabilitiesCommand", () => {`
`221`	`227`	`}),`
`222`	`228`	`baseHash: "config-1",`
`223`	`229`	`});`
	`230`	`+expect(mocks.refreshPluginRegistryAfterConfigMutation).toHaveBeenCalledWith(`
	`231`	`+expect.objectContaining({`
	`232`	`+reason: "source-changed",`
	`233`	`+}),`
	`234`	`+);`
`224`	`235`	`expect(logs.join("\n")).toContain("Probe: linked");`
`225`	`236`	`});`
`226`	`237`	`});`

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import type {`
`10`	`10`	`ChannelCapabilitiesDisplayLine,`
`11`	`11`	`ChannelPlugin,`
`12`	`12`	`} from "../../channels/plugins/types.public.js";`
	`13`	`+import { refreshPluginRegistryAfterConfigMutation } from "../../cli/plugins-registry-refresh.js";`
`13`	`14`	`import {`
`14`	`15`	`readConfigFileSnapshot,`
`15`	`16`	`replaceConfigFile,`
`@@ -269,6 +270,13 @@ export async function channelsCapabilitiesCommand(`
`269`	`270`	`? { writeOptions: { unsetPaths: [Array.from(PLUGIN_INSTALLS_CONFIG_PATH)] } }`
`270`	`271`	`: {}),`
`271`	`272`	`});`
	`273`	`+if (shouldMovePluginInstalls \|\| resolved.pluginInstalled) {`
	`274`	`+await refreshPluginRegistryAfterConfigMutation({`
	`275`	`+config: cfg,`
	`276`	`+reason: "source-changed",`
	`277`	`+logger: { warn: (message) => runtime.log(message) },`
	`278`	`+});`
	`279`	`+}`
`272`	`280`	`}`
`273`	`281`	`return resolved.plugin ? [resolved.plugin] : null;`
`274`	`282`	`})();`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import {`
`4`	`4`	`listChannelPlugins,`
`5`	`5`	`normalizeChannelId,`
`6`	`6`	`} from "../../channels/plugins/index.js";`
	`7`	`+import { refreshPluginRegistryAfterConfigMutation } from "../../cli/plugins-registry-refresh.js";`
`7`	`8`	`import { replaceConfigFile, type OpenClawConfig } from "../../config/config.js";`
`8`	`9`	`import {`
`9`	`10`	`PLUGIN_INSTALLS_CONFIG_PATH,`
`@@ -190,6 +191,13 @@ export async function channelsRemoveCommand(`
`190`	`191`	`? { writeOptions: { unsetPaths: [Array.from(PLUGIN_INSTALLS_CONFIG_PATH)] } }`
`191`	`192`	`: {}),`
`192`	`193`	`});`
	`194`	`+if (shouldMovePluginInstalls \|\| resolvedPluginState?.pluginInstalled) {`
	`195`	`+await refreshPluginRegistryAfterConfigMutation({`
	`196`	`+config: next,`
	`197`	`+reason: "source-changed",`
	`198`	`+logger: { warn: (message) => runtime.log(message) },`
	`199`	`+});`
	`200`	`+}`
`193`	`201`	`if (useWizard && prompter) {`
`194`	`202`	`await prompter.outro(`
`195`	`203`	`deleteConfig`

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import type {`
`5`	`5`	`} from "../../channels/plugins/types.adapters.js";`
`6`	`6`	`import { resolveCommandConfigWithSecrets } from "../../cli/command-config-resolution.js";`
`7`	`7`	`import { getChannelsCommandSecretTargetIds } from "../../cli/command-secret-targets.js";`
	`8`	`+import { refreshPluginRegistryAfterConfigMutation } from "../../cli/plugins-registry-refresh.js";`
`8`	`9`	`import { loadConfig, readConfigFileSnapshot, replaceConfigFile } from "../../config/config.js";`
`9`	`10`	`import { danger } from "../../globals.js";`
`10`	`11`	`import { resolveMessageChannelSelection } from "../../infra/outbound/channel-selection.js";`
`@@ -158,6 +159,13 @@ export async function channelsResolveCommand(opts: ChannelsResolveOptions, runti`
`158`	`159`	`? { writeOptions: { unsetPaths: [Array.from(PLUGIN_INSTALLS_CONFIG_PATH)] } }`
`159`	`160`	`: {}),`
`160`	`161`	`});`
	`162`	`+if (shouldMovePluginInstalls \|\| resolvedExplicit.pluginInstalled) {`
	`163`	`+await refreshPluginRegistryAfterConfigMutation({`
	`164`	`+config: cfg,`
	`165`	`+reason: "source-changed",`
	`166`	`+logger: { warn: (message) => runtime.log(message) },`
	`167`	`+});`
	`168`	`+}`
`161`	`169`	`}`
`162`	`170`
`163`	`171`	`const selection = explicitChannel`

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

推荐订阅源

Recent Commits to openclaw:main