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

Match pending sends by a send id the server echoes

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-20 15:22:50 -07:00
parent b8c5331a0c
commit 8fec4b9040
29 changed files with 437 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/agents/mergein.go
+4 -4
View File
@@ -51,7 +51,7 @@ func (m *Manager) headStartMerge(ctx context.Context, task api.Task, user api.Us
}
prompt := mergeInPrompt(target) + fmt.Sprintf(" This task's Merge is held while another task merges into %s; this turn gets a head start, and byre merges %s in again when the held merge starts. If you stop for substantive changes, call stop_merge first, so byre drops the held merge and nothing is pushed before the review.", target, target)
go func() {
_, err := m.launch(context.Background(), sess, task, "byre", prompt, nil)
_, err := m.launch(context.Background(), sess, task, "byre", prompt, "", nil)
if err != nil {
slog.Error("start held merge head start", "task", task.Id, "err", err)
}
@@ -64,9 +64,9 @@ func (m *Manager) sendMergeIn(ctx context.Context, task api.Task, user api.User,
return api.AgentSession{}, err
}
if found {
return m.Send(ctx, sess.Id, "byre", prompt, "")
return m.Send(ctx, sess.Id, "byre", prompt, "", "")
}
return m.create(ctx, task, user, sess.Member, prompt, "", "byre", nil)
return m.create(ctx, task, user, sess.Member, prompt, "", "byre", "", nil)
}
func (m *Manager) Merge(ctx context.Context, task api.Task, project api.Project, user api.User, title string) (api.Task, error) {
@@ -189,7 +189,7 @@ func (m *Manager) launchMerge(sess api.AgentSession, task api.Task, project api.
}
func (m *Manager) deliverMerge(ctx context.Context, sess api.AgentSession, task api.Task, project api.Project, prompt string) error {
_, compacting, err := m.recordMessage(ctx, sess, task, "byre", prompt, nil)
_, compacting, err := m.recordMessage(ctx, sess, task, "byre", prompt, "", nil)
if err != nil {
return err
}