@emend-ai/utim 1.43.7 → 1.43.10

package/bin/utim.js

@@ -2,39 +2,37 @@
 
 /**
  * UTIM CLI Launcher
- * 
- * Designed for zero-friction UX: the user runs `utim` and it just works.
- * If the Python engine isn't installed yet, this script installs it silently
- * with a spinner before launching — no extra commands needed.
+ *
+ * Zero-friction UX: `npm install -g @emend-ai/utim` then just run `utim`.
+ * Automatically installs the Python engine on first run if needed.
  */
 
-const { spawnSync, spawn, execFileSync } = require('child_process');
-const os = require('os');
-const fs = require('fs');
+const { spawnSync, spawn } = require('child_process');
+const os   = require('os');
+const fs   = require('fs');
 
-const args = process.argv.slice(2);
-const isWin = os.platform() === 'win32';
-const isMac = os.platform() === 'darwin';
+const args     = process.argv.slice(2);
+const isWin    = os.platform() === 'win32';
+const isMac    = os.platform() === 'darwin';
 const isTermux =
     (process.env.PREFIX && process.env.PREFIX.includes('com.termux')) ||
     fs.existsSync('/data/data/com.termux');
 
-// ── Spinner ───────────────────────────────────────────────────────────────────
+// ── Spinner (no-op when not a TTY) ───────────────────────────────────────────
 function createSpinner(text) {
     const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
     let i = 0;
-    // Only show spinner if stdout is a TTY (not piped)
-    if (!process.stdout.isTTY) {
+    if (!process.stderr.isTTY) {
         process.stderr.write(text + '\n');
         return { stop: (msg) => { if (msg) process.stderr.write(msg + '\n'); } };
     }
     const iv = setInterval(() => {
-        process.stderr.write(`\r${frames[i++ % frames.length]}  ${text}`);
+        process.stderr.write(`\r${frames[i++ % frames.length]}  ${text}  `);
     }, 80);
     return {
         stop: (msg) => {
             clearInterval(iv);
-            process.stderr.write('\r' + ' '.repeat(text.length + 4) + '\r');
+            process.stderr.write('\r' + ' '.repeat(text.length + 6) + '\r');
             if (msg) process.stderr.write(msg + '\n');
         }
     };
@@ -42,64 +40,97 @@ function createSpinner(text) {
 
 // ── Find a working Python 3 interpreter ──────────────────────────────────────
 function findPython() {
-    const candidates = isWin ? ['python', 'python3', 'py'] : ['python3', 'python'];
-    for (const candidate of candidates) {
+    const candidates = isWin
+        ? ['python', 'python3', 'py']
+        : ['python3', 'python'];
+
+    for (const cmd of candidates) {
         try {
-            const r = spawnSync(candidate, ['--version'], {
+            const r = spawnSync(cmd, ['--version'], {
                 encoding: 'utf8',
-                timeout: 4000,
+                timeout: 5000,
                 shell: isWin,
                 windowsHide: true,
             });
             const out = (r.stdout || '') + (r.stderr || '');
-            if (out.includes('Python 3')) return candidate;
+            if (out.includes('Python 3')) return cmd;
         } catch (_) {}
     }
     return null;
 }
 
-// ── Check if utim_cli Python package is importable ───────────────────────────
+// ── Check if utim-cli is installed via pip show (does NOT import the module) ─
+// Using pip show avoids false negatives caused by broken/missing transitive deps.
 function isUtimInstalled(python) {
     try {
-        const r = spawnSync(python, ['-c', 'import utim_cli'], {
-            timeout: 5000,
+        const r = spawnSync(python, ['-m', 'pip', 'show', 'utim-cli'], {
+            encoding: 'utf8',
+            timeout: 10000,
             shell: isWin,
             windowsHide: true,
         });
+        return r.status === 0 && (r.stdout || '').includes('Name:');
+    } catch (_) {
+        return false;
+    }
+}
+
+// ── Run pip install with given extra flags — always show output ───────────────
+function runPip(python, extraFlags) {
+    try {
+        const r = spawnSync(
+            python,
+            ['-m', 'pip', 'install', '--upgrade', ...extraFlags, 'utim-cli'],
+            {
+                stdio: 'inherit',   // Always show output so errors are visible
+                shell: isWin,
+                windowsHide: false,
+                timeout: 300000,
+            }
+        );
         return r.status === 0;
     } catch (_) {
         return false;
     }
 }
 
-// ── Install UTIM engine from PyPI with a spinner ──────────────────────────────
+// ── Install UTIM engine — tries multiple strategies ───────────────────────────
 function installEngine(python) {
-    const spinner = createSpinner('Setting up UTIM (first run)...');
-
-    // On Termux: prebuilt packages must exist before pydantic-core compiles
+    // Termux: install prebuilt system packages first to skip pydantic-core compilation
     if (isTermux) {
-        spinner.stop();
         process.stderr.write(
-            '\n💡 Termux detected — installing prebuilt dependencies first...\n' +
-            '   (This is needed to avoid pydantic-core compilation errors)\n\n'
+            '\n💡 Termux: installing prebuilt system dependencies first...\n\n'
         );
         spawnSync('pkg', ['install', '-y', 'python-cryptography', 'python-pydantic'], {
             stdio: 'inherit',
             shell: false,
         });
+        spawnSync(python, ['-m', 'pip', 'install', '--upgrade', 'pip', 'setuptools', 'wheel'], {
+            stdio: 'pipe',
+            shell: false,
+            timeout: 60000,
+        });
     }
 
-    const pipArgs = ['-m', 'pip', 'install', '--upgrade', '--quiet', 'utim-cli'];
-    const result = spawnSync(python, pipArgs, {
-        stdio: isTermux ? 'inherit' : 'pipe',
-        shell: isWin,
-        windowsHide: true,
-        timeout: 300000, // 5 min max
-    });
+    const spinner = createSpinner('Setting up UTIM (first run)');
+    spinner.stop('\n⚙  Installing UTIM Python engine...\n');
 
-    if (!isTermux) spinner.stop();
+    // Strategy 1: standard install
+    if (runPip(python, [])) return true;
 
-    return result.status === 0;
+    // Strategy 2: --user (needed on systems where global site-packages is read-only)
+    process.stderr.write('\n   Retrying with --user flag...\n\n');
+    if (runPip(python, ['--user'])) return true;
+
+    // Strategy 3: upgrade pip first, then retry both
+    process.stderr.write('\n   Upgrading pip and retrying...\n\n');
+    spawnSync(python, ['-m', 'pip', 'install', '--upgrade', 'pip'], {
+        stdio: 'pipe', shell: isWin, windowsHide: true, timeout: 60000,
+    });
+    if (runPip(python, [])) return true;
+    if (runPip(python, ['--user'])) return true;
+
+    return false;
 }
 
 // ── Launch UTIM Python engine ─────────────────────────────────────────────────
@@ -111,57 +142,70 @@ function launch(python) {
     });
     proc.on('exit', (code) => process.exit(code == null ? 0 : code));
     proc.on('error', (err) => {
-        process.stderr.write(`\nFailed to start UTIM: ${err.message}\n`);
+        process.stderr.write(
+            `\n❌  Could not start UTIM: ${err.message}\n\n` +
+            'Try reinstalling:\n' +
+            `  ${python} -m pip install --upgrade utim-cli\n\n`
+        );
         process.exit(1);
     });
 }
 
-// ── Error: Python not found ───────────────────────────────────────────────────
+// ── Friendly "Python not found" message ──────────────────────────────────────
 function noPythonError() {
-    process.stderr.write('\n❌  Python 3 was not found on this system.\n\n');
+    process.stderr.write('\n❌  Python 3 is required but was not found.\n\n');
     if (isTermux) {
-        process.stderr.write(
-            '💡 Termux: run  pkg install python  then try  utim  again.\n'
-        );
+        process.stderr.write('Run:  pkg install python\nThen:  utim\n\n');
     } else if (isMac) {
         process.stderr.write(
-            'Install Python via Homebrew:  brew install python\n' +
-            'or download from:             https://python.org\n'
+            'Install:  brew install python\n' +
+            'Or:       https://python.org\n' +
+            'Then:     utim\n\n'
         );
     } else if (isWin) {
         process.stderr.write(
-            'Download Python from https://python.org\n' +
-            'Make sure to check "Add Python to PATH" during installation.\n'
+            'Download from https://python.org\n' +
+            '✔ Check "Add Python to PATH" during setup.\n' +
+            'Then:  utim\n\n'
         );
     } else {
         process.stderr.write(
-            'Install Python 3.9+ via your package manager, e.g.:\n' +
-            '  sudo apt install python3 python3-pip\n'
+            'sudo apt install python3 python3-pip   # Debian/Ubuntu\n' +
+            'sudo dnf install python3               # Fedora/RHEL\n' +
+            'Then:  utim\n\n'
         );
     }
-    process.stderr.write('\nThen run  utim  again — no extra steps required.\n\n');
     process.exit(1);
 }
 
 // ── Main ─────────────────────────────────────────────────────────────────────
 const python = findPython();
-
-if (!python) {
-    noPythonError();
-}
+if (!python) noPythonError();
 
 if (!isUtimInstalled(python)) {
-    const ok = installEngine(python);
-    if (!ok || !isUtimInstalled(python)) {
-        process.stderr.write(
-            '\n❌  Failed to install UTIM Python engine automatically.\n\n' +
-            'Please run manually:\n' +
-            `  ${python} -m pip install utim-cli\n\n` +
-            'Then run  utim  again.\n\n'
-        );
-        process.exit(1);
+    const pipOk = installEngine(python);
+
+    if (!isUtimInstalled(python)) {
+        if (pipOk) {
+            // pip said success but `pip show` still doesn't see it —
+            // environment mismatch (e.g. multiple Python installs).
+            // Attempt launch anyway; Python's own error will be informative.
+            process.stderr.write(
+                '\n⚠  Installed but could not verify — launching anyway...\n\n'
+            );
+        } else {
+            // pip failed — output was already shown above by inherit stdio
+            process.stderr.write(
+                '\n❌  Automatic installation failed (see pip errors above).\n\n' +
+                'Common fixes:\n' +
+                `  ${python} -m pip install --user utim-cli\n` +
+                '  python -m pip install --upgrade pip && pip install utim-cli\n\n' +
+                'Then run:  utim\n\n'
+            );
+            process.exit(1);
+        }
     }
 }
 
-// Engine is confirmed installed — launch it
+// Launch — even if verification was uncertain, let Python report a real error
 launch(python);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emend-ai/utim",
-  "version": "1.43.7",
+  "version": "1.43.10",
   "description": "UTIM – Universal Terminal Intelligence Manager. An agentic AI coding assistant for your terminal.",
   "keywords": [
     "ai",