open-agents-ai 0.187.516 → 0.187.518

package/dist/index.js

@@ -596035,8 +596035,8 @@ function adoptHandoffRuns() {
     } catch {
       alive = false;
     }
-    const jobsDir3 = path8.join(home, ".open-agents", "jobs");
-    const jobFile = path8.join(jobsDir3, `${r2.jobId}.json`);
+    const dirJobs = jobsDir();
+    const jobFile = path8.join(dirJobs, `${r2.jobId}.json`);
     let job = null;
     try {
       if (fs7.existsSync(jobFile)) job = JSON.parse(fs7.readFileSync(jobFile, "utf-8"));
@@ -596099,6 +596099,58 @@ function adoptHandoffRuns() {
       } catch {
       }
     }
+    if (r2.deadlineAtMs && r2.deadlineAtMs > 0 && process.env["OA_DISABLE_DAEMON_TIMEOUT_KILL"] !== "1") {
+      const remainingMs = r2.deadlineAtMs - Date.now();
+      const adoptedPid = r2.pid;
+      const adoptedJobId = r2.jobId;
+      const fireTimeout = () => {
+        try {
+          if (!fs7.existsSync(jobFile)) return;
+          const cur = JSON.parse(fs7.readFileSync(jobFile, "utf-8"));
+          if (cur.status !== "running") return;
+          cur.status = "timeout";
+          cur.completedAt = (/* @__PURE__ */ new Date()).toISOString();
+          fs7.writeFileSync(jobFile, JSON.stringify(cur, null, 2), "utf-8");
+        } catch {
+        }
+        try {
+          process.kill(-adoptedPid, "SIGTERM");
+        } catch {
+        }
+        try {
+          process.kill(adoptedPid, "SIGTERM");
+        } catch {
+        }
+        setTimeout(() => {
+          try {
+            process.kill(-adoptedPid, "SIGKILL");
+          } catch {
+          }
+          try {
+            process.kill(adoptedPid, "SIGKILL");
+          } catch {
+          }
+        }, 3e4).unref();
+        try {
+          publishEvent(
+            "run.timeout",
+            { run_id: adoptedJobId, source: "adopted-rearm" },
+            { subject: r2.user || "anonymous", aimsControl: "A.6.2.6" }
+          );
+        } catch {
+        }
+        process.stderr.write(`  RCA-1 re-armed deadline fired for adopted run ${adoptedJobId} (pid=${adoptedPid})
+`);
+      };
+      if (remainingMs <= 0) {
+        process.stderr.write(`  Adopted run ${adoptedJobId} is past its deadline by ${-remainingMs}ms — firing SIGTERM now.
+`);
+        setImmediate(fireTimeout);
+      } else {
+        const t2 = setTimeout(fireTimeout, remainingMs);
+        t2.unref();
+      }
+    }
     const pollHandle = setInterval(() => {
       let stillAlive = false;
       try {
@@ -598032,6 +598084,11 @@ async function handleV1Run(req2, res) {
   let _rca1DeadlineFired = false;
   const _rca1KillSwitch = process.env["OA_DISABLE_DAEMON_TIMEOUT_KILL"] === "1";
   const _rca1EffectiveTimeoutS = timeout2 && timeout2 > 0 ? timeout2 : activeProfile?.limits?.timeout_s && activeProfile.limits.timeout_s > 0 ? activeProfile.limits.timeout_s : 1800;
+  const _rca1DeadlineAtMs = Date.now() + (_rca1EffectiveTimeoutS + 60) * 1e3;
+  if (!_rca1KillSwitch) {
+    job.deadlineAtMs = _rca1DeadlineAtMs;
+    atomicJobWrite(dir, id, job);
+  }
   const _rca1Deadline = _rca1KillSwitch ? null : setTimeout(() => {
     if (job.status !== "running") return;
     _rca1DeadlineFired = true;
@@ -601844,23 +601901,24 @@ function startApiServer(options2 = {}) {
             let user = null;
             let scope = null;
             let cwd5 = null;
+            let deadlineAtMs = null;
             try {
-              const fs7 = require3("node:fs");
+              const dir = jobsDir();
               const path8 = require3("node:path");
-              const home = require3("node:os").homedir();
-              const jobsDir3 = path8.join(home, ".open-agents", "jobs");
-              const jobFile = path8.join(jobsDir3, `${id}.json`);
+              const fs7 = require3("node:fs");
+              const jobFile = path8.join(dir, `${id}.json`);
               if (fs7.existsSync(jobFile)) {
                 const j = JSON.parse(fs7.readFileSync(jobFile, "utf-8"));
-                outputFile = j.outputFile ?? path8.join(jobsDir3, `${id}.output`);
+                outputFile = j.outputFile ?? path8.join(dir, `${id}.output`);
                 startedAt2 = j.startedAt ?? null;
                 user = j.user ?? null;
                 scope = j.scope ?? null;
                 cwd5 = j.cwd ?? null;
+                deadlineAtMs = typeof j.deadlineAtMs === "number" && j.deadlineAtMs > 0 ? j.deadlineAtMs : null;
               }
             } catch {
             }
-            handoff.push({ jobId: id, pid, outputFile, startedAt: startedAt2, user, scope, cwd: cwd5, handoffAt: (/* @__PURE__ */ new Date()).toISOString() });
+            handoff.push({ jobId: id, pid, outputFile, startedAt: startedAt2, user, scope, cwd: cwd5, handoffAt: (/* @__PURE__ */ new Date()).toISOString(), deadlineAtMs });
           }
           if (handoff.length > 0) {
             try {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "open-agents-ai",
-  "version": "0.187.516",
+  "version": "0.187.518",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "open-agents-ai",
-      "version": "0.187.516",
+      "version": "0.187.518",
       "hasInstallScript": true,
       "license": "CC-BY-NC-4.0",
       "dependencies": {

package/package.json

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