PR #74097: perf(agents/tools): lazily list capability providers in tool model-config resolution

• Repository: openclaw/openclaw
• Author: poolside-ventures
• State: open | merged: False
• Link: https://github.com/openclaw/openclaw/pull/74097

Description (problem / solution / changelog)

Summary

• Problem: resolveCapabilityModelConfigForTool (src/agents/tools/media-tool-shared.ts:246) takes providers: CapabilityProvider[] as a required eagerly-evaluated parameter, and short-circuits via hasToolModelConfig(explicit) after the caller has already computed the provider list. The 3 callers (image-generate-tool.ts:202, video-generate-tool.ts:232, music-generate-tool.ts:138) call listRuntime{Image,Video,Music}GenerationProviders({ config: cfg }) eagerly. On hosted gateways with plugins.entries populated, each provider listing triggers a full plugin-registry reload through resolvePluginCapabilityProviders → loadOpenClawPlugins (~5–6s per call).
• Why it matters: For agents with an explicit, complete modelConfig for image / video / music generation, the provider list is pure waste — resolveCapabilityModelConfigForTool returns at the hasToolModelConfig(explicit) check without using it. With 3 generation tools registered on every agent, that's ~15–18s of wasted wall-clock per turn on hosted gateways. Repro and instrumented stack traces in #74096.
• What changed: providers is now () => CapabilityProvider[] (a thunk). It's only invoked when the function falls through to candidate resolution (i.e. when modelConfig is incomplete). The 3 internal callers pass thunks. Two regression tests added in media-tool-shared.test.ts.
• What did NOT change (scope boundary): Behavior when modelConfig is incomplete (still lists providers and resolves candidates). The provider listing logic itself (listRuntime{Image,Video,Music}GenerationProviders). The capability-provider runtime's caching behavior (separate concern, see #73793). All existing image/video/music tool tests pass unchanged.

Change Type (select all)

• Bug fix
• Refactor required for the fix

Scope (select all touched areas)

• Skills / tool execution

Linked Issue/PR

• Closes #74096
• Related #73793 (independent capability-provider cache fix; this PR helps even without that one)
• This PR fixes a bug or regression

Root Cause

