owpenwork 0.1.1 → 0.1.3

package/README.md

@@ -10,7 +10,19 @@ One-command install (recommended):
 curl -fsSL https://raw.githubusercontent.com/different-ai/openwork/dev/packages/owpenbot/install.sh | bash
 ```
 
-Then follow the printed next steps (run `owpenbot setup`, link WhatsApp, start the bridge).
+Or install from npm:
+
+```bash
+npm install -g owpenwork
+```
+
+Quick run without install:
+
+```bash
+npx owpenwork
+```
+
+Then follow the prompts (setup, QR login, start).
 
 1) One-command setup (installs deps, builds, creates `.env` if missing):
 
@@ -29,30 +41,18 @@ Recommended:
 - `OPENCODE_SERVER_USERNAME`
 - `OPENCODE_SERVER_PASSWORD`
 
-3) Run setup (writes `~/.owpenbot/owpenbot.json`):
-
-```bash
-owpenbot setup
-```
-
-4) Link WhatsApp (QR):
-
-```bash
-owpenbot whatsapp login
-```
-
-5) Start the bridge:
+3) Run owpenwork and follow the guided setup:
 
 ```bash
-owpenbot start
+owpenwork
 ```
 
-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):
 
-- Run `owpenbot pairing list` to view pending codes.
-- Approve a code: `owpenbot pairing approve <code>`.
+- Run `owpenwork pairing list` to view pending codes.
+- Approve a code: `owpenwork pairing approve <code>`.
 - The user can then message again to receive OpenCode replies.
 
 ## Usage Flows
@@ -61,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 `owpenbot setup` and choose “personal number.”
-2) Run `owpenbot 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.
@@ -72,9 +72,9 @@ 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 `owpenbot setup` and choose “dedicated number.”
-3) Run `owpenbot whatsapp login` to scan the QR.
-4) If DM policy is pairing, approve codes with `owpenbot pairing approve <code>`.
+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)
 
@@ -85,18 +85,17 @@ Telegram support is wired but not E2E tested yet. To try it:
 ## Commands
 
 ```bash
-owpenbot setup
-owpenbot whatsapp login
-owpenbot start
-owpenbot pairing list
-owpenbot pairing approve <code>
-owpenbot status
+owpenwork
+owpenwork --non-interactive
+owpenwork pairing list
+owpenwork pairing approve <code>
+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`.
 
@@ -105,4 +104,6 @@ owpenbot 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,4 +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,7 +12,9 @@ const program = new Command();
 program
     .name("owpenbot")
     .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();
