Version: 0.9.47.dev.260427
后端: 1. execute 节点继续拆职责——超大 execute.go 下沉为 node/execute 子包,按决策流、动作路由、上下文锚点、工具执行、状态快照、工具展示与参数解析拆分;顶层 execute.go 收敛为桥接导出,降低单文件编排/业务/模型/工具逻辑混写 2. 节点公共能力继续沉到 shared——抽出 LLM 纠错回灌、完整上下文调试日志、thinking 开关、统一上下文压缩、可见 assistant 文本持久化等 node_* 公共件,减少 execute 独占实现并为其他节点复用铺路 3. speak 文本整理能力独立收口——新增 speak_text 辅助文件,补齐正文归一化的独立承载,继续收缩 execute 主文件体积 前端: 4. NewAgent 时间线接入 business_card 业务卡片协议——schedule_agent.ts 新增 task_query / task_record 卡片载荷类型与 business_card kind;AssistantPanel 增加业务卡片事件存储、时间线恢复、块渲染分支与 BusinessCardRenderer 接入,同时保留 interrupt / status / tool / reasoning 多块并存 5. 新增任务查询卡片与任务记录卡片组件,并补充 DesignDemo 设计预览页与路由,前端可先行验证 business_card 的视觉与交互落点 文档: 6. 新增 newagent business card 前后端对接说明,明确 timeline kind、payload 结构、卡片分类、前后端发射/渲染约束
This commit is contained in:
436
backend/newAgent/node/execute/tool_runtime.go
Normal file
436
backend/newAgent/node/execute/tool_runtime.go
Normal file
@@ -0,0 +1,436 @@
|
||||
package newagentexecute
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
newagentshared "github.com/LoveLosita/smartflow/backend/newAgent/shared"
|
||||
"log"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
newagentmodel "github.com/LoveLosita/smartflow/backend/newAgent/model"
|
||||
newagentstream "github.com/LoveLosita/smartflow/backend/newAgent/stream"
|
||||
newagenttools "github.com/LoveLosita/smartflow/backend/newAgent/tools"
|
||||
"github.com/LoveLosita/smartflow/backend/newAgent/tools/schedule"
|
||||
"github.com/cloudwego/eino/schema"
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
func appendToolCallResultHistory(
|
||||
conversationContext *newagentmodel.ConversationContext,
|
||||
toolName string,
|
||||
args map[string]any,
|
||||
result string,
|
||||
) {
|
||||
if conversationContext == nil {
|
||||
return
|
||||
}
|
||||
|
||||
argsJSON := "{}"
|
||||
if args != nil {
|
||||
if raw, err := json.Marshal(args); err == nil {
|
||||
argsJSON = string(raw)
|
||||
}
|
||||
}
|
||||
toolCallID := uuid.NewString()
|
||||
conversationContext.AppendHistory(&schema.Message{
|
||||
Role: schema.Assistant,
|
||||
Content: "",
|
||||
ToolCalls: []schema.ToolCall{
|
||||
{
|
||||
ID: toolCallID,
|
||||
Type: "function",
|
||||
Function: schema.FunctionCall{
|
||||
Name: toolName,
|
||||
Arguments: argsJSON,
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
conversationContext.AppendHistory(&schema.Message{
|
||||
Role: schema.Tool,
|
||||
Content: result,
|
||||
ToolCallID: toolCallID,
|
||||
ToolName: toolName,
|
||||
})
|
||||
}
|
||||
|
||||
func executeToolCall(
|
||||
ctx context.Context,
|
||||
flowState *newagentmodel.CommonState,
|
||||
conversationContext *newagentmodel.ConversationContext,
|
||||
toolCall *newagentmodel.ToolCallIntent,
|
||||
emitter *newagentstream.ChunkEmitter,
|
||||
registry *newagenttools.ToolRegistry,
|
||||
scheduleState *schedule.ScheduleState,
|
||||
writePreview newagentmodel.WriteSchedulePreviewFunc,
|
||||
) error {
|
||||
if toolCall == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
toolName := strings.TrimSpace(toolCall.Name)
|
||||
if toolName == "" {
|
||||
return fmt.Errorf("工具调用缺少工具名称")
|
||||
}
|
||||
|
||||
if err := emitter.EmitToolCallStart(
|
||||
executeStatusBlockID,
|
||||
executeStageName,
|
||||
toolName,
|
||||
buildToolCallStartSummary(toolName, toolCall.Arguments),
|
||||
buildToolArgumentsPreviewCN(toolCall.Arguments),
|
||||
false,
|
||||
); err != nil {
|
||||
return fmt.Errorf("工具调用开始事件发送失败: %w", err)
|
||||
}
|
||||
|
||||
if registry == nil {
|
||||
return fmt.Errorf("工具注册表未注入")
|
||||
}
|
||||
if scheduleState == nil && registry.RequiresScheduleState(toolName) {
|
||||
return fmt.Errorf("日程状态未加载,无法执行工具 %q", toolName)
|
||||
}
|
||||
if registry.IsToolTemporarilyDisabled(toolName) {
|
||||
flowState.ConsecutiveCorrections++
|
||||
if flowState.ConsecutiveCorrections >= maxConsecutiveCorrections {
|
||||
return fmt.Errorf("连续 %d 次调用临时禁用工具,终止执行: %s",
|
||||
flowState.ConsecutiveCorrections, toolName)
|
||||
}
|
||||
blockedResult := buildTemporarilyDisabledToolResult(toolName)
|
||||
_ = emitter.EmitToolCallResult(
|
||||
executeStatusBlockID,
|
||||
executeStageName,
|
||||
toolName,
|
||||
"blocked",
|
||||
blockedResult,
|
||||
buildToolArgumentsPreviewCN(toolCall.Arguments),
|
||||
false,
|
||||
)
|
||||
appendToolCallResultHistory(conversationContext, toolName, toolCall.Arguments, blockedResult)
|
||||
newagentshared.AppendLLMCorrectionWithHint(
|
||||
conversationContext,
|
||||
"",
|
||||
fmt.Sprintf("工具 %q 当前暂时禁用。", toolName),
|
||||
"请改用 move/swap/batch_move/unplace 等排程微调工具继续推进。",
|
||||
)
|
||||
return nil
|
||||
}
|
||||
if !registry.HasTool(toolName) {
|
||||
flowState.ConsecutiveCorrections++
|
||||
if flowState.ConsecutiveCorrections >= maxConsecutiveCorrections {
|
||||
return fmt.Errorf("连续 %d 次调用未知工具,终止执行: %s;可用工具:%s。",
|
||||
flowState.ConsecutiveCorrections, toolName, strings.Join(registry.ToolNames(), "、"))
|
||||
}
|
||||
log.Printf("[WARN] execute 工具名不合法 chat=%s round=%d tool=%s consecutive=%d/%d available=%v",
|
||||
flowState.ConversationID, flowState.RoundUsed, toolName,
|
||||
flowState.ConsecutiveCorrections, maxConsecutiveCorrections, registry.ToolNames())
|
||||
newagentshared.AppendLLMCorrectionWithHint(
|
||||
conversationContext,
|
||||
"",
|
||||
fmt.Sprintf("你调用的工具 %q 不存在。", toolName),
|
||||
fmt.Sprintf("可用工具:%s。请检查拼写后重试。", strings.Join(registry.ToolNames(), "、")),
|
||||
)
|
||||
return nil
|
||||
}
|
||||
if !isToolVisibleForCurrentExecuteMode(flowState, registry, toolName) {
|
||||
flowState.ConsecutiveCorrections++
|
||||
if flowState.ConsecutiveCorrections >= maxConsecutiveCorrections {
|
||||
return fmt.Errorf("连续 %d 次调用未激活工具,终止执行: %s(active_domain=%q active_packs=%v)",
|
||||
flowState.ConsecutiveCorrections,
|
||||
toolName,
|
||||
flowState.ActiveToolDomain,
|
||||
newagenttools.ResolveEffectiveToolPacks(flowState.ActiveToolDomain, flowState.ActiveToolPacks))
|
||||
}
|
||||
|
||||
addHint := `请先调用 context_tools_add 激活目标工具域后再继续。`
|
||||
if flowState != nil && flowState.ActiveOptimizeOnly {
|
||||
addHint = `当前处于“粗排后主动优化专用模式”,只允许使用 analyze_health、move、swap;不要再尝试 query_target_tasks / query_available_slots 等全窗搜索工具。`
|
||||
} else if domain, pack, ok := newagenttools.ResolveToolDomainPack(toolName); ok {
|
||||
if newagenttools.IsFixedToolPack(domain, pack) {
|
||||
addHint = fmt.Sprintf(`请先调用 context_tools_add,参数 domain="%s"。`, domain)
|
||||
} else {
|
||||
addHint = fmt.Sprintf(`请先调用 context_tools_add,参数 domain="%s", packs=["%s"]。`, domain, pack)
|
||||
}
|
||||
}
|
||||
|
||||
newagentshared.AppendLLMCorrectionWithHint(
|
||||
conversationContext,
|
||||
"",
|
||||
fmt.Sprintf("你调用的工具 %q 当前不在已激活工具域内。", toolName),
|
||||
addHint,
|
||||
)
|
||||
return nil
|
||||
}
|
||||
|
||||
if shouldForceFeasibilityNegotiation(flowState, registry, toolName) {
|
||||
blockedResult := buildInfeasibleBlockedResult(flowState)
|
||||
_ = emitter.EmitToolCallResult(
|
||||
executeStatusBlockID,
|
||||
executeStageName,
|
||||
toolName,
|
||||
"blocked",
|
||||
blockedResult,
|
||||
buildToolArgumentsPreviewCN(toolCall.Arguments),
|
||||
false,
|
||||
)
|
||||
appendToolCallResultHistory(conversationContext, toolName, toolCall.Arguments, blockedResult)
|
||||
return nil
|
||||
}
|
||||
|
||||
beforeDigest := summarizeScheduleStateForDebug(scheduleState)
|
||||
if !registry.RequiresScheduleState(toolName) {
|
||||
if toolCall.Arguments == nil {
|
||||
toolCall.Arguments = make(map[string]any)
|
||||
}
|
||||
toolCall.Arguments["_user_id"] = flowState.UserID
|
||||
}
|
||||
result := registry.Execute(scheduleState, toolName, toolCall.Arguments)
|
||||
updateHealthSnapshotV2(flowState, toolName, result)
|
||||
updateTaskClassUpsertSnapshot(flowState, toolName, result)
|
||||
updateActiveToolDomainSnapshot(flowState, toolName, result)
|
||||
afterDigest := summarizeScheduleStateForDebug(scheduleState)
|
||||
log.Printf(
|
||||
"[DEBUG] execute tool chat=%s round=%d tool=%s args=%s before=%s after=%s result_preview=%.200s",
|
||||
flowState.ConversationID,
|
||||
flowState.RoundUsed,
|
||||
toolName,
|
||||
marshalArgsForDebug(toolCall.Arguments),
|
||||
beforeDigest,
|
||||
afterDigest,
|
||||
flattenForLog(result),
|
||||
)
|
||||
_ = emitter.EmitToolCallResult(
|
||||
executeStatusBlockID,
|
||||
executeStageName,
|
||||
toolName,
|
||||
resolveToolEventResultStatus(result),
|
||||
buildToolEventResultSummary(result),
|
||||
buildToolArgumentsPreviewCN(toolCall.Arguments),
|
||||
false,
|
||||
)
|
||||
|
||||
appendToolCallResultHistory(conversationContext, toolName, toolCall.Arguments, result)
|
||||
|
||||
if registry.IsScheduleMutationTool(toolName) {
|
||||
flowState.HasScheduleWriteOps = true
|
||||
flowState.HasScheduleChanges = true
|
||||
}
|
||||
|
||||
tryWritePreviewAfterWriteTool(ctx, flowState, scheduleState, registry, toolName, writePreview)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func applyPendingContextHook(flowState *newagentmodel.CommonState) {
|
||||
if flowState == nil || flowState.PendingContextHook == nil {
|
||||
return
|
||||
}
|
||||
hook := flowState.PendingContextHook
|
||||
domain := newagenttools.NormalizeToolDomain(hook.Domain)
|
||||
if domain == "" {
|
||||
flowState.PendingContextHook = nil
|
||||
return
|
||||
}
|
||||
flowState.ActiveToolDomain = domain
|
||||
flowState.ActiveToolPacks = newagenttools.ResolveEffectiveToolPacks(domain, hook.Packs)
|
||||
flowState.PendingContextHook = nil
|
||||
}
|
||||
|
||||
func isToolVisibleForCurrentExecuteMode(
|
||||
flowState *newagentmodel.CommonState,
|
||||
registry *newagenttools.ToolRegistry,
|
||||
toolName string,
|
||||
) bool {
|
||||
if registry == nil {
|
||||
return false
|
||||
}
|
||||
activeDomain := ""
|
||||
var activePacks []string
|
||||
if flowState != nil {
|
||||
activeDomain = flowState.ActiveToolDomain
|
||||
activePacks = flowState.ActiveToolPacks
|
||||
}
|
||||
if !registry.IsToolVisibleInDomain(activeDomain, activePacks, toolName) {
|
||||
return false
|
||||
}
|
||||
if flowState != nil && flowState.ActiveOptimizeOnly && !newagenttools.IsToolAllowedInActiveOptimize(toolName) {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func buildTemporarilyDisabledToolResult(toolName string) string {
|
||||
return fmt.Sprintf("工具 %q 当前暂时禁用。请改用 move/swap/batch_move/unplace 等排程微调工具。", strings.TrimSpace(toolName))
|
||||
}
|
||||
|
||||
func executePendingTool(
|
||||
ctx context.Context,
|
||||
runtimeState *newagentmodel.AgentRuntimeState,
|
||||
conversationContext *newagentmodel.ConversationContext,
|
||||
registry *newagenttools.ToolRegistry,
|
||||
scheduleState *schedule.ScheduleState,
|
||||
originalState *schedule.ScheduleState,
|
||||
writePreview newagentmodel.WriteSchedulePreviewFunc,
|
||||
emitter *newagentstream.ChunkEmitter,
|
||||
) error {
|
||||
pending := runtimeState.PendingConfirmTool
|
||||
if pending == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
var args map[string]any
|
||||
if err := json.Unmarshal([]byte(pending.ArgsJSON), &args); err != nil {
|
||||
return fmt.Errorf("解析待确认工具参数失败: %w", err)
|
||||
}
|
||||
|
||||
if err := emitter.EmitToolCallStart(
|
||||
executeStatusBlockID,
|
||||
executeStageName,
|
||||
pending.ToolName,
|
||||
buildToolCallStartSummary(pending.ToolName, args),
|
||||
buildToolArgumentsPreviewCN(args),
|
||||
false,
|
||||
); err != nil {
|
||||
return fmt.Errorf("工具调用开始事件发送失败: %w", err)
|
||||
}
|
||||
|
||||
if scheduleState == nil {
|
||||
return fmt.Errorf("日程状态未加载,无法执行已确认的写工具 %s", pending.ToolName)
|
||||
}
|
||||
flowState := runtimeState.EnsureCommonState()
|
||||
if registry.IsToolTemporarilyDisabled(pending.ToolName) {
|
||||
blockedResult := buildTemporarilyDisabledToolResult(pending.ToolName)
|
||||
_ = emitter.EmitToolCallResult(
|
||||
executeStatusBlockID,
|
||||
executeStageName,
|
||||
pending.ToolName,
|
||||
"blocked",
|
||||
blockedResult,
|
||||
buildToolArgumentsPreviewCN(args),
|
||||
false,
|
||||
)
|
||||
appendToolCallResultHistory(conversationContext, pending.ToolName, args, blockedResult)
|
||||
runtimeState.PendingConfirmTool = nil
|
||||
return nil
|
||||
}
|
||||
|
||||
if shouldForceFeasibilityNegotiation(flowState, registry, pending.ToolName) {
|
||||
blockedResult := buildInfeasibleBlockedResult(flowState)
|
||||
_ = emitter.EmitToolCallResult(
|
||||
executeStatusBlockID,
|
||||
executeStageName,
|
||||
pending.ToolName,
|
||||
"blocked",
|
||||
blockedResult,
|
||||
buildToolArgumentsPreviewCN(args),
|
||||
false,
|
||||
)
|
||||
appendToolCallResultHistory(conversationContext, pending.ToolName, args, blockedResult)
|
||||
runtimeState.PendingConfirmTool = nil
|
||||
return nil
|
||||
}
|
||||
|
||||
beforeDigest := summarizeScheduleStateForDebug(scheduleState)
|
||||
if !registry.RequiresScheduleState(pending.ToolName) {
|
||||
if args == nil {
|
||||
args = make(map[string]any)
|
||||
}
|
||||
args["_user_id"] = flowState.UserID
|
||||
}
|
||||
result := registry.Execute(scheduleState, pending.ToolName, args)
|
||||
updateHealthSnapshotV2(flowState, pending.ToolName, result)
|
||||
updateTaskClassUpsertSnapshot(flowState, pending.ToolName, result)
|
||||
updateActiveToolDomainSnapshot(flowState, pending.ToolName, result)
|
||||
afterDigest := summarizeScheduleStateForDebug(scheduleState)
|
||||
log.Printf(
|
||||
"[DEBUG] execute pending tool chat=%s round=%d tool=%s args=%s before=%s after=%s result_preview=%.200s",
|
||||
flowState.ConversationID,
|
||||
flowState.RoundUsed,
|
||||
pending.ToolName,
|
||||
marshalArgsForDebug(args),
|
||||
beforeDigest,
|
||||
afterDigest,
|
||||
flattenForLog(result),
|
||||
)
|
||||
_ = emitter.EmitToolCallResult(
|
||||
executeStatusBlockID,
|
||||
executeStageName,
|
||||
pending.ToolName,
|
||||
resolveToolEventResultStatus(result),
|
||||
buildToolEventResultSummary(result),
|
||||
buildToolArgumentsPreviewCN(args),
|
||||
false,
|
||||
)
|
||||
|
||||
appendToolCallResultHistory(conversationContext, pending.ToolName, args, result)
|
||||
|
||||
if registry.IsScheduleMutationTool(pending.ToolName) {
|
||||
flowState.HasScheduleWriteOps = true
|
||||
flowState.HasScheduleChanges = true
|
||||
}
|
||||
|
||||
tryWritePreviewAfterWriteTool(ctx, flowState, scheduleState, registry, pending.ToolName, writePreview)
|
||||
|
||||
runtimeState.PendingConfirmTool = nil
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func tryWritePreviewAfterWriteTool(
|
||||
ctx context.Context,
|
||||
flowState *newagentmodel.CommonState,
|
||||
scheduleState *schedule.ScheduleState,
|
||||
registry *newagenttools.ToolRegistry,
|
||||
toolName string,
|
||||
writePreview newagentmodel.WriteSchedulePreviewFunc,
|
||||
) {
|
||||
if flowState == nil || scheduleState == nil || registry == nil || writePreview == nil {
|
||||
return
|
||||
}
|
||||
if !registry.IsScheduleMutationTool(toolName) {
|
||||
return
|
||||
}
|
||||
|
||||
if err := writePreview(ctx, scheduleState, flowState.UserID, flowState.ConversationID, flowState.TaskClassIDs); err != nil {
|
||||
log.Printf(
|
||||
"[WARN] execute realtime preview write failed chat=%s tool=%s err=%v",
|
||||
flowState.ConversationID,
|
||||
toolName,
|
||||
err,
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
log.Printf(
|
||||
"[DEBUG] execute realtime preview write success chat=%s tool=%s",
|
||||
flowState.ConversationID,
|
||||
toolName,
|
||||
)
|
||||
}
|
||||
|
||||
var listItemRe = regexp.MustCompile(`([^\n])([2-9][\.、]\s)`)
|
||||
|
||||
func normalizeSpeak(speak string) string {
|
||||
speak = strings.TrimSpace(speak)
|
||||
if speak == "" {
|
||||
return speak
|
||||
}
|
||||
if !strings.Contains(speak, "\n") {
|
||||
speak = listItemRe.ReplaceAllString(speak, "$1\n$2")
|
||||
}
|
||||
return speak + "\n"
|
||||
}
|
||||
|
||||
func buildExecuteNormalizedSpeakTail(streamed, normalized string) string {
|
||||
streamed = strings.ReplaceAll(streamed, "\r\n", "\n")
|
||||
normalized = strings.ReplaceAll(normalized, "\r\n", "\n")
|
||||
if streamed == "" || normalized == "" {
|
||||
return ""
|
||||
}
|
||||
if !strings.HasPrefix(normalized, streamed) {
|
||||
return ""
|
||||
}
|
||||
return normalized[len(streamed):]
|
||||
}
|
||||
Reference in New Issue
Block a user