@jetstart/core 2.3.1 → 2.3.3

package/dist/build/dex-generator.js

@@ -52,14 +52,21 @@ class DexGenerator {
     async findD8() {
         if (this.d8Path)
             return this.d8Path;
-        // Check multiple locations for Android SDK
-        let androidHome = process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT;
-        // Fallback to common Windows locations
+        // Check environment variables first, but validate the path actually exists
+        const envAndroidHome = process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT;
+        let androidHome;
+        if (envAndroidHome && fs.existsSync(path.join(envAndroidHome, 'build-tools'))) {
+            androidHome = envAndroidHome;
+        }
+        // Fallback: probe common install locations
         if (!androidHome) {
             const commonLocations = [
-                'C:\\Android',
                 path.join(os.homedir(), 'AppData', 'Local', 'Android', 'Sdk'),
+                'C:\\Android',
                 'C:\\Users\\Public\\Android\\Sdk',
+                path.join(os.homedir(), 'Android', 'Sdk'),
+                path.join(os.homedir(), 'Library', 'Android', 'sdk'),
+                '/opt/android-sdk',
             ];
             for (const loc of commonLocations) {
                 if (fs.existsSync(path.join(loc, 'build-tools'))) {
@@ -70,7 +77,7 @@ class DexGenerator {
             }
         }
         if (!androidHome) {
-            (0, logger_1.error)('ANDROID_HOME or ANDROID_SDK_ROOT not set');
+            (0, logger_1.error)('Android build-tools not found');
             return null;
         }
         // d8 is in build-tools

package/dist/build/gradle.js

@@ -42,6 +42,7 @@ const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
+const shared_1 = require("@jetstart/shared");
 const parser_1 = require("./parser");
 /**
  * ADB Helper for auto-installing APKs
@@ -288,16 +289,18 @@ class GradleExecutor {
     async execute(config) {
         const startTime = Date.now();
         const gradlePath = this.findGradle(config.projectPath);
-        // If Gradle not found, return mock build for testing
+        // If Gradle not found, fail build with clear error
         if (!gradlePath) {
-            console.log('[Gradle] No Gradle found, returning mock successful build for testing');
-            // Simulate build delay
-            await new Promise(resolve => setTimeout(resolve, 2000));
             return {
-                success: true,
+                success: false,
                 buildTime: Date.now() - startTime,
-                apkPath: path.join(config.projectPath, 'build/outputs/apk/debug/app-debug.apk'),
-                apkSize: 5242880, // Mock size: 5MB
+                errors: [{
+                        file: 'gradle',
+                        line: 0,
+                        column: 0,
+                        message: 'Gradle not found. Please install Gradle 8.0+ or ensure the Gradle wrapper (gradlew) exists in your project project.',
+                        severity: shared_1.ErrorSeverity.ERROR
+                    }]
             };
         }
         // Ensure Android SDK is configured

package/dist/build/kotlin-compiler.d.ts

@@ -22,6 +22,13 @@ export declare class KotlinCompiler {
     findComposeCompiler(): Promise<string | null>;
     /**
      * Find kotlinc executable
+     *
+     * Search order:
+     *   1. KOTLIN_HOME env var (set in .env or shell)
+     *   2. ANDROID_STUDIO_HOME env var
+     *   3. Platform-specific static paths (Scoop, Chocolatey, SDKMAN, snap, …)
+     *   4. Versioned IDE directories (IntelliJ IDEA, JetBrains Toolbox, Android Studio)
+     *   5. `where` / `which` fallback
      */
     findKotlinc(): Promise<string | null>;
     /**

package/dist/build/kotlin-compiler.js

@@ -102,27 +102,99 @@ class KotlinCompiler {
     }
     /**
      * Find kotlinc executable
+     *
+     * Search order:
+     *   1. KOTLIN_HOME env var (set in .env or shell)
+     *   2. ANDROID_STUDIO_HOME env var
+     *   3. Platform-specific static paths (Scoop, Chocolatey, SDKMAN, snap, …)
+     *   4. Versioned IDE directories (IntelliJ IDEA, JetBrains Toolbox, Android Studio)
+     *   5. `where` / `which` fallback
      */
     async findKotlinc() {
         if (this.kotlincPath)
             return this.kotlincPath;
-        // Check common locations
+        const win = os.platform() === 'win32';
+        const localAppData = process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local');
+        const progFiles = process.env.PROGRAMFILES || 'C:\\Program Files';
+        /**
+         * Scan `parentDir` for subdirectories whose names start with `entryPrefix`
+         * (pass '' to accept any entry), then return the first candidate that exists:
+         *   path.join(parentDir, entry, ...rest)
+         * Entries are sorted descending so the latest version is tried first.
+         * Returns null (never throws) if the directory is missing or unreadable.
+         */
+        const findInVersionedDir = (parentDir, entryPrefix, ...rest) => {
+            try {
+                if (!fs.existsSync(parentDir))
+                    return null;
+                const entries = fs.readdirSync(parentDir)
+                    .filter(e => !entryPrefix || e.toLowerCase().startsWith(entryPrefix.toLowerCase()))
+                    .sort()
+                    .reverse(); // latest version first
+                for (const entry of entries) {
+                    const candidate = path.join(parentDir, entry, ...rest);
+                    if (fs.existsSync(candidate))
+                        return candidate;
+                }
+            }
+            catch { /* permission / access errors — silently skip */ }
+            return null;
+        };
+        const homeDir = os.homedir();
+        // JetStart installs kotlinc here when the user runs --full-install
+        const jetstartKotlinc = win
+            ? path.join(homeDir, '.jetstart', 'kotlinc', 'bin', 'kotlinc.bat')
+            : path.join(homeDir, '.jetstart', 'kotlinc', 'bin', 'kotlinc');
+        // Validate KOTLIN_HOME if set — only use it when it actually points to kotlinc
+        const kotlinHomeCandidate = process.env.KOTLIN_HOME
+            ? (win
+                ? path.join(process.env.KOTLIN_HOME, 'bin', 'kotlinc.bat')
+                : path.join(process.env.KOTLIN_HOME, 'bin', 'kotlinc'))
+            : null;
         const locations = [
-            // From environment variable
-            process.env.KOTLIN_HOME ? path.join(process.env.KOTLIN_HOME, 'bin', 'kotlinc') : null,
-            // From Android Studio
-            process.env.ANDROID_STUDIO_HOME ? path.join(process.env.ANDROID_STUDIO_HOME, 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc') : null,
-            // System-wide installation (Windows)
-            'C:\\Program Files\\kotlinc\\bin\\kotlinc.bat',
-            'C:\\kotlinc\\bin\\kotlinc.bat',
-            // System-wide installation (Unix)
-            '/usr/local/bin/kotlinc',
-            '/usr/bin/kotlinc',
-            // Homebrew (macOS)
-            '/opt/homebrew/bin/kotlinc',
-        ].filter(Boolean);
+            // JetStart managed install (~/.jetstart/kotlinc) — checked first
+            jetstartKotlinc,
+            // env overrides (validated)
+            kotlinHomeCandidate,
+            process.env.ANDROID_STUDIO_HOME
+                ? path.join(process.env.ANDROID_STUDIO_HOME, 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc')
+                : null,
+            // Windows static paths
+            win ? path.join(progFiles, 'kotlinc', 'bin', 'kotlinc.bat') : null,
+            win ? 'C:\\kotlinc\\bin\\kotlinc.bat' : null,
+            // Scoop  (~\scoop\apps\kotlin\current)
+            win ? path.join(homeDir, 'scoop', 'apps', 'kotlin', 'current', 'bin', 'kotlinc.bat') : null,
+            // Chocolatey
+            win ? 'C:\\ProgramData\\chocolatey\\bin\\kotlinc.bat' : null,
+            // Android Studio — standard Google installer
+            win ? path.join(progFiles, 'Android', 'Android Studio', 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc.bat') : null,
+            win ? path.join(localAppData, 'Programs', 'Android Studio', 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc.bat') : null,
+            // Windows versioned IDE paths (wildcard scan)
+            // IntelliJ IDEA — any version under C:\Program Files\JetBrains
+            win ? findInVersionedDir(path.join(progFiles, 'JetBrains'), 'IntelliJ IDEA', 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc.bat') : null,
+            // JetBrains Toolbox — IDEA Ultimate
+            win ? findInVersionedDir(path.join(localAppData, 'JetBrains', 'Toolbox', 'apps', 'IDEA-U', 'ch-0'), '', 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc.bat') : null,
+            // JetBrains Toolbox — IDEA Community
+            win ? findInVersionedDir(path.join(localAppData, 'JetBrains', 'Toolbox', 'apps', 'IDEA-C', 'ch-0'), '', 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc.bat') : null,
+            // JetBrains Toolbox — Android Studio (Jellyfish+)
+            win ? findInVersionedDir(path.join(localAppData, 'JetBrains', 'Toolbox', 'apps', 'AndroidStudio', 'ch-0'), '', 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc.bat') : null,
+            // Unix / macOS static paths
+            !win ? '/usr/local/bin/kotlinc' : null,
+            !win ? '/usr/bin/kotlinc' : null,
+            // Homebrew (Apple Silicon + Intel)
+            !win ? '/opt/homebrew/bin/kotlinc' : null,
+            !win ? '/usr/local/opt/kotlin/bin/kotlinc' : null,
+            // SDKMAN  (~/.sdkman/candidates/kotlin/current)
+            !win ? path.join(homeDir, '.sdkman', 'candidates', 'kotlin', 'current', 'bin', 'kotlinc') : null,
+            // Snap
+            !win ? '/snap/bin/kotlinc' : null,
+            // IntelliJ IDEA — Linux Toolbox
+            !win ? findInVersionedDir(path.join(homeDir, '.local', 'share', 'JetBrains', 'Toolbox', 'apps', 'IDEA-U', 'ch-0'), '', 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc') : null,
+        ];
         for (const loc of locations) {
-            const execPath = os.platform() === 'win32' && !loc.endsWith('.bat') ? `${loc}.bat` : loc;
+            if (!loc)
+                continue;
+            const execPath = win && !loc.endsWith('.bat') ? `${loc}.bat` : loc;
             if (fs.existsSync(execPath)) {
                 this.kotlincPath = execPath;
                 (0, logger_1.log)(`Found kotlinc at: ${execPath}`);
@@ -131,7 +203,7 @@ class KotlinCompiler {
         }
         // Try to find via 'where' (Windows) or 'which' (Unix)
         try {
-            const cmd = os.platform() === 'win32' ? 'where' : 'which';
+            const cmd = win ? 'where' : 'which';
             const result = await this.runCommand(cmd, ['kotlinc']);
             if (result.success && result.stdout.trim()) {
                 this.kotlincPath = result.stdout.trim().split('\n')[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetstart/core",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "description": "Build server and orchestration for JetStart",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,8 +33,8 @@
   },
   "homepage": "https://github.com/dev-phantom/jetstart#readme",
   "dependencies": {
-    "@jetstart/shared": "^2.3.1",
-    "@jetstart/logs": "^2.3.1",
+    "@jetstart/shared": "^2.3.3",
+    "@jetstart/logs": "^2.3.3",
     "express": "^4.18.2",
     "ws": "^8.14.2",
     "chokidar": "^3.5.3",

package/src/build/dex-generator.ts

@@ -26,15 +26,22 @@ export class DexGenerator {
   async findD8(): Promise<string | null> {
     if (this.d8Path) return this.d8Path;
 
-    // Check multiple locations for Android SDK
-    let androidHome = process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT;
+    // Check environment variables first, but validate the path actually exists
+    const envAndroidHome = process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT;
+    let androidHome: string | undefined;
+    if (envAndroidHome && fs.existsSync(path.join(envAndroidHome, 'build-tools'))) {
+      androidHome = envAndroidHome;
+    }
 
-    // Fallback to common Windows locations
+    // Fallback: probe common install locations
     if (!androidHome) {
       const commonLocations = [
-        'C:\\Android',
         path.join(os.homedir(), 'AppData', 'Local', 'Android', 'Sdk'),
+        'C:\\Android',
         'C:\\Users\\Public\\Android\\Sdk',
+        path.join(os.homedir(), 'Android', 'Sdk'),
+        path.join(os.homedir(), 'Library', 'Android', 'sdk'),
+        '/opt/android-sdk',
       ];
       for (const loc of commonLocations) {
         if (fs.existsSync(path.join(loc, 'build-tools'))) {
@@ -46,7 +53,7 @@ export class DexGenerator {
     }
 
     if (!androidHome) {
-      logError('ANDROID_HOME or ANDROID_SDK_ROOT not set');
+      logError('Android build-tools not found');
       return null;
     }
 

package/src/build/gradle.ts

@@ -7,7 +7,7 @@ import { spawn, ChildProcess, execSync } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
-import { BuildConfig, BuildResult } from '@jetstart/shared';
+import { BuildConfig, BuildResult, ErrorSeverity } from '@jetstart/shared';
 import { BuildOutputParser } from './parser';
 
 /**
@@ -289,18 +289,18 @@ export class GradleExecutor {
     const startTime = Date.now();
     const gradlePath = this.findGradle(config.projectPath);
 
-    // If Gradle not found, return mock build for testing
+    // If Gradle not found, fail build with clear error
     if (!gradlePath) {
-      console.log('[Gradle] No Gradle found, returning mock successful build for testing');
-
-      // Simulate build delay
-      await new Promise(resolve => setTimeout(resolve, 2000));
-
       return {
-        success: true,
+        success: false,
         buildTime: Date.now() - startTime,
-        apkPath: path.join(config.projectPath, 'build/outputs/apk/debug/app-debug.apk'),
-        apkSize: 5242880, // Mock size: 5MB
+        errors: [{
+          file: 'gradle',
+          line: 0,
+          column: 0,
+          message: 'Gradle not found. Please install Gradle 8.0+ or ensure the Gradle wrapper (gradlew) exists in your project project.',
+          severity: ErrorSeverity.ERROR
+        }]
       };
     }
 

package/src/build/kotlin-compiler.ts

@@ -82,28 +82,113 @@ export class KotlinCompiler {
 
   /**
    * Find kotlinc executable
+   *
+   * Search order:
+   *   1. KOTLIN_HOME env var (set in .env or shell)
+   *   2. ANDROID_STUDIO_HOME env var
+   *   3. Platform-specific static paths (Scoop, Chocolatey, SDKMAN, snap, …)
+   *   4. Versioned IDE directories (IntelliJ IDEA, JetBrains Toolbox, Android Studio)
+   *   5. `where` / `which` fallback
    */
   async findKotlinc(): Promise<string | null> {
     if (this.kotlincPath) return this.kotlincPath;
 
-    // Check common locations
-    const locations = [
-      // From environment variable
-      process.env.KOTLIN_HOME ? path.join(process.env.KOTLIN_HOME, 'bin', 'kotlinc') : null,
-      // From Android Studio
-      process.env.ANDROID_STUDIO_HOME ? path.join(process.env.ANDROID_STUDIO_HOME, 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc') : null,
-      // System-wide installation (Windows)
-      'C:\\Program Files\\kotlinc\\bin\\kotlinc.bat',
-      'C:\\kotlinc\\bin\\kotlinc.bat',
-      // System-wide installation (Unix)
-      '/usr/local/bin/kotlinc',
-      '/usr/bin/kotlinc',
-      // Homebrew (macOS)
-      '/opt/homebrew/bin/kotlinc',
-    ].filter(Boolean) as string[];
+    const win = os.platform() === 'win32';
+    const localAppData = process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local');
+    const progFiles  = process.env.PROGRAMFILES  || 'C:\\Program Files';
+
+    /**
+     * Scan `parentDir` for subdirectories whose names start with `entryPrefix`
+     * (pass '' to accept any entry), then return the first candidate that exists:
+     *   path.join(parentDir, entry, ...rest)
+     * Entries are sorted descending so the latest version is tried first.
+     * Returns null (never throws) if the directory is missing or unreadable.
+     */
+    const findInVersionedDir = (
+      parentDir: string,
+      entryPrefix: string,
+      ...rest: string[]
+    ): string | null => {
+      try {
+        if (!fs.existsSync(parentDir)) return null;
+        const entries = fs.readdirSync(parentDir)
+          .filter(e => !entryPrefix || e.toLowerCase().startsWith(entryPrefix.toLowerCase()))
+          .sort()
+          .reverse(); // latest version first
+        for (const entry of entries) {
+          const candidate = path.join(parentDir, entry, ...rest);
+          if (fs.existsSync(candidate)) return candidate;
+        }
+      } catch { /* permission / access errors — silently skip */ }
+      return null;
+    };
+
+    const homeDir = os.homedir();
+    // JetStart installs kotlinc here when the user runs --full-install
+    const jetstartKotlinc = win
+      ? path.join(homeDir, '.jetstart', 'kotlinc', 'bin', 'kotlinc.bat')
+      : path.join(homeDir, '.jetstart', 'kotlinc', 'bin', 'kotlinc');
+
+    // Validate KOTLIN_HOME if set — only use it when it actually points to kotlinc
+    const kotlinHomeCandidate = process.env.KOTLIN_HOME
+      ? (win
+          ? path.join(process.env.KOTLIN_HOME, 'bin', 'kotlinc.bat')
+          : path.join(process.env.KOTLIN_HOME, 'bin', 'kotlinc'))
+      : null;
+
+    const locations: Array<string | null> = [
+      // JetStart managed install (~/.jetstart/kotlinc) — checked first
+      jetstartKotlinc,
+
+      // env overrides (validated)
+      kotlinHomeCandidate,
+      process.env.ANDROID_STUDIO_HOME
+        ? path.join(process.env.ANDROID_STUDIO_HOME, 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc')
+        : null,
+
+      // Windows static paths
+      win ? path.join(progFiles, 'kotlinc', 'bin', 'kotlinc.bat')          : null,
+      win ? 'C:\\kotlinc\\bin\\kotlinc.bat'                                 : null,
+      // Scoop  (~\scoop\apps\kotlin\current)
+      win ? path.join(homeDir, 'scoop', 'apps', 'kotlin', 'current', 'bin', 'kotlinc.bat') : null,
+      // Chocolatey
+      win ? 'C:\\ProgramData\\chocolatey\\bin\\kotlinc.bat'                 : null,
+      // Android Studio — standard Google installer
+      win ? path.join(progFiles,   'Android', 'Android Studio', 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc.bat') : null,
+      win ? path.join(localAppData,'Programs', 'Android Studio', 'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc.bat') : null,
+
+      // Windows versioned IDE paths (wildcard scan)
+      // IntelliJ IDEA — any version under C:\Program Files\JetBrains
+      win ? findInVersionedDir(path.join(progFiles, 'JetBrains'), 'IntelliJ IDEA',
+              'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc.bat')         : null,
+      // JetBrains Toolbox — IDEA Ultimate
+      win ? findInVersionedDir(path.join(localAppData, 'JetBrains', 'Toolbox', 'apps', 'IDEA-U', 'ch-0'), '',
+              'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc.bat')          : null,
+      // JetBrains Toolbox — IDEA Community
+      win ? findInVersionedDir(path.join(localAppData, 'JetBrains', 'Toolbox', 'apps', 'IDEA-C', 'ch-0'), '',
+              'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc.bat')          : null,
+      // JetBrains Toolbox — Android Studio (Jellyfish+)
+      win ? findInVersionedDir(path.join(localAppData, 'JetBrains', 'Toolbox', 'apps', 'AndroidStudio', 'ch-0'), '',
+              'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc.bat')          : null,
+
+      // Unix / macOS static paths
+      !win ? '/usr/local/bin/kotlinc'                                        : null,
+      !win ? '/usr/bin/kotlinc'                                              : null,
+      // Homebrew (Apple Silicon + Intel)
+      !win ? '/opt/homebrew/bin/kotlinc'                                     : null,
+      !win ? '/usr/local/opt/kotlin/bin/kotlinc'                             : null,
+      // SDKMAN  (~/.sdkman/candidates/kotlin/current)
+      !win ? path.join(homeDir, '.sdkman', 'candidates', 'kotlin', 'current', 'bin', 'kotlinc') : null,
+      // Snap
+      !win ? '/snap/bin/kotlinc'                                             : null,
+      // IntelliJ IDEA — Linux Toolbox
+      !win ? findInVersionedDir(path.join(homeDir, '.local', 'share', 'JetBrains', 'Toolbox', 'apps', 'IDEA-U', 'ch-0'), '',
+              'plugins', 'Kotlin', 'kotlinc', 'bin', 'kotlinc')              : null,
+    ];
 
     for (const loc of locations) {
-      const execPath = os.platform() === 'win32' && !loc.endsWith('.bat') ? `${loc}.bat` : loc;
+      if (!loc) continue;
+      const execPath = win && !loc.endsWith('.bat') ? `${loc}.bat` : loc;
       if (fs.existsSync(execPath)) {
         this.kotlincPath = execPath;
         log(`Found kotlinc at: ${execPath}`);
@@ -113,7 +198,7 @@ export class KotlinCompiler {
 
     // Try to find via 'where' (Windows) or 'which' (Unix)
     try {
-      const cmd = os.platform() === 'win32' ? 'where' : 'which';
+      const cmd = win ? 'where' : 'which';
       const result = await this.runCommand(cmd, ['kotlinc']);
       if (result.success && result.stdout.trim()) {
         this.kotlincPath = result.stdout.trim().split('\n')[0];