Merge remote-tracking branch 'origin/kenneth/telegram-409' into kenneth/channels-rollup

# Conflicts:
#	external_plugins/telegram/server.ts
This commit is contained in:
Kenneth Lien
2026-03-20 13:13:07 -07:00

View File

@@ -15,7 +15,7 @@ import {
ListToolsRequestSchema, ListToolsRequestSchema,
CallToolRequestSchema, CallToolRequestSchema,
} from '@modelcontextprotocol/sdk/types.js' } from '@modelcontextprotocol/sdk/types.js'
import { Bot, InputFile, type Context } from 'grammy' import { Bot, GrammyError, InputFile, type Context } from 'grammy'
import type { ReactionTypeEmoji } from 'grammy/types' import type { ReactionTypeEmoji } from 'grammy/types'
import { randomBytes } from 'crypto' import { randomBytes } from 'crypto'
import { readFileSync, writeFileSync, mkdirSync, readdirSync, rmSync, statSync, renameSync, realpathSync, chmodSync } from 'fs' import { readFileSync, writeFileSync, mkdirSync, readdirSync, rmSync, statSync, renameSync, realpathSync, chmodSync } from 'fs'
@@ -628,14 +628,35 @@ bot.catch(err => {
process.stderr.write(`telegram channel: handler error (polling continues): ${err.error}\n`) process.stderr.write(`telegram channel: handler error (polling continues): ${err.error}\n`)
}) })
bot.start({ // 409 Conflict = another getUpdates consumer is still active (zombie from a
onStart: info => { // previous session, or a second Claude Code instance). Retry with backoff
botUsername = info.username // until the slot frees up instead of crashing on the first rejection.
process.stderr.write(`telegram channel: polling as @${info.username}\n`) void (async () => {
}, for (let attempt = 1; ; attempt++) {
}).catch(err => { try {
// bot.start() only rejects if polling can't begin or dies unrecoverably — await bot.start({
// bad token, 409 conflict, network gone. Log it so the user isn't left onStart: info => {
// wondering why messages stopped arriving. botUsername = info.username
process.stderr.write(`telegram channel: polling stopped: ${err}\n`) process.stderr.write(`telegram channel: polling as @${info.username}\n`)
}) },
})
return // bot.stop() was called — clean exit from the loop
} catch (err) {
if (err instanceof GrammyError && err.error_code === 409) {
const delay = Math.min(1000 * attempt, 15000)
const detail = attempt === 1
? ' — another instance is polling (zombie session, or a second Claude Code running?)'
: ''
process.stderr.write(
`telegram channel: 409 Conflict${detail}, retrying in ${delay / 1000}s\n`,
)
await new Promise(r => setTimeout(r, delay))
continue
}
// bot.stop() mid-setup rejects with grammy's "Aborted delay" — expected, not an error.
if (err instanceof Error && err.message === 'Aborted delay') return
process.stderr.write(`telegram channel: polling failed: ${err}\n`)
return
}
}
})()