Show the subagents in the clients

[onechat] / telegram.go

diff --git a/telegram.go b/telegram.go
index 6d5332de8c9868eeabc0210a566063be8ae320f7..c560104c52b83cb4d590d60b939c2de04af277f2 100644 (file)
--- a/telegram.go
+++ b/telegram.go
@@ -163,7 +163,7 @@ type TelegramBot struct {
 // stop the agent.
 func (b *TelegramBot) Notify(event Event) {
        switch event.Kind {
 // stop the agent.
 func (b *TelegramBot) Notify(event Event) {
        switch event.Kind {

-       case "busy", "idle", "reply", "error", "notice":
+       case "busy", "idle", "reply", "error", "notice", "subagent", "work":

        case "user":
                if event.Source == telegramSource {
                        return
        case "user":
                if event.Source == telegramSource {
                        return


@@ -349,9 +349,9 @@ func (b *TelegramBot) pause(ctx context.Context, err error, wait, asked time.Dur
 
 // handle runs one update. A text message of the owner in the private chat goes
 // to the agent, and handle returns when it is durable in the log. The line
 
 // handle runs one update. A text message of the owner in the private chat goes
 // to the agent, and handle returns when it is durable in the log. The line

-// /stop interrupts the turn. Any other message of the owner gets the answer
-// that only text is supported. Every other update is ignored, and its content
-// is not logged.
+// /stop interrupts the turn, and the line /stop NAME stops the subagent NAME.
+// Any other message of the owner gets the answer that only text is supported.
+// Every other update is ignored, and its content is not logged.

 func (b *TelegramBot) handle(ctx context.Context, l *TurnLoop, update TelegramUpdate) error {
        message := update.Message
        if message == nil || message.Chat.Type != "private" || message.Chat.ID != b.owner || message.From == nil || message.From.ID != b.owner {
 func (b *TelegramBot) handle(ctx context.Context, l *TurnLoop, update TelegramUpdate) error {
        message := update.Message
        if message == nil || message.Chat.Type != "private" || message.Chat.ID != b.owner || message.From == nil || message.From.ID != b.owner {


@@ -359,6 +359,7 @@ func (b *TelegramBot) handle(ctx context.Context, l *TurnLoop, update TelegramUp
                return nil
        }
 
                return nil
        }
 

+       name, stop := stopSubagentName(message.Text)

        switch {
        case message.Text == "":
                b.notice(telegramTextOnly)
        switch {
        case message.Text == "":
                b.notice(telegramTextOnly)


@@ -366,6 +367,15 @@ func (b *TelegramBot) handle(ctx context.Context, l *TurnLoop, update TelegramUp
                if !l.Interrupt() {
                        b.notice("No turn runs.")
                }
                if !l.Interrupt() {
                        b.notice("No turn runs.")
                }

+       case stop:
+               found, err := l.StopSubagent(name)
+               if err != nil {
+                       return fmt.Errorf("stop subagent %s: %w", name, err)
+               }
+
+               if !found {
+                       b.notice("No subagent " + name + " runs.")
+               }

        default:
                _, err := l.Submit(telegramSource, message.Text)
                if err != nil {
        default:
                _, err := l.Submit(telegramSource, message.Text)
                if err != nil {


@@ -530,11 +540,17 @@ func telegramSplitMessage(text string, limit int) []string {
 }
 
 // telegramText returns the text of event for the chat. A user message of
 }
 
 // telegramText returns the text of event for the chat. A user message of

-// another client has its source as a mark.
+// another client has its source as a mark. A subagent shows only its start and
+// how its run ended, because the reply of the agent carries the content of the
+// report.

 func telegramText(event Event) string {
        switch event.Kind {
        case "user":
                return "[" + event.Source + "] " + event.Text
 func telegramText(event Event) string {
        switch event.Kind {
        case "user":
                return "[" + event.Source + "] " + event.Text

+       case "subagent":
+               return "[" + event.Text + "] started"
+       case "work":
+               return "[" + event.Source + "] " + event.Status

        case "error":
                return "Error: " + event.Text
        default:
        case "error":
                return "Error: " + event.Text
        default: