claude-telegram-bot 0.3.11 → 0.3.14

package/bot.mjs

@@ -794,6 +794,7 @@ async function downloadAttachment(att) {
 // ── 메시지 처리 ───────────────────────────────────────────────────────────
 let busy = false;
 const msgQueue = []; // { msg, receivedAt } — busy 중 수신 메시지 대기열
+const mediaGroups = new Map(); // media_group_id → { msgs, timer } — 미디어 그룹 수집 대기
 let currentChild = null;  // 실행 중인 claude child process (/stop 용)
 let currentTyping = null; // 타이핑 인터벌 (/stop 시 정리용)
 let prevSessionId;        // /stop --reset 복원 대상
@@ -804,8 +805,8 @@ async function handle(msg) {
   if (!chatId) return;
   const l = langOf(msg);
   const text = (msg.text || msg.caption || "").trim();
-  const attachment = pickAttachment(msg);
-  if (!text && !attachment) return;
+  const attachment = msg._mediaGroup ? null : pickAttachment(msg);
+  if (!text && !attachment && !msg._mediaGroup?.length) return;
 
   // 화이트리스트
   if (!cfg.allowedChatId) {
@@ -951,7 +952,18 @@ async function handle(msg) {
 
   try {
     let prompt = text;
-    if (attachment) {
+    if (msg._mediaGroup?.length) {
+      const notes = [];
+      for (const fileId of msg._mediaGroup) {
+        try {
+          const { dest, name } = await downloadAttachment({ fileId, name: null });
+          notes.push(`[Attachment] Absolute path: ${dest} (filename: ${name}). Open it with the Read tool if needed.`);
+        } catch (e) {
+          await send(chatId, t(l, "attachFail", e.message));
+        }
+      }
+      if (notes.length) prompt = text ? `${text}\n\n${notes.join("\n")}` : notes.join("\n");
+    } else if (attachment) {
       try {
         const { dest, name } = await downloadAttachment(attachment);
         const note = `[Attachment] Absolute path: ${dest} (filename: ${name}). Open it with the Read tool if needed.`;
@@ -996,6 +1008,28 @@ function drainQueue() {
   return { ...group[group.length - 1].msg, text: merged, caption: undefined };
 }
 
+// 미디어 그룹(여러 장 동시 전송) — 1초 대기 후 일괄 처리
+function mergeMediaGroup(msgs) {
+  const captions = msgs.map((m) => m.caption || "").filter(Boolean);
+  const fileIds = msgs
+    .filter((m) => m.photo?.length)
+    .map((m) => m.photo[m.photo.length - 1].file_id);
+  return { ...msgs[0], text: captions.join("\n"), caption: undefined, _mediaGroup: fileIds };
+}
+
+function dispatch(msg) {
+  const gid = msg.media_group_id;
+  if (!gid) { handle(msg).catch((e) => console.error("Handle error:", e.message)); return; }
+  if (!mediaGroups.has(gid)) mediaGroups.set(gid, { msgs: [], timer: null });
+  const g = mediaGroups.get(gid);
+  g.msgs.push(msg);
+  clearTimeout(g.timer);
+  g.timer = setTimeout(() => {
+    mediaGroups.delete(gid);
+    handle(mergeMediaGroup(g.msgs)).catch((e) => console.error("Handle error:", e.message));
+  }, 1000);
+}
+
 // ── 롱폴링 루프 ───────────────────────────────────────────────────────────
 async function main() {
   console.log("Bot started. Polling Telegram...");
@@ -1033,7 +1067,7 @@ async function main() {
       }
       for (const upd of res.result) {
         offset = upd.update_id + 1;
-        if (upd.message) handle(upd.message).catch((e) => console.error("Handle error:", e.message));
+        if (upd.message) dispatch(upd.message);
       }
     } catch (e) {
       console.error("Polling error:", e.message);

package/ctb.mjs

@@ -17,6 +17,11 @@ import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "
 import { basename, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { spawn } from "node:child_process";
+import dns from "node:dns";
+import net from "node:net";
+
+dns.setDefaultResultOrder("ipv4first");
+if (net.setDefaultAutoSelectFamily) net.setDefaultAutoSelectFamily(false);
 
 const HERE = dirname(fileURLToPath(import.meta.url));
 const args = process.argv.slice(2);
@@ -28,7 +33,7 @@ const VERSION = (() => {
   } catch {
     return "?";
   }
-})();
+})();;
 
 function runBot(botArgs) {
   const child = spawn(process.execPath, [join(HERE, "bot.mjs"), ...botArgs], {
@@ -56,7 +61,7 @@ function resolveConfig(arg) {
   return existsSync(join(process.cwd(), arg)) ? join(process.cwd(), arg) : join(HERE, arg);
 }
 
-function main() {
+async function main() {
   if (a === "-h" || a === "--help") {
     console.log(
       `ctb v${VERSION} — claude-telegram-bot short CLI\n\n` +
@@ -122,9 +127,20 @@ function main() {
     sessionId = JSON.parse(readFileSync(statePath, "utf8")).sessionId;
   } catch {}
 
-  const finalArgs = sessionId ? ["--resume", sessionId, ...claudeArgs] : claudeArgs;
-  if (sessionId) process.stderr.write(`Resuming session: ${sessionId}\n`);
+  if (sessionId) {
+    process.stderr.write(`Resuming session: ${sessionId}\n`);
+    // 텔레그램 이전 대화와 구분하기 위해 세션에 시작 마커 삽입
+    await new Promise((resolve) => {
+      const marker = spawn("claude", [
+        "--resume", sessionId, "-p", "---ctb:start---", "--output-format", "json",
+      ], { stdio: ["ignore", "ignore", "ignore"] });
+      marker.on("close", resolve);
+      marker.on("error", resolve);
+      setTimeout(() => { marker.kill(); resolve(); }, 15000);
+    });
+  }
 
+  const finalArgs = sessionId ? ["--resume", sessionId, ...claudeArgs] : claudeArgs;
   const child = spawn("claude", finalArgs, { stdio: "inherit" });
   child.on("close", async (code) => {
     cleanup();
@@ -135,8 +151,8 @@ function main() {
 
 async function summarizeSession(sid, lang) {
   const langInstruction = lang && lang.startsWith("ko")
-    ? "한국어로 짧은 구문(10단어 이내)으로 이 세션에서 한 작업을 요약해줘. 마크다운 없이 텍스트만. 중요한 작업이 없으면 정확히 이렇게만 답해: SKIP"
-    : "In one short phrase (10 words max), what was done this session? Plain text only. If nothing significant, reply: SKIP";
+    ? "---ctb:start--- 마커 이후에 이 터미널 세션에서 한 작업을 한국어로 짧은 구문(10단어 이내)으로 요약해줘. 마크다운 없이 텍스트만. 마커 이후 중요한 작업이 없으면 정확히 이렇게만 답해: SKIP"
+    : "After the ---ctb:start--- marker in this conversation, what was accomplished in this terminal session? One short phrase, 10 words max, plain text. If nothing significant after the marker, reply: SKIP";
   return new Promise((resolve) => {
     const child = spawn("claude", [
       "--resume", sid,
@@ -160,14 +176,22 @@ async function notifyTelegram(configPath, sessionId) {
   try {
     const cfg = JSON.parse(readFileSync(configPath, "utf8"));
     if (!cfg.token || !cfg.allowedChatId || cfg.ctbNotify === false) return;
-    const summary = await summarizeSession(sessionId, cfg.lang);
-    if (!summary) return;
-    await fetch(`https://api.telegram.org/bot${cfg.token}/sendMessage`, {
+    const lang = cfg.lang || process.env.LANG || "";
+    process.stderr.write("ctb: summarizing session...\n");
+    const summary = await summarizeSession(sessionId, lang);
+    if (!summary) { process.stderr.write("ctb: nothing to summarize (SKIP)\n"); return; }
+    process.stderr.write(`ctb: sending to Telegram — ${summary}\n`);
+    const label = lang.startsWith("ko") ? "[터미널]" : "[local]";
+    const r = await fetch(`https://api.telegram.org/bot${cfg.token}/sendMessage`, {
       method: "POST",
       headers: { "content-type": "application/json" },
-      body: JSON.stringify({ chat_id: cfg.allowedChatId, text: `💻 ${summary}` }),
+      body: JSON.stringify({ chat_id: cfg.allowedChatId, text: `💻 ${label} ${summary}` }),
     });
-  } catch {}
+    const json = await r.json();
+    if (!json.ok) process.stderr.write(`ctb: Telegram error — ${JSON.stringify(json)}\n`);
+  } catch (e) {
+    process.stderr.write(`ctb: notify error — ${e.message}\n`);
+  }
 }
 
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-telegram-bot",
-  "version": "0.3.11",
+  "version": "0.3.14",
   "description": "Drive Claude Code from Telegram — messages run headless `claude -p` in a project dir and replies come back to the chat. Zero dependencies.",
   "type": "module",
   "bin": {