grok-telegram-bot 2.2.0 → 2.2.1

package/CHANGELOG.md

@@ -9,6 +9,14 @@ The latest section is published verbatim as the GitHub Release notes by
 
 ## [Unreleased]
 
+## [2.2.1] - 2026-07-12
+
+### Fixed
+
+- **📌 Permission prompts stay pinned** while waiting for Approve/Deny so they
+  aren't lost under streaming chat. The pin is removed on approve, deny, or
+  timeout, and the status panel is re-pinned afterwards.
+
 ## [2.2.0] - 2026-07-12
 
 The **reliable multi-account** release — account switch / auto-rotate now only
@@ -669,6 +677,7 @@ from a single chat and switch between them, on a redesigned, compact menu.
   diffs, MarkdownV2 rendering, scheduled tasks, multi-image prompts, and a
   cross-platform 24/7 background service.
 
+[2.2.1]: https://github.com/artickc/grok-telegram-bot/releases/tag/v2.2.1
 [2.2.0]: https://github.com/artickc/grok-telegram-bot/releases/tag/v2.2.0
 [2.1.0]: https://github.com/artickc/grok-telegram-bot/releases/tag/v2.1.0
 [2.0.0]: https://github.com/artickc/grok-telegram-bot/releases/tag/v2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grok-telegram-bot",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Control the official Grok Build CLI from Telegram over the Agent Client Protocol (ACP). Sign in with your xAI account, switch projects, resume sessions, stream responses with diffs, queue follow-ups, manage multiple sign-ins, and run 24/7 as a cross-platform background service.",
   "type": "module",
   "main": "src/index.ts",

package/scripts/_push-branch.mjs

@@ -1,26 +1,14 @@
 import { readFileSync } from "node:fs";
 import { spawnSync } from "node:child_process";
 
-const files = [
-  ".env.example",
-  "CHANGELOG.md",
-  "src/app/accounts.ts",
-  "src/app/auth-service.ts",
-  "src/bot/account-rotator.ts",
-  "src/bot/bot.ts",
-  "src/bot/handlers/accounts.ts",
-  "src/bot/permission-service.ts",
-  "src/bot/reauth-controller.ts",
-  "src/config.ts",
-  "src/grok/client.ts",
-  "test/auth-and-permissions.test.ts",
-];
-
+const files = process.argv.slice(2);
+if (files.length < 3) {
+  console.error("Usage: node scripts/_push-branch.mjs <branch> <message> <file>...");
+  process.exit(1);
+}
+const [branch, message, ...paths] = files;
 const owner = "artickc";
 const repo = "grok-telegram-bot";
-const branch = "feat/fix-rotation-and-auto-approve";
-const message =
-  "fix: account rotation swaps auth.json headlessly; auto-approve session permissions";
 
 // eslint-disable-next-line no-control-regex
 const ANSI_RE = /\x1b\[[0-9;?]*[ -/]*[@-~]/g;
@@ -43,29 +31,35 @@ function ghApi(method, path, body) {
   }
   const text = (r.stdout || "").replace(ANSI_RE, "").trim();
   if (!text) return {};
-  try {
-    return JSON.parse(text);
-  } catch (e) {
-    throw new Error(`JSON parse failed for ${method} ${path}: ${text.slice(0, 200)}`);
-  }
+  return JSON.parse(text);
 }
 
-const refPath = `repos/${owner}/${repo}/git/ref/heads/${branch}`;
-const ref = ghApi("GET", refPath);
-const baseSha = ref.object.sha;
-console.log("base", baseSha);
+// Ensure branch exists from main if missing.
+try {
+  ghApi("GET", `repos/${owner}/${repo}/git/ref/heads/${branch}`);
+} catch {
+  const main = ghApi("GET", `repos/${owner}/${repo}/git/ref/heads/main`);
+  ghApi("POST", `repos/${owner}/${repo}/git/refs`, {
+    ref: `refs/heads/${branch}`,
+    sha: main.object.sha,
+  });
+  console.log("created branch", branch, "from main");
+}
 
+const ref = ghApi("GET", `repos/${owner}/${repo}/git/ref/heads/${branch}`);
+const baseSha = ref.object.sha;
 const baseCommit = ghApi("GET", `repos/${owner}/${repo}/git/commits/${baseSha}`);
 const baseTree = baseCommit.tree.sha;
+console.log("base", baseSha);
 
 const tree = [];
