@emend-ai/utim 1.46.9 → 1.46.12

package/bin/utim.js

@@ -107,15 +107,22 @@ function runPip(python, extraFlags) {
             return isUtimInstalled(python);
         } else {
             // Linux / Termux fallback: run in current terminal
-            const r = spawnSync(
-                python,
-                ['-m', 'pip', 'install', '--upgrade', ...extraFlags, 'utim-cli'],
-                {
-                    stdio: 'inherit',
-                    shell: false,
-                    timeout: 300000,
-                }
-            );
+            const pipArgs = ['-m', 'pip', 'install'];
+            if (isTermux) {
+                // On Termux: do NOT use --upgrade to prevent pip from pulling newer
+                // versions of pydantic-core from PyPI and trying to compile from source.
+                // Instead, use --upgrade-strategy only-if-needed to keep the pre-compiled version.
+                pipArgs.push('--upgrade-strategy', 'only-if-needed');
+            } else {
+                pipArgs.push('--upgrade');
+            }
+            pipArgs.push(...extraFlags, 'utim-cli');
+
+            const r = spawnSync(python, pipArgs, {
+                stdio: 'inherit',
+                shell: false,
+                timeout: 300000,
+            });
             return r.status === 0;
         }
     } catch (_) {
@@ -127,52 +134,41 @@ function installEngine(python) {
     let termuxFlags = [];
     if (isTermux) {
         process.stderr.write(
-            '\n💡 Termux detected. Installing prebuilt system packages...\n\n'
+            '\n💡 Termux detected. Preparing Android-compatible dependencies...\n\n'
         );
 
-        // Step 1: install prebuilt system-level cryptography to avoid Rust/C compilation
-        spawnSync('pkg', ['install', '-y', 'python-cryptography'], {
-            stdio: 'inherit',
-            shell: false,
-        });
-
-        // Step 2: upgrade pip/setuptools/wheel first
-        spawnSync(python, ['-m', 'pip', 'install', '--upgrade', '--quiet', 'pip', 'setuptools', 'wheel'], {
-            stdio: 'pipe',
-            shell: false,
-            timeout: 60000,
-        });
+        // Step 1: upgrade pkg repo list
+        spawnSync('pkg', ['update', '-y'], { stdio: 'pipe', shell: false, timeout: 30000 });
 
-        // Step 3: pre-install pydantic-core from the Android pre-built wheel index
-        // BEFORE installing utim-cli, so pip never tries to compile it from Rust source.
-        process.stderr.write('\n⚙  Pre-installing pydantic-core (Android prebuilt wheel)...\n\n');
-        const pydanticInstall = spawnSync(
-            python,
-            [
-                '-m', 'pip', 'install', '--upgrade', '--quiet',
-                'pydantic-core',
-                '--extra-index-url', 'https://eutalix.github.io/android-pydantic-core/',
-            ],
+        // Step 2: install pydantic via Termux's own compiled package.
+        // This is the ONLY reliable way to get pydantic-core on Android without
+        // a Rust toolchain. pkg ships a prebuilt binary for aarch64-linux-android.
+        process.stderr.write('⚙  Installing pydantic via Termux package manager...\n\n');
+        const pkgResult = spawnSync(
+            'pkg', ['install', '-y', 'python-pydantic', 'python-cryptography'],
             { stdio: 'inherit', shell: false, timeout: 120000 }
         );
 
-        if (pydanticInstall.status !== 0) {
+        if (pkgResult.status !== 0) {
             process.stderr.write(
-                '\n⚠  pydantic-core prebuilt install failed. Will try Termux repository fallback...\n\n'
+                '\n⚠  pkg install failed — will try pip with prebuilt wheel index as fallback...\n\n'
             );
-            // Fallback: Termux user repository
+            // Fallback: Eutalix prebuilt wheels (works for Python 3.11/3.12)
             spawnSync(
                 python,
-                [
-                    '-m', 'pip', 'install', '--upgrade', '--quiet',
-                    'pydantic-core',
-                    '--extra-index-url', 'https://termux-user-repository.github.io/pypi/',
-                ],
+                ['-m', 'pip', 'install', '--upgrade', '--quiet',
+                 'pydantic-core', 'pydantic',
+                 '--extra-index-url', 'https://eutalix.github.io/android-pydantic-core/'],
                 { stdio: 'inherit', shell: false, timeout: 120000 }
             );
         }
 
-        // Extra index flags for the main utim-cli install (catches any remaining Rust deps)
+        // Step 3: upgrade pip/setuptools/wheel
+        spawnSync(python, ['-m', 'pip', 'install', '--upgrade', '--quiet', 'pip', 'setuptools', 'wheel'], {
+            stdio: 'pipe', shell: false, timeout: 60000,
+        });
+
+        // Extra index as safety net for any remaining Rust-based transitive deps
         termuxFlags = [
             '--extra-index-url', 'https://eutalix.github.io/android-pydantic-core/',
             '--extra-index-url', 'https://termux-user-repository.github.io/pypi/',

package/package.json

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