X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/37d5f21b23da5fbd6b44fed41f653927669571ed..0da1ef837bbd190cc5787214187d1b29d62b9410:/turn.go diff --git a/turn.go b/turn.go index 93052e2..e304714 100644 --- a/turn.go +++ b/turn.go @@ -122,24 +122,45 @@ func (l *TurnLoop) Submit(source, text string) (Message, error) { // Submit does. A failed write stops the loop, because the log refuses all // writes after it. func (l *TurnLoop) Report(name, text, status string) { - message, err := l.memory.Append("work", text) - if err == nil { - l.notify(Event{ - Kind: "work", - ID: message.ID, - Text: text, - Source: name, - Status: status, - }) - } - - l.mutex.Lock() + message, err := l.Work(name, text, status) switch { case err != nil: - l.failure = fmt.Errorf("%w: %w", errChainLogWrite, err) + l.fail(fmt.Errorf("%w: %w", errChainLogWrite, err)) case status != subagentStopped: - l.pending = append(l.pending, message) + l.Wake(message) + } +} + +// Work logs text as a work message of source, such as the name of a subagent, +// and tells the clients, with status. The message starts no turn until it goes +// to Wake. +func (l *TurnLoop) Work(source, text, status string) (Message, error) { + message, err := l.memory.Append("work", text) + if err != nil { + return Message{}, err + } + + l.notify(Event{ + Kind: "work", + ID: message.ID, + Text: text, + Source: source, + Status: status, + }) + + return message, nil +} + +// Wake adds the logged messages to the waiting messages and wakes the loop +// once, as a user message of Submit does. They join the first request of a new +// turn together, or the next request of a running turn after the tool results. +func (l *TurnLoop) Wake(messages ...Message) { + if len(messages) == 0 { + return } + + l.mutex.Lock() + l.pending = append(l.pending, messages...) l.mutex.Unlock() select {