codemaxxing 0.4.9 → 0.4.11

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>;
@@ -13,9 +13,9 @@ export interface PullProgress {
     percent: number;
 }
 /**
- * Pull a model from Ollama registry.
+ * Pull a model from Ollama registry via HTTP API.
+ * Falls back to CLI if API fails.
  * Calls onProgress with download updates.
- * Returns a promise that resolves when complete.
  */
 export declare function pullModel(modelId: string, onProgress?: (progress: PullProgress) => void): Promise<void>;
 export interface OllamaModelInfo {

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() {
@@ -47,22 +69,98 @@ export function getOllamaInstallCommand(os) {
         case "windows": return "winget install Ollama.Ollama";
     }
 }
+/** Find the ollama binary path */
+function findOllamaBinary() {
+    // Try PATH first
+    try {
+        const cmd = process.platform === "win32" ? "where ollama" : "which ollama";
+        return execSync(cmd, { stdio: ["pipe", "pipe", "pipe"], timeout: 3000 }).toString().trim().split("\n")[0];
+    }
+    catch { }
+    // Check known Windows paths
+    if (process.platform === "win32") {
+        for (const p of getWindowsOllamaPaths()) {
+            if (existsSync(p))
+                return p;
+        }
+    }
+    return "ollama"; // fallback, hope for the best
+}
 /** Start ollama serve in background */
 export function startOllama() {
-    const child = spawn("ollama", ["serve"], {
+    const bin = findOllamaBinary();
+    const child = spawn(bin, ["serve"], {
         detached: true,
         stdio: "ignore",
     });
     child.unref();
 }
 /**
- * Pull a model from Ollama registry.
+ * Pull a model from Ollama registry via HTTP API.
+ * Falls back to CLI if API fails.
  * Calls onProgress with download updates.
- * Returns a promise that resolves when complete.
  */
 export function pullModel(modelId, onProgress) {
+    // Try HTTP API first (works even when CLI isn't on PATH)
+    return pullModelViaAPI(modelId, onProgress).catch(() => {
+        // Fallback to CLI
+        return pullModelViaCLI(modelId, onProgress);
+    });
+}
+function pullModelViaAPI(modelId, onProgress) {
+    return new Promise(async (resolve, reject) => {
+        try {
+            const res = await fetch("http://localhost:11434/api/pull", {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({ name: modelId, stream: true }),
+            });
+            if (!res.ok || !res.body) {
+                reject(new Error(`Ollama API returned ${res.status}`));
+                return;
+            }
+            const reader = res.body.getReader();
+            const decoder = new TextDecoder();
+            let buffer = "";
+            while (true) {
+                const { done, value } = await reader.read();
+                if (done)
+                    break;
+                buffer += decoder.decode(value, { stream: true });
+                const lines = buffer.split("\n");
+                buffer = lines.pop() || "";
+                for (const line of lines) {
+                    if (!line.trim())
+                        continue;
+                    try {
+                        const data = JSON.parse(line);
+                        if (data.status === "success") {
+                            onProgress?.({ status: "success", percent: 100 });
+                            resolve();
+                            return;
+                        }
+                        if (data.total && data.completed) {
+                            const percent = Math.round((data.completed / data.total) * 100);
+                            onProgress?.({ status: "downloading", total: data.total, completed: data.completed, percent });
+                        }
+                        else {
+                            onProgress?.({ status: data.status || "working...", percent: 0 });
+                        }
+                    }
+                    catch { }
+                }
+            }
+            resolve();
+        }
+        catch (err) {
+            reject(err);
+        }
+    });
+}
+function pullModelViaCLI(modelId, onProgress) {
     return new Promise((resolve, reject) => {
-        const child = spawn("ollama", ["pull", modelId], {
+        const bin = findOllamaBinary();
+        const child = spawn(bin, ["pull", modelId], {
             stdio: ["pipe", "pipe", "pipe"],
         });
         let lastOutput = "";
@@ -150,7 +248,9 @@ export async function stopOllama() {
     try {
         // First unload all models from memory
         try {
-            execSync("ollama stop", { stdio: ["pipe", "pipe", "pipe"], timeout: 5000 });
+            const bin = findOllamaBinary();
+            const { spawnSync } = require("child_process");
+            spawnSync(bin, ["stop"], { stdio: "pipe", timeout: 5000 });
         }
         catch { /* may fail if no models loaded */ }
         // Kill the server process

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemaxxing",
-  "version": "0.4.9",
+  "version": "0.4.11",
   "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 */
@@ -50,9 +72,26 @@ export function getOllamaInstallCommand(os: "macos" | "linux" | "windows"): stri
   }
 }
 
+/** Find the ollama binary path */
+function findOllamaBinary(): string {
+  // Try PATH first
+  try {
+    const cmd = process.platform === "win32" ? "where ollama" : "which ollama";
+    return execSync(cmd, { stdio: ["pipe", "pipe", "pipe"], timeout: 3000 }).toString().trim().split("\n")[0];
+  } catch {}
+  // Check known Windows paths
+  if (process.platform === "win32") {
+    for (const p of getWindowsOllamaPaths()) {
+      if (existsSync(p)) return p;
+    }
+  }
+  return "ollama"; // fallback, hope for the best
+}
+
 /** Start ollama serve in background */
 export function startOllama(): void {
-  const child = spawn("ollama", ["serve"], {
+  const bin = findOllamaBinary();
+  const child = spawn(bin, ["serve"], {
     detached: true,
     stdio: "ignore",
   });
@@ -67,16 +106,77 @@ export interface PullProgress {
 }
 
 /**
- * Pull a model from Ollama registry.
+ * Pull a model from Ollama registry via HTTP API.
+ * Falls back to CLI if API fails.
  * Calls onProgress with download updates.
- * Returns a promise that resolves when complete.
  */
 export function pullModel(
   modelId: string,
   onProgress?: (progress: PullProgress) => void
+): Promise<void> {
+  // Try HTTP API first (works even when CLI isn't on PATH)
+  return pullModelViaAPI(modelId, onProgress).catch(() => {
+    // Fallback to CLI
+    return pullModelViaCLI(modelId, onProgress);
+  });
+}
+
+function pullModelViaAPI(
+  modelId: string,
+  onProgress?: (progress: PullProgress) => void
+): Promise<void> {
+  return new Promise(async (resolve, reject) => {
+    try {
+      const res = await fetch("http://localhost:11434/api/pull", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ name: modelId, stream: true }),
+      });
+      if (!res.ok || !res.body) {
+        reject(new Error(`Ollama API returned ${res.status}`));
+        return;
+      }
+      const reader = res.body.getReader();
+      const decoder = new TextDecoder();
+      let buffer = "";
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        buffer += decoder.decode(value, { stream: true });
+        const lines = buffer.split("\n");
+        buffer = lines.pop() || "";
+        for (const line of lines) {
+          if (!line.trim()) continue;
+          try {
+            const data = JSON.parse(line);
+            if (data.status === "success") {
+              onProgress?.({ status: "success", percent: 100 });
+              resolve();
+              return;
+            }
+            if (data.total && data.completed) {
+              const percent = Math.round((data.completed / data.total) * 100);
+              onProgress?.({ status: "downloading", total: data.total, completed: data.completed, percent });
+            } else {
+              onProgress?.({ status: data.status || "working...", percent: 0 });
+            }
+          } catch {}
+        }
+      }
+      resolve();
+    } catch (err: any) {
+      reject(err);
+    }
+  });
+}
+
+function pullModelViaCLI(
+  modelId: string,
+  onProgress?: (progress: PullProgress) => void
 ): Promise<void> {
   return new Promise((resolve, reject) => {
-    const child = spawn("ollama", ["pull", modelId], {
+    const bin = findOllamaBinary();
+    const child = spawn(bin, ["pull", modelId], {
       stdio: ["pipe", "pipe", "pipe"],
     });
 
@@ -176,7 +276,9 @@ export async function stopOllama(): Promise<{ ok: boolean; message: string }> {
   try {
     // First unload all models from memory
     try {
-      execSync("ollama stop", { stdio: ["pipe", "pipe", "pipe"], timeout: 5000 });
+      const bin = findOllamaBinary();
+      const { spawnSync } = require("child_process");
+      spawnSync(bin, ["stop"], { stdio: "pipe", timeout: 5000 });
     } catch { /* may fail if no models loaded */ }
 
     // Kill the server process