dex-termux-cli 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dex-termux-cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "description": "Termux CLI for Android with guided search, readable tree views, command help, and safe project install flows for Python, Node, and PHP.",
   "keywords": [

package/src/commands/android-shell.js

@@ -1,6 +1,7 @@
 import fs from 'node:fs/promises';
 import { spawn } from 'node:child_process';
 import { getUserConfigPath, loadUserConfig } from '../core/config.js';
+import { resolveInteractiveShell } from '../utils/shell.js';
 
 const ANDROID_ROOT = '/sdcard';
 
@@ -19,14 +20,15 @@ export async function runAndroidShellCommand() {
     throw new Error(`No se puede acceder a la ruta Android: ${ANDROID_ROOT}`);
   }
 
-  const shell = process.env.SHELL || '/data/data/com.termux/files/usr/bin/sh';
+  const interactiveShell = await resolveInteractiveShell();
 
   console.log(`Abriendo shell en ${ANDROID_ROOT}`);
+  console.log(`Shell   : ${interactiveShell.shellName} interactiva`);
   console.log('Escribe exit para volver.');
   console.log('');
 
   await new Promise((resolve, reject) => {
-    const child = spawn(shell, {
+    const child = spawn(interactiveShell.shellPath, interactiveShell.shellArgs, {
       cwd: ANDROID_ROOT,
       stdio: 'inherit',
       env: {

package/src/commands/safe-shell.js

@@ -4,6 +4,7 @@ import { createHash } from 'node:crypto';
 import { spawn } from 'node:child_process';
 import { loadUserConfig } from '../core/config.js';
 import { detectProjectContext } from '../utils/project-context.js';
+import { resolveInteractiveShell } from '../utils/shell.js';
 
 export async function runSafeShellCommand() {
   const config = await loadUserConfig();
@@ -25,7 +26,7 @@ export async function runSafeShellCommand() {
 
   const projectKey = getProjectKey(projectRoot);
   const projectState = config.projects && config.projects[projectKey] ? config.projects[projectKey] : null;
-  const shell = process.env.SHELL || '/data/data/com.termux/files/usr/bin/sh';
+  const interactiveShell = await resolveInteractiveShell();
   const reason = projectState && projectState.preferSafeInstall
     ? 'Este proyecto ya quedo marcado para modo seguro.'
     : 'Entrando al entorno seguro manual de Dex.';
@@ -47,13 +48,14 @@ export async function runSafeShellCommand() {
     console.log('Proyecto : ' + projectRoot);
     console.log('Entorno  : ' + venvDir);
     console.log('Python   : ' + rescuePython);
+    console.log('Shell    : ' + interactiveShell.shellName + ' interactiva');
     console.log('Nota     : ' + reason);
     console.log('Usa python, pip o python bot.py desde aqui.');
     console.log('Si sales de esta shell, el modo seguro deja de estar activo.');
     console.log('Escribe exit para volver a tu shell normal.');
     console.log('');
 
-    await openSafeShell(shell, projectRoot, {
+    await openSafeShell(interactiveShell, projectRoot, {
       PATH: nextPath,
       VIRTUAL_ENV: venvDir,
       DEX_CONTEXT: 'safe-shell',
@@ -82,13 +84,14 @@ export async function runSafeShellCommand() {
     console.log('Proyecto : ' + projectRoot);
     console.log('Seguro   : ' + safeProjectDir);
     console.log('Modulos  : ' + nodeModulesDir);
+    console.log('Shell    : ' + interactiveShell.shellName + ' interactiva');
     console.log('Nota     : ' + reason);
     console.log('Usa node, npm o npm run desde aqui.');
     console.log('Esta shell abre la copia segura del proyecto dentro de HOME.');
     console.log('Escribe exit para volver a tu shell normal.');
     console.log('');
 
-    await openSafeShell(shell, safeProjectDir, {
+    await openSafeShell(interactiveShell, safeProjectDir, {
       PATH: nextPath,
       DEX_CONTEXT: 'safe-shell',
       DEX_SAFE_PROJECT: projectRoot,
@@ -118,6 +121,7 @@ export async function runSafeShellCommand() {
     console.log('Proyecto : ' + projectRoot);
     console.log('Seguro   : ' + safeProjectDir);
     console.log('Vendor   : ' + vendorDir);
+    console.log('Shell    : ' + interactiveShell.shellName + ' interactiva');
     console.log('Nota     : ' + reason);
     console.log('Usa php, composer o binarios de vendor/bin desde aqui.');
     console.log('Esta shell abre la copia segura del proyecto dentro de HOME.');
@@ -126,7 +130,7 @@ export async function runSafeShellCommand() {
 
     await fs.mkdir(composerHome, { recursive: true });
 
-    await openSafeShell(shell, safeProjectDir, {
+    await openSafeShell(interactiveShell, safeProjectDir, {
       PATH: nextPath,
       COMPOSER_HOME: composerHome,
       DEX_CONTEXT: 'safe-shell',
@@ -171,9 +175,9 @@ function supportsSafeMode(projectType) {
   return projectType === 'python' || projectType === 'node' || projectType === 'php';
 }
 
-function openSafeShell(shell, cwd, envPatch) {
+function openSafeShell(interactiveShell, cwd, envPatch) {
   return new Promise((resolve, reject) => {
-    const child = spawn(shell, ['-i'], {
+    const child = spawn(interactiveShell.shellPath, interactiveShell.shellArgs, {
       cwd,
       stdio: 'inherit',
       env: {

package/src/utils/shell.js

@@ -0,0 +1,54 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+const TERMUX_ZSH = '/data/data/com.termux/files/usr/bin/zsh';
+const TERMUX_BASH = '/data/data/com.termux/files/usr/bin/bash';
+const TERMUX_SH = '/data/data/com.termux/files/usr/bin/sh';
+
+export async function resolveInteractiveShell() {
+  const preferredShell = process.env.DEX_PREFERRED_SHELL || process.env.SHELL || '';
+  const candidates = buildShellCandidates(preferredShell);
+
+  for (const shellPath of candidates) {
+    if (!shellPath) {
+      continue;
+    }
+
+    if (await shellExists(shellPath)) {
+      return {
+        shellPath,
+        shellArgs: ['-i'],
+        shellName: path.basename(shellPath),
+      };
+    }
+  }
+
+  return {
+    shellPath: TERMUX_SH,
+    shellArgs: ['-i'],
+    shellName: 'sh',
+  };
+}
+
+function buildShellCandidates(preferredShell) {
+  const shellName = path.basename(preferredShell || '');
+
+  if (preferredShell && shellName && shellName !== 'sh') {
+    return dedupe([preferredShell, TERMUX_ZSH, TERMUX_BASH, TERMUX_SH]);
+  }
+
+  return dedupe([TERMUX_ZSH, TERMUX_BASH, preferredShell, TERMUX_SH]);
+}
+
+async function shellExists(shellPath) {
+  try {
+    await fs.access(shellPath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function dedupe(values) {
+  return [...new Set(values.filter(Boolean))];
+}