Package a systemd user service

[onechat] / turn.go

diff --git a/turn.go b/turn.go
index 93052e2d28d527c55d3827d0b557d13af1fd461d..837ac7c519ecbdd6760bdbc370c7522a622f5422 100644 (file)
--- a/turn.go
+++ b/turn.go
@@ -9,10 +9,10 @@ import (
        "time"
 )
 
        "time"
 )
 

-// newTurnLoop returns the loop of agent with its memory and its subagents. Its
-// calls go through client, and notify gets each event. The clock gives the date
-// of a turn.
-func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, client ChainClient, clock func() time.Time, notify func(Event)) (*TurnLoop, error) {
+// newTurnLoop returns the loop of agent with its memory, its subagents, and the
+// WhatsApp link and the schedules of its tools. Its calls go through client,
+// and notify gets each event. The clock gives the date of a turn.
+func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, whatsapp *WhatsApp, schedules *Schedules, client ChainClient, clock func() time.Time, notify func(Event)) (*TurnLoop, error) {

        layout, err := loadViewLayout(filepath.Join(agent.dir, viewLayoutFileName))
        if err != nil {
                return nil, err
        layout, err := loadViewLayout(filepath.Join(agent.dir, viewLayoutFileName))
        if err != nil {
                return nil, err


@@ -47,6 +47,8 @@ func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, client Chai
                chat:      memory,
                subagents: subagents,
                runs:      l.runs,
                chat:      memory,
                subagents: subagents,
                runs:      l.runs,

+               whatsapp:  whatsapp,
+               schedules: schedules,

                workdir:   agent.config.Workdir,
        }
 
                workdir:   agent.config.Workdir,
        }
 


@@ -122,24 +124,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) {
 // 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:
        switch {
        case err != nil:

-               l.failure = fmt.Errorf("%w: %w", errChainLogWrite, err)
+               l.fail(fmt.Errorf("%w: %w", errChainLogWrite, err))

        case status != subagentStopped:
        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 {
        l.mutex.Unlock()
 
        select {