telegram: exit when Claude Code closes the connection

When the MCP stdio transport closes, the bot kept polling Telegram as
a zombie process — holding the token and causing 409 Conflict for the
next session.

- Listen for stdin end/close and SIGTERM/SIGINT -> bot.stop() + exit
- Force-exit after 2s if bot.stop() stalls on the long-poll timeout
- unref the approval-check interval so it doesn't keep us alive

Fixes #793, partial #788 (issue 3)

external_plugins/discord/.claude-plugin/plugin.json

@@ -1,20 +1,11 @@
 {
   "name": "discord",
-  "description": "Discord channel for Claude Code — messaging bridge with built-in access control. Manage pairing, allowlists, and policy via /discord:access.",
-  "version": "0.0.2",
+  "description": "Discord channel for Claude Code \u2014 messaging bridge with built-in access control. Manage pairing, allowlists, and policy via /discord:access.",
+  "version": "0.0.1",
   "keywords": [
     "discord",
     "messaging",
     "channel",
     "mcp"
-  ],
-  "userConfig": {
-    "DISCORD_BOT_TOKEN": {
-      "type": "string",
-      "title": "Bot Token",
-      "description": "Bot token from the Discord Developer Portal. Stored in keychain (macOS) or ~/.claude/.credentials.json with 0600 permissions elsewhere. Never written to settings.json.",
-      "required": true,
-      "sensitive": true
-    }
-  }
+  ]
 }

external_plugins/discord/.mcp.json

@@ -2,10 +2,7 @@
   "mcpServers": {
     "discord": {
       "command": "bun",
-      "args": ["run", "--cwd", "${CLAUDE_PLUGIN_ROOT}", "--shell=bun", "--silent", "start"],
-      "env": {
-        "DISCORD_BOT_TOKEN": "${user_config.DISCORD_BOT_TOKEN}"
-      }
+      "args": ["run", "--cwd", "${CLAUDE_PLUGIN_ROOT}", "--shell=bun", "--silent", "start"]
     }
   }
 }

external_plugins/discord/server.ts

@@ -34,12 +34,10 @@ const ACCESS_FILE = join(STATE_DIR, 'access.json')
 const APPROVED_DIR = join(STATE_DIR, 'approved')
 const ENV_FILE = join(STATE_DIR, '.env')
 
-// Token is injected via ${user_config.DISCORD_BOT_TOKEN} from .mcp.json —
-// prompted at enable time, stored in keychain (macOS) or .credentials.json 0600
-// elsewhere. The .env file below is a legacy fallback for users configured
-// before H1 #3617646 — real env wins, so the injected value takes precedence.
+// Load ~/.claude/channels/discord/.env into process.env. Real env wins.
+// Plugin-spawned servers don't get an env block — this is where the token lives.
 try {
-  // Defensive chmod for legacy .env files (no-op on Windows).
+  // Token is a credential — lock to owner. No-op on Windows (would need ACLs).
   chmodSync(ENV_FILE, 0o600)
   for (const line of readFileSync(ENV_FILE, 'utf8').split('\n')) {
     const m = line.match(/^(\w+)=(.*)$/)
@@ -53,8 +51,8 @@ const STATIC = process.env.DISCORD_ACCESS_MODE === 'static'
 if (!TOKEN) {
   process.stderr.write(
     `discord channel: DISCORD_BOT_TOKEN required\n` +
-    `  re-enter via: /plugin manage → discord → Configure options\n` +
-    `  (stored in keychain/credentials.json, not settings.json)\n`,
+    `  set in ${ENV_FILE}\n` +
+    `  format: DISCORD_BOT_TOKEN=MTIz...\n`,
   )
   process.exit(1)
 }

external_plugins/telegram/.claude-plugin/plugin.json

@@ -1,20 +1,11 @@
 {
   "name": "telegram",
-  "description": "Telegram channel for Claude Code — messaging bridge with built-in access control. Manage pairing, allowlists, and policy via /telegram:access.",
-  "version": "0.0.2",
+  "description": "Telegram channel for Claude Code \u2014 messaging bridge with built-in access control. Manage pairing, allowlists, and policy via /telegram:access.",
+  "version": "0.0.1",
   "keywords": [
     "telegram",
     "messaging",
     "channel",
     "mcp"
-  ],
-  "userConfig": {
-    "TELEGRAM_BOT_TOKEN": {
-      "type": "string",
-      "title": "Bot Token",
-      "description": "Bot token from @BotFather — format is 123456789:AAH... Stored in keychain (macOS) or ~/.claude/.credentials.json with 0600 permissions elsewhere. Never written to settings.json.",
-      "required": true,
-      "sensitive": true
-    }
-  }
+  ]
 }

external_plugins/telegram/.mcp.json

@@ -2,10 +2,7 @@
   "mcpServers": {
     "telegram": {
       "command": "bun",
-      "args": ["run", "--cwd", "${CLAUDE_PLUGIN_ROOT}", "--shell=bun", "--silent", "start"],
-      "env": {
-        "TELEGRAM_BOT_TOKEN": "${user_config.TELEGRAM_BOT_TOKEN}"
-      }
+      "args": ["run", "--cwd", "${CLAUDE_PLUGIN_ROOT}", "--shell=bun", "--silent", "start"]
     }
   }
 }

