- 根因: loop/agent.decodeToolCalls 只读 resp.Message.ToolCallName/resp.Content JSON信封, 从不看 api 原生解析出的 resp.ToolCalls(Anthropic tool_use / OpenAI tool_calls) → 模型返回 thinking+tool_use(无text) 被判定'无工具调用' → 空 Content 当最终 text → res.Text="" → no reply produced; 纯聊天消息不调工具直接出 text, 故表现为'部分消息无回复' - agent/step.go: ToolCall 增 ID; ExtractToolCalls 导出并优先 resp.ToolCalls(保留原生id+归一化nil Args), 回落两旧约定 - loop/request.go: decodeToolCalls 委托 agent.ExtractToolCalls(流式/非流式共用) - loop/tool_history.go(新): 原生批次回填 assistant tool_use + 带tool_use_id的tool_result; 旧JSON信封批次保持 RoleTool 纯文本(向后兼容) - openai.go: tool_call parts 编成 tool_calls + tool_call_id - 新增 native_toolcall_test + native_toolcall_http_test(httptest假Anthropic SSE: round1 tool_use(无text)→round2含tool_use_id/tool_result→res.Text非空) - build/vet/test绿+交叉编译
159 lines
5.9 KiB
Go
159 lines
5.9 KiB
Go
package agent
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/model"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/tool"
|
|
)
|
|
|
|
// Stop reasons carried by StepResult.StopReason, consumed by the loop (M2) to
|
|
// decide how to continue after a step.
|
|
const (
|
|
// StopReasonStop is a normal final answer with no tool calls.
|
|
StopReasonStop = "stop"
|
|
// StopReasonToolCalls means the assistant requested tool calls.
|
|
StopReasonToolCalls = "tool_calls"
|
|
// StopReasonGuardrailInput means the input guardrail blocked the request.
|
|
StopReasonGuardrailInput = "guardrail_input"
|
|
// StopReasonGuardrailOutput means the output guardrail blocked the response.
|
|
StopReasonGuardrailOutput = "guardrail_output"
|
|
)
|
|
|
|
// ToolCall is a single function call the assistant requested, decoded from a
|
|
// step. Args holds the tool arguments as a JSON object.
|
|
type ToolCall struct {
|
|
// ID is the provider tool_use/tool_call id, so the loop can feed the result
|
|
// back as a native tool_result correlated to the exact call (Anthropic
|
|
// tool_use_id / OpenAI tool_call_id). Empty for the legacy JSON-envelope
|
|
// convention, where the provider emitted no id.
|
|
ID string `json:"id,omitempty"`
|
|
Name string `json:"name"`
|
|
Args map[string]any `json:"args"`
|
|
}
|
|
|
|
// StepResult is the outcome of a single agent step.
|
|
type StepResult struct {
|
|
// Final is true when the step produced a final answer (or was intercepted by
|
|
// a guardrail) and no tool execution is required.
|
|
Final bool
|
|
// Text is the assistant's final text, or the guardrail's block reason when
|
|
// Final is true.
|
|
Text string
|
|
// ToolCalls is non-empty when Final is false, listing the tool calls to run.
|
|
ToolCalls []ToolCall
|
|
// StopReason classifies how the step ended (see the StopReason* consts).
|
|
StopReason string
|
|
}
|
|
|
|
// RunStep executes one step of the agent loop. It assembles a model.Request from
|
|
// the agent's instructions prepended as a leading system message plus the
|
|
// conversation messages, runs input guardrails, calls the model adapter, runs
|
|
// output guardrails and decodes any tool calls. sessionID identifies the
|
|
// conversation for downstream tracing/telemetry and is currently carried without
|
|
// a sink; it is reserved for trace/persist (M2/M9).
|
|
//
|
|
// A final text answer yields Final=true with StopReason "stop"; a tool request
|
|
// yields Final=false with the decoded ToolCalls; a guardrail denial yields
|
|
// Final=true carrying the block reason. A nil adapter or a failed guardrail or
|
|
// model call returns a wrapped error.
|
|
func (a *Agent) RunStep(ctx context.Context, sessionID string, messages []model.Message) (*StepResult, error) {
|
|
req := a.buildRequest(messages)
|
|
|
|
if a.guards != nil {
|
|
verdict, err := a.guards.CheckInput(ctx, &req)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("agent: check input: %w", err)
|
|
}
|
|
if verdict != nil && !verdict.Allow {
|
|
return &StepResult{Final: true, Text: verdict.Reason, StopReason: StopReasonGuardrailInput}, nil
|
|
}
|
|
}
|
|
|
|
if a.adapter == nil {
|
|
return nil, fmt.Errorf("agent: run step: %w", ErrNoAdapter)
|
|
}
|
|
|
|
start := time.Now()
|
|
resp, err := a.adapter.Chat(ctx, req, model.Options{})
|
|
if err != nil {
|
|
return nil, fmt.Errorf("agent: chat: %w", err)
|
|
}
|
|
if a.recorder != nil {
|
|
a.recorder(model.CallRecord{
|
|
Model: resp.Model,
|
|
Purpose: req.Purpose,
|
|
Tokens: resp.TotalTokens,
|
|
TookMs: time.Since(start).Milliseconds(),
|
|
})
|
|
}
|
|
|
|
if a.guards != nil {
|
|
verdict, err := a.guards.CheckOutput(ctx, &resp)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("agent: check output: %w", err)
|
|
}
|
|
if verdict != nil && !verdict.Allow {
|
|
return &StepResult{Final: true, Text: verdict.Reason, StopReason: StopReasonGuardrailOutput}, nil
|
|
}
|
|
}
|
|
|
|
if calls, ok := ExtractToolCalls(resp); ok {
|
|
return &StepResult{Final: false, ToolCalls: calls, StopReason: StopReasonToolCalls}, nil
|
|
}
|
|
return &StepResult{Final: true, Text: resp.Content, StopReason: StopReasonStop}, nil
|
|
}
|
|
|
|
// ExtractToolCalls decodes tool calls from a model.Response. It prefers the
|
|
// provider-native ToolCalls the adapters populate (Anthropic tool_use / OpenAI
|
|
// tool_calls), which carry the provider id needed to correlate the result and
|
|
// are the only shape a real native-tool provider emits. It then falls back to
|
|
// two legacy conventions used by prompt-engineered providers:
|
|
//
|
|
// 1. The normalized assistant-message placeholder: when resp.Message carries a
|
|
// ToolCallName it is a single call with no argument payload.
|
|
// 2. A JSON envelope in resp.Content of the form
|
|
// {"tool_calls":[{"name":"...","args":{...}}]}.
|
|
//
|
|
// It reports ok=true (with a non-empty slice) when a call is decoded, and
|
|
// ok=false otherwise.
|
|
func ExtractToolCalls(resp model.Response) ([]ToolCall, bool) {
|
|
if len(resp.ToolCalls) > 0 {
|
|
return nativeToolCalls(resp.ToolCalls), true
|
|
}
|
|
if resp.Message.Role == model.RoleAssistant && resp.Message.ToolCallName != "" {
|
|
return []ToolCall{{Name: resp.Message.ToolCallName, Args: map[string]any{}}}, true
|
|
}
|
|
var payload struct {
|
|
ToolCalls []ToolCall `json:"tool_calls"`
|
|
}
|
|
// Lenient decode repairs common model-emitted malformations (code fences,
|
|
// trailing commas) so a slightly broken tool-call envelope does not silently
|
|
// turn into a text answer; an unrecoverable payload still yields ok=false and
|
|
// the round proceeds as text (the loop never crashes on a bad call).
|
|
if err := tool.LenientJSONUnmarshal([]byte(resp.Content), &payload); err != nil {
|
|
return nil, false
|
|
}
|
|
if len(payload.ToolCalls) == 0 {
|
|
return nil, false
|
|
}
|
|
return payload.ToolCalls, true
|
|
}
|
|
|
|
// nativeToolCalls converts the adapter-decoded provider tool calls into the
|
|
// agent's ToolCall, preserving the provider id and normalizing a nil Args to an
|
|
// empty object so downstream fingerprinting and invocation never see nil.
|
|
func nativeToolCalls(calls []model.ToolCall) []ToolCall {
|
|
out := make([]ToolCall, 0, len(calls))
|
|
for _, c := range calls {
|
|
args := c.Args
|
|
if args == nil {
|
|
args = map[string]any{}
|
|
}
|
|
out = append(out, ToolCall{ID: c.ID, Name: c.Name, Args: args})
|
|
}
|
|
return out
|
|
}
|