@clawchatsai/connector 0.0.59 → 0.0.61

package/dist/index.js

@@ -764,7 +764,7 @@ async function handleSetup(token) {
             const msg = JSON.parse(raw.toString());
             if (msg.type === 'setup-complete') {
                 clearTimeout(timeout);
-                console.log(`  User: ${msg.userId}`);
+                console.log(`  User: ${msg.email || msg.userId}`);
                 console.log('  Registering gateway... ✅');
                 // Save initial config (schemaVersion 1 — will upgrade to 2 after TOTP enrollment)
                 const config = {
@@ -792,21 +792,8 @@ async function handleSetup(token) {
                 fs.mkdirSync(dataDir, { recursive: true });
                 fs.mkdirSync(uploadsDir, { recursive: true });
                 ws.close();
-                // Ask if user wants to reuse TOTP from another gateway
-                let reuseSecret;
-                if (config.schemaVersion === 1) {
-                    const rlSetup = (await import('node:readline')).createInterface({ input: process.stdin, output: process.stdout });
-                    const askSetup = (q) => new Promise(r => rlSetup.question(q, r));
-                    console.log('');
-                    console.log('  💡 Already have ClawChats on another gateway?');
-                    console.log('     Run \`openclaw clawchats show-totp\` on that machine and paste the secret below.');
-                    const reuseAnswer = await askSetup('  Paste existing TOTP secret to reuse it (or press Enter to set up new): ');
-                    rlSetup.close();
-                    if (reuseAnswer.trim())
-                        reuseSecret = reuseAnswer.trim();
-                }
-                // Enroll TOTP (interactive — requires stdin)
-                const totpOk = await enrollTotp(config, reuseSecret);
+                // Enroll TOTP (interactive — single readline for the whole flow)
+                const totpOk = await enrollTotp(config);
                 if (!totpOk) {
                     console.log('');
                     console.log('  ⚠️  TOTP not configured. You can set it up later with: openclaw clawchats reauth');
@@ -839,11 +826,17 @@ async function handleSetup(token) {
         });
     });
 }
-async function enrollTotp(config, existingSecret) {
+async function enrollTotp(config) {
     const readline = await import('node:readline');
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     const ask = (q) => new Promise(r => rl.question(q, r));
     try {
+        // Ask once if the user wants to reuse a TOTP secret from another gateway
+        console.log('');
+        console.log('  💡 Already have ClawChats on another gateway?');
+        console.log('     Run `openclaw clawchats show-totp` on that machine, then paste the secret below.');
+        const reuseAnswer = await ask('  Paste existing TOTP secret (or press Enter to set up new): ');
+        const existingSecret = reuseAnswer.trim() || undefined;
         let totpSecret;
         if (existingSecret) {
             // Reusing secret from another gateway — strip spaces, uppercase
@@ -953,15 +946,7 @@ async function handleReauth() {
     console.log('  ⚠️  This will invalidate all existing sessions.');
     console.log('  All connected browsers will need to re-authenticate.');
     console.log('');
-    const readline = await import('node:readline');
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    const ask = (q) => new Promise(r => rl.question(q, r));
-    let existingSecret;
-    const reuseAnswer = await ask('  Reuse TOTP from another gateway? Paste secret (or press Enter to generate new): ');
-    rl.close();
-    if (reuseAnswer.trim())
-        existingSecret = reuseAnswer.trim();
-    const success = await enrollTotp(config, existingSecret);
+    const success = await enrollTotp(config);
     if (success) {
         console.log('  All previous sessions have been invalidated.');
         console.log('  Restart the gateway for changes to take effect: systemctl --user restart openclaw-gateway');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawchatsai/connector",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "type": "module",
   "description": "ClawChats OpenClaw plugin — P2P tunnel + local API bridge",
   "main": "dist/index.js",

package/server.js

@@ -3047,54 +3047,7 @@ class GatewayClient {
   }
 
   _writeActivityToDb(runId, log) {
-    if (!log._parsed) {
-      log._parsed = parseSessionKey(log.sessionKey);
-    }
-    const parsed = log._parsed;
-    if (!parsed) return;
-
-    const db = getDb(parsed.workspace);
-    if (!db) return;
-
-    const cleanSteps = log.steps.map(s => { const c = {...s}; delete c._sealed; return c; });
-    const summary = this.generateActivitySummary(log.steps);
-    const now = Date.now();
-
-    if (!log._messageId) {
-      // First write — INSERT the assistant message row
-      const thread = db.prepare('SELECT id FROM threads WHERE id = ?').get(parsed.threadId);
-      if (!thread) return;
-
-      const messageId = `gw-activity-${runId}`;
-      const metadata = { activityLog: cleanSteps, activitySummary: summary, pending: true };
-
-      db.prepare(`
-        INSERT INTO messages (id, thread_id, role, content, status, metadata, timestamp, created_at)
-        VALUES (?, ?, 'assistant', '', 'sent', ?, ?, ?)
-      `).run(messageId, parsed.threadId, JSON.stringify(metadata), now, now);
-
-      log._messageId = messageId;
-
-      // First event — broadcast message-saved so browser creates the message element
-      this.broadcastToBrowsers(JSON.stringify({
-        type: 'clawchats',
-        event: 'message-saved',
-        threadId: parsed.threadId,
-        workspace: parsed.workspace,
-        messageId,
-        timestamp: now
-      }));
-    } else {
-      // Subsequent writes — UPDATE metadata on existing row
-      const existing = db.prepare('SELECT metadata FROM messages WHERE id = ?').get(log._messageId);
-      const metadata = existing?.metadata ? JSON.parse(existing.metadata) : {};
-      metadata.activityLog = cleanSteps;
-      metadata.activitySummary = summary;
-      metadata.pending = true;
-
-      db.prepare('UPDATE messages SET metadata = ? WHERE id = ?')
-        .run(JSON.stringify(metadata), log._messageId);
-    }
+    writeActivityToDb(getDb, this.broadcastToBrowsers.bind(this), runId, log);
   }
 
   _broadcastActivityUpdate(runId, log) {
@@ -3115,59 +3068,7 @@ class GatewayClient {
   }
 
   generateActivitySummary(steps) {
-    const toolSteps = steps.filter(s => s.type === 'tool' && s.phase !== 'result' && s.phase !== 'update');
-    const hasThinking = steps.some(s => s.type === 'thinking' && s.text);
-    const hasNarration = steps.some(s => s.type === 'assistant' && s.text?.trim());
-    if (toolSteps.length === 0 && !hasThinking && !hasNarration) return null;
-    if (toolSteps.length === 0 && hasThinking) return 'Reasoned through the problem';
-    if (toolSteps.length === 0 && hasNarration) return 'Processed in multiple steps';
-
-    // Count by tool name
-    const counts = {};
-    for (const s of toolSteps) {
-      const name = s.name || 'unknown';
-      counts[name] = (counts[name] || 0) + 1;
-    }
-
-    // Build description
-    const parts = [];
-    const toolNames = {
-      'web_search': 'searched the web',
-      'web_fetch': 'fetched web pages',
-      'Read': 'read files',
-      'read': 'read files',
-      'Write': 'wrote files',
-      'write': 'wrote files',
-      'Edit': 'edited files',
-      'edit': 'edited files',
-      'exec': 'ran commands',
-      'Bash': 'ran commands',
-      'browser': 'browsed the web',
-      'memory_search': 'searched memory',
-      'memory_store': 'saved to memory',
-      'image': 'analyzed images',
-      'message': 'sent messages',
-      'sessions_spawn': 'spawned sub-agents',
-      'cron': 'managed cron jobs',
-      'Grep': 'searched code',
-      'grep': 'searched code',
-      'Glob': 'found files',
-      'glob': 'found files'
-    };
-
-    for (const [name, count] of Object.entries(counts)) {
-      const friendly = toolNames[name];
-      if (friendly) {
-        parts.push(count > 1 ? `${friendly} (${count}×)` : friendly);
-      } else {
-        parts.push(count > 1 ? `used ${name} (${count}×)` : `used ${name}`);
-      }
-    }
-
-    if (parts.length === 0) return null;
-    if (parts.length === 1) return parts[0].charAt(0).toUpperCase() + parts[0].slice(1);
-    const last = parts.pop();
-    return (parts.join(', ') + ' and ' + last).replace(/^./, c => c.toUpperCase());
+    return generateActivitySummary(steps);
   }
 
   broadcastToBrowsers(data) {
@@ -3306,6 +3207,117 @@ function extractContent(message) {
   return '';
 }
 
+// ─── Shared activity log helpers ─────────────────────────────────────────────
+// Pure functions extracted from GatewayClient / _GatewayClient so both classes
+// share a single implementation. Pass the workspace-scoped DB getter and a
+// bound broadcastToBrowsers fn as arguments.
+
+function generateActivitySummary(steps) {
+  const toolSteps = steps.filter(s => s.type === 'tool' && s.phase !== 'result' && s.phase !== 'update');
+  const hasThinking = steps.some(s => s.type === 'thinking' && s.text);
+  const hasNarration = steps.some(s => s.type === 'assistant' && s.text?.trim());
+  if (toolSteps.length === 0 && !hasThinking && !hasNarration) return null;
+  if (toolSteps.length === 0 && hasThinking) return 'Reasoned through the problem';
+  if (toolSteps.length === 0 && hasNarration) return 'Processed in multiple steps';
+
+  const counts = {};
+  for (const s of toolSteps) {
+    const name = s.name || 'unknown';
+    counts[name] = (counts[name] || 0) + 1;
+  }
+
+  const parts = [];
+  const toolNames = {
+    'web_search': 'searched the web',
+    'web_fetch': 'fetched web pages',
+    'Read': 'read files',
+    'read': 'read files',
+    'Write': 'wrote files',
+    'write': 'wrote files',
+    'Edit': 'edited files',
+    'edit': 'edited files',
+    'exec': 'ran commands',
+    'Bash': 'ran commands',
+    'browser': 'browsed the web',
+    'memory_search': 'searched memory',
+    'memory_store': 'saved to memory',
+    'image': 'analyzed images',
+    'message': 'sent messages',
+    'sessions_spawn': 'spawned sub-agents',
+    'cron': 'managed cron jobs',
+    'Grep': 'searched code',
+    'grep': 'searched code',
+    'Glob': 'found files',
+    'glob': 'found files'
+  };
+
+  for (const [name, count] of Object.entries(counts)) {
+    const friendly = toolNames[name];
+    if (friendly) {
+      parts.push(count > 1 ? `${friendly} (${count}×)` : friendly);
+    } else {
+      parts.push(count > 1 ? `used ${name} (${count}×)` : `used ${name}`);
+    }
+  }
+
+  if (parts.length === 0) return null;
+  if (parts.length === 1) return parts[0].charAt(0).toUpperCase() + parts[0].slice(1);
+  const last = parts.pop();
+  return (parts.join(', ') + ' and ' + last).replace(/^./, c => c.toUpperCase());
+}
+
+function writeActivityToDb(getDbFn, broadcastFn, runId, log) {
+  if (!log._parsed) {
+    log._parsed = parseSessionKey(log.sessionKey);
+  }
+  const parsed = log._parsed;
+  if (!parsed) return;
+
+  const db = getDbFn(parsed.workspace);
+  if (!db) return;
+
+  const cleanSteps = log.steps.map(s => { const c = {...s}; delete c._sealed; return c; });
+  const summary = generateActivitySummary(log.steps);
+  const now = Date.now();
+
+  if (!log._messageId) {
+    const thread = db.prepare('SELECT id FROM threads WHERE id = ?').get(parsed.threadId);
+    if (!thread) return;
+
+    const messageId = `gw-activity-${runId}`;
+    const metadata = { activityLog: cleanSteps, activitySummary: summary, pending: true };
+
+    try {
+      db.prepare(`
+        INSERT OR IGNORE INTO messages (id, thread_id, role, content, status, metadata, timestamp, created_at)
+        VALUES (?, ?, 'assistant', '', 'sent', ?, ?, ?)
+      `).run(messageId, parsed.threadId, JSON.stringify(metadata), now, now);
+
+      log._messageId = messageId;
+
+      broadcastFn(JSON.stringify({
+        type: 'clawchats',
+        event: 'message-saved',
+        threadId: parsed.threadId,
+        workspace: parsed.workspace,
+        messageId,
+        timestamp: now
+      }));
+    } catch (err) {
+      console.error(`[activity] Failed to write activity ${messageId}:`, err.message);
+    }
+  } else {
+    const existing = db.prepare('SELECT metadata FROM messages WHERE id = ?').get(log._messageId);
+    const metadata = existing?.metadata ? JSON.parse(existing.metadata) : {};
+    metadata.activityLog = cleanSteps;
+    metadata.activitySummary = summary;
+    metadata.pending = true;
+
+    db.prepare('UPDATE messages SET metadata = ? WHERE id = ?')
+      .run(JSON.stringify(metadata), log._messageId);
+  }
+}
+
 const gatewayClient = new GatewayClient();
 
 // ─── createApp Factory ───────────────────────────────────────────────────────
@@ -4264,51 +4276,7 @@ export function createApp(config = {}) {
     }
 
     _writeActivityToDb(runId, log) {
-      if (!log._parsed) {
-        log._parsed = parseSessionKey(log.sessionKey);
-      }
-      const parsed = log._parsed;
-      if (!parsed) return;
-
-      const db = _getDb(parsed.workspace);
-      if (!db) return;
-
-      const cleanSteps = log.steps.map(s => { const c = {...s}; delete c._sealed; return c; });
-      const summary = this.generateActivitySummary(log.steps);
-      const now = Date.now();
-
-      if (!log._messageId) {
-        const thread = db.prepare('SELECT id FROM threads WHERE id = ?').get(parsed.threadId);
-        if (!thread) return;
-
-        const messageId = `gw-activity-${runId}`;
-        const metadata = { activityLog: cleanSteps, activitySummary: summary, pending: true };
-
-        db.prepare(`
-          INSERT INTO messages (id, thread_id, role, content, status, metadata, timestamp, created_at)
-          VALUES (?, ?, 'assistant', '', 'sent', ?, ?, ?)
-        `).run(messageId, parsed.threadId, JSON.stringify(metadata), now, now);
-
-        log._messageId = messageId;
-
-        this.broadcastToBrowsers(JSON.stringify({
-          type: 'clawchats',
-          event: 'message-saved',
-          threadId: parsed.threadId,
-          workspace: parsed.workspace,
-          messageId,
-          timestamp: now
-        }));
-      } else {
-        const existing = db.prepare('SELECT metadata FROM messages WHERE id = ?').get(log._messageId);
-        const metadata = existing?.metadata ? JSON.parse(existing.metadata) : {};
-        metadata.activityLog = cleanSteps;
-        metadata.activitySummary = summary;
-        metadata.pending = true;
-
-        db.prepare('UPDATE messages SET metadata = ? WHERE id = ?')
-          .run(JSON.stringify(metadata), log._messageId);
-      }
+      writeActivityToDb(_getDb, this.broadcastToBrowsers.bind(this), runId, log);
     }
 
     _broadcastActivityUpdate(runId, log) {
@@ -4329,21 +4297,7 @@ export function createApp(config = {}) {
     }
 
     generateActivitySummary(steps) {
-      const toolSteps = steps.filter(s => s.type === 'tool' && s.phase !== 'result' && s.phase !== 'update');
-      const hasThinking = steps.some(s => s.type === 'thinking' && s.text);
-      const hasNarration = steps.some(s => s.type === 'assistant' && s.text?.trim());
-      if (toolSteps.length === 0 && !hasThinking && !hasNarration) return null;
-      if (toolSteps.length === 0 && hasThinking) return 'Reasoned through the problem';
-      if (toolSteps.length === 0 && hasNarration) return 'Processed in multiple steps';
-      const counts = {};
-      for (const s of toolSteps) { const name = s.name || 'unknown'; counts[name] = (counts[name] || 0) + 1; }
-      const parts = [];
-      const toolNames = { 'web_search': 'searched the web', 'web_fetch': 'fetched web pages', 'Read': 'read files', 'read': 'read files', 'Write': 'wrote files', 'write': 'wrote files', 'Edit': 'edited files', 'edit': 'edited files', 'exec': 'ran commands', 'Bash': 'ran commands', 'browser': 'browsed the web', 'memory_search': 'searched memory', 'memory_store': 'saved to memory', 'image': 'analyzed images', 'message': 'sent messages', 'sessions_spawn': 'spawned sub-agents', 'cron': 'managed cron jobs', 'Grep': 'searched code', 'grep': 'searched code', 'Glob': 'found files', 'glob': 'found files' };
-      for (const [name, count] of Object.entries(counts)) { const friendly = toolNames[name]; if (friendly) parts.push(count > 1 ? `${friendly} (${count}x)` : friendly); else parts.push(count > 1 ? `used ${name} (${count}x)` : `used ${name}`); }
-      if (parts.length === 0) return null;
-      if (parts.length === 1) return parts[0].charAt(0).toUpperCase() + parts[0].slice(1);
-      const last = parts.pop();
-      return (parts.join(', ') + ' and ' + last).replace(/^./, c => c.toUpperCase());
+      return generateActivitySummary(steps);
     }
 
     addBroadcastTarget(fn) { this._externalBroadcastTargets.push(fn); }