惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

Google DeepMind News
Google DeepMind News
WordPress大学
WordPress大学
S
SegmentFault 最新的问题
小众软件
小众软件
爱范儿
爱范儿
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
量子位
博客园_首页
T
Tailwind CSS Blog
The Cloudflare Blog
J
Java Code Geeks
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
U
Unit 42
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
人人都是产品经理
人人都是产品经理
N
Netflix TechBlog - Medium
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
腾讯CDC
P
Proofpoint News Feed
aimingoo的专栏
aimingoo的专栏
Recent Announcements
Recent Announcements
T
The Blog of Author Tim Ferriss
D
Docker
Microsoft Azure Blog
Microsoft Azure Blog

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(plugins): compose live hook registry view for tool-ca...
amknight · 2026-06-18 · via Recent Commits to openclaw:main

@@ -3,13 +3,25 @@

33

*

44

* Singleton hook runner that's initialized when plugins are loaded

55

* and can be called from anywhere in the codebase.

6+

*

7+

* The runner is created once and resolves hooks live on every dispatch from a

8+

* composed view of the registries that are currently live: the most recently

9+

* initialized registry, the active registry, and the pinned channel/http-route

10+

* surfaces. Freezing one registry caused scoped mid-run activations (harness

11+

* and memory ensures) to rebind the runner to a narrow registry and silently

12+

* drop other plugins' tool-call hooks (#91918). Composing live also preserves

13+

* the older contract that hooks pushed into a registry after initialization

14+

* (e.g. the SDK `addTestHook` helper) dispatch immediately.

615

*/

716817

import { createSubsystemLogger } from "../logging/subsystem.js";

918

import { resolveGlobalSingleton } from "../shared/global-singleton.js";

1019

import type { GlobalHookRunnerRegistry } from "./hook-registry.types.js";

1120

import type { PluginHookGatewayContext, PluginHookGatewayStopEvent } from "./hook-types.js";

1221

import { createHookRunner, type HookRunner } from "./hooks.js";

22+

import { isPluginRegistryRetired } from "./registry-lifecycle.js";

23+

import type { PluginRegistry } from "./registry-types.js";

24+

import { collectLivePluginRegistries } from "./runtime.js";

13251426

