oc-inspector 1.5.0 → 1.5.1

package/bin/cli.mjs

@@ -350,7 +350,31 @@ async function runDaemonStop(silent = false, cmdOpts = {}) {
 
   if (st.alive) {
     try {
+      // 2a. Send SIGTERM for graceful shutdown
       process.kill(st.pid, "SIGTERM");
+
+      // 2b. Wait up to 5 seconds for the process to exit
+      let died = false;
+      for (let i = 0; i < 10; i++) {
+        await new Promise((r) => setTimeout(r, 500));
+        try {
+          process.kill(st.pid, 0); // probe — throws ESRCH if dead
+        } catch {
+          died = true;
+          break;
+        }
+      }
+
+      // 2c. Escalate to SIGKILL if still alive
+      if (!died) {
+        try {
+          process.kill(st.pid, "SIGKILL");
+          if (!silent) {
+            console.log(`  \x1b[33m⚠\x1b[0m  Process didn't exit after SIGTERM — sent SIGKILL (PID ${st.pid})`);
+          }
+        } catch { /* already dead */ }
+      }
+
       if (!silent) {
         console.log(`  \x1b[32m✓\x1b[0m Stopped inspector (PID ${st.pid})`);
         console.log("");
@@ -463,8 +487,17 @@ async function runServe(opts) {
   }
 
   const gracefulShutdown = async (signal) => {
+    // Force-exit after 5s so we never leave a zombie process
+    const forceTimer = setTimeout(() => {
+      console.log("  \x1b[33m⚠\x1b[0m  Shutdown timed out — forcing exit");
+      cleanupPidFile();
+      process.exit(1);
+    }, 5000);
+    forceTimer.unref();
+
     console.log(`\n  Shutting down (${signal})...`);
     await restoreConfigOnExit(opts);
+    cleanupPidFile();
     process.exit(0);
   };
 
@@ -503,8 +536,17 @@ async function runForeground(opts) {
   }
 
   const gracefulShutdown = async (signal) => {
+    // Force-exit after 5s so we never leave a zombie process
+    const forceTimer = setTimeout(() => {
+      console.log("  \x1b[33m⚠\x1b[0m  Shutdown timed out — forcing exit");
+      cleanupPidFile();
+      process.exit(1);
+    }, 5000);
+    forceTimer.unref();
+
     console.log(`\n  Shutting down (${signal})...`);
     await restoreConfigOnExit(opts);
+    cleanupPidFile();
     process.exit(0);
   };
 
@@ -512,6 +554,14 @@ async function runForeground(opts) {
   process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
 }
 
+/**
+ * Remove the daemon PID file on exit.
+ * Called during graceful shutdown so stop/status don't see stale PIDs.
+ */
+function cleanupPidFile() {
+  try { unlinkSync(PID_FILE); } catch { /* ignore */ }
+}
+
 /**
  * Restore original OpenClaw config on process exit.
  * Used by graceful shutdown handlers in _serve and run modes.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-inspector",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Real-time API traffic inspector for OpenClaw — intercepts LLM provider requests, shows token usage, costs, and message flow in a live web dashboard.",
   "type": "module",
   "bin": {

package/src/config.mjs

@@ -14,6 +14,16 @@ import { homedir } from "node:os";
 import { execSync } from "node:child_process";
 import { BUILTIN_URLS, detectActiveProviders } from "./providers.mjs";
 
+/**
+ * Regex matching inspector proxy URLs on localhost (any port).
+ *
+ * Used to detect whether a baseUrl has been patched by the inspector,
+ * regardless of which port was configured at the time.
+ *
+ * @type {RegExp}
+ */
+const PROXY_URL_RE = /127\.0\.0\.1:\d+/;
+
 /** Default OpenClaw state directory. */
 const DEFAULT_OPENCLAW_DIR = join(homedir(), ".openclaw");
 
@@ -260,7 +270,7 @@ export function disable({ configPath, openclawDir }) {
       // Verify backup is clean (doesn't contain proxy URLs)
       try {
         const backupContent = readFileSync(backupPath, "utf-8");
-        if (!backupContent.includes("127.0.0.1:3000")) {
+        if (!PROXY_URL_RE.test(backupContent)) {
           copyFileSync(backupPath, configPath);
           removeState(openclawDir);
           const restart = restartGateway();
@@ -331,7 +341,7 @@ function cleanProxyUrls(configPath) {
     let cleaned = false;
 
     for (const [name, cfg] of Object.entries(providers)) {
-      if (cfg.baseUrl && cfg.baseUrl.includes("127.0.0.1:3000")) {
+      if (cfg.baseUrl && PROXY_URL_RE.test(cfg.baseUrl)) {
         if (BUILTIN_URLS[name]) {
           // Known provider — restore builtin URL
           cfg.baseUrl = BUILTIN_URLS[name];