resolveCapabilityModelConfigForTool short-circuits via hasToolModelConfig(explicit) before using the provider list, but the provider list is computed by callers before calling the function. The eager evaluation was the natural choice when the helper was first written, but on hosted gateways it has a hidden cost of ~5–6s per call because listRuntime*GenerationProviders triggers a plugin-registry reload (see #73793 for the deeper cache-miss issue on the registry side). Making the parameter lazy lets the helper choose to evaluate it only when needed.

Tests

• Added 2 tests in src/agents/tools/media-tool-shared.test.ts:
  • does not invoke the providers thunk when an explicit modelConfig resolves
  • invokes the providers thunk when modelConfig is incomplete
• All 116 existing tests in image-generate-tool.test.ts / video-generate-tool.test.ts / music-generate-tool.test.ts pass.

Verification

$ pnpm vitest run src/agents/tools/media-tool-shared.test.ts \
                  src/agents/tools/image-generate-tool.test.ts \
                  src/agents/tools/video-generate-tool.test.ts \
                  src/agents/tools/music-generate-tool.test.ts
 Test Files  6 passed (6)
      Tests  116 passed (116)

Changed files

• src/agents/tools/image-generate-tool.ts (modified, +1/-1)
• src/agents/tools/media-tool-shared.test.ts (modified, +37/-1)
• src/agents/tools/media-tool-shared.ts (modified, +16/-3)
• src/agents/tools/music-generate-tool.ts (modified, +1/-1)
• src/agents/tools/video-generate-tool.ts (modified, +1/-1)

PR #74118: perf(agents/runtime): short-circuit ensureRuntimePluginsLoaded when active registry exists

• Repository: openclaw/openclaw
• Author: poolside-ventures
• State: open | merged: False
• Link: https://github.com/openclaw/openclaw/pull/74118

Description (problem / solution / changelog)

Summary

• Problem: ensureRuntimePluginsLoaded (src/agents/runtime-plugins.ts:6) is called from dispatchReplyFromConfig on every inbound message and rebuilds the entire plugin registry on each call. It builds a 3-field options object (config, workspaceDir, runtimeOptions) and hands it to resolveRuntimePluginRegistry. getCompatibleActivePluginRegistry's strict cacheKey equality comparison fails — boot's options set has 9+ fields (onlyPluginIds, activationSourceConfig, autoEnabledReasons, etc.), so the two hashes always differ. The fall-through runs a full loadOpenClawPlugins: Jiti-loads every plugin module, re-validates manifests, re-runs each plugin's register().
• Why it matters: ~5–6s of wasted wall-clock per inbound message on hosted gateways. The active registry is already a valid answer; rebuilding it produces no useful state change. Repro and instrumented stack traces in #74117.
• What changed: Fast path in ensureRuntimePluginsLoaded — if getActivePluginRegistry() is populated, return immediately. The function's intent is to ensure plugins are loaded; if they already are, the goal is met. Updates the existing test (which was asserting one call — that assertion was wrong; the prior behavior reactivated every time) into a proper regression test that asserts zero calls when the active registry exists.
• What did NOT change (scope boundary): Behavior when no active registry exists (still builds load options and calls resolveRuntimePluginRegistry). loadGatewayPlugins's boot path. getCompatibleActivePluginRegistry's strict-equality logic — that's a more intrusive change to file separately if desired. Plugin reconfiguration paths that explicitly invalidate the active registry (setActivePluginRegistry, gateway restart on config write) — those continue to work as before.

Change Type (select all)

• Bug fix

Scope (select all touched areas)

• Gateway / orchestration
• Skills / tool execution

Linked Issue/PR

• Closes #74117
• Related #73793 / #74096 (independent fixes for the same class of strict-cache-key issue in different code paths)
• This PR fixes a bug or regression

Root Cause

ensureRuntimePluginsLoaded is the simplest member of a family of "ensure registry is loaded" helpers (cf. ensurePluginRegistryLoaded in plugins/runtime/runtime-registry-loader.ts, which has its own scope-tracking short-circuit via pluginRegistryLoaded rank). The agent-side ensureRuntimePluginsLoaded is a thin wrapper that defers all caching responsibility to resolveRuntimePluginRegistry → getCompatibleActivePluginRegistry. That worked when the cache-key derivation matched between boot and dispatch. It stopped working when the boot path grew additional options (onlyPluginIds, activationSourceConfig, etc.) that the dispatch path doesn't supply, but the strict-equality check was never relaxed to a "is-compatible-subset" check.

A more thorough fix would be to make getCompatibleActivePluginRegistry accept subset-compatibility, but that's a larger surface area touching multiple call sites. This PR takes the minimal approach for this specific call site: short-circuit at the helper level. The function's contract is "ensure plugins are loaded", not "always rebuild the registry".

Tests

• Updated src/agents/runtime-plugins.test.ts:
  • Added getActivePluginRegistry mock to the existing vi.mock("../plugins/runtime.js", ...) block.
  • Renamed and rewrote the existing test (does not reactivate plugins when a process already has an active registry — which was incorrectly asserting one call) into short-circuits without rebuilding load options when an active registry exists, asserting zero calls to resolveRuntimePluginRegistry.
  • Other tests (resolves runtime plugins through the shared runtime helper when no active registry is present, etc.) now mock getActivePluginRegistry to return undefined so they exercise the fall-through path.

Verification

$ pnpm vitest run src/agents/runtime-plugins.test.ts
 Test Files  2 passed (2)
      Tests  8 passed (8)

Changed files

• src/agents/runtime-plugins.test.ts (modified, +15/-4)
• src/agents/runtime-plugins.ts (modified, +24/-1)