indieclaw-agent 1.1.0 → 1.1.2

package/index.js

@@ -210,6 +210,7 @@ function handleFsDelete(ws, { id, path: filePath }) {
 // --- System Stats ---
 function handleSystemStats(ws, { id }) {
   const platform = os.platform();
+  const mem = platform === 'darwin' ? getDarwinMemory() : getLinuxMemory();
   const stats = {
     hostname: os.hostname(),
     platform,
@@ -220,17 +221,61 @@ function handleSystemStats(ws, { id }) {
       cores: os.cpus().length,
       usage: getCpuUsage(platform),
     },
-    memory: {
-      total: os.totalmem(),
-      free: os.freemem(),
-      used: os.totalmem() - os.freemem(),
-      usagePercent: Math.round(((os.totalmem() - os.freemem()) / os.totalmem()) * 100),
-    },
+    memory: mem,
     disk: getDiskUsage(platform),
   };
   reply(ws, id, stats);
 }
 
+function getDarwinMemory() {
+  const total = os.totalmem();
+  try {
+    const out = execSync('vm_stat', { timeout: 3000 }).toString();
+    const pageMatch = out.match(/page size of (\d+) bytes/);
+    const pageSize = pageMatch ? parseInt(pageMatch[1], 10) : 16384;
+
+    const val = (key) => {
+      const m = out.match(new RegExp(key + ':\\s+(\\d+)'));
+      return m ? parseInt(m[1], 10) : 0;
+    };
+
+    const wired = val('Pages wired down');
+    const active = val('Pages active');
+    const compressed = val('Pages occupied by compressor');
+    const purgeable = val('Pages purgeable');
+
+    // Used = wired + active (minus purgeable) + compressed — matches Activity Monitor
+    const used = (wired + active - purgeable + compressed) * pageSize;
+    const free = total - used;
+    return {
+      total,
+      free: Math.max(free, 0),
+      used: Math.min(used, total),
+      usagePercent: Math.round((Math.min(used, total) / total) * 100),
+    };
+  } catch {
+    // Fallback to Node.js (inaccurate on macOS but better than nothing)
+    const free = os.freemem();
+    return {
+      total,
+      free,
+      used: total - free,
+      usagePercent: Math.round(((total - free) / total) * 100),
+    };
+  }
+}
+
+function getLinuxMemory() {
+  const total = os.totalmem();
+  const free = os.freemem();
+  return {
+    total,
+    free,
+    used: total - free,
+    usagePercent: Math.round(((total - free) / total) * 100),
+  };
+}
+
 function getCpuUsage(platform) {
   try {
     if (platform === 'linux') {
@@ -251,23 +296,32 @@ function getCpuUsage(platform) {
 
 function getDiskUsage(platform) {
   try {
-    const cmd = platform === 'darwin' ? 'df -k /' : 'df -k / --output=source,size,used,avail,pcent,target';
-    const out = execSync(cmd, { timeout: 5000 }).toString();
-    const lines = out.trim().split('\n').slice(1);
-    return lines.map((line) => {
-      const parts = line.trim().split(/\s+/);
-      if (platform === 'darwin') {
-        // macOS df: Filesystem 512-blocks Used Available Capacity ...
-        // df -k gives 1K-blocks
+    if (platform === 'darwin') {
+      // macOS APFS: "Used" column only shows one volume's data
+      // Calculate used = total - available for accurate results
+      const out = execSync('df -k /', { timeout: 5000 }).toString();
+      const lines = out.trim().split('\n').slice(1);
+      return lines.map((line) => {
+        const parts = line.trim().split(/\s+/);
+        // Columns: Filesystem 1K-blocks Used Available Capacity iused ifree %iused Mounted
+        const total = parseInt(parts[1], 10) * 1024;
+        const available = parseInt(parts[3], 10) * 1024;
+        const used = total - available;
         return {
           filesystem: parts[0],
-          mount: parts[8] || parts[5] || '/',
-          total: parseInt(parts[1], 10) * 1024,
-          used: parseInt(parts[2], 10) * 1024,
-          available: parseInt(parts[3], 10) * 1024,
-          usagePercent: parseInt(parts[4], 10),
+          mount: parts[8] || '/',
+          total,
+          used,
+          available,
+          usagePercent: Math.round((used / total) * 100),
         };
-      }
+      });
+    }
+    // Linux
+    const out = execSync('df -k / --output=source,size,used,avail,pcent,target', { timeout: 5000 }).toString();
+    const lines = out.trim().split('\n').slice(1);
+    return lines.map((line) => {
+      const parts = line.trim().split(/\s+/);
       return {
         filesystem: parts[0],
         total: parseInt(parts[1], 10) * 1024,
@@ -455,46 +509,85 @@ function handleCronList(ws, { id }) {
   });
 }
 
-// --- Terminal (PTY) ---
+// --- Terminal (PTY with child_process fallback) ---
 function handleTerminalStart(ws, { id }) {
-  if (!pty) {
-    return replyError(ws, id, 'Terminal not available (node-pty not installed)');
+  const shell = process.env.SHELL || '/bin/bash';
+
+  // Try node-pty first
+  if (pty) {
+    try {
+      const term = pty.spawn(shell, [], {
+        name: 'xterm-256color',
+        cols: 80,
+        rows: 24,
+        cwd: os.homedir(),
+        env: { ...process.env, TERM: 'xterm-256color' },
+      });
+
+      term._ws = ws;
+      term._isPty = true;
+      terminals.set(id, term);
+
+      term.onData((data) => {
+        send(ws, { type: 'terminal.output', id, data });
+      });
+
+      term.onExit(({ exitCode }) => {
+        send(ws, { type: 'terminal.exit', id, exitCode });
+        terminals.delete(id);
+      });
+
+      return reply(ws, id, { pid: term.pid });
+    } catch (err) {
+      console.log(`[agent] node-pty spawn failed (${err.message}), using fallback`);
+    }
   }
 
-  const shell = process.env.SHELL || '/bin/bash';
-  const term = pty.spawn(shell, [], {
-    name: 'xterm-256color',
-    cols: 80,
-    rows: 24,
+  // Fallback: child_process.spawn
+  const { spawn } = require('child_process');
+  const proc = spawn(shell, ['-i'], {
     cwd: os.homedir(),
-    env: { ...process.env, TERM: 'xterm-256color' },
+    env: { ...process.env, TERM: 'dumb' },
+    stdio: ['pipe', 'pipe', 'pipe'],
   });
 
-  term._ws = ws;
-  terminals.set(id, term);
+  proc._ws = ws;
+  proc._isPty = false;
 
-  term.onData((data) => {
-    send(ws, { type: 'terminal.output', id, data });
+  proc.stdout.on('data', (data) => {
+    send(ws, { type: 'terminal.output', id, data: data.toString() });
   });
 
-  term.onExit(({ exitCode }) => {
-    send(ws, { type: 'terminal.exit', id, exitCode });
+  proc.stderr.on('data', (data) => {
+    send(ws, { type: 'terminal.output', id, data: data.toString() });
+  });
+
+  proc.on('exit', (exitCode) => {
+    send(ws, { type: 'terminal.exit', id, exitCode: exitCode ?? 0 });
     terminals.delete(id);
   });
 
-  reply(ws, id, { pid: term.pid });
+  terminals.set(id, proc);
+  reply(ws, id, { pid: proc.pid });
 }
 
 function handleTerminalInput(ws, { id, data }) {
   const term = terminals.get(id);
   if (!term) return replyError(ws, id, 'Terminal not found');
-  term.write(data);
+  if (term._isPty) {
+    term.write(data);
+  } else {
+    term.stdin.write(data);
+  }
 }
 
 function handleTerminalResize(ws, { id, cols, rows }) {
   const term = terminals.get(id);
   if (!term) return replyError(ws, id, 'Terminal not found');
-  term.resize(cols, rows);
+  if (term._isPty && term.resize) {
+    term.resize(cols, rows);
+  }
+  // fallback processes don't support resize
 }
 
 function handleTerminalStop(ws, { id }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "indieclaw-agent",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Manage your server from your phone. Agent for the IndieClaw mobile app.",
   "main": "index.js",
   "bin": {