open-agents-ai 0.187.335 → 0.187.336

package/dist/index.js

@@ -299703,51 +299703,66 @@ sleep 1
                 done(false);
                 return;
               }
+              const isSystemdTimer = String(task.id || "").startsWith("timer:") || task.file === "(systemd)" || task.index === -1;
               (async () => {
                 try {
                   const r3 = await doFetch(`/v1/scheduled/${encodeURIComponent(task.id)}`, { method: "DELETE", headers: { "Content-Type": "application/json" } });
                   if (r3.ok) {
                     renderInfo2(`Deleted scheduled task ${task.id}`);
-                    try {
-                      const dir = (task.file || "").split("/").slice(0, -1).join("/") || task.file;
-                      const resp = await doFetch("/v1/scheduled/kill", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ pattern: dir.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") }) });
+                    if (isSystemdTimer) {
                       try {
-                        const j = await resp.json();
-                        const cnt = (Array.isArray(j.killed) ? j.killed.length : 0) + (Array.isArray(j.additionally) ? j.additionally.length : 0);
-                        if (cnt > 0) renderInfo2(`Killed ${cnt} residual process(es).`);
+                        const timerName = String(task.id || "").replace(/^timer:/, "");
+                        const { execSync: es } = await import("node:child_process");
+                        const userSystemd = `${process.env.HOME}/.config/systemd/user`;
+                        for (const suffix of [".timer", ".service"]) {
+                          try {
+                            es(`rm -f "${userSystemd}/${timerName}${suffix}"`, { stdio: "pipe" });
+                          } catch {
+                          }
+                        }
+                        try {
+                          es("systemctl --user daemon-reload", { stdio: "pipe" });
+                        } catch {
+                        }
+                        try {
+                          es(`pkill -f '${timerName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}' || true`, { stdio: "pipe", timeout: 5e3 });
+                        } catch {
+                        }
+                        renderInfo2(`Cleaned up systemd timer: ${timerName}`);
                       } catch {
                       }
-                    } catch {
-                    }
-                    try {
-                      const id = String(task.id || "");
-                      const dir = (task.file || "").split("/").slice(0, -1).join("/") || task.file;
-                      const escId = id.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
-                      const escDir = dir.replace(/['"\\]/g, "\\$&");
-                      const script = [
-                        // Disable both naming schemes if present
-                        `systemctl disable --now "oa-${escId}.timer" 2>/dev/null || true`,
-                        `systemctl disable --now "oa-${escId}.service" 2>/dev/null || true`,
-                        `systemctl disable --now "oa-sched-${escId}.timer" 2>/dev/null || true`,
-                        `systemctl disable --now "oa-sched-${escId}.service" 2>/dev/null || true`,
-                        // Remove root cron OA markers for this id
-                        `crontab -l 2>/dev/null | sed '/OPEN-AGENTS-SCHEDULED:${escId}/d' | crontab - || true`,
-                        // Kill lingering processes broadly
-                        `pkill -f 'OPEN-AGENTS-SCHEDULED|oa-sched-|open-agents-ai|/bin/oa|nexus-daemon|ollama' || true`,
-                        `sleep 1`,
-                        `pkill -9 -f 'OPEN-AGENTS-SCHEDULED|oa-sched-|open-agents-ai|/bin/oa|nexus-daemon|ollama' || true`
-                      ].join("; ");
-                      await runSudoScript(ctx3, script);
+                    } else {
                       try {
-                        const dir2 = (task.file || "").split("/").slice(0, -1).join("/") || task.file;
-                        const r22 = await doFetch("/v1/scheduled/kill", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ pattern: dir2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") }) });
-                        const j2 = await r22.json();
-                        const rem2 = Array.isArray(j2.procs_after) ? j2.procs_after.length : 0;
-                        if (rem2 > 0) renderWarning2(`Remaining after sudo cleanup: ${rem2}`);
-                        else renderInfo2("No remaining matched processes after sudo cleanup.");
+                        const dir = (task.file || "").split("/").slice(0, -1).join("/") || task.file;
+                        const resp = await doFetch("/v1/scheduled/kill", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ pattern: dir.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") }) });
+                        try {
+                          const j = await resp.json();
+                          const cnt = (Array.isArray(j.killed) ? j.killed.length : 0) + (Array.isArray(j.additionally) ? j.additionally.length : 0);
+                          if (cnt > 0) renderInfo2(`Killed ${cnt} residual process(es).`);
+                        } catch {
+                        }
+                      } catch {
+                      }
+                      try {
+                        const rawId = String(task.id || "");
+                        const dir = (task.file || "").split("/").slice(0, -1).join("/") || task.file;
+                        const baseId = rawId.replace(/^timer:/, "").replace(/^oa-sched-/, "").replace(/^oa-/, "");
+                        const escBase = baseId.replace(/['"\\]/g, "\\$&");
+                        const escDir = dir.replace(/['"\\]/g, "\\$&");
+                        const script = [
+                          // Disable both naming schemes if present
+                          `systemctl disable --now "oa-${escBase}.timer" 2>/dev/null || true`,
+                          `systemctl disable --now "oa-${escBase}.service" 2>/dev/null || true`,
+                          `systemctl disable --now "oa-sched-${escBase}.timer" 2>/dev/null || true`,
+                          `systemctl disable --now "oa-sched-${escBase}.service" 2>/dev/null || true`,
+                          // Remove root cron OA markers for this id
+                          `crontab -l 2>/dev/null | sed '/OPEN-AGENTS-SCHEDULED.*${escBase}/d' | crontab - || true`,
+                          // Kill only processes matching this specific task (not all OA/ollama/nexus)
+                          `pkill -f 'OPEN-AGENTS-SCHEDULED.*${escBase}' || true`
+                        ].join("; ");
+                        await runSudoScript(ctx3, script);
                       } catch {
                       }
-                    } catch {
                     }
                     done(true);
                   } else {

package/package.json

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