codemaxxing 0.4.7 → 0.4.8

package/dist/index.js

@@ -1465,34 +1465,40 @@ function App() {
                 if (key.return) {
                     // Auto-install Ollama if not present
                     if (!isOllamaInstalled()) {
-                        addMsg("info", "📦 Installing Ollama... (this may take a minute)");
+                        setWizardPullProgress({ status: "Installing Ollama...", percent: 0 });
+                        setWizardScreen("pulling");
+                        // Run install async so the UI can update
                         const installCmd = getOllamaInstallCommand(wizardHardware?.os ?? "linux");
-                        try {
-                            // Use pipe instead of inherit — Ink TUI conflicts with inherit stdio
-                            const parts = installCmd.split(" ");
-                            const result = _require("child_process").spawnSync(parts[0], parts.slice(1), {
-                                stdio: "pipe",
-                                timeout: 180000,
-                                shell: true,
-                                encoding: "utf-8",
-                            });
-                            if (result.status === 0) {
-                                addMsg("info", "✅ Ollama installed!");
+                        (async () => {
+                            try {
+                                const { execFile } = _require("child_process");
+                                const parts = installCmd.split(" ");
+                                await new Promise((resolve, reject) => {
+                                    execFile(parts[0], parts.slice(1), { shell: true, timeout: 180000 }, (err, _stdout, stderr) => {
+                                        if (err)
+                                            reject(new Error(stderr || err.message));
+                                        else
+                                            resolve();
+                                    });
+                                });
+                                addMsg("info", "✅ Ollama installed! Proceeding to model download...");
+                                // 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);
                             }
-                            else {
-                                const errMsg = (result.stderr || result.stdout || "").trim().split("\n").pop() || "Unknown error";
-                                addMsg("error", `Install failed: ${errMsg}`);
+                            catch (e) {
+                                addMsg("error", `Install failed: ${e.message}`);
                                 addMsg("info", `Try manually in a separate terminal: ${installCmd}`);
-                                return;
+                                setWizardScreen("install-ollama");
+                                setWizardPullProgress(null);
                             }
-                        }
-                        catch (e) {
-                            addMsg("error", `Install failed: ${e.message}`);
-                            addMsg("info", `Try manually in a separate terminal: ${installCmd}`);
-                            return;
-                        }
+                        })();
+                        return;
                     }
-                    if (isOllamaInstalled()) {
+                    // Ollama already installed — proceed to pull
+                    {
                         const selected = wizardSelectedModel;
                         if (selected) {
                             setWizardScreen("pulling");
@@ -1820,7 +1826,7 @@ function App() {
                         { key: "openrouter", icon: "\uD83C\uDF10", label: "OpenRouter", desc: "200+ cloud models, browser login" },
                         { key: "apikey", icon: "\uD83D\uDD11", label: "Enter API key manually", desc: "" },
                         { key: "existing", icon: "\u2699\uFE0F", label: "I already have a server running", desc: "" },
-                    ].map((item, i) => (_jsxs(Text, { children: [i === wizardIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "  \u25B8 " }) : _jsx(Text, { children: "    " }), _jsxs(Text, { color: i === wizardIndex ? theme.colors.suggestion : theme.colors.primary, bold: true, children: [item.icon, "  ", item.label] }), item.desc ? _jsxs(Text, { color: theme.colors.muted, children: [" (", item.desc, ")"] }) : null] }, item.key))), _jsx(Text, { children: "" }), _jsx(Text, { dimColor: true, children: "  \u2191\u2193 navigate \u00B7 Enter to select" })] })), wizardScreen === "models" && wizardHardware && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.border, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.secondary, children: "Your hardware:" }), _jsxs(Text, { color: theme.colors.muted, children: ["  CPU: ", wizardHardware.cpu.name, " (", wizardHardware.cpu.cores, " cores)"] }), _jsxs(Text, { color: theme.colors.muted, children: ["  RAM: ", formatBytes(wizardHardware.ram)] }), wizardHardware.gpu ? (_jsxs(Text, { color: theme.colors.muted, children: ["  GPU: ", wizardHardware.gpu.name, wizardHardware.gpu.vram > 0 ? ` (${formatBytes(wizardHardware.gpu.vram)})` : ""] })) : (_jsx(Text, { color: theme.colors.muted, children: "  GPU: none detected" })), !isLlmfitAvailable() && (_jsx(Text, { dimColor: true, children: "  Tip: Install llmfit for smarter recommendations: brew install llmfit" })), _jsx(Text, { children: "" }), _jsx(Text, { bold: true, color: theme.colors.secondary, children: "Recommended models:" }), _jsx(Text, { children: "" }), wizardModels.map((m, i) => (_jsxs(Text, { children: [i === wizardIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "  \u25B8 " }) : _jsx(Text, { children: "    " }), _jsxs(Text, { children: [getFitIcon(m.fit), " "] }), _jsx(Text, { color: i === wizardIndex ? theme.colors.suggestion : theme.colors.primary, bold: true, children: m.name }), _jsxs(Text, { color: theme.colors.muted, children: ["     ~", m.size, " GB \u00B7 ", m.quality === "best" ? "Best" : m.quality === "great" ? "Great" : "Good", " quality \u00B7 ", m.speed] })] }, m.ollamaId))), wizardModels.length === 0 && (_jsx(Text, { color: theme.colors.error, children: "  No suitable models found for your hardware." })), _jsx(Text, { children: "" }), _jsx(Text, { dimColor: true, children: "  \u2191\u2193 navigate \u00B7 Enter to install \u00B7 Esc back" })] })), wizardScreen === "install-ollama" && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.warning, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.warning, children: "Ollama is required for local models." }), _jsx(Text, { children: "" }), _jsx(Text, { color: theme.colors.primary, children: "  Press Enter to install Ollama automatically" }), _jsxs(Text, { dimColor: true, children: ["  Or install manually: ", _jsx(Text, { children: getOllamaInstallCommand(wizardHardware?.os ?? "linux") })] }), _jsx(Text, { children: "" }), _jsx(Text, { dimColor: true, children: "  Enter to install · Esc to go back" })] })), wizardScreen === "pulling" && wizardSelectedModel && (_jsx(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.border, paddingX: 1, marginBottom: 0, children: wizardPullError ? (_jsxs(_Fragment, { children: [_jsxs(Text, { color: theme.colors.error, bold: true, children: ["  \u274C Error: ", wizardPullError] }), _jsx(Text, { children: "" }), _jsx(Text, { dimColor: true, children: "  Press Enter to retry \u00B7 Esc to go back" })] })) : wizardPullProgress ? (_jsxs(_Fragment, { children: [_jsxs(Text, { bold: true, color: theme.colors.secondary, children: ["  Downloading ", wizardSelectedModel.name, "..."] }), wizardPullProgress.status === "downloading" || wizardPullProgress.percent > 0 ? (_jsx(_Fragment, { children: _jsxs(Text, { children: ["  ", _jsxs(Text, { color: theme.colors.primary, children: ["\u2588".repeat(Math.floor(wizardPullProgress.percent / 5)), "\u2591".repeat(20 - Math.floor(wizardPullProgress.percent / 5))] }), "  ", _jsxs(Text, { bold: true, children: [wizardPullProgress.percent, "%"] }), wizardPullProgress.completed != null && wizardPullProgress.total != null ? (_jsxs(Text, { color: theme.colors.muted, children: [" \u00B7 ", formatBytes(wizardPullProgress.completed), " / ", formatBytes(wizardPullProgress.total)] })) : null] }) })) : (_jsxs(Text, { color: theme.colors.muted, children: ["  ", wizardPullProgress.status, "..."] }))] })) : null })), showSuggestions && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.muted, paddingX: 1, marginBottom: 0, children: [cmdMatches.slice(0, 6).map((c, i) => (_jsxs(Text, { children: [i === cmdIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "▸ " }) : _jsx(Text, { children: "  " }), _jsx(Text, { color: i === cmdIndex ? theme.colors.suggestion : theme.colors.primary, bold: true, children: c.cmd }), _jsxs(Text, { color: theme.colors.muted, children: [" — ", c.desc] })] }, i))), _jsx(Text, { dimColor: true, children: "  ↑↓ navigate · Tab select" })] })), _jsxs(Box, { borderStyle: "single", borderColor: approval ? theme.colors.warning : theme.colors.border, paddingX: 1, children: [_jsx(Text, { color: theme.colors.secondary, bold: true, children: "> " }), approval ? (_jsx(Text, { color: theme.colors.warning, children: "waiting for approval..." })) : ready && !loading && !wizardScreen ? (_jsxs(Box, { children: [pastedChunks.map((p) => (_jsxs(Text, { color: theme.colors.muted, children: ["[Pasted text #", p.id, " +", p.lines, " lines]"] }, p.id))), _jsx(TextInput, { value: input, onChange: (v) => { setInput(v); setCmdIndex(0); }, onSubmit: handleSubmit }, inputKey)] })) : (_jsx(Text, { dimColor: true, children: loading ? "waiting for response..." : "initializing..." }))] }), agent && (_jsx(Box, { paddingX: 2, children: _jsxs(Text, { dimColor: true, children: ["💬 ", agent.getContextLength(), " messages · ~", (() => {
+                    ].map((item, i) => (_jsxs(Text, { children: [i === wizardIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "  \u25B8 " }) : _jsx(Text, { children: "    " }), _jsxs(Text, { color: i === wizardIndex ? theme.colors.suggestion : theme.colors.primary, bold: true, children: [item.icon, "  ", item.label] }), item.desc ? _jsxs(Text, { color: theme.colors.muted, children: [" (", item.desc, ")"] }) : null] }, item.key))), _jsx(Text, { children: "" }), _jsx(Text, { dimColor: true, children: "  \u2191\u2193 navigate \u00B7 Enter to select" })] })), wizardScreen === "models" && wizardHardware && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.border, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.secondary, children: "Your hardware:" }), _jsxs(Text, { color: theme.colors.muted, children: ["  CPU: ", wizardHardware.cpu.name, " (", wizardHardware.cpu.cores, " cores)"] }), _jsxs(Text, { color: theme.colors.muted, children: ["  RAM: ", formatBytes(wizardHardware.ram)] }), wizardHardware.gpu ? (_jsxs(Text, { color: theme.colors.muted, children: ["  GPU: ", wizardHardware.gpu.name, wizardHardware.gpu.vram > 0 ? ` (${formatBytes(wizardHardware.gpu.vram)})` : ""] })) : (_jsx(Text, { color: theme.colors.muted, children: "  GPU: none detected" })), !isLlmfitAvailable() && (_jsx(Text, { dimColor: true, children: "  Tip: Install llmfit for smarter recommendations: brew install llmfit" })), _jsx(Text, { children: "" }), _jsx(Text, { bold: true, color: theme.colors.secondary, children: "Recommended models:" }), _jsx(Text, { children: "" }), wizardModels.map((m, i) => (_jsxs(Text, { children: [i === wizardIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "  \u25B8 " }) : _jsx(Text, { children: "    " }), _jsxs(Text, { children: [getFitIcon(m.fit), " "] }), _jsx(Text, { color: i === wizardIndex ? theme.colors.suggestion : theme.colors.primary, bold: true, children: m.name }), _jsxs(Text, { color: theme.colors.muted, children: ["     ~", m.size, " GB \u00B7 ", m.quality === "best" ? "Best" : m.quality === "great" ? "Great" : "Good", " quality \u00B7 ", m.speed] })] }, m.ollamaId))), wizardModels.length === 0 && (_jsx(Text, { color: theme.colors.error, children: "  No suitable models found for your hardware." })), _jsx(Text, { children: "" }), _jsx(Text, { dimColor: true, children: "  \u2191\u2193 navigate \u00B7 Enter to install \u00B7 Esc back" })] })), wizardScreen === "install-ollama" && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.warning, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.warning, children: "Ollama is required for local models." }), _jsx(Text, { children: "" }), _jsx(Text, { color: theme.colors.primary, children: "  Press Enter to install Ollama automatically" }), _jsxs(Text, { dimColor: true, children: ["  Or install manually: ", _jsx(Text, { children: getOllamaInstallCommand(wizardHardware?.os ?? "linux") })] }), _jsx(Text, { children: "" }), _jsx(Text, { dimColor: true, children: "  Enter to install · Esc to go back" })] })), wizardScreen === "pulling" && (wizardSelectedModel || wizardPullProgress) && (_jsx(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.border, paddingX: 1, marginBottom: 0, children: wizardPullError ? (_jsxs(_Fragment, { children: [_jsxs(Text, { color: theme.colors.error, bold: true, children: ["  \u274C Error: ", wizardPullError] }), _jsx(Text, { children: "" }), _jsx(Text, { dimColor: true, children: "  Press Enter to retry \u00B7 Esc to go back" })] })) : wizardPullProgress ? (_jsxs(_Fragment, { children: [_jsxs(Text, { bold: true, color: theme.colors.secondary, children: ["  ", wizardSelectedModel ? `Downloading ${wizardSelectedModel.name}...` : wizardPullProgress?.status || "Working..."] }), wizardPullProgress.status === "downloading" || wizardPullProgress.percent > 0 ? (_jsx(_Fragment, { children: _jsxs(Text, { children: ["  ", _jsxs(Text, { color: theme.colors.primary, children: ["\u2588".repeat(Math.floor(wizardPullProgress.percent / 5)), "\u2591".repeat(20 - Math.floor(wizardPullProgress.percent / 5))] }), "  ", _jsxs(Text, { bold: true, children: [wizardPullProgress.percent, "%"] }), wizardPullProgress.completed != null && wizardPullProgress.total != null ? (_jsxs(Text, { color: theme.colors.muted, children: [" \u00B7 ", formatBytes(wizardPullProgress.completed), " / ", formatBytes(wizardPullProgress.total)] })) : null] }) })) : (_jsxs(Text, { color: theme.colors.muted, children: ["  ", wizardPullProgress.status, "..."] }))] })) : null })), showSuggestions && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.muted, paddingX: 1, marginBottom: 0, children: [cmdMatches.slice(0, 6).map((c, i) => (_jsxs(Text, { children: [i === cmdIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "▸ " }) : _jsx(Text, { children: "  " }), _jsx(Text, { color: i === cmdIndex ? theme.colors.suggestion : theme.colors.primary, bold: true, children: c.cmd }), _jsxs(Text, { color: theme.colors.muted, children: [" — ", c.desc] })] }, i))), _jsx(Text, { dimColor: true, children: "  ↑↓ navigate · Tab select" })] })), _jsxs(Box, { borderStyle: "single", borderColor: approval ? theme.colors.warning : theme.colors.border, paddingX: 1, children: [_jsx(Text, { color: theme.colors.secondary, bold: true, children: "> " }), approval ? (_jsx(Text, { color: theme.colors.warning, children: "waiting for approval..." })) : ready && !loading && !wizardScreen ? (_jsxs(Box, { children: [pastedChunks.map((p) => (_jsxs(Text, { color: theme.colors.muted, children: ["[Pasted text #", p.id, " +", p.lines, " lines]"] }, p.id))), _jsx(TextInput, { value: input, onChange: (v) => { setInput(v); setCmdIndex(0); }, onSubmit: handleSubmit }, inputKey)] })) : (_jsx(Text, { dimColor: true, children: loading ? "waiting for response..." : "initializing..." }))] }), agent && (_jsx(Box, { paddingX: 2, children: _jsxs(Text, { dimColor: true, children: ["💬 ", agent.getContextLength(), " messages · ~", (() => {
                             const tokens = agent.estimateTokens();
                             return tokens >= 1000 ? `${(tokens / 1000).toFixed(1)}k` : String(tokens);
                         })(), " tokens", (() => {

package/package.json

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

package/src/index.tsx

@@ -1489,32 +1489,38 @@ function App() {
         if (key.return) {
           // Auto-install Ollama if not present
           if (!isOllamaInstalled()) {
-            addMsg("info", "📦 Installing Ollama... (this may take a minute)");
+            setWizardPullProgress({ status: "Installing Ollama...", percent: 0 });
+            setWizardScreen("pulling");
+
+            // Run install async so the UI can update
             const installCmd = getOllamaInstallCommand(wizardHardware?.os ?? "linux");
-            try {
-              // Use pipe instead of inherit — Ink TUI conflicts with inherit stdio
-              const parts = installCmd.split(" ");
-              const result = _require("child_process").spawnSync(parts[0], parts.slice(1), {
-                stdio: "pipe",
-                timeout: 180000,
-                shell: true,
-                encoding: "utf-8",
-              });
-              if (result.status === 0) {
-                addMsg("info", "✅ Ollama installed!");
-              } else {
-                const errMsg = (result.stderr || result.stdout || "").trim().split("\n").pop() || "Unknown error";
-                addMsg("error", `Install failed: ${errMsg}`);
+            (async () => {
+              try {
+                const { execFile } = _require("child_process");
+                const parts = installCmd.split(" ");
+                await new Promise<void>((resolve, reject) => {
+                  execFile(parts[0], parts.slice(1), { shell: true, 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...");
+                // 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}`);
-                return;
+                setWizardScreen("install-ollama");
+                setWizardPullProgress(null);
               }
-            } catch (e: any) {
-              addMsg("error", `Install failed: ${e.message}`);
-              addMsg("info", `Try manually in a separate terminal: ${installCmd}`);
-              return;
-            }
+            })();
+            return;
           }
-          if (isOllamaInstalled()) {
+          // Ollama already installed — proceed to pull
+          {
             const selected = wizardSelectedModel;
             if (selected) {
               setWizardScreen("pulling");
@@ -2178,7 +2184,7 @@ function App() {
         </Box>
       )}
 
-      {wizardScreen === "pulling" && wizardSelectedModel && (
+      {wizardScreen === "pulling" && (wizardSelectedModel || wizardPullProgress) && (
         <Box flexDirection="column" borderStyle="single" borderColor={theme.colors.border} paddingX={1} marginBottom={0}>
           {wizardPullError ? (
             <>
@@ -2188,7 +2194,7 @@ function App() {
             </>
           ) : wizardPullProgress ? (
             <>
-              <Text bold color={theme.colors.secondary}>{"  Downloading "}{wizardSelectedModel.name}{"..."}</Text>
+              <Text bold color={theme.colors.secondary}>{"  "}{wizardSelectedModel ? `Downloading ${wizardSelectedModel.name}...` : wizardPullProgress?.status || "Working..."}</Text>
               {wizardPullProgress.status === "downloading" || wizardPullProgress.percent > 0 ? (
                 <>
                   <Text>