claude-telegram-bot 0.3.19 → 0.3.23

package/bot.mjs

@@ -149,6 +149,8 @@ const STR = {
     compactOk: "🗜️ Context compacted. The conversation continues with a summary.",
     compactFail: (m) => `⚠️ Compact failed: ${m}`,
     compactNoSession: "No active session to compact. Just send a message to start one.",
+    testFallbackDisabled: "⚠️ Ollama fallback is not enabled. Set `\"ollamaFallback\": true` in config.json.",
+    testFallbackFail: (m) => `⚠️ Ollama test failed: ${m}`,
     busy: "⏳ A previous task is still running. Please try again when it finishes.",
     queued: (n) => `⏳ Queued (#${n}). Will run when the current task finishes.`,
     stopOk: "🛑 Task stopped.",
@@ -287,6 +289,8 @@ const STR = {
     compactFail: (m) => `⚠️ compact 실패: ${m}`,
     compactNoSession: "압축할 활성 세션이 없습니다. 메시지를 보내 세션을 시작하세요.",
     contextTooLong: "⚠️ 프롬프트가 너무 깁니다. `/compact` 로 컨텍스트를 압축하거나 `/new` 로 새 세션을 시작하세요.",
+    testFallbackDisabled: "⚠️ Ollama 폴백이 비활성화 상태입니다. config.json에 `\"ollamaFallback\": true` 를 추가하세요.",
+    testFallbackFail: (m) => `⚠️ Ollama 테스트 실패: ${m}`,
   },
 };
 const t = (l, key, ...a) => {
@@ -536,6 +540,14 @@ function parseResetTime(raw) {
   return null;
 }
 
+function isFallbackError(raw, code) {
+  const t = (raw || "").toLowerCase();
+  return t.includes("credit") || t.includes("balance") || t.includes("billing") || t.includes("payment")
+    || t.includes("rate_limit") || t.includes("rate limit") || t.includes("too many requests") || code === 429
+    || t.includes("usage limit") || t.includes("monthly limit")
+    || t.includes("overloaded") || code === 529;
+}
+
 function classifyClaudeError(raw, code) {
   const t = raw.toLowerCase();
   if (t.includes("credit") || t.includes("balance") || t.includes("billing") || t.includes("payment"))
@@ -603,15 +615,34 @@ function runClaude(prompt, sessionId, opts = {}) {
         const rawErr = j.result ?? "";
         const text = j.is_error ? classifyClaudeError(rawErr, code) : (rawErr || "(empty response)");
         const resetAt = j.is_error ? parseResetTime(rawErr) : null;
-        resolve({ ok: !j.is_error, text, sessionId: j.session_id, cost: j.total_cost_usd, resetAt });
+        const canFallback = j.is_error && isFallbackError(rawErr, code);
+        resolve({ ok: !j.is_error, text, sessionId: j.session_id, cost: j.total_cost_usd, resetAt, canFallback });
       } catch {
         const raw = (err || out || "no output").slice(0, 3500);
-        resolve({ ok: false, text: classifyClaudeError(raw, code), resetAt: parseResetTime(raw) });
+        resolve({ ok: false, text: classifyClaudeError(raw, code), resetAt: parseResetTime(raw), canFallback: isFallbackError(raw, code) });
       }
     });
   });
 }
 
+// ── Ollama 폴백 실행 ──────────────────────────────────────────────────────
+async function runOllama(prompt, lang = "en") {
+  const header = lang === "ko"
+    ? "🌙 Claude가 잠시 쉬고 있어요. 제가 대신 도와드릴게요. (세션은 이어지지 않아요)\n\n"
+    : "🌙 Claude is resting right now. I'll help in the meantime. (Session won't continue)\n\n";
+  const model = cfg.ollamaModel || "phi3:mini";
+  const r = await fetch("http://localhost:11434/api/generate", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ model, prompt, stream: false }),
+    signal: AbortSignal.timeout(60_000),
+  });
+  if (!r.ok) return { ok: false, text: `Ollama HTTP ${r.status}` };
+  const j = await r.json();
+  const text = (j.response || "").trim();
+  return text ? { ok: true, text: header + text } : { ok: false, text: "no response" };
+}
+
 // ── 크론 스케줄러 ─────────────────────────────────────────────────────────
 // 표준 cron 5필드 "분 시 일 월 요일"을 의존성 0 유지를 위해 최소 파서로 직접 구현.
 // 지원: * · 목록(1,3,5) · 범위(1-5) · 스텝(*/15, 9-17/2). 요일 0·7 = 일요일.