external_plugins/telegram/server.ts

@@ -27,12 +27,10 @@ const ACCESS_FILE = join(STATE_DIR, 'access.json')
 const APPROVED_DIR = join(STATE_DIR, 'approved')
 const ENV_FILE = join(STATE_DIR, '.env')
 
-// Token is injected via ${user_config.TELEGRAM_BOT_TOKEN} from .mcp.json —
-// prompted at enable time, stored in keychain (macOS) or .credentials.json 0600
-// elsewhere. The .env file below is a legacy fallback for users configured
-// before H1 #3617646 — real env wins, so the injected value takes precedence.
+// Load ~/.claude/channels/telegram/.env into process.env. Real env wins.
+// Plugin-spawned servers don't get an env block — this is where the token lives.
 try {
-  // Defensive chmod for legacy .env files (no-op on Windows).
+  // Token is a credential — lock to owner. No-op on Windows (would need ACLs).
   chmodSync(ENV_FILE, 0o600)
   for (const line of readFileSync(ENV_FILE, 'utf8').split('\n')) {
     const m = line.match(/^(\w+)=(.*)$/)
@@ -46,8 +44,8 @@ const STATIC = process.env.TELEGRAM_ACCESS_MODE === 'static'
 if (!TOKEN) {
   process.stderr.write(
     `telegram channel: TELEGRAM_BOT_TOKEN required\n` +
-    `  re-enter via: /plugin manage → telegram → Configure options\n` +
-    `  (stored in keychain/credentials.json, not settings.json)\n`,
+    `  set in ${ENV_FILE}\n` +
+    `  format: TELEGRAM_BOT_TOKEN=123456789:AAH...\n`,
   )
   process.exit(1)
 }
@@ -306,7 +304,7 @@ function checkApprovals(): void {
   }
 }
 
-if (!STATIC) setInterval(checkApprovals, 5000)
+if (!STATIC) setInterval(checkApprovals, 5000).unref()
 
 // Telegram caps messages at 4096 chars. Split long replies, preferring
 // paragraph boundaries when chunkMode is 'newline'.
@@ -509,6 +507,24 @@ mcp.setRequestHandler(CallToolRequestSchema, async req => {
 
 await mcp.connect(new StdioServerTransport())
 
+// When Claude Code closes the MCP connection, stdin gets EOF. Without this
+// the bot keeps polling forever as a zombie, holding the token and blocking
+// the next session with 409 Conflict.
+let shuttingDown = false
+function shutdown(): void {
+  if (shuttingDown) return
+  shuttingDown = true
+  process.stderr.write('telegram channel: shutting down\n')
+  // bot.stop() signals the poll loop to end; the current getUpdates request
+  // may take up to its long-poll timeout to return. Force-exit after 2s.
+  setTimeout(() => process.exit(0), 2000)
+  void Promise.resolve(bot.stop()).finally(() => process.exit(0))
+}
+process.stdin.on('end', shutdown)
+process.stdin.on('close', shutdown)
+process.on('SIGTERM', shutdown)
+process.on('SIGINT', shutdown)
+
 bot.on('message:text', async ctx => {
   await handleInbound(ctx, ctx.message.text, undefined)
 })