Simplify codebase per audit of 461aac7
This commit is contained in:
@@ -77,7 +77,7 @@ func (m *Manager) Message(ctx context.Context, sessionID, actor string, p Prompt
|
||||
if err != nil {
|
||||
return api.AgentSession{}, false, err
|
||||
}
|
||||
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)
|
||||
err = m.store.AddTaskInput(ctx, store.TaskInput{TaskID: sess.TaskId, Member: sess.Member, Actor: actor, Text: p.Text, Kind: p.Kind, 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, Prompt{Text: in.Text, SendID: in.SendID, Client: in.Client, Images: in.Images})
|
||||
_, err = m.Send(ctx, sess.Id, in.Actor, Prompt{Text: in.Text, Kind: in.Kind, 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
|
||||
@@ -172,6 +172,7 @@ func (m *Manager) deliverQueued(ctx context.Context, sess api.AgentSession) (boo
|
||||
type queued struct {
|
||||
actor string
|
||||
text string
|
||||
kind store.MessageKind
|
||||
sendID string
|
||||
client string
|
||||
}
|
||||
@@ -289,13 +290,11 @@ func (m *Manager) imagesHint(l *live, held heldImages) string {
|
||||
func (m *Manager) recordQueued(ctx context.Context, l *live, msgs []queued) string {
|
||||
b := &strings.Builder{}
|
||||
for i, q := range msgs {
|
||||
if l.implementer() && isMergeInPrompt(q.actor, q.text) {
|
||||
m.takeMergeTurn(l)
|
||||
if l.implementer() && q.kind == store.MessageMergeIn {
|
||||
m.ownMerge(l.id, l.taskID, l.dir)
|
||||
}
|
||||
payload := map[string]any{"text": q.text, "mid_turn": true}
|
||||
if isFindingsMessage(q.actor, q.text) {
|
||||
payload["findings"] = true
|
||||
}
|
||||
markKind(payload, q.kind)
|
||||
if q.sendID != "" {
|
||||
payload["send_id"] = q.sendID
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user