@gonzih/cc-tg 0.3.14 → 0.3.15

package/dist/bot.js

@@ -168,9 +168,11 @@ export class CcTgBot {
             this.botId = me.id;
             console.log(`[tg] bot identity: @${this.botUsername} (id=${this.botId})`);
         }).catch((err) => console.error("[tg] getMe failed:", err.message));
-        // Cron manager — fires each task into an isolated ClaudeProcess
-        this.cron = new CronManager(opts.cwd ?? process.cwd(), (chatId, prompt) => {
-            this.runCronTask(chatId, prompt);
+        // Cron manager — fires each task into an isolated ClaudeProcess.
+        // The `done` callback is passed through to runCronTask so the cron manager
+        // knows when a task finishes and can allow the next tick to run.
+        this.cron = new CronManager(opts.cwd ?? process.cwd(), (chatId, prompt, jobId, done) => {
+            this.runCronTask(chatId, prompt, done);
         });
         this.costStore = new CostStore(opts.cwd ?? process.cwd());
         this.registerBotCommands();
@@ -722,7 +724,7 @@ export class CcTgBot {
         const toolUse = content.find((b) => b.type === "tool_use");
         return toolUse?.name ?? "";
     }
-    runCronTask(chatId, prompt) {
+    runCronTask(chatId, prompt, done = () => { }) {
         // Fresh isolated Claude session — never touches main conversation
         const cronProcess = new ClaudeProcess({
             cwd: this.opts.cwd,
@@ -783,9 +785,11 @@ export class CcTgBot {
         cronProcess.on("error", (err) => {
             console.error(`[cron] task error for chat=${chatId}:`, err.message);
             cronProcess.kill();
+            done();
         });
         cronProcess.on("exit", () => {
             console.log(`[cron] task complete for chat=${chatId}`);
+            done();
         });
         cronProcess.sendPrompt(taskPrompt);
     }

package/dist/cron.d.ts

@@ -11,9 +11,15 @@ export interface CronJob {
     createdAt: string;
     schedule: string;
 }
-type FireCallback = (chatId: number, prompt: string) => void;
+/** Called when a job fires. `done` must be called when the task completes so
+ *  the next scheduled tick is allowed to run. Until `done` is called, concurrent
+ *  ticks for the same job are silently skipped (prevents the resume-loop explosion
+ *  where each tick spawns more agents than the last). */
+type FireCallback = (chatId: number, prompt: string, jobId: string, done: () => void) => void;
 export declare class CronManager {
     private jobs;
+    /** Job IDs whose fire callback has been invoked but whose `done` hasn't fired yet. */
+    private activeJobs;
     private storePath;
     private fire;
     constructor(cwd: string, fire: FireCallback);

package/dist/cron.js

@@ -7,6 +7,8 @@ import { readFileSync, writeFileSync, mkdirSync, existsSync } from "fs";
 import { join } from "path";
 export class CronManager {
     jobs = new Map();
+    /** Job IDs whose fire callback has been invoked but whose `done` hasn't fired yet. */
+    activeJobs = new Set();
     storePath;
     fire;
     constructor(cwd, fire) {
@@ -36,8 +38,13 @@ export class CronManager {
         const id = `${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
         const job = { id, chatId, intervalMs, prompt, schedule, createdAt: new Date().toISOString() };
         const timer = setInterval(() => {
+            if (this.activeJobs.has(id)) {
+                console.log(`[cron:${id}] skipping tick — previous task still running`);
+                return;
+            }
+            this.activeJobs.add(id);
             console.log(`[cron:${id}] firing for chat=${chatId} prompt="${prompt}"`);
-            this.fire(chatId, prompt);
+            this.fire(chatId, prompt, id, () => { this.activeJobs.delete(id); });
         }, intervalMs);
         this.jobs.set(id, { ...job, timer });
         this.persist();
@@ -48,6 +55,7 @@ export class CronManager {
         if (!job || job.chatId !== chatId)
             return false;
         clearInterval(job.timer);
+        this.activeJobs.delete(id);
         this.jobs.delete(id);
         this.persist();
         return true;
@@ -57,6 +65,7 @@ export class CronManager {
         for (const [id, job] of this.jobs) {
             if (job.chatId === chatId) {
                 clearInterval(job.timer);
+                this.activeJobs.delete(id);
                 this.jobs.delete(id);
                 count++;
             }
@@ -86,9 +95,16 @@ export class CronManager {
         }
         // Recreate timer so it uses updated intervalMs and always reads latest job.prompt
         clearInterval(job.timer);
+        // Also clear any active-job lock so the updated timer can fire immediately next tick
+        this.activeJobs.delete(job.id);
         job.timer = setInterval(() => {
+            if (this.activeJobs.has(job.id)) {
+                console.log(`[cron:${job.id}] skipping tick — previous task still running`);
+                return;
+            }
+            this.activeJobs.add(job.id);
             console.log(`[cron:${job.id}] firing for chat=${job.chatId} prompt="${job.prompt}"`);
-            this.fire(job.chatId, job.prompt);
+            this.fire(job.chatId, job.prompt, job.id, () => { this.activeJobs.delete(job.id); });
         }, job.intervalMs);
         this.persist();
         const { timer: _t, ...cronJob } = job;
@@ -113,8 +129,13 @@ export class CronManager {
             const data = JSON.parse(readFileSync(this.storePath, "utf8"));
             for (const job of data) {
                 const timer = setInterval(() => {
+                    if (this.activeJobs.has(job.id)) {
+                        console.log(`[cron:${job.id}] skipping tick — previous task still running`);
+                        return;
+                    }
+                    this.activeJobs.add(job.id);
                     console.log(`[cron:${job.id}] firing for chat=${job.chatId} prompt="${job.prompt}"`);
-                    this.fire(job.chatId, job.prompt);
+                    this.fire(job.chatId, job.prompt, job.id, () => { this.activeJobs.delete(job.id); });
                 }, job.intervalMs);
                 this.jobs.set(job.id, { ...job, timer });
             }

package/package.json

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