mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-02 03:04:56 +00:00
* refactor: extract agent core package Introduce packages/agent-core as the OpenClaw-owned home for reusable agent loop, harness, session, prompt, and runtime dependency contracts. * refactor: extract shared llm runtime Move provider model registries, stream wrappers, OAuth helpers, and LLM utilities into src/llm with plugin-sdk barrels instead of depending on the old embedded runtime layout. * refactor: remove pi runtime internals Rename remaining Pi-shaped agent surfaces to OpenClaw agent runtime names, delete obsolete Pi docs and package graph checks, and add the third-party notice for incorporated code. * refactor: tighten agent session runtime Make agent-core/runtime dependencies explicit, consolidate compaction and session transcript helpers, and move model/session helpers behind OpenClaw-owned contracts. * refactor: remove static model and pi auth paths Drop static model catalogs and Pi auth bridges, move model/provider facts to manifest-owned runtime contracts, and harden internal embedded-agent utilities. * refactor: remove legacy provider compat paths * docs: remove agent parity notes * fix: skip provider wildcard metadata parsing * refactor: share session extension sdk loading * refactor: inline acpx proxy error formatter * refactor: fold edit recovery into edit tool * fix: accept extension batch separator * test: align startup provider plugin expectations * fix: restore provider-scoped release discovery * test: align static asset packaging expectations * fix: run static provider catalogs during scoped discovery * fix: add provider entry catalogs for scoped live discovery * fix: load lightweight provider catalog entries * fix: refresh provider-scoped plugin metadata * fix: keep provider catalog entries on release live path * fix: keep static manifest models in release live checks * fix: harden release model discovery * fix: reduce OpenAI live cache probe reasoning * fix: disable OpenAI cache probe reasoning * ci: extend OpenAI gateway live timeout * fix: extend live gateway model budget * fix: stabilize release validation regressions * fix: honor provider aliases in model rows * fix: stabilize release validation lanes * fix: stabilize release memory qa * ci: stabilize release validation lanes * ci: prefer ipv4 for live docker node calls * fix: restore shared tool-call stream wrapper * ci: remove legacy pi test shard alias * fix: clean up embedded agent test drift * fix: stabilize runtime alias status * fix: clean up embedded agent ci drift * fix: restore release ci invariants * fix: clean up post-rebase runtime drift * fix: restore release ci checks * fix: restore release ci after rebase * fix: remove stale pi runtime path * test: align compaction runtime expectations * test: update plugin prerelease expectations * fix: handle claude live tool approvals * fix: stabilize release validation gates * fix: finish agent runtime import * test: finish post-rebase agent runtime mocks * fix: keep codex compaction native * fix: stabilize codex app-server hook tests * test: isolate codex diagnostic active run * test: remove codex diagnostic completion race # Conflicts: # extensions/codex/src/app-server/run-attempt.test.ts * ci: fix full release manifest performance run id * refactor: narrow llm plugin sdk boundary * chore: drop generated google boundary stamps * fix: repair rebase fallout * fix: clean up rebased runtime references * fix: decode codex jwt payloads as base64url * fix: preserve shipped pi runtime alias * fix: add scoped sdk virtual modules * fix: decode llm codex oauth jwt as base64url * fix: avoid stale vertex adc negative cache * fix: harden tool arg decoding and codeql path * fix: keep vertex adc negative checks live * refactor: consolidate codex jwt and edit helpers * fix: await codex oauth node runtime imports * fix: preserve sdk tool and notice contracts * fix: preserve shipped compat config boundaries * fix: align codex oauth callback host * fix: terminate agent-core loop streams on failure * fix: keep codex oauth callback alive during fallback * ci: include session tools in critical codeql scans * fix: keep Cloudflare Anthropic provider auth header * docs: redirect legacy pi runtime pages * fix: honor bundled web provider compat discovery * fix: protect session output spill files * fix: keep legacy agent dir env blocked * fix: contain auto-discovered skill symlinks * fix: harden agent core sdk proxy surfaces * fix: restore approval reaction sdk compat * fix: keep live docker runs bounded * fix: keep codex oauth redirect host aligned * fix: resolve post-rebase agent runtime drift * fix: redact anthropic oauth parse failures * fix: preserve responses strict tool shaping * fix: repair agent runtime rebase cleanup * docs: redirect retired parity pages * fix: bound auto-discovered resources to roots * fix: repair post-rebase agent test drift * fix: preserve bundled provider allowlist migration * fix: preserve manifest-owned provider aliases * fix: declare photon image dependency * fix: keep provider headers out of proxy body * fix: preserve shipped env aliases * fix: refresh control ui i18n generated state * fix: quote read fallback paths * fix: preview edits through configured backend * test: satisfy core test typecheck * fix: preserve ZAI usage auth fallback * test: repair codex diagnostic test * fix: repair agent runtime rebase drift * test: finish embedded runner import rename * fix: repair agent runtime rebase integrations * test: align compaction oauth fallback expectations * fix: allow sdk-auth session models * fix: update doctor tool schema import * fix: preserve bedrock plugin region * fix: stream harmony-like prose immediately * ci: include session runtime in codeql shards * fix: repair latest rebase integrations * fix: honor explicit codex websocket transport * fix: keep openai-compatible credentials provider-scoped * fix: refresh sdk api baseline after rebase * fix: route cli runtime aliases through openclaw harness * test: rename stale harness mock expectation * test: rename embedded agent overflow calls * test: clean embedded auth test wording * test: use openclaw stream types in deepinfra cache test * fix: refresh sdk api baseline on latest main * fix: honor bundled discovery compat allowlists * fix: refresh sdk api baseline after latest rebase * fix: remove stale rebase imports * test: rename stale model catalog mock * test: mock renamed doctor runtime modules * fix: map canonical kimi env auth * fix: use internal model registry in bench script * fix: migrate deepinfra provider catalog entry * fix: enforce builtin tool suppression * fix: route compaction auth and proxy payloads safely * refactor: prune unused llm registry leftovers * test: update codex hooks session import * test: fix model picker ci coverage * test: align model picker auth mock types
368 lines
12 KiB
TypeScript
368 lines
12 KiB
TypeScript
import { sortUniqueStrings } from "../shared/string-normalization.js";
|
|
import { withActivatedPluginIds } from "./activation-context.js";
|
|
import { resolveBundledPluginCompatibleActivationInputs } from "./activation-context.js";
|
|
import { resolveManifestActivationPluginIds } from "./activation-planner.js";
|
|
import { getLoadedRuntimePluginRegistry } from "./active-runtime-registry.js";
|
|
import { extractPluginInstallRecordsFromInstalledPluginIndex } from "./installed-plugin-index-install-records.js";
|
|
import {
|
|
getRuntimePluginRegistryForLoadOptions,
|
|
isPluginRegistryLoadInFlight,
|
|
loadOpenClawPlugins,
|
|
type PluginLoadOptions,
|
|
} from "./loader.js";
|
|
import { loadPluginMetadataSnapshot } from "./plugin-metadata-snapshot.js";
|
|
import type { PluginMetadataRegistryView } from "./plugin-metadata-snapshot.types.js";
|
|
import { hasExplicitPluginIdScope } from "./plugin-scope.js";
|
|
import { resolveProviderConfigApiOwnerHint } from "./provider-config-owner.js";
|
|
import {
|
|
resolveActivatableProviderOwnerPluginIds,
|
|
resolveDiscoverableProviderOwnerPluginIds,
|
|
resolveDiscoveredProviderPluginIds,
|
|
resolveEnabledProviderPluginIds,
|
|
resolveBundledProviderCompatPluginIds,
|
|
resolveOwningPluginIdsForModelRefs,
|
|
resolveOwningPluginIdsForProviderRef,
|
|
withBundledProviderVitestCompat,
|
|
} from "./providers.js";
|
|
import { getActivePluginRegistryWorkspaceDir } from "./runtime.js";
|
|
import {
|
|
buildPluginRuntimeLoadOptionsFromValues,
|
|
createPluginRuntimeLoaderLogger,
|
|
} from "./runtime/load-context.js";
|
|
import type { ProviderPlugin } from "./types.js";
|
|
|
|
function dedupeSortedPluginIds(values: Iterable<string>): string[] {
|
|
return sortUniqueStrings(values);
|
|
}
|
|
|
|
function resolveExplicitProviderOwnerPluginIds(
|
|
params: {
|
|
providerRefs: readonly string[];
|
|
config?: PluginLoadOptions["config"];
|
|
workspaceDir?: string;
|
|
env?: PluginLoadOptions["env"];
|
|
},
|
|
snapshot: PluginMetadataRegistryView,
|
|
): string[] {
|
|
return dedupeSortedPluginIds(
|
|
params.providerRefs.flatMap((provider) => {
|
|
const plannedPluginIds = resolveManifestActivationPluginIds({
|
|
trigger: {
|
|
kind: "provider",
|
|
provider,
|
|
},
|
|
config: params.config,
|
|
workspaceDir: params.workspaceDir,
|
|
env: params.env,
|
|
manifestRecords: snapshot.manifestRegistry.plugins,
|
|
});
|
|
if (plannedPluginIds.length > 0) {
|
|
return plannedPluginIds;
|
|
}
|
|
const apiOwnerHint = resolveProviderConfigApiOwnerHint({
|
|
provider,
|
|
config: params.config,
|
|
});
|
|
if (apiOwnerHint) {
|
|
const apiOwnerPluginIds = resolveManifestActivationPluginIds({
|
|
trigger: {
|
|
kind: "provider",
|
|
provider: apiOwnerHint,
|
|
},
|
|
config: params.config,
|
|
workspaceDir: params.workspaceDir,
|
|
env: params.env,
|
|
manifestRecords: snapshot.manifestRegistry.plugins,
|
|
});
|
|
if (apiOwnerPluginIds.length > 0) {
|
|
return apiOwnerPluginIds;
|
|
}
|
|
}
|
|
return (
|
|
resolveOwningPluginIdsForProviderRef({
|
|
provider,
|
|
config: params.config,
|
|
workspaceDir: params.workspaceDir,
|
|
env: params.env,
|
|
manifestRegistry: snapshot.manifestRegistry,
|
|
}) ?? []
|
|
);
|
|
}),
|
|
);
|
|
}
|
|
|
|
function mergeExplicitOwnerPluginIds(
|
|
providerPluginIds: readonly string[],
|
|
explicitOwnerPluginIds: readonly string[],
|
|
): string[] {
|
|
if (explicitOwnerPluginIds.length === 0) {
|
|
return [...providerPluginIds];
|
|
}
|
|
return dedupeSortedPluginIds([...providerPluginIds, ...explicitOwnerPluginIds]);
|
|
}
|
|
|
|
function resolvePluginProviderLoadBase(
|
|
params: {
|
|
config?: PluginLoadOptions["config"];
|
|
workspaceDir?: string;
|
|
env?: PluginLoadOptions["env"];
|
|
onlyPluginIds?: string[];
|
|
providerRefs?: readonly string[];
|
|
modelRefs?: readonly string[];
|
|
},
|
|
snapshot: PluginMetadataRegistryView,
|
|
) {
|
|
const env = params.env ?? process.env;
|
|
const workspaceDir = params.workspaceDir ?? getActivePluginRegistryWorkspaceDir();
|
|
const providerOwnedPluginIds = params.providerRefs?.length
|
|
? resolveExplicitProviderOwnerPluginIds(
|
|
{
|
|
providerRefs: params.providerRefs,
|
|
config: params.config,
|
|
workspaceDir,
|
|
env,
|
|
},
|
|
snapshot,
|
|
)
|
|
: [];
|
|
const modelOwnedPluginIds = params.modelRefs?.length
|
|
? resolveOwningPluginIdsForModelRefs({
|
|
models: params.modelRefs,
|
|
config: params.config,
|
|
workspaceDir,
|
|
env,
|
|
manifestRegistry: snapshot.manifestRegistry,
|
|
})
|
|
: [];
|
|
const requestedPluginIds =
|
|
hasExplicitPluginIdScope(params.onlyPluginIds) ||
|
|
params.providerRefs?.length ||
|
|
params.modelRefs?.length ||
|
|
providerOwnedPluginIds.length > 0 ||
|
|
modelOwnedPluginIds.length > 0
|
|
? dedupeSortedPluginIds([
|
|
...(params.onlyPluginIds ?? []),
|
|
...providerOwnedPluginIds,
|
|
...modelOwnedPluginIds,
|
|
])
|
|
: undefined;
|
|
const explicitOwnerPluginIds = dedupeSortedPluginIds([
|
|
...providerOwnedPluginIds,
|
|
...modelOwnedPluginIds,
|
|
]);
|
|
return {
|
|
env,
|
|
workspaceDir,
|
|
requestedPluginIds,
|
|
explicitOwnerPluginIds,
|
|
rawConfig: params.config,
|
|
};
|
|
}
|
|
|
|
function resolveSetupProviderPluginLoadState(
|
|
params: Parameters<typeof resolvePluginProviders>[0],
|
|
base: ReturnType<typeof resolvePluginProviderLoadBase>,
|
|
snapshot: PluginMetadataRegistryView,
|
|
) {
|
|
const providerPluginIds = resolveDiscoveredProviderPluginIds({
|
|
config: params.config,
|
|
workspaceDir: base.workspaceDir,
|
|
env: base.env,
|
|
onlyPluginIds: base.requestedPluginIds,
|
|
includeUntrustedWorkspacePlugins: params.includeUntrustedWorkspacePlugins,
|
|
registry: snapshot.index,
|
|
manifestRegistry: snapshot.manifestRegistry,
|
|
});
|
|
const explicitOwnerPluginIds = resolveDiscoverableProviderOwnerPluginIds({
|
|
pluginIds: base.explicitOwnerPluginIds,
|
|
config: params.config,
|
|
workspaceDir: base.workspaceDir,
|
|
env: base.env,
|
|
includeUntrustedWorkspacePlugins: params.includeUntrustedWorkspacePlugins,
|
|
registry: snapshot.index,
|
|
manifestRegistry: snapshot.manifestRegistry,
|
|
});
|
|
const setupPluginIds = mergeExplicitOwnerPluginIds(providerPluginIds, explicitOwnerPluginIds);
|
|
if (setupPluginIds.length === 0) {
|
|
return undefined;
|
|
}
|
|
const setupConfig = withActivatedPluginIds({
|
|
config: base.rawConfig,
|
|
pluginIds: setupPluginIds,
|
|
});
|
|
const loadOptions = buildPluginRuntimeLoadOptionsFromValues(
|
|
{
|
|
config: setupConfig,
|
|
activationSourceConfig: setupConfig,
|
|
autoEnabledReasons: {},
|
|
workspaceDir: base.workspaceDir,
|
|
env: base.env,
|
|
logger: createPluginRuntimeLoaderLogger(),
|
|
manifestRegistry: snapshot.manifestRegistry,
|
|
installRecords: extractPluginInstallRecordsFromInstalledPluginIndex(snapshot.index),
|
|
},
|
|
{
|
|
onlyPluginIds: setupPluginIds,
|
|
pluginSdkResolution: params.pluginSdkResolution,
|
|
cache: params.cache ?? false,
|
|
activate: params.activate ?? false,
|
|
},
|
|
);
|
|
return { loadOptions };
|
|
}
|
|
|
|
function resolveRuntimeProviderPluginLoadState(
|
|
params: Parameters<typeof resolvePluginProviders>[0],
|
|
base: ReturnType<typeof resolvePluginProviderLoadBase>,
|
|
snapshot: PluginMetadataRegistryView,
|
|
) {
|
|
const explicitOwnerPluginIds = resolveActivatableProviderOwnerPluginIds({
|
|
pluginIds: base.explicitOwnerPluginIds,
|
|
config: base.rawConfig,
|
|
workspaceDir: base.workspaceDir,
|
|
env: base.env,
|
|
includeUntrustedWorkspacePlugins: params.includeUntrustedWorkspacePlugins,
|
|
registry: snapshot.index,
|
|
manifestRegistry: snapshot.manifestRegistry,
|
|
});
|
|
const runtimeRequestedPluginIds =
|
|
base.requestedPluginIds !== undefined
|
|
? dedupeSortedPluginIds([...(params.onlyPluginIds ?? []), ...explicitOwnerPluginIds])
|
|
: undefined;
|
|
const requestConfig = withActivatedPluginIds({
|
|
config: base.rawConfig,
|
|
pluginIds: explicitOwnerPluginIds,
|
|
});
|
|
const activation = resolveBundledPluginCompatibleActivationInputs({
|
|
rawConfig: requestConfig,
|
|
env: base.env,
|
|
workspaceDir: base.workspaceDir,
|
|
onlyPluginIds: runtimeRequestedPluginIds,
|
|
applyAutoEnable: params.applyAutoEnable ?? true,
|
|
compatMode: {
|
|
vitest: params.bundledProviderVitestCompat,
|
|
},
|
|
resolveCompatPluginIds: (compatParams) =>
|
|
resolveBundledProviderCompatPluginIds({
|
|
...compatParams,
|
|
manifestRegistry: snapshot.manifestRegistry,
|
|
}),
|
|
});
|
|
const config = params.bundledProviderVitestCompat
|
|
? withBundledProviderVitestCompat({
|
|
config: activation.config,
|
|
pluginIds: activation.compatPluginIds,
|
|
env: base.env,
|
|
})
|
|
: activation.config;
|
|
const providerPluginIds = mergeExplicitOwnerPluginIds(
|
|
resolveEnabledProviderPluginIds({
|
|
config,
|
|
workspaceDir: base.workspaceDir,
|
|
env: base.env,
|
|
onlyPluginIds: runtimeRequestedPluginIds,
|
|
registry: snapshot.index,
|
|
manifestRegistry: snapshot.manifestRegistry,
|
|
}),
|
|
explicitOwnerPluginIds,
|
|
);
|
|
const loadOptions = buildPluginRuntimeLoadOptionsFromValues(
|
|
{
|
|
config,
|
|
activationSourceConfig: activation.activationSourceConfig,
|
|
autoEnabledReasons: activation.autoEnabledReasons,
|
|
workspaceDir: base.workspaceDir,
|
|
env: base.env,
|
|
logger: createPluginRuntimeLoaderLogger(),
|
|
manifestRegistry: snapshot.manifestRegistry,
|
|
installRecords: extractPluginInstallRecordsFromInstalledPluginIndex(snapshot.index),
|
|
},
|
|
{
|
|
onlyPluginIds: providerPluginIds,
|
|
pluginSdkResolution: params.pluginSdkResolution,
|
|
cache: params.cache ?? true,
|
|
activate: params.activate ?? false,
|
|
},
|
|
);
|
|
return { loadOptions };
|
|
}
|
|
|
|
export function isPluginProvidersLoadInFlight(
|
|
params: Parameters<typeof resolvePluginProviders>[0],
|
|
): boolean {
|
|
const env = params.env ?? process.env;
|
|
const workspaceDir = params.workspaceDir ?? getActivePluginRegistryWorkspaceDir();
|
|
const snapshot =
|
|
params.pluginMetadataSnapshot ??
|
|
loadPluginMetadataSnapshot({
|
|
config: params.config ?? {},
|
|
workspaceDir,
|
|
env,
|
|
});
|
|
const base = resolvePluginProviderLoadBase({ ...params, workspaceDir, env }, snapshot);
|
|
const loadState =
|
|
params.mode === "setup"
|
|
? resolveSetupProviderPluginLoadState(params, base, snapshot)
|
|
: resolveRuntimeProviderPluginLoadState(params, base, snapshot);
|
|
if (!loadState) {
|
|
return false;
|
|
}
|
|
return isPluginRegistryLoadInFlight(loadState.loadOptions);
|
|
}
|
|
|
|
export function resolvePluginProviders(params: {
|
|
config?: PluginLoadOptions["config"];
|
|
workspaceDir?: string;
|
|
/** Use an explicit env when plugin roots should resolve independently from process.env. */
|
|
env?: PluginLoadOptions["env"];
|
|
bundledProviderVitestCompat?: boolean;
|
|
onlyPluginIds?: string[];
|
|
providerRefs?: readonly string[];
|
|
modelRefs?: readonly string[];
|
|
activate?: boolean;
|
|
cache?: boolean;
|
|
applyAutoEnable?: boolean;
|
|
pluginSdkResolution?: PluginLoadOptions["pluginSdkResolution"];
|
|
mode?: "runtime" | "setup";
|
|
includeUntrustedWorkspacePlugins?: boolean;
|
|
pluginMetadataSnapshot?: PluginMetadataRegistryView;
|
|
}): ProviderPlugin[] {
|
|
const env = params.env ?? process.env;
|
|
const workspaceDir = params.workspaceDir ?? getActivePluginRegistryWorkspaceDir();
|
|
const snapshot =
|
|
params.pluginMetadataSnapshot ??
|
|
loadPluginMetadataSnapshot({
|
|
config: params.config ?? {},
|
|
workspaceDir,
|
|
env,
|
|
});
|
|
const base = resolvePluginProviderLoadBase({ ...params, workspaceDir, env }, snapshot);
|
|
if (params.mode === "setup") {
|
|
const loadState = resolveSetupProviderPluginLoadState(params, base, snapshot);
|
|
if (!loadState) {
|
|
return [];
|
|
}
|
|
const registry = loadOpenClawPlugins(loadState.loadOptions);
|
|
return registry.providers.map((entry) =>
|
|
Object.assign({}, entry.provider, { pluginId: entry.pluginId }),
|
|
);
|
|
}
|
|
const loadState = resolveRuntimeProviderPluginLoadState(params, base, snapshot);
|
|
const registry =
|
|
loadState.loadOptions.onlyPluginIds?.length === 0
|
|
? undefined
|
|
: (getLoadedRuntimePluginRegistry({
|
|
env: base.env,
|
|
loadOptions: loadState.loadOptions,
|
|
workspaceDir: base.workspaceDir,
|
|
requiredPluginIds: loadState.loadOptions.onlyPluginIds,
|
|
}) ?? getRuntimePluginRegistryForLoadOptions(loadState.loadOptions));
|
|
if (!registry) {
|
|
return [];
|
|
}
|
|
|
|
return registry.providers.map((entry) =>
|
|
Object.assign({}, entry.provider, { pluginId: entry.pluginId }),
|
|
);
|
|
}
|