codemaxxing 0.4.9 → 0.4.10

package/dist/index.js

@@ -1465,8 +1465,8 @@ function App() {
                 if (key.return) {
                     // Auto-install Ollama if not present
                     if (!isOllamaInstalled()) {
-                        setWizardPullProgress({ status: "Installing Ollama...", percent: 0 });
-                        setWizardScreen("pulling");
+                        setLoading(true);
+                        setSpinnerMsg("Installing Ollama... this may take a minute");
                         // Run install async so the UI can update
                         const installCmd = getOllamaInstallCommand(wizardHardware?.os ?? "linux");
                         (async () => {
@@ -1481,17 +1481,17 @@ function App() {
                                     });
                                 });
                                 addMsg("info", "✅ Ollama installed! Proceeding to model download...");
+                                setLoading(false);
                                 // Small delay for PATH to update on Windows
                                 await new Promise(r => setTimeout(r, 2000));
                                 // Go back to models screen so user can pick and it'll proceed to pull
                                 setWizardScreen("models");
-                                setWizardPullProgress(null);
                             }
                             catch (e) {
                                 addMsg("error", `Install failed: ${e.message}`);
                                 addMsg("info", `Try manually in a separate terminal: ${installCmd}`);
+                                setLoading(false);
                                 setWizardScreen("install-ollama");
-                                setWizardPullProgress(null);
                             }
                         })();
                         return;

package/dist/utils/ollama.d.ts

@@ -1,4 +1,4 @@
-/** Check if ollama binary exists on PATH or known install locations */
+/** Check if ollama binary exists on PATH, known install locations, or server is running */
 export declare function isOllamaInstalled(): boolean;
 /** Check if ollama server is responding */
 export declare function isOllamaRunning(): Promise<boolean>;

package/dist/utils/ollama.js

@@ -11,20 +11,42 @@ function getWindowsOllamaPaths() {
     paths.push(join(localAppData, "Ollama", "ollama.exe"));
     return paths;
 }
-/** Check if ollama binary exists on PATH or known install locations */
+/** Check if ollama binary exists on PATH, known install locations, or server is running */
 export function isOllamaInstalled() {
+    // Check PATH first
     try {
         const cmd = process.platform === "win32" ? "where ollama" : "which ollama";
         execSync(cmd, { stdio: ["pipe", "pipe", "pipe"], timeout: 3000 });
         return true;
     }
-    catch {
-        // Fallback: check known install paths on Windows
-        if (process.platform === "win32") {
-            return getWindowsOllamaPaths().some(p => existsSync(p));
+    catch { }
+    // Check known install paths on Windows
+    if (process.platform === "win32") {
+        if (getWindowsOllamaPaths().some(p => existsSync(p)))
+            return true;
+    }
+    // Check if the server is responding (if server is running, Ollama is definitely installed)
+    try {
+        execSync("curl -s http://localhost:11434/api/tags", {
+            stdio: ["pipe", "pipe", "pipe"],
+            timeout: 3000,
+        });
+        return true;
+    }
+    catch { }
+    // Check if ollama process is running (Windows)
+    if (process.platform === "win32") {
+        try {
+            const result = execSync("tasklist /fi \"imagename eq ollama app.exe\" /fo csv /nh", {
+                stdio: ["pipe", "pipe", "pipe"],
+                timeout: 3000,
+            });
+            if (result.toString().toLowerCase().includes("ollama"))
+                return true;
         }
-        return false;
+        catch { }
     }
+    return false;
 }
 /** Check if ollama server is responding */
 export async function isOllamaRunning() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemaxxing",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "Open-source terminal coding agent. Connect any LLM. Max your code.",
   "main": "dist/index.js",
   "bin": {

package/src/index.tsx

@@ -1489,8 +1489,8 @@ function App() {
         if (key.return) {
           // Auto-install Ollama if not present
           if (!isOllamaInstalled()) {
-            setWizardPullProgress({ status: "Installing Ollama...", percent: 0 });
-            setWizardScreen("pulling");
+            setLoading(true);
+            setSpinnerMsg("Installing Ollama... this may take a minute");
 
             // Run install async so the UI can update
             const installCmd = getOllamaInstallCommand(wizardHardware?.os ?? "linux");
@@ -1504,16 +1504,16 @@ function App() {
                   });
                 });
                 addMsg("info", "✅ Ollama installed! Proceeding to model download...");
+                setLoading(false);
                 // Small delay for PATH to update on Windows
                 await new Promise(r => setTimeout(r, 2000));
                 // Go back to models screen so user can pick and it'll proceed to pull
                 setWizardScreen("models");
-                setWizardPullProgress(null);
               } catch (e: any) {
                 addMsg("error", `Install failed: ${e.message}`);
                 addMsg("info", `Try manually in a separate terminal: ${installCmd}`);
+                setLoading(false);
                 setWizardScreen("install-ollama");
-                setWizardPullProgress(null);
               }
             })();
             return;

package/src/utils/ollama.ts

@@ -13,19 +13,41 @@ function getWindowsOllamaPaths(): string[] {
   return paths;
 }
 
-/** Check if ollama binary exists on PATH or known install locations */
+/** Check if ollama binary exists on PATH, known install locations, or server is running */
 export function isOllamaInstalled(): boolean {
+  // Check PATH first
   try {
     const cmd = process.platform === "win32" ? "where ollama" : "which ollama";
     execSync(cmd, { stdio: ["pipe", "pipe", "pipe"], timeout: 3000 });
     return true;
-  } catch {
-    // Fallback: check known install paths on Windows
-    if (process.platform === "win32") {
-      return getWindowsOllamaPaths().some(p => existsSync(p));
-    }
-    return false;
+  } catch {}
+
+  // Check known install paths on Windows
+  if (process.platform === "win32") {
+    if (getWindowsOllamaPaths().some(p => existsSync(p))) return true;
+  }
+
+  // Check if the server is responding (if server is running, Ollama is definitely installed)
+  try {
+    execSync("curl -s http://localhost:11434/api/tags", {
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 3000,
+    });
+    return true;
+  } catch {}
+
+  // Check if ollama process is running (Windows)
+  if (process.platform === "win32") {
+    try {
+      const result = execSync("tasklist /fi \"imagename eq ollama app.exe\" /fo csv /nh", {
+        stdio: ["pipe", "pipe", "pipe"],
+        timeout: 3000,
+      });
+      if (result.toString().toLowerCase().includes("ollama")) return true;
+    } catch {}
   }
+
+  return false;
 }
 
 /** Check if ollama server is responding */