Wait for the WhatsApp catch-up before a turn

[onechat] / turn.go

diff --git a/turn.go b/turn.go
index d6a1c416d1a7b04bf8d641eb7a758dfb7c55752e..e304714e5068b01acb0f4d545b9dedd4de2ac5fb 100644 (file)
--- a/turn.go
+++ b/turn.go
@@ -122,18 +122,19 @@ 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) {
 // Submit does. A failed write stops the loop, because the log refuses all
 // writes after it.
 func (l *TurnLoop) Report(name, text, status string) {

-       _, err := l.Work(name, text, status, status != subagentStopped)
-       if err != nil {
+       message, err := l.Work(name, text, status)
+       switch {
+       case err != nil:

                l.fail(fmt.Errorf("%w: %w", errChainLogWrite, err))
                l.fail(fmt.Errorf("%w: %w", errChainLogWrite, err))

+       case status != subagentStopped:
+               l.Wake(message)

        }
 }
 
 // Work logs text as a work message of source, such as the name of a subagent,
        }
 }
 
 // Work logs text as a work message of source, such as the name of a subagent,

-// and tells the clients, with status. With wake, the message joins the waiting
-// messages and wakes the loop, as a user message of Submit does: it joins the
-// first request of a new turn, or the next request of a running turn after the
-// tool results.
-func (l *TurnLoop) Work(source, text, status string, wake bool) (Message, error) {
+// 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
        message, err := l.memory.Append("work", text)
        if err != nil {
                return Message{}, err


@@ -147,20 +148,25 @@ func (l *TurnLoop) Work(source, text, status string, wake bool) (Message, error)
                Status: status,
        })
 
                Status: status,
        })
 

-       if !wake {
-               return message, nil
+       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.mutex.Lock()

-       l.pending = append(l.pending, message)
+       l.pending = append(l.pending, messages...)

        l.mutex.Unlock()
 
        select {
        case l.wake <- struct{}{}:
        default:
        }
        l.mutex.Unlock()
 
        select {
        case l.wake <- struct{}{}:
        default:
        }

-
-       return message, nil

 }
 
 // StopSubagent ends the run of the subagent name and tells if it ran. Its
 }
 
 // StopSubagent ends the run of the subagent name and tells if it ran. Its