beecork 1.3.9 → 1.3.11

package/dist/cli/commands.js

@@ -23,22 +23,6 @@ export async function startDaemon() {
         console.log(`Beecork daemon is already running (PID: ${existingPid})`);
         return;
     }
-    // Check if WhatsApp needs pairing
-    const config = getConfig();
-    const waSessionPath = config.whatsapp?.sessionPath ?? `${process.env.HOME}/.beecork/whatsapp-session`;
-    const waEnabled = config.whatsapp?.enabled;
-    const waHasSession = waEnabled && fs.existsSync(waSessionPath) && fs.readdirSync(waSessionPath).length > 0;
-    if (waEnabled && !waHasSession) {
-        console.log('\n⚠ WhatsApp is enabled but not yet paired.');
-        console.log('  Starting daemon in foreground so you can scan the QR code...');
-        console.log('  Once paired, press Ctrl+C and run "beecork start" again.\n');
-        const daemonPath = new URL('../daemon.js', import.meta.url).pathname;
-        const child = spawn('node', [daemonPath], {
-            stdio: 'inherit',
-        });
-        process.on('SIGINT', () => { child.kill(); process.exit(0); });
-        return;
-    }
     try {
         startService();
         console.log('Beecork daemon started via system service.');

package/dist/index.js

@@ -135,7 +135,7 @@ channelCmd
 });
 program
     .command('discord')
-    .description('Configure Discord channel')
+    .description('Set up Discord — interactive setup for bot token and user ID')
     .action(async () => {
     const readline = await import('node:readline');
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
@@ -163,15 +163,16 @@ program
 });
 program
     .command('whatsapp')
-    .description('Configure WhatsApp channel')
+    .description('Set up WhatsApp — enter phone number, then scan QR code to pair')
     .action(async () => {
     const readline = await import('node:readline');
+    const fs = await import('node:fs');
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     const ask = (q, def) => new Promise(r => rl.question(def ? `${q} [${def}]: ` : `${q}: `, a => r(a.trim() || def || '')));
     console.log('\nWhatsApp Setup\n');
     console.log('  WhatsApp connects via QR code scanning (like WhatsApp Web).');
-    console.log('  After setup, run "beecork start" and the QR code will appear');
-    console.log('  in your terminal. Scan it with your phone to pair.\n');
+    console.log('  After entering your phone number, a QR code will appear.');
+    console.log('  Scan it with your phone to pair.\n');
     const number = await ask('Your WhatsApp phone number (e.g., 14155551234)');
     if (!number) {
         console.log('No number provided. Cancelled.');
@@ -181,22 +182,53 @@ program
     const { getConfig, saveConfig } = await import('./config.js');
     const { getBeecorkHome } = await import('./util/paths.js');
     const config = getConfig();
+    const sessionPath = `${getBeecorkHome()}/whatsapp-session`;
     config.whatsapp = {
         enabled: true,
         mode: 'baileys',
-        sessionPath: `${getBeecorkHome()}/whatsapp-session`,
+        sessionPath,
         allowedNumbers: [number],
     };
     saveConfig(config);
-    console.log('\n✓ WhatsApp configured.');
-    console.log('  Next: run "beecork start" — the QR code will appear in your terminal.');
-    console.log('  Scan it with your phone to pair. Once paired, press Ctrl+C and');
-    console.log('  run "beecork start" again for background operation.\n');
+    console.log('\n✓ Config saved. Connecting to WhatsApp...\n');
     rl.close();
+    // Pair immediately — show QR code in this terminal
+    try {
+        const { default: makeWASocket, useMultiFileAuthState, DisconnectReason } = await import('@whiskeysockets/baileys');
+        fs.mkdirSync(sessionPath, { recursive: true, mode: 0o700 });
+        const { state, saveCreds } = await useMultiFileAuthState(sessionPath);
+        const sock = makeWASocket({
+            auth: state,
+            printQRInTerminal: true,
+        });
+        sock.ev.on('creds.update', saveCreds);
+        sock.ev.on('connection.update', (update) => {
+            if (update.connection === 'open') {
+                console.log('\n✓ WhatsApp paired successfully!');
+                console.log('  You can now start the daemon: beecork start\n');
+                sock.end(undefined);
+                process.exit(0);
+            }
+            if (update.connection === 'close') {
+                const reason = update.lastDisconnect?.error?.output?.statusCode;
+                if (reason === DisconnectReason.loggedOut) {
+                    console.log('\n✗ WhatsApp logged out. Please try again.\n');
+                    process.exit(1);
+                }
+            }
+        });
+        console.log('Scan the QR code above with your phone (WhatsApp → Linked Devices → Link a Device)');
+        console.log('Waiting for pairing... (Ctrl+C to cancel)\n');
+    }
+    catch (err) {
+        console.error('Failed to connect to WhatsApp:', err instanceof Error ? err.message : err);
+        console.log('\nConfig is saved. You can try pairing later by running: beecork whatsapp');
+        process.exit(1);
+    }
 });
 program
     .command('webhook')
-    .description('Configure Webhook channel')
+    .description('Set up Webhook — enable HTTP API for triggering Beecork from any service')
     .action(async () => {
     const readline = await import('node:readline');
     const crypto = await import('node:crypto');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beecork",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "description": "Claude Code always-on infrastructure — a phone number, a memory, and an alarm clock",
   "type": "module",
   "bin": {