grok-telegram-bot 2.2.3 → 2.2.4

package/CHANGELOG.md

@@ -7,9 +7,29 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 The latest section is published verbatim as the GitHub Release notes by
 `.github/workflows/release.yml` when a `vX.Y.Z` tag is pushed.
 
-## [Unreleased]
-
-## [2.2.3] - 2026-07-13
+## [Unreleased]
+
+## [2.2.4] - 2026-07-16
+
+### Fixed
+
+- **🚫 Rotate immediately on Grok access denial.** API `403 Forbidden` / `Access
+  denied` responses now bypass same-account retry backoff, mark the failed
+  login with `⚠️`, and rotate to the next eligible saved account. If the active
+  host login was not already saved (for example after an external sign-in or
+  token refresh), it is captured first so the warning is visible and persists.
+- **🔐 Isolated Grok Telegram identity.** The Grok bot now takes its Telegram
+  token from its own instance `.env` before considering an inherited process
+  environment value. This prevents a machine-wide token for a sibling bot from
+  making Grok poll as Codex/Kiro/OpenCode and causing Telegram conflicts.
+- **⚠️ Persistent account warnings.** Account access/quota failures are shown
+  in `/accounts`, excluded from later automatic rotations, and can be manually
+  re-enabled after the account is repaired.
+- **🛟 No false success for silent ACP turns.** A Grok ACP completion with no
+  text, thought, or tool update is now treated as a recoverable agent failure
+  instead of reporting `Done · no text output`.
+
+## [2.2.3] - 2026-07-13
 
 ### Fixed
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grok-telegram-bot",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "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/src/app/accounts.ts

