tt/ttstd-infinite-canvas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(canvas): 云端 Agent - 参数错误有限重试并折叠中间失败

Browse Source
This commit is contained in:
ddCat
2026-09-21 09:30:38 +08:00
parent c80a554c49
commit 6eea2552f8
16 changed files with 396 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
backend/internal/app/cloud_agent_runtime.go
View File

@@ -68,6 +68,7 @@ type cloudAgentRuntime struct {
VideoSeconds int `json:"videoSeconds"`
Calls []cloudAgentCall `json:"calls"`
CallIndex int `json:"callIndex"`
ToolRepairs map[string]cloudAgentToolRepair `json:"toolRepairs,omitempty"`
Approval *cloudAgentApproval `json:"approval,omitempty"`
Decisions map[string]string `json:"decisions"`
DecisionSettings map[string]string `json:"decisionSettings,omitempty"`
@@ -232,6 +233,14 @@ func validateCloudAgentRuntime(run *model.CloudAgentExecution, state *cloudAgent
if state.CallIndex < 0 || state.CallIndex > len(state.Calls) || len(state.Calls) > cloudAgentMaxToolCalls {
return errors.New("Agent runtime call cursor is invalid")
}
for toolName, repair := range state.ToolRepairs {
if toolName == "" || utf8.RuneCountInString(toolName) > 80 || repair.Attempt < 1 || repair.Attempt > cloudAgentToolAttemptLimit || repair.GroupID == "" {
return errors.New("Agent runtime tool repair state is invalid")
}
if err := validateCloudAgentID(repair.GroupID, "工具纠错组 ID", 240); err != nil {
return err
}
}
if state.ActiveTaskID != "" && state.MediaTaskID != "" {
return errors.New("Agent runtime has multiple active tasks")
}
@@ -918,7 +927,7 @@ func cloudAgentSafeMediaTaskError(task *model.Task) string {
return detail
}
func cloudAgentToolResult(runID string, state *cloudAgentRuntime, call cloudAgentCall, result any, err error) {
func cloudAgentToolResult(runID string, state *cloudAgentRuntime, call cloudAgentCall, result any, err error) bool {
payload := map[string]any{"toolName": call.Function.Name, "callId": call.ID, "arguments": call.Function.Arguments}
if call.Function.Name == "skill_read_file" {
var args struct {
@@ -938,7 +947,7 @@ func cloudAgentToolResult(runID string, state *cloudAgentRuntime, call cloudAgen
kind := "tool_completed"
if err != nil {
detail, ok := result.(map[string]any)
if !ok {
if !ok || detail == nil {
detail = map[string]any{}
}
message := cloudAgentSafeToolError(err)
@@ -966,6 +975,9 @@ func cloudAgentToolResult(runID string, state *cloudAgentRuntime, call cloudAgen
if call.Function.Name == "canvas_get_state" {
detail["exampleArguments"] = map[string]any{}
}
if call.Function.Name == "canvas_apply_ops" {
detail["exampleArguments"] = map[string]any{"snapshotHash": "<canvas_get_state.snapshotHash>", "ops": []any{map[string]any{"type": "add_node", "id": "<new-node-id>", "nodeType": "text", "content": "<content>"}}}
}
}
result = detail
kind = "tool_failed"
@@ -973,6 +985,7 @@ func cloudAgentToolResult(runID string, state *cloudAgentRuntime, call cloudAgen
} else {
payload["text"] = "工具执行成功"
}
exhausted := cloudAgentTrackToolRepair(runID, state, call, result, err, payload)
raw, _ := json.Marshal(result)
payload["result"] = result
if call.Function.Name == "skill_read_file" && err == nil {
@@ -991,6 +1004,7 @@ func cloudAgentToolResult(runID string, state *cloudAgentRuntime, call cloudAgen
state.Canonical.Messages = append(state.Canonical.Messages, map[string]any{"role": "tool", "tool_call_id": call.ID, "content": string(raw)})
state.CallIndex++
state.Approval = nil
return exhausted
}
func (s *Service) advanceCloudAgentTool(run *model.CloudAgentExecution, state *cloudAgentRuntime) error {
if state.CallIndex < 0 || state.CallIndex >= len(state.Calls) {
@@ -1096,7 +1110,7 @@ func (s *Service) advanceCloudAgentTool(run *model.CloudAgentExecution, state *c
if mutationErr != nil {
var argumentErr *cloudAgentArgumentError
if errors.As(mutationErr, &argumentErr) {
cloudAgentToolResult(run.ID, state, call, nil, mutationErr)
cloudAgentRecordToolResult(current, state, call, nil, mutationErr)
return cloudAgentSave(current, state)
}
var appErr *AppError
@@ -1179,12 +1193,12 @@ func (s *Service) advanceCloudAgentTool(run *model.CloudAgentExecution, state *c
if call.Function.Name == "ask_user" && toolErr == nil {
payload, _ := result.(map[string]any)
state.event(run.ID, "user_question", payload)
cloudAgentToolResult(run.ID, state, call, result, nil)
cloudAgentRecordToolResult(current, state, call, result, nil)
skipRemainingCloudAgentCalls(run.ID, state)
current.Status = "completed"
return cloudAgentSave(current, state)
}
cloudAgentToolResult(run.ID, state, call, result, toolErr)
cloudAgentRecordToolResult(current, state, call, result, toolErr)
return cloudAgentSave(current, state)
})
}
@@ -1350,7 +1364,7 @@ func (s *Service) cloudAgentMediaError(run *model.CloudAgentExecution, state *cl
state.event(run.ID, "run_failed", map[string]any{"text": "Agent 媒体调用状态无效，本轮已停止"})
return cloudAgentSave(current, state)
}
cloudAgentToolResult(run.ID, state, state.Calls[state.CallIndex], map[string]any{"phase": phase, "taskSubmitted": submitted}, err)
cloudAgentRecordToolResult(current, state, state.Calls[state.CallIndex], map[string]any{"phase": phase, "taskSubmitted": submitted}, err)
if submitted {
state.MediaTaskID = ""
}