open-agents-ai 0.184.35 → 0.184.37

package/dist/index.js

@@ -47641,8 +47641,8 @@ async function handleSlashCommand(input, ctx) {
         writeFileSync19(jwtFile, JSON.stringify(jwtPayload, null, 2));
         renderInfo(`Launching fortemi-react from ${fDir}...`);
         try {
-          const { spawn: spawn23 } = __require("node:child_process");
-          const child = spawn23("npx", ["vite", "dev", "--host", "0.0.0.0", "--port", "3000"], {
+          const { spawn: spawn22 } = __require("node:child_process");
+          const child = spawn22("npx", ["vite", "dev", "--host", "0.0.0.0", "--port", "3000"], {
             cwd: join58(fDir, "apps", "standalone"),
             stdio: "ignore",
             detached: true,
@@ -50459,8 +50459,8 @@ Environment="OLLAMA_NUM_PARALLEL=${n}"
       }
       await new Promise((r) => setTimeout(r, 1e3));
       process.env.OLLAMA_NUM_PARALLEL = String(n);
-      const { spawn: spawn23 } = await import("node:child_process");
-      const child = spawn23("ollama", ["serve"], {
+      const { spawn: spawn22 } = await import("node:child_process");
+      const child = spawn22("ollama", ["serve"], {
         stdio: "ignore",
         detached: true,
         env: { ...process.env, OLLAMA_NUM_PARALLEL: String(n) }
@@ -62533,6 +62533,15 @@ function startApiServer(options = {}) {
       }
     });
   });
+  server.on("error", (err) => {
+    if (err.code === "EADDRINUSE") {
+      process.stderr.write(`  Port ${port} already in use \u2014 API server not started.
+`);
+    } else {
+      process.stderr.write(`  API server error: ${err.message}
+`);
+    }
+  });
   server.listen(port, host, () => {
     const version = getVersion3();
     process.stderr.write(`
@@ -64775,19 +64784,33 @@ Rationale: ${proposal.rationale}${provenanceNote}`;
     } catch {
     }
     try {
-      const { startApiServer: startApiServer2 } = await Promise.resolve().then(() => (init_serve(), serve_exports));
       const apiPort = parseInt(process.env["OA_PORT"] || "11435", 10);
-      const apiServer = startApiServer2({
-        port: apiPort,
-        ollamaUrl: currentConfig.backendUrl || "http://127.0.0.1:11434"
+      const portFree = await new Promise((resolve36) => {
+        const net = __require("net");
+        const tester = net.createServer();
+        tester.once("error", (err) => {
+          if (err.code === "EADDRINUSE")
+            resolve36(false);
+          else
+            resolve36(true);
+        });
+        tester.once("listening", () => {
+          tester.close(() => resolve36(true));
+        });
+        tester.listen(apiPort, "127.0.0.1");
       });
-      writeContent(() => renderInfo(`REST API: http://localhost:${apiPort} (${process.env["OA_API_KEY"] || process.env["OA_API_KEYS"] ? "auth enabled" : "open"})`));
-    } catch (apiErr) {
-      const msg = apiErr instanceof Error ? apiErr.message : String(apiErr);
-      if (msg.includes("EADDRINUSE")) {
+      if (!portFree) {
       } else {
-        writeContent(() => renderWarning(`API server: ${msg.slice(0, 60)}`));
+        const { startApiServer: startApiServer2 } = await Promise.resolve().then(() => (init_serve(), serve_exports));
+        const apiServer = startApiServer2({
+          port: apiPort,
+          ollamaUrl: currentConfig.backendUrl || "http://127.0.0.1:11434"
+        });
+        apiServer.on?.("error", () => {
+        });
+        writeContent(() => renderInfo(`REST API: http://localhost:${apiPort}`));
       }
+    } catch {
     }
     try {
       const { homedir: _hd } = await import("node:os");
@@ -68115,161 +68138,33 @@ var serve_exports2 = {};
 __export(serve_exports2, {
   serveCommand: () => serveCommand
 });
-import { spawn as spawn22 } from "node:child_process";
 async function serveCommand(opts, config) {
-  const backendType = config.backendType;
-  if (backendType === "ollama") {
-    await serveOllama(opts, config);
-  } else if (backendType === "vllm") {
-    await serveVllm(opts, config);
-  } else {
-    printHeader("Backend: fake");
-    printInfo("FakeBackend requires no server \u2014 it runs in-process.");
-    printInfo("Use --backend ollama or --backend vllm to connect to a real model.");
-  }
-}
-async function serveOllama(opts, config) {
-  const model = opts.model ?? config.model;
-  const baseUrl = config.backendUrl;
-  printHeader("Ollama Backend");
-  printSection("Active Configuration");
-  printKeyValue("Backend", "Ollama (manages its own server)", 2);
-  printKeyValue("URL", baseUrl, 2);
-  printKeyValue("Model", model, 2);
-  printInfo("Ollama manages its own server process \u2014 no startup needed via open-agents.");
-  printInfo("If Ollama is not running, start it with: ollama serve");
-  const backend = new OllamaBackend({ baseUrl, model });
-  let healthy;
+  const port = opts.port ?? 11435;
+  const ollamaUrl = config.backendUrl || "http://127.0.0.1:11434";
+  printHeader("Open Agents REST API");
+  printInfo(`Starting API server on port ${port}...`);
+  printInfo(`Backend: ${config.backendType} (${ollamaUrl})`);
   try {
-    healthy = await backend.healthCheck();
-  } catch {
-    healthy = false;
-  }
-  if (!healthy) {
-    printWarning(`Ollama is not reachable at ${baseUrl}`);
-    printInfo("Start Ollama and then run: open-agents status");
-    return;
-  }
-  printSuccess(`Ollama is running at ${baseUrl}`);
-  let availableModels = [];
-  try {
-    availableModels = await OllamaBackend.listModels(baseUrl);
-  } catch {
-  }
-  if (availableModels.length > 0) {
-    printSection("Available Models");
-    for (const name of availableModels) {
-      const isActive = name === model;
-      printKeyValue(isActive ? `${name} (configured)` : name, "", 2);
-    }
-    if (!availableModels.includes(model)) {
-      printWarning(`Model "${model}" is not pulled yet.`);
-      printInfo(`Pull it with: ollama pull ${model}`);
-    }
-  }
-  if (opts.verbose) {
-    printSection("Next Steps");
-    printInfo(`Run a task:  open-agents run "your task here" --backend ollama`);
-    printInfo(`Check status: open-agents status`);
-  }
-  const apiPort = opts.port ?? 11435;
-  printSection("Starting API Server");
-  printKeyValue("Port", String(apiPort), 2);
-  printKeyValue("Ollama proxy", baseUrl, 2);
-  const server = startApiServer({
-    port: apiPort,
-    verbose: opts.verbose,
-    ollamaUrl: baseUrl
-  });
-  await new Promise((resolve36) => {
-    server.on("close", resolve36);
-  });
-}
-async function serveVllm(opts, config) {
-  const port = opts.port ?? 8e3;
-  const host = opts.host ?? "0.0.0.0";
-  const model = opts.model ?? config.model;
-  printHeader("Start vLLM Server");
-  printSection("Server Configuration");
-  printKeyValue("Model", model, 2);
-  printKeyValue("Host", host, 2);
-  printKeyValue("Port", String(port), 2);
-  if (opts.extraArgs && opts.extraArgs.length > 0) {
-    printKeyValue("Extra args", opts.extraArgs.join(" "), 2);
-  }
-  const args = [
-    "-m",
-    "vllm.entrypoints.openai.api_server",
-    "--model",
-    model,
-    "--host",
-    host,
-    "--port",
-    String(port),
-    ...opts.extraArgs ?? []
-  ];
-  printInfo(`Running: python ${args.join(" ")}`);
-  printInfo(`Server will be available at http://${host}:${port}`);
-  printInfo("Press Ctrl+C to stop");
-  if (opts.verbose) {
-    printSection("Environment");
-    printKeyValue("CUDA_VISIBLE_DEVICES", process.env["CUDA_VISIBLE_DEVICES"] ?? "(not set)", 2);
-    printKeyValue("HF_TOKEN", process.env["HF_TOKEN"] ? "[set]" : "(not set)", 2);
-  }
-  await runVllmServer(args, opts.verbose ?? false);
-}
-async function runVllmServer(args, verbose) {
-  return new Promise((resolve36, reject) => {
-    const child = spawn22("python", args, {
-      stdio: verbose ? "inherit" : ["ignore", "pipe", "pipe"],
-      env: { ...process.env }
-    });
-    if (child.stdout) {
-      child.stdout.on("data", (chunk) => {
-        const line = chunk.toString().trim();
-        if (line)
-          printInfo(`[vllm] ${line}`);
-      });
-    }
-    if (child.stderr) {
-      child.stderr.on("data", (chunk) => {
-        const line = chunk.toString().trim();
-        if (line)
-          printWarning(`[vllm] ${line}`);
-      });
-    }
-    child.once("spawn", () => {
-      printSuccess("vLLM process started");
-    });
-    child.once("error", (err) => {
-      if (err.code === "ENOENT") {
-        printError("'python' not found. Ensure Python 3.10+ and vLLM are installed.");
-        printInfo("Install vLLM: pip install vllm");
-        reject(err);
-      } else {
-        printError(`Failed to start vLLM: ${err.message}`);
-        reject(err);
-      }
-    });
-    child.once("exit", (code, signal) => {
-      if (signal) {
-        printInfo(`vLLM server stopped by signal ${signal}`);
+    const server = startApiServer({ port, ollamaUrl });
+    await new Promise((resolve36) => {
+      process.on("SIGINT", () => {
+        server.close();
         resolve36();
-      } else if (code === 0) {
-        printSuccess("vLLM server exited cleanly");
+      });
+      process.on("SIGTERM", () => {
+        server.close();
         resolve36();
-      } else {
-        printError(`vLLM server exited with code ${code}`);
-        reject(new Error(`vLLM exited with code ${code}`));
-      }
+      });
     });
-    const forwardSignal = (sig) => {
-      if (!child.killed)
-        child.kill(sig);
-    };
-    process.once("SIGINT", () => forwardSignal("SIGINT"));
-    process.once("SIGTERM", () => forwardSignal("SIGTERM"));
-  });
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    if (msg.includes("EADDRINUSE")) {
+      printError(`Port ${port} already in use. Another OA instance may be running.`);
+      printInfo(`Try: oa serve --port ${port + 1}`);
+    } else {
+      printError(`API server failed: ${msg}`);
+    }
+  }
 }
 var init_serve2 = __esm({
   "packages/cli/dist/commands/serve.js"() {

package/package.json

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