Simplify code found by simplicity audit of d6be98f

This commit is contained in:
Ian Gulliver committed 2026-10-23 13:05:14 -07:00
1 parent c337799147
commit 3c2932c8fb
26 files changed
+180 -225

No files matched your search

+6 -6
View File
@@ -39,11 +39,11 @@ func (m *Manager) lockDelivery(sessionID string) func() {
}
}
func (m *Manager) Message(ctx context.Context, sessionID, actor, text, model, effort, sendID, client string, images ...string) (api.AgentSession, bool, error) {
func (m *Manager) Message(ctx context.Context, sessionID, actor string, p Prompt) (api.AgentSession, bool, error) {
unlock := m.lockDelivery(sessionID)
defer unlock()
prior, sent, err := m.priorSend(ctx, sendID)
prior, sent, err := m.priorSend(ctx, p.SendID)
if err != nil || sent {
return prior, false, err
}
@@ -64,11 +64,11 @@ func (m *Manager) Message(ctx context.Context, sessionID, actor, text, model, ef
}
held := sess.State == api.AgentSessionStateIdle && sess.Role == api.Implementer && (automatedActor(actor) && m.interrupted(sess.Id) || landing || m.isPaused(sess.Id))
if !held && (sess.State != api.AgentSessionStateRunning || sess.Role != api.Implementer) {
sess, err = m.Send(ctx, sessionID, actor, text, model, effort, sendID, client, images...)
sess, err = m.Send(ctx, sessionID, actor, p)
return sess, false, err
}
sess, err = m.changeModel(ctx, sess, model, effort, actor)
sess, err = m.changeModel(ctx, sess, p.Model, p.Effort, actor)
if err != nil {
return api.AgentSession{}, false, err
}
@@ -77,7 +77,7 @@ func (m *Manager) Message(ctx context.Context, sessionID, actor, text, model, ef
if err != nil {
return api.AgentSession{}, false, err
}
err = m.store.AddTaskInput(ctx, store.TaskInput{TaskID: sess.TaskId, Member: sess.Member, Actor: actor, Text: text, Images: images, SendID: sendID, Client: client}, task.ProjectId, sess.Id)
err = m.store.AddTaskInput(ctx, store.TaskInput{TaskID: sess.TaskId, Member: sess.Member, Actor: actor, Text: p.Text, Images: p.Images, SendID: p.SendID, Client: p.Client}, task.ProjectId, sess.Id)
if err != nil {
return api.AgentSession{}, false, err
}
@@ -157,7 +157,7 @@ func (m *Manager) deliverQueued(ctx context.Context, sess api.AgentSession) (boo
}
in := inputs[0]
_, err = m.Send(ctx, sess.Id, in.Actor, in.Text, "", "", in.SendID, in.Client, in.Images...)
_, err = m.Send(ctx, sess.Id, in.Actor, Prompt{Text: in.Text, SendID: in.SendID, Client: in.Client, Images: in.Images})
if errors.Is(err, ErrConflict) {
slog.Info("queued message held: session changed state", "session", sess.Id, "task", task.Id, "err", err)
return true, nil