@sma1lboy/kobe 0.9.19 → 0.9.21

package/dist/cli/pty-host-node.mjs

@@ -383,18 +383,22 @@ function recordPtyExit(info, path = defaultPtyExitsPath()) {
     return;
   if (info.exit.code === 0 && info.exit.signal === null)
     return;
-  const records = readPtyExitRecords(path);
-  records[info.key] = {
+  writeRecord(info.key, {
     key: info.key,
     pid: info.pid,
     code: info.exit.code,
     signal: info.exit.signal,
     at: info.exit.at,
-    tail: plainTail(info.tail)
-  };
-  const newest = Object.values(records).sort((a, b) => a.at < b.at ? 1 : -1).slice(0, MAX_RECORDS);
+    tail: plainTail(info.tail),
+    layer: "pty"
+  }, path);
+}
+function writeRecord(storeKey, record, path) {
+  const records = readPtyExitRecords(path);
+  records[storeKey] = record;
+  const newest = Object.entries(records).sort(([, a], [, b]) => a.at < b.at ? 1 : -1).slice(0, MAX_RECORDS);
   mkdirSync(dirname2(path), { recursive: true });
-  writeFileSync(path, JSON.stringify(Object.fromEntries(newest.map((r) => [r.key, r])), null, 2), "utf8");
+  writeFileSync(path, JSON.stringify(Object.fromEntries(newest), null, 2), "utf8");
 }
 
 // ../kobe-daemon/src/daemon/pty-freeze-store.ts
@@ -788,22 +792,24 @@ async function settledWithin(exited, ms) {
     clearTimeout(timer);
   return settled;
 }
-function signalProcessGroup(pid, signal, fallback, platform = process.platform) {
+function signalProcessGroup(pid, signal, fallback, platform = process.platform, onSignal) {
   if (platform !== "win32" && pid > 1) {
     try {
       process.kill(-pid, signal);
+      onSignal?.(`sent ${signal} to process group -${pid}`);
       return;
     } catch {}
   }
   try {
     fallback();
+    onSignal?.(`sent ${signal} to pid ${pid} (per-process fallback)`);
   } catch {}
 }
 var TERMINATION_GRACE_MS = 500;
-async function terminatePtyChild(proc, onSettled) {
-  signalProcessGroup(proc.pid, "SIGTERM", () => proc.kill("SIGTERM"));
+async function terminatePtyChild(proc, onSettled, onSignal) {
+  signalProcessGroup(proc.pid, "SIGTERM", () => proc.kill("SIGTERM"), process.platform, onSignal);
   if (!await settledWithin(proc.exited, TERMINATION_GRACE_MS)) {
-    signalProcessGroup(proc.pid, "SIGKILL", () => proc.kill("SIGKILL"));
+    signalProcessGroup(proc.pid, "SIGKILL", () => proc.kill("SIGKILL"), process.platform, onSignal);
     await settledWithin(proc.exited, TERMINATION_GRACE_MS);
   }
   onSettled();
@@ -856,7 +862,7 @@ class PtyChildController {
       this.markExited(session);
       return;
     }
-    await terminatePtyChild(proc, () => this.markExited(session));
+    await terminatePtyChild(proc, () => this.markExited(session), (line) => this.deps.log?.("pty-signal", `${session.key}: ${line}`));
   }
   markExited(session, exit) {
     if (!session.alive)