update

2026-08-11 16:43:48 +07:00
parent 5a27630ccf
commit 89885c1583
5 changed files with 206 additions and 185 deletions
@@ -509,41 +509,42 @@ prepareToolCall(context, msg, tc, config, abortedSignal)
 ```
 """
 function prepareToolCall(
-    context::agentContext,
-    assistantMsg::assistantMessage,
-    toolCall::agentToolCall,
-    config::agentLoopConfig,
-    signal::Union{Nothing, abortSignal},
+  context::agentContext,
+  assistantMsg::assistantMessage,
+  toolCall::agentToolCall,
+  config::agentLoopConfig,
+  signal::Union{Nothing, abortSignal},
 )::Union{preparedToolCall,immediateOutcome}

-    tool = get(context.tools, toolCall.name, nothing)
-    if tool === nothing
-        return immediateOutcome(createErrorToolResult("Tool $toolCall.name not found"), true)
+  tool = get(context.tools, toolCall.name, nothing)
+  if tool === nothing
+    return immediateOutcome(createErrorToolResult("Tool $toolCall.name not found"), true)
+  end
+
+  try
+    # 1. prepare arguments (tool-specific transform)
+    prepared = prepareToolCallArguments(tool, toolCall)
+    validatedArgs = validateToolArguments(tool, prepared)
+
+    #WORKING 2. beforeToolCall hook — can block
+    if config.beforeToolCall !== nothing
+      before = config.beforeToolCall(
+        beforeToolCallContext(assistantMsg, toolCall, validatedArgs, context), 
+        signal
+        )
+      if signal !== nothing && signal.aborted
+        return immediateOutcome(createErrorToolResult("Operation aborted"), true)
+      end
+      if before !== nothing && before.block
+        return immediateOutcome(
+          createErrorToolResult(get(before, :reason, "Tool execution was blocked")), true)
+      end
    end

-    try
-        # 1. prepare arguments (tool-specific transform)
-        prepared = prepareToolCallArguments(tool, toolCall)
-        validatedArgs = validateToolArguments(tool, prepared)
-
-        # 2. beforeToolCall hook — can block
-        if config.beforeToolCall !== nothing
-            before = config.beforeToolCall(
-                assistantMsgCtx(assistantMsg, toolCall, validatedArgs, context), signal
-            )
-            if signal !== nothing && signal.aborted
-                return immediateOutcome(createErrorToolResult("Operation aborted"), true)
-            end
-            if before !== nothing && before.block
-                return immediateOutcome(
-                    createErrorToolResult(get(before, :reason, "Tool execution was blocked")), true)
-            end
-        end
-
-        return preparedToolCall(tool, toolCall, validatedArgs)
-    catch err
-        return immediateOutcome(createErrorToolResult(sprint(showerror, err)), true)
-    end
+    return preparedToolCall(tool, toolCall, validatedArgs)
+  catch err
+    return immediateOutcome(createErrorToolResult(sprint(showerror, err)), true)
+  end
 end

 # ── per-call execution ──────────────────────────────────────────
@@ -687,7 +688,7 @@ function finalizeExecutedToolCall(
    if config.afterToolCall !== nothing
        try
            after = config.afterToolCall(
-                afterCtx(assistantMsg, prep.toolCall, prep.args, result, isError, context), signal
+                afterToolCallContext(assistantMsg, prep.toolCall, prep.args, result, isError, context), signal
            )
            if after !== nothing
                result = merge(result, dict(:content=>get(after,:content,result.content),