open-agents-ai 0.187.321 → 0.187.323

package/dist/index.js

@@ -299366,8 +299366,56 @@ The session corrections MUST become hard rules in the SKILL.md Rules section.`;
       } else if (arg === "start") {
         const ok2 = await ensureDaemon2();
         renderInfo2(ok2 ? "Daemon started." : "Daemon already running or failed to start.");
+      } else if (arg === "takeover") {
+        try {
+          renderInfo2("Requesting sudo to migrate daemon to current user and restart...");
+          const nodeBin = process.execPath;
+          const { execSync: execSync57 } = await import("node:child_process");
+          let npmRoot = "";
+          try {
+            npmRoot = execSync57("npm root -g", { encoding: "utf8" }).trim();
+          } catch {
+          }
+          const launcher = npmRoot ? `${npmRoot}/open-agents-ai/dist/launcher.cjs` : "";
+          const svc = [
+            "[Unit]",
+            "Description=Open Agents API Daemon",
+            "After=default.target",
+            "",
+            "[Service]",
+            "Type=simple",
+            `ExecStart=${nodeBin} ${launcher} serve --daemon --quiet`,
+            `WorkingDirectory=${process.cwd()}`,
+            "Restart=always",
+            "RestartSec=2",
+            "Environment=OA_DAEMON=1",
+            "",
+            "[Install]",
+            "WantedBy=default.target",
+            ""
+          ].join("\n").replace(/[$`]/g, "\\$&");
+          const takeover = `set -e
+sudo -v
+sudo systemctl disable --now open-agents-daemon.service || true
+sudo pkill -f 'open-agents-ai.*serve' || true
+mkdir -p "$HOME/.config/systemd/user"
+printf '%s' "${svc}" > "$HOME/.config/systemd/user/open-agents-daemon.service"
+systemctl --user daemon-reload || true
+systemctl --user enable --now open-agents-daemon.service || true
+sleep 1
+`;
+          const { spawn: spawn27 } = await import("node:child_process");
+          await new Promise((resolve40) => {
+            const child = spawn27("bash", ["-lc", takeover], { stdio: "inherit" });
+            child.on("exit", () => resolve40());
+          });
+          renderInfo2("Daemon takeover complete.");
+        } catch (e2) {
+          renderError2(`Takeover failed: ${e2?.message || e2}`);
+        }
+        return "handled";
       } else {
-        renderInfo2("Usage: /daemon [status|start|stop|restart]");
+        renderInfo2("Usage: /daemon [status|start|stop|restart|takeover]");
       }
       return "handled";
     }
@@ -327818,26 +327866,42 @@ async function handleRequest(req2, res, ollamaUrl, verbose) {
       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|ollama)";
+      const timersDisabled = disableAllOaTimers();
+      const cronRemoved = removeAllOaCrons();
       const procsBefore = listMatchingProcesses(pattern);
       const gpuBefore = sampleGpuUtil();
-      const killed = killScheduledProcesses(pids, pattern);
+      const killed = killProcessGroups(pids, pattern);
       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 });
+              process.kill(-child.pid, "SIGTERM");
+              additionally.push({ pid, ok: true, signal: "PGRP-TERM", run_id: rid });
+            } catch {
+              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 {
+              await new Promise((r2) => setTimeout(r2, 250));
             } 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 });
+                process.kill(-child.pid, "SIGKILL");
+                additionally.push({ pid, ok: true, signal: "PGRP-KILL", run_id: rid });
               } catch {
+                try {
+                  process.kill(pid, "SIGKILL");
+                  additionally.push({ pid, ok: true, signal: "KILL", run_id: rid });
+                } catch {
+                }
               }
             } catch {
             }
