@emqo/claudebridge 0.6.2 → 0.7.0

package/dist/adapters/discord.js

@@ -240,13 +240,21 @@ export class DiscordAdapter {
             await channel.send(t(this.locale, "auto_starting", { id: task.id, desc: task.description }));
             console.log(`[discord] auto-task #${task.id} for ${task.user_id}`);
             const res = this.maxParallel > 1
-                ? await this.engine.runParallel(task.user_id, task.description, "discord", task.chat_id)
-                : await this.engine.runStream(task.user_id, task.description, "discord", task.chat_id);
+                ? await this.engine.runParallel(task.user_id, task.description, "discord", task.chat_id, undefined, 0)
+                : await this.engine.runStream(task.user_id, task.description, "discord", task.chat_id, undefined, 0);
             if (res.timedOut) {
                 this.store.markTaskResult(task.id, "failed");
                 if (res.text)
                     this.store.setTaskResult(task.id, res.text.slice(0, 10000));
                 await channel.send(t(this.locale, "auto_failed", { id: task.id, err: "timed out" }));
+                const retryMatch = task.description.match(/\[retry (\d+)\/3\]/);
+                const retryCount = retryMatch ? parseInt(retryMatch[1]) : 0;
+                if (retryCount < 3) {
+                    const retryDesc = retryCount === 0
+                        ? `[retry 1/3] Previous attempt of task #${task.id} timed out. Continue from where it left off: ${task.description}`
+                        : task.description.replace(`[retry ${retryCount}/3]`, `[retry ${retryCount + 1}/3]`);
+                    this.store.addTask(task.user_id, "discord", task.chat_id, retryDesc, undefined, true, task.parent_id || task.id, Date.now() + 120000);
+                }
                 return;
             }
             this.store.markTaskResult(task.id, "done");
@@ -267,6 +275,15 @@ export class DiscordAdapter {
         catch (err) {
             this.store.markTaskResult(task.id, "failed");
             console.error(`[discord] auto-task #${task.id} failed:`, err);
+            // Self-healing: auto-retry failed tasks (max 3 retries)
+            const retryMatch = task.description.match(/\[retry (\d+)\/3\]/);
+            const retryCount = retryMatch ? parseInt(retryMatch[1]) : 0;
+            if (retryCount < 3) {
+                const retryDesc = retryCount === 0
+                    ? `[retry 1/3] Previous attempt of task #${task.id} failed (${(err.message || "unknown").slice(0, 100)}). Analyze the failure, fix the issue, then: ${task.description}`
+                    : task.description.replace(`[retry ${retryCount}/3]`, `[retry ${retryCount + 1}/3]`);
+                this.store.addTask(task.user_id, "discord", task.chat_id, retryDesc, undefined, true, task.parent_id || task.id, Date.now() + 120000);
+            }
             try {
                 const ch = await this.client.channels.fetch(task.chat_id);
                 if (ch?.isTextBased() && "send" in ch) {

package/dist/adapters/telegram.js

@@ -394,13 +394,23 @@ export class TelegramAdapter {
         try {
             console.log(`[telegram] auto-task #${task.id} for ${task.user_id}`);
             const res = this.maxParallel > 1
-                ? await this.engine.runParallel(task.user_id, task.description, "telegram", task.chat_id)
-                : await this.engine.runStream(task.user_id, task.description, "telegram", task.chat_id);
+                ? await this.engine.runParallel(task.user_id, task.description, "telegram", task.chat_id, undefined, 0)
+                : await this.engine.runStream(task.user_id, task.description, "telegram", task.chat_id, undefined, 0);
             if (res.timedOut) {
                 this.store.markTaskResult(task.id, "failed");
                 if (res.text)
                     this.store.setTaskResult(task.id, res.text.slice(0, 10000));
                 await this.reply(chatId, t(this.locale, "auto_failed", { id: task.id, err: "timed out" }));
+                // Self-healing: auto-retry timed out tasks
+                const retryMatch = task.description.match(/\[retry (\d+)\/3\]/);
+                const retryCount = retryMatch ? parseInt(retryMatch[1]) : 0;
+                if (retryCount < 3) {
+                    const retryDesc = retryCount === 0
+                        ? `[retry 1/3] Previous attempt of task #${task.id} timed out. Continue from where it left off: ${task.description}`
+                        : task.description.replace(`[retry ${retryCount}/3]`, `[retry ${retryCount + 1}/3]`);
+                    const retryId = this.store.addTask(task.user_id, "telegram", task.chat_id, retryDesc, undefined, true, task.parent_id || task.id, Date.now() + 120000);
+                    await this.reply(chatId, t(this.locale, "auto_retry", { id: retryId, attempt: retryCount + 1, parent: task.id }));
+                }
                 return;
             }
             this.store.markTaskResult(task.id, "done");
@@ -428,6 +438,16 @@ export class TelegramAdapter {
         catch (err) {
             this.store.markTaskResult(task.id, "failed");
             await this.reply(chatId, t(this.locale, "auto_failed", { id: task.id, err: err.message || "unknown" }));
+            // Self-healing: auto-retry failed tasks (max 3 retries)
+            const retryMatch = task.description.match(/\[retry (\d+)\/3\]/);
+            const retryCount = retryMatch ? parseInt(retryMatch[1]) : 0;
+            if (retryCount < 3) {
+                const retryDesc = retryCount === 0
+                    ? `[retry 1/3] Previous attempt of task #${task.id} failed (${(err.message || "unknown").slice(0, 100)}). Analyze the failure, fix the issue, then: ${task.description}`
+                    : task.description.replace(`[retry ${retryCount}/3]`, `[retry ${retryCount + 1}/3]`);
+                const retryId = this.store.addTask(task.user_id, "telegram", task.chat_id, retryDesc, undefined, true, task.parent_id || task.id, Date.now() + 120000);
+                await this.reply(chatId, t(this.locale, "auto_retry", { id: retryId, attempt: retryCount + 1, parent: task.id }));
+            }
         }
     }
     async checkApprovals() {

package/dist/core/agent.d.ts

@@ -26,8 +26,8 @@ export declare class AgentEngine {
     getMaxParallel(): number;
     getWorkDir(userId: string): string;
     isLocked(userId: string): boolean;
-    runStream(userId: string, prompt: string, platform: string, chatId: string, onChunk?: StreamCallback): Promise<AgentResponse>;
-    runParallel(userId: string, prompt: string, platform: string, chatId: string, onChunk?: StreamCallback): Promise<AgentResponse>;
+    runStream(userId: string, prompt: string, platform: string, chatId: string, onChunk?: StreamCallback, overrideTimeoutMs?: number): Promise<AgentResponse>;
+    runParallel(userId: string, prompt: string, platform: string, chatId: string, onChunk?: StreamCallback, overrideTimeoutMs?: number): Promise<AgentResponse>;
     private _executeWithRetry;
     private _execute;
     private _executeNoSession;

package/dist/core/agent.js

@@ -46,13 +46,13 @@ export class AgentEngine {
     isLocked(userId) {
         return this.lock.isLocked(userId);
     }
-    async runStream(userId, prompt, platform, chatId, onChunk) {
+    async runStream(userId, prompt, platform, chatId, onChunk, overrideTimeoutMs) {
         const release = await this.lock.acquire(userId);
         try {
             this.store.addHistory(userId, platform, "user", prompt);
             const memories = this.config.agent.memory?.enabled ? this.store.getMemories(userId) : [];
             const memoryPrompt = memories.length ? memories.map(m => `- ${m.content}`).join("\n") : "";
-            const res = await this._executeWithRetry(userId, prompt, platform, chatId, onChunk, memoryPrompt);
+            const res = await this._executeWithRetry(userId, prompt, platform, chatId, onChunk, memoryPrompt, overrideTimeoutMs);
             this.store.addHistory(userId, platform, "assistant", res.text);
             this.store.recordUsage(userId, platform, res.cost || 0);
             if (this.config.agent.memory?.auto_summary)
@@ -63,7 +63,7 @@ export class AgentEngine {
             release();
         }
     }
-    async runParallel(userId, prompt, platform, chatId, onChunk) {
+    async runParallel(userId, prompt, platform, chatId, onChunk, overrideTimeoutMs) {
         // No per-user lock — parallel tasks are independent
         // No session resume — fresh session to prevent conflicts
         const memories = this.config.agent.memory?.enabled ? this.store.getMemories(userId) : [];
@@ -75,7 +75,7 @@ export class AgentEngine {
                 ? this.rotator.next()
                 : { name: "cli-default", api_key: "", base_url: "", model: "" };
             try {
-                const res = await this._executeNoSession(userId, prompt, platform, chatId, ep, onChunk, memoryPrompt);
+                const res = await this._executeNoSession(userId, prompt, platform, chatId, ep, onChunk, memoryPrompt, overrideTimeoutMs);
                 this.store.recordUsage(userId, platform, res.cost || 0);
                 return res;
             }
@@ -92,7 +92,7 @@ export class AgentEngine {
         }
         throw lastErr;
     }
-    async _executeWithRetry(userId, prompt, platform, chatId, onChunk, memoryPrompt) {
+    async _executeWithRetry(userId, prompt, platform, chatId, onChunk, memoryPrompt, overrideTimeoutMs) {
         const maxRetries = Math.max(Math.min(this.rotator.count, 3), 1);
         let lastErr;
         for (let i = 0; i < maxRetries; i++) {
@@ -100,7 +100,7 @@ export class AgentEngine {
                 ? this.rotator.next()
                 : { name: "cli-default", api_key: "", base_url: "", model: "" };
             try {
-                return await this._execute(userId, prompt, platform, chatId, ep, onChunk, memoryPrompt);
+                return await this._execute(userId, prompt, platform, chatId, ep, onChunk, memoryPrompt, overrideTimeoutMs);
             }
             catch (err) {
                 lastErr = err;
@@ -115,7 +115,7 @@ export class AgentEngine {
         }
         throw lastErr;
     }
-    _execute(userId, prompt, platform, chatId, ep, onChunk, memoryPrompt) {
+    _execute(userId, prompt, platform, chatId, ep, onChunk, memoryPrompt, overrideTimeoutMs) {
         return new Promise((resolve, reject) => {
             const sessionId = this.store.getSession(userId) || "";
             const cwd = this.getWorkDir(userId);
@@ -150,11 +150,11 @@ export class AgentEngine {
             const child = spawn("claude", args, { cwd, env, stdio: ["pipe", "pipe", "pipe"] });
             child.stdin.end();
             console.log(`[agent] spawned claude pid=${child.pid} cwd=${cwd} args=${args.join(" ")}`);
-            const timeoutMs = (this.config.agent.timeout_seconds || 600) * 1000;
-            const timer = setTimeout(() => { try {
+            const timeoutMs = overrideTimeoutMs !== undefined ? overrideTimeoutMs : (this.config.agent.timeout_seconds || 600) * 1000;
+            const timer = timeoutMs > 0 ? setTimeout(() => { try {
                 child.kill("SIGTERM");
             }
-            catch { } }, timeoutMs);
+            catch { } }, timeoutMs) : null;
             let fullText = "";
             let newSessionId = sessionId;
             let cost = 0;
@@ -202,7 +202,8 @@ export class AgentEngine {
                 console.log(`[agent] stderr: ${s.slice(0, 200)}`);
             });
             child.on("close", (code, signal) => {
-                clearTimeout(timer);
+                if (timer)
+                    clearTimeout(timer);
                 console.log(`[agent] claude exited code=${code} signal=${signal} fullText=${fullText.length}chars stderr=${stderr.slice(0, 200)}`);
                 if (signal === "SIGTERM") {
                     console.warn(`[agent] claude timed out after ${timeoutMs / 1000}s`);
@@ -225,7 +226,7 @@ export class AgentEngine {
             child.on("error", reject);
         });
     }
-    _executeNoSession(userId, prompt, platform, chatId, ep, onChunk, memoryPrompt) {
+    _executeNoSession(userId, prompt, platform, chatId, ep, onChunk, memoryPrompt, overrideTimeoutMs) {
         return new Promise((resolve, reject) => {
             const cwd = this.getWorkDir(userId);
             const args = ["-p", prompt, "--verbose", "--output-format", "stream-json", "--permission-mode", this.config.agent.permission_mode || "acceptEdits"];
@@ -257,11 +258,11 @@ export class AgentEngine {
             const child = spawn("claude", args, { cwd, env, stdio: ["pipe", "pipe", "pipe"] });
             child.stdin.end();
             console.log(`[agent] spawned claude (parallel) pid=${child.pid} cwd=${cwd}`);
-            const timeoutMs = (this.config.agent.timeout_seconds || 600) * 1000;
-            const timer = setTimeout(() => { try {
+            const timeoutMs = overrideTimeoutMs !== undefined ? overrideTimeoutMs : (this.config.agent.timeout_seconds || 600) * 1000;
+            const timer = timeoutMs > 0 ? setTimeout(() => { try {
                 child.kill("SIGTERM");
             }
-            catch { } }, timeoutMs);
+            catch { } }, timeoutMs) : null;
             let fullText = "";
             let sessionId = "";
             let cost = 0;
@@ -300,7 +301,8 @@ export class AgentEngine {
             let stderr = "";
             child.stderr.on("data", (data) => { stderr += data.toString(); });
             child.on("close", (code, signal) => {
-                clearTimeout(timer);
+                if (timer)
+                    clearTimeout(timer);
                 console.log(`[agent] claude (parallel) exited code=${code} signal=${signal} text=${fullText.length}chars`);
                 if (signal === "SIGTERM") {
                     console.warn(`[agent] claude (parallel) timed out after ${timeoutMs / 1000}s`);

package/dist/core/i18n.js

@@ -14,6 +14,7 @@ const messages = {
         auto_scheduled: "Auto task #{id} scheduled (executes in {minutes} min):\n{desc}",
         auto_done: "Auto task #{id} done (cost: ${cost}):",
         auto_failed: "Auto task #{id} failed: {err}",
+        auto_retry: "Self-healing: auto task #{parent} failed, retry #{attempt}/3 queued as task #{id} (in 2min)",
         page_expired: "Page expired. Please resend your question.",
         approval_request: "Approval needed for auto task #{id}:\n{desc}",
         approval_approved: "Auto task #{id} approved -- queued for execution.",
@@ -38,6 +39,7 @@ const messages = {
         auto_scheduled: "自动任务 #{id} 已排程（{minutes} 分钟后执行）：\n{desc}",
         auto_done: "自动任务 #{id} 完成（花费：${cost}）：",
         auto_failed: "自动任务 #{id} 失败：{err}",
+        auto_retry: "自愈机制：自动任务 #{parent} 失败，重试 #{attempt}/3 已排队为任务 #{id}（2分钟后执行）",
         page_expired: "页面已过期，请重新发送问题。",
         approval_request: "自动任务 #{id} 需要审批：\n{desc}",
         approval_approved: "自动任务 #{id} 已批准 -- 已加入执行队列。",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emqo/claudebridge",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "description": "Bridge claude CLI to chat platforms (Telegram, Discord) with scheduled auto-tasks, autonomous project management, HITL approval, conditional branching, webhook triggers, parallel execution, and observability",
   "main": "dist/index.js",
   "bin": {