ready to merge and ready to discard as states

internal/store/inbox.go

@@ -27,6 +27,10 @@ func (s *Store) CreateInboxItem(ctx context.Context, item api.InboxItem) error {
 		if err != nil {
 			return err
 		}
+		_, err = tx.ExecContext(ctx, `UPDATE tasks SET ready = '' WHERE id = ?`, item.TaskId)
+		if err != nil {
+			return err
+		}
 
 		return emitItem(ctx, tx, emit, "inbox.created", item.Id, agentActor)
 	})

internal/store/migrations/063-add-task-ready.sql

@@ -0,0 +1,10 @@
+ALTER TABLE tasks ADD COLUMN ready TEXT NOT NULL DEFAULT '';
+UPDATE tasks SET ready = coalesce((
+	SELECT CASE e.kind WHEN 'task.ready' THEN 'merge' ELSE 'discard' END FROM events e
+	WHERE e.task_id = tasks.id AND e.kind IN ('task.ready', 'task.discard_suggested')
+	AND NOT EXISTS (
+		SELECT 1 FROM events l WHERE l.task_id = tasks.id AND l.seq > e.seq
+		AND (l.kind = 'inbox.created' OR (l.kind = 'snapshot.created' AND json_extract(l.payload, '$.trigger') != 'answer'))
+	)
+	ORDER BY e.seq DESC LIMIT 1
+), '') WHERE status = 'active';

internal/store/snapshot.go

@@ -17,6 +17,12 @@ func (s *Store) CreateSnapshot(ctx context.Context, snap api.Snapshot, projectID
 		if err != nil {
 			return err
 		}
+		if snap.Trigger != api.SnapshotTriggerAnswer {
+			_, err = tx.ExecContext(ctx, `UPDATE tasks SET ready = '' WHERE id = ?`, snap.TaskId)
+			if err != nil {
+				return err
+			}
+		}
 		return emit(api.Event{
 			Kind:           "snapshot.created",
 			ProjectId:      &projectID,

internal/store/store.go

@@ -761,17 +761,17 @@ func (s *Store) SetReadyPromptN(ctx context.Context, id string, snapshotN int) e
 }
 
 func (s *Store) MarkReady(ctx context.Context, id, overview, actor string) error {
-	return s.emitActive(ctx, id, actor, "task.ready", map[string]any{"id": id, "overview": overview})
+	return s.setReady(ctx, id, actor, api.TaskReadyMerge, "task.ready", map[string]any{"id": id, "overview": overview})
 }
 
 func (s *Store) SuggestDiscard(ctx context.Context, id, reason, actor string) error {
-	return s.emitActive(ctx, id, actor, "task.discard_suggested", map[string]any{"id": id, "reason": reason})
+	return s.setReady(ctx, id, actor, api.TaskReadyDiscard, "task.discard_suggested", map[string]any{"id": id, "reason": reason})
 }
 
-func (s *Store) emitActive(ctx context.Context, id, actor, kind string, payload map[string]any) error {
+func (s *Store) setReady(ctx context.Context, id, actor string, ready api.TaskReady, kind string, payload map[string]any) error {
 	return s.write(ctx, func(tx *sql.Tx, emit emitFunc) error {
 		projectID := ""
-		err := tx.QueryRowContext(ctx, `SELECT project_id FROM tasks WHERE id = ? AND status = ?`, id, string(api.TaskStatusActive)).Scan(&projectID)
+		err := tx.QueryRowContext(ctx, `UPDATE tasks SET ready = ? WHERE id = ? AND status = ? RETURNING project_id`, string(ready), id, string(api.TaskStatusActive)).Scan(&projectID)
 		if errors.Is(err, sql.ErrNoRows) {
 			return ErrNotFound
 		}
@@ -1491,7 +1491,7 @@ func (s *Store) ClearReviewRequests(ctx context.Context) error {
 
 const projectColumns = `id, name, repo_path, default_branch, remote, created_by, created_at`
 
-const taskColumns = `id, project_id, title, merge_title, branch, worktree_path, base_ref, port_base, color, status, created_by, created_at, closed_at, merge_commit, todo_item, forked_from, forked_at, merge_queued_at, workflow_name, workflow_run, workflow_stage, parent_task_id, parent_merge_by, merge_after_review_by != '', state, merging_by != '' OR finalizing != '', discard_state != '' AND status = 'active', (SELECT coalesce(max(seq), 0) FROM events WHERE events.task_id = tasks.id AND kind = 'turn.ended' AND json_extract(payload, '$.summary') = 1)`
+const taskColumns = `id, project_id, title, merge_title, branch, worktree_path, base_ref, port_base, color, status, created_by, created_at, closed_at, merge_commit, todo_item, forked_from, forked_at, merge_queued_at, workflow_name, workflow_run, workflow_stage, parent_task_id, parent_merge_by, merge_after_review_by != '', state, merging_by != '' OR finalizing != '', discard_state != '' AND status = 'active', (SELECT coalesce(max(seq), 0) FROM events WHERE events.task_id = tasks.id AND kind = 'turn.ended' AND json_extract(payload, '$.summary') = 1), ready`
 
 const sessionColumns = `id, coalesce(task_id, ''), owner, vendor, model, vendor_session_id, state, role, member, created_by, created_at, forked_from, forked_at, subagents`
 
@@ -1526,11 +1526,16 @@ func scanTask(row scanner) (api.Task, error) {
 	parentTaskID := ""
 	parentMergeBy := ""
 	taskState := ""
-	err := row.Scan(&t.Id, &t.ProjectId, &t.Title, &t.MergeTitle, &t.Branch, &t.WorktreePath, &t.BaseRef, &t.PortBase, &t.Color, &status, &t.CreatedBy, &createdAt, &closedAt, &mergeCommit, &todoItem, &forkedFrom, &forkedAt, &mergeQueuedAt, &workflowName, &workflowRun, &workflowStage, &parentTaskID, &parentMergeBy, &t.MergeAfterReview, &taskState, &t.Merging, &t.Discarding, &t.SummarySeq)
+	ready := ""
+	err := row.Scan(&t.Id, &t.ProjectId, &t.Title, &t.MergeTitle, &t.Branch, &t.WorktreePath, &t.BaseRef, &t.PortBase, &t.Color, &status, &t.CreatedBy, &createdAt, &closedAt, &mergeCommit, &todoItem, &forkedFrom, &forkedAt, &mergeQueuedAt, &workflowName, &workflowRun, &workflowStage, &parentTaskID, &parentMergeBy, &t.MergeAfterReview, &taskState, &t.Merging, &t.Discarding, &t.SummarySeq, &ready)
 	if err != nil {
 		return t, err
 	}
 	t.State = api.TaskState(taskState)
+	if ready != "" {
+		r := api.TaskReady(ready)
+		t.Ready = &r
+	}
 	if parentTaskID != "" {
 		t.ParentTaskId = &parentTaskID
 	}