ton/YiemAgent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

update

Browse Source
This commit is contained in:
narawat
2026-09-02 11:17:41 +07:00
parent 096baad09d
commit 6db50b6a52
6 changed files with 199 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/agentCore.jl
+96 -80
View File
@@ -114,6 +114,27 @@ function yiemAgent(
followUp = Channel(32)
outputChannel = Channel(16)
if mcpServer === nothing
""" please implement the following MCP server interface
struct mcpServer
natsConn::NATS.Connection
topic::String
senderID::String
end
# MCP protocol: tools/list — returns tool definitions (JSON-RPC 2.0)
# check input and output format from MCP server doc
function (mcp::mcpServer)(method::String, sessionId::String)::AbstractDict{String, <:Any}
error("please implement MCP server tools/list interface")
end
# MCP protocol: tools/call — executes a tool (JSON-RPC 2.0)
function (mcp::mcpServer)(method::String, toolName::String, arguments::Dict{String, Any},
sessionId::String)::AbstractDict{String, <:Any}
error("please implement MCP server interface")
end
"""
end
tools = OrderedDict{String, agentTool}()
registerAllTools(tools, mcpServer; eventSink=eventSink, sessionId=sessionId)
@@ -211,18 +232,18 @@ function _agentLoop(agent::yiemAgent)
while true
while newUserMsg === nothing
if isready(agent.inputChannel)
agent.eventSink("_agentLoop 1 agent._state.messages length $(length(agent._state.messages))")
agent.eventSink("_agentLoop 1 agent._state.messages length $(length(agent._state.messages))"; publish=false, log=true)
# agent process new user msg immediately after the current tool call finished.
newUserMsg = take!(agent.inputChannel)
agent.eventSink("new user msg")
agent.eventSink("new user msg"; publish=false, log=true)
else
# check followUp message after _processMessage() is done
if typeof(processingTask) == Task && istaskdone(processingTask) == true
agent.eventSink("_agentLoop 2 agent._state.messages length $(length(agent._state.messages))")
agent.eventSink("_agentLoop 2 agent._state.messages length $(length(agent._state.messages))"; publish=false, log=true)
# if agent runs is done but followUpChannel has messages,
# put new message in inputChannel instead
if isready(agent.followUpChannel)
agent.eventSink("_agentLoop 3 agent._state.messages length $(length(agent._state.messages))")
agent.eventSink("_agentLoop 3 agent._state.messages length $(length(agent._state.messages))"; publish=false, log=true)
while isready(agent.followUpChannel)
followUpMsg = take!(agent.followUpChannel)
put!(agent.inputChannel, followUpMsg)
@@ -230,18 +251,18 @@ function _agentLoop(agent::yiemAgent)
processingTask = nothing # reset
result = nothing # reset
else # _processMessage() done and no followUp message.
agent.eventSink("_agentLoop 4 agent._state.messages length $(length(agent._state.messages))")
agent.eventSink("_agentLoop 4 agent._state.messages length $(length(agent._state.messages))"; publish=false, log=true)
result = deepcopy(agent._state.messages[end])
agent.eventSink("_agentLoop 4-1 ")
agent.eventSink("_agentLoop 4-1 "; publish=false, log=true)
# filter out reasoningContent in-place
filter!(c -> !(c isa reasoningContent), result.content)
agent.eventSink("_agentLoop 5 ")
agent.eventSink("_agentLoop 5 "; publish=false, log=true)
# format output
respondToUI = _assistantMessageToOpenAI(result)
agent.eventSink("_agentLoop 6 ")
agent.eventSink("_agentLoop 6 "; publish=false, log=true)
put!(agent.outputChannel, respondToUI)
if !isempty(result.content) && result.content[1] isa textContent
agent.eventSink(result.content[1].text)
agent.eventSink(result.content[1].text; publish=false, log=true)
end
processingTask = nothing # reset
result = nothing # reset
@@ -272,7 +293,7 @@ function _agentLoop(agent::yiemAgent)
else
# spawn new _processMessage() if it is not already running.
if processingTask === nothing
agent.eventSink("_agentLoop 5 agent._state.messages length $(length(agent._state.messages))")
agent.eventSink("_agentLoop 5 agent._state.messages length $(length(agent._state.messages))"; publish=false, log=true)
# discard all messages in followUpChannel
while isready(agent.followUpChannel)
_ = take!(agent.followUpChannel)
@@ -303,7 +324,7 @@ function _agentLoop(agent::yiemAgent)
showerror(io, e, bt)
println(io)
end
eventSink(errMsg)
eventSink(errMsg; publish=false, log=true)
# On any error, send error response and exit the loop
@error "Agent loop failed" error=e
@@ -351,7 +372,7 @@ function _processMessage(
afterToolCall::Union{Function, Nothing},
parallelToolExecute::Bool,
)::Nothing
eventSink("_processMessage 1 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 1 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
# loop until llmCall() response didn't use tool calls
final_response = nothing
@@ -372,43 +393,43 @@ function _processMessage(
try
# Drain inputChannel and convert OpenAI-format messages to userMessage type
while isready(inputChannel)
eventSink("_processMessage 2 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 2 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
newUserMsg_openai = take!(inputChannel)
eventSink("_processMessage 3 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 3 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
if newUserMsg_openai === :shutdown
eventSink("_processMessage 4 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 4 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
# Re-emit shutdown signal for the loop to handle
put!(inputChannel, :shutdown)
break
end
eventSink("_processMessage 5 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 5 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
newUserMsg = OpenAiToUserMessage(newUserMsg_openai)
push!(agentMsgHistory, newUserMsg)
eventSink("_processMessage 6 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 6 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
end
eventSink("_processMessage 7 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 7 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
# call prepareContext()
state = agentState(systemPrompt, nothing, tools, agentMsgHistory)
eventSink("_processMessage 8 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 8 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
preparedContext = prepareContext(state, eventSink)
eventSink("_processMessage 9 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 9 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
# Call formatMessagesForLLM() to format for LLM
formattedMessages = formatMessagesForLLM(preparedContext, eventSink)
eventSink("_processMessage 10 formattedMessages $formattedMessages")
eventSink("_processMessage 10 formattedMessages $formattedMessages"; publish=false, log=true)
""" response example
response = JSON.Object{String, Any}("finish_reason" => "tool_calls", "index" => 0, "message" => JSON.Object{String, Any}("role" => "assistant", "content" => "", "reasoning_content" => "Here's a thinking process:\n\n1. **Identify User Request**: The user is asking for the weather in Bangkok.\n2. **Locate Relevant Tool**: I have a `getWeather` function available.\n3. **Check Function Parameters**:\n - `city` (required): City and country, e.g., 'San Francisco, CA' or 'Tokyo, Japan'\n - `units` (optional, default \"celsius\"): Temperature scale (\"celsius\" or \"fahrenheit\")\n4. **Prepare Parameters**:\n - `city`: \"Bangkok, Thailand\" (adding country for clarity, though just \"Bangkok\" might work, following the example format is safer)\n - `units`: Not specified, so I'll use the default (\"celsius\")\n5. **Execute Tool Call**: Call `getWeather` with `city: \"Bangkok, Thailand\"`\n6. **Anticipate Response**: The function will return current weather and forecast data for Bangkok. I'll then format it nicely for the user.\n - *Self-Correction/Verification during thought*: The prompt says \"city: City and country, e.g., 'San Francisco, CA' or 'Tokyo, Japan'\". I'll use \"Bangkok, Thailand\". The `units` parameter is optional, so I'll omit it to use the default.\n - Proceed with tool call.✅\n", "tool_calls" => Any[JSON.Object{String, Any}("type" => "function", "function" => JSON.Object{String, Any}("name" => "getWeather", "arguments" => "{\"city\":\"Bangkok, Thailand\"}"), "id" => "6fOilR5QPcdppbAAHluhkRyUDu3oWMAL")]))
"""
response = llmCall(formattedMessages)
eventSink("LLM response " * string(response))
eventSink("LLM response " * string(response); publish=false, log=true)
eventSink("_processMessage 11 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 11 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
# Extract tool calls from LLM response content blocks
hasToolCalls, toolCallList, assistant_msg = _extractToolCalls(response)
eventSink("hasToolCalls: $hasToolCalls\ntoolCallList: $toolCallList _state.messages length $(length(agentMsgHistory))")
eventSink("assistant_msg " * string(assistant_msg))
eventSink("_processMessage 11-1")
eventSink("hasToolCalls: $hasToolCalls\ntoolCallList: $toolCallList _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
eventSink("assistant_msg " * string(assistant_msg); publish=false, log=true)
eventSink("_processMessage 11-1"; publish=false, log=true)
# Add assistant message (tool calls or text) to history for next LLM turn
push!(agentMsgHistory, assistant_msg)
@@ -423,21 +444,21 @@ function _processMessage(
)
signal = abortSignal(false)
eventSink("_processMessage 12 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 12 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
# call executeToolCalls()
toolResultBatch = executeToolCalls(preparedContext, assistant_msg, toolCallList, config,
signal, eventSink)
eventSink("_processMessage 13 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 13 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
# save toolResults to messages
for toolResult in toolResultBatch.messages
eventSink("toolResult " * string(toolResult))
eventSink("toolResult " * string(toolResult); publish=false, log=true)
push!(agentMsgHistory, toolResult)
end
eventSink("_processMessage 14 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 14 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
if toolResultBatch.terminate
eventSink("_processMessage 15 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 15 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
# If toolResultBatch requested termination, build a final response
final_content = [textContent("Tool execution completed.")]
for toolResult in toolResultBatch.messages
@@ -451,7 +472,7 @@ function _processMessage(
end
end
end
eventSink("_processMessage 16 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 16 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
final_response = assistantMessage(
role="assistant",
content=final_content,
@@ -470,7 +491,7 @@ function _processMessage(
break
end
else
eventSink("_processMessage 17 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 17 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
# LLM did not use tool calls —
break
end
@@ -481,12 +502,12 @@ function _processMessage(
println(io)
end
eventSink(err_msg)
eventSink(err_msg; publish=false, log=true)
end
end
eventSink("_processMessage 18 _state.messages length $(length(agentMsgHistory))")
eventSink("_processMessage 18 _state.messages length $(length(agentMsgHistory))"; publish=false, log=true)
return nothing
end
@@ -926,46 +947,46 @@ function prepareToolCall(
signal::abortSignal,
eventSink
)::Union{preparedToolCall,immediateOutcome}
eventSink("prepareToolCall 1")
eventSink("prepareToolCall 1"; publish=false, log=true)
# pick a called tool from tool store
tool = get(context.tools, toolCall.name, nothing)
if tool === nothing
eventSink("prepareToolCall 2")
eventSink("prepareToolCall 2"; publish=false, log=true)
return immediateOutcome(createErrorToolResult("Tool $toolCall.name not found"), true)
end
try
eventSink("prepareToolCall 3")
eventSink("prepareToolCall 3"; publish=false, log=true)
# 1. prepare arguments (tool-specific transform)
prepared = prepareToolCallArguments(tool, toolCall)
eventSink("prepared " * string(prepared.arguments))
eventSink("prepareToolCall 4")
eventSink("prepared " * string(prepared.arguments); publish=false, log=true)
eventSink("prepareToolCall 4"; publish=false, log=true)
validatedArgs = validateToolArguments(tool, prepared)
eventSink("validatedArgs " * string(validatedArgs))
eventSink("prepareToolCall 5")
eventSink("validatedArgs " * string(validatedArgs); publish=false, log=true)
eventSink("prepareToolCall 5"; publish=false, log=true)
# 2. beforeToolCall hook — can block
if config.beforeToolCall !== nothing
eventSink("prepareToolCall 6")
eventSink("prepareToolCall 6"; publish=false, log=true)
before = config.beforeToolCall(
beforeToolCallContext(assistantMsg, toolCall, validatedArgs, context),
signal
)
eventSink("prepareToolCall 7")
eventSink("prepareToolCall 7"; publish=false, log=true)
if signal.aborted
eventSink("prepareToolCall 8")
eventSink("prepareToolCall 8"; publish=false, log=true)
return immediateOutcome(createErrorToolResult("Operation aborted"), true)
end
if before !== nothing && before.block
eventSink("prepareToolCall 9")
eventSink("prepareToolCall 9"; publish=false, log=true)
return immediateOutcome(
createErrorToolResult(get(before, :reason, "Tool execution was blocked")), true)
end
end
eventSink("prepareToolCall 10")
eventSink("prepareToolCall 10"; publish=false, log=true)
return preparedToolCall(tool, toolCall, validatedArgs)
catch e
bt = catch_backtrace()
@@ -974,7 +995,7 @@ function prepareToolCall(
println(io)
end
eventSink(errMsg)
eventSink(errMsg; publish=false, log=true)
return immediateOutcome(createErrorToolResult(sprint(showerror, e)), true)
end
@@ -1026,13 +1047,13 @@ function executePreparedToolCall(
signal::Union{Nothing,abortSignal},
eventSink,
)::executedOutcome
eventSink("executePreparedToolCall 1")
eventSink("executePreparedToolCall 1"; publish=false, log=true)
try #WORKING pass sessionId from yiemAgent to tool call
result = prep.tool.execute(prep.toolCall.id, prep.args, signal, eventSink)
eventSink("executePreparedToolCall 2")
eventSink("tool execute raw result: " * sprint(show, result))
eventSink("executePreparedToolCall 3")
eventSink("executePreparedToolCall 2"; publish=false, log=true)
eventSink("tool execute raw result: " * sprint(show, result); publish=false, log=true)
eventSink("executePreparedToolCall 3"; publish=false, log=true)
return executedOutcome(result, false)
catch e
bt = catch_backtrace()
@@ -1040,7 +1061,7 @@ function executePreparedToolCall(
showerror(io, e, bt)
println(io)
end
eventSink(errMsg)
eventSink(errMsg; publish=false, log=true)
return executedOutcome(createErrorToolResult(sprint(showerror, e)), true)
end
@@ -1112,17 +1133,17 @@ function finalizeExecutedToolCall(
signal::Union{Nothing,abortSignal},
eventSink
)::finalizedOutcome
eventSink("finalizeExecutedToolCall 1")
eventSink("finalizeExecutedToolCall 1"; publish=false, log=true)
result = executed.result
isError = executed.isError
eventSink("finalizeExecutedToolCall 2")
eventSink("finalizeExecutedToolCall 2"; publish=false, log=true)
if config.afterToolCall !== nothing
try
after = config.afterToolCall(
afterToolCallContext(assistantMsg, prep.toolCall, prep.args, result, isError, context),
signal
)
eventSink("finalizeExecutedToolCall 3")
eventSink("finalizeExecutedToolCall 3"; publish=false, log=true)
if after !== nothing
result = merge(result, dict(:content=>get(after,:content,result.content),
:details=>get(after,:details,result.details),
@@ -1136,13 +1157,13 @@ function finalizeExecutedToolCall(
showerror(io, e, bt)
println(io)
end
eventSink(errMsg)
eventSink(errMsg; publish=false, log=true)
result = createErrorToolResult(sprint(showerror, e))
isError = true
end
end
eventSink("finalizeExecutedToolCall 4")
eventSink("finalizeExecutedToolCall 4"; publish=false, log=true)
return finalizedOutcome(prep.toolCall, result, isError)
end
@@ -1208,39 +1229,39 @@ function executeToolCallsSequential(
signal::abortSignal,
eventSink,
)::agentToolCallBatch
eventSink("executeToolCallsSequential 1")
eventSink("executeToolCallsSequential 1"; publish=false, log=true)
finalizedCalls = finalizedOutcome[]
messages = toolResultMessage[]
for tc in toolCalls
eventSink("start tool execute $(tc.id), $(tc.name), $(tc.arguments)")
eventSink("start tool execute $(tc.id), $(tc.name), $(tc.arguments)"; publish=false, log=true)
prep = prepareToolCall(context, assistantMsg, tc, config, signal, eventSink)
eventSink("executeToolCallsSequential " * string(prep.args))
eventSink("executeToolCallsSequential " * string(prep.args); publish=false, log=true)
if prep isa immediateOutcome
eventSink("executeToolCallsSequential 2-1")
eventSink("executeToolCallsSequential 2-1"; publish=false, log=true)
finalized = finalizedOutcome(tc, prep.result, prep.isError)
eventSink("executeToolCallsSequential 2-2")
eventSink("executeToolCallsSequential 2-2"; publish=false, log=true)
else
eventSink("executeToolCallsSequential 3")
eventSink("executeToolCallsSequential 3"; publish=false, log=true)
executed = executePreparedToolCall(prep, signal, eventSink)
eventSink("executeToolCallsSequential 3-1")
eventSink("executeToolCallsSequential 3-1"; publish=false, log=true)
finalized = finalizeExecutedToolCall(context, assistantMsg, prep, executed, config,
signal, eventSink)
eventSink("executeToolCallsSequential 3-2")
eventSink("executeToolCallsSequential 3-2"; publish=false, log=true)
end
eventSink("executeToolCallsSequential 4")
eventSink("executeToolCallsSequential 4"; publish=false, log=true)
eventSink("finalized $(finalized.toolCall.id), $(finalized.toolCall.name),
$(finalized.result), $(finalized.isError)")
$(finalized.result), $(finalized.isError)"; publish=false, log=true)
push!(messages, createToolResultMessage(finalized))
push!(finalizedCalls, finalized)
eventSink("executeToolCallsSequential 5")
eventSink("executeToolCallsSequential 5"; publish=false, log=true)
if signal !== nothing && signal.aborted
break
end
end
eventSink("executeToolCallsSequential 6")
eventSink("executeToolCallsSequential 6"; publish=false, log=true)
return agentToolCallBatch(messages, shouldTerminate(finalizedCalls))
end
@@ -1313,7 +1334,7 @@ function executeToolCallsParallel(
entries = Union{finalizedOutcome,Task}[]
for tc in toolCalls
eventSink(toolExecStartEvent(tc.id, tc.name, tc.arguments))
eventSink(toolExecStartEvent(tc.id, tc.name, tc.arguments); publish=false, log=true)
prep = prepareToolCall(context, assistantMsg, tc, config, signal, eventSink)
@@ -1412,7 +1433,7 @@ function executeToolCalls(
eventSink,
)::agentToolCallBatch
eventSink("_executeToolCalls 1")
eventSink("_executeToolCalls 1"; publish=false, log=true)
hasSequential = false
for tc in toolCalls
t = get(context.tools, tc.name, nothing)
@@ -1421,13 +1442,13 @@ function executeToolCalls(
break
end
end
eventSink("_executeToolCalls 2")
eventSink("_executeToolCalls 2"; publish=false, log=true)
if config.toolExecution == "sequential" || hasSequential
eventSink("_executeToolCalls 3")
eventSink("_executeToolCalls 3"; publish=false, log=true)
return executeToolCallsSequential(context, assistantMsg, toolCalls, config, signal,
eventSink)
else
eventSink("_executeToolCalls 4")
eventSink("_executeToolCalls 4"; publish=false, log=true)
return executeToolCallsParallel(context, assistantMsg, toolCalls, config, signal,
eventSink)
end
@@ -1563,11 +1584,6 @@ end