@@ -327847,12 +327911,14 @@ async function handleRequest(req2, res, ollamaUrl, verbose) {
       } catch {
       }
       try {
-        await new Promise((r2) => setTimeout(r2, 600));
+        await new Promise((r2) => setTimeout(r2, 800));
       } catch {
       }
       const procsAfter = listMatchingProcesses(pattern);
       const gpuAfter = sampleGpuUtil();
       jsonResponse(res, 200, {
+        timers_disabled: timersDisabled,
+        cron_lines_removed: cronRemoved,
         killed_count: killed.length + additionally.length,
         killed,
         additionally,
@@ -328887,47 +328953,59 @@ function setScheduledEnabled(id, enabled2) {
     return false;
   }
 }
-function killScheduledProcesses(pids, pattern) {
+function killProcessGroups(pids, pattern) {
   const killed = [];
   try {
     const { execSync: es } = __require("node:child_process");
-    const targets = /* @__PURE__ */ new Set();
+    const targets = /* @__PURE__ */ new Map();
     if (pids && pids.length > 0) {
-      for (const pid of pids) if (Number.isInteger(pid)) targets.add(pid);
+      for (const pid of pids) {
+        try {
+          const out = es(`ps -o pgid= -p ${pid}`, { encoding: "utf8", stdio: "pipe" }).trim();
+          const pg = parseInt(out, 10);
+          if (pg > 0) targets.set(pid, pg);
+        } catch {
+        }
+      }
     } else {
       try {
-        const ps = es("ps -eo pid,command", { encoding: "utf8", stdio: "pipe" });
+        const ps = es("ps -eo pid,pgid,command", { encoding: "utf8", stdio: "pipe" });
         const re = new RegExp(pattern, "i");
         for (const line of ps.split("\n")) {
-          const m2 = line.trim().match(/^(\d+)\s+(.*)$/);
+          const m2 = line.trim().match(/^(\d+)\s+(\d+)\s+(.+)$/);
           if (!m2) continue;
           const pid = parseInt(m2[1], 10);
-          const cmd = m2[2] || "";
-          if (!isFinite(pid)) continue;
-          if (re.test(cmd)) targets.add(pid);
+          const pg = parseInt(m2[2], 10);
+          const cmd = m2[3] || "";
+          if (!isFinite(pid) || !isFinite(pg)) continue;
+          if (!re.test(cmd)) continue;
+          targets.set(pid, pg);
         }
       } catch {
       }
     }
-    for (const pid of targets) {
+    const seenPg = /* @__PURE__ */ new Set();
+    for (const [, pg] of targets) {
+      if (seenPg.has(pg)) continue;
+      seenPg.add(pg);
       try {
-        process.kill(pid, "SIGTERM");
-        killed.push({ pid, ok: true, signal: "TERM" });
+        process.kill(-pg, "SIGTERM");
+        killed.push({ pid: -pg, ok: true, signal: "PGRP-TERM" });
       } catch {
-        killed.push({ pid, ok: false, signal: "TERM" });
+        killed.push({ pid: -pg, ok: false, signal: "PGRP-TERM" });
       }
     }
     const start2 = Date.now();
-    while (Date.now() - start2 < 500) {
+    while (Date.now() - start2 < 600) {
     }
-    for (const pid of targets) {
+    for (const pg of seenPg) {
       try {
-        process.kill(pid, 0);
+        process.kill(-pg, 0);
         try {
-          process.kill(pid, "SIGKILL");
-          killed.push({ pid, ok: true, signal: "KILL" });
+          process.kill(-pg, "SIGKILL");
+          killed.push({ pid: -pg, ok: true, signal: "PGRP-KILL" });
         } catch {
-          killed.push({ pid, ok: false, signal: "KILL" });
+          killed.push({ pid: -pg, ok: false, signal: "PGRP-KILL" });
         }
       } catch {
       }
@@ -328936,6 +329014,37 @@ function killScheduledProcesses(pids, pattern) {
   }
   return killed;
 }
+function disableAllOaTimers() {
+  let disabled = 0;
+  try {
+    const timers = listOaUserTimers();
+    for (const t2 of timers) {
+      try {
+        userServiceAction(`${t2.name}.timer`, "disable");
+        disabled++;
+      } catch {
+      }
+      try {
+        userServiceAction(`${t2.name}.timer`, "stop");
+      } catch {
+      }
+    }
+  } catch {
+  }
+  return disabled;
+}
+function removeAllOaCrons() {
+  try {
+    const lines = getCurrentCrontabLines();
+    const next = lines.filter((l2) => !l2.includes(CRON_MARKER2));
+    if (next.length !== lines.length) {
+      writeCrontabLines(next);
+      return lines.length - next.length;
+    }
+  } catch {
+  }
+  return 0;
+}
 function listMatchingProcesses(pattern) {
   const list = [];
   try {

package/package.json

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