fix(backend): Agent 任务 - 限制循环读取并收紧提交后的取消边界

This commit is contained in:
Codex Audit committed 2026-09-23 11:09:57 +08:00
1 parent bc0d109428
commit a218996e23
16 files changed
+778 -46

No files matched your search

+30
View File
@@ -180,6 +180,36 @@ func (r *Repository) LatestProviderRequestIDForTask(taskID string) (string, erro
return strings.TrimSpace(log.ProviderRequestID), err
}
// LatestProviderRequestIDsForTasks returns the newest upstream request ID per task.
// Task list queries intentionally select a narrow read model; this bulk lookup
// hydrates IDs recorded in API logs so the UI can hide cancellation after the
// upstream request has been accepted even when the task row was not updated yet.
func (r *Repository) LatestProviderRequestIDsForTasks(taskIDs []string) (map[string]string, error) {
result := make(map[string]string, len(taskIDs))
if len(taskIDs) == 0 {
return result, nil
}
var logs []model.ApiCallLog
err := r.db.Select("task_id", "provider_request_id", "created_at").
Where("task_id IN ? AND provider_request_id <> ''", taskIDs).
Order("created_at desc").
Find(&logs).Error
if err != nil {
return nil, err
}
for _, log := range logs {
taskID := strings.TrimSpace(log.TaskID)
providerRequestID := strings.TrimSpace(log.ProviderRequestID)
if taskID == "" || providerRequestID == "" {
continue
}
if _, exists := result[taskID]; !exists {
result[taskID] = providerRequestID
}
}
return result, nil
}
func (r *Repository) HasAPICallLogForTask(taskID string) (bool, error) {
if strings.TrimSpace(taskID) == "" {
return false, nil
@@ -190,3 +190,34 @@ func TestQueryAPICallLogsHidesInternalPollStages(t *testing.T) {
t.Fatalf("visible logs = %#v, want video-create and image-create", items)
}
}
func TestLatestProviderRequestIDsForTasksReturnsNewestPerTask(t *testing.T) {
db, err := gorm.Open(sqlite.Open("file:latest-provider-ids?mode=memory&cache=shared"), &gorm.Config{})
if err != nil {
t.Fatal(err)
}
if err := db.AutoMigrate(&model.ApiCallLog{}); err != nil {
t.Fatal(err)
}
base := time.Now().Add(-time.Hour)
for _, log := range []model.ApiCallLog{
{ID: "old-task-1", TaskID: "task-1", ProviderRequestID: "provider-old", CreatedAt: base},
{ID: "new-task-1", TaskID: "task-1", ProviderRequestID: "provider-new", CreatedAt: base.Add(2 * time.Minute)},
{ID: "task-2", TaskID: "task-2", ProviderRequestID: "provider-2", CreatedAt: base.Add(time.Minute)},
{ID: "empty", TaskID: "task-3", ProviderRequestID: "", CreatedAt: base.Add(3 * time.Minute)},
} {
if err := db.Create(&log).Error; err != nil {
t.Fatal(err)
}
}
ids, err := New(db).LatestProviderRequestIDsForTasks([]string{"task-1", "task-2", "task-3"})
if err != nil {
t.Fatal(err)
}
if ids["task-1"] != "provider-new" || ids["task-2"] != "provider-2" {
t.Fatalf("unexpected provider IDs: %#v", ids)
}
if _, ok := ids["task-3"]; ok {
t.Fatalf("empty provider ID should be omitted: %#v", ids)
}
}