Autumn-27
8047bb7aca
任务页新建任务左侧加「并发设置」齿轮:开关(默认关) + 并发数量(开启默认5)。 开启后新建任务若「运行中」数已达上限,进入「排队中」不启动;有空位时后台 每 5s 自动把最早排队的任务补位启动。 - db: tasks 加持久化 queued 列(schema + ALTER 补旧库);Task.Queued/SetQueued。 - manager: ConcurrencyLimit/SetConcurrency(settings KV);SetTaskQueued(落库+同步内存)。 - 准入与促进器(goals.go):launchTask 统一准入,满则挂起排队;抽出 startTaskEngine 复用;occupiesSlot/runningTaskCount/queueIfAtCapacity;reconcileConcurrency 每 scheduler tick 补位(关闭则放行全部排队),concMu 串行化防超发;启动重载/setActive/ reviveTask 三处'排队则不启动'门。 - settings: /api/settings 增 task_concurrency_enabled/limit;PUT 后立即协调一次。 - web: 齿轮 Dialog(Switch+数量);新增 queued/「排队中」状态(类型/状态色/筛选)。 - 超限只排队新任务,不打断在跑的;排队任务不消耗 LLM(目标拆解推迟到出队)。 go build/vet、tsc 通过;DB queued 往返测试通过。
373 lines
11 KiB
Go
373 lines
11 KiB
Go
package server
|
||
|
||
import (
|
||
"context"
|
||
"encoding/json"
|
||
"fmt"
|
||
"log"
|
||
"strconv"
|
||
"strings"
|
||
"time"
|
||
|
||
"github.com/Autumn-27/artex/db"
|
||
)
|
||
|
||
// Scheduler drives P3 triggers: on each tick it fires due interval triggers and
|
||
// scans for new findings / newly-met goals (any task) to fire event triggers.
|
||
// Each fire enqueues a NEW conversation on the agent's per-agent trigger queue
|
||
// (StartTriggeredRun): fires for the same agent run one at a time in FIFO order,
|
||
// distinct agents still run concurrently. State is persisted (per-trigger last_fire
|
||
// + finding watermark + fired-goal set) so a restart resumes without double-firing.
|
||
// Triggers only attach to CUSTOM agents.
|
||
type Scheduler struct {
|
||
s *Server
|
||
pg *db.DB
|
||
tick time.Duration
|
||
}
|
||
|
||
const (
|
||
schedKeyLastFinding = "last_finding_id" // watermark: max finding node id fired for
|
||
schedKeyFiredGoals = "fired_goals" // JSON array of goal node ids already fired
|
||
schedKeyLastTimeout = "last_timeout_id" // watermark: max task id fired for task timeout
|
||
schedKeyLastToolCall = "last_toolcall_id" // watermark: max activity id fired for tool call
|
||
schedKeyLastTaskCreate = "last_taskcreate_id" // watermark: max task id fired for task create
|
||
)
|
||
|
||
func newScheduler(s *Server) *Scheduler {
|
||
return &Scheduler{s: s, pg: s.m.pg, tick: 5 * time.Second}
|
||
}
|
||
|
||
// Run loops until ctx is done, ticking the scheduler. Started once from server New.
|
||
func (sc *Scheduler) Run(ctx context.Context) {
|
||
if sc.pg == nil {
|
||
return
|
||
}
|
||
sc.init()
|
||
t := time.NewTicker(sc.tick)
|
||
defer t.Stop()
|
||
for {
|
||
select {
|
||
case <-ctx.Done():
|
||
return
|
||
case <-t.C:
|
||
sc.s.reconcileConcurrency() // 并发上限:有空位就把排队任务补位启动
|
||
sc.step()
|
||
}
|
||
}
|
||
}
|
||
|
||
// init seeds the watermarks on first run so pre-existing findings/goals don't all
|
||
// fire at once — only events created AFTER the scheduler first starts count.
|
||
func (sc *Scheduler) init() {
|
||
if sc.mustState(schedKeyLastFinding) == "" {
|
||
var maxID int64
|
||
if evs, err := sc.pg.NewFindingsSince(0); err == nil {
|
||
for _, e := range evs {
|
||
if e.NodeID > maxID {
|
||
maxID = e.NodeID
|
||
}
|
||
}
|
||
}
|
||
_ = sc.pg.SetSchedState(schedKeyLastFinding, strconv.FormatInt(maxID, 10))
|
||
}
|
||
if sc.mustState(schedKeyFiredGoals) == "" {
|
||
set := map[int64]bool{}
|
||
if evs, err := sc.pg.MetGoals(); err == nil {
|
||
for _, e := range evs {
|
||
set[e.NodeID] = true
|
||
}
|
||
}
|
||
sc.saveFiredGoalSet(set)
|
||
}
|
||
if sc.mustState(schedKeyLastTimeout) == "" {
|
||
var maxID int64
|
||
if evs, err := sc.pg.TimedOutTasksSince(0); err == nil {
|
||
for _, e := range evs {
|
||
if e.NodeID > maxID {
|
||
maxID = e.NodeID
|
||
}
|
||
}
|
||
}
|
||
_ = sc.pg.SetSchedState(schedKeyLastTimeout, strconv.FormatInt(maxID, 10))
|
||
}
|
||
if sc.mustState(schedKeyLastToolCall) == "" {
|
||
var maxID int64
|
||
if evs, err := sc.pg.NewToolCallsSince(0); err == nil {
|
||
for _, e := range evs {
|
||
if e.NodeID > maxID {
|
||
maxID = e.NodeID
|
||
}
|
||
}
|
||
}
|
||
_ = sc.pg.SetSchedState(schedKeyLastToolCall, strconv.FormatInt(maxID, 10))
|
||
}
|
||
if sc.mustState(schedKeyLastTaskCreate) == "" {
|
||
var maxID int64
|
||
if evs, err := sc.pg.NewTasksSince(0); err == nil {
|
||
for _, e := range evs {
|
||
if e.NodeID > maxID {
|
||
maxID = e.NodeID
|
||
}
|
||
}
|
||
}
|
||
_ = sc.pg.SetSchedState(schedKeyLastTaskCreate, strconv.FormatInt(maxID, 10))
|
||
}
|
||
}
|
||
|
||
func (sc *Scheduler) step() {
|
||
triggers, err := sc.pg.ListEnabledTriggers()
|
||
if err != nil {
|
||
return
|
||
}
|
||
if len(triggers) == 0 {
|
||
return
|
||
}
|
||
sc.fireIntervals(triggers)
|
||
sc.fireFindings(triggers)
|
||
sc.fireGoals(triggers)
|
||
sc.fireTaskTimeouts(triggers)
|
||
sc.fireToolCalls(triggers)
|
||
sc.fireTaskCreates(triggers)
|
||
}
|
||
|
||
// fireIntervals fires triggers whose interval has elapsed since last_fire.
|
||
func (sc *Scheduler) fireIntervals(triggers []*db.AgentTrigger) {
|
||
now := time.Now()
|
||
for _, tr := range triggers {
|
||
if tr.IntervalSec <= 0 {
|
||
continue
|
||
}
|
||
due := tr.LastFire == nil || now.Sub(*tr.LastFire) >= time.Duration(tr.IntervalSec)*time.Second
|
||
if !due {
|
||
continue
|
||
}
|
||
_ = sc.pg.TouchTriggerFire(tr.ID)
|
||
ctx := "\n\n【本次为定时触发】" + now.Format(" 2006-01-02 15:04:05 MST")
|
||
sc.s.StartTriggeredRun(tr.AgentKey, fmt.Sprintf("定时触发 · %s", now.Format("15:04")), tr.IntervalMessage+ctx, 0, false)
|
||
}
|
||
}
|
||
|
||
// fireFindings fires on_finding triggers for findings above the persisted
|
||
// watermark (monotonic node id → no double-fire across restarts).
|
||
func (sc *Scheduler) fireFindings(triggers []*db.AgentTrigger) {
|
||
var want []*db.AgentTrigger
|
||
for _, tr := range triggers {
|
||
if tr.OnFinding {
|
||
want = append(want, tr)
|
||
}
|
||
}
|
||
last, _ := strconv.ParseInt(sc.mustState(schedKeyLastFinding), 10, 64)
|
||
events, err := sc.pg.NewFindingsSince(last)
|
||
if err != nil || len(events) == 0 {
|
||
return
|
||
}
|
||
// Advance the watermark whether or not any on_finding trigger is active: a
|
||
// finding fires only for triggers live at the moment it appears. Otherwise a
|
||
// trigger enabled later would replay the entire historical backlog at once.
|
||
maxID := last
|
||
for _, e := range events {
|
||
if e.NodeID > maxID {
|
||
maxID = e.NodeID
|
||
}
|
||
if len(want) == 0 {
|
||
continue
|
||
}
|
||
msgCtx := fmt.Sprintf("\n\n【本次由任务发现 finding 触发】\n任务: #%d %s（目标：%s）\n发现: [%s/%s] %s",
|
||
e.TaskID, e.TaskDesc, e.TaskGoal, e.VulnClass, e.Severity, e.Summary)
|
||
for _, tr := range want {
|
||
sc.s.StartTriggeredRun(tr.AgentKey, fmt.Sprintf("finding 触发 · task#%d", e.TaskID), tr.FindingMessage+msgCtx, e.TaskID, true)
|
||
}
|
||
}
|
||
_ = sc.pg.SetSchedState(schedKeyLastFinding, strconv.FormatInt(maxID, 10))
|
||
}
|
||
|
||
// fireGoals fires on_goal_met triggers for met goals not yet in the fired set.
|
||
func (sc *Scheduler) fireGoals(triggers []*db.AgentTrigger) {
|
||
var want []*db.AgentTrigger
|
||
for _, tr := range triggers {
|
||
if tr.OnGoalMet {
|
||
want = append(want, tr)
|
||
}
|
||
}
|
||
events, err := sc.pg.MetGoals()
|
||
if err != nil || len(events) == 0 {
|
||
return
|
||
}
|
||
// Mark goals as consumed whether or not a trigger is active, so enabling an
|
||
// on_goal_met trigger later doesn't replay every already-met goal.
|
||
fired := sc.firedGoalSet()
|
||
changed := false
|
||
for _, e := range events {
|
||
if fired[e.NodeID] {
|
||
continue
|
||
}
|
||
fired[e.NodeID] = true
|
||
changed = true
|
||
if len(want) == 0 {
|
||
continue
|
||
}
|
||
msgCtx := fmt.Sprintf("\n\n【本次由任务完成目标触发】\n任务: #%d %s（目标：%s）\n达成目标: %s",
|
||
e.TaskID, e.TaskDesc, e.TaskGoal, e.Summary)
|
||
for _, tr := range want {
|
||
sc.s.StartTriggeredRun(tr.AgentKey, fmt.Sprintf("目标触发 · task#%d", e.TaskID), tr.GoalMessage+msgCtx, e.TaskID, true)
|
||
}
|
||
}
|
||
if changed {
|
||
sc.saveFiredGoalSet(fired)
|
||
}
|
||
}
|
||
|
||
// fireTaskTimeouts fires on_task_timeout triggers for tasks that newly reached
|
||
// status='timeout' above the persisted watermark (task id → no double-fire).
|
||
func (sc *Scheduler) fireTaskTimeouts(triggers []*db.AgentTrigger) {
|
||
var want []*db.AgentTrigger
|
||
for _, tr := range triggers {
|
||
if tr.OnTaskTimeout {
|
||
want = append(want, tr)
|
||
}
|
||
}
|
||
last, _ := strconv.ParseInt(sc.mustState(schedKeyLastTimeout), 10, 64)
|
||
events, err := sc.pg.TimedOutTasksSince(last)
|
||
if err != nil || len(events) == 0 {
|
||
return
|
||
}
|
||
// Advance the watermark even with no active trigger — see fireFindings.
|
||
maxID := last
|
||
for _, e := range events {
|
||
if e.NodeID > maxID {
|
||
maxID = e.NodeID
|
||
}
|
||
if len(want) == 0 {
|
||
continue
|
||
}
|
||
msgCtx := fmt.Sprintf("\n\n【本次由任务超时触发】\n任务: #%d %s（目标：%s）",
|
||
e.TaskID, e.TaskDesc, e.TaskGoal)
|
||
for _, tr := range want {
|
||
sc.s.StartTriggeredRun(tr.AgentKey, fmt.Sprintf("超时触发 · task#%d", e.TaskID), tr.TaskTimeoutMessage+msgCtx, e.TaskID, true)
|
||
}
|
||
}
|
||
_ = sc.pg.SetSchedState(schedKeyLastTimeout, strconv.FormatInt(maxID, 10))
|
||
}
|
||
|
||
// fireTaskCreates fires on_task_create triggers for tasks newly created above the
|
||
// persisted watermark (task id → no double-fire across restarts).
|
||
func (sc *Scheduler) fireTaskCreates(triggers []*db.AgentTrigger) {
|
||
var want []*db.AgentTrigger
|
||
for _, tr := range triggers {
|
||
if tr.OnTaskCreate {
|
||
want = append(want, tr)
|
||
}
|
||
}
|
||
last, _ := strconv.ParseInt(sc.mustState(schedKeyLastTaskCreate), 10, 64)
|
||
events, err := sc.pg.NewTasksSince(last)
|
||
if err != nil || len(events) == 0 {
|
||
return
|
||
}
|
||
// Advance the watermark even with no active trigger — see fireFindings.
|
||
maxID := last
|
||
for _, e := range events {
|
||
if e.NodeID > maxID {
|
||
maxID = e.NodeID
|
||
}
|
||
if len(want) == 0 {
|
||
continue
|
||
}
|
||
msgCtx := fmt.Sprintf("\n\n【本次由任务创建触发】\n任务ID: #%d\n任务描述: %s\n任务目标: %s",
|
||
e.TaskID, e.TaskDesc, e.TaskGoal)
|
||
for _, tr := range want {
|
||
sc.s.StartTriggeredRun(tr.AgentKey, fmt.Sprintf("任务创建触发 · task#%d", e.TaskID), tr.TaskCreateMessage+msgCtx, e.TaskID, true)
|
||
}
|
||
}
|
||
_ = sc.pg.SetSchedState(schedKeyLastTaskCreate, strconv.FormatInt(maxID, 10))
|
||
}
|
||
|
||
// fireToolCalls fires on_tool_call triggers for tool calls (tool_result rows) above
|
||
// the persisted watermark whose tool name is in the trigger's selected set. The fire
|
||
// message carries the task id/desc/goal + tool name + (truncated) input & output.
|
||
func (sc *Scheduler) fireToolCalls(triggers []*db.AgentTrigger) {
|
||
var want []*db.AgentTrigger
|
||
for _, tr := range triggers {
|
||
if tr.OnToolCall && len(tr.ToolNames) > 0 {
|
||
want = append(want, tr)
|
||
}
|
||
}
|
||
last, _ := strconv.ParseInt(sc.mustState(schedKeyLastToolCall), 10, 64)
|
||
events, err := sc.pg.NewToolCallsSince(last)
|
||
if err != nil || len(events) == 0 {
|
||
return
|
||
}
|
||
// Advance the watermark even with no active trigger — see fireFindings.
|
||
maxID := last
|
||
for _, e := range events {
|
||
if e.NodeID > maxID {
|
||
maxID = e.NodeID
|
||
}
|
||
if len(want) == 0 {
|
||
continue
|
||
}
|
||
errTag := ""
|
||
if e.ToolIsErr {
|
||
errTag = "[error] "
|
||
}
|
||
msgCtx := fmt.Sprintf("\n\n【本次由工具调用触发】\n任务: #%d %s（目标：%s）\n工具: %s\n入参: %s\n返回: %s%s",
|
||
e.TaskID, e.TaskDesc, e.TaskGoal, e.Tool, trunc(e.ToolInput, 1500), errTag, trunc(e.ToolOutput, 1500))
|
||
for _, tr := range want {
|
||
if !containsFold(tr.ToolNames, e.Tool) {
|
||
continue
|
||
}
|
||
sc.s.StartTriggeredRun(tr.AgentKey, fmt.Sprintf("工具触发 · %s · task#%d", e.Tool, e.TaskID), tr.ToolCallMessage+msgCtx, e.TaskID, true)
|
||
}
|
||
}
|
||
_ = sc.pg.SetSchedState(schedKeyLastToolCall, strconv.FormatInt(maxID, 10))
|
||
}
|
||
|
||
// containsFold reports whether name is in set (case-insensitive).
|
||
func containsFold(set []string, name string) bool {
|
||
for _, s := range set {
|
||
if strings.EqualFold(s, name) {
|
||
return true
|
||
}
|
||
}
|
||
return false
|
||
}
|
||
|
||
// trunc caps s to max runes, appending an ellipsis + original length when cut.
|
||
func trunc(s string, max int) string {
|
||
r := []rune(s)
|
||
if len(r) <= max {
|
||
return s
|
||
}
|
||
return string(r[:max]) + fmt.Sprintf("…(已截断,共 %d 字)", len(r))
|
||
}
|
||
|
||
func (sc *Scheduler) mustState(key string) string {
|
||
v, _ := sc.pg.GetSchedState(key)
|
||
return v
|
||
}
|
||
|
||
func (sc *Scheduler) firedGoalSet() map[int64]bool {
|
||
out := map[int64]bool{}
|
||
raw := sc.mustState(schedKeyFiredGoals)
|
||
if raw == "" {
|
||
return out
|
||
}
|
||
var ids []int64
|
||
if json.Unmarshal([]byte(raw), &ids) == nil {
|
||
for _, id := range ids {
|
||
out[id] = true
|
||
}
|
||
}
|
||
return out
|
||
}
|
||
|
||
func (sc *Scheduler) saveFiredGoalSet(set map[int64]bool) {
|
||
ids := make([]int64, 0, len(set))
|
||
for id := range set {
|
||
ids = append(ids, id)
|
||
}
|
||
b, _ := json.Marshal(ids)
|
||
if err := sc.pg.SetSchedState(schedKeyFiredGoals, string(b)); err != nil {
|
||
log.Printf("[scheduler] save fired goals failed: %v", err)
|
||
}
|
||
}
|