CalvinBackup/CyberStrikeAI
1
0
Fork 0
mirror of https://github.com/Ed1s0nZ/CyberStrikeAI.git synced 2026-09-27 19:51:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
公明
2026-07-14 16:24:06 +08:00
committed by GitHub
parent 73f0c35ef7
commit 364ca48846
14 changed files with 900 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/multiagent/eino_adk_run_loop.go
+59 -1
View File
@@ -78,7 +78,7 @@ type einoADKRunLoopArgs struct {
StreamsMainAssistant func(agent string) bool
EinoRoleTag func(agent string) string
CheckpointDir string
// RunRetryMaxAttempts / RunRetryMaxBackoffSec：429、5xx、网络抖动时的指数退避续跑（0=默认 10 次 / 30s 上限）。
// RunRetryMaxAttempts / RunRetryMaxBackoffSec：429、5xx、网络抖动时的指数退避续跑（0=默认 4 次 / 30s 上限）。
RunRetryMaxAttempts int
RunRetryMaxBackoffSec int
@@ -501,6 +501,38 @@ func runEinoADKAgentLoop(ctx context.Context, args *einoADKRunLoopArgs, baseMsgs
if runErr == nil {
return false, nil
}
var rejected *modelOutputRejectedError
if errors.As(runErr, &rejected) {
if progress != nil {
progress("model_output_rejected", "模型输出不完整或工具参数不安全，已阻止执行。", map[string]interface{}{
"conversationId": conversationID,
"source": "eino",
"orchestration": orchMode,
"reason": rejected.Reason,
"finishReason": rejected.FinishReason,
"toolName": rejected.ToolName,
"toolCallId": rejected.ToolCallID,
"argumentsBytes": rejected.ArgumentsBytes,
"completionTokens": rejected.CompletionTokens,
"reasoningTokens": rejected.ReasoningTokens,
"repairAttempt": rejected.RepairAttempt,
"repairable": rejected.Repairable,
})
}
if !rejected.Repairable {
return false, handleRunErr(runErr)
}
restartMsgs, ctxSource := einoMessagesForRunRestart(args, baseMsgs, runAccumulatedMsgs, baseAccumulatedCount)
restartMsgs = append(restartMsgs, schema.UserMessage(modelOutputRepairInstruction))
if logger != nil {
logger.Warn("eino model output rejected, retrying once with concise instruction",
zap.Error(runErr), zap.String("orchestration", orchMode),
zap.String("contextSource", string(ctxSource)), zap.Int("repairAttempt", rejected.RepairAttempt))
}
msgs = restartMsgs
iter = startRunnerIter(msgs)
return true, nil
}
if isEinoContextOverflowError(runErr) && !contextOverflowRetried {
contextOverflowRetried = true
restartMsgs, ctxSource := einoMessagesForRunRestart(args, baseMsgs, runAccumulatedMsgs, baseAccumulatedCount)
@@ -996,6 +1028,19 @@ func runEinoADKAgentLoop(ctx context.Context, args *einoADKRunLoopArgs, baseMsgs
if merged := mergeStreamingToolCallFragments(toolStreamFragments); len(merged) > 0 {
lastToolChunk = mergeMessageToolCalls(&schema.Message{ToolCalls: merged})
}
if progress != nil && lastToolChunk != nil {
for _, tc := range lastToolChunk.ToolCalls {
if marker, ok := modelOutputRecoveryFromToolCall(tc); ok {
progress("model_output_rejected", "模型工具调用不完整或参数不安全，已阻止执行并要求重写。", map[string]interface{}{
"conversationId": conversationID, "source": "eino", "orchestration": orchMode,
"reason": marker.Reason, "finishReason": marker.FinishReason,
"toolName": tc.Function.Name, "toolCallId": tc.ID,
"argumentsBytes": marker.ArgumentsBytes, "completionTokens": marker.CompletionTokens,
"reasoningTokens": marker.ReasoningTokens, "repairAttempt": marker.RepairAttempt,
})
}
}
}
tryEmitToolCallsOnce(lastToolChunk, ev.AgentName, orchestratorName, conversationID, orchMode, progress, toolEmitSeen, subAgentToolStep, mainAgentToolStep, markPendingWithMonitor)
// 流式路径此前只把 tool_calls 推给进度 UI，未写入 runAccumulatedMsgs；落库后 loadHistory→RepairOrphan 会删掉全部 tool 结果，表现为「续跑/下轮失忆」。
if lastToolChunk != nil && len(lastToolChunk.ToolCalls) > 0 {
@@ -1031,6 +1076,19 @@ func runEinoADKAgentLoop(ctx context.Context, args *einoADKRunLoopArgs, baseMsgs
continue
}
runAccumulatedMsgs = append(runAccumulatedMsgs, msg)
if progress != nil {
for _, tc := range msg.ToolCalls {
if marker, ok := modelOutputRecoveryFromToolCall(tc); ok {
progress("model_output_rejected", "模型工具调用不完整或参数不安全，已阻止执行并要求重写。", map[string]interface{}{
"conversationId": conversationID, "source": "eino", "orchestration": orchMode,
"reason": marker.Reason, "finishReason": marker.FinishReason,
"toolName": tc.Function.Name, "toolCallId": tc.ID,
"argumentsBytes": marker.ArgumentsBytes, "completionTokens": marker.CompletionTokens,
"reasoningTokens": marker.ReasoningTokens, "repairAttempt": marker.RepairAttempt,
})
}
}
}
tryEmitToolCallsOnce(mergeMessageToolCalls(msg), ev.AgentName, orchestratorName, conversationID, orchMode, progress, toolEmitSeen, subAgentToolStep, mainAgentToolStep, markPendingWithMonitor)
if mv.Role == schema.Assistant {