frizz-server 0.15.7 → 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);

package/dist/claude-agent-broker.js

@@ -2,7 +2,7 @@ import { createRequire as __frizzCreateRequire } from "node:module"; const requi
 
 // packages/server/src/backend/claude-agent-broker.ts
 import net from "node:net";
-import { readFileSync as readFileSync5, realpathSync as realpathSync2, statSync as statSync3, unlinkSync as unlinkSync3, writeFileSync as writeFileSync3 } from "node:fs";
+import { readFileSync as readFileSync5, realpathSync as realpathSync2, unlinkSync as unlinkSync3, writeFileSync as writeFileSync3 } from "node:fs";
 import { randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
 
@@ -27488,15 +27488,36 @@ function claudeCompactionWindowOf(env) {
   return Number.isInteger(window) && window > 0 ? window : void 0;
 }
 
+// packages/server/src/backend/socket-ownership.ts
+import { statSync as statSync2 } from "node:fs";
+function socketPathOwnership(socketPath) {
+  if (process.platform === "win32") return () => true;
+  let bound;
+  try {
+    const stat = statSync2(socketPath);
+    bound = { dev: stat.dev, ino: stat.ino };
+  } catch {
+    return () => true;
+  }
+  return () => {
+    try {
+      const now = statSync2(socketPath);
+      return now.dev === bound.dev && now.ino === bound.ino;
+    } catch {
+      return false;
+    }
+  };
+}
+
 // packages/server/src/backend/claude-broker-diagnostics.ts
-import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync4, readFileSync as readFileSync4, renameSync as renameSync2, statSync as statSync2 } from "node:fs";
+import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync4, readFileSync as readFileSync4, renameSync as renameSync2, statSync as statSync3 } from "node:fs";
 import { join as join6 } from "node:path";
 var MAX_BYTES = 4 * 1024 * 1024;
 function appendRecord(path, record) {
   try {
     mkdirSync4(join6(path, ".."), { recursive: true });
     try {
-      if (statSync2(path).size > MAX_BYTES) renameSync2(path, `${path}.1`);
+      if (statSync3(path).size > MAX_BYTES) renameSync2(path, `${path}.1`);
     } catch {
     }
     appendFileSync2(path, `${JSON.stringify(record)}
@@ -27640,7 +27661,7 @@ function runClaudeBroker(config) {
     (error) => shutdown(0, "event-pump-failed", error instanceof Error ? error.message : String(error))
   );
   const armIdle = () => {
-    if (client) return;
+    if (client || closed) return;
     clearTimeout(idleTimer);
     idleTimer = setTimeout(() => shutdown(0, "idle-timeout"), IDLE_EXIT_MS);
   };
@@ -27737,16 +27758,7 @@ function runClaudeBroker(config) {
     sock.on("error", () => {
     });
   });
-  let socketIdentity = null;
-  const socketPathIsOurs = () => {
-    if (!socketIdentity) return true;
-    try {
-      const now = statSync3(config.socketPath);
-      return now.dev === socketIdentity.dev && now.ino === socketIdentity.ino;
-    } catch {
-      return false;
-    }
-  };
+  let socketPathIsOurs = () => true;
   const recordOwner = () => {
     if (!config.recordPath) return null;
     try {
@@ -27825,13 +27837,7 @@ function runClaudeBroker(config) {
   }
   server.listen(config.socketPath, () => {
     published = true;
-    if (process.platform !== "win32") {
-      try {
-        const bound = statSync3(config.socketPath);
-        socketIdentity = { dev: bound.dev, ino: bound.ino };
-      } catch {
-      }
-    }
+    socketPathIsOurs = socketPathOwnership(config.socketPath);
     if (config.recordPath) {
       const record = { daemonPid: process.pid, socketPath: config.socketPath, sessionId: config.sessionId, generation, createdAt: (/* @__PURE__ */ new Date()).toISOString(), capabilities: BROKER_CAPABILITIES, compactionWindow: claudeCompactionWindowOf(config.workerEnv) };
       try {

package/dist/codex-app-server-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/runtime-lease.ts
 import { existsSync, mkdirSync, readdirSync as readdirSync2, readFileSync, unlinkSync as unlinkSync2, writeFileSync } from "node:fs";
 import { dirname, join as join2 } from "node:path";
@@ -174,6 +195,7 @@ function main() {
   let dropped = 0;
   let idleTimer = null;
   let published = false;
+  let socketPathIsOurs = () => true;
   const recordOwner = () => {
     try {
       const value = JSON.parse(readFileSync2(config.recordPath, "utf8"));
@@ -195,7 +217,7 @@ function main() {
       }
     }
     if (published && owner !== null && owner !== process.pid) return;
-    if (published && process.platform !== "win32") {
+    if (published && process.platform !== "win32" && socketPathIsOurs()) {
       try {
         unlinkSync3(config.socketPath);
       } catch {
@@ -239,7 +261,8 @@ function main() {
       unreachableStrikes = 0;
       return;
     }
-    if (recordOwner() === process.pid) {
+    const recorded = recordOwner() === process.pid;
+    if (recorded && socketPathIsOurs()) {
       unreachableStrikes = 0;
       return;
     }
@@ -248,7 +271,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) {
@@ -380,6 +403,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);