owpenwork 0.1.2 → 0.1.4

package/README.md

@@ -19,12 +19,10 @@ npm install -g owpenwork
 Quick run without install:
 
 ```bash
-npx owpenwork setup
-npx owpenwork whatsapp login
-npx owpenwork start
+npx owpenwork
 ```
 
-Then follow the printed next steps (run `owpenbot setup`, link WhatsApp, start the bridge).
+Then follow the prompts (setup, QR login, start).
 
 1) One-command setup (installs deps, builds, creates `.env` if missing):
 
@@ -43,25 +41,13 @@ Recommended:
 - `OPENCODE_SERVER_USERNAME`
 - `OPENCODE_SERVER_PASSWORD`
 
-3) Run setup (writes `~/.owpenbot/owpenbot.json`):
+3) Run owpenwork and follow the guided setup:
 
 ```bash
-owpenwork setup
+owpenwork
 ```
 
-4) Link WhatsApp (QR):
-
-```bash
-owpenwork whatsapp login
-```
-
-5) Start the bridge:
-
-```bash
-owpenwork start
-```
-
-Owpenbot keeps the WhatsApp session alive once connected.
+Owpenwork keeps the WhatsApp session alive once connected.
 
 6) Pair a user with the bot (only if DM policy is pairing):
 
@@ -75,8 +61,8 @@ Owpenbot keeps the WhatsApp session alive once connected.
 
 Use your own WhatsApp account as the bot and test from a second number you control.
 
-1) Run `owpenwork setup` and choose “personal number.”
-2) Run `owpenwork whatsapp login` to scan the QR.
+1) Run `owpenwork` and choose “personal number.”
+2) Scan the QR when prompted.
 3) Message yourself or from a second number; your number is already allowlisted.
 
 Note: WhatsApp’s “message yourself” thread is not reliable for bot testing.
@@ -86,8 +72,8 @@ Note: WhatsApp’s “message yourself” thread is not reliable for bot testing
 Use a separate WhatsApp number as the bot account so it stays independent from your personal chat history.
 
 1) Create a new WhatsApp account for the dedicated number.
-2) Run `owpenwork setup` and choose “dedicated number.”
-3) Run `owpenwork whatsapp login` to scan the QR.
+2) Run `owpenwork` and choose “dedicated number.”
+3) Scan the QR when prompted.
 4) If DM policy is pairing, approve codes with `owpenwork pairing approve <code>`.
 
 ## Telegram (Untested)
@@ -99,9 +85,8 @@ Telegram support is wired but not E2E tested yet. To try it:
 ## Commands
 
 ```bash
-owpenwork setup
-owpenwork whatsapp login
-owpenwork start
+owpenwork
+owpenwork --non-interactive
 owpenwork pairing list
 owpenwork pairing approve <code>
 owpenwork status
@@ -110,7 +95,7 @@ owpenwork status
 ## Defaults
 
 - SQLite at `~/.owpenbot/owpenbot.db` unless overridden.
-- Config stored at `~/.owpenbot/owpenbot.json` (created by `owpenbot setup`).
+- Config stored at `~/.owpenbot/owpenbot.json` (created by `owpenwork` or `owpenwork setup`).
 - DM policy defaults to `pairing` unless changed in setup.
 - Group chats are disabled unless `GROUPS_ENABLED=true`.
 
@@ -119,4 +104,6 @@ owpenwork status
 ```bash
 pnpm -C packages/owpenbot test:unit
 pnpm -C packages/owpenbot test:smoke
