wlw/ai-agent
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement skill debugging functionality and refactor skill execution flow

Browse Source
This commit is contained in:
mlogclub
2026-04-09 11:58:04 +08:00
parent eb9cd78646
commit 28d18ab6c0
12 changed files with 321 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ai/runtime/debug_run.go
+83
View File
@@ -0,0 +1,83 @@
package runtime
import (
"context"
"strings"
"cs-agent/internal/models"
"cs-agent/internal/pkg/dto/request"
"cs-agent/internal/pkg/dto/response"
"cs-agent/internal/pkg/enums"
"cs-agent/internal/pkg/errorsx"
svc "cs-agent/internal/services"
)
func init() {
svc.SkillDebugRunHook = DebugRunSkill
}
func DebugRunSkill(ctx context.Context, req request.SkillDebugRunRequest) (*response.SkillDebugRunResponse, error) {
aiAgent := svc.AIAgentService.Get(req.AIAgentID)
if aiAgent == nil || aiAgent.Status != enums.StatusOk {
return nil, errorsx.InvalidParam("AI Agent不存在或未启用")
}
aiConfig := svc.AIConfigService.Get(aiAgent.AIConfigID)
if aiConfig == nil {
return nil, errorsx.InvalidParam("AI Agent关联的AI配置不存在")
}
conversation := &models.Conversation{ID: req.ConversationID, AIAgentID: req.AIAgentID}
if req.ConversationID > 0 {
conversation = svc.ConversationService.Get(req.ConversationID)
if conversation == nil {
return nil, errorsx.InvalidParam("会话不存在")
}
}
message := &models.Message{
ConversationID: req.ConversationID,
SenderType: enums.IMSenderTypeCustomer,
MessageType: enums.IMMessageTypeText,
Content: strings.TrimSpace(req.UserMessage),
}
summary, err := Service.Run(ctx, Request{
Conversation: conversation,
UserMessage: message,
AIAgent: aiAgent,
AIConfig: aiConfig,
ManualSkillCode: strings.TrimSpace(req.SkillCode),
})
if err != nil {
return buildSkillDebugRunResponse(req, summary, nil), err
}
selectedSkill := svc.SkillDefinitionService.GetByCode(strings.TrimSpace(req.SkillCode))
if summary == nil || strings.TrimSpace(summary.PlannedSkillCode) == "" {
return nil, errorsx.InvalidParam("Skill 未命中")
}
return buildSkillDebugRunResponse(req, summary, selectedSkill), nil
}
func buildSkillDebugRunResponse(req request.SkillDebugRunRequest, summary *Summary, skill *models.SkillDefinition) *response.SkillDebugRunResponse {
resp := &response.SkillDebugRunResponse{
ConversationID: req.ConversationID,
AIAgentID: req.AIAgentID,
}
if skill != nil {
resp.SkillCode = skill.Code
resp.SkillName = skill.Name
}
if summary == nil {
return resp
}
if resp.SkillCode == "" {
resp.SkillCode = strings.TrimSpace(summary.PlannedSkillCode)
}
resp.ReplyText = summary.ReplyText
resp.PlanReason = summary.PlanReason
resp.SkillRouteTrace = summary.SkillRouteTrace
resp.ToolCodes = append([]string(nil), summary.ToolCodes...)
resp.InvokedToolCodes = append([]string(nil), summary.InvokedToolCodes...)
resp.CheckPointID = summary.CheckPointID
resp.Interrupted = summary.Interrupted
resp.TraceData = summary.TraceData
resp.ErrorMessage = summary.ErrorMessage
return resp
}
internal/ai/runtime/internal/engine/service.go
+49 -4
View File
@@ -11,6 +11,7 @@ import (
"cs-agent/internal/ai/runtime/internal/impl/callbacks"
"cs-agent/internal/ai/runtime/internal/impl/factory"
"cs-agent/internal/ai/runtime/internal/impl/retrievers"
"cs-agent/internal/models"
"cs-agent/internal/pkg/utils"
"github.com/cloudwego/eino/adk"
@@ -74,8 +75,9 @@ func (s *Service) Run(ctx context.Context, req Request) (*Summary, error) {
summary.TraceData = collector.Marshal()
return summary, err
}
toolDefsByModelName := make(map[string]string, len(toolDefs))
for _, item := range toolDefs {
filteredToolDefs := filterToolDefinitionsBySkill(toolDefs, req.SelectedSkill)
toolDefsByModelName := make(map[string]string, len(filteredToolDefs))
for _, item := range filteredToolDefs {
summary.ToolCodes = append(summary.ToolCodes, item.ToolCode)
toolDefsByModelName[item.ModelName] = item.ToolCode
}
@@ -92,8 +94,14 @@ func (s *Service) Run(ctx context.Context, req Request) (*Summary, error) {
collector.Data.Model.Provider = string(req.AIConfig.Provider)
collector.Data.Model.Name = req.AIConfig.ModelName
summary.SelectedSkillCode = ""
summary.SkillRouteReason = strings.TrimSpace(req.SkillRouteReason)
summary.SkillRouteTrace = strings.TrimSpace(req.SkillRouteTrace)
if req.SelectedSkill != nil {
summary.SelectedSkillCode = strings.TrimSpace(req.SelectedSkill.Code)
}
agent, err := s.agentFactory.BuildCustomerServiceAgent(ctx, req.AIAgent, req.AIConfig, toolDefs, req.ExtraTools, req.ExtraToolCodes, collector)
agent, err := s.agentFactory.BuildCustomerServiceAgent(ctx, req.AIAgent, req.AIConfig, req.SelectedSkill, filteredToolDefs, req.ExtraTools, req.ExtraToolCodes, collector)
if err != nil {
summary.Status = "error"
summary.ErrorMessage = err.Error()
@@ -217,7 +225,7 @@ func (s *Service) Resume(ctx context.Context, req ResumeRequest) (*Summary, erro
collector.Data.Input.ToolCodes = append(collector.Data.Input.ToolCodes, summary.ToolCodes...)
collector.Data.Model.Provider = string(req.AIConfig.Provider)
collector.Data.Model.Name = req.AIConfig.ModelName
agent, err := s.agentFactory.BuildCustomerServiceAgent(ctx, req.AIAgent, req.AIConfig, toolDefs, req.ExtraTools, req.ExtraToolCodes, collector)
agent, err := s.agentFactory.BuildCustomerServiceAgent(ctx, req.AIAgent, req.AIConfig, nil, toolDefs, req.ExtraTools, req.ExtraToolCodes, collector)
if err != nil {
summary.Status = "error"
summary.ErrorMessage = err.Error()
@@ -261,6 +269,43 @@ func (s *Service) Resume(ctx context.Context, req ResumeRequest) (*Summary, erro
return summary, nil
}
func filterToolDefinitionsBySkill(definitions []adapter.MCPToolDefinition, skill *models.SkillDefinition) []adapter.MCPToolDefinition {
if len(definitions) == 0 || skill == nil {
return definitions
}
allowed := parseJSONArraySet(skill.AllowedToolCodes)
if len(allowed) == 0 {
return definitions
}
ret := make([]adapter.MCPToolDefinition, 0, len(definitions))
for _, item := range definitions {
if _, ok := allowed[strings.TrimSpace(item.ToolCode)]; ok {
ret = append(ret, item)
}
}
return ret
}
func parseJSONArraySet(raw string) map[string]struct{} {
raw = strings.TrimSpace(raw)
if raw == "" {
return nil
}
var items []string
if err := json.Unmarshal([]byte(raw), &items); err != nil {
return nil
}
ret := make(map[string]struct{}, len(items))
for _, item := range items {
item = strings.TrimSpace(item)
if item == "" {
continue
}
ret[item] = struct{}{}
}
return ret
}
func buildRunOptions(checkPointID string) []adk.AgentRunOption {
if strings.TrimSpace(checkPointID) == "" {
return nil
internal/ai/runtime/internal/engine/types.go
+13 -7
View File
@@ -7,13 +7,16 @@ import (
)
type Request struct {
Conversation *models.Conversation
UserMessage *models.Message
AIAgent *models.AIAgent
AIConfig *models.AIConfig
CheckPointID string
ExtraTools []einotool.BaseTool
ExtraToolCodes map[string]string
Conversation *models.Conversation
UserMessage *models.Message
AIAgent *models.AIAgent
AIConfig *models.AIConfig
SelectedSkill *models.SkillDefinition
SkillRouteReason string
SkillRouteTrace string
CheckPointID string
ExtraTools []einotool.BaseTool
ExtraToolCodes map[string]string
}
type ResumeRequest struct {
@@ -36,6 +39,9 @@ type Summary struct {
RunID string
Status string
ReplyText string
SelectedSkillCode string
SkillRouteReason string
SkillRouteTrace string
ModelName string
PromptTokens int
CompletionTokens int
internal/ai/runtime/internal/impl/factory/agent_factory.go
+67 -4
View File
@@ -2,6 +2,8 @@ package factory
import (
"context"
"encoding/json"
"fmt"
"strings"
einoadapter "cs-agent/internal/ai/runtime/internal/impl/adapter"
@@ -27,7 +29,7 @@ func NewAgentFactory() *AgentFactory {
}
func (f *AgentFactory) BuildCustomerServiceAgent(ctx context.Context, aiAgent *models.AIAgent, aiConfig *models.AIConfig,
toolDefinitions []einoadapter.MCPToolDefinition, extraTools []einobasetool.BaseTool, extraToolCodes map[string]string,
selectedSkill *models.SkillDefinition, toolDefinitions []einoadapter.MCPToolDefinition, extraTools []einobasetool.BaseTool, extraToolCodes map[string]string,
collector *einocallbacks.RuntimeTraceCollector) (*einoagents.CustomerServiceAgent, error) {
if aiAgent == nil || aiConfig == nil {
return nil, nil
@@ -58,7 +60,7 @@ func (f *AgentFactory) BuildCustomerServiceAgent(ctx context.Context, aiAgent *m
inner, err := adk.NewChatModelAgent(ctx, &adk.ChatModelAgentConfig{
Name: strings.TrimSpace(aiAgent.Name),
Description: strings.TrimSpace(aiAgent.Description),
Instruction: buildAgentInstruction(aiAgent, extraToolCodes),
Instruction: buildAgentInstruction(aiAgent, selectedSkill, toolDefinitions, extraToolCodes),
Model: chatModel,
ToolsConfig: adk.ToolsConfig{
ToolsNodeConfig: compose.ToolsNodeConfig{
@@ -73,12 +75,15 @@ func (f *AgentFactory) BuildCustomerServiceAgent(ctx context.Context, aiAgent *m
return &einoagents.CustomerServiceAgent{Inner: inner}, nil
}
func buildAgentInstruction(aiAgent *models.AIAgent, extraToolCodes map[string]string) string {
func buildAgentInstruction(aiAgent *models.AIAgent, selectedSkill *models.SkillDefinition, toolDefinitions []einoadapter.MCPToolDefinition, extraToolCodes map[string]string) string {
baseInstruction := ""
if aiAgent != nil {
baseInstruction = strings.TrimSpace(aiAgent.SystemPrompt)
}
appendixParts := make([]string, 0, 1)
appendixParts := make([]string, 0, 2)
if skillInstruction := buildSelectedSkillInstruction(selectedSkill, toolDefinitions); skillInstruction != "" {
appendixParts = append(appendixParts, skillInstruction)
}
if hasToolCode(extraToolCodes, "builtin/create_ticket_with_confirmation") {
appendixParts = append(appendixParts, strings.TrimSpace(`
你可以在确认信息充分后调用 create_ticket_with_confirmation 工具来创建工单，但必须遵守以下规则：
@@ -98,6 +103,44 @@ func buildAgentInstruction(aiAgent *models.AIAgent, extraToolCodes map[string]st
return baseInstruction + "\n\n" + strings.Join(appendixParts, "\n\n")
}
func buildSelectedSkillInstruction(skill *models.SkillDefinition, toolDefinitions []einoadapter.MCPToolDefinition) string {
if skill == nil {
return ""
}
lines := []string{
"当前命中的专项技能：",
fmt.Sprintf("- code: %s", strings.TrimSpace(skill.Code)),
fmt.Sprintf("- name: %s", strings.TrimSpace(skill.Name)),
}
if desc := strings.TrimSpace(skill.Description); desc != "" {
lines = append(lines, fmt.Sprintf("- description: %s", desc))
}
if content := strings.TrimSpace(skill.Content); content != "" {
lines = append(lines, "", "技能说明：", content)
}
if examples := parseJSONStringArray(skill.Examples); len(examples) > 0 {
lines = append(lines, "", "典型示例问法：")
for _, item := range examples {
lines = append(lines, "- "+item)
}
}
if len(toolDefinitions) > 0 {
lines = append(lines, "", "当前技能允许使用的工具：")
for _, item := range toolDefinitions {
if strings.TrimSpace(item.ToolCode) == "" {
continue
}
line := "- " + strings.TrimSpace(item.ToolCode)
if title := strings.TrimSpace(item.Title); title != "" {
line += " | " + title
}
lines = append(lines, line)
}
}
lines = append(lines, "", "执行要求：", "- 优先遵循该技能说明完成任务。", "- 如果关键信息不足，先向用户追问。", "- 不得调用当前技能未授权的工具。")
return strings.TrimSpace(strings.Join(lines, "\n"))
}
func hasToolCode(toolCodes map[string]string, target string) bool {
target = strings.TrimSpace(target)
if target == "" {
@@ -110,3 +153,23 @@ func hasToolCode(toolCodes map[string]string, target string) bool {
}
return false
}
func parseJSONStringArray(raw string) []string {
raw = strings.TrimSpace(raw)
if raw == "" {
return nil
}
var ret []string
if err := json.Unmarshal([]byte(raw), &ret); err != nil {
return nil
}
out := make([]string, 0, len(ret))
for _, item := range ret {
item = strings.TrimSpace(item)
if item == "" {
continue
}
out = append(out, item)
}
return out
}
internal/ai/runtime/service.go
+55 -32
View File
@@ -2,12 +2,14 @@ package runtime
import (
"context"
"encoding/json"
"strings"
"cs-agent/internal/ai/runtime/internal/engine"
"cs-agent/internal/ai/runtime/registry"
"cs-agent/internal/ai/runtime/tools"
"cs-agent/internal/ai/skills"
"cs-agent/internal/models"
)
var Service = newService()
@@ -27,21 +29,27 @@ type service struct {
}
func (s *service) Run(ctx context.Context, req Request) (*Summary, error) {
skillSummary, skillErr := s.tryRunSkill(ctx, req)
if skillSummary != nil && strings.TrimSpace(skillSummary.ReplyText) != "" {
return skillSummary, nil
selectedSkill, skillReason, skillTrace, skillErr := s.selectSkill(ctx, req)
req.SelectedSkill = selectedSkill
req.SkillRouteReason = skillReason
req.SkillRouteTrace = skillTrace
if req.SelectedSkill != nil {
req.SelectedSkill = cloneSkillDefinition(req.SelectedSkill)
}
if err := s.prepareToolsForRun(&req); err != nil {
return nil, err
}
summary, err := s.runtime.Run(ctx, engine.Request{
Conversation: req.Conversation,
UserMessage: req.UserMessage,
AIAgent: req.AIAgent,
AIConfig: req.AIConfig,
CheckPointID: req.CheckPointID,
ExtraTools: req.ExtraTools,
ExtraToolCodes: req.ExtraToolCodes,
Conversation: req.Conversation,
UserMessage: req.UserMessage,
AIAgent: req.AIAgent,
AIConfig: req.AIConfig,
SelectedSkill: req.SelectedSkill,
SkillRouteReason: req.SkillRouteReason,
SkillRouteTrace: req.SkillRouteTrace,
CheckPointID: req.CheckPointID,
ExtraTools: req.ExtraTools,
ExtraToolCodes: req.ExtraToolCodes,
})
if err != nil {
ret := toSummary(summary)
@@ -119,8 +127,9 @@ func toSummary(summary *engine.Summary) *Summary {
RunID: summary.RunID,
Status: summary.Status,
ReplyText: summary.ReplyText,
PlannedSkillCode: "",
PlanReason: "",
PlannedSkillCode: strings.TrimSpace(summary.SelectedSkillCode),
PlanReason: strings.TrimSpace(summary.SkillRouteReason),
SkillRouteTrace: strings.TrimSpace(summary.SkillRouteTrace),
ModelName: summary.ModelName,
PromptTokens: summary.PromptTokens,
CompletionTokens: summary.CompletionTokens,
@@ -147,31 +156,45 @@ func toSummary(summary *engine.Summary) *Summary {
return ret
}
func (s *service) tryRunSkill(ctx context.Context, req Request) (*Summary, error) {
func (s *service) selectSkill(ctx context.Context, req Request) (*models.SkillDefinition, string, string, error) {
if req.AIAgent == nil || req.AIConfig == nil || req.UserMessage == nil || req.Conversation == nil {
return nil, nil
return nil, "", "", nil
}
result, err := skills.Execute(ctx, skills.RuntimeContext{
AIAgentID: req.AIAgent.ID,
UserMessage: strings.TrimSpace(req.UserMessage.Content),
ConversationID: req.Conversation.ID,
result, err := skills.Select(ctx, skills.RuntimeContext{
AIAgentID: req.AIAgent.ID,
UserMessage: strings.TrimSpace(req.UserMessage.Content),
ConversationID: req.Conversation.ID,
ManualSkillCode: strings.TrimSpace(req.ManualSkillCode),
})
if err != nil {
return nil, err
return nil, "", "", err
}
if result == nil || result.Plan == nil || result.Plan.Skill == nil {
return nil, nil
traceData := marshalSkillRouteTrace(result)
reason := ""
if result != nil && result.Plan != nil {
reason = strings.TrimSpace(result.Plan.MatchReason)
}
return nil, reason, traceData, nil
}
traceData := ""
if result.RunLog != nil {
traceData = result.RunLog.TraceData
}
return &Summary{
Status: "completed",
ReplyText: strings.TrimSpace(result.ReplyText),
PlannedSkillCode: strings.TrimSpace(result.Plan.Skill.Code),
PlanReason: strings.TrimSpace(result.Plan.MatchReason),
ModelName: req.AIConfig.ModelName,
TraceData: traceData,
}, nil
return result.Plan.Skill, strings.TrimSpace(result.Plan.MatchReason), marshalSkillRouteTrace(result), nil
}
func marshalSkillRouteTrace(result *skills.ExecutionResult) string {
if result == nil || result.Plan == nil || result.Plan.RouteTrace == nil {
return ""
}
buf, err := json.Marshal(result.Plan.RouteTrace)
if err != nil {
return ""
}
return string(buf)
}
func cloneSkillDefinition(item *models.SkillDefinition) *models.SkillDefinition {
if item == nil {
return nil
}
clone := *item
return &clone
}
internal/ai/runtime/types.go
+12 -7
View File
@@ -7,13 +7,17 @@ import (
)
type Request struct {
Conversation *models.Conversation
UserMessage *models.Message
AIAgent *models.AIAgent
AIConfig *models.AIConfig
CheckPointID string
ExtraTools []einotool.BaseTool
ExtraToolCodes map[string]string
Conversation *models.Conversation
UserMessage *models.Message
AIAgent *models.AIAgent
AIConfig *models.AIConfig
ManualSkillCode string
SelectedSkill *models.SkillDefinition
SkillRouteReason string
SkillRouteTrace string
CheckPointID string
ExtraTools []einotool.BaseTool
ExtraToolCodes map[string]string
}
type ResumeRequest struct {
@@ -38,6 +42,7 @@ type Summary struct {
ReplyText string
PlannedSkillCode string
PlanReason string
SkillRouteTrace string
ModelName string
PromptTokens int
CompletionTokens int