scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-08-28 05:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: move PreToolUse hooks after user approval and handle array content in PostToolUse

Browse source 
- Moved PreToolUse hook execution into askApproval callback so hooks only
  fire after the user approves the tool, avoiding wasted API calls on
  rejected tools
- Fixed PostToolUse hook to extract text from array-format
  ToolResultBlockParam.content instead of silently returning empty string
This commit is contained in:
Roo Code 2026-02-17 17:53:00 +00:00
parent 055a1dff0c
commit 47ff524552
1 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/core/assistant-message/presentAssistantMessage.ts
View file

@ -527,6 +527,28 @@ export async function presentAssistantMessage(cline: Task) {
approvalFeedback = { text, images }
}
// === PreToolUse Hook (fires after user approves to avoid wasting API calls on rejected tools) ===
try {
const hooksManager = cline.providerRef.deref()?.getHooksManager()
if (hooksManager?.hasHooksForEvent("PreToolUse")) {
const matchingHooks = hooksManager.getMatchingHooks("PreToolUse", block.name)
if (matchingHooks.length > 0) {
const hookContext: HookContext = {
event: "PreToolUse",
toolName: block.name,
toolInput: block.nativeArgs || block.params,
}
const hookResults = await executeHooks(matchingHooks, hookContext, cline.apiConfiguration)
const hookOutput = formatHookResults(hookResults)
if (hookOutput) {
await cline.say("hook_output", `PreToolUse hook for ${block.name}:\n${hookOutput}`)
}
}
}
} catch (hookError) {
console.warn(`[presentAssistantMessage] PreToolUse hook error:`, hookError)
}
return true
}
@ -677,30 +699,6 @@ export async function presentAssistantMessage(cline: Task) {
}
}
// === PreToolUse Hook ===
if (!block.partial) {
try {
const hooksManager = cline.providerRef.deref()?.getHooksManager()
if (hooksManager?.hasHooksForEvent("PreToolUse")) {
const matchingHooks = hooksManager.getMatchingHooks("PreToolUse", block.name)
if (matchingHooks.length > 0) {
const hookContext: HookContext = {
event: "PreToolUse",
toolName: block.name,
toolInput: block.nativeArgs || block.params,
}
const hookResults = await executeHooks(matchingHooks, hookContext, cline.apiConfiguration)
const hookOutput = formatHookResults(hookResults)
if (hookOutput) {
await cline.say("hook_output", `PreToolUse hook for ${block.name}:\n${hookOutput}`)
}
}
}
} catch (hookError) {
console.warn(`[presentAssistantMessage] PreToolUse hook error:`, hookError)
}
}
switch (block.name) {
case "write_to_file":
await checkpointSaveAndMark(cline)
@ -963,11 +961,10 @@ export async function presentAssistantMessage(cline: Task) {
: Array.isArray(lastResult?.content)
? lastResult.content
.filter(
(b): b is import("@anthropic-ai/sdk").Anthropic.TextBlockParam =>
b.type === "text",
(b): b is Anthropic.TextBlockParam => b.type === "text",
)
.map((b) => b.text)
.join("\n")
.join("\n") || ""
: ""
const hookContext: HookContext = {
event: "PostToolUse",