Merge remote-tracking branch 'origin/pr-588' into codex/pr-557-589-security-integration

This commit is contained in:
ddCat committed 2026-09-22 11:19:54 +08:00
commit 205638ad45
8 files changed
+395 -34

No files matched your search

+7 -2
View File
@@ -403,7 +403,7 @@ func (s *Service) CreateCloudAgentRun(userID string, req CloudAgentRequest, pare
}
history = append(history, providerTextMessage{Role: "assistant", Content: text})
if strings.TrimSpace(context) != "" {
history = append(history, providerTextMessage{Role: "user", Content: context})
history = append(history, providerTextMessage{Role: "user", Content: context, AgentContextSource: "continuation"})
}
}
history = trimCloudAgentTextHistory(history, cloudAgentHistoryKeepRounds, cloudAgentHistoryMaxBytes)
@@ -487,7 +487,12 @@ func cloudAgentLegacyHistory(messages []map[string]interface{}, currentPrompt st
if !ok || role != []string{"user", "assistant"}[index%2] {
return nil
}
history = append(history, providerTextMessage{Role: role, Content: content})
// 来源标记必须一起搬:丢了它,旧会话里的运行时交接消息会被当成真人轮次参与裁剪。
message := providerTextMessage{Role: role, Content: content}
if source, ok := messages[index][cloudAgentContextSourceKey].(string); ok && source != "" && source != "runtime" {
message.AgentContextSource = source
}
history = append(history, message)
}
return history
}