frizz-server 0.15.6 → 0.15.8

package/dist/acp-daemon.js

@@ -70,6 +70,27 @@ function sweepStaleSockets(options, deps = {}) {
   });
 }
 
+// packages/server/src/backend/socket-ownership.ts
+import { statSync } from "node:fs";
+function socketPathOwnership(socketPath) {
+  if (process.platform === "win32") return () => true;
+  let bound;
+  try {
+    const stat = statSync(socketPath);
+    bound = { dev: stat.dev, ino: stat.ino };
+  } catch {
+    return () => true;
+  }
+  return () => {
+    try {
+      const now = statSync(socketPath);
+      return now.dev === bound.dev && now.ino === bound.ino;
+    } catch {
+      return false;
+    }
+  };
+}
+
 // packages/server/src/backend/acp-daemon.ts
 var MAX_QUEUED_LINES = 2e4;
 var MAX_QUEUED_BYTES = 64 * 1024 * 1024;
@@ -131,6 +152,7 @@ function main() {
   let dropped = 0;
   let idleTimer = null;
   let published = false;
+  let socketPathIsOurs = () => true;
   const recordOwner = () => {
     try {
       const value = JSON.parse(readFileSync(config.recordPath, "utf8"));
@@ -152,7 +174,7 @@ function main() {
       }
     }
     if (published && owner !== null && owner !== process.pid) return;
-    if (published && process.platform !== "win32") {
+    if (published && process.platform !== "win32" && socketPathIsOurs()) {
       try {
         unlinkSync2(config.socketPath);
       } catch {
@@ -196,7 +218,8 @@ function main() {
       unreachableStrikes = 0;
       return;
     }
-    if (recordOwner() === process.pid) {
+    const recorded = recordOwner() === process.pid;
+    if (recorded && socketPathIsOurs()) {
       unreachableStrikes = 0;
       return;
     }
@@ -205,7 +228,7 @@ function main() {
       child.kill("SIGTERM");
     } catch {
     }
-    die(0, "self-collected-record-reassigned");
+    die(0, recorded ? "self-collected-socket-lost" : "self-collected-record-reassigned");
   };
   const toClient = (line) => {
     if (client) {
@@ -365,6 +388,7 @@ function main() {
     server.on("error", () => die(6, "socket-listen-error"));
     server.listen(config.socketPath, () => {
       published = true;
+      socketPathIsOurs = socketPathOwnership(config.socketPath);
       writeRecord();
       armIdleExit();
       const reachability = setInterval(checkReachable, config.reachabilityCheckMs ?? REACHABILITY_CHECK_MS);