codemaxxing 0.4.8 → 0.4.10

package/dist/index.js

@@ -1465,16 +1465,15 @@ 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 () => {
                             try {
-                                const { execFile } = _require("child_process");
-                                const parts = installCmd.split(" ");
+                                const { exec } = _require("child_process");
                                 await new Promise((resolve, reject) => {
-                                    execFile(parts[0], parts.slice(1), { shell: true, timeout: 180000 }, (err, _stdout, stderr) => {
+                                    exec(installCmd, { timeout: 180000 }, (err, _stdout, stderr) => {
                                         if (err)
                                             reject(new Error(stderr || err.message));
                                         else
@@ -1482,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 */
+/** 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

@@ -1,14 +1,52 @@
 import { execSync, spawn } from "child_process";
-/** Check if ollama binary exists on PATH */
+import { existsSync } from "fs";
+import { join } from "path";
+/** Get known Ollama binary paths for Windows */
+function getWindowsOllamaPaths() {
+    const paths = [];
+    const localAppData = process.env.LOCALAPPDATA || join(process.env.USERPROFILE || "", "AppData", "Local");
+    const programFiles = process.env.ProgramFiles || "C:\\Program Files";
+    paths.push(join(localAppData, "Programs", "Ollama", "ollama.exe"));
+    paths.push(join(programFiles, "Ollama", "ollama.exe"));
+    paths.push(join(localAppData, "Ollama", "ollama.exe"));
+    return paths;
+}
+/** 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 {
-        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 */
 export async function isOllamaRunning() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemaxxing",
-  "version": "0.4.8",
+  "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,32 +1489,31 @@ 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 () => {
               try {
-                const { execFile } = _require("child_process");
-                const parts = installCmd.split(" ");
+                const { exec } = _require("child_process");
                 await new Promise<void>((resolve, reject) => {
-                  execFile(parts[0], parts.slice(1), { shell: true, timeout: 180000 }, (err: any, _stdout: string, stderr: string) => {
+                  exec(installCmd, { timeout: 180000 }, (err: any, _stdout: string, stderr: string) => {
                     if (err) reject(new Error(stderr || err.message));
                     else resolve();
                   });
                 });
                 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

@@ -1,14 +1,53 @@
 import { execSync, spawn } from "child_process";
+import { existsSync } from "fs";
+import { join } from "path";
 
-/** Check if ollama binary exists on PATH */
+/** Get known Ollama binary paths for Windows */
+function getWindowsOllamaPaths(): string[] {
+  const paths: string[] = [];
+  const localAppData = process.env.LOCALAPPDATA || join(process.env.USERPROFILE || "", "AppData", "Local");
+  const programFiles = process.env.ProgramFiles || "C:\\Program Files";
+  paths.push(join(localAppData, "Programs", "Ollama", "ollama.exe"));
+  paths.push(join(programFiles, "Ollama", "ollama.exe"));
+  paths.push(join(localAppData, "Ollama", "ollama.exe"));
+  return paths;
+}
+
+/** 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 {
-    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 */