osagent 0.1.69 → 0.1.71

package/dist/cli.js

@@ -146462,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,
@@ -146537,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
@@ -146572,7 +146587,7 @@ function createContentGeneratorConfig(config2, authType, generationConfig) {
   };
 }
 async function createContentGenerator(config2, gcConfig, sessionId2, isInitialAuth) {
-  const version3 = "0.1.69";
+  const version3 = "0.1.71";
   const userAgent2 = `OSAgent/${version3} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -146647,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";
@@ -335704,7 +335720,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.69";
+  return "0.1.71";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -336153,16 +336169,34 @@ function checkOllamaInstalled() {
   }
 }
 __name(checkOllamaInstalled, "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 checkOllamaRunning() {
+  const { url: url3, source: source2 } = getOllamaEndpoint();
+  const displayUrl = url3.replace("http://", "");
+  const sourceNote = source2 !== "default" ? ` (from ${source2})` : "";
   try {
-    execSync4("curl -s http://localhost:11434/api/tags", { encoding: "utf-8", timeout: 5e3 });
-    return { name: "Ollama Server", status: "ok", message: "running on localhost:11434" };
+    execSync4(`curl -s ${url3}/api/tags`, { encoding: "utf-8", timeout: 5e3 });
+    return { name: "Ollama Server", status: "ok", message: `running on ${displayUrl}${sourceNote}` };
   } catch {
+    const isWSL = process.platform === "linux" && __require("os").release().toLowerCase().includes("microsoft");
+    const action = isWSL ? "WSL detected. Set OLLAMA_HOST=host.docker.internal:11434 or your Windows IP" : 'Run "ollama serve" to start the local server';
     return {
       name: "Ollama Server",
       status: "warning",
-      message: "not running",
-      action: 'Run "ollama serve" to start the local server'
+      message: `not reachable at ${displayUrl}`,
+      action
     };
   }
 }
@@ -339873,8 +339907,8 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO2 = "ab4acfa";
-var CLI_VERSION2 = "0.1.69";
+var GIT_COMMIT_INFO2 = "3160e61";
+var CLI_VERSION2 = "0.1.71";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -341952,7 +341986,7 @@ function checkOllamaInstalled2() {
   }
 }
 __name(checkOllamaInstalled2, "checkOllamaInstalled");
-function getOllamaEndpoint() {
+function getOllamaEndpoint2() {
   const ollamaHost = process.env["OLLAMA_HOST"];
   if (ollamaHost) {
     const url3 = ollamaHost.startsWith("http") ? ollamaHost : `http://${ollamaHost}`;
@@ -341964,9 +341998,9 @@ function getOllamaEndpoint() {
   }
   return { url: "http://localhost:11434", source: "default" };
 }
-__name(getOllamaEndpoint, "getOllamaEndpoint");
+__name(getOllamaEndpoint2, "getOllamaEndpoint");
 function checkOllamaRunning2() {
-  const { url: primaryUrl, source: source2 } = getOllamaEndpoint();
+  const { url: primaryUrl, source: source2 } = getOllamaEndpoint2();
   const endpoints = [
     primaryUrl,
     // WSL-specific fallbacks (only try if primary is localhost)
@@ -383510,6 +383544,20 @@ var useOSAAuth = /* @__PURE__ */ __name((pendingAuthType, isAuthenticating) => {
 }, "useOSAAuth");
 
 // packages/cli/src/ui/auth/useAuth.ts
+function getEffectiveOllamaLocalUrl() {
+  const ollamaHost = process.env["OLLAMA_HOST"];
+  if (ollamaHost) {
+    const url3 = ollamaHost.startsWith("http") ? ollamaHost : `http://${ollamaHost}`;
+    return `${url3.replace(/\/$/, "")}/v1`;
+  }
+  const ollamaBaseUrl = process.env["OLLAMA_BASE_URL"];
+  if (ollamaBaseUrl) {
+    const baseUrl = ollamaBaseUrl.replace(/\/v1\/?$/, "").replace(/\/$/, "");
+    return `${baseUrl}/v1`;
+  }
+  return "http://localhost:11434/v1";
+}
+__name(getEffectiveOllamaLocalUrl, "getEffectiveOllamaLocalUrl");
 var useAuthCommand = /* @__PURE__ */ __name((settings, config2, addItem) => {
   const unAuthenticated = settings.merged.security?.auth?.selectedType === void 0;
   const [authState, setAuthState] = (0, import_react112.useState)(
@@ -383648,7 +383696,7 @@ var useAuthCommand = /* @__PURE__ */ __name((settings, config2, addItem) => {
       if (authType === AuthType2.OLLAMA_LOCAL) {
         config2.updateCredentials({
           apiKey: "ollama",
-          baseUrl: "http://localhost:11434/v1",
+          baseUrl: getEffectiveOllamaLocalUrl(),
           model: credentials?.model || "qwen2.5-coder:32b"
         });
         await performAuth(authType, scope, credentials);
@@ -393917,6 +393965,15 @@ __name(getUserStartupWarnings, "getUserStartupWarnings");
 // packages/cli/src/validateNonInterActiveAuth.ts
 init_esbuild_shims();
 function getAuthTypeFromEnv() {
+  if (process.env["GROQ_API_KEY"]) {
+    return AuthType2.USE_GROQ;
+  }
+  if (process.env["OLLAMA_API_KEY"]) {
+    return AuthType2.OLLAMA_CLOUD;
+  }
+  if (process.env["OLLAMA_HOST"] || process.env["OLLAMA_BASE_URL"]) {
+    return AuthType2.OLLAMA_LOCAL;
+  }
   if (process.env["OPENAI_API_KEY"]) {
     return AuthType2.USE_OPENAI;
   }
@@ -395836,9 +395893,9 @@ ${finalArgs[promptIndex + 1]}`;
       }
       process.exit(0);
     }
-    const isInteractive = config2.isInteractive();
     const consolePatcher = new ConsolePatcher({
-      stderr: isInteractive,
+      stderr: true,
+      // Always use stderr for console.log/error/warn
       debugMode: isDebugMode2
     });
     consolePatcher.patch();

package/package.json

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