open-agents-ai 0.187.311 → 0.187.313

package/dist/index.js

@@ -299369,15 +299369,33 @@ The session corrections MUST become hard rules in the SKILL.md Rules section.`;
             label: `${t2.enabled ? "●" : "○"} ${t2.name || "(task)"} ${t2.schedule ? "[" + t2.schedule + "]" : ""}`,
             detail: `${t2.file}#${t2.index}`
           }));
-          items.push({ key: "__kill__", label: "Kill OA schedulers", detail: "Stop scheduler/nexus background processes" });
+          items.push({ key: "__kill__", label: "Kill OA schedulers + active runs", detail: "Stop scheduler/nexus processes and terminate active OA runs" });
           const result = await tuiSelect({
             items,
             title: "Scheduled Tasks",
             onEnter: (item, { done }) => {
               (async () => {
                 if (item.key === "__kill__") {
-                  await doFetch("/v1/scheduled/kill", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({}) });
-                  renderInfo2("Kill signal sent to OA scheduler processes.");
+                  const resp = await doFetch("/v1/scheduled/kill", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({}) });
+                  try {
+                    const j = await resp.json();
+                    const kb = Array.isArray(j.killed) ? j.killed.length : 0;
+                    const ka = Array.isArray(j.additionally) ? j.additionally.length : 0;
+                    renderInfo2(`Killed ${kb + ka} processes (schedulers + active runs).`);
+                    const before = j.gpu_before?.[0];
+                    const after = j.gpu_after?.[0];
+                    if (before && after) {
+                      renderInfo2(`GPU util: ${before.gpu_pct}% → ${after.gpu_pct}%, VRAM: ${before.vram_used_gb}/${before.vram_total_gb} GB → ${after.vram_used_gb}/${after.vram_total_gb} GB`);
+                    }
+                    const rem = Array.isArray(j.procs_after) ? j.procs_after.length : 0;
+                    if (rem > 0) {
+                      renderWarning2(`Remaining matched processes: ${rem}`);
+                    } else {
+                      renderInfo2("No remaining matched processes.");
+                    }
+                  } catch {
+                    renderInfo2("Kill signal sent.");
+                  }
                   done();
                   return;
                 }
@@ -321792,9 +321810,24 @@ async function loadScheduled() {
 
 (window as any).killScheduled = async function() {
   try {
-    await fetch('/v1/scheduled/kill', { method:'POST', headers: headers(), body: JSON.stringify({}) });
-    alert('Kill signal sent to OA scheduler processes');
-  } catch {}
+    const r = await fetch('/v1/scheduled/kill', { method:'POST', headers: headers(), body: JSON.stringify({}) });
+    const j = await r.json();
+    const kb = Array.isArray(j.killed) ? j.killed.length : 0;
+    const ka = Array.isArray(j.additionally) ? j.additionally.length : 0;
+    const before = j.gpu_before && j.gpu_before[0] ? j.gpu_before[0] : null;
+    const after = j.gpu_after && j.gpu_after[0] ? j.gpu_after[0] : null;
+    const rem = Array.isArray(j.procs_after) ? j.procs_after.length : 0;
+    let msg = 'Killed ' + (kb + ka) + ' processes.';
+    if (before && after) {
+      msg += '
+GPU util: ' + before.gpu_pct + '% → ' + after.gpu_pct + '%, VRAM: ' + before.vram_used_gb + '/' + before.vram_total_gb + ' GB → ' + after.vram_used_gb + '/' + after.vram_total_gb + ' GB';
+    }
+    msg += rem > 0 ? ('
+Remaining matched processes: ' + rem) : '
+No remaining matched processes.';
+    alert(msg);
+    loadScheduled();
+  } catch (e) { alert('Kill failed: ' + (e && e.message || String(e))); }
 }
 
 (window as any).disableAllScheduled = async function() {
@@ -327540,9 +327573,50 @@ async function handleRequest(req2, res, ollamaUrl, verbose) {
     if (pathname === "/v1/scheduled/kill" && method === "POST") {
       const body = await parseJsonBody(req2);
       const pids = Array.isArray(body?.pids) ? body.pids.filter((n2) => Number.isInteger(n2)) : void 0;
-      const pattern = typeof body?.pattern === "string" && body.pattern.trim() ? body.pattern.trim() : "(/bin/oa|open-agents-ai|nexus-daemon|OPEN-AGENTS-SCHEDULED)";
+      const pattern = typeof body?.pattern === "string" && body.pattern.trim() ? body.pattern.trim() : "(/bin/oa|open-agents-ai|nexus-daemon|OPEN-AGENTS-SCHEDULED|ollama)";
+      const procsBefore = listMatchingProcesses(pattern);
+      const gpuBefore = sampleGpuUtil();
       const killed = killScheduledProcesses(pids, pattern);
-      jsonResponse(res, 200, { killed_count: killed.length, killed });
+      const additionally = [];
+      try {
+        for (const [rid, child] of Array.from(runningProcesses.entries())) {
+          const pid = child?.pid ?? 0;
+          if (pid > 0) {
+            try {
+              process.kill(pid, "SIGTERM");
+              additionally.push({ pid, ok: true, signal: "TERM", run_id: rid });
+            } catch {
+              additionally.push({ pid, ok: false, signal: "TERM", run_id: rid });
+            }
+            try {
+              process.kill(pid, 0);
+              try {
+                process.kill(pid, "SIGKILL");
+                additionally.push({ pid, ok: true, signal: "KILL", run_id: rid });
+              } catch {
+              }
+            } catch {
+            }
+          }
+          runningProcesses.delete(rid);
+        }
+      } catch {
+      }
+      try {
+        await new Promise((r2) => setTimeout(r2, 600));
+      } catch {
+      }
+      const procsAfter = listMatchingProcesses(pattern);
+      const gpuAfter = sampleGpuUtil();
+      jsonResponse(res, 200, {
+        killed_count: killed.length + additionally.length,
+        killed,
+        additionally,
+        procs_before: procsBefore,
+        procs_after: procsAfter,
+        gpu_before: gpuBefore,
+        gpu_after: gpuAfter
+      });
       return;
     }
     if ((pathname === "/v1/chat" || pathname === "/api/chat") && method === "POST") {
@@ -328550,6 +328624,43 @@ function killScheduledProcesses(pids, pattern) {
   }
   return killed;
 }
+function listMatchingProcesses(pattern) {
+  const list = [];
+  try {
+    const { execSync: es } = __require("node:child_process");
+    const re = new RegExp(pattern, "i");
+    const ps = es("ps -eo pid,pcpu,pmem,command", { encoding: "utf8", stdio: "pipe" });
+    for (const line of ps.split("\n")) {
+      const m2 = line.trim().match(/^(\d+)\s+([0-9.]+)?\s+([0-9.]+)?\s+(.+)$/);
+      if (!m2) continue;
+      const pid = parseInt(m2[1], 10);
+      const cpu = m2[2] ? parseFloat(m2[2]) : null;
+      const mem = m2[3] ? parseFloat(m2[3]) : null;
+      const cmd = m2[4] || "";
+      if (!isFinite(pid)) continue;
+      if (re.test(cmd)) list.push({ pid, cpu, mem, cmd });
+    }
+  } catch {
+  }
+  return list;
+}
+function sampleGpuUtil() {
+  try {
+    const { execSync: es } = __require("node:child_process");
+    const out = es("nvidia-smi --query-gpu=utilization.gpu,memory.used,memory.total --format=csv,noheader,nounits", { encoding: "utf8", timeout: 3e3, stdio: "pipe" });
+    const arr = [];
+    for (const line of out.trim().split("\n")) {
+      const [pctS, usedS, totalS] = line.split(",").map((s2) => s2.trim());
+      const pct = parseInt(pctS, 10);
+      const usedGb = Math.round(parseInt(usedS, 10) / 1024 * 10) / 10;
+      const totalGb = Math.round(parseInt(totalS, 10) / 1024);
+      if (!isNaN(pct) && !isNaN(usedGb) && !isNaN(totalGb)) arr.push({ gpu_pct: pct, vram_used_gb: usedGb, vram_total_gb: totalGb });
+    }
+    return arr;
+  } catch {
+    return null;
+  }
+}
 function startApiServer(options2 = {}) {
   if (options2.quiet) setQuiet(true);
   const log22 = options2.quiet ? (_msg) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.187.311",
+  "version": "0.187.313",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",