@gonzih/cc-tg 0.3.15 → 0.4.1

package/README.md

@@ -25,6 +25,7 @@ Open your bot in Telegram and start chatting.
 | `TELEGRAM_BOT_TOKEN` | yes | From @BotFather |
 | `CLAUDE_CODE_TOKEN` | yes* | Claude Code OAuth token (starts with `sk-ant-oat`) |
 | `CLAUDE_CODE_OAUTH_TOKEN` | yes* | Alias for `CLAUDE_CODE_TOKEN` |
+| `CLAUDE_CODE_OAUTH_TOKENS` | no | Comma-separated OAuth tokens for rotation — e.g. `token1,token2,token3`. When one account hits its usage limit, automatically switches to the next token instead of sleeping. |
 | `ANTHROPIC_API_KEY` | yes* | Alternative — API key from console.anthropic.com |
 | `ALLOWED_USER_IDS` | no | Comma-separated Telegram user IDs. Leave empty to allow anyone |
 | `CWD` | no | Working directory for Claude Code. Defaults to current directory |
@@ -157,6 +158,9 @@ cc-tg works with the [cc-agent](https://github.com/Gonzih/cc-agent) MCP server t
         <string>your_token</string>
         <key>CLAUDE_CODE_TOKEN</key>
         <string>your_claude_token</string>
+        <!-- Optional: comma-separated OAuth tokens for automatic rotation on usage limit -->
+        <!-- <key>CLAUDE_CODE_OAUTH_TOKENS</key> -->
+        <!-- <string>token1,token2,token3</string> -->
         <key>ALLOWED_USER_IDS</key>
         <string>your_telegram_id</string>
         <key>CWD</key>

package/dist/bot.js

@@ -14,6 +14,7 @@ import { transcribeVoice, isVoiceAvailable } from "./voice.js";
 import { CronManager } from "./cron.js";
 import { formatForTelegram, splitLongMessage } from "./formatter.js";
 import { detectUsageLimit } from "./usage-limit.js";
+import { getCurrentToken, rotateToken, getTokenIndex, getTokenCount } from "./tokens.js";
 const BOT_COMMANDS = [
     { command: "start", description: "Reset session and start fresh" },
     { command: "reset", description: "Reset Claude session" },
@@ -409,7 +410,7 @@ export class CcTgBot {
             return existing;
         const claude = new ClaudeProcess({
             cwd: this.opts.cwd,
-            token: this.opts.claudeToken,
+            token: getCurrentToken() || this.opts.claudeToken,
         });
         const session = {
             claude,
@@ -476,6 +477,29 @@ export class CcTgBot {
                 clearTimeout(prevRetry.timer);
             this.bot.sendMessage(chatId, sig.humanMessage).catch(() => { });
             this.killSession(chatId);
+            // Token rotation: if this is a usage_exhausted signal and we have multiple
+            // tokens, rotate to the next one and retry immediately instead of sleeping.
+            // Only rotate if we haven't yet cycled through all tokens (attempt <= count-1).
+            if (sig.reason === "usage_exhausted" && getTokenCount() > 1 && attempt <= getTokenCount() - 1) {
+                const prevIdx = getTokenIndex();
+                rotateToken();
+                const newIdx = getTokenIndex();
+                const total = getTokenCount();
+                console.log(`[cc-tg] Token ${prevIdx + 1}/${total} exhausted, rotating to token ${newIdx + 1}/${total}`);
+                this.bot.sendMessage(chatId, `🔄 Token ${prevIdx + 1}/${total} exhausted, switching to token ${newIdx + 1}/${total}...`).catch(() => { });
+                this.pendingRetries.set(chatId, { text: lastPrompt, attempt, timer: setTimeout(() => { }, 0) });
+                try {
+                    const retrySession = this.getOrCreateSession(chatId);
+                    retrySession.currentPrompt = lastPrompt;
+                    retrySession.isRetry = true;
+                    retrySession.claude.sendPrompt(lastPrompt);
+                    this.startTyping(chatId, retrySession);
+                }
+                catch (err) {
+                    this.bot.sendMessage(chatId, `❌ Failed to retry with rotated token: ${err.message}`).catch(() => { });
+                }
+                return;
+            }
             if (attempt > 3) {
                 this.bot.sendMessage(chatId, "❌ Claude usage limit persists after 3 retries. Please try again later.").catch(() => { });
                 this.pendingRetries.delete(chatId);
@@ -735,6 +759,11 @@ export class CcTgBot {
             "This is NOT part of the user's ongoing conversation.",
             "Be concise. Report results only. No greetings or pleasantries.",
             "If there is nothing to report, say so in one sentence.",
+            "DEDUP RULE: If this task involves resuming or restarting interrupted agents/jobs,",
+            "  skip any job whose task description already starts with 'RESUMING' (it is already",
+            "  a resume attempt). Also skip any job that has a non-empty 'resumed_by' field.",
+            "  Only spawn a resume agent for a job if resume_count < 2 (when that field exists).",
+            "  This prevents exponential job growth when a cron re-discovers its own spawned agents.",
             "",
             `SCHEDULED TASK: ${prompt}`,
         ].join("\n");

package/dist/index.js

@@ -21,6 +21,7 @@ import os from "os";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import { CcTgBot } from "./bot.js";
+import { loadTokens } from "./tokens.js";
 import { Registry, startControlServer } from "@gonzih/agent-ops";
 import { Redis } from "ioredis";
 const __filename = fileURLToPath(import.meta.url);
@@ -98,6 +99,11 @@ Set one and run again:
 `);
     process.exit(1);
 }
+// Load OAuth token pool (supports CLAUDE_CODE_OAUTH_TOKENS for multi-account rotation)
+const tokenPool = loadTokens();
+if (tokenPool.length > 1) {
+    console.log(`[cc-tg] Token pool loaded: ${tokenPool.length} tokens — will rotate on usage limit`);
+}
 const allowedUserIds = process.env.ALLOWED_USER_IDS
     ? process.env.ALLOWED_USER_IDS.split(",").map((s) => parseInt(s.trim(), 10)).filter(Boolean)
     : [];

package/dist/tokens.d.ts

@@ -0,0 +1,22 @@
+/**
+ * OAuth token pool management.
+ *
+ * Supports CLAUDE_CODE_OAUTH_TOKENS (comma-separated list of tokens).
+ * Falls back to CLAUDE_CODE_OAUTH_TOKEN for single-token / backwards compat.
+ */
+/**
+ * Load tokens from env vars. Called on startup; also re-callable in tests.
+ * Priority: CLAUDE_CODE_OAUTH_TOKENS > CLAUDE_CODE_OAUTH_TOKEN > (empty)
+ */
+export declare function loadTokens(): string[];
+/** Returns the current active token, or empty string if none configured. */
+export declare function getCurrentToken(): string;
+/**
+ * Advance to the next token (wraps around).
+ * Returns the new current token.
+ */
+export declare function rotateToken(): string;
+/** Zero-based index of the current token. */
+export declare function getTokenIndex(): number;
+/** Total number of tokens in the pool. */
+export declare function getTokenCount(): number;

package/dist/tokens.js

@@ -0,0 +1,56 @@
+/**
+ * OAuth token pool management.
+ *
+ * Supports CLAUDE_CODE_OAUTH_TOKENS (comma-separated list of tokens).
+ * Falls back to CLAUDE_CODE_OAUTH_TOKEN for single-token / backwards compat.
+ */
+let tokens = [];
+let currentIndex = 0;
+let initialized = false;
+/**
+ * Load tokens from env vars. Called on startup; also re-callable in tests.
+ * Priority: CLAUDE_CODE_OAUTH_TOKENS > CLAUDE_CODE_OAUTH_TOKEN > (empty)
+ */
+export function loadTokens() {
+    const multi = process.env.CLAUDE_CODE_OAUTH_TOKENS;
+    if (multi) {
+        tokens = multi.split(",").map((t) => t.trim()).filter(Boolean);
+    }
+    else {
+        const single = process.env.CLAUDE_CODE_OAUTH_TOKEN;
+        tokens = single ? [single] : [];
+    }
+    currentIndex = 0;
+    initialized = true;
+    return tokens;
+}
+function ensureInitialized() {
+    if (!initialized)
+        loadTokens();
+}
+/** Returns the current active token, or empty string if none configured. */
+export function getCurrentToken() {
+    ensureInitialized();
+    return tokens[currentIndex] ?? "";
+}
+/**
+ * Advance to the next token (wraps around).
+ * Returns the new current token.
+ */
+export function rotateToken() {
+    ensureInitialized();
+    if (tokens.length === 0)
+        return "";
+    currentIndex = (currentIndex + 1) % tokens.length;
+    return tokens[currentIndex];
+}
+/** Zero-based index of the current token. */
+export function getTokenIndex() {
+    ensureInitialized();
+    return currentIndex;
+}
+/** Total number of tokens in the pool. */
+export function getTokenCount() {
+    ensureInitialized();
+    return tokens.length;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gonzih/cc-tg",
-  "version": "0.3.15",
+  "version": "0.4.1",
   "description": "Claude Code Telegram bot — chat with Claude Code via Telegram",
   "type": "module",
   "bin": {