openclaw-aegis 1.2.0 → 1.2.1

package/dist/cli/index.js

@@ -465,7 +465,7 @@ async function httpHealthProbe(target, port, endpoint = "/health", timeoutMs = 5
 // src/health/probes/config.ts
 var fs3 = __toESM(require("fs"));
 var REQUIRED_CONFIG_PATHS = [
-  { path: ["gateway", "port"], label: "gateway.port" }
+  { path: [["gateway", "port"], ["port"]], label: "gateway.port" }
 ];
 var POISON_KEYS = ["autoAck", "autoAckMessage"];
 async function configProbe(_target, configPath) {
@@ -493,13 +493,15 @@ async function configProbe(_target, configPath) {
         latencyMs: Date.now() - start
       };
     }
-    const missingPaths = REQUIRED_CONFIG_PATHS.filter(({ path: path4 }) => {
-      let obj = parsed;
-      for (const key of path4) {
-        if (obj === null || typeof obj !== "object" || !(key in obj)) return true;
-        obj = obj[key];
-      }
-      return false;
+    const missingPaths = REQUIRED_CONFIG_PATHS.filter(({ path: alternatives }) => {
+      return !alternatives.some((keyPath) => {
+        let obj = parsed;
+        for (const key of keyPath) {
+          if (obj === null || typeof obj !== "object" || !(key in obj)) return false;
+          obj = obj[key];
+        }
+        return true;
+      });
     });
     if (missingPaths.length > 0) {
       return {
@@ -594,6 +596,26 @@ async function tunProbe(_target) {
 
 // src/health/probes/memory.ts
 var fs5 = __toESM(require("fs"));
+var os3 = __toESM(require("os"));
+var import_node_child_process3 = require("child_process");
+function getRssMb(pid) {
+  if (os3.platform() !== "darwin") {
+    const statusPath = `/proc/${pid}/status`;
+    if (!fs5.existsSync(statusPath)) return null;
+    const status = fs5.readFileSync(statusPath, "utf-8");
+    const rssMatch = status.match(/VmRSS:\s+(\d+)\s+kB/);
+    if (!rssMatch) return null;
+    return parseInt(rssMatch[1] ?? "0", 10) / 1024;
+  }
+  try {
+    const output = (0, import_node_child_process3.execSync)(`ps -o rss= -p ${pid}`, { encoding: "utf-8" }).trim();
+    const rssKb = parseInt(output, 10);
+    if (isNaN(rssKb)) return null;
+    return rssKb / 1024;
+  } catch {
+    return null;
+  }
+}
 async function memoryProbe(_target, pidSource, thresholdMb = 512) {
   const start = Date.now();
   try {
@@ -607,29 +629,16 @@ async function memoryProbe(_target, pidSource, thresholdMb = 512) {
         latencyMs: Date.now() - start
       };
     }
-    const statusPath = `/proc/${pid}/status`;
-    if (!fs5.existsSync(statusPath)) {
+    const rssMb = getRssMb(pid);
+    if (rssMb === null) {
       return {
         name: "memory",
         healthy: false,
         score: 0,
-        message: `Process ${pid} not found in /proc`,
+        message: `Could not read memory for process ${pid}`,
         latencyMs: Date.now() - start
       };
     }
-    const status = fs5.readFileSync(statusPath, "utf-8");
-    const rssMatch = status.match(/VmRSS:\s+(\d+)\s+kB/);
-    if (!rssMatch) {
-      return {
-        name: "memory",
-        healthy: true,
-        score: 1,
-        message: "Could not parse RSS from /proc status",
-        latencyMs: Date.now() - start
-      };
-    }
-    const rssKb = parseInt(rssMatch[1] ?? "0", 10);
-    const rssMb = rssKb / 1024;
     const healthy = rssMb < thresholdMb;
     return {
       name: "memory",
@@ -651,6 +660,35 @@ async function memoryProbe(_target, pidSource, thresholdMb = 512) {
 
 // src/health/probes/cpu.ts
 var fs6 = __toESM(require("fs"));
+var os4 = __toESM(require("os"));
+var import_node_child_process4 = require("child_process");
+async function getCpuPercentLinux(pid, sampleMs) {
+  const statPath = `/proc/${pid}/stat`;
+  if (!fs6.existsSync(statPath)) return null;
+  const readCpuTime = () => {
+    const stat = fs6.readFileSync(statPath, "utf-8");
+    const fields = stat.split(" ");
+    const utime = parseInt(fields[13] ?? "0", 10) || 0;
+    const stime = parseInt(fields[14] ?? "0", 10) || 0;
+    return utime + stime;
+  };
+  const cpuTime1 = readCpuTime();
+  await new Promise((r) => setTimeout(r, sampleMs));
+  const cpuTime2 = readCpuTime();
+  const clockTicks = 100;
+  const cpuDelta = (cpuTime2 - cpuTime1) / clockTicks;
+  return cpuDelta / (sampleMs / 1e3) * 100;
+}
+function getCpuPercentMac(pid) {
+  try {
+    const output = (0, import_node_child_process4.execSync)(`ps -o %cpu= -p ${pid}`, { encoding: "utf-8" }).trim();
+    const cpu = parseFloat(output);
+    if (isNaN(cpu)) return null;
+    return cpu;
+  } catch {
+    return null;
+  }
+}
 async function cpuProbe(_target, pidSource, thresholdPercent = 90, sampleMs = 1e3) {
   const start = Date.now();
   try {
@@ -664,29 +702,21 @@ async function cpuProbe(_target, pidSource, thresholdPercent = 90, sampleMs = 1e
         latencyMs: Date.now() - start
       };
     }
-    const statPath = `/proc/${pid}/stat`;
-    if (!fs6.existsSync(statPath)) {
+    let cpuPercent;
+    if (os4.platform() === "darwin") {
+      cpuPercent = getCpuPercentMac(pid);
+    } else {
+      cpuPercent = await getCpuPercentLinux(pid, sampleMs);
+    }
+    if (cpuPercent === null) {
       return {
         name: "cpu",
         healthy: false,
         score: 0,
-        message: `Process ${pid} not found in /proc`,
+        message: `Could not read CPU usage for process ${pid}`,
         latencyMs: Date.now() - start
       };
     }
-    const readCpuTime = () => {
-      const stat = fs6.readFileSync(statPath, "utf-8");
-      const fields = stat.split(" ");
-      const utime = parseInt(fields[13] ?? "0", 10) || 0;
-      const stime = parseInt(fields[14] ?? "0", 10) || 0;
-      return utime + stime;
-    };
-    const cpuTime1 = readCpuTime();
-    await new Promise((r) => setTimeout(r, sampleMs));
-    const cpuTime2 = readCpuTime();
-    const clockTicks = 100;
-    const cpuDelta = (cpuTime2 - cpuTime1) / clockTicks;
-    const cpuPercent = cpuDelta / (sampleMs / 1e3) * 100;
     const healthy = cpuPercent < thresholdPercent;
     return {
       name: "cpu",
@@ -707,10 +737,10 @@ async function cpuProbe(_target, pidSource, thresholdPercent = 90, sampleMs = 1e
 }
 
 // src/health/probes/disk.ts
-var import_node_child_process3 = require("child_process");
+var import_node_child_process5 = require("child_process");
 var import_node_util2 = require("util");
 var path2 = __toESM(require("path"));
-var execFileAsync2 = (0, import_node_util2.promisify)(import_node_child_process3.execFile);
+var execFileAsync2 = (0, import_node_util2.promisify)(import_node_child_process5.execFile);
 async function diskProbe(_target, configPath, thresholdMb = 100) {
   const start = Date.now();
   try {
@@ -1048,7 +1078,7 @@ var checkCommand = new import_commander2.Command("check").description("Run all h
 // src/cli/commands/init.ts
 var import_commander3 = require("commander");
 var fs8 = __toESM(require("fs"));
-var os3 = __toESM(require("os"));
+var os5 = __toESM(require("os"));
 var readline = __toESM(require("readline"));
 function ask(rl, question, defaultValue) {
   const suffix = defaultValue ? ` [${defaultValue}]` : "";
@@ -1071,19 +1101,19 @@ function detectPort() {
   return 3e3;
 }
 function detectPlatform() {
-  if (os3.platform() === "darwin") {
+  if (os5.platform() === "darwin") {
     return { type: "launchd", pidFile: "ai.openclaw.gateway" };
   }
   return { type: "systemd", pidFile: "openclaw-gateway.service" };
 }
 function generateToml(opts) {
-  const platform3 = detectPlatform();
+  const platform5 = detectPlatform();
   let toml = `# OpenClaw Aegis Configuration
 # Generated by 'aegis init'
 
 [gateway]
 configPath = "~/.openclaw/openclaw.json"
-pidFile = "${platform3.pidFile}"
+pidFile = "${platform5.pidFile}"
 port = ${opts.port}
 logPath = "~/.openclaw/logs/gateway.log"
 healthEndpoint = "/health"
@@ -1110,7 +1140,7 @@ enabled = true
 countdownMs = 30000
 
 [platform]
-type = "${platform3.type}"
+type = "${platform5.type}"
 `;
   if (opts.channels.length > 0) {
     toml += "\n[alerts]\n";
@@ -1145,9 +1175,9 @@ var initCommand = new import_commander3.Command("init").description("Interactive
   const channels = [];
   if (opts.auto) {
     console.log("Auto-detecting configuration...");
-    const platform3 = detectPlatform();
+    const platform5 = detectPlatform();
     console.log(`  Gateway port: ${detectedPort}`);
-    console.log(`  PID source: ${platform3.pidFile} (${platform3.type})`);
+    console.log(`  PID source: ${platform5.pidFile} (${platform5.type})`);
     console.log(`  Memory threshold: 768MB`);
   } else {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });