telegram-approval-buttons 4.0.3 → 5.0.0

package/CHANGELOG.md

@@ -5,6 +5,62 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.0.0] - 2026-02-24
+
+### ⚠️ Breaking Changes
+
+- **Plugin ID renamed**: `telegram-approval-buttons` → `approval-buttons`
+
+  If you're upgrading from v4.x, update your `~/.openclaw/openclaw.json`:
+
+  ```diff
+  "plugins": {
+    "entries": {
+  -   "telegram-approval-buttons": {
+  +   "approval-buttons": {
+        "enabled": true,
+        ...
+      }
+    }
+  }
+  ```
+
+  Then restart: `openclaw gateway restart`
+
+### Added
+- **Slack inline button support** — approval buttons now work in Slack via Block Kit interactive messages
+- New files: `lib/slack-api.ts`, `lib/slack-formatter.ts`, `tests/slack-formatter.test.ts`
+- Auto-detects Slack credentials from `channels.slack` config or `SLACK_BOT_TOKEN` / `SLACK_CHANNEL_ID` env vars
+- `/approvalstatus` now shows both Telegram and Slack connectivity
+- Multi-channel architecture: either or both channels can be independently enabled
+
+### Changed
+- **Cleaner approval messages** — removed verbose internal fields (Security, Ask, Host) from both Telegram and Slack formats. Messages now focus on: command, CWD, agent, and expiry
+- Plugin ID and TAG shortened to `approval-buttons`
+
+### Contributors
+
+Thanks to [@sjkey](https://github.com/sjkey) for contributing Slack support and the message simplification improvements in this release 🙏
+
+## [4.1.0] - 2026-02-20
+
+### Changed
+- **Performance: O(1) approval resolution lookup** — `detectApprovalResult()` now extracts UUIDs via regex and performs a direct `Map.has()` lookup instead of iterating all pending entries. The old O(n) linear scan is replaced with O(1) hash lookup for full UUIDs, with a fallback prefix scan only for truncated IDs.
+
+### Added
+- **Gateway denial detection** — New `resolveAction()` function and `RE_GATEWAY_DENIAL` regex detect when the gateway auto-denies an approval due to timeout (`Exec denied.*approval-timeout`). The plugin now immediately cleans up stale Telegram buttons when the gateway reports a timeout, instead of waiting for the stale cleanup timer.
+- **Robust short hex matching** — Short approval IDs are now matched via `\b([a-f0-9]{8,})\b` regex with `startsWith()` prefix matching, supporting variable-length truncated IDs instead of the previous hardcoded 8-char `slice()`.
+
+### Fixed
+- Synced `openclaw.plugin.json` manifest version with `package.json` (was stuck at 4.0.2)
+- Updated header comment in `index.ts` to reflect current version
+
+## [4.0.3] - 2026-02-16
+
+### Fixed
+- Auto-detect `botToken` key from `channels.telegram.botToken` in addition to `channels.telegram.token`
+- Improved README setup documentation with clearer quick start instructions
+
 ## [4.0.2] - 2026-02-15
 
 ### Added

package/README.md

@@ -1,6 +1,6 @@
-# 🔐 Telegram Approval Buttons for OpenClaw
+# 🔐 Approval Buttons for OpenClaw
 
-> One-tap `exec` approvals in Telegram — no more typing `/approve <uuid> allow-once`.
+> One-tap `exec` approvals in **Telegram** and **Slack** — no more typing `/approve <uuid> allow-once`.
 
 ## What does this look like?
 
@@ -10,13 +10,14 @@
 
 ## What does this do?
 
-OpenClaw's Discord has built-in approval buttons. **Telegram doesn't** — you're stuck typing long `/approve` commands. This plugin fixes that.
+OpenClaw's Discord has built-in approval buttons. **Telegram and Slack don't** — you're stuck typing long `/approve` commands. This plugin fixes that for both.
 
 **Features:**
 - ✅ **One-tap approvals** — Allow Once · 🔏 Always · ❌ Deny
+- 💬 **Multi-channel** — works on Telegram (inline keyboard) and Slack (Block Kit buttons)
 - 🔄 **Auto-resolve** — edits the message after decision (removes buttons, shows result)
 - ⏰ **Expiry handling** — stale approvals auto-cleaned and marked as expired
-- 🩺 **Self-diagnostics** — `/approvalstatus` checks health and stats
+- 🩺 **Self-diagnostics** — `/approvalstatus` checks health and stats for both channels
 - 🛡️ **Graceful fallback** — if buttons fail, the original text goes through
 - 📦 **Zero dependencies** — uses only Node.js built-in `fetch`
 
@@ -74,7 +75,7 @@ Open your `~/.openclaw/openclaw.json` and add two things:
   },
   "plugins": {
     "entries": {
-      "telegram-approval-buttons": {
+      "approval-buttons": {
         "enabled": true,
         "config": {
           "botToken": "<your_bot_token>",
@@ -101,20 +102,22 @@ Then send `/approvalstatus` in your Telegram chat. You should see:
 ```
 🟢 Approval Buttons Status
 
-Config: chatId=✓ · token=✓
-Telegram: ✓ connected (@your_bot)
+Telegram: chatId=✓ · token=✓
+  ✓ connected (@your_bot)
+Slack: not configured
+
 Pending: 0 · Processed: 0
 Uptime: 1m
 ```
 
-> ⚠️ **If you see `DISABLED — missing config`**, the plugin can't find your bot token or chat ID. Double-check that `botToken` and `chatId` are set in `plugins.entries.telegram-approval-buttons.config` in your `~/.openclaw/openclaw.json`.
+> ⚠️ **If you see `DISABLED — missing config`**, the plugin can't find your bot token or chat ID. Double-check that `botToken` and `chatId` are set in `plugins.entries.approval-buttons.config` in your `~/.openclaw/openclaw.json`.
 
 **That's it!** Next time the AI triggers an `exec` approval, you'll get inline buttons instead of text.
 
 ## Prerequisites
 
 - **OpenClaw ≥ 2026.2.9** installed and running
-- **Node.js ≥ 22** (uses built-in `fetch`)
+- **Node.js ≥ 20** (uses built-in `fetch`)
 - **Telegram configured** in your `openclaw.json` (bot token + `allowFrom`)
 - **Exec approvals targeting Telegram** — see Step 2 above
 
@@ -159,13 +162,15 @@ The plugin **auto-detects** `botToken` and `chatId` from your Telegram channel c
 {
   "plugins": {
     "entries": {
-      "telegram-approval-buttons": {
+      "approval-buttons": {
         "enabled": true,
         "config": {
-          "chatId": "123456789",       // Override auto-detected chat ID
-          "botToken": "123:ABC...",     // Override auto-detected bot token
-          "staleMins": 10,             // Minutes before stale cleanup (default: 10)
-          "verbose": false             // Diagnostic logging (default: false)
+          "chatId": "123456789",          // Telegram chat ID
+          "botToken": "123:ABC...",        // Telegram bot token
+          "slackBotToken": "xoxb-...",     // Slack bot OAuth token (optional)
+          "slackChannelId": "C0123456",    // Slack channel/DM ID (optional)
+          "staleMins": 10,                // Minutes before stale cleanup (default: 10)
+          "verbose": false                // Diagnostic logging (default: false)
         }
       }
     }
@@ -197,25 +202,44 @@ A: Yes, but the bot needs to be an admin or it needs permission to edit its own
 
 | Problem | Fix |
 |---------|-----|
-| `DISABLED — missing config` in logs | Add `botToken` and `chatId` to `plugins.entries.telegram-approval-buttons.config` in your `~/.openclaw/openclaw.json`. See Step 2. |
+| `DISABLED — missing config` in logs | Add `botToken` and `chatId` to `plugins.entries.approval-buttons.config` in your `~/.openclaw/openclaw.json`. See Step 2. |
+| `plugin not found: telegram-approval-buttons` | You upgraded from v4.x. Rename the key in your config from `telegram-approval-buttons` to `approval-buttons`. See [Upgrading from v4.x](#upgrading-from-v4x). |
 | Still getting old text approvals | Your `approvals.exec` config must target Telegram. See Step 2. |
 | `/approvalstatus` says "unknown command" | Plugin didn't load. Run `openclaw plugins install telegram-approval-buttons` and restart the gateway. |
 | No buttons appear | Check `tools.exec.ask` is not `"off"`. Run `/approvalstatus` to check config. |
 | Buttons show but nothing happens | Bot needs message editing permission. Use a private chat or make bot admin. |
-| `/approvalstatus` says "token=✗" | Set `botToken` in plugin config. See Step 2. |
-| `/approvalstatus` says "chatId=✗" | Set `chatId` in plugin config. See Step 2. |
 | Buttons say "expired" | Approval timed out before you tapped. Adjust `staleMins` if needed. |
 
+## Upgrading from v4.x
+
+v5.0.0 renamed the plugin ID from `telegram-approval-buttons` to `approval-buttons`. Update your `~/.openclaw/openclaw.json`:
+
+```diff
+"plugins": {
+  "entries": {
+-   "telegram-approval-buttons": {
++   "approval-buttons": {
+      "enabled": true,
+      ...
+    }
+  }
+}
+```
+
+Then restart: `openclaw gateway restart`
+
 ## Architecture
 
 ```
-telegram-approval-buttons/
+approval-buttons/
 ├── index.ts                  # Entry point — orchestration only
 ├── types.ts                  # Shared TypeScript interfaces
 ├── lib/
-│   ├── telegram-api.ts       # Telegram Bot API client (isolated)
+│   ├── telegram-api.ts       # Telegram Bot API client
+│   ├── slack-api.ts          # Slack Web API client
 │   ├── approval-parser.ts    # Parse OpenClaw approval text format
 │   ├── message-formatter.ts  # HTML formatting for Telegram messages
+│   ├── slack-formatter.ts    # Block Kit formatting for Slack messages
 │   ├── approval-store.ts     # In-memory pending approval tracker
 │   └── diagnostics.ts        # Config resolution, health checks
 ├── openclaw.plugin.json      # Plugin manifest
@@ -226,6 +250,11 @@ telegram-approval-buttons/
 
 Issues and PRs welcome. Each file in `lib/` is self-contained with a single responsibility.
 
+## Contributors
+
+- [@JairFC](https://github.com/JairFC) — creator and maintainer
+- [@sjkey](https://github.com/sjkey) — Slack support and message simplification (v5.0.0)
+
 ## License
 
 [MIT](LICENSE)

package/SECURITY.md

@@ -0,0 +1,39 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported |
+|---------|-----------|
+| 4.x     | ✅ Active  |
+| < 4.0   | ❌ EOL     |
+
+## Reporting a Vulnerability
+
+If you discover a security vulnerability in this plugin, please report it responsibly:
+
+1. **Do NOT open a public issue** — this could expose the vulnerability to others
+2. **Email**: [francojair81@gmail.com](mailto:francojair81@gmail.com)
+3. **Include**:
+   - Description of the vulnerability
+   - Steps to reproduce
+   - Potential impact
+   - Suggested fix (if you have one)
+
+I will acknowledge your report within **48 hours** and aim to release a fix within **7 days** for critical issues.
+
+## Security Model
+
+This plugin runs **in-process** with the OpenClaw Gateway as trusted code:
+
+- **No external network calls** except to the Telegram Bot API (`api.telegram.org`)
+- **No data persistence** — all approval state is in-memory and lost on restart
+- **No credential storage** — bot token and chat ID are read from OpenClaw's config at runtime
+- **Input validation** — callback query data is validated against the pending approvals map; unknown IDs are silently ignored
+- **HTML escaping** — all user-supplied text is escaped before Telegram HTML rendering to prevent injection
+
+## Best Practices for Users
+
+- Keep your OpenClaw instance and this plugin updated
+- Use `plugins.allow` allowlists to restrict which plugins can load
+- Review the source code before installing any community plugin
+- Never share your bot token or chat ID publicly

package/index.ts

@@ -1,10 +1,10 @@
 // ─────────────────────────────────────────────────────────────────────────────
-// telegram-approval-buttons · index.ts (v4.0.2)
+// approval-buttons · index.ts (v5.0.0)
 // Plugin entry point — orchestration only, all logic lives in lib/
 //
-// Adds inline keyboard buttons to exec approval messages in Telegram.
+// Adds inline keyboard/button approval messages to Telegram and Slack.
 // When a user taps a button, OpenClaw processes the /approve command
-// automatically via its callback_query → synthetic text message pipeline.
+// automatically via the channel's callback mechanism.
 // ─────────────────────────────────────────────────────────────────────────────
 
 import type { PluginConfig } from "./types.js";
@@ -12,6 +12,7 @@ import type { PluginConfig } from "./types.js";
 // ── Modules ─────────────────────────────────────────────────────────────────
 
 import { TelegramApi } from "./lib/telegram-api.js";
+import { SlackApi } from "./lib/slack-api.js";
 import { ApprovalStore } from "./lib/approval-store.js";
 import { parseApprovalText, detectApprovalResult } from "./lib/approval-parser.js";
 import {
@@ -21,6 +22,12 @@ import {
   buildApprovalKeyboard,
   formatHealthCheck,
 } from "./lib/message-formatter.js";
+import {
+  formatSlackApprovalRequest,
+  formatSlackApprovalResolved,
+  formatSlackApprovalExpired,
+  slackFallbackText,
+} from "./lib/slack-formatter.js";
 import {
   resolveConfig,
   runHealthCheck,
@@ -30,8 +37,8 @@ import {
 
 // ── Constants ───────────────────────────────────────────────────────────────
 
-const PLUGIN_VERSION = "4.0.3";
-const TAG = "telegram-approval-buttons";
+const PLUGIN_VERSION = "5.0.0";
+const TAG = "approval-buttons";
 
 // ── Plugin registration ─────────────────────────────────────────────────────
 
@@ -43,6 +50,7 @@ function register(api: any): void {
 
   const pluginCfg: PluginConfig = api.pluginConfig ?? {};
   const telegramCfg = api.config?.channels?.telegram ?? {};
+  const slackCfg = api.config?.channels?.slack ?? {};
 
   const config = resolveConfig(
     {
@@ -51,51 +59,74 @@ function register(api: any): void {
         token: telegramCfg.token || telegramCfg.botToken,
         allowFrom: telegramCfg.allowFrom,
       },
+      slackChannelConfig: {
+        token: slackCfg.token,
+        botToken: slackCfg.botToken,
+        allowFrom: slackCfg.allowFrom,
+      },
       env: {
         TELEGRAM_BOT_TOKEN: process.env.TELEGRAM_BOT_TOKEN,
         TELEGRAM_CHAT_ID: process.env.TELEGRAM_CHAT_ID,
+        SLACK_BOT_TOKEN: process.env.SLACK_BOT_TOKEN,
+        SLACK_CHANNEL_ID: process.env.SLACK_CHANNEL_ID,
       },
     },
     log,
   );
 
   if (!config) {
-    log.warn(`[${TAG}] v${PLUGIN_VERSION} loaded (DISABLED — missing config)`);
+    log.warn(`[${TAG}] v${PLUGIN_VERSION} loaded (DISABLED — no channels configured)`);
     return;
   }
 
   logStartupDiagnostics(config, log);
 
-  // ─── 2. Initialize modules ───────────────────────────────────────────
+  // ─── 2. Initialize API clients ────────────────────────────────────────
+
+  const tg = config.telegram
+    ? new TelegramApi(config.telegram.botToken, config.verbose ? log : undefined)
+    : null;
 
-  const tg = new TelegramApi(config.botToken, config.verbose ? log : undefined);
+  const slack = config.slack
+    ? new SlackApi(config.slack.botToken, config.verbose ? log : undefined)
+    : null;
+
+  // ─── 3. Initialize store with expiry handler ──────────────────────────
 
   const store = new ApprovalStore(
     config.staleMins * 60_000,
     config.verbose ? log : undefined,
-    // onExpired: edit the Telegram message to show "expired"
+    // onExpired: edit the message to show "expired"
     (entry) => {
-      tg.editMessageText(
-        config.chatId,
-        entry.messageId,
-        formatApprovalExpired(entry.info),
-      ).catch(() => { });
+      if (entry.channel === "telegram" && tg && config.telegram) {
+        tg.editMessageText(
+          config.telegram.chatId,
+          entry.messageId,
+          formatApprovalExpired(entry.info),
+        ).catch(() => {});
+      } else if (entry.channel === "slack" && slack && config.slack) {
+        slack.updateMessage(
+          config.slack.channelId,
+          entry.slackTs,
+          "Exec Approval Expired",
+          formatSlackApprovalExpired(entry.info),
+        ).catch(() => {});
+      }
     },
   );
 
-  // ─── 3. Register background service (cleanup timer) ──────────────────
+  // ─── 4. Register background service (cleanup timer) ──────────────────
 
   api.registerService({
     id: `${TAG}-cleanup`,
     start: () => {
       store.start();
-      // Non-blocking connectivity check
-      runStartupChecks(tg, log).catch(() => { });
+      runStartupChecks(tg, slack, log).catch(() => {});
     },
     stop: () => store.stop(),
   });
 
-  // ─── 4. Register /approvalstatus command ─────────────────────────────
+  // ─── 5. Register /approvalstatus command ─────────────────────────────
 
   api.registerCommand({
     name: "approvalstatus",
@@ -103,12 +134,12 @@ function register(api: any): void {
     acceptsArgs: false,
     requireAuth: true,
     handler: async () => {
-      const health = await runHealthCheck(config, tg, store, startedAt);
+      const health = await runHealthCheck(config, tg, slack, store, startedAt);
       return { text: formatHealthCheck(health) };
     },
   });
 
-  // ─── 5. Register message_sending hook ────────────────────────────────
+  // ─── 6. Register message_sending hook ────────────────────────────────
 
   api.on(
     "message_sending",
@@ -116,78 +147,128 @@ function register(api: any): void {
       event: { to: string; content: string; metadata?: Record<string, unknown> },
       ctx: { channelId: string; accountId?: string },
     ) => {
-      // Only intercept Telegram messages
-      if (ctx.channelId !== "telegram") return;
-
-      // ── 5a. Check for approval resolution ───────────────────────────
-      const resolution = detectApprovalResult(event.content, store.entries());
-      if (resolution) {
-        const entry = store.resolve(resolution.id);
-        if (entry) {
-          log.info(
-            `[${TAG}] resolved ${resolution.id.slice(0, 8)}… → ${resolution.action}`,
-          );
-          const edited = await tg.editMessageText(
-            config.chatId,
-            entry.messageId,
-            formatApprovalResolved(entry.info, resolution.action),
-          );
-          if (edited && config.verbose) {
-            log.info(`[${TAG}] edited msg=${entry.messageId}`);
-          }
-        }
-        // Don't cancel — let resolution messages pass through
-        return;
+      // ── Telegram ──────────────────────────────────────────────────
+      if (ctx.channelId === "telegram" && tg && config.telegram) {
+        return handleTelegram(event, config.telegram.chatId, tg, store, log);
       }
 
-      // ── 5b. Check for new approval request ─────────────────────────
-      const info = parseApprovalText(event.content);
-      if (!info) return;
-
-      // Duplicate guard
-      if (store.has(info.id)) {
-        if (config.verbose) {
-          log.info(`[${TAG}] skipping duplicate ${info.id.slice(0, 8)}…`);
-        }
-        return { cancel: true };
+      // ── Slack ─────────────────────────────────────────────────────
+      if (ctx.channelId === "slack" && slack && config.slack) {
+        return handleSlack(event, config.slack.channelId, slack, store, log);
       }
+    },
+  );
 
-      log.info(`[${TAG}] intercepting ${info.id.slice(0, 8)}…`);
+  // ─── Done ─────────────────────────────────────────────────────────────
+
+  const channels = [config.telegram && "Telegram", config.slack && "Slack"]
+    .filter(Boolean)
+    .join(" + ");
+  log.info(`[${TAG}] v${PLUGIN_VERSION} loaded ✓ (${channels})`);
+}
 
-      // Send formatted message with inline buttons
-      const messageId = await tg.sendMessage(
-        config.chatId,
-        formatApprovalRequest(info),
-        buildApprovalKeyboard(info.id),
+// ─── Channel handlers ───────────────────────────────────────────────────────
+
+async function handleTelegram(
+  event: { content: string },
+  chatId: string,
+  tg: TelegramApi,
+  store: ApprovalStore,
+  log: any,
+): Promise<{ cancel: true } | void> {
+  // Check for approval resolution
+  const resolution = detectApprovalResult(event.content, store.entries());
+  if (resolution) {
+    const entry = store.resolve(resolution.id);
+    if (entry && entry.channel === "telegram") {
+      log.info(`[${TAG}] telegram resolved ${resolution.id.slice(0, 8)}… → ${resolution.action}`);
+      await tg.editMessageText(
+        chatId,
+        entry.messageId,
+        formatApprovalResolved(entry.info, resolution.action),
       );
+    }
+    return;
+  }
 
-      if (messageId === null) {
-        log.warn(`[${TAG}] send failed for ${info.id.slice(0, 8)}… — falling back to plain text`);
-        // Don't cancel: let the plain-text message through as fallback
-        return;
-      }
+  // Check for new approval request
+  const info = parseApprovalText(event.content);
+  if (!info) return;
 
-      // Track it
-      store.add(info.id, messageId, info);
-      log.info(`[${TAG}] sent buttons for ${info.id.slice(0, 8)}… (msg=${messageId})`);
+  if (store.has(info.id)) return { cancel: true };
 
-      // Cancel the original plain-text message
-      return { cancel: true };
-    },
+  log.info(`[${TAG}] telegram intercepting ${info.id.slice(0, 8)}…`);
+
+  const messageId = await tg.sendMessage(
+    chatId,
+    formatApprovalRequest(info),
+    buildApprovalKeyboard(info.id),
   );
 
-  // ─── Done ─────────────────────────────────────────────────────────────
+  if (messageId === null) {
+    log.warn(`[${TAG}] telegram send failed for ${info.id.slice(0, 8)}… — falling back`);
+    return;
+  }
+
+  store.add(info.id, "telegram", { messageId }, info);
+  log.info(`[${TAG}] telegram sent buttons for ${info.id.slice(0, 8)}… (msg=${messageId})`);
+  return { cancel: true };
+}
+
+async function handleSlack(
+  event: { content: string },
+  channelId: string,
+  slackApi: SlackApi,
+  store: ApprovalStore,
+  log: any,
+): Promise<{ cancel: true } | void> {
+  // Check for approval resolution
+  const resolution = detectApprovalResult(event.content, store.entries());
+  if (resolution) {
+    const entry = store.resolve(resolution.id);
+    if (entry && entry.channel === "slack") {
+      log.info(`[${TAG}] slack resolved ${resolution.id.slice(0, 8)}… → ${resolution.action}`);
+      await slackApi.updateMessage(
+        channelId,
+        entry.slackTs,
+        `Exec ${resolution.action}`,
+        formatSlackApprovalResolved(entry.info, resolution.action),
+      );
+    }
+    return;
+  }
+
+  // Check for new approval request
+  const info = parseApprovalText(event.content);
+  if (!info) return;
+
+  if (store.has(info.id)) return { cancel: true };
+
+  log.info(`[${TAG}] slack intercepting ${info.id.slice(0, 8)}…`);
+
+  const ts = await slackApi.postMessage(
+    channelId,
+    slackFallbackText(info),
+    formatSlackApprovalRequest(info),
+  );
+
+  if (ts === null) {
+    log.warn(`[${TAG}] slack send failed for ${info.id.slice(0, 8)}… — falling back`);
+    return;
+  }
 
-  log.info(`[${TAG}] v${PLUGIN_VERSION} loaded ✓`);
+  store.add(info.id, "slack", { slackTs: ts }, info);
+  log.info(`[${TAG}] slack sent buttons for ${info.id.slice(0, 8)}… (ts=${ts})`);
+  return { cancel: true };
 }
 
 // ─── Plugin export ──────────────────────────────────────────────────────────
 
 export default {
-  id: "telegram-approval-buttons",
-  name: "Telegram Approval Buttons",
+  id: "approval-buttons",
+  name: "Approval Buttons",
   description:
-    "Adds inline keyboard buttons to exec approval messages in Telegram. " +
+    "Adds inline buttons to exec approval messages in Telegram and Slack. " +
     "Tap to approve/deny without typing commands.",
   version: PLUGIN_VERSION,
   kind: "extension" as const,

package/lib/approval-parser.ts

@@ -1,5 +1,5 @@
 // ─────────────────────────────────────────────────────────────────────────────
-// telegram-approval-buttons · lib/approval-parser.ts
+// approval-buttons · lib/approval-parser.ts
 // Parse OpenClaw's plain-text exec approval format into structured data
 // ─────────────────────────────────────────────────────────────────────────────
 
@@ -9,6 +9,9 @@ import type { ApprovalAction, ApprovalInfo, ApprovalResolution, SentApproval } f
 
 const RE_APPROVAL_MARKER = /Exec approval required/i;
 const RE_ID = /ID:\s*([a-f0-9-]+)/i;
+const RE_UUID = /([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/i;
+const RE_SHORT_HEX = /\b([a-f0-9]{8,})\b/i;
+const RE_GATEWAY_DENIAL = /Exec denied.*approval-timeout/i;
 const RE_COMMAND_BLOCK = /Command:\s*`{0,3}\n?(.+?)\n?`{0,3}(?:\n|$)/is;
 const RE_COMMAND_INLINE = /Command:\s*(.+)/i;
 const RE_CWD = /CWD:\s*(.+)/i;
@@ -50,25 +53,56 @@ export function parseApprovalText(text: string): ApprovalInfo | null {
 /**
  * Detect if an outgoing message indicates an approval was resolved.
  *
- * Checks whether the message text references any pending approval ID
- * (full UUID or first 8 chars) and attempts to determine the action.
+ * Uses O(1) Map lookup instead of iterating all pending entries:
+ * 1. Extract full UUID from text via regex → direct Map.has() (O(1))
+ * 2. Fallback: extract short hex ID (8+ chars) → scan pending by prefix
+ *
+ * Also detects gateway-initiated denials (approval-timeout) so the
+ * plugin can immediately clean up stale buttons in Telegram.
  */
 export function detectApprovalResult(
   text: string,
   pending: ReadonlyMap<string, SentApproval>,
 ): ApprovalResolution | null {
-  for (const [id] of pending) {
-    const shortId = id.slice(0, 8);
-    if (!text.includes(id) && !text.includes(shortId)) continue;
+  if (pending.size === 0) return null;
+
+  // Fast path: full UUID → O(1) Map lookup
+  const fullMatch = text.match(RE_UUID);
+  if (fullMatch) {
+    const id = fullMatch[1];
+    if (pending.has(id)) {
+      return { id, action: resolveAction(text) };
+    }
+  }
 
-    const action = inferAction(text);
-    return { id, action };
+  // Slow path: short hex ID (8+ chars) → prefix scan on pending keys
+  // This handles messages that only reference a truncated approval ID
+  const shortMatch = text.match(RE_SHORT_HEX);
+  if (shortMatch) {
+    const shortId = shortMatch[1];
+    for (const [pendingId] of pending) {
+      if (pendingId.startsWith(shortId)) {
+        return { id: pendingId, action: resolveAction(text) };
+      }
+    }
   }
+
   return null;
 }
 
 // ─── Internal ───────────────────────────────────────────────────────────────
 
+/**
+ * Determine the approval action from message text.
+ * Checks gateway denial first, then infers from keywords.
+ * Order matters: check most specific patterns first.
+ */
+function resolveAction(text: string): ApprovalAction {
+  // Gateway-initiated denial takes priority (unambiguous signal)
+  if (RE_GATEWAY_DENIAL.test(text)) return "deny";
+  return inferAction(text);
+}
+
 /**
  * Infer the approval action from message text.
  * Order matters: check most specific patterns first.