@gonzih/cc-tg 0.2.18 → 0.2.20

package/dist/bot.d.ts

@@ -38,10 +38,12 @@ export declare class CcTgBot {
     /** Kill cc-agent PIDs with SIGTERM. Returns the list of killed PIDs. */
     private killCcAgent;
     private handleReloadMcp;
+    private handleMcpStatus;
     private handleMcpVersion;
     private handleClearNpxCache;
     private handleRestart;
     private handleGetFile;
+    private callCcAgentTool;
     private killSession;
     stop(): void;
 }

package/dist/bot.js

@@ -6,7 +6,7 @@ import TelegramBot from "node-telegram-bot-api";
 import { existsSync, createWriteStream, mkdirSync, statSync, readdirSync, readFileSync, writeFileSync } from "fs";
 import { resolve, basename, join } from "path";
 import os from "os";
-import { execSync } from "child_process";
+import { execSync, spawn } from "child_process";
 import https from "https";
 import http from "http";
 import { ClaudeProcess, extractText } from "./claude.js";
@@ -20,6 +20,7 @@ const BOT_COMMANDS = [
     { command: "help", description: "Show all available commands" },
     { command: "cron", description: "Manage cron jobs — add/list/edit/remove/clear" },
     { command: "reload_mcp", description: "Restart the cc-agent MCP server process" },
+    { command: "mcp_status", description: "Check MCP server connection status" },
     { command: "mcp_version", description: "Show cc-agent npm version and npx cache info" },
     { command: "clear_npx_cache", description: "Clear npx cache and restart MCP to pick up latest version" },
     { command: "restart", description: "Restart the bot process in-place" },
@@ -65,6 +66,28 @@ function formatCronCostFooter(usage) {
     const cost = computeCostUsd(usage);
     return `\n💰 Cron cost: $${cost.toFixed(4)} (${formatTokens(usage.inputTokens)} in / ${formatTokens(usage.outputTokens)} out tokens)`;
 }
+function formatAgentCostSummary(text) {
+    try {
+        const data = JSON.parse(text);
+        const totalCost = (data.total_cost_usd ?? data.total_cost ?? 0);
+        const totalJobs = (data.total_jobs ?? data.job_count ?? 0);
+        const byRepo = (data.by_repo ?? []);
+        const lines = [
+            "🤖 Agent jobs (all time)",
+            `Total: $${totalCost.toFixed(2)} across ${totalJobs} jobs`,
+        ];
+        for (const entry of byRepo) {
+            const repo = (entry.repo ?? entry.repository ?? "unknown");
+            const cost = (entry.cost_usd ?? entry.cost ?? 0);
+            const jobs = (entry.job_count ?? entry.jobs ?? 0);
+            lines.push(`  ${repo}: $${cost.toFixed(2)} (${jobs} jobs)`);
+        }
+        return lines.join("\n");
+    }
+    catch {
+        return `🤖 Agent jobs (all time)\n${text}`;
+    }
+}
 class CostStore {
     costs = new Map();
     storePath;
@@ -214,6 +237,11 @@ export class CcTgBot {
             await this.handleReloadMcp(chatId);
             return;
         }
+        // /mcp_status — run `claude mcp list` and show connection status
+        if (text === "/mcp_status") {
+            await this.handleMcpStatus(chatId);
+            return;
+        }
         // /mcp_version — show published npm version and cached npx entries
         if (text === "/mcp_version") {
             await this.handleMcpVersion(chatId);
@@ -237,7 +265,17 @@ export class CcTgBot {
         // /cost — show session token usage and cost
         if (text === "/cost") {
             const cost = this.costStore.get(chatId);
-            await this.bot.sendMessage(chatId, formatCostReport(cost));
+            let reply = formatCostReport(cost);
+            try {
+                const rawSummary = await this.callCcAgentTool("cost_summary");
+                if (rawSummary) {
+                    reply += "\n\n" + formatAgentCostSummary(rawSummary);
+                }
+            }
+            catch (err) {
+                console.error("[cost] cc-agent cost_summary failed:", err.message);
+            }
+            await this.bot.sendMessage(chatId, reply);
             return;
         }
         const session = this.getOrCreateSession(chatId);
@@ -809,12 +847,30 @@ export class CcTgBot {
         return pids;
     }
     async handleReloadMcp(chatId) {
+        await this.bot.sendMessage(chatId, "Clearing npx cache and reloading MCP...");
+        try {
+            const home = process.env.HOME ?? "~";
+            execSync(`rm -rf "${home}/.npm/_npx/"`, { encoding: "utf8", shell: "/bin/sh" });
+            console.log("[mcp] cleared ~/.npm/_npx/");
+        }
+        catch (err) {
+            await this.bot.sendMessage(chatId, `Warning: failed to clear npx cache: ${err.message}`);
+        }
         const pids = this.killCcAgent();
         if (pids.length === 0) {
-            await this.bot.sendMessage(chatId, "No cc-agent process found. MCP will start fresh on the next agent call.");
+            await this.bot.sendMessage(chatId, "NPX cache cleared. No cc-agent process found — MCP will start fresh on the next agent call.");
             return;
         }
-        await this.bot.sendMessage(chatId, `Sent SIGTERM to cc-agent (pid${pids.length > 1 ? "s" : ""}: ${pids.join(", ")}).\nMCP restarted. New process will load on next agent call.`);
+        await this.bot.sendMessage(chatId, `NPX cache cleared. Sent SIGTERM to cc-agent (pid${pids.length > 1 ? "s" : ""}: ${pids.join(", ")}).\nMCP restarted. New process will load on next agent call.`);
+    }
+    async handleMcpStatus(chatId) {
+        try {
+            const output = execSync("claude mcp list", { encoding: "utf8", shell: "/bin/sh" }).trim();
+            await this.bot.sendMessage(chatId, `MCP server status:\n\n${output || "(no output)"}`);
+        }
+        catch (err) {
+            await this.bot.sendMessage(chatId, `Failed to run claude mcp list: ${err.message}`);
+        }
     }
     async handleMcpVersion(chatId) {
         let npmVersion = "unknown";
@@ -890,6 +946,77 @@ export class CcTgBot {
         }
         await this.bot.sendDocument(chatId, filePath);
     }
+    callCcAgentTool(toolName, args = {}) {
+        return new Promise((resolve) => {
+            let settled = false;
+            const done = (val) => {
+                if (!settled) {
+                    settled = true;
+                    resolve(val);
+                }
+            };
+            let proc;
+            try {
+                proc = spawn("npx", ["-y", "@gonzih/cc-agent@latest"], {
+                    env: { ...process.env },
+                    stdio: ["pipe", "pipe", "pipe"],
+                });
+            }
+            catch (err) {
+                console.error("[mcp] failed to spawn cc-agent:", err.message);
+                done(null);
+                return;
+            }
+            const timeout = setTimeout(() => {
+                console.warn("[mcp] cc-agent tool call timed out");
+                proc.kill();
+                done(null);
+            }, 30_000);
+            let buffer = "";
+            const sendMsg = (msg) => { proc.stdin.write(JSON.stringify(msg) + "\n"); };
+            sendMsg({
+                jsonrpc: "2.0", id: 1, method: "initialize",
+                params: { protocolVersion: "2024-11-05", capabilities: {}, clientInfo: { name: "cc-tg", version: "1.0.0" } },
+            });
+            proc.stdout.on("data", (chunk) => {
+                buffer += chunk.toString();
+                const lines = buffer.split("\n");
+                buffer = lines.pop() ?? "";
+                for (const line of lines) {
+                    if (!line.trim())
+                        continue;
+                    try {
+                        const msg = JSON.parse(line);
+                        if (msg.id === 1 && "result" in msg) {
+                            sendMsg({ jsonrpc: "2.0", method: "notifications/initialized" });
+                            sendMsg({ jsonrpc: "2.0", id: 2, method: "tools/call", params: { name: toolName, arguments: args } });
+                        }
+                        else if (msg.id === 2) {
+                            clearTimeout(timeout);
+                            if (msg.error) {
+                                console.error("[mcp] cost_summary error:", JSON.stringify(msg.error));
+                                proc.kill();
+                                done(null);
+                                return;
+                            }
+                            const result = msg.result;
+                            const content = result?.content;
+                            const text = (content ?? []).filter((b) => b.type === "text").map((b) => b.text).join("");
+                            proc.kill();
+                            done(text || null);
+                        }
+                    }
+                    catch { /* ignore non-JSON lines */ }
+                }
+            });
+            proc.on("error", (err) => {
+                console.error("[mcp] cc-agent spawn error:", err.message);
+                clearTimeout(timeout);
+                done(null);
+            });
+            proc.on("exit", () => { clearTimeout(timeout); done(null); });
+        });
+    }
     killSession(chatId, keepCrons = true) {
         const session = this.sessions.get(chatId);
         if (session) {

package/package.json

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