+pnpm -C packages/owpenbot test:cli
+pnpm -C packages/owpenbot test:npx
 ```

package/dist/cli.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import fs from "node:fs";
+import path from "node:path";
 import { createInterface } from "node:readline/promises";
 import { Command } from "commander";
 import { startBridge } from "./bridge.js";
@@ -10,8 +11,11 @@ import { loginWhatsApp, unpairWhatsApp } from "./whatsapp.js";
 const program = new Command();
 program
     .name("owpenbot")
+    .version("0.1.3")
     .description("OpenCode WhatsApp + Telegram bridge")
-    .argument("[path]");
+    .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();
@@ -22,7 +26,7 @@ const runStart = async (pathOverride) => {
         process.env.OPENCODE_DIRECTORY = config.opencodeDirectory;
     }
     const bridge = await startBridge(config, logger);
-    logger.info("Commands: owpenbot whatsapp login, owpenbot pairing list, owpenbot status");
+    logger.info("Commands: owpenwork whatsapp login, owpenwork pairing list, owpenwork status");
     const shutdown = async () => {
         logger.info("shutting down");
         await bridge.stop();
@@ -31,26 +35,10 @@ const runStart = async (pathOverride) => {
     process.on("SIGINT", shutdown);
     process.on("SIGTERM", shutdown);
 };
-program
-    .command("start")
-    .description("Start the bridge")
-    .action(() => runStart());
-program.action((pathArg) => {
-    if (process.argv.includes("--help") || process.argv.includes("-h")) {
-        program.outputHelp();
-        return;
-    }
-    return runStart(pathArg);
-});
-program
-    .command("setup")
-    .description("Create or update owpenbot.json for WhatsApp")
-    .option("--non-interactive", "Write defaults without prompts", false)
-    .action(async (opts) => {
-    const config = loadConfig(process.env, { requireOpencode: false });
+async function runSetupWizard(config, nonInteractive) {
     const { config: existing } = readConfigFile(config.configPath);
     const next = existing ?? { version: 1 };
-    if (opts.nonInteractive) {
+    if (nonInteractive) {
         next.version = 1;
         next.channels = next.channels ?? {};
         next.channels.whatsapp = {
@@ -125,6 +113,58 @@ program
     };
     writeConfigFile(config.configPath, next);
     console.log(`Wrote ${config.configPath}`);
+}
+async function runGuidedFlow(pathArg, opts) {
+    if (pathArg?.trim()) {
+        process.env.OPENCODE_DIRECTORY = pathArg.trim();
+    }
+    let config = loadConfig(process.env, { requireOpencode: false });
+    if (!process.env.OPENCODE_DIRECTORY) {
+        process.env.OPENCODE_DIRECTORY = config.opencodeDirectory;
+    }
+    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);
+    }
+    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;
+        }
+    }
+    config = loadConfig(process.env, { requireOpencode: false });
+    const authPath = path.join(config.whatsappAuthDir, "creds.json");
+    if (!fs.existsSync(authPath)) {
+        await loginWhatsApp(config, createLogger(config.logLevel));
+    }
+    await runStart(pathArg);
+}
+program
+    .command("start")
+    .description("Start the bridge")
+    .action(() => runStart());
+program.action((pathArg) => {
+    if (process.argv.includes("--help") || process.argv.includes("-h")) {
+        program.outputHelp();
+        return;
+    }
+    const opts = program.opts();
+    return runGuidedFlow(pathArg, { nonInteractive: Boolean(opts.nonInteractive), check: Boolean(opts.check) });
+});
+program
+    .command("setup")
+    .description("Create or update owpenbot.json for WhatsApp")
+    .option("--non-interactive", "Write defaults without prompts", false)
+    .action(async (opts) => {
+    const config = loadConfig(process.env, { requireOpencode: false });
+    await runSetupWizard(config, Boolean(opts.nonInteractive));
 });
 program
     .command("pairing-code")

package/install.sh

@@ -140,9 +140,8 @@ cat <<EOF
 Owpenbot installed.
 
 Next steps:
-1) Run setup: owpenwork setup
-2) Link WhatsApp: owpenwork whatsapp login
-3) Start bridge: owpenwork start
+1) Run owpenwork: owpenwork
+2) Follow the guided setup + QR login
 
 Owpenbot will print a QR code during login and keep the session alive.
 EOF

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owpenwork",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "WhatsApp bridge for a running OpenCode server",
   "private": false,
   "type": "module",
@@ -35,7 +35,9 @@
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "setup": "node scripts/setup.mjs",
     "test:unit": "pnpm build && node --test test/*.test.js",
-    "test:smoke": "node scripts/smoke.mjs"
+    "test:smoke": "node scripts/smoke.mjs",
+    "test:cli": "pnpm build && node scripts/test-cli.mjs",
+    "test:npx": "node scripts/test-npx.mjs"
   },
   "dependencies": {
     "@opencode-ai/sdk": "^1.1.19",