open-agents-ai 0.187.365 → 0.187.367

package/dist/index.js

@@ -539097,6 +539097,7 @@ var init_neovim_mode = __esm({
 var daemon_exports = {};
 __export(daemon_exports, {
   ensureDaemon: () => ensureDaemon,
+  forceKillDaemon: () => forceKillDaemon,
   getDaemonPid: () => getDaemonPid,
   getDaemonStatus: () => getDaemonStatus,
   isDaemonRunning: () => isDaemonRunning,
@@ -539200,6 +539201,67 @@ function stopDaemon() {
     return false;
   }
 }
+async function forceKillDaemon(port) {
+  const p2 = port ?? getDaemonPort();
+  let killed = 0;
+  const pid = getDaemonPid();
+  if (pid) {
+    try {
+      process.kill(pid, "SIGTERM");
+      killed++;
+    } catch {
+    }
+    for (let i2 = 0; i2 < 20; i2++) {
+      await new Promise((r2) => setTimeout(r2, 100));
+      try {
+        process.kill(pid, 0);
+      } catch {
+        break;
+      }
+    }
+    try {
+      process.kill(pid, 0);
+      process.kill(pid, "SIGKILL");
+      killed++;
+    } catch {
+    }
+    try {
+      unlinkSync16(PID_FILE2);
+    } catch {
+    }
+  }
+  try {
+    const { execSync: execSync57 } = await import("node:child_process");
+    const out = execSync57(
+      `lsof -ti :${p2} 2>/dev/null || fuser ${p2}/tcp 2>/dev/null || true`,
+      { encoding: "utf8", timeout: 3e3 }
+    ).trim();
+    const pids = out.split(/[\s\n]+/).map((s2) => parseInt(s2, 10)).filter((n2) => Number.isFinite(n2) && n2 > 0 && n2 !== process.pid);
+    for (const otherPid of pids) {
+      try {
+        process.kill(otherPid, "SIGTERM");
+        killed++;
+      } catch {
+      }
+    }
+    if (pids.length > 0) {
+      await new Promise((r2) => setTimeout(r2, 1e3));
+      for (const otherPid of pids) {
+        try {
+          process.kill(otherPid, 0);
+          process.kill(otherPid, "SIGKILL");
+        } catch {
+        }
+      }
+    }
+  } catch {
+  }
+  for (let i2 = 0; i2 < 50; i2++) {
+    if (!await isDaemonRunning(p2)) return killed;
+    await new Promise((r2) => setTimeout(r2, 100));
+  }
+  return killed;
+}
 async function ensureDaemon() {
   const port = getDaemonPort();
   if (await isDaemonRunning(port)) {
@@ -544447,12 +544509,12 @@ async function handleSlashCommand(input, ctx3) {
             renderInfo2(`Generated API key: ${c3.bold(c3.yellow(apiKey))}`);
             renderInfo2("Use the Web UI ‘key’ button to paste this token, or set Authorization: Bearer <key> in your client.");
             try {
-              const { homedir: homedir41 } = await import("node:os");
-              const { mkdirSync: mkdirSync58, writeFileSync: writeFileSync51 } = await import("node:fs");
-              const { join: join110 } = await import("node:path");
-              const dir = join110(homedir41(), ".open-agents");
-              mkdirSync58(dir, { recursive: true });
-              writeFileSync51(join110(dir, "api.key"), apiKey + "\n", "utf8");
+              const { homedir: homedir42 } = await import("node:os");
+              const { mkdirSync: mkdirSync59, writeFileSync: writeFileSync52 } = await import("node:fs");
+              const { join: join111 } = await import("node:path");
+              const dir = join111(homedir42(), ".open-agents");
+              mkdirSync59(dir, { recursive: true });
+              writeFileSync52(join111(dir, "api.key"), apiKey + "\n", "utf8");
             } catch {
             }
           }
@@ -544462,29 +544524,66 @@ async function handleSlashCommand(input, ctx3) {
             ctx4.saveSettings({ oaAccess: val2 });
           }
           const port2 = parseInt(process.env["OA_PORT"] || "11435", 10);
-          let switched2 = false;
           try {
-            const resp = await fetch(`http://127.0.0.1:${port2}/v1/admin/access`, {
+            const { homedir: homedir42 } = await import("node:os");
+            const { mkdirSync: mkdirSync59, writeFileSync: writeFileSync52 } = await import("node:fs");
+            const { join: join111 } = await import("node:path");
+            const dir = join111(homedir42(), ".open-agents");
+            mkdirSync59(dir, { recursive: true });
+            writeFileSync52(join111(dir, "access"), `${val2}
+`, "utf8");
+          } catch {
+          }
+          const baseUrl2 = `http://127.0.0.1:${port2}`;
+          const authHeaders2 = () => {
+            const token = process.env["OA_API_KEY"] || "";
+            return token ? { Authorization: `Bearer ${token}` } : {};
+          };
+          let liveOk2 = false;
+          try {
+            const resp = await fetch(`${baseUrl2}/v1/admin/access`, {
               method: "POST",
-              headers: { "Content-Type": "application/json" },
+              headers: { "Content-Type": "application/json", ...authHeaders2() },
               body: JSON.stringify({ mode: val2 }),
               signal: AbortSignal.timeout(3e3)
             });
-            switched2 = resp.ok;
+            liveOk2 = resp.ok;
           } catch {
           }
-          if (switched2) {
+          const readCurrent2 = async () => {
+            try {
+              const r2 = await fetch(`${baseUrl2}/v1/admin/access`, { headers: authHeaders2(), signal: AbortSignal.timeout(2e3) });
+              if (!r2.ok) return null;
+              const j = await r2.json();
+              return typeof j.mode === "string" ? j.mode : null;
+            } catch {
+              return null;
+            }
+          };
+          const current2 = await readCurrent2();
+          if (liveOk2 && current2 === val2) {
             renderInfo2(`Access policy now '${val2}' (live, no restart). Persisted to ~/.open-agents/access.`);
+            return "handled";
+          }
+          renderInfo2(`Live switch did not take effect (daemon reports ${current2 ?? "unreachable"}). Force-restarting...`);
+          const { forceKillDaemon: forceKillDaemon3, ensureDaemon: ensureDaemon3 } = await Promise.resolve().then(() => (init_daemon(), daemon_exports));
+          const killed2 = await forceKillDaemon3(port2);
+          if (killed2 > 0) renderInfo2(`Force-killed ${killed2} process(es) bound to port ${port2}.`);
+          const ok3 = await ensureDaemon3();
+          if (!ok3) {
+            renderError2("Failed to start a fresh daemon after force-kill.");
+            return "handled";
+          }
+          let finalMode2 = null;
+          for (let i2 = 0; i2 < 10; i2++) {
+            finalMode2 = await readCurrent2();
+            if (finalMode2) break;
+            await new Promise((r2) => setTimeout(r2, 250));
+          }
+          if (finalMode2 === val2) {
+            renderInfo2(`Access policy now '${val2}' (daemon restarted, verified).`);
           } else {
-            const { stopDaemon: stopDaemon2, ensureDaemon: ensureDaemon2, isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_daemon(), daemon_exports));
-            stopDaemon2();
-            const deadline = Date.now() + 4e3;
-            while (Date.now() < deadline) {
-              if (!await isDaemonRunning2(port2)) break;
-              await new Promise((r2) => setTimeout(r2, 200));
-            }
-            const ok2 = await ensureDaemon2();
-            renderInfo2(ok2 ? "Daemon restarted to apply access policy." : "Failed to restart daemon.");
+            renderWarning2(`Daemon restarted but reports mode='${finalMode2 ?? "unreachable"}'. Expected '${val2}'.`);
           }
           return "handled";
         }
@@ -544512,12 +544611,12 @@ async function handleSlashCommand(input, ctx3) {
         renderInfo2(`Generated API key: ${c3.bold(c3.yellow(apiKey))}`);
         renderInfo2("Use the Web UI ‘key’ button to paste this token, or set Authorization: Bearer <key> in your client.");
         try {
-          const { homedir: homedir41 } = await import("node:os");
-          const { mkdirSync: mkdirSync58, writeFileSync: writeFileSync51 } = await import("node:fs");
-          const { join: join110 } = await import("node:path");
-          const dir = join110(homedir41(), ".open-agents");
-          mkdirSync58(dir, { recursive: true });
-          writeFileSync51(join110(dir, "api.key"), apiKey + "\n", "utf8");
+          const { homedir: homedir42 } = await import("node:os");
+          const { mkdirSync: mkdirSync59, writeFileSync: writeFileSync52 } = await import("node:fs");
+          const { join: join111 } = await import("node:path");
+          const dir = join111(homedir42(), ".open-agents");
+          mkdirSync59(dir, { recursive: true });
+          writeFileSync52(join111(dir, "api.key"), apiKey + "\n", "utf8");
         } catch {
         }
       }
@@ -544527,34 +544626,72 @@ async function handleSlashCommand(input, ctx3) {
         ctx3.saveSettings({ oaAccess: val });
       }
       const port = parseInt(process.env["OA_PORT"] || "11435", 10);
-      let switched = false;
+      const { homedir: homedir41 } = await import("node:os");
+      const { mkdirSync: mkdirSync58, writeFileSync: writeFileSync51 } = await import("node:fs");
+      const { join: join110 } = await import("node:path");
       try {
-        const resp = await fetch(`http://127.0.0.1:${port}/v1/admin/access`, {
+        const dir = join110(homedir41(), ".open-agents");
+        mkdirSync58(dir, { recursive: true });
+        writeFileSync51(join110(dir, "access"), `${val}
+`, "utf8");
+      } catch (e2) {
+        renderWarning2(`Could not persist ~/.open-agents/access: ${e2 instanceof Error ? e2.message : String(e2)}`);
+      }
+      const baseUrl = `http://127.0.0.1:${port}`;
+      const authHeaders = () => {
+        const token = process.env["OA_API_KEY"] || "";
+        return token ? { Authorization: `Bearer ${token}` } : {};
+      };
+      let liveOk = false;
+      try {
+        const resp = await fetch(`${baseUrl}/v1/admin/access`, {
           method: "POST",
-          headers: { "Content-Type": "application/json" },
+          headers: { "Content-Type": "application/json", ...authHeaders() },
           body: JSON.stringify({ mode: val }),
           signal: AbortSignal.timeout(3e3)
         });
-        switched = resp.ok;
+        liveOk = resp.ok;
         if (!resp.ok) {
           const txt = await resp.text().catch(() => "");
           renderWarning2(`Live access switch HTTP ${resp.status}: ${txt.slice(0, 120)}`);
         }
       } catch (e2) {
-        renderWarning2(`Live access switch failed (${e2 instanceof Error ? e2.message : String(e2)}); falling back to daemon restart.`);
+        renderWarning2(`Live access switch fetch failed: ${e2 instanceof Error ? e2.message : String(e2)}`);
       }
-      if (switched) {
+      const readCurrent = async () => {
+        try {
+          const r2 = await fetch(`${baseUrl}/v1/admin/access`, { headers: authHeaders(), signal: AbortSignal.timeout(2e3) });
+          if (!r2.ok) return null;
+          const j = await r2.json();
+          return typeof j.mode === "string" ? j.mode : null;
+        } catch {
+          return null;
+        }
+      };
+      let current = await readCurrent();
+      if (liveOk && current === val) {
         renderInfo2(`Access policy now '${val}' (live, no restart). Persisted to ~/.open-agents/access.`);
+        return "handled";
+      }
+      renderInfo2(`Live switch did not take effect (daemon reports ${current ?? "unreachable"}). Force-restarting daemon...`);
+      const { forceKillDaemon: forceKillDaemon2, ensureDaemon: ensureDaemon2 } = await Promise.resolve().then(() => (init_daemon(), daemon_exports));
+      const killed = await forceKillDaemon2(port);
+      if (killed > 0) renderInfo2(`Force-killed ${killed} process(es) bound to port ${port}.`);
+      const ok2 = await ensureDaemon2();
+      if (!ok2) {
+        renderError2("Failed to start a fresh daemon after force-kill. Try: `oa serve --quiet --daemon &` manually.");
+        return "handled";
+      }
+      let finalMode = null;
+      for (let i2 = 0; i2 < 10; i2++) {
+        finalMode = await readCurrent();
+        if (finalMode) break;
+        await new Promise((r2) => setTimeout(r2, 250));
+      }
+      if (finalMode === val) {
+        renderInfo2(`Access policy now '${val}' (daemon restarted, verified via /v1/admin/access).`);
       } else {
-        const { stopDaemon: stopDaemon2, ensureDaemon: ensureDaemon2, isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_daemon(), daemon_exports));
-        stopDaemon2();
-        const deadline = Date.now() + 4e3;
-        while (Date.now() < deadline) {
-          if (!await isDaemonRunning2(port)) break;
-          await new Promise((r2) => setTimeout(r2, 200));
-        }
-        const ok2 = await ensureDaemon2();
-        renderInfo2(ok2 ? "Daemon restarted to apply access policy." : "Failed to restart daemon.");
+        renderWarning2(`Daemon restarted but reports mode='${finalMode ?? "unreachable"}'. Expected '${val}'. Check ~/.open-agents/access.`);
       }
       return "handled";
     }
@@ -569010,12 +569147,12 @@ async function loadScheduled() {
     const rows = tasks.map(t => {
       const enabled = !!t.enabled;
       const btn = enabled
-        ? '<button onclick="toggleScheduled('' + t.id + '',false)" style="background:#2a2a30;border:1px solid #5a2a2a;color:#b25f5f;padding:2px 6px;border-radius:3px;font-size:0.65rem;cursor:pointer">disable</button>'
-        : '<button onclick="toggleScheduled('' + t.id + '',true)" style="background:#2a2a30;border:1px solid #2a3a2a;color:#4ec94e;padding:2px 6px;border-radius:3px;font-size:0.65rem;cursor:pointer">enable</button>';
+        ? '<button onclick="toggleScheduled(\\'' + t.id + '\\',false)" style="background:#2a2a30;border:1px solid #5a2a2a;color:#b25f5f;padding:2px 6px;border-radius:3px;font-size:0.65rem;cursor:pointer">disable</button>'
+        : '<button onclick="toggleScheduled(\\'' + t.id + '\\',true)" style="background:#2a2a30;border:1px solid #2a3a2a;color:#4ec94e;padding:2px 6px;border-radius:3px;font-size:0.65rem;cursor:pointer">enable</button>';
       const color = enabled ? '#4ec94e' : '#5a2a2a';
       const procInfo = t.procs && t.procs.length ? (' (' + t.procs.length + ' proc)') : '';
       const up = t.procs && t.procs[0] && t.procs[0].uptime_s ? (' • up ' + Math.max(1, Math.round(t.procs[0].uptime_s/60)) + 'm') : '';
-      const killBtn = '<button onclick="killScheduledTask('' + t.id + '')" style="background:#2a2a30;border:1px solid #5a2a2a;color:#b25f5f;padding:2px 6px;border-radius:3px;font-size:0.65rem;cursor:pointer">kill</button>';
+      const killBtn = '<button onclick="killScheduledTask(\\'' + t.id + '\\')" style="background:#2a2a30;border:1px solid #5a2a2a;color:#b25f5f;padding:2px 6px;border-radius:3px;font-size:0.65rem;cursor:pointer">kill</button>';
       const row = '<div style="background:#1e1e22;border-left:2px solid ' + color + ';padding:6px 10px;margin:4px 0;font-size:0.72rem">'
         + '<div style="color:#b0b0b0">' + (t.name || '(task)') + ' <span style="color:#555">' + (t.schedule || '') + '</span>' + procInfo + up + '</div>'
         + '<div style="color:#555;font-size:0.6rem">' + t.file + '#' + t.index + '</div>'
@@ -569035,14 +569172,14 @@ async function loadScheduled() {
   } catch {}
 }
 
-(window as any).toggleScheduled = async function(id: string, enabled: boolean) {
+window.toggleScheduled = async function(id, enabled) {
   try {
     await fetch('/v1/scheduled/' + encodeURIComponent(id), { method:'POST', headers: headers(), body: JSON.stringify({enabled}) });
     loadScheduled();
   } catch {}
 }
 
-(window as any).killScheduled = async function() {
+window.killScheduled = async function() {
   try {
     const r = await fetch('/v1/scheduled/kill', { method:'POST', headers: headers(), body: JSON.stringify({}) });
     const j = await r.json();
@@ -569053,18 +569190,15 @@ async function loadScheduled() {
     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 += '\\nGPU 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.';
+    msg += rem > 0 ? ('\\nRemaining matched processes: ' + rem) : '\\nNo remaining matched processes.';
     alert(msg);
     loadScheduled();
   } catch (e) { alert('Kill failed: ' + (e && e.message || String(e))); }
 }
 
-(window as any).disableAllScheduled = async function() {
+window.disableAllScheduled = async function() {
   try {
     const r = await fetch('/v1/scheduled', { headers: headers() });
     const d = await r.json();
@@ -569081,7 +569215,7 @@ No remaining matched processes.';
   } catch {}
 }
 
-(window as any).enableAllScheduled = async function() {
+window.enableAllScheduled = async function() {
   try {
     const r = await fetch('/v1/scheduled', { headers: headers() });
     const d = await r.json();
@@ -569098,7 +569232,7 @@ No remaining matched processes.';
   } catch {}
 }
 
-(window as any).adoptScheduled = async function() {
+window.adoptScheduled = async function() {
   try {
     const r = await fetch('/v1/scheduled/reconcile', { method:'POST', headers: headers(), body: JSON.stringify({ apply: true }) });
     const j = await r.json();
@@ -569110,7 +569244,7 @@ No remaining matched processes.';
   } catch (e) { alert('Adopt failed: ' + (e && e.message || String(e))); }
 }
 
-(window as any).fixupScheduled = async function() {
+window.fixupScheduled = async function() {
   try {
     if (!confirm('Rewrite OA cron entries to canonical launcher?')) return;
     const r = await fetch('/v1/scheduled/fixup', { method:'POST', headers: headers(), body: JSON.stringify({ mode: 'cron', dryRun: false }) });
@@ -569120,7 +569254,7 @@ No remaining matched processes.';
   } catch (e) { alert('Fixup failed: ' + (e && e.message || String(e))); }
 }
 
-(window as any).migrateScheduled = async function() {
+window.migrateScheduled = async function() {
   try {
     if (!confirm('Migrate OA cron entries to systemd user timers?')) return;
     const r = await fetch('/v1/scheduled/fixup', { method:'POST', headers: headers(), body: JSON.stringify({ mode: 'migrate', dryRun: false }) });
@@ -569130,7 +569264,7 @@ No remaining matched processes.';
   } catch (e) { alert('Migrate failed: ' + (e && e.message || String(e))); }
 }
 
-(window as any).killScheduledTask = async function(id) {
+window.killScheduledTask = async function(id) {
   try {
     // Fetch task to derive a pattern (directory of tasks.json)
     const r = await fetch('/v1/scheduled/status', { headers: headers() });
@@ -569141,20 +569275,20 @@ No remaining matched processes.';
     const dir = (t.file || '').split('/').slice(0, -1).join('/') || t.file;
     // Escape for regex without using a character class that includes brace/dollar combo (parser quirk)
     const safe = dir
-      .replace(/\\/g, "\\\\")
-      .replace(/[/g, "\\[")
-      .replace(/]/g, "\\]")
-      .replace(/{/g, "\\{")
-      .replace(/}/g, "\\}")
-      .replace(/(/g, "\\(")
-      .replace(/)/g, "\\)")
-      .replace(/*/g, "\\*")
-      .replace(/+/g, "\\+")
-      .replace(/?/g, "\\?")
-      .replace(/^/g, "\\^")
-      .replace(/$/g, "\\$")
-      .replace(/|/g, "\\|")
-      .replace(/./g, "\\.");
+      .replace(/\\\\/g, "\\\\\\\\")
+      .replace(/\\[/g, "\\\\[")
+      .replace(/\\]/g, "\\\\]")
+      .replace(/\\{/g, "\\\\{")
+      .replace(/\\}/g, "\\\\}")
+      .replace(/\\(/g, "\\\\(")
+      .replace(/\\)/g, "\\\\)")
+      .replace(/\\*/g, "\\\\*")
+      .replace(/\\+/g, "\\\\+")
+      .replace(/\\?/g, "\\\\?")
+      .replace(/\\^/g, "\\\\^")
+      .replace(/\\$/g, "\\\\$")
+      .replace(/\\|/g, "\\\\|")
+      .replace(/\\./g, "\\\\.");
     const body = { pattern: safe };
     const resp = await fetch('/v1/scheduled/kill', { method:'POST', headers: headers(), body: JSON.stringify(body) });
     const j = await resp.json();
@@ -569164,11 +569298,8 @@ No remaining matched processes.';
     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 for task.';
-    if (before && after) msg += '
-GPU util: ' + before.gpu_pct + '% → ' + after.gpu_pct + '%';
-    msg += rem > 0 ? ('
-Remaining matched processes: ' + rem) : '
-No remaining matched processes.';
+    if (before && after) msg += '\\nGPU util: ' + before.gpu_pct + '% → ' + after.gpu_pct + '%';
+    msg += rem > 0 ? ('\\nRemaining matched processes: ' + rem) : '\\nNo remaining matched processes.';
     alert(msg);
     loadScheduled();
   } catch (e) { alert('Kill failed: ' + (e && e.message || String(e))); }
@@ -569183,8 +569314,8 @@ async function loadServices() {
     const svcs = Array.isArray(d.services) ? d.services : [];
     if (!svcs.length) { el.innerHTML = ''; return; }
     const rows = svcs.map(s => {
-      const stopBtn = '<button onclick="svcAction('' + s.name + '','stop')" style="background:#2a2a30;border:1px solid #5a2a2a;color:#b25f5f;padding:2px 6px;border-radius:3px;font-size:0.65rem;cursor:pointer">stop</button>';
-      const disBtn = '<button onclick="svcAction('' + s.name + '','disable')" style="background:#2a2a30;border:1px solid #5a2a2a;color:#b25f5f;padding:2px 6px;border-radius:3px;font-size:0.65rem;cursor:pointer">disable</button>';
+      const stopBtn = '<button onclick="svcAction(\\'' + s.name + '\\',\\'stop\\')" style="background:#2a2a30;border:1px solid #5a2a2a;color:#b25f5f;padding:2px 6px;border-radius:3px;font-size:0.65rem;cursor:pointer">stop</button>';
+      const disBtn = '<button onclick="svcAction(\\'' + s.name + '\\',\\'disable\\')" style="background:#2a2a30;border:1px solid #5a2a2a;color:#b25f5f;padding:2px 6px;border-radius:3px;font-size:0.65rem;cursor:pointer">disable</button>';
       return '<div style="background:#1e1e22;border-left:2px solid #3a3a42;padding:6px 10px;margin:4px 0;font-size:0.72rem">'
         + '<div style="color:#b0b0b0">' + s.name + '</div>'
         + '<div style="color:#555;font-size:0.6rem">enabled: ' + s.enabled + ' • active: ' + s.active + '</div>'
@@ -569195,7 +569326,7 @@ async function loadServices() {
   } catch {}
 }
 
-(window as any).svcAction = async function(name, action) {
+window.svcAction = async function(name, action) {
   try {
     await fetch('/v1/services/systemd/' + encodeURIComponent(name), { method:'POST', headers: headers(), body: JSON.stringify({ action }) });
     loadServices();

package/package.json

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