mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-08 09:40:43 +00:00
Fix startup and per-turn provider registry hot paths by keeping primary-model startup discovery on metadata-only provider entries and by keeping capability provider fallback loads scoped to manifest-derived owners, including explicit empty scopes when no bundled owner exists.
Evidence:
- Reproduces the reported code paths from #73729, #73835, and #73793: startup prewarm was able to enter provider/model discovery that loaded plugin runtime, and capability lookups could bypass active registry reuse or broaden fallback registry loads.
- Fix threads providerDiscoveryEntriesOnly through models-config planning into plugin discovery.
- Fix reuses active non-memory/non-speech capability providers even with explicit plugins.entries.
- Fix keeps fallback registry loads scoped with onlyPluginIds, including [] for no-owner media capability checks.
- Local targeted tests passed for gateway startup, models config, provider discovery, capability providers, and web provider runtimes.
- Testbox pnpm check:changed passed.
- Testbox pnpm build passed.
- GitHub CI required checks passed on e5e6fe1d52.
Fixes #73729.
Fixes #73835.
Fixes #73793.
Supersedes #73794.
118 lines
3.3 KiB
TypeScript
118 lines
3.3 KiB
TypeScript
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
import type { PluginMetadataSnapshotOwnerMaps } from "../plugins/plugin-metadata-snapshot.js";
|
|
import type { ProviderPlugin } from "../plugins/types.js";
|
|
|
|
const mocks = vi.hoisted(() => ({
|
|
resolveRuntimePluginDiscoveryProviders: vi.fn(),
|
|
runProviderCatalog: vi.fn(),
|
|
}));
|
|
|
|
vi.mock("../plugins/provider-discovery.js", () => ({
|
|
resolveRuntimePluginDiscoveryProviders: mocks.resolveRuntimePluginDiscoveryProviders,
|
|
runProviderCatalog: mocks.runProviderCatalog,
|
|
groupPluginDiscoveryProvidersByOrder: (providers: ProviderPlugin[]) => ({
|
|
simple: providers,
|
|
profile: [],
|
|
paired: [],
|
|
late: [],
|
|
}),
|
|
normalizePluginDiscoveryResult: ({
|
|
provider,
|
|
result,
|
|
}: {
|
|
provider: ProviderPlugin;
|
|
result?: { provider?: unknown; providers?: Record<string, unknown> } | null;
|
|
}) => result?.providers ?? (result?.provider ? { [provider.id]: result.provider } : {}),
|
|
}));
|
|
|
|
import { resolveImplicitProviders } from "./models-config.providers.implicit.js";
|
|
|
|
function metadataOwners(
|
|
overrides: Partial<PluginMetadataSnapshotOwnerMaps>,
|
|
): PluginMetadataSnapshotOwnerMaps {
|
|
return {
|
|
channels: new Map(),
|
|
channelConfigs: new Map(),
|
|
providers: new Map(),
|
|
modelCatalogProviders: new Map(),
|
|
cliBackends: new Map(),
|
|
setupProviders: new Map(),
|
|
commandAliases: new Map(),
|
|
contracts: new Map(),
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function createProvider(id: string): ProviderPlugin {
|
|
return {
|
|
id,
|
|
label: id,
|
|
auth: [],
|
|
catalog: {
|
|
order: "simple",
|
|
run: async () => null,
|
|
},
|
|
};
|
|
}
|
|
|
|
describe("resolveImplicitProviders startup discovery scope", () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
mocks.resolveRuntimePluginDiscoveryProviders.mockResolvedValue([createProvider("openai")]);
|
|
mocks.runProviderCatalog.mockResolvedValue({
|
|
providers: {
|
|
openai: {
|
|
baseUrl: "https://api.openai.com/v1",
|
|
api: "openai-responses",
|
|
models: [],
|
|
},
|
|
},
|
|
});
|
|
});
|
|
|
|
it("passes startup provider scopes as plugin owner filters", async () => {
|
|
await resolveImplicitProviders({
|
|
agentDir: "/tmp/openclaw-agent",
|
|
config: {},
|
|
env: {} as NodeJS.ProcessEnv,
|
|
explicitProviders: {},
|
|
pluginMetadataSnapshot: {
|
|
index: { plugins: [] } as never,
|
|
manifestRegistry: { plugins: [], diagnostics: [] },
|
|
owners: metadataOwners({
|
|
providers: new Map([["openai", ["openai"]]]),
|
|
}),
|
|
},
|
|
providerDiscoveryProviderIds: ["openai"],
|
|
providerDiscoveryTimeoutMs: 1234,
|
|
});
|
|
|
|
expect(mocks.resolveRuntimePluginDiscoveryProviders).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
onlyPluginIds: ["openai"],
|
|
}),
|
|
);
|
|
expect(mocks.runProviderCatalog).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
timeoutMs: 1234,
|
|
}),
|
|
);
|
|
});
|
|
|
|
it("can keep startup discovery on provider discovery entries only", async () => {
|
|
await resolveImplicitProviders({
|
|
agentDir: "/tmp/openclaw-agent",
|
|
config: {},
|
|
env: {} as NodeJS.ProcessEnv,
|
|
explicitProviders: {},
|
|
providerDiscoveryEntriesOnly: true,
|
|
});
|
|
|
|
expect(mocks.resolveRuntimePluginDiscoveryProviders).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
discoveryEntriesOnly: true,
|
|
}),
|
|
);
|
|
});
|
|
});
|