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

Move lead delivery and the Merge & continue hold onto the coordinator

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-21 13:59:37 -07:00
parent 1734057293
commit 5c50fa857f
16 changed files with 270 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/store/coordinate.go
+14
View File
@@ -17,6 +17,8 @@ type Work struct {
SettleReviews []SnapshotRef
ReadyPrompts []ReadyPrompt
AdvanceStages []string
LeadDeliveries []LeadDelivery
QueuedDelivery []QueuedDelivery
}
func (s *Store) Coordinate(ctx context.Context) (Work, error) {
@@ -74,6 +76,18 @@ func (s *Store) Coordinate(ctx context.Context) (Work, error) {
return err
}
work.AdvanceStages, err = finishedStages(ctx, tx)
if err != nil {
return err
}
work.LeadDeliveries, err = leadDeliveries(ctx, tx)
if err != nil {
return err
}
err = endLandings(ctx, tx)
if err != nil {
return err
}
work.QueuedDelivery, err = queuedDeliveries(ctx, tx)
return err
})
return work, err
internal/store/landing.go
+114
View File
@@ -0,0 +1,114 @@
package store
import (
"context"
"database/sql"
"errors"
"fmt"
"g.fc.run/ai/byre/internal/api"
)
func (s *Store) StartLanding(ctx context.Context, taskID, sessionID, login string) error {
return s.write(ctx, func(tx *sql.Tx, emit emitFunc) error {
landing := ""
running := false
err := tx.QueryRowContext(ctx, `SELECT landing_session, `+implementerRunning+` FROM tasks WHERE id = ?`, taskID).Scan(&landing, &running)
if errors.Is(err, sql.ErrNoRows) {
return ErrNotFound
}
if err != nil {
return err
}
switch {
case landing != "":
return fmt.Errorf("%w: task %s is already merging and continuing", ErrStateChanged, taskID)
case running:
return fmt.Errorf("%w: an agent on task %s is mid-turn; merge when they're all idle", ErrStateChanged, taskID)
}
idle := api.AgentSessionStateIdle
err = transitionSessionTx(ctx, tx, emit, sessionID, &idle, api.AgentSessionStateRunning, "byre", nil)
if err != nil {
return err
}
_, err = tx.ExecContext(ctx, `UPDATE tasks SET landing_session = ?, landing_by = ? WHERE id = ?`, sessionID, login, taskID)
return err
})
}
func (s *Store) LandingBy(ctx context.Context, taskID, sessionID string) (string, error) {
by := ""
err := s.db.QueryRowContext(ctx, `SELECT landing_by FROM tasks WHERE id = ? AND landing_session = ?`, taskID, sessionID).Scan(&by)
if errors.Is(err, sql.ErrNoRows) {
return "", nil
}
return by, err
}
func (s *Store) HeldForLanding(ctx context.Context, taskID, sessionID string) (bool, error) {
held := false
err := s.db.QueryRowContext(ctx, `SELECT landing_session != '' AND landing_session != ? FROM tasks WHERE id = ?`, sessionID, taskID).Scan(&held)
if errors.Is(err, sql.ErrNoRows) {
return false, nil
}
return held, err
}
func endLandings(ctx context.Context, tx *sql.Tx) error {
_, err := tx.ExecContext(ctx, `UPDATE tasks SET landing_session = '', landing_by = ''
WHERE landing_session != '' AND NOT EXISTS (SELECT 1 FROM agent_sessions s WHERE s.id = tasks.landing_session AND s.state = 'running')`)
return err
}
type QueuedDelivery struct {
SessionID string
Input int64
Response string
}
func queuedDeliveries(ctx context.Context, tx *sql.Tx) ([]QueuedDelivery, error) {
rows, err := tx.QueryContext(ctx, `
SELECT s.id, s.task_id,
coalesce((SELECT min(q.id) FROM task_inputs q WHERE q.task_id = s.task_id AND q.member = s.member), 0),
coalesce((SELECT r.id FROM inbox_responses r JOIN inbox_items i ON i.id = r.item_id
WHERE i.agent_session_id = s.id AND r.delivered_at IS NULL ORDER BY r.created_at LIMIT 1), '')
FROM agent_sessions s JOIN tasks t ON t.id = s.task_id
WHERE s.role = 'implementer' AND s.state = 'idle'
AND t.status = 'active' AND t.discard_state = '' AND t.merging_by = '' AND t.finalizing = '' AND t.landing_session = ''
AND (EXISTS (SELECT 1 FROM task_inputs q WHERE q.task_id = s.task_id AND q.member = s.member)
OR EXISTS (SELECT 1 FROM inbox_responses r JOIN inbox_items i ON i.id = r.item_id WHERE i.agent_session_id = s.id AND r.delivered_at IS NULL))
AND s.id = (SELECT l.id FROM agent_sessions l WHERE l.task_id = s.task_id AND l.member = s.member AND l.role = 'implementer' AND l.state != 'completed' ORDER BY l.created_at DESC LIMIT 1)`)
if err != nil {
return nil, err
}
type candidate struct {
QueuedDelivery
taskID string
}
found := []candidate{}
for rows.Next() {
c := candidate{}
err = rows.Scan(&c.SessionID, &c.taskID, &c.Input, &c.Response)
if err != nil {
rows.Close()
return nil, err
}
found = append(found, c)
}
err = errors.Join(rows.Err(), rows.Close())
if err != nil {
return nil, err
}
deliveries := []QueuedDelivery{}
for _, c := range found {
stopped, err := sessionStopped(ctx, tx, c.taskID, c.SessionID)
if err != nil {
return nil, err
}
if !stopped {
deliveries = append(deliveries, c.QueuedDelivery)
}
}
return deliveries, nil
}
internal/store/lead.go
+28
View File
@@ -89,6 +89,34 @@ func (s *Store) RestoreLeadInputs(ctx context.Context, inputs []LeadInput) error
})
}
type LeadDelivery struct {
Owner string
First int64
Last int64
}
func leadDeliveries(ctx context.Context, tx *sql.Tx) ([]LeadDelivery, error) {
rows, err := tx.QueryContext(ctx, `
SELECT i.owner, min(i.id), max(i.id) FROM lead_inputs i
WHERE (SELECT l.state FROM agent_sessions l WHERE l.owner = i.owner AND l.state != 'completed' ORDER BY l.created_at DESC LIMIT 1) = 'idle'
GROUP BY i.owner`)
if err != nil {
return nil, err
}
defer rows.Close()
found := []LeadDelivery{}
for rows.Next() {
d := LeadDelivery{}
err = rows.Scan(&d.Owner, &d.First, &d.Last)
if err != nil {
return nil, err
}
found = append(found, d)
}
return found, rows.Err()
}
func (s *Store) DeleteLeadInputs(ctx context.Context, ids []int64) error {
return s.write(ctx, func(tx *sql.Tx, emit emitFunc) error {
for _, id := range ids {
internal/store/migrations/095-add-task-landing.sql
+2
View File
@@ -0,0 +1,2 @@
ALTER TABLE tasks ADD COLUMN landing_session TEXT NOT NULL DEFAULT '';
ALTER TABLE tasks ADD COLUMN landing_by TEXT NOT NULL DEFAULT '';
internal/store/store.go
+7 -2
View File
@@ -1315,9 +1315,11 @@ func transitionSessionTx(ctx context.Context, tx *sql.Tx, emit emitFunc, id stri
role := ""
discard := ""
finalizing := ""
landing := ""
err := tx.QueryRowContext(ctx, `
SELECT coalesce(t.id, ''), coalesce(t.project_id, ''), s.owner, s.state, s.role, coalesce(t.discard_state, ''), coalesce(t.finalizing, '') FROM agent_sessions s LEFT JOIN tasks t ON t.id = s.task_id WHERE s.id = ?
`, id).Scan(&taskID, &projectID, &owner, &current, &role, &discard, &finalizing)
SELECT coalesce(t.id, ''), coalesce(t.project_id, ''), s.owner, s.state, s.role, coalesce(t.discard_state, ''), coalesce(t.finalizing, ''), coalesce(t.landing_session, '')
FROM agent_sessions s LEFT JOIN tasks t ON t.id = s.task_id WHERE s.id = ?
`, id).Scan(&taskID, &projectID, &owner, &current, &role, &discard, &finalizing, &landing)
if errors.Is(err, sql.ErrNoRows) {
return ErrNotFound
}
@@ -1334,6 +1336,9 @@ func transitionSessionTx(ctx context.Context, tx *sql.Tx, emit emitFunc, id stri
if state == api.AgentSessionStateRunning && role == string(api.Implementer) && finalizing != "" {
return fmt.Errorf("%w: task %s is finishing its merge", ErrStateChanged, taskID)
}
if state == api.AgentSessionStateRunning && role == string(api.Implementer) && landing != "" && landing != id {
return fmt.Errorf("%w: held while task %s merges and continues", ErrStateChanged, taskID)
}
_, err = tx.ExecContext(ctx, `UPDATE agent_sessions SET state = ? WHERE id = ?`, string(state), id)
if err != nil {