@cosmicstack/mercury-agent 0.2.1 → 0.2.2

package/dist/index.js

@@ -848,6 +848,7 @@ You can override this:
         });
       }
       this.capabilities.setChannelContext(msg.channelId, msg.channelType);
+      this.capabilities.permissions.setCurrentChannelType(msg.channelType);
       const fallbackIterator = this.providers.getFallbackIterator();
       let result = null;
       let usedProvider = null;
@@ -1720,7 +1721,7 @@ var CLIChannel = class extends BaseChannel {
 // src/channels/telegram.ts
 import fs2 from "fs";
 import path2 from "path";
-import { Bot, InputFile } from "grammy";
+import { Bot, InputFile, InlineKeyboard } from "grammy";
 import { autoRetry } from "@grammyjs/auto-retry";
 var MAX_MESSAGE_LENGTH = 4096;
 var TelegramChannel = class extends BaseChannel {
@@ -1734,6 +1735,7 @@ var TelegramChannel = class extends BaseChannel {
   ownerChatId = null;
   typingInterval = null;
   chatCommandContext;
+  pendingApprovals = /* @__PURE__ */ new Map();
   setChatCommandContext(ctx) {
     this.chatCommandContext = ctx;
   }
@@ -1762,6 +1764,18 @@ var TelegramChannel = class extends BaseChannel {
       };
       this.emit(msg);
     });
+    bot.on("callback_query:data", async (ctx) => {
+      const data = ctx.callbackQuery.data;
+      const resolver = this.pendingApprovals.get(data);
+      if (!resolver) {
+        await ctx.answerCallbackQuery({ text: "Expired" });
+        return;
+      }
+      this.pendingApprovals.delete(data);
+      const action = data.split(":")[1];
+      resolver(action);
+      await ctx.answerCallbackQuery({ text: action === "no" ? "Denied" : "Approved" });
+    });
     bot.catch((err) => {
       logger.error({ err: err.message }, "Telegram bot error");
     });
@@ -1945,6 +1959,34 @@ var TelegramChannel = class extends BaseChannel {
       this.stopTypingLoop();
     }
   }
+  async askPermission(prompt, targetId) {
+    const chatId = this.parseChatId(targetId);
+    if (!chatId || !this.bot) return "no";
+    const id = `perm_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+    const keyboard = new InlineKeyboard().text("Allow", `${id}:yes`).text("Always", `${id}:always`).text("Deny", `${id}:no`);
+    const html = mdToTelegram(prompt);
+    try {
+      await this.bot.api.sendMessage(chatId, html, {
+        parse_mode: "HTML",
+        reply_markup: keyboard
+      });
+    } catch {
+      await this.bot.api.sendMessage(chatId, this.stripHtml(html), {
+        reply_markup: keyboard
+      });
+    }
+    return new Promise((resolve9) => {
+      this.pendingApprovals.set(`${id}:yes`, () => resolve9("yes"));
+      this.pendingApprovals.set(`${id}:always`, () => resolve9("always"));
+      this.pendingApprovals.set(`${id}:no`, () => resolve9("no"));
+      setTimeout(() => {
+        this.pendingApprovals.delete(`${id}:yes`);
+        this.pendingApprovals.delete(`${id}:always`);
+        this.pendingApprovals.delete(`${id}:no`);
+        resolve9("no");
+      }, 12e4);
+    });
+  }
   escapeHtml(text) {
     return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
   }
@@ -2258,10 +2300,17 @@ var PermissionManager = class {
   autoApproveAll = false;
   elevatedCommands = /* @__PURE__ */ new Set();
   pendingApprovals = /* @__PURE__ */ new Set();
+  currentChannelType = "cli";
   constructor() {
     this.cwd = process.cwd();
     this.manifest = this.load();
   }
+  setCurrentChannelType(type) {
+    this.currentChannelType = type;
+  }
+  getCurrentChannelType() {
+    return this.currentChannelType;
+  }
   onAsk(handler) {
     this.askHandler = handler;
   }
@@ -2390,9 +2439,31 @@ var PermissionManager = class {
     }
     for (const pattern of shell.needsApproval) {
       if (this.matchPattern(trimmed, pattern)) {
+        if (this.currentChannelType === "telegram" && this.askHandler) {
+          const result = await this.askHandler(`Run command: ${trimmed}`);
+          if (result === "yes") {
+            return { allowed: true, needsApproval: false };
+          }
+          if (result === "always") {
+            this.addApprovedCommand(baseCmd);
+            return { allowed: true, needsApproval: false };
+          }
+          return { allowed: false, reason: `User denied: ${trimmed}`, needsApproval: false };
+        }
         return { allowed: false, reason: `Command requires approval: matches "${pattern}"`, needsApproval: true };
       }
     }
+    if (this.currentChannelType === "telegram" && this.askHandler) {
+      const result = await this.askHandler(`Run command: ${trimmed}`);
+      if (result === "yes") {
+        return { allowed: true, needsApproval: false };
+      }
+      if (result === "always") {
+        this.addApprovedCommand(baseCmd);
+        return { allowed: true, needsApproval: false };
+      }
+      return { allowed: false, reason: `User denied: ${trimmed}`, needsApproval: false };
+    }
     return { allowed: false, reason: "Command not in auto-approve list \u2014 requires approval", needsApproval: true };
   }
   isGitReadAllowed() {
@@ -4441,11 +4512,17 @@ async function runAgent(isDaemon = false) {
   await agent.birth();
   await agent.wake();
   const cliChannel = channels.get("cli");
-  if (cliChannel) {
-    capabilities.permissions.onAsk(async (prompt) => {
+  const tgChannel = channels.get("telegram");
+  capabilities.permissions.onAsk(async (prompt) => {
+    const channelType = capabilities.permissions.getCurrentChannelType();
+    if (channelType === "telegram" && tgChannel) {
+      return tgChannel.askPermission(prompt);
+    }
+    if (cliChannel) {
       return cliChannel.askPermission(prompt);
-    });
-  }
+    }
+    return "no";
+  });
   const activeCh = channels.getActiveChannels();
   const toolNames = capabilities.getToolNames();
   if (!isDaemon) {