owpenwork 0.1.10 → 0.1.12

package/dist/bridge.js

@@ -19,7 +19,8 @@ const TOOL_LABELS = {
     task: "agent",
     webfetch: "webfetch",
 };
-export async function startBridge(config, logger) {
+export async function startBridge(config, logger, reporter) {
+    const reportStatus = reporter?.onStatus;
     const client = createClient(config);
     const store = new BridgeStore(config.dbPath);
     store.seedAllowlist("telegram", config.allowlist.telegram);
@@ -31,12 +32,14 @@ export async function startBridge(config, logger) {
     }
     else {
         logger.info("telegram adapter disabled");
+        reportStatus?.("Telegram adapter disabled.");
     }
     if (config.whatsappEnabled) {
-        adapters.set("whatsapp", createWhatsAppAdapter(config, logger, handleInbound, { printQr: true }));
+        adapters.set("whatsapp", createWhatsAppAdapter(config, logger, handleInbound, { printQr: true, onStatus: reportStatus }));
     }
     else {
         logger.info("whatsapp adapter disabled");
+        reportStatus?.("WhatsApp adapter disabled.");
     }
     const sessionQueue = new Map();
     const activeRuns = new Map();
@@ -102,7 +105,7 @@ export async function startBridge(config, logger) {
                     if (output)
                         message += `\n${output}`;
                 }
-                await sendText(run.channel, run.peerId, message);
+                await sendText(run.channel, run.peerId, message, { kind: "tool" });
             }
             if (event.type === "permission.asked") {
                 const permission = event.properties;
@@ -117,7 +120,9 @@ export async function startBridge(config, logger) {
                 if (response === "reject") {
                     const run = activeRuns.get(permission.sessionID);
                     if (run) {
-                        await sendText(run.channel, run.peerId, "Permission denied. Update configuration to allow tools.");
+                        await sendText(run.channel, run.peerId, "Permission denied. Update configuration to allow tools.", {
+                            kind: "system",
+                        });
                     }
                 }
             }
@@ -125,10 +130,14 @@ export async function startBridge(config, logger) {
     })().catch((error) => {
         logger.error({ error }, "event stream closed");
     });
-    async function sendText(channel, peerId, text) {
+    async function sendText(channel, peerId, text, options = {}) {
         const adapter = adapters.get(channel);
         if (!adapter)
             return;
+        const kind = options.kind ?? "system";
+        if (options.display !== false) {
+            reporter?.onOutbound?.({ channel, peerId, text, kind });
+        }
         const chunks = chunkText(text, adapter.maxTextLength);
         for (const chunk of chunks) {
             logger.info({ channel, peerId, length: chunk.length }, "sending message");
@@ -151,30 +160,36 @@ export async function startBridge(config, logger) {
             const allowed = allowAll || isSelf || store.isAllowed("whatsapp", peerKey);
             if (!allowed) {
                 if (config.whatsappDmPolicy === "allowlist") {
-                    await sendText(inbound.channel, inbound.peerId, "Access denied. Ask the owner to allowlist your number.");
+                    await sendText(inbound.channel, inbound.peerId, "Access denied. Ask the owner to allowlist your number.", { kind: "system" });
                     return;
                 }
                 store.prunePairingRequests();
                 const active = store.getPairingRequest("whatsapp", peerKey);
                 const pending = store.listPairingRequests("whatsapp");
                 if (!active && pending.length >= 3) {
-                    await sendText(inbound.channel, inbound.peerId, "Pairing queue full. Ask the owner to approve pending requests.");
+                    await sendText(inbound.channel, inbound.peerId, "Pairing queue full. Ask the owner to approve pending requests.", { kind: "system" });
                     return;
                 }
                 const code = active?.code ?? String(Math.floor(100000 + Math.random() * 900000));
                 if (!active) {
                     store.createPairingRequest("whatsapp", peerKey, code, 60 * 60_000);
                 }
-                await sendText(inbound.channel, inbound.peerId, `Pairing required. Ask the owner to approve code: ${code}`);
+                await sendText(inbound.channel, inbound.peerId, `Pairing required. Ask the owner to approve code: ${code}`, { kind: "system" });
                 return;
             }
         }
         else if (config.allowlist[inbound.channel].size > 0) {
             if (!store.isAllowed(inbound.channel, peerKey)) {
-                await sendText(inbound.channel, inbound.peerId, "Access denied.");
+                await sendText(inbound.channel, inbound.peerId, "Access denied.", { kind: "system" });
                 return;
             }
         }
+        reporter?.onInbound?.({
+            channel: inbound.channel,
+            peerId: inbound.peerId,
+            text: inbound.text,
+            fromMe: inbound.fromMe,
+        });
         const session = store.getSession(inbound.channel, peerKey);
         const sessionID = session?.session_id ?? (await createSession({ ...inbound, peerId: peerKey }));
         enqueue(sessionID, async () => {
@@ -198,15 +213,19 @@ export async function startBridge(config, logger) {
                     .join("\n")
                     .trim();
                 if (reply) {
-                    await sendText(inbound.channel, inbound.peerId, reply);
+                    await sendText(inbound.channel, inbound.peerId, reply, { kind: "reply" });
                 }
                 else {
-                    await sendText(inbound.channel, inbound.peerId, "No response generated. Try again.");
+                    await sendText(inbound.channel, inbound.peerId, "No response generated. Try again.", {
+                        kind: "system",
+                    });
                 }
             }
             catch (error) {
                 logger.error({ error }, "prompt failed");
-                await sendText(inbound.channel, inbound.peerId, "Error: failed to reach OpenCode.");
+                await sendText(inbound.channel, inbound.peerId, "Error: failed to reach OpenCode.", {
+                    kind: "system",
+                });
             }
             finally {
                 activeRuns.delete(sessionID);
@@ -242,8 +261,10 @@ export async function startBridge(config, logger) {
     }
     for (const adapter of adapters.values()) {
         await adapter.start();
+        reportStatus?.(`${adapter.name === "whatsapp" ? "WhatsApp" : "Telegram"} adapter started.`);
     }
     logger.info({ channels: Array.from(adapters.keys()) }, "bridge started");
+    reportStatus?.(`Bridge running. Logs: ${config.logFile}`);
     return {
         async stop() {
             eventAbort.abort();

package/dist/cli.js

@@ -8,8 +8,9 @@ import { loadConfig, normalizeWhatsAppId, readConfigFile, writeConfigFile, } fro
 import { BridgeStore } from "./db.js";
 import { createLogger } from "./logger.js";
 import { createClient } from "./opencode.js";
+import { truncateText } from "./text.js";
 import { loginWhatsApp, unpairWhatsApp } from "./whatsapp.js";
-const VERSION = "0.1.10";
+const VERSION = "0.1.12";
 const STEP_OPTIONS = [
     {
         value: "config",
@@ -62,6 +63,38 @@ function defaultSelections(configExists, whatsappLinked) {
     selections.push("start");
     return selections;
 }
+function createAppLogger(config) {
+    return createLogger(config.logLevel, { logFile: config.logFile });
+}
+function createConsoleReporter() {
+    const formatChannel = (channel) => (channel === "whatsapp" ? "WhatsApp" : "Telegram");
+    const formatPeer = (channel, peerId, fromMe) => {
+        const base = channel === "whatsapp" ? normalizeWhatsAppId(peerId) : peerId;
+        return fromMe ? `${base} (me)` : base;
+    };
+    const printBlock = (prefix, text) => {
+        const lines = text.split(/\r?\n/).map((line) => truncateText(line.trim(), 240));
+        const [first, ...rest] = lines.length ? lines : ["(empty)"];
+        console.log(`${prefix} ${first}`);
+        for (const line of rest) {
+            console.log(`${" ".repeat(prefix.length)} ${line}`);
+        }
+    };
+    return {
+        onStatus(message) {
+            console.log(message);
+        },
+        onInbound({ channel, peerId, text, fromMe }) {
+            const prefix = `[${formatChannel(channel)}] ${formatPeer(channel, peerId, fromMe)} >`;
+            printBlock(prefix, text);
+        },
+        onOutbound({ channel, peerId, text, kind }) {
+            const marker = kind === "reply" ? "<" : kind === "tool" ? "*" : "!";
+            const prefix = `[${formatChannel(channel)}] ${formatPeer(channel, peerId)} ${marker}`;
+            printBlock(prefix, text);
+        },
+    };
+}
 function updateConfig(configPath, updater) {
     const { config } = readConfigFile(configPath);
     const base = config ?? { version: 1 };
@@ -195,12 +228,13 @@ async function runStart(pathOverride) {
         process.env.OPENCODE_DIRECTORY = pathOverride.trim();
     }
     const config = loadConfig();
-    const logger = createLogger(config.logLevel);
+    const logger = createAppLogger(config);
+    const reporter = createConsoleReporter();
     if (!process.env.OPENCODE_DIRECTORY) {
         process.env.OPENCODE_DIRECTORY = config.opencodeDirectory;
     }
-    const bridge = await startBridge(config, logger);
-    logger.info("Commands: owpenwork whatsapp login, owpenwork pairing list, owpenwork status");
+    const bridge = await startBridge(config, logger, reporter);
+    reporter.onStatus?.("Commands: owpenwork whatsapp login, owpenwork pairing list, owpenwork status");
     const shutdown = async () => {
         logger.info("shutting down");
         await bridge.stop();
@@ -277,7 +311,7 @@ async function runGuidedFlow(pathArg, opts) {
                     if (!relink)
                         return;
                 }
-                await loginWhatsApp(config, createLogger(config.logLevel));
+                await loginWhatsApp(config, createAppLogger(config), { onStatus: console.log });
             });
             continue;
         }
@@ -338,7 +372,7 @@ login
     .description("Login to WhatsApp via QR code")
     .action(async () => {
     const config = loadConfig(process.env, { requireOpencode: false });
-    await loginWhatsApp(config, createLogger(config.logLevel));
+    await loginWhatsApp(config, createAppLogger(config), { onStatus: console.log });
 });
 login
     .command("telegram")
@@ -372,28 +406,28 @@ whatsapp
     .description("Login to WhatsApp via QR code")
     .action(async () => {
     const config = loadConfig(process.env, { requireOpencode: false });
-    await loginWhatsApp(config, createLogger(config.logLevel));
+    await loginWhatsApp(config, createAppLogger(config), { onStatus: console.log });
 });
 whatsapp
     .command("logout")
     .description("Logout of WhatsApp and clear auth state")
     .action(() => {
     const config = loadConfig(process.env, { requireOpencode: false });
-    unpairWhatsApp(config, createLogger(config.logLevel));
+    unpairWhatsApp(config, createAppLogger(config));
 });
 program
     .command("qr")
     .description("Print a WhatsApp QR code to pair")
     .action(async () => {
     const config = loadConfig(process.env, { requireOpencode: false });
-    await loginWhatsApp(config, createLogger(config.logLevel));
+    await loginWhatsApp(config, createAppLogger(config), { onStatus: console.log });
 });
 program
     .command("unpair")
     .description("Clear WhatsApp pairing data")
     .action(() => {
     const config = loadConfig(process.env, { requireOpencode: false });
-    unpairWhatsApp(config, createLogger(config.logLevel));
+    unpairWhatsApp(config, createAppLogger(config));
 });
 const pairing = program.command("pairing").description("Pairing requests");
 pairing

package/dist/config.js

@@ -125,6 +125,7 @@ export function loadConfig(env = process.env, options = {}) {
     const resolvedDirectory = opencodeDirectory || process.cwd();
     const dataDir = expandHome(env.OWPENBOT_DATA_DIR ?? "~/.owpenbot");
     const dbPath = expandHome(env.OWPENBOT_DB_PATH ?? path.join(dataDir, "owpenbot.db"));
+    const logFile = expandHome(env.OWPENBOT_LOG_FILE ?? path.join(dataDir, "logs", "owpenbot.log"));
     const configPath = resolveConfigPath(dataDir, env);
     const { config: configFile } = readConfigFile(configPath);
     const whatsappFile = configFile.channels?.whatsapp ?? {};
@@ -159,6 +160,7 @@ export function loadConfig(env = process.env, options = {}) {
         whatsappEnabled: parseBoolean(env.WHATSAPP_ENABLED, true),
         dataDir,
         dbPath,
+        logFile,
         allowlist: envAllowlist,
         toolUpdatesEnabled: parseBoolean(env.TOOL_UPDATES_ENABLED, false),
         groupsEnabled: parseBoolean(env.GROUPS_ENABLED, false),

package/dist/logger.js

@@ -1,5 +1,12 @@
+import fs from "node:fs";
+import path from "node:path";
 import pino from "pino";
-export function createLogger(level) {
+export function createLogger(level, options) {
+    if (options?.logFile) {
+        fs.mkdirSync(path.dirname(options.logFile), { recursive: true });
+        const destination = pino.destination({ dest: options.logFile, sync: false });
+        return pino({ level, base: undefined }, destination);
+    }
     return pino({
         level,
         base: undefined,

package/dist/whatsapp.js

@@ -43,15 +43,18 @@ export function createWhatsAppAdapter(config, logger, onMessage, opts = {}) {
             if (update.qr && opts.printQr) {
                 qrcode.generate(update.qr, { small: true });
                 log.info("scan the QR code to connect WhatsApp");
+                opts.onStatus?.("Scan the QR code to connect WhatsApp.");
             }
             if (update.connection === "open") {
                 log.info("whatsapp connected");
+                opts.onStatus?.("WhatsApp connected.");
             }
             if (update.connection === "close") {
                 const lastDisconnect = update.lastDisconnect;
                 const statusCode = lastDisconnect?.error?.output?.statusCode;
                 if (statusCode === 515 && !stopped) {
                     log.warn("whatsapp stream error; restarting connection");
+                    opts.onStatus?.("WhatsApp stream error; reconnecting.");
                     setTimeout(() => {
                         void connect();
                     }, 1000);
@@ -60,10 +63,12 @@ export function createWhatsAppAdapter(config, logger, onMessage, opts = {}) {
                 const shouldReconnect = statusCode !== DisconnectReason.loggedOut;
                 if (shouldReconnect && !stopped) {
                     log.warn("whatsapp connection closed, reconnecting");
+                    opts.onStatus?.("WhatsApp connection closed; reconnecting.");
                     void connect();
                 }
                 else if (!shouldReconnect) {
                     log.warn("whatsapp logged out, run 'owpenbot whatsapp login'");
+                    opts.onStatus?.("WhatsApp logged out. Run: owpenwork whatsapp login.");
                 }
             }
         });
@@ -114,67 +119,86 @@ export function createWhatsAppAdapter(config, logger, onMessage, opts = {}) {
         },
     };
 }
-export async function loginWhatsApp(config, logger) {
+export async function loginWhatsApp(config, logger, options = {}) {
     const authDir = path.resolve(config.whatsappAuthDir);
     ensureDir(authDir);
     const log = logger.child({ channel: "whatsapp" });
     const { state, saveCreds } = await useMultiFileAuthState(authDir);
     const { version } = await fetchLatestBaileysVersion();
-    await new Promise((resolve, reject) => {
-        let finished = false;
-        const sock = makeWASocket({
-            auth: {
-                creds: state.creds,
-                keys: makeCacheableSignalKeyStore(state.keys, log),
-            },
-            version,
-            logger: log,
-            printQRInTerminal: false,
-            syncFullHistory: false,
-            markOnlineOnConnect: false,
-            browser: ["owpenbot", "cli", "0.1.0"],
-        });
-        const finish = (reason) => {
-            if (finished)
-                return;
-            finished = true;
-            log.info({ reason }, "whatsapp login finished");
-            sock.end(undefined);
-            resolve();
-        };
-        sock.ev.on("creds.update", async () => {
-            await saveCreds();
-            if (state.creds?.registered) {
-                finish("creds.registered");
-            }
-        });
-        sock.ev.on("connection.update", (update) => {
-            if (update.qr) {
-                qrcode.generate(update.qr, { small: true });
-                log.info("scan the QR code to connect WhatsApp");
-            }
-            if (update.connection === "open") {
-                finish("connection.open");
-            }
-            if (update.connection === "close") {
-                const lastDisconnect = update.lastDisconnect;
-                const statusCode = lastDisconnect?.error?.output?.statusCode;
-                if (statusCode === 515) {
-                    if (state.creds?.registered) {
-                        log.info("whatsapp login requires reconnect; completing login");
-                        finish("connection.restart.required");
-                        return;
-                    }
-                    log.warn("whatsapp restart requested before creds registered");
-                    reject(new Error("WhatsApp login restart required"));
+    const credsPath = path.join(authDir, "creds.json");
+    const maxAttempts = 2;
+    for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+        const result = await new Promise((resolve) => {
+            let finished = false;
+            const sock = makeWASocket({
+                auth: {
+                    creds: state.creds,
+                    keys: makeCacheableSignalKeyStore(state.keys, log),
+                },
+                version,
+                logger: log,
+                printQRInTerminal: false,
+                syncFullHistory: false,
+                markOnlineOnConnect: false,
+                browser: ["owpenbot", "cli", "0.1.0"],
+            });
+            const finish = (reason, status) => {
+                if (finished)
                     return;
-                }
+                finished = true;
+                log.info({ reason }, "whatsapp login finished");
+                sock.end(undefined);
+                resolve(status);
+            };
+            sock.ev.on("creds.update", async () => {
+                await saveCreds();
                 if (state.creds?.registered) {
-                    finish("connection.close.registered");
+                    finish("creds.registered", "linked");
                 }
-            }
+            });
+            sock.ev.on("connection.update", (update) => {
+                if (update.qr) {
+                    qrcode.generate(update.qr, { small: true });
+                    log.info("scan the QR code to connect WhatsApp");
+                    options.onStatus?.("Scan the QR code to connect WhatsApp.");
+                }
+                if (update.connection === "open") {
+                    options.onStatus?.("WhatsApp linked.");
+                    finish("connection.open", "linked");
+                }
+                if (update.connection === "close") {
+                    const lastDisconnect = update.lastDisconnect;
+                    const statusCode = lastDisconnect?.error?.output?.statusCode;
+                    if (statusCode === 515) {
+                        if (state.creds?.registered || fs.existsSync(credsPath)) {
+                            log.info("whatsapp login requires reconnect; completing login");
+                            options.onStatus?.("WhatsApp login requires reconnect; completing login.");
+                            finish("connection.restart.required", "linked");
+                        }
+                        else {
+                            log.warn("whatsapp restart requested before creds registered");
+                            options.onStatus?.("WhatsApp login needs another scan.");
+                            finish("connection.restart.required", "restart");
+                        }
+                        return;
+                    }
+                    if (state.creds?.registered) {
+                        options.onStatus?.("WhatsApp linked.");
+                        finish("connection.close.registered", "linked");
+                    }
+                }
+            });
         });
-    });
+        if (result === "linked") {
+            return;
+        }
+        if (attempt < maxAttempts) {
+            log.warn("retrying whatsapp login after restart");
+            options.onStatus?.("Retrying WhatsApp login...");
+            await new Promise((resolve) => setTimeout(resolve, 1500));
+        }
+    }
+    throw new Error("WhatsApp login failed after restart");
 }
 export function unpairWhatsApp(config, logger) {
     const authDir = path.resolve(config.whatsappAuthDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owpenwork",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "WhatsApp bridge for a running OpenCode server",
   "private": false,
   "type": "module",