// Run polls for the messages of the owner and sends the queued events to the
// chat until ctx ends. It returns an error only when a message or the offset
// cannot be written, because then the bot would lose or repeat messages.
-func (b *TelegramBot) Run(ctx context.Context, l *loop) error {
+func (b *TelegramBot) Run(ctx context.Context, l *TurnLoop) error {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
// poll gets the updates from the stored offset on and handles each one, until
// ctx ends. Each update is handled to its end also when ctx ends during it, so
// a stop does not repeat its message.
-func (b *TelegramBot) poll(ctx context.Context, l *loop) error {
+func (b *TelegramBot) poll(ctx context.Context, l *TurnLoop) error {
offset, err := telegramLoadOffset(b.offsetPath)
if err != nil {
return err
}
// post sends event to the chat. A reply goes as rich messages of its Markdown,
-// split with telegramSplitRich. 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) {
return
}
- for _, markdown := range telegramSplitRich(event.Text, telegramRichBytes) {
+ for _, markdown := range telegramSplitRich(telegramEscapeTags(event.Text), telegramRichBytes) {
b.deliverRich(ctx, markdown)
}
}
// 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.
-func (b *TelegramBot) handle(ctx context.Context, l *loop, update TelegramUpdate) error {
+// /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 {
b.logger.Print("update ignored: not a message of the owner in the private chat")
return nil
}
+ name, stop := stopSubagentName(message.Text)
switch {
case message.Text == "":
b.notice(telegramTextOnly)
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 {
}
}
-// 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 {
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)
}
// 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 {
cut--
}
+ start := max(cut-len("&")+1, 0)
+ entity := strings.LastIndexByte(markdown[start:cut], '&')
+ if entity >= 0 && start+entity > 0 {
+ cut = start + entity
+ }
+
return cut, "", ""
}
projects / onechat / blobdiff