omnius 1.0.556 → 1.0.558

package/dist/postinstall-daemon.cjs

@@ -251,6 +251,41 @@ function tryHealth(port, cb) {
   req.end();
 }
 
+function tryHealthIdentity(port, cb) {
+  var http = require("http");
+  var settled = false;
+  function done(version) {
+    if (settled) return;
+    settled = true;
+    cb(version);
+  }
+  var req = http.request(
+    { host: "127.0.0.1", port: port, path: "/health", method: "GET", timeout: 1500 },
+    function (res) {
+      var body = "";
+      res.setEncoding("utf8");
+      res.on("data", function (chunk) { body += chunk; });
+      res.on("end", function () {
+        if (res.statusCode !== 200) return done(null);
+        try {
+          var data = JSON.parse(body);
+          done(data.boot_version || data.version || null);
+        } catch (e) { done(null); }
+      });
+    }
+  );
+  req.on("timeout", function () { try { req.destroy(); } catch (e) {} done(null); });
+  req.on("error", function () { done(null); });
+  req.end();
+}
+
+function installedPackageVersion() {
+  try {
+    var pkg = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "package.json"), "utf8"));
+    return typeof pkg.version === "string" ? pkg.version : null;
+  } catch (e) { return null; }
+}
+
 // Resolve the `omnius` launcher script.
 //
 // PRIORITY ORDER (most stable first):
@@ -316,13 +351,12 @@ function effectiveUser() {
   return process.env.USER || process.env.LOGNAME || os.userInfo().username;
 }
 
-// ─── Force-kill port holder (regardless of how it was launched) ────────────
+// ─── Stop only an attested Omnius port holder ───────────────────────────────
 //
-// Critical for upgrade correctness: when an OLD daemon (started before this
-// install) is running, it holds port 11435 with stale in-memory code. The
-// systemctl/launchctl `restart` calls below CANNOT reach it because the
-// service manager doesn't own that process — it was started detached by
-// `omnius serve --daemon` from a previous TUI session.
+// Critical for upgrade correctness: when an OLD *Omnius* daemon started by a
+// previous install holds port 11435, the new service cannot bind it.  Do not
+// treat every listener as disposable: postinstall runs with whatever rights
+// npm was given, and an arbitrary process may legitimately own this port.
 //
 // Result without this kill: postinstall tries to start a NEW systemd
 // daemon, port-bind fails, old daemon stays alive serving stale code,
@@ -330,12 +364,25 @@ function effectiveUser() {
 //
 // Strategy (matches packages/cli/src/daemon.ts:forceKillDaemon):
 //   1. SIGTERM via known PID files (~/.omnius/daemon.pid + .omnius/nexus/daemon.pid)
-//   2. lsof / fuser port probe — find ANY other holder
+//   2. lsof / fuser port probe — admit only a process whose cmdline proves it
+//      is `omnius ... serve --daemon`
 //   3. 2s graceful grace, then SIGKILL stragglers
 //   4. Poll /health up to 5s for confirmation
 //
 // Skips when OMNIUS_DISABLE_FORCE_KILL_DAEMON=1 (escape valve).
-function forceKillPortHolder(port, cb) {
+function processCommandLine(pid) {
+  if (IS_WIN) return "";
+  try { return fs.readFileSync("/proc/" + pid + "/cmdline", "utf8").replace(/\0/g, " "); } catch (e) {}
+  return "";
+}
+
+function isAttestedOmniusDaemon(pid) {
+  var cmd = processCommandLine(pid);
+  return /(?:^|[\\/\s])omnius(?:[\\/\s]|$)|[\\/]omnius[\\/]dist[\\/]index\.js\b|launcher\.cjs\b/i.test(cmd) &&
+    /\bserve\b/.test(cmd) && /--daemon\b/.test(cmd);
+}
+
+function stopStaleAttestedDaemonPortHolder(port, cb) {
   if (process.env.OMNIUS_DISABLE_FORCE_KILL_DAEMON === "1") {
     log("OMNIUS_DISABLE_FORCE_KILL_DAEMON=1 — skipping port-holder kill (upgrades may not pick up new code).");
     return cb(0);
@@ -353,7 +400,8 @@ function forceKillPortHolder(port, cb) {
       if (!fs.existsSync(pidFile)) return;
       var n = parseInt(fs.readFileSync(pidFile, "utf8").trim(), 10);
       if (!n || n <= 0) return;
-      try { process.kill(n, "SIGTERM"); killed++; log("SIGTERM old daemon (pid " + n + ", from " + pidFile + ")"); } catch (e) { /* dead */ }
+      if (!isAttestedOmniusDaemon(n)) return;
+      try { process.kill(n, "SIGTERM"); killed++; log("SIGTERM old Omnius daemon (pid " + n + ", from " + pidFile + ")"); } catch (e) { /* dead */ }
     } catch (e) { /* */ }
   });
 
@@ -370,7 +418,8 @@ function forceKillPortHolder(port, cb) {
         return Number.isFinite(n) && n > 0 && n !== process.pid;
       });
       pids.forEach(function (otherPid) {
-        try { process.kill(otherPid, "SIGTERM"); killed++; log("SIGTERM port-holder (pid " + otherPid + ")"); } catch (e) { /* */ }
+        if (!isAttestedOmniusDaemon(otherPid)) return;
+        try { process.kill(otherPid, "SIGTERM"); killed++; log("SIGTERM attested Omnius port-holder (pid " + otherPid + ")"); } catch (e) { /* */ }
       });
     }
   } catch (e) { /* */ }
