X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/97274864799ac2eea84bf80c9727a810b695db55..153f3f9b4b09d521412eacca30eddeed395c3f41:/turn.go?ds=sidebyside

diff --git a/turn.go b/turn.go
index f8faad8..029f24e 100644
--- a/turn.go
+++ b/turn.go
@@ -11,18 +11,21 @@ import (
 	"time"
 )
 
-// modelClient sends model calls.
-type modelClient interface {
-	Create(ctx context.Context, request Request) (Response, error)
+// TurnClient sends model calls.
+type TurnClient interface {
+	Create(ctx context.Context, request ModelRequest) (ModelResponse, error)
 }
 
 // Event tells the clients what the agent does as it happens. Kind is the kind
 // of a logged message (user, reply, tool, echo), or one of ready, busy, idle,
-// and error. ID is the ID of a logged message.
+// and error. 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.
 type Event struct {
-	Kind string `json:"kind"`
-	ID   int    `json:"id,omitempty"`
-	Text string `json:"text,omitempty"`
+	Kind   string `json:"kind"`
+	ID     int    `json:"id,omitempty"`
+	Text   string `json:"text,omitempty"`
+	Source string `json:"source,omitempty"`
 }
 
 // loop runs the turns of one agent. A user message goes to the log when it
@@ -44,7 +47,7 @@ type Event struct {
 type loop struct {
 	agent  *Agent
 	memory *Memory
-	client modelClient
+	client TurnClient
 	tools  *toolbox
 	layout *viewLayout
 	clock  func() time.Time
@@ -73,7 +76,7 @@ type functionCallOutput struct {
 
 // newLoop returns the loop of agent with its memory. Its calls go through
 // client, and notify gets each event. The clock gives the date of a turn.
-func newLoop(agent *Agent, memory *Memory, client modelClient, clock func() time.Time, notify func(Event)) (*loop, error) {
+func newLoop(agent *Agent, memory *Memory, client TurnClient, clock func() time.Time, notify func(Event)) (*loop, error) {
 	layout, err := loadLayout(filepath.Join(agent.dir, layoutFileName))
 	if err != nil {
 		return nil, err
@@ -98,10 +101,11 @@ func newLoop(agent *Agent, memory *Memory, client modelClient, clock func() time
 	return l, nil
 }
 
-// Submit logs a user message 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 *loop) Submit(text string) (Message, error) {
-	message, err := l.Append("user", text)
+// 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 *loop) Submit(source, text string) (Message, error) {
+	message, err := l.record("user", source, text)
 	if err != nil {
 		return Message{}, err
 	}
@@ -144,15 +148,22 @@ func (l *loop) Busy() bool {
 // Append logs a message and tells the clients. The toolbox logs its calls and
 // results through it.
 func (l *loop) Append(kind, text string) (Message, error) {
+	return l.record(kind, "", text)
+}
+
+// record logs a message and tells the clients, with the client source of a user
+// message.
+func (l *loop) 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,
+		Kind:   kind,
+		ID:     message.ID,
+		Text:   text,
+		Source: source,
 	})
 
 	return message, nil
@@ -272,7 +283,7 @@ func (l *loop) chain(ctx context.Context) error {
 
 	input := turnInput(view, l.state(), messages)
 	for turn := "first"; ; turn = "next" {
-		response, err := l.client.Create(ctx, Request{
+		response, err := l.client.Create(ctx, ModelRequest{
 			Model:        l.agent.config.Model,
 			Effort:       l.agent.config.Effort,
 			Instructions: instructions,
@@ -299,7 +310,7 @@ func (l *loop) chain(ctx context.Context) error {
 // input of the next request: input, the output items, the tool results, and
 // the user messages that came in the meantime. After the final answer it
 // returns no input.
-func (l *loop) handle(ctx context.Context, input []any, response Response) ([]any, error) {
+func (l *loop) handle(ctx context.Context, input []any, response ModelResponse) ([]any, error) {
 	var outputs []any
 	for _, raw := range response.Output {
 		item, err := inputItem(raw)
@@ -317,7 +328,7 @@ func (l *loop) handle(ctx context.Context, input []any, response Response) ([]an
 
 		switch call.Type {
 		case "message":
-			text, err := outputText([]json.RawMessage{raw})
+			text, err := modelOutputText([]json.RawMessage{raw})
 			if err != nil {
 				return nil, err
 			}
@@ -351,7 +362,7 @@ func (l *loop) handle(ctx context.Context, input []any, response Response) ([]an
 
 	input = append(input, outputs...)
 	for _, message := range l.take() {
-		input = append(input, userMessage(message.Text))
+		input = append(input, modelUserMessage(message.Text))
 	}
 
 	return input, nil
@@ -370,12 +381,12 @@ func (l *loop) state() string {
 func turnInput(view []string, state string, messages []Message) []any {
 	input := make([]any, 0, len(view)+1+len(messages))
 	for _, text := range view {
-		input = append(input, userMessage(text))
+		input = append(input, modelUserMessage(text))
 	}
 
-	input = append(input, userMessage(state))
+	input = append(input, modelUserMessage(state))
 	for _, message := range messages {
-		input = append(input, userMessage(message.Text))
+		input = append(input, modelUserMessage(message.Text))
 	}
 
 	return input