squidclaw 0.5.1 → 0.5.3

package/lib/channels/hub.js

@@ -22,6 +22,20 @@ export class ChannelHub {
       return;
     }
 
+    // Allowlist check
+    const allowFrom = agent.allowFrom || ['*'];
+    if (!allowFrom.includes('*')) {
+      const senderNum = contactId.replace('@s.whatsapp.net', '').replace(/[^0-9]/g, '');
+      const allowed = allowFrom.some(n => {
+        const clean = n.replace(/[^0-9]/g, '');
+        return senderNum.endsWith(clean) || clean.endsWith(senderNum);
+      });
+      if (!allowed) {
+        logger.info('hub', 'Message from ' + contactId + ' blocked (not in allowlist)');
+        return;
+      }
+    }
+
     // Skip group messages unless mentioned (for now)
     if (metadata.isGroup) {
       // TODO: implement group mention detection

package/lib/cli/hatch-tui.js

@@ -5,7 +5,7 @@
 
 import chalk from 'chalk';
 import { createInterface } from 'readline';
-import { loadConfig, getHome } from '../core/config.js';
+import { loadConfig, getHome, MODEL_MAP } from '../core/config.js';
 import { writeFileSync, readFileSync, existsSync } from 'fs';
 import { join } from 'path';
 
@@ -18,7 +18,7 @@ export async function hatchTUI(agentId) {
   const manifestPath = join(agentDir, 'agent.json');
 
   if (!existsSync(manifestPath)) {
-    console.log(chalk.red('Agent not found: ' + agentId));
+    console.log(chalk.red('  Agent not found: ' + agentId));
     return;
   }
 
@@ -39,10 +39,9 @@ export async function hatchTUI(agentId) {
   console.log();
 
   // ═══ Start engine silently ═══
-  let engine = null;
   const port = config.engine?.port || 9500;
+  let engine = null;
 
-  // Check if engine already running
   let engineReady = false;
   try {
     const res = await fetch('http://127.0.0.1:' + port + '/health');
@@ -54,7 +53,6 @@ export async function hatchTUI(agentId) {
     try {
       const { SquidclawEngine } = await import('../engine.js');
       engine = new SquidclawEngine({ port });
-      // Suppress output
       const origLog = console.log;
       const origErr = console.error;
       console.log = () => {};
@@ -64,7 +62,8 @@ export async function hatchTUI(agentId) {
       console.error = origErr;
       process.stdout.write(chalk.green(' ready!\n\n'));
     } catch (err) {
-      console.log(chalk.red(' failed: ' + err.message));
+      process.stdout.write(chalk.red(' failed\n'));
+      console.log(chalk.red('  ' + err.message));
       console.log(chalk.gray('  Run "squidclaw start" first, then "squidclaw wake"'));
       return;
     }
@@ -72,10 +71,9 @@ export async function hatchTUI(agentId) {
 
   await DELAY(500);
 
-  // ═══ First message from agent ═══
-  const firstMessage = await callAgent(port, agentId, 
-    'You just came to life for the very first time. You are "' + manifest.name + '". Express excitement about existing — be curious, a little confused. Ask: who are you? who am I? Keep it to 2-3 SHORT sentences. Be playful. No ---SPLIT--- markers.',
-    true
+  // ═══ Agent's first message — call AI directly ═══
+  const firstMessage = await callAgentDirect(config, manifest, 
+    'You just came to life. You are ' + manifest.name + '. Express excitement — be curious, playful. Ask who you are talking to. 2-3 SHORT sentences only.'
   );
 
   await typeMessage(manifest.name, firstMessage);
@@ -84,38 +82,36 @@ export async function hatchTUI(agentId) {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   let turnCount = 0;
   let agentFinalName = manifest.name;
+  const chatHistory = [
+    { role: 'assistant', content: firstMessage }
+  ];
 
-  const askUser = () => new Promise(resolve => {
-    rl.question(chalk.green('\n  You: '), (answer) => resolve(answer));
-  });
-
-  console.log(chalk.gray('\n  (Type /done when you\'re ready to finish hatching)\n'));
+  console.log(chalk.gray('\n  (Type /done when ready to finish hatching)\n'));
 
   while (true) {
-    const userInput = await askUser();
+    const userInput = await new Promise(resolve => {
+      rl.question(chalk.green('\n  You: '), resolve);
+    });
     if (!userInput || !userInput.trim()) continue;
     if (userInput.trim().toLowerCase() === '/done' || userInput.trim().toLowerCase() === '/exit') break;
 
     turnCount++;
+    chatHistory.push({ role: 'user', content: userInput });
 
     let hint = '';
-    if (turnCount <= 2) {
-      hint = 'You are still figuring out who you are. Ask about your personality, your name, what you do. Be curious and playful.';
-    } else if (turnCount <= 4) {
-      hint = 'You are forming your identity now. Confirm what you have learned. Show your personality emerging.';
-    } else {
-      hint = 'You know who you are. Act like it. If conversation feels complete, suggest typing /done.';
-    }
+    if (turnCount <= 2) hint = 'You are discovering who you are. Ask about your name, personality, purpose. Be curious.';
+    else if (turnCount <= 4) hint = 'Your identity is forming. Show your personality. Confirm what you learned.';
+    else hint = 'You know who you are now. Act like it. If the conversation feels complete, suggest /done.';
 
-    const response = await callAgent(port, agentId, userInput, false, hint);
+    const response = await callAgentDirect(config, manifest, userInput, chatHistory, hint);
+    chatHistory.push({ role: 'assistant', content: response });
     await typeMessage(agentFinalName, response);
 
-    // Check if user renamed agent
-    const nameMatch = userInput.match(/call you (\w+)/i) || userInput.match(/your name.+?(\w+)$/i) || userInput.match(/name you (\w+)/i);
+    const nameMatch = userInput.match(/call you (\w+)/i) || userInput.match(/name you (\w+)/i);
     if (nameMatch) agentFinalName = nameMatch[1];
   }
 
-  // ═══ Save identity ═══
+  // ═══ Save ═══
   console.log();
   console.log(chalk.cyan('  ════════════════════════════════════'));
   console.log(chalk.cyan('  🦑 ' + agentFinalName + ' is hatched!'));
@@ -127,7 +123,6 @@ export async function hatchTUI(agentId) {
   manifest.hatchedAt = new Date().toISOString();
   writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
 
-  // Update SOUL.md
   const soulPath = join(agentDir, 'SOUL.md');
   if (existsSync(soulPath)) {
     let soul = readFileSync(soulPath, 'utf8');
@@ -137,36 +132,117 @@ export async function hatchTUI(agentId) {
 
   writeFileSync(join(agentDir, 'IDENTITY.md'), '# ' + agentFinalName + '\n- Name: ' + agentFinalName + '\n- Hatched: ' + new Date().toISOString() + '\n- Emoji: 🦑\n');
 
-  console.log(chalk.green('  ✅ ' + agentFinalName + ' is ready!\n'));
-  console.log('  ' + chalk.bold('Commands:\n'));
-  console.log('     ' + chalk.cyan('squidclaw start') + '   — run the engine');
+  console.log(chalk.green('  ✅ ' + agentFinalName + ' is alive!\n'));
+  console.log('  ' + chalk.bold('Now run:\n'));
+  console.log('     ' + chalk.cyan('squidclaw start') + '   — launch the engine');
   console.log('     ' + chalk.cyan('squidclaw tui') + '     — chat in terminal');
-  console.log('     ' + chalk.cyan('squidclaw status') + '  — check status');
   console.log();
 
   rl.close();
-  if (engine) {
-    try { await engine.stop(); } catch {}
-  }
+  if (engine) { try { await engine.stop(); } catch {} }
   process.exit(0);
 }
 
-async function callAgent(port, agentId, message, isFirstMessage, hint) {
+/**
+ * Call AI directly (bypass engine API) for the hatch conversation
+ */
+async function callAgentDirect(config, manifest, message, history, hint) {
+  const provider = config.ai?.defaultProvider || 'anthropic';
+  const rawModel = manifest.model || config.ai?.defaultModel || 'claude-sonnet-4';
+  const model = MODEL_MAP[rawModel] || rawModel;
+  const providerConfig = config.ai?.providers?.[provider] || {};
+  const apiKey = providerConfig.key;
+
+  if (!apiKey || apiKey === 'local') {
+    return "I can't think yet — no API key configured. Check your config!";
+  }
+
+  const systemPrompt = 'You are ' + manifest.name + ', an AI agent that just hatched (came to life). This is your first conversation ever. Be playful, curious, excited. Keep responses SHORT (2-3 sentences max). No ---SPLIT--- markers. No "As an AI" phrases.' + (hint ? '\n\n' + hint : '');
+
+  const messages = [
+    { role: 'user', content: message }
+  ];
+
+  // Add history if available
+  if (history && history.length > 0) {
+    messages.length = 0;
+    for (const h of history.slice(-10)) {
+      messages.push({ role: h.role, content: h.content });
+    }
+    messages.push({ role: 'user', content: message });
+  }
+
   try {
-    const body = { message, contactId: 'hatch-session' };
-    if (hint) body.systemHint = hint;
-    if (isFirstMessage) body.systemOverride = message;
-
-    const res = await fetch('http://127.0.0.1:' + port + '/api/agents/' + agentId + '/chat', {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify(body),
-    });
+    // Determine API endpoint
+    let url, headers, body;
+
+    if (provider === 'anthropic') {
+      url = 'https://api.anthropic.com/v1/messages';
+      headers = {
+        'content-type': 'application/json',
+        'x-api-key': apiKey,
+        'anthropic-version': '2023-06-01',
+      };
+      // OAuth token support
+      if (apiKey.includes('sk-ant-oat')) {
+        headers['authorization'] = 'Bearer ' + apiKey;
+        headers['anthropic-beta'] = 'claude-code-20250219,oauth-2025-04-20';
+        delete headers['x-api-key'];
+      }
+      body = JSON.stringify({
+        model: model,
+        max_tokens: 300,
+        system: systemPrompt,
+        messages: messages,
+      });
+    } else if (provider === 'openai' || provider === 'groq' || provider === 'together' || provider === 'cerebras' || provider === 'mistral') {
+      const urls = {
+        openai: 'https://api.openai.com/v1/chat/completions',
+        groq: 'https://api.groq.com/openai/v1/chat/completions',
+        together: 'https://api.together.xyz/v1/chat/completions',
+        cerebras: 'https://api.cerebras.ai/v1/chat/completions',
+        mistral: 'https://api.mistral.ai/v1/chat/completions',
+      };
+      url = urls[provider];
+      headers = {
+        'content-type': 'application/json',
+        'authorization': 'Bearer ' + apiKey,
+      };
+      body = JSON.stringify({
+        model: model.replace(provider + '/', ''),
+        max_tokens: 300,
+        messages: [{ role: 'system', content: systemPrompt }, ...messages],
+      });
+    } else if (provider === 'google') {
+      const cleanModel = model.replace('google/', '');
+      url = 'https://generativelanguage.googleapis.com/v1beta/models/' + cleanModel + ':generateContent?key=' + apiKey;
+      headers = { 'content-type': 'application/json' };
+      body = JSON.stringify({
+        systemInstruction: { parts: [{ text: systemPrompt }] },
+        contents: messages.map(m => ({ role: m.role === 'assistant' ? 'model' : 'user', parts: [{ text: m.content }] })),
+      });
+    } else {
+      return "Provider " + provider + " isn't supported in hatch mode yet. Try starting the engine first.";
+    }
+
+    const res = await fetch(url, { method: 'POST', headers, body });
     const data = await res.json();
-    const msgs = data.messages || [];
-    return msgs.join(' ') || '...';
+
+    if (!res.ok) {
+      const errMsg = data?.error?.message || data?.message || JSON.stringify(data).slice(0, 200);
+      return '(AI error: ' + errMsg + ')';
+    }
+
+    // Extract response based on provider
+    if (provider === 'anthropic') {
+      return data.content?.[0]?.text || '...';
+    } else if (provider === 'google') {
+      return data.candidates?.[0]?.content?.parts?.[0]?.text || '...';
+    } else {
+      return data.choices?.[0]?.message?.content || '...';
+    }
   } catch (err) {
-    return '(oops, something went wrong: ' + err.message + ')';
+    return '(connection error: ' + err.message + ')';
   }
 }
 

package/lib/cli/setup.js

@@ -176,9 +176,10 @@ export async function setup() {
   if (p.isCancel(connectWA)) return p.cancel('Setup cancelled');
 
   let waConnected = false;
+  let waPhone = null;
 
   if (connectWA === 'pair') {
-    const waPhone = await p.text({
+    waPhone = await p.text({
       message: 'WhatsApp phone number (with country code):',
       placeholder: '+966 5XX XXX XXXX',
       validate: (v) => v.replace(/[^0-9+]/g, '').length < 8 ? 'Enter a valid phone number' : undefined,
@@ -186,6 +187,7 @@ export async function setup() {
     if (p.isCancel(waPhone)) return p.cancel('Setup cancelled');
 
     const cleanPhone = waPhone.replace(/[^0-9]/g, '');
+    waPhone = cleanPhone;
     manifest.whatsappNumber = cleanPhone;
 
     // Actually connect WhatsApp NOW
@@ -215,6 +217,50 @@ export async function setup() {
     config.channels.whatsapp.enabled = true;
   }
 
+  // Ask for allowlist (who can chat with this agent?)
+  if (connectWA !== 'skip') {
+    const allowMode = await p.select({
+      message: 'Who can message this agent on WhatsApp?',
+      options: [
+        { value: 'owner', label: '🔒 Only me', hint: 'recommended for testing' },
+        { value: 'list', label: '📋 Specific numbers (allowlist)' },
+        { value: 'all', label: '🌍 Everyone', hint: 'public agent' },
+      ],
+    });
+    if (p.isCancel(allowMode)) return p.cancel('Setup cancelled');
+
+    if (allowMode === 'owner' && waPhone) {
+      config.channels.whatsapp.allowFrom = [waPhone];
+      manifest.allowFrom = [waPhone];
+      console.log(chalk.gray('  Only ' + waPhone + ' can chat with ' + agentName));
+    } else if (allowMode === 'owner' && !waPhone) {
+      const ownerPhone = await p.text({
+        message: 'Your phone number (with country code):',
+        placeholder: '+966 5XX XXX XXXX',
+        validate: (v) => v.replace(/[^0-9+]/g, '').length < 8 ? 'Enter a valid number' : undefined,
+      });
+      if (!p.isCancel(ownerPhone)) {
+        const clean = ownerPhone.replace(/[^0-9]/g, '');
+        config.channels.whatsapp.allowFrom = [clean];
+        manifest.allowFrom = [clean];
+      }
+    } else if (allowMode === 'list') {
+      const numbers = await p.text({
+        message: 'Allowed numbers (comma separated):',
+        placeholder: '+966501234567, +966509876543',
+        validate: (v) => v.length < 5 ? 'Enter at least one number' : undefined,
+      });
+      if (!p.isCancel(numbers)) {
+        const list = numbers.split(',').map(n => n.replace(/[^0-9]/g, '').trim()).filter(Boolean);
+        config.channels.whatsapp.allowFrom = list;
+        manifest.allowFrom = list;
+      }
+    } else {
+      config.channels.whatsapp.allowFrom = ['*'];
+      manifest.allowFrom = ['*'];
+    }
+  }
+
   // ═══ Step 4: Telegram ═══
   p.note('Step 4 of 4: Telegram', '✈️');
 

package/lib/cli/wa-login.js

@@ -3,7 +3,7 @@
  * Shows QR code or pairing code right in the terminal
  */
 
-import { default as makeWASocket, useMultiFileAuthState, DisconnectReason, fetchLatestBaileysVersion } from 'baileys';
+import { makeWASocket, useMultiFileAuthState, DisconnectReason, fetchLatestBaileysVersion } from '@whiskeysockets/baileys';
 import qrcode from 'qrcode-terminal';
 import chalk from 'chalk';
 import { mkdirSync } from 'fs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squidclaw",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "\ud83e\udd91 AI agent platform \u2014 human-like agents for WhatsApp, Telegram & more",
   "main": "lib/engine.js",
   "bin": {