refactor: unify lazy module loaders · openclaw/openclaw@db06fcd

Recent Commits to openclaw:main

steipete · 2026-05-02 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import type { Mock } from "vitest";`
`2`	`2`	`import { vi } from "vitest";`
`3`	`3`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
	`4`	`+import { createLazyImportLoader } from "../shared/lazy-promise.js";`
`4`	`5`	`import { createTestRuntime } from "./test-runtime-config-helpers.js";`
`5`	`6`
`6`	`7`	`type ReplaceConfigFileResult = Awaited<`
`@@ -44,11 +45,12 @@ vi.mock("./agents.command-shared.js", () => ({`
`44`	`45`
`45`	`46`	`export const runtime = createTestRuntime();`
`46`	`47`
`47`		`-let agentsBindCommandModulePromise: Promise<typeof import("./agents.commands.bind.js")> \| undefined;`
	`48`	`+const agentsBindCommandModuleLoader = createLazyImportLoader(`
	`49`	`+() => import("./agents.commands.bind.js"),`
	`50`	`+);`
`48`	`51`
`49`	`52`	`export async function loadFreshAgentsBindCommandModuleForTest() {`
`50`		`-agentsBindCommandModulePromise ??= import("./agents.commands.bind.js");`
`51`		`-return await agentsBindCommandModulePromise;`
	`53`	`+return await agentsBindCommandModuleLoader.load();`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`export function resetAgentsBindTestHarness(): void {`

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import { normalizeChannelId as normalizeBundledChannelId } from "../channels/reg`
`6`	`6`	`import { isRouteBinding, listRouteBindings } from "../config/bindings.js";`
`7`	`7`	`import type { AgentRouteBinding } from "../config/types.js";`
`8`	`8`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
`9`		`-import { listManifestChannelContributionIds } from "../plugins/manifest-channel-contributions.js";`
	`9`	`+import { listManifestChannelContributionIds } from "../plugins/manifest-contribution-ids.js";`
`10`	`10`	`import { DEFAULT_ACCOUNT_ID, normalizeAgentId } from "../routing/session-key.js";`
`11`	`11`	`import { normalizeOptionalString } from "../shared/string-coerce.js";`
`12`	`12`	`import { normalizeStringEntries } from "../shared/string-normalization.js";`

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import type { AgentRouteBinding } from "../config/types.js";`
`6`	`6`	`import { normalizeAgentId } from "../routing/session-key.js";`
`7`	`7`	`import { type RuntimeEnv, writeRuntimeJson } from "../runtime.js";`
`8`	`8`	`import { defaultRuntime } from "../runtime.js";`
	`9`	`+import { createLazyImportLoader } from "../shared/lazy-promise.js";`
`9`	`10`	`import { describeBinding } from "./agents.binding-format.js";`
`10`	`11`	`import { requireValidConfig, requireValidConfigFileSnapshot } from "./agents.command-shared.js";`
`11`	`12`
`@@ -29,11 +30,12 @@ type AgentsUnbindOptions = {`
`29`	`30`	`json?: boolean;`
`30`	`31`	`};`
`31`	`32`
`32`		`-let agentBindingsModulePromise: Promise<AgentBindingsModule> \| undefined;`
	`33`	`+const agentBindingsModuleLoader = createLazyImportLoader<AgentBindingsModule>(`
	`34`	`+() => import("./agents.bindings.js"),`
	`35`	`+);`
`33`	`36`
`34`	`37`	`function loadAgentBindingsModule(): Promise<AgentBindingsModule> {`
`35`		`-agentBindingsModulePromise ??= import("./agents.bindings.js");`
`36`		`-return agentBindingsModulePromise;`
	`38`	`+return agentBindingsModuleLoader.load();`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`function resolveAgentId(`

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,17 @@ import {`
`5`	`5`	`type BackupCreateResult,`
`6`	`6`	`} from "../infra/backup-create.js";`
`7`	`7`	`import { type RuntimeEnv, writeRuntimeJson } from "../runtime.js";`
	`8`	`+import { createLazyImportLoader } from "../shared/lazy-promise.js";`
`8`	`9`	`export type { BackupCreateOptions, BackupCreateResult } from "../infra/backup-create.js";`
`9`	`10`
`10`	`11`	`type BackupVerifyRuntime = typeof import("./backup-verify.js");`
`11`	`12`
`12`		`-let backupVerifyRuntimePromise: Promise<BackupVerifyRuntime> \| undefined;`
	`13`	`+const backupVerifyRuntimeLoader = createLazyImportLoader<BackupVerifyRuntime>(`
	`14`	`+() => import("./backup-verify.js"),`
	`15`	`+);`
`13`	`16`
`14`	`17`	`function loadBackupVerifyRuntime(): Promise<BackupVerifyRuntime> {`
`15`		`-backupVerifyRuntimePromise ??= import("./backup-verify.js");`
`16`		`-return backupVerifyRuntimePromise;`
	`18`	`+return backupVerifyRuntimeLoader.load();`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`export async function backupCreateCommand(`

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import type { ChannelMeta } from "../../channels/plugins/types.public.js";`
`8`	`8`	`import { isStaticallyChannelConfigured } from "../../config/channel-configured-shared.js";`
`9`	`9`	`import { applyPluginAutoEnable } from "../../config/plugin-auto-enable.js";`
`10`	`10`	`import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`11`		`-import { listManifestChannelContributionIds } from "../../plugins/manifest-channel-contributions.js";`
	`11`	`+import { listManifestChannelContributionIds } from "../../plugins/manifest-contribution-ids.js";`
`12`	`12`	`import type { ChannelChoice } from "../onboard-types.js";`
`13`	`13`	`import {`
`14`	`14`	`listSetupDiscoveryChannelPluginCatalogEntries,`

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import { refreshPluginRegistryAfterConfigMutation } from "../../cli/plugins-regi`
`11`	`11`	`import type { OpenClawConfig } from "../../config/config.js";`
`12`	`12`	`import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../../routing/session-key.js";`
`13`	`13`	`import { defaultRuntime, type RuntimeEnv } from "../../runtime.js";`
	`14`	`+import { createLazyImportLoader } from "../../shared/lazy-promise.js";`
`14`	`15`	`import { normalizeOptionalLowercaseString } from "../../shared/string-coerce.js";`
`15`	`16`	`import { createClackPrompter } from "../../wizard/clack-prompter.js";`
`16`	`17`	`import { applyAgentBindings, describeBinding } from "../agents.bindings.js";`
`@@ -22,17 +23,19 @@ import { requireValidConfigFileSnapshot, shouldUseWizard } from "./shared.js";`
`22`	`23`	`type ChannelSetupPluginInstallModule = typeof import("../channel-setup/plugin-install.js");`
`23`	`24`	`type OnboardChannelsModule = typeof import("../onboard-channels.js");`
`24`	`25`
`25`		`-let channelSetupPluginInstallPromise: Promise<ChannelSetupPluginInstallModule> \| undefined;`
`26`		`-let onboardChannelsPromise: Promise<OnboardChannelsModule> \| undefined;`
	`26`	`+const channelSetupPluginInstallLoader = createLazyImportLoader<ChannelSetupPluginInstallModule>(`
	`27`	`+() => import("../channel-setup/plugin-install.js"),`
	`28`	`+);`
	`29`	`+const onboardChannelsLoader = createLazyImportLoader<OnboardChannelsModule>(`
	`30`	`+() => import("../onboard-channels.js"),`
	`31`	`+);`
`27`	`32`
`28`	`33`	`function loadChannelSetupPluginInstall(): Promise<ChannelSetupPluginInstallModule> {`
`29`		`-channelSetupPluginInstallPromise ??= import("../channel-setup/plugin-install.js");`
`30`		`-return channelSetupPluginInstallPromise;`
	`34`	`+return channelSetupPluginInstallLoader.load();`
`31`	`35`	`}`
`32`	`36`
`33`	`37`	`function loadOnboardChannels(): Promise<OnboardChannelsModule> {`
`34`		`-onboardChannelsPromise ??= import("../onboard-channels.js");`
`35`		`-return onboardChannelsPromise;`
	`38`	`+return onboardChannelsLoader.load();`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`export type ChannelsAddOptions = {`

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { normalizeChannelId as normalizeBundledChannelId } from "../../channels/`
`3`	`3`	`import { getResolvedLoggerSettings } from "../../logging.js";`
`4`	`4`	`import { resolveLogFile } from "../../logging/log-tail.js";`
`5`	`5`	`import { parseLogLine } from "../../logging/parse-log-line.js";`
`6`		`-import { listManifestChannelContributionIds } from "../../plugins/manifest-channel-contributions.js";`
	`6`	`+import { listManifestChannelContributionIds } from "../../plugins/manifest-contribution-ids.js";`
`7`	`7`	`import { defaultRuntime, type RuntimeEnv, writeRuntimeJson } from "../../runtime.js";`
`8`	`8`	`import { normalizeLowercaseStringOrEmpty } from "../../shared/string-coerce.js";`
`9`	`9`	`import { theme } from "../../terminal/theme.js";`

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import { ensureControlUiAssetsBuilt } from "../infra/control-ui-assets.js";`
`12`	`12`	`import { resolvePluginContributionOwners } from "../plugins/plugin-registry.js";`
`13`	`13`	`import type { RuntimeEnv } from "../runtime.js";`
`14`	`14`	`import { defaultRuntime } from "../runtime.js";`
	`15`	`+import { createLazyImportLoader } from "../shared/lazy-promise.js";`
`15`	`16`	`import { normalizeOptionalString } from "../shared/string-coerce.js";`
`16`	`17`	`import { note } from "../terminal/note.js";`
`17`	`18`	`import { isPlainObject, resolveUserPath } from "../utils.js";`
`@@ -56,11 +57,12 @@ type SetupPluginConfigModule = typeof import("../wizard/setup.plugin-config.js")`
`56`	`57`
`57`	`58`	`const GATEWAY_HINT_PROBE_TIMEOUT_MS = 300;`
`58`	`59`
`59`		`-let setupPluginConfigModulePromise: Promise<SetupPluginConfigModule> \| undefined;`
	`60`	`+const setupPluginConfigModuleLoader = createLazyImportLoader<SetupPluginConfigModule>(`
	`61`	`+() => import("../wizard/setup.plugin-config.js"),`
	`62`	`+);`
`60`	`63`
`61`	`64`	`function loadSetupPluginConfigModule(): Promise<SetupPluginConfigModule> {`
`62`		`-setupPluginConfigModulePromise ??= import("../wizard/setup.plugin-config.js");`
`63`		`-return setupPluginConfigModulePromise;`
	`65`	`+return setupPluginConfigModuleLoader.load();`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`function mergeWizardConfigOntoLatest(current: unknown, base: unknown, next: unknown): unknown {`

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { mergeMissing } from "../../../config/legacy.shared.js";`
`2`		`-import { loadPluginMetadataSnapshot } from "../../../plugins/plugin-metadata-snapshot.js";`
	`2`	`+import { loadManifestMetadataSnapshot } from "../../../plugins/manifest-contract-eligibility.js";`
`3`	`3`	`import {`
`4`	`4`	`cloneRecord,`
`5`	`5`	`ensureRecord,`
`@@ -17,7 +17,7 @@ const LEGACY_GLOBAL_WEB_SEARCH_PROVIDER_ID = "brave";`
`17`	`17`
`18`	`18`	`function getBundledLegacyWebSearchOwners(): ReadonlyMap<string, string> {`
`19`	`19`	`const owners = new Map<string, string>();`
`20`		`-for (const plugin of loadPluginMetadataSnapshot({ config: {}, env: process.env }).plugins) {`
	`20`	`+for (const plugin of loadManifestMetadataSnapshot({ config: {}, env: process.env }).plugins) {`
`21`	`21`	`if (plugin.origin !== "bundled") {`
`22`	`22`	`continue;`
`23`	`23`	`}`

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import { installPluginFromNpmSpec } from "../../../plugins/install.js";`
`6`	`6`	`import { loadInstalledPluginIndexInstallRecords } from "../../../plugins/installed-plugin-index-records.js";`
`7`	`7`	`import { writePersistedInstalledPluginIndexInstallRecords } from "../../../plugins/installed-plugin-index-records.js";`
`8`	`8`	`import { buildNpmResolutionInstallFields } from "../../../plugins/installs.js";`
`9`		`-import { loadPluginMetadataSnapshot } from "../../../plugins/plugin-metadata-snapshot.js";`
	`9`	`+import { loadManifestMetadataSnapshot } from "../../../plugins/manifest-contract-eligibility.js";`
`10`	`10`	`import { resolveProviderInstallCatalogEntries } from "../../../plugins/provider-install-catalog.js";`
`11`	`11`	`import { updateNpmInstalledPlugins } from "../../../plugins/update.js";`
`12`	`12`	`import { asObjectRecord } from "./object.js";`
`@@ -154,7 +154,7 @@ export async function repairMissingConfiguredPluginInstalls(params: {`
`154`	`154`	`}): Promise<{ changes: string[]; warnings: string[] }> {`
`155`	`155`	`const env = params.env ?? process.env;`
`156`	`156`	`const knownIds = new Set(`
`157`		`-loadPluginMetadataSnapshot({`
	`157`	`+loadManifestMetadataSnapshot({`
`158`	`158`	`config: params.cfg,`
`159`	`159`	`env,`
`160`	`160`	`}).plugins.map((plugin) => plugin.id),`

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

推荐订阅源

Recent Commits to openclaw:main