Make intentional error discards explicit

[onechat] / turn.go

diff --git a/turn.go b/turn.go
index b5aa4cf28484d0059a55bb5f308ef5f59783c904..c08e94a0eed7d94a22e787d7bbaf97a69ce89289 100644 (file)
--- a/turn.go
+++ b/turn.go
@@ -118,26 +118,15 @@ func newTurnLoop(agent *Agent, memory *Memory, subagents *Subagents, whatsapp *W
        return l, nil
 }
 
        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
 }
 
 // Report logs the report text of the subagent name as a work message and tells


@@ -155,6 +144,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.
 // 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 +203,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) {
 // 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) {


@@ -272,31 +321,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()
 // waiting tells if user messages or reports wait for a request.
 func (l *TurnLoop) waiting() bool {
        l.mutex.Lock()


@@ -305,19 +329,6 @@ func (l *TurnLoop) waiting() bool {
        return len(l.pending) > 0
 }
 
        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()
 // failed returns the error of a failed write of a report.
 func (l *TurnLoop) failed() error {
        l.mutex.Lock()


@@ -462,17 +473,6 @@ func (l *TurnLoop) take() []Message {
        return messages
 }
 
        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 {
 // turnError returns the text of the error that ended a turn.
 func turnError(ctx context.Context, err error) string {
        if ctx.Err() != nil {