Run reviews and nudges on the state-driven coordinator
This commit is contained in:
+7
-24
@@ -705,12 +705,6 @@ func (s *Store) CancelMergeAfterReview(ctx context.Context, id, actor string) er
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Store) FinishedMergeAfterReviews(ctx context.Context) ([]string, error) {
|
||||
return queryIDs(ctx, s.db, `
|
||||
SELECT tasks.merge_after_review_id FROM tasks JOIN reviews ON reviews.id = tasks.merge_after_review_id
|
||||
WHERE tasks.merge_after_review_by != '' AND reviews.state != ?`, string(api.ReviewStateRunning))
|
||||
}
|
||||
|
||||
func (s *Store) TakeMergeAfterReview(ctx context.Context, id string, reviewIDs []string) (MergeAfterReview, error) {
|
||||
mar := MergeAfterReview{}
|
||||
err := s.write(ctx, func(tx *sql.Tx, emit emitFunc) error {
|
||||
@@ -752,22 +746,6 @@ func (s *Store) SetTaskSummary(ctx context.Context, id, summary, actor string) e
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Store) ReadyPromptDue(ctx context.Context, id string) (bool, error) {
|
||||
due := false
|
||||
err := s.db.QueryRowContext(ctx, `SELECT EXISTS (
|
||||
SELECT 1 FROM events e, tasks t
|
||||
WHERE t.id = ? AND e.task_id = t.id AND e.seq > t.ready_prompt_seq
|
||||
AND ((e.kind = 'snapshot.created' AND json_extract(e.payload, '$.trigger') NOT IN `+cutPointTriggers+`)
|
||||
OR (e.kind = 'user.message' AND e.actor != ? AND e.actor NOT LIKE '% (lead)' AND json_extract(e.payload, '$.bounce') IS NOT 1))
|
||||
)`, id, agentActor).Scan(&due)
|
||||
return due, err
|
||||
}
|
||||
|
||||
func (s *Store) SetReadyPromptSeq(ctx context.Context, id string, seq int64) error {
|
||||
_, err := s.db.ExecContext(ctx, `UPDATE tasks SET ready_prompt_seq = ? WHERE id = ?`, seq, id)
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *Store) MarkReady(ctx context.Context, id, overview, merge, actor string) error {
|
||||
return s.setReady(ctx, id, actor, merge, "task.ready", map[string]any{"id": id, "overview": overview, "merge": merge})
|
||||
}
|
||||
@@ -1092,8 +1070,12 @@ func (s *Store) TaskHandoffs(ctx context.Context, taskID string) ([]Handoff, err
|
||||
}
|
||||
|
||||
func (s *Store) SessionStopped(ctx context.Context, taskID, sessionID string) (bool, error) {
|
||||
return sessionStopped(ctx, s.db, taskID, sessionID)
|
||||
}
|
||||
|
||||
func sessionStopped(ctx context.Context, q querier, taskID, sessionID string) (bool, error) {
|
||||
stopped := false
|
||||
err := s.db.QueryRowContext(ctx, `
|
||||
err := q.QueryRowContext(ctx, `
|
||||
SELECT coalesce(json_extract(e.payload, '$.stopped'), 0) = 1 AND NOT EXISTS (
|
||||
SELECT 1 FROM events a
|
||||
WHERE a.task_id = e.task_id AND a.agent_session_id = e.agent_session_id AND a.seq > e.seq
|
||||
@@ -1630,7 +1612,8 @@ const taskStateExpr = `CASE
|
||||
WHEN s.state != 'idle' THEN s.state
|
||||
WHEN s.subagents > 0 THEN 'running'
|
||||
WHEN EXISTS (SELECT 1 FROM reviews r WHERE r.task_id = tasks.id AND r.state = 'running') THEN 'reviewing'
|
||||
WHEN tasks.review_requests > 0 THEN 'review_pending'
|
||||
WHEN tasks.review_requests > 0 OR EXISTS (SELECT 1 FROM snapshots sn WHERE sn.task_id = tasks.id AND sn.review = 1
|
||||
AND NOT EXISTS (SELECT 1 FROM reviews r WHERE r.task_id = sn.task_id AND r.snapshot_n >= sn.n)) THEN 'review_pending'
|
||||
WHEN tasks.ready IN ('complete', 'continue') THEN 'ready_to_merge'
|
||||
WHEN tasks.ready = 'discard' THEN 'discard_suggested'
|
||||
WHEN tasks.stage_output != '' THEN 'finished'
|
||||
|
||||
Reference in New Issue
Block a user