@@ -21,7 +25,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();
@@ -30,26 +34,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 = {
@@ -124,6 +112,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

@@ -5,6 +5,7 @@ OWPENBOT_REF="${OWPENBOT_REF:-dev}"
 OWPENBOT_REPO="${OWPENBOT_REPO:-https://github.com/different-ai/openwork.git}"
 OWPENBOT_INSTALL_DIR="${OWPENBOT_INSTALL_DIR:-$HOME/.owpenbot/openwork}"
 OWPENBOT_BIN_DIR="${OWPENBOT_BIN_DIR:-$HOME/.local/bin}"
+OWPENBOT_INSTALL_METHOD="${OWPENBOT_INSTALL_METHOD:-npm}"
 
 usage() {
   cat <<'EOF'
@@ -15,6 +16,7 @@ Environment variables:
   OWPENBOT_REPO         Git repo (default: https://github.com/different-ai/openwork.git)
   OWPENBOT_REF          Git ref/branch (default: dev)
   OWPENBOT_BIN_DIR      Bin directory for owpenbot shim (default: ~/.local/bin)
+  OWPENBOT_INSTALL_METHOD  Install method: npm|git (default: npm)
 
 Example:
   OWPENBOT_INSTALL_DIR=~/owpenbot curl -fsSL https://raw.githubusercontent.com/different-ai/openwork/dev/packages/owpenbot/install.sh | bash
@@ -33,82 +35,87 @@ require_bin() {
   fi
 }
 
-require_bin git
 require_bin node
 
-if ! command -v pnpm >/dev/null 2>&1; then
-  if command -v corepack >/dev/null 2>&1; then
-    corepack enable >/dev/null 2>&1 || true
-    corepack prepare pnpm@10.27.0 --activate
-  else
-    echo "pnpm is required. Install pnpm or enable corepack, then retry." >&2
-    exit 1
+if [[ "$OWPENBOT_INSTALL_METHOD" == "npm" ]]; then
+  echo "Installing owpenwork via npm..."
+  npm install -g owpenwork
+else
+  require_bin git
+  if ! command -v pnpm >/dev/null 2>&1; then
+    if command -v corepack >/dev/null 2>&1; then
+      corepack enable >/dev/null 2>&1 || true
+      corepack prepare pnpm@10.27.0 --activate
+    else
+      echo "pnpm is required. Install pnpm or enable corepack, then retry." >&2
+      exit 1
+    fi
   fi
-fi
 
-if [[ -d "$OWPENBOT_INSTALL_DIR/.git" ]]; then
-  echo "Updating owpenbot source in $OWPENBOT_INSTALL_DIR"
-  git -C "$OWPENBOT_INSTALL_DIR" fetch origin --prune
-  if git -C "$OWPENBOT_INSTALL_DIR" show-ref --verify --quiet "refs/remotes/origin/$OWPENBOT_REF"; then
-    git -C "$OWPENBOT_INSTALL_DIR" checkout -B "$OWPENBOT_REF" "origin/$OWPENBOT_REF"
-    git -C "$OWPENBOT_INSTALL_DIR" pull --ff-only origin "$OWPENBOT_REF"
+  if [[ -d "$OWPENBOT_INSTALL_DIR/.git" ]]; then
+    echo "Updating owpenbot source in $OWPENBOT_INSTALL_DIR"
+    git -C "$OWPENBOT_INSTALL_DIR" fetch origin --prune
+    if git -C "$OWPENBOT_INSTALL_DIR" show-ref --verify --quiet "refs/remotes/origin/$OWPENBOT_REF"; then
+      git -C "$OWPENBOT_INSTALL_DIR" checkout -B "$OWPENBOT_REF" "origin/$OWPENBOT_REF"
+      git -C "$OWPENBOT_INSTALL_DIR" pull --ff-only origin "$OWPENBOT_REF"
+    else
+      git -C "$OWPENBOT_INSTALL_DIR" checkout -f
+      git -C "$OWPENBOT_INSTALL_DIR" pull --ff-only
+    fi
   else
-    git -C "$OWPENBOT_INSTALL_DIR" checkout -f
-    git -C "$OWPENBOT_INSTALL_DIR" pull --ff-only
+    echo "Cloning owpenbot source to $OWPENBOT_INSTALL_DIR"
+    mkdir -p "$OWPENBOT_INSTALL_DIR"
+    git clone --depth 1 "$OWPENBOT_REPO" "$OWPENBOT_INSTALL_DIR"
+    if git -C "$OWPENBOT_INSTALL_DIR" show-ref --verify --quiet "refs/remotes/origin/$OWPENBOT_REF"; then
+      git -C "$OWPENBOT_INSTALL_DIR" checkout -B "$OWPENBOT_REF" "origin/$OWPENBOT_REF"
+    fi
   fi
-else
-  echo "Cloning owpenbot source to $OWPENBOT_INSTALL_DIR"
-  mkdir -p "$OWPENBOT_INSTALL_DIR"
-  git clone --depth 1 "$OWPENBOT_REPO" "$OWPENBOT_INSTALL_DIR"
-  if git -C "$OWPENBOT_INSTALL_DIR" show-ref --verify --quiet "refs/remotes/origin/$OWPENBOT_REF"; then
-    git -C "$OWPENBOT_INSTALL_DIR" checkout -B "$OWPENBOT_REF" "origin/$OWPENBOT_REF"
-  fi
-fi
 
-if [[ ! -d "$OWPENBOT_INSTALL_DIR/packages/owpenbot" ]]; then
-  echo "owpenbot package not found on ref '$OWPENBOT_REF'. Trying dev/main..." >&2
-  git -C "$OWPENBOT_INSTALL_DIR" fetch origin --prune
-  if git -C "$OWPENBOT_INSTALL_DIR" show-ref --verify --quiet refs/remotes/origin/dev; then
-    git -C "$OWPENBOT_INSTALL_DIR" checkout -B dev origin/dev
-  elif git -C "$OWPENBOT_INSTALL_DIR" show-ref --verify --quiet refs/remotes/origin/main; then
-    git -C "$OWPENBOT_INSTALL_DIR" checkout -B main origin/main
+  if [[ ! -d "$OWPENBOT_INSTALL_DIR/packages/owpenbot" ]]; then
+    echo "owpenbot package not found on ref '$OWPENBOT_REF'. Trying dev/main..." >&2
+    git -C "$OWPENBOT_INSTALL_DIR" fetch origin --prune
+    if git -C "$OWPENBOT_INSTALL_DIR" show-ref --verify --quiet refs/remotes/origin/dev; then
+      git -C "$OWPENBOT_INSTALL_DIR" checkout -B dev origin/dev
+    elif git -C "$OWPENBOT_INSTALL_DIR" show-ref --verify --quiet refs/remotes/origin/main; then
+      git -C "$OWPENBOT_INSTALL_DIR" checkout -B main origin/main
+    fi
   fi
-fi
 
-if [[ ! -d "$OWPENBOT_INSTALL_DIR/packages/owpenbot" ]]; then
-  echo "owpenbot package not found after checkout. Aborting." >&2
-  exit 1
-fi
+  if [[ ! -d "$OWPENBOT_INSTALL_DIR/packages/owpenbot" ]]; then
+    echo "owpenbot package not found after checkout. Aborting." >&2
+    exit 1
+  fi
 
-echo "Installing dependencies..."
-pnpm -C "$OWPENBOT_INSTALL_DIR" install
+  echo "Installing dependencies..."
+  pnpm -C "$OWPENBOT_INSTALL_DIR" install
 
-echo "Building owpenbot..."
-pnpm -C "$OWPENBOT_INSTALL_DIR/packages/owpenbot" build
+  echo "Building owpenbot..."
+  pnpm -C "$OWPENBOT_INSTALL_DIR/packages/owpenbot" build
 
-ENV_PATH="$OWPENBOT_INSTALL_DIR/packages/owpenbot/.env"
-ENV_EXAMPLE="$OWPENBOT_INSTALL_DIR/packages/owpenbot/.env.example"
-if [[ ! -f "$ENV_PATH" ]]; then
-  if [[ -f "$ENV_EXAMPLE" ]]; then
-    cp "$ENV_EXAMPLE" "$ENV_PATH"
-    echo "Created $ENV_PATH"
-  else
-    cat <<EOF > "$ENV_PATH"
+  ENV_PATH="$OWPENBOT_INSTALL_DIR/packages/owpenbot/.env"
+  ENV_EXAMPLE="$OWPENBOT_INSTALL_DIR/packages/owpenbot/.env.example"
+  if [[ ! -f "$ENV_PATH" ]]; then
+    if [[ -f "$ENV_EXAMPLE" ]]; then
+      cp "$ENV_EXAMPLE" "$ENV_PATH"
+      echo "Created $ENV_PATH"
+    else
+      cat <<EOF > "$ENV_PATH"
 OPENCODE_URL=http://127.0.0.1:4096
 OPENCODE_DIRECTORY=
 WHATSAPP_AUTH_DIR=~/.owpenbot/whatsapp
 EOF
-    echo "Created $ENV_PATH (minimal)"
+      echo "Created $ENV_PATH (minimal)"
+    fi
   fi
-fi
 
-mkdir -p "$OWPENBOT_BIN_DIR"
-cat <<EOF > "$OWPENBOT_BIN_DIR/owpenbot"
+  mkdir -p "$OWPENBOT_BIN_DIR"
+  cat <<EOF > "$OWPENBOT_BIN_DIR/owpenbot"
 #!/usr/bin/env bash
 set -euo pipefail
 node "$OWPENBOT_INSTALL_DIR/packages/owpenbot/dist/cli.js" "$@"
 EOF
-chmod 755 "$OWPENBOT_BIN_DIR/owpenbot"
+  chmod 755 "$OWPENBOT_BIN_DIR/owpenbot"
+fi
 
 if ! echo ":$PATH:" | grep -q ":$OWPENBOT_BIN_DIR:"; then
   shell_name="$(basename "${SHELL:-}" 2>/dev/null || true)"
@@ -133,10 +140,8 @@ cat <<EOF
 Owpenbot installed.
 
 Next steps:
-1) Edit $ENV_PATH (optional)
-2) Run setup: owpenbot setup
-3) Link WhatsApp: owpenbot whatsapp login
-4) Start bridge: owpenbot 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.1",
+  "version": "0.1.3",
   "description": "WhatsApp bridge for a running OpenCode server",
   "private": false,
   "type": "module",
@@ -11,7 +11,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/different-ai/openwork.git",
+    "url": "git+https://github.com/different-ai/openwork.git",
     "directory": "packages/owpenbot"
   },
   "keywords": [
@@ -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",