-for (const path of files) {
+for (const path of paths) {
   const content = readFileSync(path, "utf8");
   const blob = ghApi("POST", `repos/${owner}/${repo}/git/blobs`, {
     content: Buffer.from(content, "utf8").toString("base64"),
     encoding: "base64",
   });
-  tree.push({ path, mode: "100644", type: "blob", sha: blob.sha });
+  tree.push({ path: path.replace(/\\/g, "/"), mode: "100644", type: "blob", sha: blob.sha });
   console.log("blob", path, blob.sha.slice(0, 8));
 }
 
@@ -73,15 +67,11 @@ const newTree = ghApi("POST", `repos/${owner}/${repo}/git/trees`, {
   base_tree: baseTree,
   tree,
 });
-console.log("tree", newTree.sha);
-
 const commit = ghApi("POST", `repos/${owner}/${repo}/git/commits`, {
   message,
   tree: newTree.sha,
   parents: [baseSha],
 });
-console.log("commit", commit.sha);
-
 ghApi("PATCH", `repos/${owner}/${repo}/git/refs/heads/${branch}`, {
   sha: commit.sha,
   force: false,

package/scripts/_tag-release.mjs

@@ -0,0 +1,52 @@
+import { spawnSync } from "node:child_process";
+
+const owner = "artickc";
+const repo = "grok-telegram-bot";
+const version = process.argv[2] || "2.2.1";
+const tag = `v${version}`;
+const message = process.argv[3] || `${tag} — pin permission prompts until resolved`;
+
+// eslint-disable-next-line no-control-regex
+const ANSI_RE = /\x1b\[[0-9;?]*[ -/]*[@-~]/g;
+
+function ghApi(method, path, body) {
+  const args = ["api", "-X", method, path];
+  const opts = {
+    encoding: "utf8",
+    maxBuffer: 50 * 1024 * 1024,
+    shell: false,
+    env: { ...process.env, NO_COLOR: "1", CLICOLOR: "0", FORCE_COLOR: "0", GH_FORCE_TTY: "0" },
+  };
+  if (body !== undefined) {
+    args.push("--input", "-");
+    opts.input = JSON.stringify(body);
+  }
+  const r = spawnSync("gh", args, opts);
+  if (r.status !== 0) {
+    throw new Error(`gh api ${method} ${path} failed (${r.status}): ${r.stderr || r.stdout}`);
+  }
+  const text = (r.stdout || "").replace(ANSI_RE, "").trim();
+  if (!text) return {};
+  return JSON.parse(text);
+}
+
+const ref = ghApi("GET", `repos/${owner}/${repo}/git/ref/heads/main`);
+const sha = ref.object.sha;
+console.log("main", sha);
+
+const tagObj = ghApi("POST", `repos/${owner}/${repo}/git/tags`, {
+  tag,
+  message,
+  object: sha,
+  type: "commit",
+  tagger: {
+    name: "artickc",
+    email: "artickc@users.noreply.github.com",
+    date: new Date().toISOString(),
+  },
+});
+ghApi("POST", `repos/${owner}/${repo}/git/refs`, {
+  ref: `refs/tags/${tag}`,
+  sha: tagObj.sha,
+});
+console.log("created tag", tag, "->", sha);

package/src/bot/bot.ts

@@ -125,8 +125,12 @@ export async function createBot(cfg: AppConfig, acp: GrokClient): Promise<BotBun
 
   // Permission handling: default is auto-approve (prefer "this session" / always).
   // Interactive Approve/Deny buttons only when both trust-all and auto-approve are off.
+  // Interactive prompts are pinned so they aren't lost in a busy chat; on
+  // settle we re-pin the status panel (private chats keep a single pin).
   const autoApprovePerms = cfg.autoApprovePermissions || cfg.trustAllTools;
-  const permissions = new PermissionService(bot.api, registry, autoApprovePerms);
+  const permissions = new PermissionService(bot.api, registry, autoApprovePerms, {
+    onUnpinned: (chatId) => statusPanel.ensurePinned(chatId),
+  });
   acp.permissionHandler = (p) => permissions.handle(p);
 
   // The bot pins/unpins the status panel, and Telegram emits a "pinned a
@@ -147,9 +151,14 @@ export async function createBot(cfg: AppConfig, acp: GrokClient): Promise<BotBun
   });
 
   bot.callbackQuery(/^perm:(\d+):(\d+)$/, async (ctx) => {
+    // resolveChoice unpins the prompt; we then rewrite it to the chosen label.
     const label = permissions.resolveChoice(ctx.match![1]!, Number(ctx.match![2]));
     await ctx.answerCallbackQuery({ text: label ?? "Expired" });
-    await ctx.editMessageText(label ? `\u{1F510} ${label}` : "\u{1F510} (expired)").catch(() => {});
+    await ctx
+      .editMessageText(label ? `\u{1F510} ${label}` : "\u{1F510} (expired)", {
+        reply_markup: { inline_keyboard: [] },
+      })
+      .catch(() => {});
   });
 
   bot.callbackQuery(/^permsw:(\d+)$/, async (ctx) => {

package/src/bot/menu/status-panel.ts

@@ -153,6 +153,20 @@ export class StatusPanel {
       log.debug("status create/pin failed:", (err as Error).message);
     }
   }
+
+  /**
+   * Re-pin the existing status panel (if any). Used after a temporary pin
+   * (e.g. a permission prompt) is unpinned so the status panel stays visible.
+   */
+  async ensurePinned(chatId: number): Promise<void> {
+    const id = this.settings.get(chatId).statusMessageId;
+    if (!id) return;
+    try {
+      await this.api.pinChatMessage(chatId, id, { disable_notification: true });
+    } catch (err) {
+      log.debug("status re-pin failed:", (err as Error).message);
+    }
+  }
 }
 
 function isNotModified(err: unknown): boolean {

package/src/bot/permission-service.ts

@@ -2,6 +2,9 @@
  * PermissionService — turns Grok's ACP `session/request_permission` into either
  * an automatic session-level approval (default) or inline Approve/Deny buttons.
  *
+ * Interactive prompts are **pinned** so they stay visible while the chat is
+ * busy streaming other messages, then **unpinned** on approve / deny / timeout.
+ *
  * Auto-approve prefers "allow for this session" / "always allow" options so the
  * agent stops re-prompting mid-turn. Interactive mode is only used when
  * auto-approve is off (GROK_TRUST_ALL_TOOLS=false and AUTO_APPROVE_PERMISSIONS=false).
@@ -31,6 +34,16 @@ interface Pending {
   sessionId: string;
   messageId?: number;
   timer: NodeJS.Timeout;
+  /** True once the message has been pinned (so we know to unpin on settle). */
+  pinned: boolean;
+}
+
+export interface PermissionServiceOptions {
+  /**
+   * Called after a permission prompt is unpinned (approve / deny / timeout).
+   * Use to re-pin the status panel if Telegram only keeps one pin per chat.
+   */
+  onUnpinned?: (chatId: number) => void | Promise<void>;
 }
 
 export class PermissionService {
@@ -38,13 +51,16 @@ export class PermissionService {
   private seq = 0;
   /** When true, every permission request is auto-approved (session-scope preferred). */
   autoApprove: boolean;
+  private readonly onUnpinned?: (chatId: number) => void | Promise<void>;
 
   constructor(
     private readonly api: Api,
     private readonly registry: RuntimeRegistry,
     autoApprove = true,
+    opts?: PermissionServiceOptions,
   ) {
     this.autoApprove = autoApprove;
+    this.onUnpinned = opts?.onUnpinned;
   }
 
   /** Handle a permission request: auto-approve (default), ask the chat, or allow if unattended. */
@@ -78,6 +94,7 @@ export class PermissionService {
     if (canSwitch) kb.text(`\u{1F500} Switch to ${label}`, `permsw:${reqId}`);
 
     let messageId: number | undefined;
+    let pinned = false;
     try {
       const msg = await this.api.sendMessage(
         chatId,
@@ -88,6 +105,14 @@ export class PermissionService {
         },
       );
       messageId = msg.message_id;
+      // Pin so the prompt stays visible while the chat streams other messages.
+      // disable_notification:true — the send already notified; no second ping.
+      try {
+        await this.api.pinChatMessage(chatId, messageId, { disable_notification: true });
+        pinned = true;
+      } catch (e) {
+        log.warn("failed to pin permission prompt:", (e as Error).message);
+      }
     } catch (e) {
       log.warn("failed to send permission prompt:", (e as Error).message);
       return autoDecideSession(params);
@@ -95,11 +120,21 @@ export class PermissionService {
 
     return new Promise<PermissionOutcome>((resolve) => {
       const timer = setTimeout(() => {
+        const p = this.pending.get(reqId);
+        if (!p) return;
         this.pending.delete(reqId);
-        void this.api.editMessageText(chatId, messageId!, "\u231B Approval timed out \u2014 denied.").catch(() => {});
+        void this.finishPrompt(p, "\u231B Approval timed out \u2014 denied.");
         resolve({ outcome: { outcome: "cancelled" } });
       }, TIMEOUT_MS);
-      this.pending.set(reqId, { resolve, options: params.options, chatId, sessionId: params.sessionId, messageId, timer });
+      this.pending.set(reqId, {
+        resolve,
+        options: params.options,
+        chatId,
+        sessionId: params.sessionId,
+        messageId,
+        timer,
+        pinned,
+      });
     });
   }
 
@@ -111,9 +146,12 @@ export class PermissionService {
     this.pending.delete(reqId);
     const opt = p.options[index];
     if (!opt) {
+      void this.finishPrompt(p, "\u{1F510} (cancelled)");
       p.resolve({ outcome: { outcome: "cancelled" } });
       return undefined;
     }
+    // Unpin + mark resolved (caller typically edits the message text too).
+    void this.unpinOnly(p);
     p.resolve({ outcome: { outcome: "selected", optionId: opt.optionId } });
     return opt.name;
   }
@@ -122,6 +160,31 @@ export class PermissionService {
   sessionFor(reqId: string): string | undefined {
     return this.pending.get(reqId)?.sessionId;
   }
+
+  /** Unpin (if pinned) and optionally rewrite the prompt message. */
+  private async finishPrompt(p: Pending, text?: string): Promise<void> {
+    if (p.messageId !== undefined && text) {
+      await this.api.editMessageText(p.chatId, p.messageId, text, { reply_markup: { inline_keyboard: [] } }).catch(() => {});
+    }
+    await this.unpinOnly(p);
+  }
+
+  /** Unpin the permission prompt and restore the status pin if any. */
+  private async unpinOnly(p: Pending): Promise<void> {
+    if (p.pinned && p.messageId !== undefined) {
+      p.pinned = false;
+      await this.api.unpinChatMessage(p.chatId, p.messageId).catch((e) => {
+        log.debug("unpin permission prompt failed:", (e as Error).message);
+      });
+    }
+    if (this.onUnpinned) {
+      try {
+        await this.onUnpinned(p.chatId);
+      } catch (e) {
+        log.debug("onUnpinned hook failed:", (e as Error).message);
+      }
+    }
+  }
 }
 
 function describe(

package/scripts/_release-version.mjs

@@ -1,87 +0,0 @@
-/**
- * Bump package.json on main + create vX.Y.Z tag via the GitHub API
- * (local git push/commit is restricted in this environment).
- */
-import { readFileSync } from "node:fs";
-import { spawnSync } from "node:child_process";
-
-const owner = "artickc";
-const repo = "grok-telegram-bot";
-const branch = "main";
-const version = "2.2.0";
-const tag = `v${version}`;
-const message = `v${version} — headless account rotation + auto-approve session permissions`;
-
-// eslint-disable-next-line no-control-regex
-const ANSI_RE = /\x1b\[[0-9;?]*[ -/]*[@-~]/g;
-
-function ghApi(method, path, body) {
-  const args = ["api", "-X", method, path];
-  const opts = {
-    encoding: "utf8",
-    maxBuffer: 50 * 1024 * 1024,
-    shell: false,
-    env: { ...process.env, NO_COLOR: "1", CLICOLOR: "0", FORCE_COLOR: "0", GH_FORCE_TTY: "0" },
-  };
-  if (body !== undefined) {
-    args.push("--input", "-");
-    opts.input = JSON.stringify(body);
-  }
-  const r = spawnSync("gh", args, opts);
-  if (r.status !== 0) {
-    throw new Error(`gh api ${method} ${path} failed (${r.status}): ${r.stderr || r.stdout}`);
-  }
-  const text = (r.stdout || "").replace(ANSI_RE, "").trim();
-  if (!text) return {};
-  return JSON.parse(text);
-}
-
-const ref = ghApi("GET", `repos/${owner}/${repo}/git/ref/heads/${branch}`);
-const baseSha = ref.object.sha;
-const baseCommit = ghApi("GET", `repos/${owner}/${repo}/git/commits/${baseSha}`);
-const baseTree = baseCommit.tree.sha;
-console.log("base", baseSha);
-
-const content = readFileSync("package.json", "utf8");
-const blob = ghApi("POST", `repos/${owner}/${repo}/git/blobs`, {
-  content: Buffer.from(content, "utf8").toString("base64"),
-  encoding: "base64",
-});
-
-const newTree = ghApi("POST", `repos/${owner}/${repo}/git/trees`, {
-  base_tree: baseTree,
-  tree: [{ path: "package.json", mode: "100644", type: "blob", sha: blob.sha }],
-});
-
-const commit = ghApi("POST", `repos/${owner}/${repo}/git/commits`, {
-  message,
-  tree: newTree.sha,
-  parents: [baseSha],
-});
-console.log("commit", commit.sha);
-
-ghApi("PATCH", `repos/${owner}/${repo}/git/refs/heads/${branch}`, {
-  sha: commit.sha,
-  force: false,
-});
-console.log("updated", branch, "->", commit.sha);
-
-// Annotated tag for release workflow.
-const tagObj = ghApi("POST", `repos/${owner}/${repo}/git/tags`, {
-  tag,
-  message: message,
-  object: commit.sha,
-  type: "commit",
-  tagger: {
-    name: "artickc",
-    email: "artickc@users.noreply.github.com",
-    date: new Date().toISOString(),
-  },
-});
-console.log("tag object", tagObj.sha);
-
-ghApi("POST", `repos/${owner}/${repo}/git/refs`, {
-  ref: `refs/tags/${tag}`,
-  sha: tagObj.sha,
-});
-console.log("created tag", tag);