@gonzih/cc-tg 0.6.3 → 0.6.4

package/dist/cc-agent-events.d.ts

@@ -42,6 +42,7 @@ export interface HandlerDeps {
     readJobOutput: (jobId: string) => Promise<string[]>;
     readCoordinatorPlan: (jobId: string) => Promise<CoordinatorPlan | null>;
     getRunningJobCount: () => Promise<number>;
+    getActiveChatIds: () => Promise<number[]>;
 }
 export declare function buildDecisionPrompt(event: JobEvent, last40lines: string[], coordinatorPlan: CoordinatorPlan | null): string;
 export declare function parseDecision(raw: string): DecisionResult;
@@ -55,6 +56,12 @@ export declare function defaultSpawnFollowupAgent(repoUrl: string, task: string)
 export declare function defaultReadJobOutput(jobId: string): Promise<string[]>;
 export declare function defaultReadCoordinatorPlan(jobId: string): Promise<CoordinatorPlan | null>;
 export declare function defaultGetRunningJobCount(): Promise<number>;
+/**
+ * Returns chat IDs to notify about job events.
+ * Reads unique chatIds from the cron jobs file (same users who set up cron jobs).
+ * Falls back to CC_AGENT_NOTIFY_CHAT_ID env var for backward compatibility.
+ */
+export declare function defaultGetActiveChatIds(): Promise<number[]>;
 /**
  * Write a coordinator plan for a job, so cc-tg knows what follow-up to spawn.
  * Call this when spawning a job that has a planned follow-up.

package/dist/cc-agent-events.js

@@ -10,6 +10,8 @@
  * Controlled via CC_AGENT_EVENTS_ENABLED env var (default: true).
  * Requires CC_AGENT_NOTIFY_CHAT_ID to send Telegram notifications.
  */
+import { readFileSync } from "fs";
+import { join } from "path";
 import { Redis } from "ioredis";
 import TelegramBot from "node-telegram-bot-api";
 import { ClaudeProcess, extractText } from "./claude.js";