type HookRunnerGlobalState = {

1527

hookRunner: HookRunner | null;

@@ -25,27 +37,153 @@ const getState = () =>

25372638

const getLog = () => createSubsystemLogger("plugins");

273940+

function collectHookRegistrySources(

41+

lastInitialized: GlobalHookRunnerRegistry | null,

42+

): GlobalHookRunnerRegistry[] {

43+

const ordered: GlobalHookRunnerRegistry[] = [];

44+

const seen = new Set<GlobalHookRunnerRegistry>();

45+

const add = (registry: GlobalHookRunnerRegistry | null) => {

46+

if (!registry || seen.has(registry)) {

47+

return;

48+

}

49+

// Retired registries were superseded by a newer activation; dispatching

50+

// their hooks would resurrect stale config closures. Only lastInitialized

51+

// can be retired here (the live registries below are active/pinned, never

52+

// retired); SDK-supplied registries are not PluginRegistry and never match.

53+

if (isPluginRegistryRetired(registry as PluginRegistry)) {

54+

return;

55+

}

56+

seen.add(registry);

57+

ordered.push(registry);

58+

};

59+

// Precedence: the explicitly initialized registry wins so an SDK caller that

60+

// initializes an isolated registry stays authoritative; in the gateway it is

61+

// the same object as the active registry, so this just dedupes.

62+

add(lastInitialized);

63+

for (const registry of collectLivePluginRegistries()) {

64+

add(registry);

65+

}

66+

return ordered;

67+

}

68+69+

function composeLiveHookRegistry(

70+

lastInitialized: GlobalHookRunnerRegistry | null,

71+

): GlobalHookRunnerRegistry {

72+

const sources = collectHookRegistrySources(lastInitialized);

73+

// One source registry owns a plugin's entire contribution (status + hooks),

74+

// so handlers never double-fire across registries and a plugin's hooks stay

75+

// paired with the status the inbound-claim path reads.

76+

const ownerSourceIndexByPluginId = new Map<string, number>();

77+

const claimOwner = (pluginId: string, index: number) => {

78+

if (!ownerSourceIndexByPluginId.has(pluginId)) {

79+

ownerSourceIndexByPluginId.set(pluginId, index);

80+

}

81+

};

82+

// pluginIds each source actually contributes a hook for, so ownership can

83+

// prefer a source that carries the plugin's hooks over a same-plugin record

84+

// that loaded without any (e.g. a setup-runtime channel load registers the

85+

// channel but not the plugin's api.on(...) hooks).

86+

const hookPluginIdsBySource = sources.map((registry) => {

87+

const ids = new Set<string>();

88+

for (const hook of registry.typedHooks) {

89+

ids.add(hook.pluginId);

90+

}

91+

for (const hook of registry.hooks) {

92+

ids.add(hook.pluginId);

93+

}

94+

return ids;

95+

});

96+

// Prefer the highest-precedence source where the plugin loaded AND actually

97+

// contributes a hook, so a loaded-but-hookless record (failed/disabled scoped

98+

// reload, or a setup-runtime channel load) cannot shadow a lower-precedence

99+

// registration that still carries a fail-closed tool-call gate.

100+

sources.forEach((registry, index) => {

101+

for (const plugin of registry.plugins) {

102+

if (plugin.status === "loaded" && hookPluginIdsBySource[index].has(plugin.id)) {

103+

claimOwner(plugin.id, index);

104+

}

105+

}

106+

});

107+

// Then a loaded record owns the plugin's status when no live source

108+

// contributes a hook for it, keeping status paired with a single owner.

109+

sources.forEach((registry, index) => {

110+

for (const plugin of registry.plugins) {

111+

if (plugin.status === "loaded") {

112+

claimOwner(plugin.id, index);

113+

}

114+

}

115+

});

116+

sources.forEach((registry, index) => {

117+

for (const plugin of registry.plugins) {

118+

claimOwner(plugin.id, index);

119+

}

120+

});

121+

// Defensive: claim any hook whose plugin record is absent from .plugins so a

122+

// malformed registry never silently drops a registered hook.

123+

sources.forEach((registry, index) => {

124+

for (const hook of registry.typedHooks) {

125+

claimOwner(hook.pluginId, index);

126+

}

127+

for (const hook of registry.hooks) {

128+

claimOwner(hook.pluginId, index);

129+

}

130+

});

131+

return {

132+

hooks: sources.flatMap((registry, index) =>

133+

registry.hooks.filter((hook) => ownerSourceIndexByPluginId.get(hook.pluginId) === index),

134+

),

135+

typedHooks: sources.flatMap((registry, index) =>

136+

registry.typedHooks.filter((hook) => ownerSourceIndexByPluginId.get(hook.pluginId) === index),

137+

),

138+

plugins: sources.flatMap((registry, index) =>

139+

registry.plugins.filter((plugin) => ownerSourceIndexByPluginId.get(plugin.id) === index),

140+

),

141+

};

142+

}

143+144+

function createComposedHookRegistryFacade(state: HookRunnerGlobalState): GlobalHookRunnerRegistry {

145+

// Live getters: createHookRunner reads these on every hasHooks/getHooksForName

146+

// call, so the runner always dispatches the current live registry set rather

147+

// than a snapshot captured at initialization. Composition is bounded by the

148+

// small live registry set and runs on hook-paced events, not tight loops.

149+

return {

150+

get hooks() {

151+

return composeLiveHookRegistry(state.registry).hooks;

152+

},

153+

get typedHooks() {

154+

return composeLiveHookRegistry(state.registry).typedHooks;

155+

},

156+

get plugins() {

157+

return composeLiveHookRegistry(state.registry).plugins;

158+

},

159+

};

160+

}

161+28162

/**

29163

* Initialize the global hook runner with a plugin registry.

30-

* Called once when plugins are loaded during gateway startup.

164+

* Called on every plugin registry activation and by SDK consumers. The runner

165+

* instance stays stable so references captured mid-run keep seeing current

166+

* hooks; the passed registry becomes the highest-precedence composition source.

31167

*/

32168

export function initializeGlobalHookRunner(registry: GlobalHookRunnerRegistry): void {

33169

const state = getState();

34170

const log = getLog();

35171

state.registry = registry;

36-

state.hookRunner = createHookRunner(registry, {

37-

logger: {

38-

debug: (msg) => log.debug(msg),

39-

warn: (msg) => log.warn(msg),

40-

error: (msg) => log.error(msg),

41-

},

42-

catchErrors: true,

43-

failurePolicyByHook: {

44-

before_agent_run: "fail-closed",

45-

before_install: "fail-closed",

46-

before_tool_call: "fail-closed",

47-

},

48-

});

172+

if (!state.hookRunner) {

173+

state.hookRunner = createHookRunner(createComposedHookRegistryFacade(state), {

174+

logger: {

175+

debug: (msg) => log.debug(msg),

176+

warn: (msg) => log.warn(msg),

177+

error: (msg) => log.error(msg),

178+

},

179+

catchErrors: true,

180+

failurePolicyByHook: {

181+

before_agent_run: "fail-closed",

182+

before_install: "fail-closed",

183+

before_tool_call: "fail-closed",

184+

},

185+

});

186+

}

4918750188

const hookCount = registry.hooks.length;

51189

if (hookCount > 0) {

@@ -62,8 +200,9 @@ export function getGlobalHookRunner(): HookRunner | null {

62200

}

6320164202

/**

65-

* Get the global plugin registry.

66-

* Returns null if plugins haven't been loaded yet.

203+

* Get the registry from the most recent activation or explicit initialization.

204+

* Returns null if plugins haven't been loaded yet. Hook dispatch does not use

205+

* this single registry; the runner resolves hooks from the live composed view.

67206

*/

68207

export function getGlobalPluginRegistry(): GlobalHookRunnerRegistry | null {

69208

return getState().registry;