open-agents-ai 0.187.366 → 0.187.368

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)) {
@@ -544211,77 +544273,84 @@ async function handleSlashCommand(input, ctx3) {
       await showColorMenu(ctx3);
       return "handled";
     }
-    case "apikey": {
-      registerSlashCommand({
-        name: "apikey",
-        description: "Show/copy/rotate API key (show|copy|new)",
-        handler: async ({ arg: arg2 }) => {
-          const action = (arg2 || "show").trim().toLowerCase();
-          let key = process.env["OA_API_KEY"] || "";
-          if (!key) {
-            try {
-              const { homedir: homedir41 } = await import("node:os");
-              const { readFileSync: readFileSync72, existsSync: existsSync91 } = await import("node:fs");
-              const { join: join110 } = await import("node:path");
-              const p2 = join110(homedir41(), ".open-agents", "api.key");
-              if (existsSync91(p2)) key = readFileSync72(p2, "utf8").trim();
-            } catch {
-            }
+    case "apikey":
+    case "key": {
+      const apiKeyHandler = async ({ arg: a2 }) => {
+        const action = (a2 || "show").trim().toLowerCase();
+        let key = process.env["OA_API_KEY"] || "";
+        if (!key) {
+          try {
+            const { homedir: homedir41 } = await import("node:os");
+            const { readFileSync: readFileSync72, existsSync: existsSync91 } = await import("node:fs");
+            const { join: join110 } = await import("node:path");
+            const p2 = join110(homedir41(), ".open-agents", "api.key");
+            if (existsSync91(p2)) key = readFileSync72(p2, "utf8").trim();
+          } catch {
           }
-          if (action === "show") {
-            if (!key) {
-              renderWarning2("No API key set. Use /access any to generate one.");
-              return "handled";
-            }
-            renderInfo2(`API key: ${c3.bold(c3.yellow(key))}`);
-            renderInfo2("Use Authorization: Bearer <key> or paste in the Web UI key modal.");
+        }
+        if (action === "show") {
+          if (!key) {
+            renderWarning2("No API key set. Use /access any to generate one.");
             return "handled";
           }
-          if (action === "copy") {
-            if (!key) {
-              renderWarning2("No API key set. Use /access any to generate one.");
-              return "handled";
-            }
-            try {
-              const { spawnSync: spawnSync6 } = await import("node:child_process");
-              const tryCmd = (cmd2, args) => spawnSync6(cmd2, args, { input: key, encoding: "utf8" });
-              let ok2 = false;
-              if (process.platform === "darwin") {
-                ok2 = tryCmd("pbcopy", []).status === 0;
-              } else if (process.platform === "win32") {
-                ok2 = tryCmd("clip", []).status === 0;
-              } else {
-                ok2 = tryCmd("wl-copy", []).status === 0 || tryCmd("xclip", ["-selection", "clipboard"]).status === 0;
-              }
-              renderInfo2(ok2 ? "Copied API key to clipboard." : "Copy failed — printed above, select to copy.");
-            } catch {
-              renderInfo2("Copy failed — printed above, select to copy.");
-            }
+          renderInfo2(`API key: ${c3.bold(c3.yellow(key))}`);
+          renderInfo2("Use Authorization: Bearer <key> or paste in the Web UI key modal.");
+          return "handled";
+        }
+        if (action === "copy") {
+          if (!key) {
+            renderWarning2("No API key set. Use /access any to generate one.");
             return "handled";
           }
-          if (action === "new") {
-            try {
-              const { randomBytes: randomBytes23 } = await import("node:crypto");
-              const { homedir: homedir41 } = await import("node:os");
-              const { mkdirSync: mkdirSync58, writeFileSync: writeFileSync51 } = await import("node:fs");
-              const { join: join110 } = await import("node:path");
-              const newKey = randomBytes23(16).toString("hex");
-              process.env["OA_API_KEY"] = newKey;
-              const dir = join110(homedir41(), ".open-agents");
-              mkdirSync58(dir, { recursive: true });
-              writeFileSync51(join110(dir, "api.key"), newKey + "\n", "utf8");
-              renderInfo2(`New API key: ${c3.bold(c3.yellow(newKey))}`);
-              renderInfo2("Restart the daemon to apply if needed. Use /access any to restart quickly.");
-            } catch (e2) {
-              renderError2(`Failed to rotate key: ${e2 instanceof Error ? e2.message : String(e2)}`);
+          try {
+            const { spawnSync: spawnSync6 } = await import("node:child_process");
+            const tryCmd = (cmd2, args) => spawnSync6(cmd2, args, { input: key, encoding: "utf8" });
+            let ok2 = false;
+            if (process.platform === "darwin") {
+              ok2 = tryCmd("pbcopy", []).status === 0;
+            } else if (process.platform === "win32") {
+              ok2 = tryCmd("clip", []).status === 0;
+            } else {
+              ok2 = tryCmd("wl-copy", []).status === 0 || tryCmd("xclip", ["-selection", "clipboard"]).status === 0;
             }
-            return "handled";
+            renderInfo2(ok2 ? "Copied API key to clipboard." : "Copy failed — printed above, select to copy.");
+          } catch {
+            renderInfo2("Copy failed — printed above, select to copy.");
           }
-          renderInfo2("Usage: /apikey [show|copy|new]");
           return "handled";
         }
+        if (action === "new") {
+          try {
+            const { randomBytes: randomBytes23 } = await import("node:crypto");
+            const { homedir: homedir41 } = await import("node:os");
+            const { mkdirSync: mkdirSync58, writeFileSync: writeFileSync51 } = await import("node:fs");
+            const { join: join110 } = await import("node:path");
+            const newKey = randomBytes23(16).toString("hex");
+            process.env["OA_API_KEY"] = newKey;
+            const dir = join110(homedir41(), ".open-agents");
+            mkdirSync58(dir, { recursive: true });
+            writeFileSync51(join110(dir, "api.key"), newKey + "\n", "utf8");
+            renderInfo2(`New API key: ${c3.bold(c3.yellow(newKey))}`);
+            renderInfo2("Restart the daemon to apply if needed. Use /access any to restart quickly.");
+          } catch (e2) {
+            renderError2(`Failed to rotate key: ${e2 instanceof Error ? e2.message : String(e2)}`);
+          }
+          return "handled";
+        }
+        renderInfo2("Usage: /apikey [show|copy|new]    aliases: /key");
+        return "handled";
+      };
+      registerSlashCommand({
+        name: "apikey",
+        description: "Show/copy/rotate API key (show|copy|new)",
+        handler: async (opts) => apiKeyHandler({ arg: opts.arg })
       });
-      return "handled";
+      registerSlashCommand({
+        name: "key",
+        description: "Alias for /apikey",
+        handler: async (opts) => apiKeyHandler({ arg: opts.arg })
+      });
+      return apiKeyHandler({ arg });
     }
     case "sessions":
     case "session": {
@@ -544447,12 +544516,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 +544531,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 +544618,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 +544633,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 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(`http://127.0.0.1:${port}/v1/admin/access`, {
+        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";
     }
@@ -552472,6 +552616,10 @@ var init_render2 = __esm({
       ["/scheduler menu", "Interactive scheduler menu (toggle/kill)"],
       ["/scheduler list", "List all scheduled tasks and timers"],
       ["/scheduler kill", "Kill schedulers + active runs (with escalation if needed)"],
+      ["/apikey", "Show current API key (for pasting into Web UI / clients)"],
+      ["/apikey copy", "Copy the API key to clipboard"],
+      ["/apikey new", "Rotate to a new API key (regenerate)"],
+      ["/key", "Alias for /apikey"],
       ["/codegraph", "Code-graph snapshot: stats, top files, recent activity"],
       ["/codegraph watch [N]", "Subscribe to live code-graph events for N seconds (default 30)"],
       ["/cg", "Alias for /codegraph"],

package/package.json

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