@@ -56,11 +58,23 @@ Reply in JSON:
   "followup": { "repo_url": "...", "task": "..." } | null
 }`;
 }
+function extractJson(text) {
+    // Strip ```json ... ``` fences
+    const fenced = text.match(/```(?:json)?\s*([\s\S]*?)```/);
+    if (fenced)
+        return fenced[1].trim();
+    // Find first { ... } block
+    const start = text.indexOf("{");
+    const end = text.lastIndexOf("}");
+    if (start !== -1 && end !== -1)
+        return text.slice(start, end + 1);
+    return "";
+}
 export function parseDecision(raw) {
-    const match = raw.match(/\{[\s\S]*\}/);
-    if (!match)
+    const extracted = extractJson(raw);
+    if (!extracted)
         throw new Error(`No JSON found in Claude response: ${raw.slice(0, 200)}`);
-    const parsed = JSON.parse(match[0]);
+    const parsed = JSON.parse(extracted);
     if (!["NOTIFY_ONLY", "SPAWN_FOLLOWUP", "SILENT"].includes(parsed.action)) {
         throw new Error(`Unknown action: ${parsed.action}`);
     }
@@ -83,15 +97,6 @@ function formatFailureMessage(event) {
     const repoShort = event.repoUrl.replace(/^https?:\/\/github\.com\//, "");
     return `✗ ${event.title} failed\n${repoShort} — exit 1\nLast line: ${lastLine}`;
 }
-function getChatId() {
-    const chatIdStr = process.env.CC_AGENT_NOTIFY_CHAT_ID;
-    if (!chatIdStr)
-        return null;
-    const chatId = Number(chatIdStr);
-    if (isNaN(chatId))
-        return null;
-    return chatId;
-}
 /**
  * Ask Claude to make a decision about a completed job.
  * Returns the raw text response from Claude.
@@ -223,6 +228,36 @@ export async function defaultReadCoordinatorPlan(jobId) {
 export async function defaultGetRunningJobCount() {
     return 0;
 }
+/**
+ * Returns chat IDs to notify about job events.
+ * Reads unique chatIds from the cron jobs file (same users who set up cron jobs).
+ * Falls back to CC_AGENT_NOTIFY_CHAT_ID env var for backward compatibility.
+ */
+export async function defaultGetActiveChatIds() {
+    const ids = new Set();
+    // Backward compat: explicit env var
+    const chatIdStr = process.env.CC_AGENT_NOTIFY_CHAT_ID;
+    if (chatIdStr) {
+        const chatId = Number(chatIdStr);
+        if (!isNaN(chatId))
+            ids.add(chatId);
+    }
+    // Read chatIds from cron jobs persistence file
+    try {
+        const cwd = process.env.CWD ?? process.cwd();
+        const cronFile = join(cwd, ".cc-tg", "crons.json");
+        const raw = readFileSync(cronFile, "utf-8");
+        const jobs = JSON.parse(raw);
+        for (const job of jobs) {
+            if (typeof job.chatId === "number")
+                ids.add(job.chatId);
+        }
+    }
+    catch {
+        // file doesn't exist or parse error — ignore
+    }
+    return Array.from(ids);
+}
 /**
  * Write a coordinator plan for a job, so cc-tg knows what follow-up to spawn.
  * Call this when spawning a job that has a planned follow-up.
@@ -281,11 +316,15 @@ export async function handleJobEvent(message, deps) {
         log("warn", "Failed to read coordinator plan:", err.message);
     }
     let decision;
+    let rawResponse = "";
     try {
-        const rawResponse = await deps.askClaude(buildDecisionPrompt(event, last40lines, coordinatorPlan));
+        rawResponse = await deps.askClaude(buildDecisionPrompt(event, last40lines, coordinatorPlan));
         decision = parseDecision(rawResponse);
     }
     catch (err) {
+        if (rawResponse) {
+            log("error", "[cc-agent-events] Claude raw response:", rawResponse.slice(0, 200));
+        }
         log("error", "Claude decision failed, falling back to NOTIFY_ONLY:", err.message);
         const fallbackMsg = event.status === "failed"
             ? formatFailureMessage(event)
@@ -293,16 +332,24 @@ export async function handleJobEvent(message, deps) {
         decision = { action: "NOTIFY_ONLY", message: fallbackMsg };
     }
     log("info", `Decision: ${decision.action} for job ${event.jobId}`);
-    const chatId = getChatId();
+    let chatIds = [];
+    try {
+        chatIds = await deps.getActiveChatIds();
+    }
+    catch (err) {
+        log("warn", "Failed to get active chat IDs:", err.message);
+    }
     try {
         if (decision.action === "NOTIFY_ONLY") {
-            if (!chatId) {
-                log("warn", "NOTIFY_ONLY: CC_AGENT_NOTIFY_CHAT_ID not set, skipping notification");
+            if (chatIds.length === 0) {
+                log("warn", "NOTIFY_ONLY: no active chat IDs, skipping notification");
                 return;
             }
             const msg = decision.message
                 ?? (event.status === "failed" ? formatFailureMessage(event) : `Job completed: ${event.title}`);
-            await deps.sendTelegramMessage(chatId, msg);
+            for (const chatId of chatIds) {
+                await deps.sendTelegramMessage(chatId, msg);
+            }
         }
         else if (decision.action === "SPAWN_FOLLOWUP") {
             if (!decision.followup) {
@@ -311,14 +358,16 @@ export async function handleJobEvent(message, deps) {
             }
             await deps.spawnFollowupAgent(decision.followup.repo_url, decision.followup.task);
             // Send Telegram notification about the spawn
-            if (chatId) {
+            if (chatIds.length > 0) {
                 let runningCount = 0;
                 try {
                     runningCount = await deps.getRunningJobCount();
                 }
                 catch { }
                 const spawnMsg = formatSpawnMessage(event, decision.followup, runningCount);
-                await deps.sendTelegramMessage(chatId, spawnMsg);
+                for (const chatId of chatIds) {
+                    await deps.sendTelegramMessage(chatId, spawnMsg);
+                }
             }
         }
         else {
@@ -338,6 +387,7 @@ function makeDefaultDeps() {
         readJobOutput: defaultReadJobOutput,
         readCoordinatorPlan: defaultReadCoordinatorPlan,
         getRunningJobCount: defaultGetRunningJobCount,
+        getActiveChatIds: defaultGetActiveChatIds,
     };
 }
 let subscriberClient = null;

package/package.json

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