ai/byre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Open merge dialog instantly from pushed merge facts

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-21 11:48:21 -07:00
parent 4bb6f1fa11
commit 890fb6b691
15 changed files with 736 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/store/mergefacts.go
+81
View File
@@ -0,0 +1,81 @@
package store
import (
"context"
"database/sql"
"errors"
"reflect"
"g.fc.run/ai/byre/internal/api"
)
const mergeFactsColumns = `unmerged_commits, unmerged_files, unreviewed_changes, review_snapshot, review_count, review_running, review_failed, review_findings,
(SELECT json_group_array(json_object('login', login, 'display_name', display_name, 'git_name', git_name, 'git_email', git_email))
FROM (SELECT * FROM task_participants WHERE task_participants.task_id = tasks.id ORDER BY position))`
type GitFacts struct {
UnmergedCommits int
UnmergedFiles int
UnreviewedChanges bool
}
func (s *Store) SettleMergeFacts(ctx context.Context, taskID string, g GitFacts) error {
return s.write(ctx, func(tx *sql.Tx, emit emitFunc) error {
t, err := scanTask(tx.QueryRowContext(ctx, `SELECT `+taskColumns+` FROM tasks WHERE id = ?`, taskID))
if errors.Is(err, sql.ErrNoRows) {
return ErrNotFound
}
if err != nil {
return err
}
if t.Status != api.TaskStatusActive {
return nil
}
f := api.MergeFacts{UnmergedCommits: g.UnmergedCommits, UnmergedFiles: g.UnmergedFiles, UnreviewedChanges: g.UnreviewedChanges}
err = tx.QueryRowContext(ctx, `SELECT coalesce(max(n), 0) FROM snapshots WHERE task_id = ? AND trigger NOT IN (?, ?, ?)`,
taskID, string(api.SnapshotTriggerAnswer), string(api.SnapshotTriggerFork), string(api.SnapshotTriggerAskHuman)).Scan(&f.ReviewSnapshot)
if err != nil {
return err
}
err = tx.QueryRowContext(ctx, `
SELECT count(*), coalesce(max(state = ?), 0), coalesce(max(state = ?), 0),
coalesce(sum(CASE WHEN state = ? THEN (
SELECT count(*) FROM json_each(nullif(reviews.result, ''), '$.findings') f
WHERE coalesce(json_extract(reviews.finding_states, '$."' || f.key || '"'), '') != ?
) END), 0)
FROM reviews WHERE task_id = ? AND snapshot_n = ?
`, string(api.ReviewStateRunning), string(api.ReviewStateFailed), string(api.ReviewStateDone), string(api.FindingIgnored), taskID, f.ReviewSnapshot).
Scan(&f.ReviewCount, &f.ReviewRunning, &f.ReviewFailed, &f.ReviewFindings)
if err != nil {
return err
}
f.Participants, err = participants(ctx, tx, taskID)
if err != nil {
return err
}
if reflect.DeepEqual(f, t.MergeFacts) {
return nil
}
_, err = tx.ExecContext(ctx, `
UPDATE tasks SET unmerged_commits = ?, unmerged_files = ?, unreviewed_changes = ?, review_snapshot = ?, review_count = ?, review_running = ?, review_failed = ?, review_findings = ?
WHERE id = ?
`, f.UnmergedCommits, f.UnmergedFiles, f.UnreviewedChanges, f.ReviewSnapshot, f.ReviewCount, f.ReviewRunning, f.ReviewFailed, f.ReviewFindings, taskID)
if err != nil {
return err
}
_, err = tx.ExecContext(ctx, `DELETE FROM task_participants WHERE task_id = ?`, taskID)
if err != nil {
return err
}
for i, p := range f.Participants {
_, err = tx.ExecContext(ctx, `INSERT INTO task_participants (task_id, position, login, display_name, git_name, git_email) VALUES (?, ?, ?, ?, ?, ?)`,
taskID, i, p.Login, p.DisplayName, p.GitName, p.GitEmail)
if err != nil {
return err
}
}
return emit(api.Event{Kind: "task.merge_facts", ProjectId: &t.ProjectId, TaskId: &taskID, Actor: "byre", Payload: ToPayload(f)})
})
}
internal/store/migrations/091-add-task-merge-facts.sql
+17
View File
@@ -0,0 +1,17 @@
ALTER TABLE tasks ADD COLUMN unmerged_commits INTEGER NOT NULL DEFAULT 0;
ALTER TABLE tasks ADD COLUMN unmerged_files INTEGER NOT NULL DEFAULT 0;
ALTER TABLE tasks ADD COLUMN unreviewed_changes INTEGER NOT NULL DEFAULT 0;
ALTER TABLE tasks ADD COLUMN review_snapshot INTEGER NOT NULL DEFAULT 0;
ALTER TABLE tasks ADD COLUMN review_count INTEGER NOT NULL DEFAULT 0;
ALTER TABLE tasks ADD COLUMN review_running INTEGER NOT NULL DEFAULT 0;
ALTER TABLE tasks ADD COLUMN review_failed INTEGER NOT NULL DEFAULT 0;
ALTER TABLE tasks ADD COLUMN review_findings INTEGER NOT NULL DEFAULT 0;
CREATE TABLE task_participants (
task_id TEXT NOT NULL REFERENCES tasks (id),
position INTEGER NOT NULL,
login TEXT NOT NULL,
display_name TEXT NOT NULL,
git_name TEXT NOT NULL,
git_email TEXT NOT NULL,
PRIMARY KEY (task_id, position)
);
internal/store/store.go
+18 -3
View File
@@ -558,6 +558,10 @@ func (s *Store) queryTasks(ctx context.Context, query string, args ...any) ([]ap
return tasks, rows.Err()
}
func (s *Store) ActiveTasks(ctx context.Context) ([]api.Task, error) {
return s.queryTasks(ctx, `SELECT `+taskColumns+` FROM tasks WHERE status = ? ORDER BY created_at`, string(api.TaskStatusActive))
}
func (s *Store) ActiveSubtasks(ctx context.Context, parentID string) ([]api.Task, error) {
return s.queryTasks(ctx, `SELECT `+taskColumns+` FROM tasks WHERE parent_task_id = ? AND status = ? ORDER BY created_at`, parentID, string(api.TaskStatusActive))
}
@@ -939,7 +943,11 @@ func closeRun(ctx context.Context, tx *sql.Tx, emit emitFunc, stageID, actor str
}
func (s *Store) Participants(ctx context.Context, taskID string) ([]api.Participant, error) {
rows, err := s.db.QueryContext(ctx, `
return participants(ctx, s.db, taskID)
}
func participants(ctx context.Context, q querier, taskID string) ([]api.Participant, error) {
rows, err := q.QueryContext(ctx, `
SELECT u.login, u.display_name, u.git_name, u.git_email
FROM events e JOIN users u ON u.login = e.actor
WHERE e.task_id = ? AND (e.kind IN ('user.message', 'board.posted') OR (e.kind = 'task.created' AND json_extract(e.payload, '$.forked_from') IS NOT NULL))
@@ -1702,7 +1710,7 @@ func (s *Store) ClearReviewRequests(ctx context.Context) error {
const projectColumns = `id, name, repo_path, default_branch, remote, created_by, created_at, review_workflow, audit_workflow`
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_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), audit, ` + backgroundExpr
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_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), audit, ` + backgroundExpr + `, ` + mergeFactsColumns
// Keep the child lookup separate from the task itself so SQLite can use tasks_parent.
const backgroundExpr = `(audit != '' OR EXISTS (SELECT 1 FROM tasks r WHERE r.id = tasks.parent_task_id AND tasks.workflow_stage != '' AND r.audit != ''))
@@ -1742,7 +1750,14 @@ func scanTask(row scanner) (api.Task, error) {
parentMergeBy := ""
taskState := ""
audit := ""
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, &workflowStage, &parentTaskID, &parentMergeBy, &t.MergeAfterReview, &taskState, &t.Merging, &t.Discarding, &t.SummarySeq, &audit, &t.Background)
participants := ""
f := &t.MergeFacts
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, &workflowStage, &parentTaskID, &parentMergeBy, &t.MergeAfterReview, &taskState, &t.Merging, &t.Discarding, &t.SummarySeq, &audit, &t.Background,
&f.UnmergedCommits, &f.UnmergedFiles, &f.UnreviewedChanges, &f.ReviewSnapshot, &f.ReviewCount, &f.ReviewRunning, &f.ReviewFailed, &f.ReviewFindings, &participants)
if err != nil {
return t, err
}
err = json.Unmarshal([]byte(participants), &f.Participants)
if err != nil {
return t, err
}