@threadbase-sh/streamer 1.70.5 → 1.70.6

package/dist/cli.cjs

@@ -127837,7 +127837,7 @@ function uidScope() {
 function resolveOwnLabel() {
   if (process.env.LAUNCHD_LABEL) return process.env.LAUNCHD_LABEL;
   try {
-    (0, import_node_child_process5.execFileSync)("launchctl", ["print", `${uidScope()}/homebrew.mxcl.tb-streamer`], {
+    (0, import_node_child_process6.execFileSync)("launchctl", ["print", `${uidScope()}/homebrew.mxcl.tb-streamer`], {
       stdio: "ignore"
     });
     return "homebrew.mxcl.tb-streamer";
@@ -127847,7 +127847,7 @@ function resolveOwnLabel() {
 }
 function isLabelLoaded(label) {
   try {
-    (0, import_node_child_process5.execFileSync)("launchctl", ["list", label], { stdio: "ignore" });
+    (0, import_node_child_process6.execFileSync)("launchctl", ["list", label], { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -127867,7 +127867,7 @@ function detectConflictingAgents() {
     }
   }
   try {
-    const out = (0, import_node_child_process5.execFileSync)("launchctl", ["list"], {
+    const out = (0, import_node_child_process6.execFileSync)("launchctl", ["list"], {
       stdio: ["ignore", "pipe", "ignore"]
     }).toString();
     for (const line of out.split("\n")) {
@@ -127900,11 +127900,11 @@ function formatConflictMessage(conflicts) {
   );
   return lines.join("\n");
 }
-var import_node_child_process5, KNOWN_STREAMER_LABELS, LEGACY_PATTERN;
+var import_node_child_process6, KNOWN_STREAMER_LABELS, LEGACY_PATTERN;
 var init_conflict_check = __esm({
   "src/lifecycle/conflict-check.ts"() {
     "use strict";
-    import_node_child_process5 = require("child_process");
+    import_node_child_process6 = require("child_process");
     init_constants();
     KNOWN_STREAMER_LABELS = [
       "com.ronen.threadbase",
@@ -127932,7 +127932,7 @@ function uidScope2() {
 function resolveLoadedLabel() {
   if (process.env.LAUNCHD_LABEL) return process.env.LAUNCHD_LABEL;
   try {
-    (0, import_node_child_process6.execFileSync)("launchctl", ["print", `${uidScope2()}/${BREW_LAUNCHD_LABEL2}`], {
+    (0, import_node_child_process7.execFileSync)("launchctl", ["print", `${uidScope2()}/${BREW_LAUNCHD_LABEL2}`], {
       stdio: "ignore"
     });
     return BREW_LAUNCHD_LABEL2;
@@ -127945,7 +127945,7 @@ function fullTarget() {
 }
 function isAgentLoaded() {
   try {
-    (0, import_node_child_process6.execFileSync)("launchctl", ["list", resolveLoadedLabel()], { stdio: "ignore" });
+    (0, import_node_child_process7.execFileSync)("launchctl", ["list", resolveLoadedLabel()], { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -127953,7 +127953,7 @@ function isAgentLoaded() {
 }
 function bootoutAgent(timeoutMs = 2e3) {
   try {
-    (0, import_node_child_process6.execFileSync)("launchctl", ["bootout", fullTarget()], { stdio: "ignore" });
+    (0, import_node_child_process7.execFileSync)("launchctl", ["bootout", fullTarget()], { stdio: "ignore" });
   } catch {
   }
   const deadline = Date.now() + timeoutMs;
@@ -127964,7 +127964,7 @@ function bootoutAgent(timeoutMs = 2e3) {
 }
 function bootstrapAgent(plistPath, opts) {
   try {
-    (0, import_node_child_process6.execFileSync)("launchctl", ["bootstrap", uidScope2(), plistPath], {
+    (0, import_node_child_process7.execFileSync)("launchctl", ["bootstrap", uidScope2(), plistPath], {
       stdio: ["ignore", "ignore", "pipe"]
     });
   } catch (err) {
@@ -127977,7 +127977,7 @@ function bootstrapAgent(plistPath, opts) {
   }
 }
 function kickstartAgent() {
-  (0, import_node_child_process6.execFileSync)("launchctl", ["kickstart", "-k", fullTarget()], { stdio: "ignore" });
+  (0, import_node_child_process7.execFileSync)("launchctl", ["kickstart", "-k", fullTarget()], { stdio: "ignore" });
 }
 function darwinPlistPath() {
   return `${process.env.HOME}/Library/LaunchAgents/${resolveLoadedLabel()}.plist`;
@@ -127987,7 +127987,7 @@ function getLogPaths() {
 }
 function getAgentPid() {
   try {
-    const out = (0, import_node_child_process6.execFileSync)("launchctl", ["list"], {
+    const out = (0, import_node_child_process7.execFileSync)("launchctl", ["list"], {
       stdio: ["ignore", "pipe", "ignore"]
     }).toString();
     const label = resolveLoadedLabel();
@@ -128003,11 +128003,11 @@ function getAgentPid() {
     return null;
   }
 }
-var import_node_child_process6, BREW_LAUNCHD_LABEL2;
+var import_node_child_process7, BREW_LAUNCHD_LABEL2;
 var init_launchd = __esm({
   "src/lifecycle/launchd.ts"() {
     "use strict";
-    import_node_child_process6 = require("child_process");
+    import_node_child_process7 = require("child_process");
     init_constants();
     BREW_LAUNCHD_LABEL2 = "homebrew.mxcl.tb-streamer";
   }
@@ -128079,7 +128079,7 @@ __export(task_scheduler_exports, {
   kickstartAgent: () => kickstartAgent2
 });
 function ps2(command) {
-  return (0, import_node_child_process7.execFileSync)("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", command], {
+  return (0, import_node_child_process8.execFileSync)("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", command], {
     stdio: ["ignore", "pipe", "ignore"]
   }).toString();
 }
@@ -128123,11 +128123,11 @@ function getAgentPid2() {
     return null;
   }
 }
-var import_node_child_process7;
+var import_node_child_process8;
 var init_task_scheduler = __esm({
   "src/lifecycle/task-scheduler.ts"() {
     "use strict";
-    import_node_child_process7 = require("child_process");
+    import_node_child_process8 = require("child_process");
     init_constants();
   }
 });
@@ -128512,7 +128512,7 @@ __export(repo_exports, {
 });
 function getGitToplevel(cwd) {
   try {
-    return (0, import_node_child_process9.execFileSync)("git", ["rev-parse", "--show-toplevel"], {
+    return (0, import_node_child_process10.execFileSync)("git", ["rev-parse", "--show-toplevel"], {
       cwd,
       stdio: ["ignore", "pipe", "ignore"]
     }).toString().trim();
@@ -128520,11 +128520,11 @@ function getGitToplevel(cwd) {
     return null;
   }
 }
-var import_node_child_process9;
+var import_node_child_process10;
 var init_repo = __esm({
   "src/lifecycle/repo.ts"() {
     "use strict";
-    import_node_child_process9 = require("child_process");
+    import_node_child_process10 = require("child_process");
   }
 });
 
@@ -153141,6 +153141,7 @@ function pruneAgentConversations(cache) {
 }
 
 // src/services/host-pressure/hostPressure.ts
+var import_node_child_process4 = require("child_process");
 var import_os16 = require("os");
 var import_perf_hooks = require("perf_hooks");
 var HOST_PRESSURE_SAMPLE_MS = 5e3;
@@ -153175,6 +153176,59 @@ var HOST_PRESSURE_BARS = {
 };
 var REASON_ORDER = ["memory", "event_loop", "load", "agents"];
 var RANK = { ok: 0, elevated: 1, critical: 2 };
+function parseMacMemoryPressureFreeRatio(output) {
+  const match2 = output.match(/System-wide memory free percentage:\s*(\d+(?:\.\d+)?)%/);
+  if (!match2) return void 0;
+  const percentage = Number(match2[1]);
+  return percentage <= 100 ? percentage / 100 : void 0;
+}
+function runMacMemoryPressure() {
+  return new Promise((resolve4, reject) => {
+    (0, import_node_child_process4.execFile)(
+      "/usr/bin/memory_pressure",
+      ["-Q"],
+      { encoding: "utf8", timeout: 1e3 },
+      (error51, stdout2) => {
+        if (error51) {
+          reject(error51);
+          return;
+        }
+        resolve4(stdout2);
+      }
+    );
+  });
+}
+async function readMacMemoryPressureFreeRatio(run2 = runMacMemoryPressure) {
+  try {
+    return parseMacMemoryPressureFreeRatio(await run2());
+  } catch {
+    return void 0;
+  }
+}
+var MacMemoryPressureProbe = class {
+  constructor(read) {
+    this.read = read;
+  }
+  read;
+  current;
+  pending = false;
+  refresh() {
+    if (this.pending) return;
+    this.pending = true;
+    void this.read().then((ratio) => {
+      this.current = ratio;
+    }).finally(() => {
+      this.pending = false;
+    });
+  }
+  value() {
+    return this.current;
+  }
+};
+function hostMemoryFreeRatio(platform3, totalBytes, freeBytes, macPressureFreeRatio) {
+  if (platform3 === "darwin") return macPressureFreeRatio;
+  return totalBytes > 0 ? freeBytes / totalBytes : 1;
+}
 function worst(levels) {
   return levels.reduce(
     (acc, level) => RANK[level] > RANK[acc] ? level : acc,
@@ -153234,7 +153288,7 @@ function cpuBusyRatio(previous, next) {
   return 1 - idle / total;
 }
 function classifyHostPressure(sample, previous, platform3) {
-  const memRaw = schmittLowIsWorse(
+  const mem = sample.memFreeRatio === void 0 ? "ok" : schmittLowIsWorse(
     sample.memFreeRatio,
     previous,
     HOST_PRESSURE_BARS.memFreeRatio.enterElevated,
@@ -153242,7 +153296,6 @@ function classifyHostPressure(sample, previous, platform3) {
     HOST_PRESSURE_BARS.memFreeRatio.enterCritical,
     HOST_PRESSURE_BARS.memFreeRatio.leaveCritical
   );
-  const mem = platform3 === "darwin" && memRaw === "critical" ? "elevated" : memRaw;
   const eventLoop = schmittHighIsWorse(
     sample.eventLoopP99Ms,
     previous,
@@ -153326,23 +153379,28 @@ var HostPressureMonitor = class {
 };
 function createHostPressureMonitor(wsHub, liveAgents) {
   const histogram = (0, import_perf_hooks.monitorEventLoopDelay)({ resolution: 20 });
-  const windows = process.platform === "win32";
+  const platform3 = process.platform;
+  const windows = platform3 === "win32";
+  const macMemoryPressure = platform3 === "darwin" ? new MacMemoryPressureProbe(readMacMemoryPressureFreeRatio) : null;
   let prevCpuTimes = null;
+  macMemoryPressure?.refresh();
   const monitor = new HostPressureMonitor({
     wsHub,
     histogram,
     readSample: () => {
       const eventLoopP99Ms = histogram.percentile(99) / 1e6;
       histogram.reset();
-      const total = (0, import_os16.totalmem)();
+      const total = platform3 === "darwin" ? 0 : (0, import_os16.totalmem)();
+      const free = platform3 === "darwin" ? 0 : (0, import_os16.freemem)();
       const cpuList = (0, import_os16.cpus)();
       const sample = {
         liveAgents: liveAgents(),
-        memFreeRatio: total > 0 ? (0, import_os16.freemem)() / total : 1,
+        memFreeRatio: hostMemoryFreeRatio(platform3, total, free, macMemoryPressure?.value()),
         eventLoopP99Ms,
         load1: (0, import_os16.loadavg)()[0],
         ncpu: cpuList.length
       };
+      macMemoryPressure?.refresh();
       if (windows) {
         const cpuTimes = cpuList.map((cpu) => cpu.times);
         sample.cpuBusyRatio = cpuBusyRatio(prevCpuTimes, cpuTimes);
@@ -157690,9 +157748,9 @@ function downloadPath(version2, filename) {
 }
 
 // src/updater/restart.ts
-var import_node_child_process4 = require("child_process");
+var import_node_child_process5 = require("child_process");
 var import_node_util3 = require("util");
-var execFileP = (0, import_node_util3.promisify)(import_node_child_process4.execFile);
+var execFileP = (0, import_node_util3.promisify)(import_node_child_process5.execFile);
 var BREW_LAUNCHD_LABEL = "homebrew.mxcl.tb-streamer";
 var DEPLOY_LAUNCHD_LABEL = "com.ronen.threadbase";
 function resolveDefaultLabel() {
@@ -161141,7 +161199,7 @@ async function printServerBanner({
 }
 
 // cli/prod.ts
-var import_node_child_process8 = require("child_process");
+var import_node_child_process9 = require("child_process");
 var import_node_fs23 = require("fs");
 init_auth();
 init_feature_flags();
@@ -161306,7 +161364,7 @@ var defaultSpawnTail = ({ files, lines, follow }) => {
   ] : ["-n", String(lines), ...follow ? ["-F"] : [], ...existing];
   const program3 = isWindows3 ? "powershell.exe" : "tail";
   return new Promise((resolve4) => {
-    const child = (0, import_node_child_process8.spawn)(program3, args, {
+    const child = (0, import_node_child_process9.spawn)(program3, args, {
       stdio: ["ignore", "inherit", "inherit"]
     });
     child.on(