@@ -32,6 +32,11 @@ export interface StoredAccount {
   startUrl?: string;
   accountType?: string;
   region?: string;
+  /** Excluded from automatic rotation after an account-specific quota/billing failure. */
+  warning?: {
+    reason: string;
+    markedAt: string;
+  };
 }
 
 interface AccountsData {
@@ -171,6 +176,9 @@ export class AccountManager {
       email: (email && email.includes("@") ? email : undefined) || existing?.email,
       startUrl: (email && email.includes("@") ? email : undefined) || existing?.email || existing?.startUrl,
       savedAt: new Date().toISOString(),
+      // Automatic pre-rotation snapshots must not silently re-enable an
+      // account that was quarantined after a quota/billing failure.
+      warning: existing?.warning,
     };
     this.store.update((d) => {
       const idx = d.accounts.findIndex((a) => a.id === id);
@@ -227,6 +235,33 @@ export class AccountManager {
     return updated;
   }
 
+  /** Mark an account as unsuitable for future automatic rotations. */
+  markWarning(id: string, reason: string): StoredAccount | undefined {
+    let updated: StoredAccount | undefined;
+    this.store.update((d) => {
+      const account = d.accounts.find((a) => a.id === id);
+      if (account) {
+        account.warning = { reason, markedAt: new Date().toISOString() };
+        updated = account;
+      }
+    });
+    if (updated) log.warn(`marked account ${updated.label} with rotation warning: ${reason}`);
+    return updated;
+  }
+
+  /** Re-allow a manually restored account to participate in auto-rotation. */
+  clearWarning(id: string): StoredAccount | undefined {
+    let updated: StoredAccount | undefined;
+    this.store.update((d) => {
+      const account = d.accounts.find((a) => a.id === id);
+      if (account?.warning) {
+        delete account.warning;
+        updated = account;
+      }
+    });
+    return updated;
+  }
+
   async forget(id: string): Promise<boolean> {
     const existed = !!this.get(id);
     await rm(this.snapshotPath(id), { force: true }).catch(() => {});

package/src/bot/account-rotator.ts

@@ -37,6 +37,8 @@ export interface AccountRotator {
   targets(): Promise<RotationTarget[]>;
   /** Make a saved account active (swap auth.json + re-bind). Throws on error. */
   activate(id: string): Promise<void>;
+  /** Quarantine an account after an account-specific failure. Undefined means active. */
+  markFailed(id: string | undefined, reason: string): Promise<void>;
 }
 
 export class AccountRotatorImpl implements AccountRotator {
@@ -52,7 +54,26 @@ export class AccountRotatorImpl implements AccountRotator {
   async targets(): Promise<RotationTarget[]> {
     const list = this.accounts.list();
     const activeId = this.accounts.activeAccountId();
-    return list.filter((a) => a.id !== activeId).map((a) => ({ id: a.id, label: a.label }));
+    return list
+      .filter((a) => a.id !== activeId && !a.warning)
+      .map((a) => ({ id: a.id, label: a.label }));
+  }
+
+  async markFailed(id: string | undefined, reason: string): Promise<void> {
+    let accountId = id ?? this.accounts.activeAccountId();
+    if (!accountId) {
+      // The host may have been signed in or had its token refreshed outside the
+      // bot, so no saved snapshot matches yet. Capture it before marking; this
+      // guarantees the actual failed login appears with a warning in /accounts
+      // and is excluded from the target list below.
+      try {
+        accountId = (await this.accounts.captureCurrent()).id;
+      } catch (error) {
+        log.warn("could not capture active account for rotation warning:", (error as Error).message);
+        return;
+      }
+    }
+    this.accounts.markWarning(accountId, reason);
   }
 
   /**

package/src/bot/handlers/accounts.ts

@@ -17,7 +17,7 @@ import type { BotDeps } from "../deps.js";
 const log = createLogger("accounts");
 
 function accountLine(a: StoredAccount, active: boolean): string {
-  const mark = active ? "\u2705 " : "\u{1F464} ";
+  const mark = a.warning ? "\u26A0\uFE0F " : active ? "\u2705 " : "\u{1F464} ";
   return `${mark}${a.label}`;
 }
 
@@ -51,15 +51,18 @@ async function view(deps: BotDeps, note?: string): Promise<{ text: string; keybo
   if (list.length === 0) {
     lines.push("No saved accounts yet.", "", "Save the current login below, or sign in via /reauth.");
   } else {
-    for (const a of list) lines.push(accountLine(a, a.id === active));
+    for (const a of list) {
+      lines.push(accountLine(a, a.id === active));
+      if (a.warning) lines.push("  \u2514 Skipped by auto-rotate after an account access or quota error.");
+    }
   }
   const rotate = deps.accounts.autoRotateEnabled();
   lines.push(
     "",
     `\u{1F501} Auto-rotate on errors: ${rotate ? "ON" : "OFF"}`,
     rotate
-      ? "  \u2514 On give-up / 402 balance exhausted: stop CLI, swap auth, restart, retry each account once."
-      : "  \u2514 Turns stay on the active account (402 balance exhausted stops immediately).",
+      ? "  \u2514 On account access/quota errors: stop CLI, swap auth, restart, retry each eligible account once. \u26A0\uFE0F accounts are skipped."
+      : "  \u2514 Turns stay on the active account (account access/quota errors stop immediately).",
   );
   if (note) lines.push("", note);
 
@@ -70,6 +73,7 @@ async function view(deps: BotDeps, note?: string): Promise<{ text: string; keybo
       .text("\u270F\uFE0F", `acct:rename:${a.id}`)
       .text("\u{1F5D1}", `acct:del:${a.id}`)
       .row();
+    if (a.warning) kb.text(`\u26A0\uFE0F Re-enable ${trim(a.label)}`, `acct:clearwarning:${a.id}`).row();
   }
   kb.text("\u{1F4BE} Save current login", "acct:save").text("\u270F\uFE0F Save as\u2026", "acct:saveas").row();
   kb.text("\u{1F4E5} Import existing", "acct:import").text("\u{1F511} Sign in\u2026", "acct:login").row();
@@ -161,6 +165,13 @@ export function registerAccounts(bot: Bot, deps: BotDeps): void {
     await promptName(ctx, "rename", ctx.match![1]!);
   });
 
+  bot.callbackQuery(/^acct:clearwarning:(.+)$/, async (ctx) => {
+    const id = ctx.match![1]!;
+    const account = deps.accounts.clearWarning(id);
+    await ctx.answerCallbackQuery({ text: account ? "Account re-enabled for auto-rotate" : "No warning to clear" });
+    await rerender(ctx, deps, account ? `\u2705 ${account.label} can be used by auto-rotate again.` : undefined);
+  });
+
   bot.callbackQuery("acct:close", async (ctx) => {
     await ctx.answerCallbackQuery();
     await deps.ephemeral.drop(ctx);

package/src/bot/session-runtime.ts

@@ -7,8 +7,8 @@
 import { basename } from "node:path";
 import { type Api, InlineKeyboard } from "grammy";
 import {
-  type GrokClient,
-  isAccountExhaustedError,
+  type GrokClient,
+  isAccountRotationError,
   isContextExhaustedError,
   isTransientError,
   type SessionMetadata,
@@ -99,8 +99,10 @@ export class SessionRuntime {
   private turnCount = 0;
   /** Telegram message id of the current turn's prompt, so replies thread to it. */
   private turnReplyTo: number | undefined;
-  private imageScanText = "";
-  private sentImagesThisTurn = new Set<string>();
+  private imageScanText = "";
+  private sentImagesThisTurn = new Set<string>();
+  /** Monotonic count used to reject ACP "success" responses with no turn updates. */
+  private sessionUpdateCount = 0;
   private readonly listener: (sessionId: string, update: SessionUpdate) => void;
   private primingContext: string | undefined;
   private watcher: TailWatcher | undefined;
@@ -690,10 +692,18 @@ export class SessionRuntime {
     input: PromptInput,
     final: { result?: PromptResult; error?: Error; attempts: number },
   ): Promise<{ result?: PromptResult; error?: Error; attempts: number } | undefined> {
-    const rotator = this.accountRotator;
-    if (!rotator?.enabled() || !final.error || this.cancelled) return undefined;
-    if (this.streamer?.hasOutput ?? false) return undefined;
-    const targets = await rotator.targets().catch(() => [] as { id: string; label: string }[]);
+    const rotator = this.accountRotator;
+    if (!rotator?.enabled() || !final.error || this.cancelled) return undefined;
+    // A quota-exhausted or access-denied response cannot be recovered by retrying
+    // this login. Quarantine it before choosing targets, so later rotations do not
+    // cycle back to a known-bad account. This intentionally happens before the
+    // partial-stream guard: we must not retry/rotate a partial reply, but its
+    // account still needs to be skipped during a future rotation.
+    if (isAccountRotationError(final.error)) {
+      await rotator.markFailed(undefined, final.error.message);
+    }
+    if (this.streamer?.hasOutput ?? false) return undefined;
+    const targets = await rotator.targets().catch(() => [] as { id: string; label: string }[]);
     if (targets.length === 0) return undefined;
 
     const transcript = this.sessionId ? recentTranscript(this.cfg.sessionsDir, this.sessionId) : undefined;
@@ -730,18 +740,21 @@ export class SessionRuntime {
       });
       log.info(
         `chat ${this.chatId} auto-rotating to account ${t.label}` +
-          (isAccountExhaustedError(failReason) ? " (billing/quota exhausted on previous)" : ""),
+          (isAccountRotationError(failReason) ? " (previous account unavailable)" : ""),
       );
       // runPromptWithRetries already skips backoff for 402 / balance exhausted.
       last = await this.runPromptWithRetries(content);
-      if (last.result && !this.cancelled) {
+      if (last.result && !this.cancelled) {
         if (this.foreground) {
           await this.notify(`\u2705 Recovered on ${t.label}.`, { replyTo: this.turnReplyTo });
         }
         return last;
-      }
-      if (this.cancelled || (this.streamer?.hasOutput ?? false)) return last;
-      errors.push(`\u2022 ${t.label}: ${last.error?.message ?? "failed"}`);
+      }
+      if (last.error && isAccountRotationError(last.error)) {
+        await rotator.markFailed(t.id, last.error.message);
+      }
+      if (this.cancelled || (this.streamer?.hasOutput ?? false)) return last;
+      errors.push(`\u2022 ${t.label}: ${last.error?.message ?? "failed"}`);
     }
 
     // One full cycle done and still failing — stop with a combined report.
@@ -763,12 +776,21 @@ export class SessionRuntime {
   ): Promise<{ result?: PromptResult; error?: Error; attempts: number }> {
     const delays = this.cfg.promptRetryAttempts > 0 ? backoffSchedule(this.cfg.promptRetryAttempts) : [];
     const totalAttempts = delays.length + 1;
-    let attempt = 0;
-    for (;;) {
-      attempt++;
-      try {
-        const result = await this.acp.prompt(this.sessionId!, content);
-        return { result, attempts: attempt };
+    let attempt = 0;
+    for (;;) {
+      attempt++;
+      try {
+        const updatesBeforePrompt = this.sessionUpdateCount;
+        const result = await this.acp.prompt(this.sessionId!, content);
+        // A healthy ACP turn emits at least one session/update (text, thought,
+        // or tool event) before resolving session/prompt. Grok can otherwise
+        // report a successful end-turn after an upstream model failure; never
+        // present that as a completed user request.
+        await sleep(0);
+        if (this.sessionUpdateCount === updatesBeforePrompt) {
+          throw new Error("Empty agent response — Grok ended the turn without any output or tool activity");
+        }
+        return { result, attempts: attempt };
       } catch (err) {
         const error = err as Error;
         const canRecover = !this.cancelled && !(this.streamer?.hasOutput ?? false);
@@ -781,7 +803,7 @@ export class SessionRuntime {
           attempt <= delays.length &&
           canRecover &&
           !forkInstead &&
-          !isAccountExhaustedError(error) &&
+          !isAccountRotationError(error) &&
           isTransientError(error);
         if (!willRetry) return { error, attempts: attempt };
         const waitMs = delays[attempt - 1]!;
@@ -958,9 +980,10 @@ export class SessionRuntime {
     void this.runTurn(batch);
   }
 
-  private onUpdate(sessionId: string, update: SessionUpdate): void {
-    if (!this.busy || sessionId !== this.sessionId) return;
-    const kind = update.sessionUpdate;
+  private onUpdate(sessionId: string, update: SessionUpdate): void {
+    if (!this.busy || sessionId !== this.sessionId) return;
+    this.sessionUpdateCount++;
+    const kind = update.sessionUpdate;
 
     // Accumulate the turn's file-change summary + image-scan text even when this
     // session is in the background (its output isn't streamed here, but the

package/src/config.ts

@@ -44,9 +44,10 @@ function resolveInstanceDir(): string {
   return CANONICAL_DIR;
 }
 
-// Load .env from the resolved instance directory. dotenv does NOT override
-// variables already present in the environment (the launcher/service env wins).
-loadDotenv({ path: ENV_PATH });
+// Load .env from the resolved instance directory. Keep the parsed values as
+// well: a machine-wide TELEGRAM_BOT_TOKEN may belong to a sibling bot (Codex,
+// Kiro, etc.) and must never override this Grok instance's identity.
+const instanceEnv = loadDotenv({ path: ENV_PATH }).parsed ?? {};
 
 function expandHome(p: string): string {
   if (p === "~") return homedir();
@@ -146,7 +147,10 @@ export interface AppConfig {
 }
 
 export function loadConfig(): AppConfig {
-  const token = (process.env.TELEGRAM_BOT_TOKEN || "").trim();
+  // Telegram long polling permits one consumer per token. Prefer the token in
+  // this bot's own instance file over a globally inherited environment value,
+  // otherwise a Grok process can accidentally poll as a sibling bot.
+  const token = (instanceEnv.TELEGRAM_BOT_TOKEN || process.env.TELEGRAM_BOT_TOKEN || "").trim();
   if (!token) {
     throw new Error(
       "TELEGRAM_BOT_TOKEN is missing. Copy .env.example to .env and set it (run `npm run setup`).",

package/src/grok/client.ts

@@ -43,7 +43,7 @@ export interface SessionMetadata {
 
 const TRANSIENT_CODES = new Set([-32603, -32500, -32000, 500, 502, 503, 504, 429]);
 const TRANSIENT_RE =
-  /internal error|high volume|experiencing|overloaded|temporar|unavailable|rate.?limit|too many requests|try again|capacity|dispatch failure|response stream|connection (?:reset|closed|refused|error)|reset by peer|broken pipe|socket hang ?up|econnreset|econnrefused|enotfound|eai_again|etimedout|\b50[234]\b|\b429\b/i;
+  /internal error|high volume|experiencing|overloaded|temporar|unavailable|rate.?limit|too many requests|try again|capacity|dispatch failure|response stream|empty agent response|connection (?:reset|closed|refused|error)|reset by peer|broken pipe|socket hang ?up|econnreset|econnrefused|enotfound|eai_again|etimedout|\b50[234]\b|\b429\b/i;
 const CONTEXT_EXHAUSTED_RE =
   /context (?:length|window|limit|size|overflow)|maximum context|input (?:is )?too long|prompt (?:is )?too long|too many (?:input )?tokens|token limit|exceeds? (?:the )?(?:maximum|context|token)|reduce the (?:length|size)|context.{0,24}exhaust/i;
 /**
@@ -54,6 +54,10 @@ const CONTEXT_EXHAUSTED_RE =
  */
 const ACCOUNT_EXHAUSTED_RE =
   /\b402\b|payment required|balance exhausted|usage balance|out of (?:credits|quota|balance)|insufficient (?:credits|balance|quota)|quota exceeded|no (?:remaining )?credits/i;
+/** Account-level authorization failures from the Grok CLI proxy. A different
+ * saved login may be permitted, while same-account retries cannot help. */
+const ACCOUNT_ACCESS_DENIED_RE =
+  /\b403\b|forbidden|access denied/i;
 
 export class GrokError extends Error {
   constructor(
@@ -92,9 +96,36 @@ export function isAccountExhaustedError(err: Error): boolean {
   return false;
 }
 
+/**
+ * True when the active saved login cannot serve the request: either its Grok
+ * Build quota is exhausted (402), or the proxy rejects it as unauthorized
+ * (403 / Forbidden / Access denied). Both must skip same-account backoff and
+ * trigger account rotation when enabled.
+ */
+export function isAccountRotationError(err: Error): boolean {
+  if (isAccountExhaustedError(err) || ACCOUNT_ACCESS_DENIED_RE.test(err.message)) return true;
+  const data = (err as GrokError).data;
+  if (!data || typeof data !== "object") return false;
+  const d = data as Record<string, unknown>;
+  const status = d.http_status ?? d.status ?? d.statusCode;
+  if (status === 403 || status === "403") return true;
+  if (typeof d.message === "string" && ACCOUNT_ACCESS_DENIED_RE.test(d.message)) return true;
+  for (const value of Object.values(d)) {
+    if (typeof value === "string" && ACCOUNT_ACCESS_DENIED_RE.test(value)) return true;
+    if (value && typeof value === "object") {
+      const nested = value as Record<string, unknown>;
+      const nestedStatus = nested.http_status ?? nested.status ?? nested.statusCode;
+      if (nestedStatus === 403 || nestedStatus === "403") return true;
+      if (typeof nested.message === "string" && ACCOUNT_ACCESS_DENIED_RE.test(nested.message)) return true;
+    }
+  }
+  return false;
+}
+
 export function isTransientError(err: Error): boolean {
-  // Balance/quota exhaustion is permanent for this login — never backoff-retry.
-  if (isAccountExhaustedError(err)) return false;
+  // Quota exhaustion and access denial are permanent for this login — rotate,
+  // never back off and retry the same credentials.
+  if (isAccountRotationError(err)) return false;
   const code = (err as GrokError).code;
   if (typeof code === "number" && TRANSIENT_CODES.has(code)) return true;
   return TRANSIENT_RE.test(err.message);

package/scripts/_tmp-release.mjs

@@ -1,16 +0,0 @@
-import { execSync } from "node:child_process";
-
-function run(cmd) {
-  console.log(`$ ${cmd}`);
-  execSync(cmd, { stdio: "inherit" });
-}
-
-// Annotated release tag (triggers GitHub Release workflow on push).
-try {
-  run('git tag -a v2.2.3 -m "v2.2.3 — instant account rotate on 402 balance exhausted"');
-} catch {
-  console.log("tag v2.2.3 already exists locally — continuing");
-}
-run("git push origin v2.2.3");
-run("npm publish --access public");
-console.log("done");