@@ -846,6 +877,44 @@ async function downloadAttachment(att) {
   return { dest, name };
 }
 
+// ── 텔레그램 메시지 메타데이터 추출 ──────────────────────────────────────
+function buildMsgMeta(msg) {
+  const parts = [];
+
+  // 포워드 출처 (신규 API: forward_origin, 구버전 폴백: forward_from / forward_from_chat)
+  const fo = msg.forward_origin;
+  if (fo) {
+    if (fo.type === "user" && fo.sender_user)
+      parts.push(`[Forwarded from: ${fo.sender_user.first_name}${fo.sender_user.username ? ` (@${fo.sender_user.username})` : ""}]`);
+    else if (fo.type === "channel" && fo.chat)
+      parts.push(`[Forwarded from channel: ${fo.chat.title}${fo.chat.username ? ` (@${fo.chat.username})` : ""}]`);
+    else if (fo.type === "chat" && fo.sender_chat)
+      parts.push(`[Forwarded from: ${fo.sender_chat.title}]`);
+    else if (fo.type === "hidden_user" && fo.sender_user_name)
+      parts.push(`[Forwarded from: ${fo.sender_user_name} (hidden)]`);
+    else
+      parts.push(`[Forwarded message]`);
+  } else if (msg.forward_from) {
+    const u = msg.forward_from;
+    parts.push(`[Forwarded from: ${u.first_name}${u.username ? ` (@${u.username})` : ""}]`);
+  } else if (msg.forward_from_chat) {
+    const c = msg.forward_from_chat;
+    parts.push(`[Forwarded from: ${c.title}${c.username ? ` (@${c.username})` : ""}]`);
+  }
+
+  // 리플라이 컨텍스트
+  const reply = msg.reply_to_message;
+  if (reply) {
+    const replyText = (reply.text || reply.caption || "").trim().slice(0, 300);
+    const replyFrom = reply.from?.first_name || "unknown";
+    parts.push(replyText
+      ? `[Replying to ${replyFrom}: "${replyText}${replyText.length >= 300 ? "…" : ""}"]`
+      : `[Replying to ${replyFrom}'s message]`);
+  }
+
+  return parts.join("\n");
+}
+
 // ── 메시지 처리 ───────────────────────────────────────────────────────────
 let busy = false;
 const msgQueue = []; // { msg, receivedAt } — busy 중 수신 메시지 대기열
@@ -958,6 +1027,18 @@ async function handle(msg) {
     }
     return;
   }
+  if (text === "/testfallback") {
+    if (!cfg.ollamaFallback) { await send(chatId, t(l, "testFallbackDisabled")); return; }
+    await send(chatId, "🧪 Ollama 연결 테스트 중…");
+    try {
+      const res = await runOllama("Reply with exactly one sentence: Ollama fallback is working.", l);
+      if (res.ok) await send(chatId, res.text);
+      else await send(chatId, t(l, "testFallbackFail", res.text));
+    } catch (e) {
+      await send(chatId, t(l, "testFallbackFail", e.message));
+    }
+    return;
+  }
   if (text === "/new") {
     state.sessionId = undefined;
     saveState(state);
@@ -1069,6 +1150,8 @@ async function handle(msg) {
         await send(chatId, t(l, "attachFail", e.message));
       }
     }
+    const meta = buildMsgMeta(msg);
+    if (meta) prompt = prompt ? `${meta}\n\n${prompt}` : meta;
     prevSessionId = state.sessionId; // /stop --reset 복원 대상 저장
     const res = await runClaude(prompt, state.sessionId, { modelHint: true, trackChild: true, injectMemory: true });
     if (res.sessionId) {
@@ -1080,6 +1163,13 @@ async function handle(msg) {
       // 레이트 리밋이고 리셋 시간을 알면 /reserve 힌트 추가
       const hint = res.resetAt ? t(l, "reserveHint") : "";
       rateLimitState = res.resetAt ? { prompt, resetAt: res.resetAt } : null;
+      // Ollama 폴백: 레이트리밋·크레딧 에러이고 ollamaFallback 켜져 있으면 Ollama로 재시도
+      if (cfg.ollamaFallback && res.canFallback && !stopping) {
+        try {
+          const oRes = await runOllama(prompt, l);
+          if (oRes.ok) { await send(chatId, oRes.text); return; }
+        } catch {}
+      }
       const errMsg = res.text === "contextTooLong" ? t(l, "contextTooLong") : `⚠️ ${res.text}${hint}`;
       if (!stopping) await send(chatId, errMsg);
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-telegram-bot",
-  "version": "0.3.19",
+  "version": "0.3.23",
   "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": {