neoagent 2.1.9 → 2.1.10

package/lib/manager.js

@@ -70,6 +70,16 @@ function detectPlatform() {
   return 'other';
 }
 
+function launchctlDomain() {
+  if (typeof process.getuid !== 'function') return null;
+  return `gui/${process.getuid()}`;
+}
+
+function launchctlServiceTarget() {
+  const domain = launchctlDomain();
+  return domain ? `${domain}/${SERVICE_LABEL}` : SERVICE_LABEL;
+}
+
 function loadEnvPort() {
   try {
     const env = fs.readFileSync(ENV_FILE, 'utf8');
@@ -210,6 +220,49 @@ function killByPort(port) {
   return killed;
 }
 
+function listNeoAgentServerProcesses() {
+  const res = runQuiet('ps', ['-axo', 'pid=,ppid=,command=']);
+  if (res.status !== 0) return [];
+
+  return res.stdout
+    .split('\n')
+    .map((line) => line.trim())
+    .filter(Boolean)
+    .map((line) => {
+      const match = line.match(/^(\d+)\s+(\d+)\s+(.*)$/);
+      if (!match) return null;
+      return {
+        pid: Number(match[1]),
+        ppid: Number(match[2]),
+        command: match[3],
+      };
+    })
+    .filter(Boolean)
+    .filter((entry) =>
+      entry.pid !== process.pid &&
+      /(^|\s)node(\s|$)/.test(entry.command) &&
+      (
+        entry.command.includes('/neoagent/server/index.js') ||
+        entry.command.includes(`${path.sep}NeoAgent${path.sep}server${path.sep}index.js`) ||
+        entry.command.includes(`${APP_DIR}${path.sep}server${path.sep}index.js`)
+      )
+    );
+}
+
+function killNeoAgentServerProcesses() {
+  const processes = listNeoAgentServerProcesses();
+  let killed = false;
+  for (const proc of processes) {
+    try {
+      process.kill(proc.pid, 'SIGTERM');
+      killed = true;
+    } catch {
+      // Ignore stale processes.
+    }
+  }
+  return { killed, processes };
+}
+
 function isPortOpen(port) {
   return new Promise((resolve) => {
     const sock = new net.Socket();
@@ -338,8 +391,21 @@ function installMacService() {
 
   fs.writeFileSync(PLIST_DST, content);
 
-  runQuiet('launchctl', ['unload', PLIST_DST]);
-  runOrThrow('launchctl', ['load', PLIST_DST]);
+  const domain = launchctlDomain();
+  if (domain) {
+    runQuiet('launchctl', ['bootout', domain, PLIST_DST]);
+    const bootstrap = runQuiet('launchctl', ['bootstrap', domain, PLIST_DST]);
+    if (bootstrap.status !== 0) {
+      runQuiet('launchctl', ['unload', PLIST_DST]);
+      runOrThrow('launchctl', ['load', PLIST_DST]);
+    } else {
+      runQuiet('launchctl', ['enable', launchctlServiceTarget()]);
+      runQuiet('launchctl', ['kickstart', '-k', launchctlServiceTarget()]);
+    }
+  } else {
+    runQuiet('launchctl', ['unload', PLIST_DST]);
+    runOrThrow('launchctl', ['load', PLIST_DST]);
+  }
   logOk(`launchd service loaded (${SERVICE_LABEL})`);
 }
 
@@ -401,7 +467,7 @@ function cmdStart() {
   const platform = detectPlatform();
 
   if (platform === 'macos' && fs.existsSync(PLIST_DST)) {
-    runQuiet('launchctl', ['load', PLIST_DST]);
+    installMacService();
     logOk('launchd start requested');
     return;
   }
@@ -420,39 +486,49 @@ function cmdStop() {
   const platform = detectPlatform();
 
   if (platform === 'macos' && fs.existsSync(PLIST_DST)) {
+    const domain = launchctlDomain();
+    if (domain) {
+      runQuiet('launchctl', ['bootout', domain, PLIST_DST]);
+      runQuiet('launchctl', ['bootout', launchctlServiceTarget()]);
+    }
     runQuiet('launchctl', ['unload', PLIST_DST]);
     logOk('launchd stop requested');
-    return;
-  }
-
-  if (platform === 'linux' && fs.existsSync(SYSTEMD_UNIT)) {
+  } else if (platform === 'linux' && fs.existsSync(SYSTEMD_UNIT)) {
     runQuiet('systemctl', ['--user', 'stop', 'neoagent']);
     logOk('systemd stop requested');
-    return;
-  }
-
-  const pidPath = PID_FILE;
-  let stopped = false;
-  if (fs.existsSync(pidPath)) {
-    const pid = Number(fs.readFileSync(pidPath, 'utf8').trim());
-    if (Number.isFinite(pid) && pid > 0) {
-      try {
-        process.kill(pid, 'SIGTERM');
-        logOk(`Stopped pid ${pid}`);
-        stopped = true;
-      } catch {
-        logWarn(`pid ${pid} not running`);
+  } else {
+    const pidPath = PID_FILE;
+    let stopped = false;
+    if (fs.existsSync(pidPath)) {
+      const pid = Number(fs.readFileSync(pidPath, 'utf8').trim());
+      if (Number.isFinite(pid) && pid > 0) {
+        try {
+          process.kill(pid, 'SIGTERM');
+          logOk(`Stopped pid ${pid}`);
+          stopped = true;
+        } catch {
+          logWarn(`pid ${pid} not running`);
+        }
       }
+      fs.rmSync(pidPath, { force: true });
     }
-    fs.rmSync(pidPath, { force: true });
+
+    const port = loadEnvPort();
+    if (killByPort(port)) {
+      logOk(`Stopped process listening on port ${port}`);
+      stopped = true;
+    }
+    if (!stopped) logWarn('No running process found');
   }
 
   const port = loadEnvPort();
+  const { killed, processes } = killNeoAgentServerProcesses();
+  if (killed) {
+    logOk(`Stopped ${processes.length} extra NeoAgent process${processes.length === 1 ? '' : 'es'}`);
+  }
   if (killByPort(port)) {
     logOk(`Stopped process listening on port ${port}`);
-    stopped = true;
   }
-  if (!stopped) logWarn('No running process found');
 }
 
 function cmdRestart() {
@@ -496,15 +572,15 @@ async function cmdStatus() {
     logWarn(`not reachable on port ${port}`);
   }
 
-  const gitVersion = runQuiet('git', ['describe', '--tags', '--always', '--dirty']);
-  if (gitVersion.status === 0) {
-    console.log(`  version ${gitVersion.stdout.trim().replace(/^v/, '')}`);
-    return;
-  }
+  console.log(`  install root ${APP_DIR}`);
+  console.log(`  version ${currentInstalledVersionLabel()}`);
 
-  const gitSha = runQuiet('git', ['rev-parse', '--short', 'HEAD']);
-  if (gitSha.status === 0) {
-    console.log(`  version ${gitSha.stdout.trim()}`);
+  const processes = listNeoAgentServerProcesses();
+  if (processes.length > 0) {
+    console.log(`  neoagent pids ${processes.map((proc) => proc.pid).join(', ')}`);
+    if (processes.length > 1) {
+      logWarn(`multiple NeoAgent server processes detected (${processes.length})`);
+    }
   }
 }
 
@@ -551,12 +627,12 @@ function cmdUpdate() {
     if (commandExists('npm')) {
       try {
         backupRuntimeData();
-        runOrThrow('npm', ['install', '-g', 'neoagent@latest'], {
+        runOrThrow('npm', ['install', '-g', 'neoagent@latest', '--force'], {
           env: withInstallEnv()
         });
-        logOk('npm global update completed');
+        logOk('npm global update completed (forced reinstall)');
       } catch {
-        logWarn('npm global update failed. Run: npm install -g neoagent@latest');
+        logWarn('npm global update failed. Run: npm install -g neoagent@latest --force');
       }
     } else {
       logWarn('npm not found. Cannot perform global update.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neoagent",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "Proactive personal AI agent with no limits",
   "license": "MIT",
   "main": "server/index.js",

package/server/http/middleware.js

@@ -33,6 +33,7 @@ function buildHelmetOptions({ secureCookies }) {
           'https://fonts.googleapis.com',
           'https://fonts.gstatic.com',
           'https://www.gstatic.com',
+          'https://api.qrserver.com',
           ...wsConnectSrc
         ],
         fontSrc: ["'self'", 'data:', 'https://fonts.gstatic.com'],

package/server/public/flutter_bootstrap.js

@@ -37,6 +37,6 @@ _flutter.buildConfig = {"engineRevision":"052f31d115eceda8cbff1b3481fcde4330c4ae
 
 _flutter.loader.load({
   serviceWorkerSettings: {
-    serviceWorkerVersion: "3587732160" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
+    serviceWorkerVersion: "2457264468" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
   }
 });