osagent 0.1.68 → 0.1.70

package/dist/cli.js

@@ -142630,6 +142630,18 @@ var init_openrouter = __esm({
 });
 
 // packages/core/dist/src/core/openaiContentGenerator/provider/ollama.js
+function getEffectiveOllamaUrl() {
+  const ollamaHost = process.env["OLLAMA_HOST"];
+  if (ollamaHost) {
+    const url3 = ollamaHost.startsWith("http") ? ollamaHost : `http://${ollamaHost}`;
+    return url3.replace(/\/$/, "");
+  }
+  const ollamaBaseUrl = process.env["OLLAMA_BASE_URL"];
+  if (ollamaBaseUrl) {
+    return ollamaBaseUrl.replace(/\/v1\/?$/, "").replace(/\/$/, "");
+  }
+  return "http://localhost:11434";
+}
 var OllamaOpenAICompatibleProvider;
 var init_ollama = __esm({
   "packages/core/dist/src/core/openaiContentGenerator/provider/ollama.js"() {
@@ -142637,6 +142649,7 @@ var init_ollama = __esm({
     init_esbuild_shims();
     init_openai();
     init_constants2();
+    __name(getEffectiveOllamaUrl, "getEffectiveOllamaUrl");
     OllamaOpenAICompatibleProvider = class {
       static {
         __name(this, "OllamaOpenAICompatibleProvider");
@@ -142652,7 +142665,9 @@ var init_ollama = __esm({
        */
       static isOllamaProvider(config2) {
         const baseUrl = config2.baseUrl?.toLowerCase() || "";
-        return baseUrl.includes("ollama.com") || baseUrl.includes("localhost:11434") || baseUrl.includes("127.0.0.1:11434");
+        const effectiveUrl = getEffectiveOllamaUrl().toLowerCase();
+        return baseUrl.includes("ollama.com") || baseUrl.includes("localhost:11434") || baseUrl.includes("127.0.0.1:11434") || // Also check for OLLAMA_HOST configured URLs
+        effectiveUrl.includes(baseUrl.replace(/https?:\/\//, "").replace("/v1", ""));
       }
       /**
        * Check if this is OS Agent Cloud (vs Local)
@@ -142694,7 +142709,7 @@ var init_ollama = __esm({
        * Check if Ollama server is running and accessible
        */
       async checkHealth() {
-        const baseUrl = this.contentGeneratorConfig.baseUrl?.replace("/v1", "") || "http://localhost:11434";
+        const baseUrl = this.contentGeneratorConfig.baseUrl?.replace("/v1", "") || getEffectiveOllamaUrl();
         try {
           const response = await fetch(`${baseUrl}/api/version`, {
             method: "GET",
@@ -142720,7 +142735,7 @@ var init_ollama = __esm({
        * Check if a specific model is available on the Ollama server
        */
       async isModelAvailable(model) {
-        const baseUrl = this.contentGeneratorConfig.baseUrl?.replace("/v1", "") || "http://localhost:11434";
+        const baseUrl = this.contentGeneratorConfig.baseUrl?.replace("/v1", "") || getEffectiveOllamaUrl();
         try {
           const response = await fetch(`${baseUrl}/api/tags`, {
             method: "GET",
@@ -142749,7 +142764,7 @@ var init_ollama = __esm({
        * Pull a model from Ollama registry
        */
       async pullModel(model) {
-        const baseUrl = this.contentGeneratorConfig.baseUrl?.replace("/v1", "") || "http://localhost:11434";
+        const baseUrl = this.contentGeneratorConfig.baseUrl?.replace("/v1", "") || getEffectiveOllamaUrl();
         try {
           const response = await fetch(`${baseUrl}/api/pull`, {
             method: "POST",
@@ -146447,6 +146462,20 @@ var init_qwenContentGenerator = __esm({
 });
 
 // packages/core/dist/src/core/contentGenerator.js
+function getEffectiveOllamaUrl2(includeV1 = true) {
+  const ollamaHost = process.env["OLLAMA_HOST"];
+  if (ollamaHost) {
+    const url3 = ollamaHost.startsWith("http") ? ollamaHost : `http://${ollamaHost}`;
+    const baseUrl = url3.replace(/\/$/, "");
+    return includeV1 ? `${baseUrl}/v1` : baseUrl;
+  }
+  const ollamaBaseUrl = process.env["OLLAMA_BASE_URL"];
+  if (ollamaBaseUrl) {
+    const baseUrl = ollamaBaseUrl.replace(/\/v1\/?$/, "").replace(/\/$/, "");
+    return includeV1 ? `${baseUrl}/v1` : baseUrl;
+  }
+  return includeV1 ? "http://localhost:11434/v1" : "http://localhost:11434";
+}
 function createCleanConfigBase(config2, authType, generationConfig) {
   return {
     authType,
@@ -146522,7 +146551,8 @@ function createContentGeneratorConfig(config2, authType, generationConfig) {
     return {
       ...baseConfig,
       model: ollamaModel,
-      baseUrl: "http://localhost:11434/v1",
+      baseUrl: getEffectiveOllamaUrl2(true),
+      // Gets OLLAMA_HOST or defaults to localhost:11434/v1
       apiKey: "ollama",
       authType: AuthType2.OLLAMA_LOCAL,
       // Ollama doesn't need special cache control handling
@@ -146557,7 +146587,7 @@ function createContentGeneratorConfig(config2, authType, generationConfig) {
   };
 }
 async function createContentGenerator(config2, gcConfig, sessionId2, isInitialAuth) {
-  const version3 = "0.1.68";
+  const version3 = "0.1.70";
   const userAgent2 = `OSAgent/${version3} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -146632,6 +146662,7 @@ var init_contentGenerator = __esm({
     init_models();
     init_installationManager();
     init_loggingContentGenerator();
+    __name(getEffectiveOllamaUrl2, "getEffectiveOllamaUrl");
     (function(AuthType4) {
       AuthType4["LOGIN_WITH_OSAGENT"] = "oauth-personal";
       AuthType4["USE_OSA"] = "OSA-api-key";
@@ -224007,7 +224038,10 @@ var init_ollamaEmbedding = __esm({
       timeoutMs;
       dimensions;
       constructor(config2 = {}) {
-        this.baseUrl = config2.baseUrl ?? "http://localhost:11434";
+        const ollamaHost = process.env["OLLAMA_HOST"];
+        const ollamaBaseUrl = process.env["OLLAMA_BASE_URL"];
+        const effectiveUrl = ollamaHost ? ollamaHost.startsWith("http") ? ollamaHost : `http://${ollamaHost}` : ollamaBaseUrl?.replace(/\/v1\/?$/, "") ?? "http://localhost:11434";
+        this.baseUrl = config2.baseUrl ?? effectiveUrl.replace(/\/$/, "");
         this.model = config2.model ?? "nomic-embed-text";
         this.timeoutMs = config2.timeoutMs ?? 3e4;
         this.dimensions = this.model.includes("nomic") ? 768 : 384;
@@ -335686,7 +335720,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.68";
+  return "0.1.70";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -339855,8 +339889,8 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO2 = "8eb2854";
-var CLI_VERSION2 = "0.1.68";
+var GIT_COMMIT_INFO2 = "3160e61";
+var CLI_VERSION2 = "0.1.70";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -341934,37 +341968,71 @@ function checkOllamaInstalled2() {
   }
 }
 __name(checkOllamaInstalled2, "checkOllamaInstalled");
+function getOllamaEndpoint() {
+  const ollamaHost = process.env["OLLAMA_HOST"];
+  if (ollamaHost) {
+    const url3 = ollamaHost.startsWith("http") ? ollamaHost : `http://${ollamaHost}`;
+    return { url: url3.replace(/\/$/, ""), source: "OLLAMA_HOST" };
+  }
+  const ollamaBaseUrl = process.env["OLLAMA_BASE_URL"];
+  if (ollamaBaseUrl) {
+    return { url: ollamaBaseUrl.replace(/\/v1\/?$/, "").replace(/\/$/, ""), source: "OLLAMA_BASE_URL" };
+  }
+  return { url: "http://localhost:11434", source: "default" };
+}
+__name(getOllamaEndpoint, "getOllamaEndpoint");
 function checkOllamaRunning2() {
-  try {
-    execSync6("curl -s --max-time 2 http://localhost:11434/api/tags", { encoding: "utf-8" });
-    return { name: "Ollama Server", status: "ok", message: "running on :11434" };
-  } catch {
-    return {
-      name: "Ollama Server",
-      status: "warning",
-      message: "not running",
-      fix: "Run: ollama serve",
-      autoFix: /* @__PURE__ */ __name(async () => {
+  const { url: primaryUrl, source: source2 } = getOllamaEndpoint();
+  const endpoints = [
+    primaryUrl,
+    // WSL-specific fallbacks (only try if primary is localhost)
+    ...primaryUrl.includes("localhost") || primaryUrl.includes("127.0.0.1") ? ["http://host.docker.internal:11434", "http://172.17.0.1:11434"] : []
+  ];
+  for (const endpoint of endpoints) {
+    try {
+      execSync6(`curl -s --max-time 2 ${endpoint}/api/tags`, { encoding: "utf-8" });
+      const displayEndpoint = endpoint.replace("http://", "").replace(":11434", ":11434");
+      const sourceNote = source2 !== "default" ? ` (from ${source2})` : "";
+      return {
+        name: "Ollama Server",
+        status: "ok",
+        message: `running on ${displayEndpoint}${sourceNote}`,
+        details: endpoint !== primaryUrl ? [`Fallback: ${endpoint}`] : void 0
+      };
+    } catch {
+    }
+  }
+  const isWSL = platform14() === "linux" && release3().toLowerCase().includes("microsoft");
+  const fix = isWSL ? "WSL detected. Set OLLAMA_HOST=host.docker.internal:11434 or your Windows IP" : "Run: ollama serve";
+  return {
+    name: "Ollama Server",
+    status: "warning",
+    message: "not reachable",
+    fix,
+    details: isWSL ? [
+      `Tried: ${endpoints.join(", ")}`,
+      "Windows Ollama needs: export OLLAMA_HOST=host.docker.internal:11434"
+    ] : [`Tried: ${primaryUrl}`],
+    autoFix: /* @__PURE__ */ __name(async () => {
+      try {
+        const { spawn: spawn11 } = await import("child_process");
+        const child = spawn11("ollama", ["serve"], {
+          detached: true,
+          stdio: "ignore"
+        });
+        child.unref();
+        await new Promise((resolve25) => setTimeout(resolve25, 2e3));
         try {
-          const { spawn: spawn11 } = await import("child_process");
-          const child = spawn11("ollama", ["serve"], {
-            detached: true,
-            stdio: "ignore"
-          });
-          child.unref();
-          await new Promise((resolve25) => setTimeout(resolve25, 2e3));
-          try {
-            execSync6("curl -s --max-time 2 http://localhost:11434/api/tags", { encoding: "utf-8" });
-            return true;
-          } catch {
-            return false;
-          }
+          execSync6(`curl -s --max-time 2 ${primaryUrl}/api/tags`, { encoding: "utf-8" });
+          return true;
         } catch {
           return false;
         }
-      }, "autoFix")
-    };
-  }
+      } catch {
+        return false;
+      }
+    }, "autoFix")
+  };
 }
 __name(checkOllamaRunning2, "checkOllamaRunning");
 function checkGitInstalled() {
@@ -350998,7 +351066,7 @@ function useHistory() {
       setHistory((prevHistory) => {
         if (prevHistory.length > 0) {
           const lastItem = prevHistory[prevHistory.length - 1];
-          if (lastItem.type === "user" && newItem.type === "user" && lastItem.text === newItem.text) {
+          if (lastItem.type === newItem.type && "text" in lastItem && "text" in newItem && lastItem.text === newItem.text) {
             return prevHistory;
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "osagent",
-  "version": "0.1.68",
+  "version": "0.1.70",
   "description": "OS Agent - AI-powered CLI for autonomous coding with Ollama Cloud and Qwen models",
   "author": "Roberto Luna",
   "license": "Apache-2.0",