tuna-agent 0.1.19 → 0.1.20

package/dist/mcp/setup.d.ts

@@ -1,7 +1,7 @@
 import type { AgentConfig } from '../types/index.js';
 /**
- * Call Mem0 add_memory directly via MCP JSON-RPC (no Claude CLI needed).
- * Spawns mem0-mcp process, sends init + add_memory, reads response.
+ * Call Mem0 add_memory via mem0-add script (bypasses OpenMemory API).
+ * Calls `mem0-add <text>` directly or via SSH — simple, reliable.
  */
 export declare function callMem0AddMemory(text: string, agentName: string): Promise<void>;
 /**

package/dist/mcp/setup.js

@@ -21,88 +21,57 @@ const MEM0_ENV_VARS = {
     MEM0_NEO4J_PASSWORD: 'mem0graph',
 };
 /**
- * Call Mem0 add_memory directly via MCP JSON-RPC (no Claude CLI needed).
- * Spawns mem0-mcp process, sends init + add_memory, reads response.
+ * Call Mem0 add_memory via mem0-add script (bypasses OpenMemory API).
+ * Calls `mem0-add <text>` directly or via SSH — simple, reliable.
  */
 export async function callMem0AddMemory(text, agentName) {
     if (!MEM0_SSH_HOST)
         throw new Error('MEM0_SSH_HOST not configured');
-    const { spawn } = await import('child_process');
+    const { execFile } = await import('child_process');
     const safeAgentName = agentName.replace(/[^a-zA-Z0-9_-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '') || 'agent';
-    const envWithUser = { ...MEM0_ENV_VARS, MEM0_USER_ID: safeAgentName };
-    let cmd;
-    let args;
-    let spawnEnv;
-    if (MEM0_SSH_HOST === 'local') {
-        cmd = 'mem0-mcp';
-        args = [];
-        spawnEnv = { ...process.env, ...envWithUser };
-    }
-    else {
-        const envString = Object.entries(envWithUser).map(([k, v]) => `${k}=${v}`).join(' ');
-        cmd = 'ssh';
-        args = ['-p', MEM0_SSH_PORT, '-o', 'StrictHostKeyChecking=no'];
-        if (MEM0_SSH_KEY)
-            args.push('-i', MEM0_SSH_KEY);
-        args.push(MEM0_SSH_HOST, `${envString} mem0-mcp`);
-    }
     return new Promise((resolve, reject) => {
-        const proc = spawn(cmd, args, { stdio: ['pipe', 'pipe', 'pipe'], env: spawnEnv });
-        let stdout = '';
-        let resolved = false;
-        const timer = setTimeout(() => { if (!resolved) {
-            resolved = true;
-            proc.kill();
-            reject(new Error('Mem0 call timed out'));
-        } }, 30000);
-        proc.stderr.on('data', () => { }); // ignore stderr
-        const initMsg = JSON.stringify({ jsonrpc: '2.0', id: 1, method: 'initialize', params: { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'tuna-agent', version: '1.0' } } });
-        const notifyMsg = JSON.stringify({ jsonrpc: '2.0', method: 'notifications/initialized' });
-        const addMsg = JSON.stringify({ jsonrpc: '2.0', id: 2, method: 'tools/call', params: { name: 'add_memory', arguments: { text } } });
-        let sentAdd = false;
-        proc.stdout.on('data', (d) => {
-            stdout += d.toString();
-            // After init response, send the add_memory call
-            if (!sentAdd && stdout.includes('"id":1')) {
-                sentAdd = true;
-                proc.stdin.write(notifyMsg + '\n');
-                proc.stdin.write(addMsg + '\n');
+        const timer = setTimeout(() => reject(new Error('Mem0 call timed out')), 30000);
+        let cmd;
+        let args;
+        let options = {};
+        if (MEM0_SSH_HOST === 'local') {
+            cmd = 'mem0-add';
+            args = [text];
+            options.env = { ...process.env, MEM0_USER_ID: safeAgentName };
+        }
+        else {
+            cmd = 'ssh';
+            args = ['-p', MEM0_SSH_PORT, '-o', 'StrictHostKeyChecking=no'];
+            if (MEM0_SSH_KEY)
+                args.push('-i', MEM0_SSH_KEY);
+            // Shell-escape text with single quotes (escape internal single quotes)
+            const escapedText = text.replace(/'/g, "'\\''");
+            args.push(MEM0_SSH_HOST, `MEM0_USER_ID=${safeAgentName} mem0-add '${escapedText}'`);
+        }
+        execFile(cmd, args, { ...options, timeout: 30000 }, (err, stdout, stderr) => {
+            clearTimeout(timer);
+            if (err) {
+                reject(new Error(`Mem0 add failed: ${err.message}${stderr ? ` stderr: ${stderr.substring(0, 200)}` : ''}`));
+                return;
             }
-            // After add_memory response, we're done
-            if (sentAdd && stdout.includes('"id":2')) {
-                if (!resolved) {
-                    resolved = true;
-                    clearTimeout(timer);
-                    proc.stdin.end();
-                    proc.kill();
-                    // Check if the response contains an error
-                    const hasError = stdout.includes('"isError":true') || stdout.includes('"error"');
-                    if (hasError) {
-                        // Extract error message from response
-                        const errMatch = stdout.match(/"text"\s*:\s*"([^"]+)"/);
-                        reject(new Error(`Mem0 add_memory failed: ${errMatch?.[1] || 'unknown error'}`));
-                    }
-                    else {
-                        resolve();
-                    }
+            // Check response for actual results
+            try {
+                const data = JSON.parse(stdout.trim());
+                if (data.error) {
+                    reject(new Error(`Mem0 add failed: ${data.error}`));
+                    return;
+                }
+                const results = data.results || [];
+                const added = results.filter((r) => r.event === 'ADD' || r.event === 'UPDATE');
+                if (added.length === 0 && results.length > 0) {
+                    console.log(`[Mem0] Memory deduplicated (${results.length} existing matches)`);
                 }
             }
-        });
-        // Send init immediately
-        proc.stdin.write(initMsg + '\n');
-        proc.on('close', (code) => {
-            if (!resolved) {
-                resolved = true;
-                clearTimeout(timer);
-                reject(new Error(`Mem0 process exited (code ${code}) without completing add_memory. stdout: ${stdout.substring(0, 300)}`));
-            }
-        });
-        proc.on('error', (err) => {
-            if (!resolved) {
-                resolved = true;
-                clearTimeout(timer);
-                reject(err);
+            catch {
+                // Non-JSON output — might be OK if exit code was 0
+                console.warn(`[Mem0] Unexpected output: ${stdout.substring(0, 100)}`);
             }
+            resolve();
         });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tuna-agent",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "Tuna Agent - Run AI coding tasks on your machine",
   "bin": {
     "tuna-agent": "dist/cli/index.js"