a2acalling 0.6.47 → 0.6.48

package/bin/cli.js

@@ -1954,6 +1954,19 @@ a2a add "${inviteUrl}" "${ownerText || 'friend'}" && a2a call "${ownerText || 'f
       return;
     }
 
+    // Pre-start cleanup: kill any existing a2a server from a previous run
+    try {
+      const { killExistingServer } = require('../src/lib/pid-file');
+      const cleanup = killExistingServer();
+      if (cleanup.killed) {
+        console.log(`  Stopped previous server (PID ${cleanup.pid}).`);
+        // Brief pause to let the port free up
+        await new Promise(r => setTimeout(r, 500));
+      }
+    } catch (e) {
+      // Best effort — continue with startup
+    }
+
     const isAlreadyListening = await isPortListening(serverPort, '127.0.0.1', { timeoutMs: 250 });
     let serverPid = null;
     if (!isAlreadyListening.listening) {
@@ -1987,7 +2000,15 @@ a2a add "${inviteUrl}" "${ownerText || 'friend'}" && a2a call "${ownerText || 'f
 
     if (serverPid) {
       console.log('  Server started.');
-      config.setOnboarding({ server_pid: serverPid, server_port: serverPort });
+      const existingPids = (config.getOnboarding().server_pids || []).filter(p => {
+        try { process.kill(p, 0); return true; } catch (e) { return false; }
+      });
+      if (!existingPids.includes(serverPid)) existingPids.push(serverPid);
+      config.setOnboarding({
+        server_pid: serverPid,
+        server_pids: existingPids,
+        server_port: serverPort
+      });
     } else {
       console.log('  Using existing server.');
     }
@@ -2318,24 +2339,43 @@ a2a add "${inviteUrl}" "${ownerText || 'friend'}" && a2a call "${ownerText || 'f
       }
     }
 
-    // Kill server by PID from config (detached process started by quickstart)
+    // Kill server by PID from config and PID file (detached process started by quickstart)
     // Then verify the port is actually freed; if not, find and kill whatever holds it.
     async function killServerPid() {
-      let pid, serverPort;
+      let pid, serverPort, serverPids = [];
       try {
         const { A2AConfig } = require('../src/lib/config');
         const cfg = new A2AConfig();
         const onboarding = cfg.getOnboarding();
         pid = onboarding.server_pid;
         serverPort = onboarding.server_port;
+        serverPids = Array.isArray(onboarding.server_pids) ? onboarding.server_pids : [];
       } catch (err) {
-        // Config read failed — not fatal, continue with pm2 path
-        return { ok: true, skipped: true };
+        // Config read failed — not fatal, continue
       }
 
-      // Step 1: Try to kill the PID from config
-      if (pid) {
-        killPidSync(pid);
+      // Step 0: Try PID file first (most reliable source)
+      try {
+        const { readPidFile, removePidFile } = require('../src/lib/pid-file');
+        const filePid = readPidFile();
+        if (filePid) {
+          killPidSync(filePid);
+          removePidFile();
+          // If config PID is the same, don't double-kill
+          if (filePid === pid) pid = null;
+        }
+      } catch (e) {
+        // pid-file module load failed — continue with config PID
+      }
+
+      // Step 1: Try to kill all tracked PIDs from config
+      const allPids = new Set();
+      if (pid) allPids.add(pid);
+      for (const p of serverPids) {
+        if (typeof p === 'number' && p > 0) allPids.add(p);
+      }
+      for (const p of allPids) {
+        killPidSync(p);
       }
 
       // Step 2: Verify the port is freed
@@ -2359,7 +2399,13 @@ a2a add "${inviteUrl}" "${ownerText || 'friend'}" && a2a call "${ownerText || 'f
         }
       }
 
-      return { ok: true, pid, port: serverPort, skipped: !pid };
+      // Clean up PID file if it still exists
+      try {
+        const { removePidFile } = require('../src/lib/pid-file');
+        removePidFile();
+      } catch (e) {}
+
+      return { ok: true, pid, port: serverPort, skipped: !pid && allPids.size === 0 };
     }
 
     process.stdout.write('Stopping server... ');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "a2acalling",
-  "version": "0.6.47",
+  "version": "0.6.48",
   "description": "Agent-to-agent calling for OpenClaw - A2A agent communication",
   "main": "src/index.js",
   "bin": {

package/src/server.js

@@ -22,6 +22,7 @@ const {
 } = require('./lib/prompt-template');
 const { findAvailablePort } = require('./lib/port-scanner');
 const { createLogger } = require('./lib/logger');
+const { writePidFile, removePidFile } = require('./lib/pid-file');
 
 const DEFAULT_PORTS = [80, 3001, 8080, 8443, 9001];
 const requestedPort = process.env.PORT ? parseInt(process.env.PORT, 10)
@@ -903,6 +904,7 @@ async function startServer() {
         features: ['adaptive collaboration', 'auto-contacts', 'summaries', 'dashboard']
       }
     });
+    writePidFile(process.pid);
   });
 
   server.on('error', (err) => {
@@ -917,6 +919,16 @@ async function startServer() {
     }
     throw err;
   });
+
+  // Graceful shutdown: clean up PID file
+  function shutdown() {
+    removePidFile();
+    server.close(() => process.exit(0));
+    // Force exit after 5s if connections won't close
+    setTimeout(() => process.exit(0), 5000).unref();
+  }
+  process.on('SIGTERM', shutdown);
+  process.on('SIGINT', shutdown);
 }
 
 startServer();