From 7f00ed6a65286c0337aa6e9ee4a00cfe79e80293 Mon Sep 17 00:00:00 2001
From: ryan <ryan@arctel.net>
Date: Mon, 15 Jun 2026 23:10:36 +0800
Subject: [PATCH] fix(task): fix manual retry button visibility and validation

- Only show the manual retry button for failed tasks (status === "failed") on the frontend.
- Remove the maximum retry limit validation for manual retries in the task executor.
- Remove obsolete test cases verifying maximum retry limit for manual retries.
---
 .../common/admin/task-executions.tsx          |  2 +-
 internal/apps/admin/task/routers_test.go      | 29 -------------------
 internal/task/executor.go                     |  4 ---
 internal/task/executor_test.go                | 23 ---------------
 4 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/frontend/components/common/admin/task-executions.tsx b/frontend/components/common/admin/task-executions.tsx
index d9f78e55..c7250960 100644
--- a/frontend/components/common/admin/task-executions.tsx
+++ b/frontend/components/common/admin/task-executions.tsx
@@ -379,7 +379,7 @@ export function TaskExecutionsManager() {
               {detailLoading ? <Spinner className="size-4" /> : <RefreshCw className="size-4" />}
               刷新详情
             </Button>
-            {selectedExecution && selectedExecution.status !== "pending" && selectedExecution.status !== "running" && selectedExecution.retryable && selectedExecution.retry_count < selectedExecution.max_retry && (
+            {selectedExecution && selectedExecution.status === "failed" && selectedExecution.retryable && (
               <Button onClick={handleRetryExecution} disabled={retrying}>
                 {retrying ? <Spinner className="size-4" /> : <RotateCcw className="size-4" />}
                 重试任务
diff --git a/internal/apps/admin/task/routers_test.go b/internal/apps/admin/task/routers_test.go
index 9260e68c..2102c022 100644
--- a/internal/apps/admin/task/routers_test.go
+++ b/internal/apps/admin/task/routers_test.go
@@ -491,32 +491,3 @@ func TestRetryTask(t *testing.T) {
 		assert.Equal(t, http.StatusBadRequest, w.Code)
 	})
 }
-
-func TestRetryTaskMaxRetryExceeded(t *testing.T) {
-	cleanup := setupTaskTestEnvironment(t)
-	defer cleanup()
-
-	adminUser := &model.User{ID: 1001, Username: "admin", IsAdmin: true}
-	router := setupTestRouter(adminUser)
-	ctx := context.Background()
-
-	execution := &model.TaskExecution{
-		TaskID:      "retry_max_api_001",
-		TaskType:    "system:cleanup",
-		TaskName:    "系统垃圾清理",
-		Status:      model.TaskExecutionStatusFailed,
-		Retryable:   true,
-		MaxRetry:    1,
-		RetryCount:  1,
-		TriggeredBy: "retry",
-	}
-	err := model.CreateTaskExecution(ctx, execution)
-	require.NoError(t, err)
-
-	url := fmt.Sprintf("/api/v1/admin/tasks/executions/%d/retry", execution.ID)
-	req, _ := http.NewRequest("POST", url, nil)
-	w := httptest.NewRecorder()
-	router.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusBadRequest, w.Code)
-}
diff --git a/internal/task/executor.go b/internal/task/executor.go
index 3a2382db..7d36b125 100644
--- a/internal/task/executor.go
+++ b/internal/task/executor.go
@@ -163,10 +163,6 @@ func RetryTask(ctx context.Context, id uint64) (string, error) {
 		return "", errors.New(errTaskNotRetryable)
 	}
 
-	if execution.RetryCount >= execution.MaxRetry {
-		return "", fmt.Errorf(errTaskMaxRetryExceeded, execution.MaxRetry)
-	}
-
 	// 生成新的 TaskID
 	newTaskID := generateRetryTaskID(execution.TaskID, execution.RetryCount+1)
 
diff --git a/internal/task/executor_test.go b/internal/task/executor_test.go
index 6e0bbab6..ca49a8cf 100644
--- a/internal/task/executor_test.go
+++ b/internal/task/executor_test.go
@@ -339,29 +339,6 @@ func TestRetryTaskNotRetryable(t *testing.T) {
 	assert.Contains(t, err.Error(), "不支持重试")
 }
 
-func TestRetryTaskMaxRetryExceeded(t *testing.T) {
-	cleanup := setupTest(t)
-	defer cleanup()
-	ctx := context.Background()
-
-	execution := &model.TaskExecution{
-		TaskID:      "retry_max_001",
-		TaskType:    testTaskType,
-		TaskName:    "测试任务",
-		Status:      model.TaskExecutionStatusFailed,
-		Retryable:   true,
-		MaxRetry:    2,
-		RetryCount:  2,
-		TriggeredBy: "retry",
-	}
-	err := model.CreateTaskExecution(ctx, execution)
-	require.NoError(t, err)
-
-	_, err = RetryTask(ctx, execution.ID)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "已达到最大重试次数")
-}
-
 func TestRetryTaskNonExistent(t *testing.T) {
 	cleanup := setupTest(t)
 	defer cleanup()