open-agents-ai 0.68.0 → 0.68.2

package/dist/index.js

@@ -24662,21 +24662,10 @@ function installOllamaLinux() {
     return false;
   }
 }
-async function installOllamaMac(rl) {
+async function installOllamaMac(_rl) {
   if (!hasCmd("brew")) {
     process.stdout.write(`
-  ${c2.yellow("\u26A0")} Homebrew is not installed (needed for Ollama on macOS).
-
-`);
-    const installBrew = await ask(rl, `  ${c2.bold("Install Homebrew?")} (Y/n) `);
-    if (installBrew.toLowerCase() === "n") {
-      process.stdout.write(`  ${c2.dim("Skipping Homebrew install.")}
-
-`);
-      return false;
-    }
-    process.stdout.write(`
-  ${c2.cyan("\u25CF")} Installing Homebrew...
+  ${c2.cyan("\u25CF")} Homebrew not found. Installing automatically (needed for Ollama on macOS)...
 
 `);
     try {
@@ -24761,6 +24750,64 @@ function installOllamaWindows() {
     return false;
   }
 }
+async function ensureOllamaRunning(backendUrl, rl) {
+  const ollamaInstalled = hasCmd("ollama");
+  if (!ollamaInstalled) {
+    if (rl) {
+      process.stdout.write(`
+  ${c2.yellow("\u26A0")} Ollama is not installed on this system.
+`);
+      const answer = await ask(rl, `  ${c2.bold("Install Ollama now?")} (Y/n) `);
+      if (answer.toLowerCase() === "n") {
+        return false;
+      }
+    } else {
+      process.stdout.write(`
+  ${c2.cyan("\u25CF")} Ollama not found. Installing automatically...
+`);
+    }
+    const installRl = rl ?? readline.createInterface({ input: process.stdin, output: process.stdout });
+    const installed = await autoInstallOllama(installRl);
+    if (!rl)
+      installRl.close();
+    if (!installed) {
+      process.stdout.write(`  ${c2.red("\u2716")} Ollama installation failed.
+
+`);
+      return false;
+    }
+  }
+  process.stdout.write(`  ${c2.cyan("\u25CF")} Starting ollama serve...
+`);
+  try {
+    const child = spawn12("ollama", ["serve"], { stdio: "ignore", detached: true });
+    child.unref();
+  } catch {
+    process.stdout.write(`  ${c2.yellow("\u26A0")} Could not start ollama serve.
+
+`);
+    return false;
+  }
+  for (let i = 0; i < 5; i++) {
+    await new Promise((resolve28) => setTimeout(resolve28, 2e3));
+    try {
+      const resp = await fetch(`${backendUrl}/api/tags`, {
+        signal: AbortSignal.timeout(3e3)
+      });
+      if (resp.ok) {
+        process.stdout.write(`  ${c2.green("\u2714")} Ollama is running.
+
+`);
+        return true;
+      }
+    } catch {
+    }
+  }
+  process.stdout.write(`  ${c2.yellow("\u26A0")} Ollama started but not responding. Try ${c2.bold("ollama serve")} manually.
+
+`);
+  return false;
+}
 function pullModelWithAutoUpdate(tag) {
   try {
     execSync20(`ollama pull ${tag}`, {
@@ -24963,13 +25010,34 @@ async function doSetup(config, rl) {
 `);
     const ollamaInstalled = hasCmd("ollama");
     if (ollamaInstalled) {
-      process.stdout.write(`  ${c2.cyan("\u25CF")} Ollama is installed but not running.
+      process.stdout.write(`  ${c2.cyan("\u25CF")} Ollama is installed but not running. Starting automatically...
+`);
+      try {
+        const child = spawn12("ollama", ["serve"], { stdio: "ignore", detached: true });
+        child.unref();
+        await new Promise((resolve28) => setTimeout(resolve28, 3e3));
+        try {
+          models = await fetchOllamaModels(config.backendUrl);
+          process.stdout.write(`  ${c2.green("\u2714")} Ollama is running.
+
+`);
+        } catch {
+          process.stdout.write(`  ${c2.yellow("\u26A0")} Ollama started but not responding yet. It may need a moment.
 
 `);
-      const startOllama = await ask(rl, `  ${c2.bold("Start Ollama now?")} (Y/n) `);
-      if (startOllama.toLowerCase() !== "n") {
+        }
+      } catch {
+        process.stdout.write(`  ${c2.yellow("\u26A0")} Could not start Ollama. Try running ${c2.bold("ollama serve")} manually.
+
+`);
+      }
+    } else {
+      process.stdout.write(`  ${c2.cyan("\u25CF")} Ollama not found. Installing automatically...
+`);
+      const installed = await autoInstallOllama(rl);
+      if (installed) {
         process.stdout.write(`
-  ${c2.cyan("\u25CF")} Starting ollama serve in background...
+  ${c2.cyan("\u25CF")} Starting ollama serve...
 `);
         try {
           const child = spawn12("ollama", ["serve"], { stdio: "ignore", detached: true });
@@ -24981,45 +25049,16 @@ async function doSetup(config, rl) {
 
 `);
           } catch {
-            process.stdout.write(`  ${c2.yellow("\u26A0")} Ollama started but not responding yet. It may need a moment.
+            process.stdout.write(`  ${c2.yellow("\u26A0")} Ollama installed but not responding yet. Try ${c2.bold("ollama serve")} manually.
 
 `);
           }
         } catch {
-          process.stdout.write(`  ${c2.yellow("\u26A0")} Could not start Ollama. Try running ${c2.bold("ollama serve")} manually.
+          process.stdout.write(`  ${c2.yellow("\u26A0")} Ollama installed. Start it with: ${c2.bold("ollama serve")}
 
 `);
         }
       }
-    } else {
-      const installOllama = await ask(rl, `  ${c2.bold("Install Ollama?")} (Y/n) `);
-      if (installOllama.toLowerCase() !== "n") {
-        const installed = await autoInstallOllama(rl);
-        if (installed) {
-          process.stdout.write(`
-  ${c2.cyan("\u25CF")} Starting ollama serve...
-`);
-          try {
-            const child = spawn12("ollama", ["serve"], { stdio: "ignore", detached: true });
-            child.unref();
-            await new Promise((resolve28) => setTimeout(resolve28, 3e3));
-            try {
-              models = await fetchOllamaModels(config.backendUrl);
-              process.stdout.write(`  ${c2.green("\u2714")} Ollama is running.
-
-`);
-            } catch {
-              process.stdout.write(`  ${c2.yellow("\u26A0")} Ollama installed but not responding yet. Try ${c2.bold("ollama serve")} manually.
-
-`);
-            }
-          } catch {
-            process.stdout.write(`  ${c2.yellow("\u26A0")} Ollama installed. Start it with: ${c2.bold("ollama serve")}
-
-`);
-          }
-        }
-      }
       if (models.length === 0) {
         const useCustom = await ask(rl, `  ${c2.bold("Use a custom inference endpoint instead?")} (y/n) `);
         if (useCustom.toLowerCase() === "y" || useCustom.toLowerCase() === "yes") {
@@ -26697,11 +26736,30 @@ async function handleEndpoint(arg, ctx, local = false) {
   } catch (err) {
     process.stdout.write(`${c2.yellow("\u26A0")} Could not verify
 `);
-    renderWarning(`Endpoint may not be reachable: ${err instanceof Error ? err.message : String(err)}`);
-    if (provider.authRequired && !apiKey) {
-      renderInfo(`${provider.label} typically requires an API key. Use: /endpoint ${url} --auth <key>`);
+    if (provider.id === "ollama" && ctx.rl) {
+      const running = await ensureOllamaRunning(normalizedUrl, ctx.rl);
+      if (running) {
+        try {
+          const retryResp = await fetch(`${normalizedUrl}${provider.modelsPath}`, {
+            signal: AbortSignal.timeout(5e3)
+          });
+          if (retryResp.ok) {
+            process.stdout.write(`  ${c2.green("\u2714")} Connected to Ollama.
+`);
+          }
+        } catch {
+        }
+      } else {
+        renderWarning(`Endpoint may not be reachable: ${err instanceof Error ? err.message : String(err)}`);
+        renderInfo("Setting endpoint anyway \u2014 it may come online later.");
+      }
+    } else {
+      renderWarning(`Endpoint may not be reachable: ${err instanceof Error ? err.message : String(err)}`);
+      if (provider.authRequired && !apiKey) {
+        renderInfo(`${provider.label} typically requires an API key. Use: /endpoint ${url} --auth <key>`);
+      }
+      renderInfo("Setting endpoint anyway \u2014 it may come online later.");
     }
-    renderInfo("Setting endpoint anyway \u2014 it may come online later.");
   }
   ctx.setEndpoint(normalizedUrl, backendType, apiKey);
   const endpointSettings = { backendUrl: normalizedUrl, backendType, ...apiKey ? { apiKey } : {} };
@@ -36635,7 +36693,7 @@ async function startInteractive(config, repoPath) {
       const provider2 = detectProvider(config.backendUrl);
       renderWarning(`Cannot reach ${provider2.label} at ${config.backendUrl}`);
       if (provider2.id === "ollama") {
-        renderInfo("Start Ollama with: ollama serve");
+        renderInfo("Use /endpoint http://127.0.0.1:11434 to auto-install & start Ollama.");
       }
       renderInfo("Use /endpoint to configure a different backend. Starting anyway...");
     }
@@ -37023,6 +37081,7 @@ Rationale: ${proposal.rationale}${provenanceNote}`;
     get config() {
       return currentConfig;
     },
+    rl,
     repoRoot,
     costTracker,
     workEvaluator,
@@ -38453,9 +38512,13 @@ async function runWithTUI(task, config, repoPath) {
     const provider2 = detectProvider(config.backendUrl);
     renderWarning(`Cannot reach ${provider2.label} at ${config.backendUrl}`);
     if (provider2.id === "ollama") {
-      renderInfo("Start Ollama with: ollama serve");
+      const running = await ensureOllamaRunning(config.backendUrl);
+      if (!running) {
+        renderInfo("The agent will retry when you submit a task. Use /endpoint to reconfigure.");
+      }
+    } else {
+      renderInfo("The agent will retry when you submit a task. Use /endpoint to reconfigure.");
     }
-    renderInfo("The agent will retry when you submit a task. Use /endpoint to reconfigure.");
   }
   renderCompactHeader(config.model);
   renderUserMessage(task);

package/package.json

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