X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/80e348724041a694002fc38f57e8868b9b9a2be9..9346d20fe4297dce1aa16171749a7ef3e41ce7bd:/turn.go

diff --git a/turn.go b/turn.go
index b5aa4cf..4652321 100644
--- a/turn.go
+++ b/turn.go
@@ -16,7 +16,9 @@ import (
 // run. ID is the ID of a logged message. Source names the client that sent a
 // user message, such as terminal or telegram, so that each client can show the
 // messages of the others, or the subagent of a report. Status tells how the run
-// of a report ended: finished, stopped, or failed.
+// of a report ended: finished, stopped, or failed. A private notify receipt
+// uses ID for its queue sequence and Status for accepted or duplicate, not
+// processed.
 type Event struct {
 	Kind   string `json:"kind"`
 	ID     int    `json:"id,omitempty"`
@@ -118,26 +120,15 @@ func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, whatsapp *W
 	return l, nil
 }
 
-// Submit logs a user message from the client source and wakes the loop. The
-// message joins the next request: the first one of a new turn, or the next one
-// of a running turn.
-func (l *TurnLoop) Submit(source, text string) (Message, error) {
-	message, err := l.record("user", source, text)
-	if err != nil {
-		return Message{}, err
-	}
-
-	l.mutex.Lock()
-
-	l.pending = append(l.pending, message)
-	l.mutex.Unlock()
-
-	select {
-	case l.wake <- struct{}{}:
-	default:
+// state returns the per-turn state: the end of the view, and the date and time
+// of the turn, then the names and responsibilities of its children.
+func (l *TurnLoop) state() string {
+	state := "</chat>\n\nNow: " + l.clock().Format("Monday 2006-01-02 15:04 -07:00")
+	if l.messages != nil {
+		state += l.messages.ChildState(l.agent.config.Name)
 	}
 
-	return message, nil
+	return state
 }
 
 // Report logs the report text of the subagent name as a work message and tells
@@ -155,6 +146,26 @@ func (l *TurnLoop) Report(name, text, status string) {
 	}
 }
 
+// note logs a note and tells the clients. A note starts no turn.
+func (l *TurnLoop) note(text string) error {
+	_, err := l.record("note", "", text)
+
+	return err
+}
+
+// fail stops the loop with err.
+func (l *TurnLoop) fail(err error) {
+	l.mutex.Lock()
+
+	l.failure = errors.Join(l.failure, err)
+	l.mutex.Unlock()
+
+	select {
+	case l.wake <- struct{}{}:
+	default:
+	}
+}
+
 // 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.
@@ -194,6 +205,46 @@ func (l *TurnLoop) Wake(messages ...Message) {
 	}
 }
 
+// record logs a message and tells the clients, with the client source of a user
+// message.
+func (l *TurnLoop) record(kind, source, text string) (Message, error) {
+	message, err := l.memory.Append(kind, text)
+	if err != nil {
+		return Message{}, err
+	}
+
+	l.notify(Event{
+		Kind:   kind,
+		ID:     message.ID,
+		Text:   text,
+		Source: source,
+	})
+
+	return message, nil
+}
+
+// Submit logs a user message from the client source and wakes the loop. The
+// message joins the next request: the first one of a new turn, or the next one
+// of a running turn.
+func (l *TurnLoop) Submit(source, text string) (Message, error) {
+	message, err := l.record("user", source, text)
+	if err != nil {
+		return Message{}, err
+	}
+
+	l.mutex.Lock()
+
+	l.pending = append(l.pending, message)
+	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
 // report is logged, but it starts no turn.
 func (l *TurnLoop) StopSubagent(name string) (bool, error) {
@@ -234,10 +285,11 @@ func (l *TurnLoop) Flush(ctx context.Context) error {
 	return l.memory.Flush(ctx)
 }
 
-// Run runs a turn each time user messages or reports wait, until ctx ends. It
-// returns the error of a failed log write, which stops the agent. At its start
-// it resumes the subagents that a stop of the daemon cut, and at its end it
-// ends the runs of the subagents and waits for them.
+// Run starts a turn when user messages, reports, or queued external events
+// wait, until ctx ends. It returns the error of a failed log write, which stops
+// the agent. External events enter memory only between chains. At its start it
+// resumes the subagents that a stop of the daemon cut, and at its end it ends
+// the runs of the subagents and waits for them.
 func (l *TurnLoop) Run(ctx context.Context) error {
 	defer l.runs.Close()
 
@@ -247,12 +299,23 @@ func (l *TurnLoop) Run(ctx context.Context) error {
 	}
 
 	for {
-		for ctx.Err() == nil && l.waiting() {
+		for ctx.Err() == nil {
 			err := l.failed()
 			if err != nil {
 				return fmt.Errorf("check turn loop failure: %w", err)
 			}
 
+			if l.messages != nil {
+				err = l.messages.Notifications(l)
+				if err != nil {
+					return fmt.Errorf("prepare external events: %w", err)
+				}
+			}
+
+			if !l.waiting() {
+				break
+			}
+
 			err = l.turn(ctx)
 			if err != nil {
 				return fmt.Errorf("run turn: %w", err)
@@ -272,31 +335,6 @@ func (l *TurnLoop) Run(ctx context.Context) error {
 	}
 }
 
-// note logs a note and tells the clients. A note starts no turn.
-func (l *TurnLoop) note(text string) error {
-	_, err := l.record("note", "", text)
-
-	return err
-}
-
-// record logs a message and tells the clients, with the client source of a user
-// message.
-func (l *TurnLoop) record(kind, source, text string) (Message, error) {
-	message, err := l.memory.Append(kind, text)
-	if err != nil {
-		return Message{}, err
-	}
-
-	l.notify(Event{
-		Kind:   kind,
-		ID:     message.ID,
-		Text:   text,
-		Source: source,
-	})
-
-	return message, nil
-}
-
 // waiting tells if user messages or reports wait for a request.
 func (l *TurnLoop) waiting() bool {
 	l.mutex.Lock()
@@ -305,19 +343,6 @@ func (l *TurnLoop) waiting() bool {
 	return len(l.pending) > 0
 }
 
-// fail stops the loop with err.
-func (l *TurnLoop) fail(err error) {
-	l.mutex.Lock()
-
-	l.failure = errors.Join(l.failure, err)
-	l.mutex.Unlock()
-
-	select {
-	case l.wake <- struct{}{}:
-	default:
-	}
-}
-
 // failed returns the error of a failed write of a report.
 func (l *TurnLoop) failed() error {
 	l.mutex.Lock()
@@ -462,17 +487,6 @@ func (l *TurnLoop) take() []Message {
 	return messages
 }
 
-// state returns the per-turn state: the end of the view, and the date and time
-// of the turn, then the names and responsibilities of its children.
-func (l *TurnLoop) state() string {
-	state := "</chat>\n\nNow: " + l.clock().Format("Monday 2006-01-02 15:04 -07:00")
-	if l.messages != nil {
-		state += l.messages.ChildState(l.agent.config.Name)
-	}
-
-	return state
-}
-
 // turnError returns the text of the error that ended a turn.
 func turnError(ctx context.Context, err error) string {
 	if ctx.Err() != nil {