hotsheet 0.17.0-beta.23 → 0.17.0-beta.25

package/dist/channel.js

@@ -34145,9 +34145,9 @@ var StdioServerTransport = class {
 
 // src/channel.ts
 init_zod();
-import { readFileSync as readFileSync2, unlinkSync, writeFileSync } from "fs";
+import { readFileSync as readFileSync4 } from "fs";
 import { createServer } from "http";
-import { join as join3 } from "path";
+import { join as join5 } from "path";
 
 // src/channel.tools.ts
 init_zod();
@@ -34685,34 +34685,16 @@ async function callTool(name, args2, dataDir2, fetchFn = globalThis.fetch) {
 }
 
 // src/channel-config.ts
-import { basename as basename2, dirname, join as join2, resolve } from "path";
+import { basename as basename2, dirname, join as join3, resolve } from "path";
 init_zod();
 
-// src/claude-allow-rule.ts
-init_zod();
-init_file_settings();
-var ClaudeSettingsSchema = external_exports3.object({
-  permissions: external_exports3.object({
-    allow: external_exports3.array(external_exports3.string()).default([])
-  }).loose().default(() => ({ allow: [] }))
-}).loose();
-
-// src/channel-config.ts
-var McpConfigSchema = external_exports3.object({
-  mcpServers: external_exports3.record(external_exports3.string(), external_exports3.unknown()).optional()
-}).loose();
-function slugifyDataDir(dataDir2) {
-  const root = dataDir2.replace(/[\\/]\.hotsheet[\\/]?$/, "");
-  const base = basename2(root) || "project";
-  const slug = base.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-  return slug !== "" ? slug : "project";
-}
-
 // src/channelLog.ts
 import { appendFileSync, renameSync, statSync } from "fs";
+import { join as join2 } from "path";
 var CHANNEL_LOG_MAX_BYTES = 1048576;
-function createChannelLogger(logPath) {
+function createChannelLogger(logPath, options = {}) {
   let injectedBlankLine = false;
+  const pidSuffix = options.pidLabel !== void 0 && options.pidLabel !== "" ? ` ${options.pidLabel}` : "";
   return {
     log(event, details) {
       try {
@@ -34727,7 +34709,7 @@ function createChannelLogger(logPath) {
         const detailsText = details === void 0 || details === "" ? "" : ` ${details}`;
         const prefix = !injectedBlankLine && size > 0 ? "\n" : "";
         injectedBlankLine = true;
-        appendFileSync(logPath, `${prefix}[${ts}] [pid ${process.pid}] ${event}:${detailsText}
+        appendFileSync(logPath, `${prefix}[${ts}] [pid ${process.pid}${pidSuffix}] ${event}:${detailsText}
 `, "utf-8");
       } catch {
       }
@@ -34742,6 +34724,94 @@ function safeStatSize(path) {
   }
 }
 
+// src/channelPortFile.ts
+import { closeSync, openSync, readFileSync as readFileSync2, renameSync as renameSync2, unlinkSync, writeFileSync } from "fs";
+function readChannelInfo(portFile2) {
+  let raw;
+  try {
+    raw = readFileSync2(portFile2, "utf-8").trim();
+  } catch {
+    return null;
+  }
+  if (raw === "") return null;
+  if (raw.startsWith("{")) {
+    try {
+      const parsed = JSON.parse(raw);
+      if (typeof parsed !== "object" || parsed === null) return null;
+      const obj = parsed;
+      if (typeof obj.port !== "number" || !Number.isInteger(obj.port)) return null;
+      return {
+        port: obj.port,
+        pid: typeof obj.pid === "number" && Number.isInteger(obj.pid) ? obj.pid : null,
+        slug: typeof obj.slug === "string" && obj.slug !== "" ? obj.slug : null,
+        startedAt: typeof obj.startedAt === "string" && obj.startedAt !== "" ? obj.startedAt : null
+      };
+    } catch {
+      return null;
+    }
+  }
+  const legacyPort = parseInt(raw, 10);
+  if (isNaN(legacyPort)) return null;
+  return { port: legacyPort, pid: null, slug: null, startedAt: null };
+}
+function writeChannelInfo(portFile2, info) {
+  const tmp = `${portFile2}.tmp.${process.pid.toString(36)}`;
+  const body = JSON.stringify({
+    port: info.port,
+    pid: info.pid,
+    slug: info.slug,
+    startedAt: info.startedAt
+  });
+  writeFileSync(tmp, body, "utf-8");
+  renameSync2(tmp, portFile2);
+  try {
+    const slash = portFile2.lastIndexOf("/");
+    if (slash > 0) {
+      const fd = openSync(portFile2.slice(0, slash), "r");
+      try {
+        closeSync(fd);
+      } catch {
+      }
+    }
+  } catch {
+  }
+}
+function maybeUnlinkPortFile(portFile2, myPort2, myPid = process.pid) {
+  const info = readChannelInfo(portFile2);
+  if (info === null) return false;
+  if (info.pid !== null) {
+    if (info.pid !== myPid) return false;
+  } else {
+    if (info.port !== myPort2) return false;
+  }
+  try {
+    unlinkSync(portFile2);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// src/claude-allow-rule.ts
+init_zod();
+init_file_settings();
+var ClaudeSettingsSchema = external_exports3.object({
+  permissions: external_exports3.object({
+    allow: external_exports3.array(external_exports3.string()).default([])
+  }).loose().default(() => ({ allow: [] }))
+}).loose();
+
+// src/channel-config.ts
+var McpConfigSchema = external_exports3.object({
+  mcpServers: external_exports3.record(external_exports3.string(), external_exports3.unknown()).optional()
+}).loose();
+function slugifyDataDir(dataDir2) {
+  const root = dataDir2.replace(/[\\/]\.hotsheet[\\/]?$/, "");
+  const base = basename2(root) || "project";
+  const slug = base.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+  return slug !== "" ? slug : "project";
+}
+
 // src/channelPermissions.ts
 var PERMISSION_TTL_MS = 12e4;
 var queue = [];
@@ -34765,6 +34835,161 @@ function clearAllPermissions() {
   queue.length = 0;
 }
 
+// src/channelRegistry.ts
+import { existsSync, mkdirSync, readdirSync, readFileSync as readFileSync3, unlinkSync as unlinkSync2, writeFileSync as writeFileSync2 } from "fs";
+import { join as join4 } from "path";
+function registryDir(dataDir2) {
+  return join4(dataDir2, "channel-ports.d");
+}
+function entryPath(dataDir2, pid) {
+  return join4(registryDir(dataDir2), `${String(pid)}.json`);
+}
+function defaultIsPidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function registerSelf(dataDir2, info) {
+  if (info.pid === null) return;
+  mkdirSync(registryDir(dataDir2), { recursive: true });
+  const path = entryPath(dataDir2, info.pid);
+  const body = JSON.stringify({
+    port: info.port,
+    pid: info.pid,
+    slug: info.slug,
+    startedAt: info.startedAt
+  });
+  writeFileSync2(path, body, "utf-8");
+}
+function unregisterSelf(dataDir2, pid) {
+  try {
+    unlinkSync2(entryPath(dataDir2, pid));
+  } catch {
+  }
+}
+function readEntry(path) {
+  let raw;
+  try {
+    raw = readFileSync3(path, "utf-8");
+  } catch {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    if (typeof parsed !== "object" || parsed === null) return null;
+    const obj = parsed;
+    if (typeof obj.port !== "number" || !Number.isInteger(obj.port)) return null;
+    if (typeof obj.pid !== "number" || !Number.isInteger(obj.pid)) return null;
+    return {
+      port: obj.port,
+      pid: obj.pid,
+      slug: typeof obj.slug === "string" && obj.slug !== "" ? obj.slug : null,
+      startedAt: typeof obj.startedAt === "string" && obj.startedAt !== "" ? obj.startedAt : null
+    };
+  } catch {
+    return null;
+  }
+}
+function listAliveEntries(dataDir2, isPidAlive = defaultIsPidAlive) {
+  const dir = registryDir(dataDir2);
+  if (!existsSync(dir)) return [];
+  let names;
+  try {
+    names = readdirSync(dir);
+  } catch {
+    return [];
+  }
+  const alive = [];
+  for (const name of names) {
+    if (!name.endsWith(".json")) continue;
+    const path = join4(dir, name);
+    const entry = readEntry(path);
+    if (entry === null || entry.pid === null || !isPidAlive(entry.pid)) {
+      try {
+        unlinkSync2(path);
+      } catch {
+      }
+      continue;
+    }
+    alive.push(entry);
+  }
+  alive.sort((a, b) => {
+    if (a.startedAt === null && b.startedAt === null) return a.pid - b.pid;
+    if (a.startedAt === null) return 1;
+    if (b.startedAt === null) return -1;
+    return a.startedAt < b.startedAt ? -1 : a.startedAt > b.startedAt ? 1 : 0;
+  });
+  return alive;
+}
+function pickLeader(entries) {
+  return entries.length === 0 ? null : entries[0];
+}
+
+// src/channelPortFileWatcher.ts
+function installPortFileWatcher(opts) {
+  const intervalMs = opts.intervalMs ?? 5e3;
+  const setIntervalFn = opts.setIntervalFn ?? setInterval;
+  const clearIntervalFn = opts.clearIntervalFn ?? ((handle2) => {
+    clearInterval(handle2);
+  });
+  const isPidAlive = opts.isPidAlive ?? defaultIsPidAlive;
+  let lastRole = "unknown";
+  let lastLeaderPid = null;
+  const tick = () => {
+    if (opts.info.pid !== null) {
+      const allEntries = listAliveEntries(opts.dataDir, isPidAlive);
+      const ourEntry = allEntries.find((e) => e.pid === opts.info.pid);
+      if (ourEntry === void 0) {
+        try {
+          registerSelf(opts.dataDir, opts.info);
+          opts.log?.("port-file-registry-heal", `pid=${String(opts.info.pid)}`);
+        } catch (err) {
+          opts.log?.("port-file-heal-error", `registerSelf: ${String(err)}`);
+          return;
+        }
+      }
+    }
+    const alive = listAliveEntries(opts.dataDir, isPidAlive);
+    const leader = pickLeader(alive);
+    if (leader === null) {
+      return;
+    }
+    const weAreLeader = leader.pid === opts.info.pid;
+    if (weAreLeader) {
+      const current = readChannelInfo(opts.portFile);
+      const matches = current !== null && current.pid === opts.info.pid && current.port === opts.info.port && current.slug === opts.info.slug;
+      if (!matches) {
+        try {
+          writeChannelInfo(opts.portFile, opts.info);
+          const reason = current === null ? "missing" : `previous-leader-pid=${String(current.pid)}`;
+          opts.log?.("port-file-leader-write", reason);
+          opts.notify?.();
+        } catch (err) {
+          opts.log?.("port-file-heal-error", `writeChannelInfo: ${String(err)}`);
+          return;
+        }
+      }
+      if (lastRole !== "leader") {
+        lastRole = "leader";
+        lastLeaderPid = opts.info.pid;
+      }
+    } else {
+      if (lastRole !== "follower" || lastLeaderPid !== leader.pid) {
+        opts.log?.("port-file-follower-defer", `leader-pid=${String(leader.pid)} ours=${String(opts.info.pid)}`);
+        lastRole = "follower";
+        lastLeaderPid = leader.pid;
+      }
+    }
+  };
+  const handle = setIntervalFn(tick, intervalMs);
+  return () => {
+    clearIntervalFn(handle);
+  };
+}
+
 // src/channelStdioWatcher.ts
 function installStdioDisconnectHandler(opts) {
   const { stdin, stdout, onDisconnect, log } = opts;
@@ -34808,7 +35033,7 @@ function installStdioDisconnectHandler(opts) {
 }
 
 // src/channel.ts
-var CHANNEL_VERSION = 7;
+var CHANNEL_VERSION = 9;
 var dataDir = ".hotsheet";
 var args = process.argv.slice(2);
 for (let i = 0; i < args.length; i++) {
@@ -34817,10 +35042,11 @@ for (let i = 0; i < args.length; i++) {
     i++;
   }
 }
-var portFile = join3(dataDir, "channel-port");
+var portFile = join5(dataDir, "channel-port");
 var serverSlug = slugifyDataDir(dataDir);
 var serverName = `hotsheet-channel-${serverSlug}`;
-var channelLog = createChannelLogger(join3(dataDir, "mcp.log"));
+var processStartedAt = (/* @__PURE__ */ new Date()).toISOString();
+var channelLog = createChannelLogger(join5(dataDir, "mcp.log"));
 channelLog.log("process-start", `argv=${process.argv.slice(2).join(" ")} dataDir=${dataDir} serverName=${serverName}`);
 var mcp = new Server(
   { name: serverName, version: "0.1.0" },
@@ -34908,7 +35134,13 @@ var httpServer = createServer(async (req, res) => {
   }
   if (req.method === "GET" && req.url === "/health") {
     res.writeHead(200, { "Content-Type": "application/json" });
-    res.end(JSON.stringify({ ok: true, version: CHANNEL_VERSION }));
+    res.end(JSON.stringify({
+      ok: true,
+      version: CHANNEL_VERSION,
+      pid: process.pid,
+      slug: serverSlug,
+      startedAt: processStartedAt
+    }));
     return;
   }
   if (req.method === "GET" && req.url === "/permission") {
@@ -35043,8 +35275,8 @@ var httpServer = createServer(async (req, res) => {
 });
 function notifyMainServer(abortSignal) {
   try {
-    const settingsPath = join3(dataDir, "settings.json");
-    const settings = JSON.parse(readFileSync2(settingsPath, "utf-8"));
+    const settingsPath = join5(dataDir, "settings.json");
+    const settings = JSON.parse(readFileSync4(settingsPath, "utf-8"));
     if (settings.port === void 0 || settings.port === 0) {
       process.stderr.write(`[notify] no port in settings.json
 `);
@@ -35068,14 +35300,44 @@ function notifyMainServer(abortSignal) {
     return Promise.resolve();
   }
 }
+var myPort = null;
+var disposePortFileWatcher = null;
 httpServer.listen(0, "127.0.0.1", () => {
   const addr = httpServer.address();
   if (addr !== null && typeof addr !== "string") {
     const port = addr.port;
+    myPort = port;
+    const myInfo = {
+      port,
+      pid: process.pid,
+      slug: serverSlug,
+      startedAt: processStartedAt
+    };
+    try {
+      registerSelf(dataDir, myInfo);
+    } catch (err) {
+      channelLog.log("registry-register-error", String(err));
+    }
     try {
-      writeFileSync(portFile, String(port), "utf-8");
+      const alive = listAliveEntries(dataDir);
+      const leader = pickLeader(alive);
+      if (leader === null || leader.pid === process.pid) {
+        writeChannelInfo(portFile, myInfo);
+      } else {
+        channelLog.log("startup-follower", `leader-pid=${String(leader.pid)} aliveCount=${String(alive.length)}`);
+      }
     } catch {
     }
+    disposePortFileWatcher = installPortFileWatcher({
+      portFile,
+      dataDir,
+      info: myInfo,
+      intervalMs: 5e3,
+      log: (event, details) => channelLog.log(event, details),
+      notify: () => {
+        void notifyMainServer();
+      }
+    });
     process.stderr.write(`${serverName} listening on port ${port}
 `);
     channelLog.log("http-listen", `port=${port}`);
@@ -35087,13 +35349,18 @@ var heartbeatInterval = setInterval(() => {
   channelLog.log("heartbeat", `uptime=${process.uptime().toFixed(1)}s rss=${(mem.rss / 1024 / 1024).toFixed(1)}MiB`);
 }, 6e4);
 heartbeatInterval.unref();
+var cleanupInFlight = false;
 async function cleanup(reason = "unspecified") {
+  if (cleanupInFlight) return;
+  cleanupInFlight = true;
   channelLog.log("cleanup-start", `reason=${reason}`);
   clearInterval(heartbeatInterval);
-  try {
-    unlinkSync(portFile);
-  } catch {
+  if (disposePortFileWatcher !== null) {
+    disposePortFileWatcher();
+    disposePortFileWatcher = null;
   }
+  if (myPort !== null) maybeUnlinkPortFile(portFile, myPort);
+  unregisterSelf(dataDir, process.pid);
   try {
     const controller = new AbortController();
     setTimeout(() => controller.abort(), 1e3);
@@ -35117,10 +35384,7 @@ process.on("SIGHUP", () => {
 });
 process.on("exit", (code) => {
   channelLog.log("exit", `code=${code}`);
-  try {
-    unlinkSync(portFile);
-  } catch {
-  }
+  if (myPort !== null) maybeUnlinkPortFile(portFile, myPort);
 });
 export {
   CHANNEL_VERSION