owpenwork 0.1.7 → 0.1.9

package/README.md

@@ -22,7 +22,7 @@ Quick run without install:
 npx owpenwork
 ```
 
-Then follow the prompts (setup, QR login, start).
+Then follow the guided setup (choose what to configure, link WhatsApp, start).
 
 1) One-command setup (installs deps, builds, creates `.env` if missing):
 
@@ -79,17 +79,20 @@ Use a separate WhatsApp number as the bot account so it stays independent from y
 ## Telegram (Untested)
 
 Telegram support is wired but not E2E tested yet. To try it:
-- Set `TELEGRAM_BOT_TOKEN`.
-- Optionally set `TELEGRAM_ENABLED=true`.
+- Run `owpenwork login telegram --token <token>`.
+- Or set `TELEGRAM_BOT_TOKEN` and `TELEGRAM_ENABLED=true`.
 
 ## Commands
 
 ```bash
 owpenwork
 owpenwork --non-interactive
+owpenwork login whatsapp
+owpenwork login telegram --token <token>
 owpenwork pairing list
 owpenwork pairing approve <code>
 owpenwork status
+owpenwork doctor --reset
 ```
 
 ## Defaults

package/dist/cli.js

@@ -1,50 +1,86 @@
 #!/usr/bin/env node
 import fs from "node:fs";
 import path from "node:path";
-import { createInterface } from "node:readline/promises";
+import { cancel, confirm, intro, isCancel, log, multiselect, outro, select, spinner, text, } from "@clack/prompts";
 import { Command } from "commander";
 import { startBridge } from "./bridge.js";
 import { loadConfig, normalizeWhatsAppId, readConfigFile, writeConfigFile, } from "./config.js";
 import { BridgeStore } from "./db.js";
 import { createLogger } from "./logger.js";
+import { createClient } from "./opencode.js";
 import { loginWhatsApp, unpairWhatsApp } from "./whatsapp.js";
-const program = new Command();
-program
-    .name("owpenbot")
-    .version("0.1.7")
-    .description("OpenCode WhatsApp + Telegram bridge")
-    .argument("[path]")
-    .option("--non-interactive", "Run setup defaults and exit", false)
-    .option("--check", "Validate config/auth and exit", false);
-const runStart = async (pathOverride) => {
-    if (pathOverride?.trim()) {
-        process.env.OPENCODE_DIRECTORY = pathOverride.trim();
-    }
-    const config = loadConfig();
-    const logger = createLogger(config.logLevel);
-    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 shutdown = async () => {
-        logger.info("shutting down");
-        await bridge.stop();
+const VERSION = "0.1.9";
+const STEP_OPTIONS = [
+    {
+        value: "config",
+        label: "Setup configuration",
+        hint: "DM policy + allowlist",
+    },
+    {
+        value: "whatsapp",
+        label: "Link WhatsApp",
+        hint: "Scan QR",
+    },
+    {
+        value: "telegram",
+        label: "Link Telegram",
+        hint: "Optional",
+    },
+    {
+        value: "start",
+        label: "Start bridge",
+        hint: "Listen for messages",
+    },
+];
+const STEP_SET = new Set(["config", "whatsapp", "telegram", "start"]);
+function isInteractive() {
+    return Boolean(process.stdin.isTTY || process.env.OWPENWORK_FORCE_TUI === "1");
+}
+function unwrap(value) {
+    if (isCancel(value)) {
+        cancel("Setup cancelled");
         process.exit(0);
-    };
-    process.on("SIGINT", shutdown);
-    process.on("SIGTERM", shutdown);
-};
-async function runSetupWizard(config, nonInteractive) {
-    const { config: existing } = readConfigFile(config.configPath);
-    const next = existing ?? { version: 1 };
-    if (nonInteractive) {
-        next.version = 1;
+    }
+    return value;
+}
+function parseSelections(raw) {
+    if (!raw)
+        return null;
+    const selections = raw
+        .split(",")
+        .map((item) => item.trim())
+        .filter(Boolean)
+        .filter((item) => STEP_SET.has(item));
+    return selections.length ? selections : [];
+}
+function defaultSelections(configExists, whatsappLinked) {
+    const selections = [];
+    if (!configExists)
+        selections.push("config");
+    if (!whatsappLinked)
+        selections.push("whatsapp");
+    selections.push("start");
+    return selections;
+}
+function updateConfig(configPath, updater) {
+    const { config } = readConfigFile(configPath);
+    const base = config ?? { version: 1 };
+    const next = updater(base);
+    next.version = next.version ?? 1;
+    writeConfigFile(configPath, next);
+    return next;
+}
+async function runSetupWizard(config, options) {
+    const testMode = process.env.OWPENWORK_TEST_SETUP;
+    const next = updateConfig(config.configPath, (cfg) => ({ ...cfg }));
+    if (options.nonInteractive || testMode) {
         next.channels = next.channels ?? {};
+        const mode = testMode === "dedicated" ? "dedicated" : "personal";
+        const allowFrom = mode === "personal" ? ["+15551234567"] : [];
         next.channels.whatsapp = {
-            dmPolicy: "pairing",
-            allowFrom: [],
-            selfChatMode: false,
+            dmPolicy: mode === "personal" ? "allowlist" : "pairing",
+            allowFrom,
+            selfChatMode: mode === "personal",
             accounts: {
                 [config.whatsappAccountId]: {
                     authDir: config.whatsappAuthDir,
@@ -52,67 +88,126 @@ async function runSetupWizard(config, nonInteractive) {
             },
         };
         writeConfigFile(config.configPath, next);
-        console.log(`Wrote ${config.configPath}`);
+        log.success(`Wrote ${config.configPath}`);
         return;
     }
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    const phoneMode = await rl.question("WhatsApp setup: (1) Personal number (2) Dedicated number [1]: ");
-    const mode = phoneMode.trim() === "2" ? "dedicated" : "personal";
-    let dmPolicy = "pairing";
-    let allowFrom = [];
-    let selfChatMode = false;
-    if (mode === "personal") {
-        let normalized = "";
-        while (!normalized) {
-            const number = await rl.question("Your WhatsApp number (E.164, e.g. +15551234567): ");
-            const candidate = normalizeWhatsAppId(number);
-            if (!/^\+\d+$/.test(candidate)) {
-                console.log("Invalid number. Try again.");
-                continue;
+    if (options.useTui) {
+        const mode = unwrap(await select({
+            message: "WhatsApp number",
+            options: [
+                {
+                    value: "personal",
+                    label: "Personal number (no pairing)",
+                    hint: "Allowlist your own number",
+                },
+                {
+                    value: "dedicated",
+                    label: "Dedicated number",
+                    hint: "Pairing or allowlist",
+                },
+            ],
+            initialValue: "personal",
+        }));
+        let dmPolicy = "pairing";
+        let allowFrom = [];
+        let selfChatMode = false;
+        if (mode === "personal") {
+            const number = unwrap(await text({
+                message: "Your WhatsApp number (E.164)",
+                placeholder: "+15551234567",
+                validate: (value) => {
+                    const normalized = normalizeWhatsAppId(String(value ?? ""));
+                    return /^\+\d+$/.test(normalized) ? undefined : "Use E.164 format (+123...)";
+                },
+            }));
+            allowFrom = [normalizeWhatsAppId(number)];
+            dmPolicy = "allowlist";
+            selfChatMode = true;
+        }
+        else {
+            dmPolicy = unwrap(await select({
+                message: "Direct messages",
+                options: [
+                    { value: "pairing", label: "Pairing (recommended)" },
+                    { value: "allowlist", label: "Allowlist only" },
+                    { value: "open", label: "Open (public)" },
+                    { value: "disabled", label: "Disabled" },
+                ],
+                initialValue: "pairing",
+            }));
+            const listInput = unwrap(await text({
+                message: "Allowlist numbers (comma-separated, optional)",
+                placeholder: "+15551234567, +15551234568",
+            }));
+            if (listInput.trim()) {
+                allowFrom = listInput
+                    .split(",")
+                    .map((item) => normalizeWhatsAppId(item))
+                    .filter(Boolean);
+            }
+            if (dmPolicy === "open") {
+                allowFrom = allowFrom.length ? allowFrom : ["*"];
             }
-            normalized = candidate;
         }
-        allowFrom = [normalized];
-        dmPolicy = "allowlist";
-        selfChatMode = true;
+        next.channels = next.channels ?? {};
+        next.channels.whatsapp = {
+            dmPolicy,
+            allowFrom,
+            selfChatMode,
+            accounts: {
+                [config.whatsappAccountId]: {
+                    authDir: config.whatsappAuthDir,
+                },
+            },
+        };
+        writeConfigFile(config.configPath, next);
+        log.success(`Wrote ${config.configPath}`);
+        return;
     }
-    else {
-        const policyInput = await rl.question("DM policy: (1) Pairing (2) Allowlist (3) Open (4) Disabled [1]: ");
-        const policyChoice = policyInput.trim();
-        if (policyChoice === "2")
-            dmPolicy = "allowlist";
-        else if (policyChoice === "3")
-            dmPolicy = "open";
-        else if (policyChoice === "4")
-            dmPolicy = "disabled";
-        else
-            dmPolicy = "pairing";
-        const listInput = await rl.question("Allowlist numbers (comma-separated, optional): ");
-        if (listInput.trim()) {
-            allowFrom = listInput
-                .split(",")
-                .map((item) => normalizeWhatsAppId(item))
-                .filter(Boolean);
-        }
-        if (dmPolicy === "open") {
-            allowFrom = allowFrom.length ? allowFrom : ["*"];
+}
+async function runTelegramSetup(config, tokenOverride) {
+    const tokenFromEnv = tokenOverride ?? process.env.OWPENWORK_TEST_TELEGRAM_TOKEN;
+    let token = tokenFromEnv || config.telegramToken;
+    if (!token) {
+        if (!isInteractive()) {
+            log.warn("Telegram token missing. Provide TELEGRAM_BOT_TOKEN or use login command.");
+            return;
         }
+        token = unwrap(await text({
+            message: "Telegram bot token",
+            placeholder: "123456:ABCDEF...",
+            validate: (value) => (String(value ?? "").trim() ? undefined : "Token required"),
+        }));
     }
-    rl.close();
-    next.version = 1;
-    next.channels = next.channels ?? {};
-    next.channels.whatsapp = {
-        dmPolicy,
-        allowFrom,
-        selfChatMode,
-        accounts: {
-            [config.whatsappAccountId]: {
-                authDir: config.whatsappAuthDir,
-            },
-        },
+    updateConfig(config.configPath, (cfg) => {
+        const next = { ...cfg };
+        next.channels = next.channels ?? {};
+        next.channels.telegram = {
+            token,
+            enabled: true,
+        };
+        return next;
+    });
+    log.success("Telegram token saved.");
+}
+async function runStart(pathOverride) {
+    if (pathOverride?.trim()) {
+        process.env.OPENCODE_DIRECTORY = pathOverride.trim();
+    }
+    const config = loadConfig();
+    const logger = createLogger(config.logLevel);
+    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 shutdown = async () => {
+        logger.info("shutting down");
+        await bridge.stop();
+        process.exit(0);
     };
-    writeConfigFile(config.configPath, next);
-    console.log(`Wrote ${config.configPath}`);
+    process.on("SIGINT", shutdown);
+    process.on("SIGTERM", shutdown);
 }
 async function runGuidedFlow(pathArg, opts) {
     if (pathArg?.trim()) {
@@ -122,30 +217,95 @@ async function runGuidedFlow(pathArg, opts) {
     if (!process.env.OPENCODE_DIRECTORY) {
         process.env.OPENCODE_DIRECTORY = config.opencodeDirectory;
     }
+    const authPath = path.join(config.whatsappAuthDir, "creds.json");
+    const whatsappLinked = fs.existsSync(authPath);
+    const configExists = fs.existsSync(config.configPath);
     if (opts.check) {
-        const authPath = path.join(config.whatsappAuthDir, "creds.json");
-        const linked = fs.existsSync(authPath);
-        const cfgExists = fs.existsSync(config.configPath);
-        console.log(`Config: ${cfgExists ? "yes" : "no"}`);
-        console.log(`WhatsApp linked: ${linked ? "yes" : "no"}`);
-        process.exit(linked && cfgExists ? 0 : 1);
+        console.log(`Config: ${configExists ? "yes" : "no"}`);
+        console.log(`WhatsApp linked: ${whatsappLinked ? "yes" : "no"}`);
+        console.log(`Telegram configured: ${config.telegramToken ? "yes" : "no"}`);
+        process.exit(configExists && whatsappLinked ? 0 : 1);
     }
-    const cfgExists = fs.existsSync(config.configPath);
-    const cfgHasWhatsApp = config.configFile.channels?.whatsapp;
-    if (!cfgExists || !cfgHasWhatsApp) {
-        await runSetupWizard(config, opts.nonInteractive);
-        if (opts.nonInteractive) {
-            console.log("Next: owpenwork whatsapp login");
-            return;
+    if (opts.nonInteractive) {
+        await runSetupWizard(config, { nonInteractive: true, useTui: false });
+        console.log("Next: owpenwork whatsapp login");
+        return;
+    }
+    if (!isInteractive()) {
+        console.log("Non-interactive shell. Run `owpenwork start` or `owpenwork --non-interactive`.");
+        return;
+    }
+    intro("Owpenwork Setup");
+    const selectedFromEnv = parseSelections(process.env.OWPENWORK_TEST_SELECTIONS);
+    const selections = selectedFromEnv ??
+        unwrap(await multiselect({
+            message: "Select what to set up",
+            options: STEP_OPTIONS,
+            initialValues: defaultSelections(configExists, whatsappLinked),
+            required: false,
+        }));
+    const selectedSteps = Array.isArray(selections) ? selections : [];
+    if (!selectedSteps.length) {
+        cancel("No steps selected");
+        process.exit(0);
+    }
+    const total = selectedSteps.length;
+    let index = 1;
+    const runStep = async (label, task) => {
+        const spin = spinner();
+        spin.start(`Step ${index}/${total}: ${label}`);
+        await task();
+        spin.stop(`Step ${index}/${total}: ${label} done`);
+        index += 1;
+    };
+    for (const step of selectedSteps) {
+        if (step === "config") {
+            await runStep("Setup configuration", async () => {
+                await runSetupWizard(config, { nonInteractive: false, useTui: true });
+                config = loadConfig(process.env, { requireOpencode: false });
+            });
+            continue;
+        }
+        if (step === "whatsapp") {
+            await runStep("Link WhatsApp", async () => {
+                const alreadyLinked = fs.existsSync(authPath);
+                if (alreadyLinked) {
+                    const relink = unwrap(await confirm({
+                        message: "WhatsApp already linked. Relink?",
+                        initialValue: false,
+                    }));
+                    if (!relink)
+                        return;
+                }
+                await loginWhatsApp(config, createLogger(config.logLevel));
+            });
+            continue;
+        }
+        if (step === "telegram") {
+            await runStep("Link Telegram", async () => {
+                await runTelegramSetup(config);
+                config = loadConfig(process.env, { requireOpencode: false });
+            });
+            continue;
+        }
+        if (step === "start") {
+            log.info("Starting bridge...");
+            outro("Owpenwork is running.");
+            await runStart(pathArg);
         }
     }
-    config = loadConfig(process.env, { requireOpencode: false });
-    const authPath = path.join(config.whatsappAuthDir, "creds.json");
-    if (!fs.existsSync(authPath)) {
-        await loginWhatsApp(config, createLogger(config.logLevel));
+    if (!selectedSteps.includes("start")) {
+        outro("Setup complete.");
     }
-    await runStart(pathArg);
 }
+const program = new Command();
+program
+    .name("owpenbot")
+    .version(VERSION)
+    .description("OpenCode WhatsApp + Telegram bridge")
+    .argument("[path]")
+    .option("--non-interactive", "Run setup defaults and exit", false)
+    .option("--check", "Validate config/auth and exit", false);
 program
     .command("start")
     .description("Start the bridge")
@@ -164,7 +324,29 @@ program
     .option("--non-interactive", "Write defaults without prompts", false)
     .action(async (opts) => {
     const config = loadConfig(process.env, { requireOpencode: false });
-    await runSetupWizard(config, Boolean(opts.nonInteractive));
+    if (!isInteractive() && !opts.nonInteractive) {
+        console.log("Non-interactive shell. Use --non-interactive.");
+        return;
+    }
+    intro("Owpenwork Setup");
+    await runSetupWizard(config, { nonInteractive: Boolean(opts.nonInteractive), useTui: true });
+    outro("Setup complete.");
+});
+const login = program.command("login").description("Link channels");
+login
+    .command("whatsapp")
+    .description("Login to WhatsApp via QR code")
+    .action(async () => {
+    const config = loadConfig(process.env, { requireOpencode: false });
+    await loginWhatsApp(config, createLogger(config.logLevel));
+});
+login
+    .command("telegram")
+    .option("--token <token>", "Telegram bot token")
+    .description("Save Telegram bot token")
+    .action(async (opts) => {
+    const config = loadConfig(process.env, { requireOpencode: false });
+    await runTelegramSetup(config, opts.token);
 });
 program
     .command("pairing-code")
@@ -190,32 +372,28 @@ whatsapp
     .description("Login to WhatsApp via QR code")
     .action(async () => {
     const config = loadConfig(process.env, { requireOpencode: false });
-    const logger = createLogger(config.logLevel);
-    await loginWhatsApp(config, logger);
+    await loginWhatsApp(config, createLogger(config.logLevel));
 });
 whatsapp
     .command("logout")
     .description("Logout of WhatsApp and clear auth state")
     .action(() => {
     const config = loadConfig(process.env, { requireOpencode: false });
-    const logger = createLogger(config.logLevel);
-    unpairWhatsApp(config, logger);
+    unpairWhatsApp(config, createLogger(config.logLevel));
 });
 program
     .command("qr")
     .description("Print a WhatsApp QR code to pair")
     .action(async () => {
     const config = loadConfig(process.env, { requireOpencode: false });
-    const logger = createLogger(config.logLevel);
-    await loginWhatsApp(config, logger);
+    await loginWhatsApp(config, createLogger(config.logLevel));
 });
 program
     .command("unpair")
     .description("Clear WhatsApp pairing data")
     .action(() => {
     const config = loadConfig(process.env, { requireOpencode: false });
-    const logger = createLogger(config.logLevel);
-    unpairWhatsApp(config, logger);
+    unpairWhatsApp(config, createLogger(config.logLevel));
 });
 const pairing = program.command("pairing").description("Pairing requests");
 pairing
@@ -273,6 +451,7 @@ program
     const linked = fs.existsSync(authPath);
     console.log(`Config: ${config.configPath}`);
     console.log(`WhatsApp linked: ${linked ? "yes" : "no"}`);
+    console.log(`Telegram configured: ${config.telegramToken ? "yes" : "no"}`);
     console.log(`Auth dir: ${config.whatsappAuthDir}`);
     console.log(`OpenCode URL: ${config.opencodeUrl}`);
 });
@@ -290,16 +469,28 @@ program
         console.log("WhatsApp linked.");
     }
     console.log(`OpenCode URL: ${config.opencodeUrl}`);
+    try {
+        const client = createClient(config);
+        const health = await client.global.health();
+        const healthy = Boolean(health.healthy);
+        console.log(`OpenCode reachable: ${healthy ? "yes" : "no"}`);
+    }
+    catch (error) {
+        console.log("OpenCode reachable: no");
+        console.log(`Error: ${String(error)}`);
+    }
     console.log("If replies fail, ensure the server is running.");
     const resetRequested = Boolean(opts.reset);
     if (!resetRequested && !process.stdin.isTTY)
         return;
     let confirmed = resetRequested;
     if (!resetRequested) {
-        const rl = createInterface({ input: process.stdin, output: process.stdout });
-        const answer = await rl.question("Reset owpenbot state (y/N)? ");
-        rl.close();
-        confirmed = answer.trim().toLowerCase() === "y";
+        const answer = await confirm({ message: "Reset owpenbot state?", initialValue: false });
+        if (isCancel(answer)) {
+            cancel("Reset cancelled");
+            return;
+        }
+        confirmed = Boolean(answer);
     }
     if (!confirmed)
         return;
@@ -309,7 +500,7 @@ program
             fs.rmSync(target, { recursive: true, force: true });
         }
     }
-    console.log("Reset complete. Run: owpenwork setup");
+    console.log("Reset complete. Run: owpenwork");
 });
 program.parseAsync(process.argv).catch((error) => {
     console.error(error);

package/dist/config.js

@@ -141,6 +141,7 @@ export function loadConfig(env = process.env, options = {}) {
     const whatsappAllowFrom = new Set([...fileAllowFrom, ...envAllowFrom]);
     const toolOutputLimit = parseInteger(env.TOOL_OUTPUT_LIMIT) ?? 1200;
     const permissionMode = env.PERMISSION_MODE?.toLowerCase() === "deny" ? "deny" : "allow";
+    const telegramToken = env.TELEGRAM_BOT_TOKEN?.trim() || configFile.channels?.telegram?.token || undefined;
     return {
         configPath,
         configFile,
@@ -148,8 +149,8 @@ export function loadConfig(env = process.env, options = {}) {
         opencodeDirectory: resolvedDirectory,
         opencodeUsername: env.OPENCODE_SERVER_USERNAME?.trim() || undefined,
         opencodePassword: env.OPENCODE_SERVER_PASSWORD?.trim() || undefined,
-        telegramToken: env.TELEGRAM_BOT_TOKEN?.trim() || undefined,
-        telegramEnabled: parseBoolean(env.TELEGRAM_ENABLED, Boolean(env.TELEGRAM_BOT_TOKEN?.trim())),
+        telegramToken,
+        telegramEnabled: parseBoolean(env.TELEGRAM_ENABLED, configFile.channels?.telegram?.enabled ?? Boolean(telegramToken)),
         whatsappAuthDir,
         whatsappAccountId,
         whatsappDmPolicy: dmPolicy,

package/dist/whatsapp.js

@@ -156,8 +156,16 @@ export async function loginWhatsApp(config, logger) {
             if (update.connection === "open") {
                 finish("connection.open");
             }
-            if (update.connection === "close" && state.creds?.registered) {
-                finish("connection.close.registered");
+            if (update.connection === "close") {
+                const lastDisconnect = update.lastDisconnect;
+                const statusCode = lastDisconnect?.error?.output?.statusCode;
+                if (statusCode === 515 && state.creds?.registered) {
+                    finish("connection.close.registered");
+                    return;
+                }
+                if (state.creds?.registered) {
+                    finish("connection.close.registered");
+                }
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owpenwork",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "WhatsApp bridge for a running OpenCode server",
   "private": false,
   "type": "module",
@@ -40,6 +40,7 @@
     "test:npx": "node scripts/test-npx.mjs"
   },
   "dependencies": {
+    "@clack/prompts": "^0.11.0",
     "@opencode-ai/sdk": "^1.1.19",
     "@whiskeysockets/baileys": "7.0.0-rc.9",
     "better-sqlite3": "^11.7.0",