X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/de170709599e849c6b409d247b800dc68b0c7ab7..47f69638bc96100f2e446f63c7c3689023156e64:/telegram.go?ds=sidebyside

diff --git a/telegram.go b/telegram.go
index 13c200c..c78080d 100644
--- a/telegram.go
+++ b/telegram.go
@@ -311,9 +311,9 @@ func (b *TelegramBot) typing(ctx context.Context) {
 }
 
 // post sends event to the chat. A reply goes as rich messages of its Markdown,
-// with each < outside code escaped by telegramEscapeTags and then split with
-// telegramSplitRich, so that the length limit counts the escaped text. Every
-// other event goes as plain text, split with telegramSplitMessage.
+// with each < and & outside code escaped by telegramEscapeTags and then split
+// with telegramSplitRich, so that the length limit counts the escaped text.
+// Every other event goes as plain text, split with telegramSplitMessage.
 func (b *TelegramBot) post(ctx context.Context, event Event) {
 	if event.Kind != "reply" {
 		for _, text := range telegramSplitMessage(telegramText(event), telegramMessageUnits) {
@@ -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
-// /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 {
@@ -359,6 +359,7 @@ func (b *TelegramBot) handle(ctx context.Context, l *TurnLoop, update TelegramUp
 		return nil
 	}
 
+	name, stop := stopSubagentName(message.Text)
 	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.")
 		}
+	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 {
@@ -411,11 +421,13 @@ func (b *TelegramBot) deliver(ctx context.Context, part TelegramPart) {
 	}
 }
 
-// deliverRich sends markdown to the chat as a rich message. When the Bot API
-// refuses it with HTTP 400 or 404, the message was not sent, so deliverRich
-// sends the same Markdown once with message entities, and the reply is not
-// lost and does not repeat. It tries again after each failure that a later try
-// can fix, until ctx ends. It drops the message after any other failure.
+// deliverRich sends markdown, escaped with telegramEscapeTags, to the chat as a
+// rich message. When the Bot API refuses it with HTTP 400 or 404, the message
+// was not sent, so deliverRich sends the text of the part once with message
+// entities, and the reply is not lost and does not repeat. Message entities
+// read no HTML, so the fallback gets the Markdown of telegramUnescapeTags, as
+// the model wrote it. It tries again after each failure that a later try can
+// fix, until ctx ends. It drops the message after any other failure.
 func (b *TelegramBot) deliverRich(ctx context.Context, markdown string) {
 	wait := b.minWait
 	for {
@@ -426,7 +438,7 @@ func (b *TelegramBot) deliverRich(ctx context.Context, markdown string) {
 
 		if telegramRejected(err) {
 			b.logger.Printf("rich message refused, the reply goes with entities: %v", err)
-			for _, part := range telegramReplyParts(markdown) {
+			for _, part := range telegramReplyParts(telegramUnescapeTags(markdown)) {
 				b.deliver(ctx, part)
 			}
 
@@ -546,7 +558,8 @@ func telegramText(event Event) string {
 // after the last line break outside a code block, then after the last line
 // break in a code block, which it closes at the end of the part and opens again
 // in the next part with the same fence line. A line longer than limit is cut at
-// the limit. It never cuts a character.
+// the limit, or before an & in the four bytes before the limit, so that it does
+// not cut an entity of telegramEscapeTags. It never cuts a character.
 func telegramSplitRich(markdown string, limit int) []string {
 	var parts []string
 	for len(markdown) > limit {
@@ -649,6 +662,12 @@ func telegramRichCut(markdown string, limit int) (int, string, string) {
 		cut--
 	}
 
+	start := max(cut-len("&amp;")+1, 0)
+	entity := strings.LastIndexByte(markdown[start:cut], '&')
+	if entity >= 0 && start+entity > 0 {
+		cut = start + entity
+	}
+
 	return cut, "", ""
 }