@emend-ai/utim 1.43.5 → 1.43.7

package/bin/utim.js

@@ -1,18 +1,56 @@
 #!/usr/bin/env node
 
-const { spawnSync, spawn } = require('child_process');
-const path = require('path');
+/**
+ * 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.
+ */
+
+const { spawnSync, spawn, execFileSync } = require('child_process');
 const os = require('os');
 const fs = require('fs');
 
 const args = process.argv.slice(2);
-const useShell = os.platform() === 'win32';
+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 ───────────────────────────────────────────────────────────────────
+function createSpinner(text) {
+    const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+    let i = 0;
+    // Only show spinner if stdout is a TTY (not piped)
+    if (!process.stdout.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}`);
+    }, 80);
+    return {
+        stop: (msg) => {
+            clearInterval(iv);
+            process.stderr.write('\r' + ' '.repeat(text.length + 4) + '\r');
+            if (msg) process.stderr.write(msg + '\n');
+        }
+    };
+}
 
 // ── Find a working Python 3 interpreter ──────────────────────────────────────
 function findPython() {
-    for (const candidate of ['python3', 'python']) {
+    const candidates = isWin ? ['python', 'python3', 'py'] : ['python3', 'python'];
+    for (const candidate of candidates) {
         try {
-            const r = spawnSync(candidate, ['--version'], { encoding: 'utf8', timeout: 3000, shell: useShell });
+            const r = spawnSync(candidate, ['--version'], {
+                encoding: 'utf8',
+                timeout: 4000,
+                shell: isWin,
+                windowsHide: true,
+            });
             const out = (r.stdout || '') + (r.stderr || '');
             if (out.includes('Python 3')) return candidate;
         } catch (_) {}
@@ -20,73 +58,110 @@ function findPython() {
     return null;
 }
 
-// ── Attempt to launch a command, return true if successful ───────────────────
-function tryLaunch(cmd, launchArgs) {
+// ── Check if utim_cli Python package is importable ───────────────────────────
+function isUtimInstalled(python) {
     try {
-        const probe = spawnSync(cmd, ['--version'], { shell: useShell, timeout: 3000, encoding: 'utf8' });
-        const out = (probe.stdout || '') + (probe.stderr || '');
-        // accept if exit 0 OR if it printed something (some tools exit non-0 for --version)
-        if (probe.status === 0 || out.length > 0) {
-            const proc = spawn(cmd, launchArgs, { stdio: 'inherit', shell: useShell });
-            proc.on('exit', (code) => process.exit(code == null ? 0 : code));
-            return true;
-        }
-    } catch (_) {}
-    return false;
+        const r = spawnSync(python, ['-c', 'import utim_cli'], {
+            timeout: 5000,
+            shell: isWin,
+            windowsHide: true,
+        });
+        return r.status === 0;
+    } catch (_) {
+        return false;
+    }
 }
 
-// ── Try the installed console_script entry point ──────────────────────────────
-function tryEntryPoint() {
-    return tryLaunch('utim-agent-core', args);
-}
+// ── Install UTIM engine from PyPI with a spinner ──────────────────────────────
+function installEngine(python) {
+    const spinner = createSpinner('Setting up UTIM (first run)...');
 
-// ── Try via `python -m utim_cli.utim` ───────────────────────────────────────
-function tryModule(python) {
-    try {
-        const probe = spawnSync(python, ['-m', 'utim_cli', '--help'], { shell: useShell, timeout: 5000 });
-        if (probe.status === 0) {
-            const proc = spawn(python, ['-m', 'utim_cli.utim', ...args], { stdio: 'inherit', shell: useShell });
-            proc.on('exit', (code) => process.exit(code == null ? 0 : code));
-            return true;
-        }
-    } catch (_) {}
-    return false;
+    // On Termux: prebuilt packages must exist before pydantic-core compiles
+    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'
+        );
+        spawnSync('pkg', ['install', '-y', 'python-cryptography', 'python-pydantic'], {
+            stdio: 'inherit',
+            shell: false,
+        });
+    }
+
+    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
+    });
+
+    if (!isTermux) spinner.stop();
+
+    return result.status === 0;
 }
 
-// ── Last resort: install from PyPI and retry ─────────────────────────────────
-function selfInstallAndRun(python) {
-    console.error('\n⚙  First run: installing UTIM Python engine from PyPI...');
-    const install = spawnSync(python, ['-m', 'pip', 'install', '--upgrade', 'utim-cli'], {
+// ── Launch UTIM Python engine ─────────────────────────────────────────────────
+function launch(python) {
+    const proc = spawn(python, ['-m', 'utim_cli.utim', ...args], {
         stdio: 'inherit',
-        shell: useShell,
+        shell: false,
+        windowsHide: false,
     });
-    if (install.status === 0) {
-        // Retry the entry point after install
-        return tryEntryPoint() || tryModule(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.exit(1);
+    });
+}
+
+// ── Error: Python not found ───────────────────────────────────────────────────
+function noPythonError() {
+    process.stderr.write('\n❌  Python 3 was not found on this system.\n\n');
+    if (isTermux) {
+        process.stderr.write(
+            '💡 Termux: run  pkg install python  then try  utim  again.\n'
+        );
+    } else if (isMac) {
+        process.stderr.write(
+            'Install Python via Homebrew:  brew install python\n' +
+            'or download from:             https://python.org\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'
+        );
+    } else {
+        process.stderr.write(
+            'Install Python 3.9+ via your package manager, e.g.:\n' +
+            '  sudo apt install python3 python3-pip\n'
+        );
     }
-    return false;
+    process.stderr.write('\nThen run  utim  again — no extra steps required.\n\n');
+    process.exit(1);
 }
 
 // ── Main ─────────────────────────────────────────────────────────────────────
 const python = findPython();
 
-const ok =
-    tryEntryPoint() ||
-    (python && tryModule(python)) ||
-    (python && selfInstallAndRun(python));
+if (!python) {
+    noPythonError();
+}
 
-if (!ok) {
-    console.error('\nError: UTIM Engine could not start.');
-    const isTermux = (process.env.PREFIX && process.env.PREFIX.includes('com.termux')) || fs.existsSync('/data/data/com.termux');
-    if (isTermux) {
-        console.error('\n💡 Note for Termux Users: Precompiled binaries are required to avoid Rust compiler errors (pydantic-core).');
-        console.error('   Please run:  pkg install python-cryptography python-pydantic');
-        console.error('   And then:    pip install utim-cli');
-    } else if (!python) {
-        console.error('Python 3 was not found. On Termux run:  pkg install python');
-    } else {
-        console.error(`Tried Python at: ${python}`);
-        console.error('Run manually:  pip install utim-cli  or  pip3 install --upgrade utim-cli');
+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);
     }
-    process.exit(1);
 }
+
+// Engine is confirmed installed — launch it
+launch(python);

package/package.json

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

package/scripts/postinstall.js

@@ -1,30 +1,31 @@
 /**
- * Cross-platform postinstall script for @emend-ai/utim.
+ * Optional postinstall pre-warm for @emend-ai/utim.
  *
- * After `npm install -g @emend-ai/utim`, this script runs automatically to:
- *   1. Locate a Python 3 interpreter on the user's machine.
- *   2. Install the UTIM Python engine from PyPI:  pip install utim-cli
- *   3. Set the execute bit on bin/utim.js (Unix / Termux only).
+ * This is a best-effort pre-installation of the UTIM Python engine.
+ * If it fails for ANY reason, we exit 0 — the main launcher (bin/utim.js)
+ * will handle installation automatically on first run with a clean spinner.
  *
- * The Python source code is NOT bundled inside this npm package.
- * It is fetched from PyPI at install time.
+ * This script exists purely to make the first `utim` launch faster
+ * by pre-installing the Python engine during `npm install`.
  */
 const { spawnSync } = require('child_process');
-const path = require('path');
-const os   = require('os');
-const fs   = require('fs');
+const os = require('os');
+const fs = require('fs');
 
-const useShell = os.platform() === 'win32';
-const pkgDir = path.resolve(__dirname, '..');
+const isWin = os.platform() === 'win32';
+const isTermux =
+    (process.env.PREFIX && process.env.PREFIX.includes('com.termux')) ||
+    fs.existsSync('/data/data/com.termux');
 
-// ── Find a usable Python 3 interpreter ────────────────────────────────────────
 function findPython() {
-    for (const candidate of ['python3', 'python']) {
+    const candidates = isWin ? ['python', 'python3', 'py'] : ['python3', 'python'];
+    for (const candidate of candidates) {
         try {
             const r = spawnSync(candidate, ['--version'], {
                 encoding: 'utf8',
                 timeout: 4000,
-                shell: useShell,
+                shell: isWin,
+                windowsHide: true,
             });
             const out = (r.stdout || '') + (r.stderr || '');
             if (out.includes('Python 3')) return candidate;
@@ -33,68 +34,48 @@ function findPython() {
     return null;
 }
 
-// ── Install UTIM Python engine from PyPI ──────────────────────────────────────
-function installFromPyPI(python) {
-    console.log('\n⚙  Installing UTIM Python engine from PyPI (pip install utim-cli)...\n');
-    try {
-        const r = spawnSync(
-            python,
-            ['-m', 'pip', 'install', '--upgrade', 'utim-cli'],
-            { stdio: 'inherit', shell: useShell }
-        );
-        return r.status === 0;
-    } catch (_) {
-        return false;
-    }
-}
-
-// ── Set execute bit on Unix / Termux ─────────────────────────────────────────
+// Set execute bit on Unix / macOS / Termux
 function setExecuteBit() {
-    if (os.platform() !== 'win32') {
-        const binFile = path.join(pkgDir, 'bin', 'utim.js');
+    if (!isWin) {
         try {
+            const binFile = require('path').join(__dirname, '..', 'bin', 'utim.js');
             fs.chmodSync(binFile, 0o755);
-        } catch (_) {
-            // non-fatal — npm usually sets the bit itself via package.json "bin"
-        }
+        } catch (_) {}
     }
 }
 
-// ── Main ──────────────────────────────────────────────────────────────────────
-const python = findPython();
+setExecuteBit();
 
-if (!python) {
-    console.error(
-        '\n⚠  Python 3 not found on this machine.\n' +
-        '   Please install Python 3.9+ from https://python.org and then run:\n' +
-        '     pip install utim-cli\n' +
-        '   to finish setting up UTIM.\n'
-    );
-    // Exit 0 so npm does not roll back the install — user can pip install manually
+// Skip pre-warm on Termux — needs prebuilt pkg packages first,
+// which the main launcher handles properly with user guidance.
+if (isTermux) {
     process.exit(0);
 }
 
-const ok = installFromPyPI(python);
-setExecuteBit();
-
-if (ok) {
-    console.log('\n✅  UTIM installed successfully. Run  utim  to get started.\n');
-} else {
-    const isTermux = (process.env.PREFIX && process.env.PREFIX.includes('com.termux')) || fs.existsSync('/data/data/com.termux');
-    if (isTermux) {
-        console.warn(
-            '\n💡 Note for Termux Users: Precompiled binaries are required to avoid Rust compiler errors (pydantic-core).\n' +
-            '   Please run:  pkg install python-cryptography python-pydantic\n' +
-            '   And then:    pip install utim-cli\n'
-        );
-    } else {
-        console.warn(
-            '\n⚠  pip install failed. Try running manually:\n' +
-            '     pip install utim-cli\n' +
-            '   or:\n' +
-            '     pip3 install utim-cli\n'
-        );
-    }
-    // Exit 0 — don't break the npm install; user can manually pip install
+const python = findPython();
+if (!python) {
+    // No Python — launcher will guide the user on first run
     process.exit(0);
 }
+
+// Silently pre-install in the background (pipe output, not inherit)
+// so the npm install output stays clean. Any failure is fine —
+// the launcher self-heals on first `utim` run.
+try {
+    const r = spawnSync(
+        python,
+        ['-m', 'pip', 'install', '--upgrade', '--quiet', 'utim-cli'],
+        {
+            stdio: 'pipe',
+            shell: isWin,
+            windowsHide: true,
+            timeout: 300000,
+        }
+    );
+    if (r.status === 0) {
+        console.log('\n✅  UTIM ready. Run  utim  to get started.\n');
+    }
+    // If it fails, stay silent — launcher will handle it
+} catch (_) {}
+
+process.exit(0);