github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 01:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(hooks): deduplicate before_tool_call hook in toToolDefinitions (#15502)

Browse Source
This commit is contained in:
damaozi
2026-02-14 01:44:13 +08:00
committed by Peter Steinberger
parent b4430c126a
commit 534e4213a1
4 changed files with 50 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/agents/pi-tool-definition-adapter.ts
View File

@@ -91,17 +91,11 @@ export function toToolDefinitions(tools: AnyAgentTool[]): ToolDefinition[] {
execute: async (...args: ToolExecuteArgs): Promise<AgentToolResult<unknown>> => {
const { toolCallId, params, onUpdate, signal } = splitToolExecuteArgs(args);
try {
// Call before_tool_call hook
const hookOutcome = await runBeforeToolCallHook({
toolName: name,
params,
toolCallId,
});
if (hookOutcome.blocked) {
throw new Error(hookOutcome.reason);
}
const adjustedParams = hookOutcome.params;
const result = await tool.execute(toolCallId, adjustedParams, signal, onUpdate);
// NOTE: before_tool_call hook is NOT called here — it is already
// invoked by wrapToolWithBeforeToolCallHook (applied in pi-tools.ts)
// before the tool reaches toToolDefinitions. Calling it again would
// fire the hook twice per invocation (#15502).
const result = await tool.execute(toolCallId, params, signal, onUpdate);
// Call after_tool_call hook
const hookRunner = getGlobalHookRunner();
@@ -110,7 +104,7 @@ export function toToolDefinitions(tools: AnyAgentTool[]): ToolDefinition[] {
await hookRunner.runAfterToolCall(
{
toolName: name,
params: isPlainObject(adjustedParams) ? adjustedParams : {},
params: isPlainObject(params) ? params : {},
result,
},
{ toolName: name },