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

Simplify code found by simplicity audit of d6be98f

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-23 13:05:14 -07:00
parent c337799147
commit 3c2932c8fb
26 changed files with 180 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/server/lead.go
+2 -1
View File
@@ -6,6 +6,7 @@ import (
"net/http"
"strings"
"g.fc.run/ai/byre/internal/agents"
"g.fc.run/ai/byre/internal/api"
)
@@ -57,7 +58,7 @@ func (s *Server) MessageLead(w http.ResponseWriter, r *http.Request) {
return
}
sess, err := s.agents.MessageLead(r.Context(), u, req.Text, deref(req.Model), deref(req.Effort), deref(req.SendId), r.Header.Get("Byre-Client"), images)
sess, err := s.agents.MessageLead(r.Context(), u, agents.Prompt{Text: req.Text, Model: deref(req.Model), Effort: deref(req.Effort), SendID: deref(req.SendId), Client: r.Header.Get("Byre-Client"), Images: images})
if err != nil {
writeAgentError(w, err)
return
internal/server/server.go
+30 -54
View File
@@ -450,7 +450,7 @@ func (s *Server) CreateTask(w http.ResponseWriter, r *http.Request, projectID st
if !ok {
return
}
t, err := s.agents.StartTask(r.Context(), p, u, title, prompt, deref(req.Model), deref(req.Effort), r.Header.Get("Byre-Client"), images)
t, err := s.agents.StartTask(r.Context(), p, u, title, agents.Prompt{Text: prompt, Model: deref(req.Model), Effort: deref(req.Effort), Client: r.Header.Get("Byre-Client"), Images: images})
if err != nil {
writeAgentError(w, err)
return
@@ -528,64 +528,40 @@ func (s *Server) MergeTask(w http.ResponseWriter, r *http.Request, taskID string
return
}
var err error
if req.Target != nil && !req.Target.Valid() {
writeError(w, http.StatusBadRequest, fmt.Errorf("unknown target %q", *req.Target))
return
}
if req.KeepOpen != nil && *req.KeepOpen {
if (req.Target != nil && *req.Target != api.MergeTargetMain) || (req.AfterReview != nil && *req.AfterReview) {
writeError(w, http.StatusBadRequest, errors.New("keep_open is only for target main, without after_review"))
target := api.MergeTargetMain
if req.Target != nil {
if !req.Target.Valid() {
writeError(w, http.StatusBadRequest, fmt.Errorf("unknown target %q", *req.Target))
return
}
target = *req.Target
}
afterReview := deref(req.AfterReview)
keepOpen := deref(req.KeepOpen)
if keepOpen && (target != api.MergeTargetMain || afterReview) {
writeError(w, http.StatusBadRequest, errors.New("keep_open is only for target main, without after_review"))
return
}
title := ""
if target == api.MergeTargetMain {
if req.MergeTitle == nil {
writeError(w, http.StatusBadRequest, errors.New("merge_title is required to merge into the default branch"))
return
}
t, err = s.agents.MergeToMain(r.Context(), t, p, u, *req.MergeTitle)
if err != nil {
writeAgentError(w, err)
return
}
writeJSON(w, http.StatusAccepted, t)
return
}
if req.AfterReview != nil && *req.AfterReview {
target := api.MergeTargetMain
if req.Target != nil {
target = *req.Target
}
title := ""
if target == api.MergeTargetMain {
if req.MergeTitle == nil {
writeError(w, http.StatusBadRequest, errors.New("merge_title is required to merge into the default branch"))
return
}
title = *req.MergeTitle
}
t, err = s.agents.MergeAfterReview(r.Context(), t, u, target, title)
if err != nil {
writeAgentError(w, err)
return
}
writeJSON(w, http.StatusAccepted, t)
return
}
if req.Target != nil && *req.Target == api.MergeTargetParent {
t, err = s.agents.MergeIntoParent(r.Context(), t, u)
if err != nil {
writeAgentError(w, err)
return
}
writeJSON(w, http.StatusAccepted, t)
return
}
if req.MergeTitle == nil {
writeError(w, http.StatusBadRequest, errors.New("merge_title is required to merge into the default branch"))
return
title = *req.MergeTitle
}
t, err = s.agents.Merge(r.Context(), t, p, u, *req.MergeTitle)
var err error
switch {
case keepOpen:
t, err = s.agents.MergeToMain(r.Context(), t, p, u, title)
case afterReview:
t, err = s.agents.MergeAfterReview(r.Context(), t, u, target, title)
case target == api.MergeTargetParent:
t, err = s.agents.MergeIntoParent(r.Context(), t, u)
default:
t, err = s.agents.Merge(r.Context(), t, p, u, title)
}
if err != nil {
writeAgentError(w, err)
return
@@ -890,7 +866,7 @@ func (s *Server) ContinueSession(w http.ResponseWriter, r *http.Request, session
return
}
task, err := s.agents.Continue(r.Context(), src, t, p, u, req.Text, deref(req.Model), deref(req.Effort), deref(req.SendId), r.Header.Get("Byre-Client"), images...)
task, err := s.agents.Continue(r.Context(), src, t, p, u, agents.Prompt{Text: req.Text, Model: deref(req.Model), Effort: deref(req.Effort), SendID: deref(req.SendId), Client: r.Header.Get("Byre-Client"), Images: images})
if err != nil {
writeAgentError(w, err)
return
@@ -938,7 +914,7 @@ func (s *Server) CreateSession(w http.ResponseWriter, r *http.Request, taskID st
return
}
sess, err := s.agents.Create(r.Context(), t, u, req.Prompt, deref(req.Model), deref(req.Effort), deref(req.SendId), r.Header.Get("Byre-Client"), images...)
sess, err := s.agents.Create(r.Context(), t, u, agents.Prompt{Text: req.Prompt, Model: deref(req.Model), Effort: deref(req.Effort), SendID: deref(req.SendId), Client: r.Header.Get("Byre-Client"), Images: images})
if err != nil {
writeAgentError(w, err)
return
@@ -971,7 +947,7 @@ func (s *Server) SendMessage(w http.ResponseWriter, r *http.Request, sessionID s
return
}
sess, _, err := s.agents.Message(r.Context(), sessionID, actor(r), req.Text, deref(req.Model), deref(req.Effort), deref(req.SendId), r.Header.Get("Byre-Client"), images...)
sess, _, err := s.agents.Message(r.Context(), sessionID, actor(r), agents.Prompt{Text: req.Text, Model: deref(req.Model), Effort: deref(req.Effort), SendID: deref(req.SendId), Client: r.Header.Get("Byre-Client"), Images: images})
if err != nil {
writeAgentError(w, err)
return