Skip to content

Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.

[Loopforge 自动化] 【架构优化】从 validateAssistantDraft 中拆出定时任务草稿校验 validateAssistantTaskDraft (#710)

fx-kurumif952b376d9a4
diff --git a/internal/httpapi/assistant.go b/internal/httpapi/assistant.go
index a406a575..1624372e 100644
--- a/internal/httpapi/assistant.go
+++ b/internal/httpapi/assistant.go
@@ -1134,25 +1134,7 @@ func validateAssistantDraft(d *assistantDraft, projectID string) error {
return err
}
if d.Tool == "assistant_tasks_save" {
- var task assistantTask
- if json.Unmarshal(d.Body, &task) != nil || strings.TrimSpace(task.Name) == "" || strings.TrimSpace(task.Prompt) == "" {
- return errors.New("invalid assistant task")
- }
- if strings.TrimSpace(task.Cron) != "" {
- if _, err := parseAssistantCron(task.Cron); err != nil {
- return errors.New("invalid assistant task")
- }
- } else if task.IntervalSec < 60 {
- return errors.New("invalid assistant task")
- }
- task.ProjectID = strings.TrimSpace(task.ProjectID)
- if task.ProjectID == "" {
- return errors.New("invalid assistant task")
- }
- if projectID != "" && task.ProjectID != projectID {
- return errors.New("invalid draft scope")
- }
- return nil
+ return validateAssistantTaskDraft(d.Body, projectID)
}
op, ok := assistantWriteOperations[d.Tool]
if !ok {
@@ -1221,6 +1203,29 @@ func validateAssistantDraft(d *assistantDraft, projectID string) error {
return nil
}
+// validateAssistantTaskDraft 校验 assistant_tasks_save 定时任务草稿:名称、提示词、cron 或间隔以及项目归属。
+func validateAssistantTaskDraft(body json.RawMessage, projectID string) error {
+ var task assistantTask
+ if json.Unmarshal(body, &task) != nil || strings.TrimSpace(task.Name) == "" || strings.TrimSpace(task.Prompt) == "" {
+ return errors.New("invalid assistant task")
+ }
+ if strings.TrimSpace(task.Cron) != "" {
+ if _, err := parseAssistantCron(task.Cron); err != nil {
+ return errors.New("invalid assistant task")
+ }
+ } else if task.IntervalSec < 60 {
+ return errors.New("invalid assistant task")
+ }
+ task.ProjectID = strings.TrimSpace(task.ProjectID)
+ if task.ProjectID == "" {
+ return errors.New("invalid assistant task")
+ }
+ if projectID != "" && task.ProjectID != projectID {
+ return errors.New("invalid draft scope")
+ }
+ return nil
+}
+
var assistantWriteOperations = func() map[string]application.Operation {
out := map[string]application.Operation{}
for _, op := range application.PublicOperations() {
diff --git a/internal/httpapi/assistant_task_draft_blank_test.go b/internal/httpapi/assistant_task_draft_blank_test.go
new file mode 100644
index 00000000..f5989ba3
--- /dev/null
+++ b/internal/httpapi/assistant_task_draft_blank_test.go
@@ -0,0 +1,35 @@
+package httpapi
+
+import (
+ "encoding/json"
+ "testing"
+)
+
+// Whitespace-only fields must be treated as empty: a blank prompt is rejected,
+// and a blank cron falls back to the interval rule instead of being parsed.
+func TestValidateAssistantTaskDraftBlankFields(t *testing.T) {
+ cases := []struct {
+ name string
+ body string
+ wantErr string
+ }{
+ {name: "blank prompt", body: `{"name":"巡检","prompt":" \n\t","intervalSec":60,"projectId":"p1"}`, wantErr: "invalid assistant task"},
+ {name: "blank cron uses interval", body: `{"name":"巡检","prompt":"检查","cron":" ","intervalSec":60,"projectId":"p1"}`},
+ {name: "blank cron with short interval", body: `{"name":"巡检","prompt":"检查","cron":" ","intervalSec":30,"projectId":"p1"}`, wantErr: "invalid assistant task"},
+ {name: "valid cron ignores interval", body: `{"name":"日报","prompt":"汇总","cron":" 0 9 * * * ","intervalSec":0,"projectId":"p1"}`},
+ }
+ for _, tc := range cases {
+ t.Run(tc.name, func(t *testing.T) {
+ err := validateAssistantTaskDraft(json.RawMessage(tc.body), "p1")
+ if tc.wantErr == "" {
+ if err != nil {
+ t.Fatalf("validateAssistantTaskDraft() error = %v, want nil", err)
+ }
+ return
+ }
+ if err == nil || err.Error() != tc.wantErr {
+ t.Fatalf("validateAssistantTaskDraft() error = %v, want %q", err, tc.wantErr)
+ }
+ })
+ }
+}
diff --git a/internal/httpapi/assistant_task_draft_test.go b/internal/httpapi/assistant_task_draft_test.go
new file mode 100644
index 00000000..b3d0c1ab
--- /dev/null
+++ b/internal/httpapi/assistant_task_draft_test.go
@@ -0,0 +1,54 @@
+package httpapi
+
+import (
+ "encoding/json"
+ "testing"
+)
+
+func TestValidateAssistantTaskDraft(t *testing.T) {
+ cases := []struct {
+ name string
+ body string
+ projectID string
+ wantErr string
+ }{
+ {name: "valid cron", body: `{"name":"日报","prompt":"汇总","cron":"0 9 * * *","projectId":"p1"}`, projectID: "p1"},
+ {name: "valid interval", body: `{"name":"巡检","prompt":"检查","intervalSec":60,"projectId":" p1 "}`, projectID: "p1"},
+ {name: "empty scope accepts any project", body: `{"name":"巡检","prompt":"检查","intervalSec":120,"projectId":"p2"}`},
+ {name: "invalid json", body: `{`, projectID: "p1", wantErr: "invalid assistant task"},
+ {name: "missing name", body: `{"name":" ","prompt":"检查","intervalSec":60,"projectId":"p1"}`, projectID: "p1", wantErr: "invalid assistant task"},
+ {name: "missing prompt", body: `{"name":"巡检","intervalSec":60,"projectId":"p1"}`, projectID: "p1", wantErr: "invalid assistant task"},
+ {name: "invalid cron", body: `{"name":"巡检","prompt":"检查","cron":"not a cron","intervalSec":600,"projectId":"p1"}`, projectID: "p1", wantErr: "invalid assistant task"},
+ {name: "interval too short", body: `{"name":"巡检","prompt":"检查","intervalSec":59,"projectId":"p1"}`, projectID: "p1", wantErr: "invalid assistant task"},
+ {name: "missing project", body: `{"name":"巡检","prompt":"检查","intervalSec":60,"projectId":" "}`, projectID: "p1", wantErr: "invalid assistant task"},
+ {name: "other project", body: `{"name":"巡检","prompt":"检查","intervalSec":60,"projectId":"p2"}`, projectID: "p1", wantErr: "invalid draft scope"},
+ }
+ for _, tc := range cases {
+ t.Run(tc.name, func(t *testing.T) {
+ err := validateAssistantTaskDraft(json.RawMessage(tc.body), tc.projectID)
+ if tc.wantErr == "" {
+ if err != nil {
+ t.Fatalf("validateAssistantTaskDraft() error = %v, want nil", err)
+ }
+ return
+ }
+ if err == nil || err.Error() != tc.wantErr {
+ t.Fatalf("validateAssistantTaskDraft() error = %v, want %q", err, tc.wantErr)
+ }
+ })
+ }
+}
+
+func TestValidateAssistantDraftDelegatesTaskDraft(t *testing.T) {
+ ok := assistantDraft{Tool: " assistant_tasks_save ", Body: json.RawMessage(`{"name":"巡检","prompt":"检查","intervalSec":60,"projectId":"p1"}`)}
+ if err := validateAssistantDraft(&ok, "p1"); err != nil {
+ t.Fatalf("validateAssistantDraft(task) error = %v", err)
+ }
+ if ok.Tool != "assistant_tasks_save" {
+ t.Fatalf("tool not trimmed: %q", ok.Tool)
+ }
+ bad := assistantDraft{Tool: "assistant_tasks_save", Body: json.RawMessage(`{"name":"巡检","prompt":"检查","intervalSec":60,"projectId":"p2"}`)}
+ if err := validateAssistantDraft(&bad, "p1"); err == nil || err.Error() != "invalid draft scope" {
+ t.Fatalf("validateAssistantDraft(other project) error = %v, want invalid draft scope", err)
+ }
+}