@@ -391,7 +440,8 @@ function forceKillPortHolder(port, cb) {
           return Number.isFinite(n) && n > 0 && n !== process.pid;
         });
         pids.forEach(function (otherPid) {
-          try { process.kill(otherPid, "SIGKILL"); log("SIGKILL straggler (pid " + otherPid + ")"); } catch (e) { /* */ }
+          if (!isAttestedOmniusDaemon(otherPid)) return;
+          try { process.kill(otherPid, "SIGKILL"); log("SIGKILL attested Omnius straggler (pid " + otherPid + ")"); } catch (e) { /* */ }
         });
       }
     } catch (e) { /* */ }
@@ -415,6 +465,18 @@ function forceKillPortHolder(port, cb) {
   }, 2000);
 }
 
+function stopAttestedDaemonPortHolder(port, cb) {
+  var targetVersion = installedPackageVersion();
+  if (!targetVersion) return stopStaleAttestedDaemonPortHolder(port, cb);
+  tryHealthIdentity(port, function (runningVersion) {
+    if (runningVersion === targetVersion) {
+      log("Omnius daemon already reports installed boot version " + targetVersion + " — preserving active run.");
+      return cb(0);
+    }
+    stopStaleAttestedDaemonPortHolder(port, cb);
+  });
+}
+
 // ─── Nexus cleanup (preserve prior postinstall behaviour) ──────────────────
 
 function cleanNexus() {
@@ -479,6 +541,8 @@ function installSystemd(nodeBin, omniusScript, user) {
     "Documentation=https://github.com/robit-man/omnius",
     "After=network-online.target",
     "Wants=network-online.target",
+    "StartLimitIntervalSec=30",
+    "StartLimitBurst=10",
     "",
     "[Service]",
     "Type=simple",
@@ -492,8 +556,6 @@ function installSystemd(nodeBin, omniusScript, user) {
     // Pair with StartLimitIntervalSec to prevent thrash loops.
     "Restart=always",
     "RestartSec=3",
-    "StartLimitIntervalSec=30",
-    "StartLimitBurst=10",
     "StandardOutput=append:" + path.join(logDir, "daemon.log"),
     "StandardError=append:" + path.join(logDir, "daemon.err.log"),
     "",
@@ -856,14 +918,14 @@ function main() {
     return safeExit(0);
   }
 
-  // Force-kill any process holding the daemon port BEFORE we try to install
+  // Stop an attested old Omnius daemon before we try to install
   // a service. This handles the orphan-detached-daemon case (started by
   // `omnius serve --daemon` from a previous TUI session) — systemctl/launchctl
   // restart can't reach it, so we have to clean up explicitly. Without this,
   // the new service-managed daemon fails to bind port 11435 and the user
   // ends up running stale in-memory code from the previous version.
   progress(5, INSTALL_STEPS, "Clearing daemon port");
-  forceKillPortHolder(PORT, function (killedCount) {
+  stopAttestedDaemonPortHolder(PORT, function (killedCount) {
     if (killedCount > 0) {
       log("Killed " + killedCount + " stale daemon process(es) holding port " + PORT + ".");
     }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "omnius",
-  "version": "1.0.556",
+  "version": "1.0.558",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "omnius",
-      "version": "1.0.556",
+      "version": "1.0.558",
       "bundleDependencies": [
         "image-to-ascii"
       ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnius",
-  "version": "1.0.556",
+  "version": "1.0.558",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",