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

fix: dispatch before_tool_call and after_tool_call hooks from both tool execution paths (openclaw#15012) thanks @Patrick-Barletta

Browse Source 
Verified:
- pnpm check

Co-authored-by: Patrick-Barletta <67929313+Patrick-Barletta@users.noreply.github.com>
This commit is contained in:
Patrick Barletta
2026-02-12 16:48:11 -08:00
committed by GitHub
parent da2d09f57a
commit d34138dfee
8 changed files with 107 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/agents/pi-embedded-subscribe.handlers.tools.ts
View File

@@ -1,4 +1,8 @@
import type { AgentEvent } from "@mariozechner/pi-agent-core";
import type {
PluginHookAfterToolCallEvent,
PluginHookBeforeToolCallEvent,
} from "../plugins/types.js";
import type { EmbeddedPiSubscribeContext } from "./pi-embedded-subscribe.handlers.types.js";
import { emitAgentEvent } from "../infra/agent-events.js";
import { getGlobalHookRunner } from "../plugins/hook-runner-global.js";
@@ -57,6 +61,20 @@ export async function handleToolExecutionStart(
// Track start time and args for after_tool_call hook
toolStartData.set(toolCallId, { startTime: Date.now(), args });
// Call before_tool_call hook
const hookRunner = ctx.hookRunner ?? getGlobalHookRunner();
if (hookRunner?.hasHooks?.("before_tool_call")) {
try {
const hookEvent: PluginHookBeforeToolCallEvent = {
toolName,
params: args && typeof args === "object" ? (args as Record<string, unknown>) : {},
};
await hookRunner.runBeforeToolCall(hookEvent, { toolName });
} catch (err) {
ctx.log.debug(`before_tool_call hook failed: tool=${toolName} error=${String(err)}`);
}
}
if (toolName === "read") {
const record = args && typeof args === "object" ? (args as Record<string, unknown>) : {};
const filePath = typeof record.path === "string" ? record.path.trim() : "";
@@ -151,7 +169,7 @@ export function handleToolExecutionUpdate(
});
}
export function handleToolExecutionEnd(
export async function handleToolExecutionEnd(
ctx: EmbeddedPiSubscribeContext,
evt: AgentEvent & {
toolName: string;
@@ -234,30 +252,25 @@ export function handleToolExecutionEnd(
}
// Run after_tool_call plugin hook (fire-and-forget)
const hookRunner = getGlobalHookRunner();
if (hookRunner?.hasHooks("after_tool_call")) {
const hookRunnerAfter = ctx.hookRunner ?? getGlobalHookRunner();
if (hookRunnerAfter?.hasHooks("after_tool_call")) {
const startData = toolStartData.get(toolCallId);
toolStartData.delete(toolCallId);
const durationMs = startData?.startTime != null ? Date.now() - startData.startTime : undefined;
const toolArgs = startData?.args;
void hookRunner
.runAfterToolCall(
{
toolName,
params: (toolArgs && typeof toolArgs === "object" ? toolArgs : {}) as Record<
string,
unknown
>,
result: sanitizedResult,
error: isToolError ? extractToolErrorMessage(sanitizedResult) : undefined,
durationMs,
},
{
toolName,
agentId: undefined,
sessionKey: undefined,
},
)
const hookEvent: PluginHookAfterToolCallEvent = {
toolName,
params: (toolArgs && typeof toolArgs === "object" ? toolArgs : {}) as Record<string, unknown>,
result: sanitizedResult,
error: isToolError ? extractToolErrorMessage(sanitizedResult) : undefined,
durationMs,
};
void hookRunnerAfter
.runAfterToolCall(hookEvent, {
toolName,
agentId: undefined,
sessionKey: undefined,
})
.catch((err) => {
ctx.log.warn(`after_tool_call hook failed: tool=${toolName} error=${String(err)}`);
});