@emqo/claudebridge 0.7.0 → 0.9.0

package/dist/ctl.js

@@ -16,6 +16,17 @@ function fail(msg) {
     console.error(msg);
     process.exit(1);
 }
+function extractFlag(parts, flag) {
+    // Search from end to avoid matching flag text inside description
+    for (let i = parts.length - 2; i >= 0; i--) {
+        if (parts[i] === flag) {
+            const val = parts[i + 1];
+            parts.splice(i, 2);
+            return val;
+        }
+    }
+    return null;
+}
 if (category === "memory") {
     if (action === "add") {
         const [userId, ...contentParts] = rest;
@@ -102,21 +113,10 @@ else if (category === "auto") {
         const [userId, platform, chatId, ...descParts] = rest;
         if (!userId || !platform || !chatId || !descParts.length)
             fail("Usage: auto add <user_id> <platform> <chat_id> <description> [--parent <id>]");
-        // Parse optional --parent flag
-        let parentId = null;
-        const parentIdx = descParts.indexOf("--parent");
-        if (parentIdx !== -1 && descParts[parentIdx + 1]) {
-            parentId = parseInt(descParts[parentIdx + 1]);
-            descParts.splice(parentIdx, 2);
-        }
-        // Parse optional --delay flag
-        let scheduledAt = null;
-        const delayIdx = descParts.indexOf("--delay");
-        if (delayIdx !== -1 && descParts[delayIdx + 1]) {
-            const delayMin = parseInt(descParts[delayIdx + 1]);
-            scheduledAt = Date.now() + delayMin * 60000;
-            descParts.splice(delayIdx, 2);
-        }
+        const parentRaw = extractFlag(descParts, "--parent");
+        const parentId = parentRaw ? parseInt(parentRaw) : null;
+        const delayRaw = extractFlag(descParts, "--delay");
+        const scheduledAt = delayRaw ? Date.now() + parseInt(delayRaw) * 60000 : null;
         const desc = descParts.join(" ");
         const r = db.prepare("INSERT INTO tasks (user_id, platform, chat_id, description, status, parent_id, scheduled_at, created_at) VALUES (?, ?, ?, ?, 'auto', ?, ?, ?)").run(userId, platform, chatId, desc, parentId, scheduledAt, Date.now());
         output({ ok: true, id: Number(r.lastInsertRowid), scheduled_at: scheduledAt, message: scheduledAt ? `Auto task scheduled (in ${Math.ceil((scheduledAt - Date.now()) / 60000)} min)` : "Auto task queued" });
@@ -125,20 +125,10 @@ else if (category === "auto") {
         const [userId, platform, chatId, ...descParts] = rest;
         if (!userId || !platform || !chatId || !descParts.length)
             fail("Usage: auto add-approval <user_id> <platform> <chat_id> <description> [--parent <id>] [--delay <minutes>]");
-        let parentId = null;
-        const parentIdx = descParts.indexOf("--parent");
-        if (parentIdx !== -1 && descParts[parentIdx + 1]) {
-            parentId = parseInt(descParts[parentIdx + 1]);
-            descParts.splice(parentIdx, 2);
-        }
-        // Parse optional --delay flag
-        let scheduledAt = null;
-        const delayIdx = descParts.indexOf("--delay");
-        if (delayIdx !== -1 && descParts[delayIdx + 1]) {
-            const delayMin = parseInt(descParts[delayIdx + 1]);
-            scheduledAt = Date.now() + delayMin * 60000;
-            descParts.splice(delayIdx, 2);
-        }
+        const parentRaw = extractFlag(descParts, "--parent");
+        const parentId = parentRaw ? parseInt(parentRaw) : null;
+        const delayRaw = extractFlag(descParts, "--delay");
+        const scheduledAt = delayRaw ? Date.now() + parseInt(delayRaw) * 60000 : null;
         const desc = descParts.join(" ");
         const r = db.prepare("INSERT INTO tasks (user_id, platform, chat_id, description, status, parent_id, scheduled_at, created_at) VALUES (?, ?, ?, ?, 'approval_pending', ?, ?, ?)").run(userId, platform, chatId, desc, parentId, scheduledAt, Date.now());
         output({ ok: true, id: Number(r.lastInsertRowid), scheduled_at: scheduledAt, message: scheduledAt ? `Auto task queued for approval (scheduled in ${Math.ceil((scheduledAt - Date.now()) / 60000)} min)` : "Auto task queued for approval" });
@@ -176,7 +166,19 @@ else if (category === "auto") {
         fail("Usage: auto <add|add-approval|result|list|cancel|clear> ...");
     }
 }
+else if (category === "session") {
+    if (action === "list") {
+        const [userId] = rest;
+        if (!userId)
+            fail("Usage: session list <user_id>");
+        const rows = db.prepare("SELECT id, user_id, platform, chat_id, claude_session_id, label, status, created_at, last_active_at, message_count, total_cost FROM sub_sessions WHERE user_id = ? ORDER BY last_active_at DESC").all(userId);
+        output({ ok: true, sessions: rows });
+    }
+    else {
+        fail("Usage: session <list> ...");
+    }
+}
 else {
-    fail("Usage: claudebridge-ctl <memory|task|reminder|auto> <action> [args...]");
+    fail("Usage: claudebridge-ctl <memory|task|reminder|auto|session> <action> [args...]");
 }
 db.close();

package/dist/index.js

@@ -8,10 +8,13 @@ import { AgentEngine } from "./core/agent.js";
 import { TelegramAdapter } from "./adapters/telegram.js";
 import { DiscordAdapter } from "./adapters/discord.js";
 import { WebhookServer } from "./webhook.js";
+import { log, setLogLevel } from "./core/logger.js";
 async function main() {
     const _cfgIdx = process.argv.indexOf("--config");
     const _cfgPath = _cfgIdx !== -1 ? process.argv[_cfgIdx + 1] : undefined;
     let config = loadConfig(_cfgPath);
+    if (config.log_level)
+        setLogLevel(config.log_level);
     // Derive DB path from config file directory (not CWD)
     const configDir = _cfgPath ? dirname(resolve(_cfgPath)) : process.cwd();
     const dbPath = join(configDir, "data", "claudebridge.db");
@@ -21,20 +24,20 @@ async function main() {
     let webhookServer = null;
     if (config.platforms.telegram.enabled) {
         if (!config.platforms.telegram.token) {
-            console.error("[fatal] TELEGRAM_BOT_TOKEN not set");
+            log.error("TELEGRAM_BOT_TOKEN not set");
             process.exit(1);
         }
         adapters.push(new TelegramAdapter(engine, store, config.platforms.telegram, config.locale));
     }
     if (config.platforms.discord.enabled) {
         if (!config.platforms.discord.token) {
-            console.error("[fatal] DISCORD_BOT_TOKEN not set");
+            log.error("DISCORD_BOT_TOKEN not set");
             process.exit(1);
         }
         adapters.push(new DiscordAdapter(engine, store, config.platforms.discord, config.locale));
     }
     if (!adapters.length) {
-        console.error("[fatal] no platform enabled");
+        log.error("no platform enabled");
         process.exit(1);
     }
     // Start webhook server if enabled
@@ -44,23 +47,38 @@ async function main() {
     }
     // --- Register signal handlers and hot-reload BEFORE starting adapters ---
     const shutdown = () => {
-        console.log("[claudebridge] shutting down...");
+        log.info("shutting down...");
         for (const a of adapters)
             a.stop();
         if (webhookServer)
             webhookServer.stop();
+        store.close();
         setTimeout(() => process.exit(0), 1000);
     };
     process.on("SIGINT", shutdown);
     process.on("SIGTERM", shutdown);
+    process.on("uncaughtException", (err) => {
+        log.error("uncaught exception", { error: err.message, stack: err.stack });
+        shutdown();
+    });
+    process.on("unhandledRejection", (reason) => {
+        const msg = reason instanceof Error ? reason.message : String(reason);
+        log.error("unhandled rejection", { error: msg });
+    });
     process.on("SIGHUP", () => {
         try {
             config = reloadConfig();
             engine.reloadConfig(config);
-            console.log("[claudebridge] config reloaded (SIGHUP)");
+            for (const a of adapters) {
+                if ('reloadConfig' in a && typeof a.reloadConfig === 'function') {
+                    const plat = a.constructor.name === 'TelegramAdapter' ? config.platforms.telegram : config.platforms.discord;
+                    a.reloadConfig(plat, config.locale);
+                }
+            }
+            log.info("config reloaded (SIGHUP)");
         }
         catch (err) {
-            console.error("[claudebridge] config reload failed:", err);
+            log.error("config reload failed", { error: err?.message });
         }
     });
     // Hot reload config.yaml on file change
@@ -72,23 +90,34 @@ async function main() {
             try {
                 config = reloadConfig();
                 engine.reloadConfig(config);
-                console.log("[claudebridge] config reloaded");
+                for (const a of adapters) {
+                    if ('reloadConfig' in a && typeof a.reloadConfig === 'function') {
+                        const plat = a.constructor.name === 'TelegramAdapter' ? config.platforms.telegram : config.platforms.discord;
+                        a.reloadConfig(plat, config.locale);
+                    }
+                }
+                log.info("config reloaded");
             }
             catch (err) {
-                console.error("[claudebridge] config reload failed:", err);
+                log.error("config reload failed", { error: err?.message });
             }
         }, 500); // debounce
     });
-    // --- Start adapters (fire-and-forget, they run infinite polling loops) ---
+    // --- Start adapters with crash recovery ---
     for (const a of adapters) {
         a.start().catch(err => {
-            console.error("[fatal] adapter crashed:", err);
-            process.exit(1);
+            log.error("adapter crashed, retry in 10s", { adapter: a.constructor.name, error: err?.message });
+            setTimeout(() => {
+                a.start().catch(err2 => {
+                    log.error("adapter restart failed, exiting", { error: err2?.message });
+                    process.exit(1);
+                });
+            }, 10000);
         });
     }
-    console.log(`[claudebridge] running with ${adapters.length} adapter(s)`);
+    log.info("running", { adapters: adapters.length });
 }
 main().catch((err) => {
-    console.error("[fatal]", err);
+    log.error("fatal", { error: err?.message });
     process.exit(1);
 });

package/dist/providers/base.d.ts

@@ -0,0 +1,26 @@
+export interface ProviderStreamEvent {
+    type: "session_init" | "text_chunk" | "result" | "unknown";
+    sessionId?: string;
+    text?: string;
+    cost?: number;
+    isError?: boolean;
+}
+export interface ProviderExecOpts {
+    prompt: string;
+    model: string;
+    resumeSessionId?: string;
+    systemPrompt?: string;
+    appendSystemPrompt?: string;
+    allowedTools?: string[];
+    maxTurns?: number;
+    maxBudgetUsd?: number;
+    permissionMode?: string;
+}
+export interface Provider {
+    readonly binary: string;
+    readonly supportsSessionResume: boolean;
+    readonly supportsAppendSystemPrompt: boolean;
+    buildArgs(opts: ProviderExecOpts): string[];
+    buildEnv(extra: Record<string, string>): Record<string, string>;
+    parseLine(line: string): ProviderStreamEvent;
+}

package/dist/providers/base.js

@@ -0,0 +1 @@
+export {};

package/dist/providers/claude.d.ts

@@ -0,0 +1,9 @@
+import type { Provider, ProviderExecOpts, ProviderStreamEvent } from "./base.js";
+export declare class ClaudeProvider implements Provider {
+    readonly binary = "claude";
+    readonly supportsSessionResume = true;
+    readonly supportsAppendSystemPrompt = true;
+    buildArgs(opts: ProviderExecOpts): string[];
+    buildEnv(extra: Record<string, string>): Record<string, string>;
+    parseLine(line: string): ProviderStreamEvent;
+}

package/dist/providers/claude.js

@@ -0,0 +1,53 @@
+export class ClaudeProvider {
+    binary = "claude";
+    supportsSessionResume = true;
+    supportsAppendSystemPrompt = true;
+    buildArgs(opts) {
+        const args = ["-p", opts.prompt, "--verbose", "--output-format", "stream-json"];
+        if (opts.permissionMode)
+            args.push("--permission-mode", opts.permissionMode);
+        if (opts.model)
+            args.push("--model", opts.model);
+        if (opts.resumeSessionId)
+            args.push("-r", opts.resumeSessionId);
+        if (opts.systemPrompt)
+            args.push("--system-prompt", opts.systemPrompt);
+        if (opts.appendSystemPrompt)
+            args.push("--append-system-prompt", opts.appendSystemPrompt);
+        if (opts.allowedTools?.length)
+            args.push("--allowed-tools", opts.allowedTools.join(","));
+        if (opts.maxTurns)
+            args.push("--max-turns", String(opts.maxTurns));
+        if (opts.maxBudgetUsd)
+            args.push("--max-budget-usd", String(opts.maxBudgetUsd));
+        return args;
+    }
+    buildEnv(extra) {
+        return { ...process.env, ...extra };
+    }
+    parseLine(line) {
+        try {
+            const msg = JSON.parse(line);
+            if (msg.type === "system" && msg.subtype === "init" && msg.session_id) {
+                return { type: "session_init", sessionId: msg.session_id };
+            }
+            if (msg.type === "assistant" && msg.message?.content) {
+                const texts = msg.message.content
+                    .filter((b) => b.type === "text" && b.text)
+                    .map((b) => b.text);
+                if (texts.length)
+                    return { type: "text_chunk", text: texts.join("") };
+            }
+            if (msg.type === "result") {
+                return {
+                    type: "result",
+                    text: msg.result || undefined,
+                    cost: msg.total_cost_usd || undefined,
+                    isError: msg.is_error || false,
+                };
+            }
+        }
+        catch { }
+        return { type: "unknown" };
+    }
+}

package/dist/providers/codex.d.ts

@@ -0,0 +1,9 @@
+import type { Provider, ProviderExecOpts, ProviderStreamEvent } from "./base.js";
+export declare class CodexProvider implements Provider {
+    readonly binary = "codex";
+    readonly supportsSessionResume = false;
+    readonly supportsAppendSystemPrompt = false;
+    buildArgs(opts: ProviderExecOpts): string[];
+    buildEnv(extra: Record<string, string>): Record<string, string>;
+    parseLine(line: string): ProviderStreamEvent;
+}

package/dist/providers/codex.js

@@ -0,0 +1,35 @@
+export class CodexProvider {
+    binary = "codex";
+    supportsSessionResume = false;
+    supportsAppendSystemPrompt = false;
+    buildArgs(opts) {
+        const prompt = opts.appendSystemPrompt
+            ? `[System Context]\n${opts.appendSystemPrompt}\n\n[User Message]\n${opts.prompt}`
+            : opts.prompt;
+        const args = ["exec", prompt, "--json", "--dangerously-bypass-approvals-and-sandbox"];
+        if (opts.model)
+            args.push("-m", opts.model);
+        return args;
+    }
+    buildEnv(extra) {
+        return { ...process.env, ...extra };
+    }
+    parseLine(line) {
+        try {
+            const msg = JSON.parse(line);
+            if (msg.type === "thread.started" && msg.thread_id) {
+                return { type: "session_init", sessionId: msg.thread_id };
+            }
+            if (msg.type === "item.completed" && msg.item?.type === "agent_message" && msg.item.text) {
+                return { type: "text_chunk", text: msg.item.text };
+            }
+            if (msg.type === "turn.completed") {
+                const usage = msg.usage || {};
+                const cost = ((usage.input_tokens || 0) * 0.000003 + (usage.output_tokens || 0) * 0.000012);
+                return { type: "result", cost: cost || undefined };
+            }
+        }
+        catch { }
+        return { type: "unknown" };
+    }
+}

package/dist/providers/registry.d.ts

@@ -0,0 +1,2 @@
+import type { Provider } from "./base.js";
+export declare function getProvider(name: string): Provider;

package/dist/providers/registry.js

@@ -0,0 +1,12 @@
+import { ClaudeProvider } from "./claude.js";
+import { CodexProvider } from "./codex.js";
+const providers = new Map([
+    ["claude", new ClaudeProvider()],
+    ["codex", new CodexProvider()],
+]);
+export function getProvider(name) {
+    const p = providers.get(name);
+    if (!p)
+        throw new Error(`Unknown provider: ${name}. Available: ${[...providers.keys()].join(", ")}`);
+    return p;
+}

package/dist/skills/bridge.d.ts

@@ -3,5 +3,7 @@ export interface SkillContext {
     chatId: string;
     platform: string;
     locale: string;
+    subSessionId?: string;
+    subSessionLabel?: string;
 }
 export declare function generateSkillDoc(ctx: SkillContext): string;

package/dist/skills/bridge.js

@@ -11,6 +11,7 @@ export function generateSkillDoc(ctx) {
             ``,
             `你正在 ClaudeBridge 中运行，连接着 ${ctx.platform} 平台。`,
             `当前用户 ID: ${ctx.userId} | 聊天 ID: ${ctx.chatId} | 平台: ${ctx.platform}`,
+            ...(ctx.subSessionId ? [`当前子会话: ${ctx.subSessionId.slice(0, 8)} (话题: "${ctx.subSessionLabel || ""}")`] : []),
             ``,
             `你可以通过 Bash 工具调用以下命令来管理用户的记忆、任务、提醒和自动任务：`,
             ``,
@@ -120,6 +121,7 @@ export function generateSkillDoc(ctx) {
         ``,
         `You are running inside ClaudeBridge, connected to the ${ctx.platform} platform.`,
         `Current user ID: ${ctx.userId} | Chat ID: ${ctx.chatId} | Platform: ${ctx.platform}`,
+        ...(ctx.subSessionId ? [`Current sub-session: ${ctx.subSessionId.slice(0, 8)} (topic: "${ctx.subSessionLabel || ""}")`] : []),
         ``,
         `You can use the Bash tool to call these commands to manage the user's memories, tasks, reminders, and auto-tasks:`,
         ``,

package/dist/webhook.js

@@ -1,5 +1,7 @@
 import { createServer } from "node:http";
 import { createHmac, timingSafeEqual } from "node:crypto";
+import { log as rootLog } from "./core/logger.js";
+const log = rootLog.child("webhook");
 export class WebhookServer {
     store;
     config;
@@ -14,7 +16,7 @@ export class WebhookServer {
     start() {
         this.server = createServer((req, res) => this.handleRequest(req, res));
         this.server.listen(this.config.port, () => {
-            console.log(`[webhook] HTTP server listening on port ${this.config.port}`);
+            log.info("HTTP server listening", { port: this.config.port });
         });
         // Start cron schedulers
         for (const entry of this.cronEntries) {
@@ -22,14 +24,14 @@ export class WebhookServer {
             const timer = setInterval(() => {
                 try {
                     const id = this.store.addTask(entry.user_id, entry.platform, entry.chat_id, entry.description, undefined, true);
-                    console.log(`[cron] created auto-task #${id}: ${entry.description}`);
+                    log.info("cron created auto-task", { id, description: entry.description });
                 }
                 catch (e) {
-                    console.error(`[cron] failed to create task:`, e);
+                    log.error("cron failed to create task", { error: e?.message });
                 }
             }, ms);
             this.cronTimers.push(timer);
-            console.log(`[cron] scheduled every ${entry.schedule_minutes}min: ${entry.description}`);
+            log.info("cron scheduled", { minutes: entry.schedule_minutes, description: entry.description });
         }
     }
     stop() {
@@ -97,7 +99,7 @@ export class WebhookServer {
                 const event = req.headers["x-github-event"] || "unknown";
                 const description = this.buildGitHubDescription(event, payload);
                 const id = this.store.addTask(userId, platform, chatId, description, undefined, true);
-                console.log(`[webhook] github ${event} → auto-task #${id}`);
+                log.info("github webhook", { event, taskId: id });
                 this.json(res, 201, { ok: true, id, event });
             }
             catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emqo/claudebridge",
-  "version": "0.7.0",
+  "version": "0.9.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": {
@@ -11,7 +11,9 @@
   "scripts": {
     "build": "tsc",
     "start": "node dist/index.js",
-    "dev": "tsx src/index.ts"
+    "dev": "tsx src/index.ts",
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "keywords": [
     "claude",
@@ -40,14 +42,16 @@
     "discord.js": "^14.25.1",
     "dotenv": "^17.3.1",
     "ioredis": "^5.9.3",
-    "yaml": "^2.8.2"
+    "yaml": "^2.8.2",
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
     "@types/ioredis": "^4.28.10",
     "@types/node": "^25.3.0",
     "tsx": "^4.21.0",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.18"
   },
   "overrides": {
     "undici": ">=6.23.0"