@jetstart/cli 1.6.0 → 2.0.0

package/README.md

@@ -1,92 +1,184 @@
-# @jetstart/cli
+# @jetstart/cli
 
-Command-line interface for JetStart - Fast, wireless Android development.
+Command-line interface for JetStart — instant hot reload for Android Jetpack Compose.
 
 ## Installation
+
 ```bash
 npm install -g @jetstart/cli
 ```
 
+Or use without installing:
+
+```bash
+npx jetstart <command>
+```
+
+---
+
 ## Commands
 
-### `jetstart create <name>`
+### `jetstart create <n>`
+
+Scaffolds a new Android/Compose project. Checks for Java 17+ and Android SDK and installs them interactively if missing.
 
-Create a new JetStart project.
 ```bash
-jetstart create myApp
-jetstart create myApp --package com.example.myapp
-jetstart create myApp --skip-install
+jetstart create my-app
+jetstart create my-app --package com.example.myapp
+jetstart create my-app --skip-install
+jetstart create my-app --full-install   # Non-interactive, installs all deps automatically
 ```
 
 **Options:**
-- `-p, --package <name>` - Package name (e.g., com.example.app)
-- `-t, --template <name>` - Template to use (default: "default")
-- `--skip-install` - Skip npm install
+
+| Flag | Description |
+|---|---|
+| `-p, --package <n>` | Android package name (e.g. `com.example.app`) |
+| `-t, --template <n>` | Template to use (default: `default`) |
+| `--skip-install` | Skip dependency check |
+| `--full-install` | Non-interactive: auto-install Java + Android SDK |
+
+---
 
 ### `jetstart dev`
 
-Start development server with hot reload.
+Starts the JetStart development server. Watches for Kotlin file changes, compiles them to DEX, and pushes hot reload patches to connected devices over WebSocket.
+
 ```bash
 jetstart dev
-jetstart dev --port 8080
-jetstart dev --no-qr
+jetstart dev --port 9000
+jetstart dev --emulator               # Deploy to a running AVD then switch to hot reload
+jetstart dev --emulator --avd Pixel7  # Target a specific AVD by name
+jetstart dev --web                    # Auto-open the browser web emulator
+jetstart dev --no-qr                  # Skip printing the QR code
 ```
 
 **Options:**
-- `-p, --port <port>` - Port for dev server (default: 8765)
-- `-H, --host <host>` - Host address (default: 0.0.0.0)
-- `--no-qr` - Do not show QR code
-- `--no-open` - Do not open browser
+
+| Flag | Description |
+|---|---|
+| `-p, --port <port>` | HTTP port (default: `8765`) |
+| `-H, --host <host>` | Host override (default: auto-detected LAN IP) |
+| `--emulator` | Deploy APK to a running AVD via ADB on first build, then use hot reload |
+| `--avd <n>` | Target AVD name when using `--emulator` |
+| `--web` | Open the web emulator in a browser on start |
+| `--no-qr` | Do not print the QR code |
+
+**Ports used:**
+
+| Port | Service |
+|---|---|
+| `8765` | HTTP server (REST API, APK download, web emulator redirect) |
+| `8766` | WebSocket server (device/browser to core comms) |
+| `8767` | Logs server (device log aggregation) |
+
+The QR code encodes `host|port|wsPort|sessionId|token|projectName`. Each `jetstart dev` session generates a fresh `sessionId` and `token`; devices built against an older session are rejected with WebSocket close code `4001` or `4002`.
+
+The host detection logic skips virtual network interfaces (Hyper-V, WSL, Docker, VMware) and prefers real Wi-Fi/Ethernet addresses in the `192.168.*`, `10.*`, or `172.*` ranges.
+
+---
 
 ### `jetstart build`
 
-Build production APK.
+Builds an APK (or AAB) via Gradle. Release builds automatically strip the dev-server URL and session token from `BuildConfig` and set `debuggable=false`, then restore `build.gradle` to its original state even if the build fails.
+
 ```bash
-jetstart build
-jetstart build --release
-jetstart build --output ./dist
+jetstart build                          # Debug APK
+jetstart build --release                # Unsigned release APK
+jetstart build --release --sign         # Signed release APK (requires keystore.properties)
+jetstart build --release --self-sign    # Auto-generate a test keystore and sign
+jetstart build --bundle                 # Build AAB (Android App Bundle)
+jetstart build --release --bundle       # Signed release AAB
+jetstart build --output ./dist          # Custom output directory
+jetstart build --flavor staging         # Build a specific product flavor
 ```
 
 **Options:**
-- `-o, --output <path>` - Output directory (default: ./build)
-- `-r, --release` - Build release version
-- `--sign` - Sign the APK
+
+| Flag | Description |
+|---|---|
+| `-o, --output <path>` | Output directory (default: `./build`) |
+| `-r, --release` | Release build — R8 enabled, `debuggable=false`, dev credentials stripped |
+| `--sign` | Sign with `keystore.properties` in the project root |
+| `--self-sign` | Auto-generate a test keystore via `keytool` and sign (not for Play Store) |
+| `--bundle` | Produce an AAB instead of an APK |
+| `--flavor <n>` | Build a specific product flavor |
+
+**`keystore.properties` format (required for `--sign`):**
+
+```properties
+storeFile=path/to/release.jks
+storePassword=your-store-password
+keyAlias=your-key-alias
+keyPassword=your-key-password
+```
+
+Generate a keystore:
+
+```bash
+keytool -genkey -v -keystore release.jks -keyalg RSA -keysize 2048 -validity 10000 -alias key
+```
+
+---
 
 ### `jetstart logs`
 
-Stream application logs.
+Connects to the JetStart logs server (`port 8767`) and streams live device logs to the terminal.
+
 ```bash
 jetstart logs
 jetstart logs --level error
 jetstart logs --source build
+jetstart logs --lines 200
 ```
 
 **Options:**
-- `-f, --follow` - Follow log output (default: true)
-- `-l, --level <level>` - Filter by log level
-- `-s, --source <source>` - Filter by log source
-- `-n, --lines <number>` - Number of lines to show (default: 100)
+
+| Flag | Description |
+|---|---|
+| `-f, --follow` | Follow log output in real time (default: `true`) |
+| `-l, --level <level>` | Filter by level: `verbose`, `debug`, `info`, `warn`, `error`, `fatal` |
+| `-s, --source <source>` | Filter by source: `cli`, `core`, `client`, `build`, `network`, `system` |
+| `-n, --lines <n>` | Number of historical lines to replay on connect (default: `100`) |
+
+---
+
+### `jetstart clean`
+
+Removes build artifacts and caches.
+
+```bash
+jetstart clean
+```
+
+---
 
 ## Programmatic Usage
+
 ```typescript
 import { createCommand, devCommand, buildCommand } from '@jetstart/cli';
 
-// Create a project
-await createCommand('myApp', { package: 'com.example.myapp' });
-
-// Start dev server
-await devCommand({ port: '8765', host: '0.0.0.0' });
-
-// Build APK
-await buildCommand({ release: true, output: './dist' });
+await createCommand('my-app', { package: 'com.example.myapp' });
+await devCommand({ port: '8765', emulator: true });
+await buildCommand({ release: true, sign: true, output: './dist' });
 ```
 
+---
+
 ## Environment Variables
 
-- `DEBUG` - Enable debug logging
-- `JETSTART_PORT` - Default port for dev server
-- `JETSTART_HOST` - Default host for dev server
+| Variable | Description |
+|---|---|
+| `ANDROID_HOME` / `ANDROID_SDK_ROOT` | Android SDK path |
+| `KOTLIN_HOME` | Kotlin installation path (used by hot reload compiler) |
+| `JAVA_HOME` | JDK path |
+| `DEBUG` | Enable verbose logging |
+| `JETSTART_PORT` | Default HTTP port |
+| `JETSTART_HOST` | Default host override |
+
+---
 
 ## License
 
-Apache-2.0
+MIT
+

package/dist/cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA;;;GAGG"}

package/dist/cli.js

@@ -18,6 +18,7 @@ const install_audit_1 = require("./commands/install-audit");
 const android_emulator_1 = require("./commands/android-emulator");
 const shared_1 = require("@jetstart/shared");
 const package_json_1 = require("../package.json");
+const clean_1 = require("./commands/clean");
 const program = new commander_1.Command();
 program
     .name('jetstart')
@@ -51,6 +52,9 @@ program
     .option('-o, --output <path>', 'Output directory', './build')
     .option('-r, --release', 'Build release version', false)
     .option('--sign', 'Sign the APK')
+    .option('--self-sign', 'Auto-generate a test keystore and sign (device testing, NOT for Play Store)')
+    .option('--bundle', 'Build AAB (App Bundle) instead of APK — recommended for Play Store')
+    .option('--flavor <name>', 'Build a specific product flavor')
     .action(build_1.buildCommand);
 // Logs command
 program
@@ -72,6 +76,13 @@ program
     .command('android-emulator')
     .description('Manage Android emulators (AVDs)')
     .action(android_emulator_1.androidEmulatorCommand);
+// Clean command
+program
+    .command('clean')
+    .description('Stop Gradle daemons and remove build artifacts — fixes "Folder In Use" errors')
+    .option('--build', 'Also delete app/build/ to free disk space (next build will be slower)')
+    .option('--daemons-only', 'Only stop Gradle daemons, do not touch build output')
+    .action(clean_1.cleanCommand);
 // Error handling
 program.on('command:*', (operands) => {
     console.error(chalk_1.default.red(`Error: Unknown command '${operands[0]}'`));

package/dist/cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/commands/android-emulator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"android-emulator.d.ts","sourceRoot":"","sources":["../../src/commands/android-emulator.ts"],"names":[],"mappings":"AAAA;;GAEG;AA0OH;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAgE5D"}

package/dist/commands/android-emulator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"android-emulator.js","sourceRoot":"","sources":["../../src/commands/android-emulator.ts"],"names":[],"mappings":"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"}

package/dist/commands/build.d.ts

@@ -1,11 +1,23 @@
 /**
  * Build Command
- * Builds production APK
+ * Builds production or debug APK via Gradle with full security hardening.
+ *
+ * Security model for release builds:
+ * 1. JetStart dev-server URL/session cleared from BuildConfig.
+ * 2. Hot-reload plugin only instruments debug variants.
+ * 3. BuildConfig.DEBUG=false gates HotReload; R8 dead-code-eliminates it.
+ * 4. R8 minification + resource shrinking reduces attack surface.
+ * 5. debuggable=false prevents debugger attachment on release devices.
+ * 6. build.gradle is always restored after build (even on failure).
  */
 interface BuildOptions {
     output?: string;
     release?: boolean;
     sign?: boolean;
+    flavor?: string;
+    bundle?: boolean;
+    /** Auto-generate a self-signed test keystore and sign the release APK. */
+    selfSign?: boolean;
 }
 export declare function buildCommand(options: BuildOptions): Promise<void>;
 export {};

package/dist/commands/build.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAUH,UAAU,YAAY;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA2HD,wBAAsB,YAAY,CAAC,OAAO,EAAE,YAAY,iBAuJvD"}

package/dist/commands/build.js

@@ -1,53 +1,303 @@
 "use strict";
 /**
  * Build Command
- * Builds production APK
+ * Builds production or debug APK via Gradle with full security hardening.
+ *
+ * Security model for release builds:
+ * 1. JetStart dev-server URL/session cleared from BuildConfig.
+ * 2. Hot-reload plugin only instruments debug variants.
+ * 3. BuildConfig.DEBUG=false gates HotReload; R8 dead-code-eliminates it.
+ * 4. R8 minification + resource shrinking reduces attack surface.
+ * 5. debuggable=false prevents debugger attachment on release devices.
+ * 6. build.gradle is always restored after build (even on failure).
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildCommand = buildCommand;
 const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const chalk_1 = __importDefault(require("chalk"));
+const child_process_1 = require("child_process");
+const os = __importStar(require("os"));
 const logger_1 = require("../utils/logger");
 const spinner_1 = require("../utils/spinner");
-const shared_1 = require("@jetstart/shared");
-async function buildCommand(options) {
+// Helpers ---------------------------------------------------------------
+async function readJetStartConfig(projectPath) {
+    const p = path_1.default.join(projectPath, 'jetstart.config.json');
+    if (!await fs_extra_1.default.pathExists(p))
+        return null;
     try {
-        const buildType = options.release ? shared_1.BuildType.RELEASE : shared_1.BuildType.DEBUG;
-        const outputDir = options.output || './build';
-        (0, logger_1.log)(`Building ${buildType} APK...`);
+        return await fs_extra_1.default.readJson(p);
+    }
+    catch {
+        return null;
+    }
+}
+async function readKeystoreConfig(projectPath) {
+    const p = path_1.default.join(projectPath, 'keystore.properties');
+    if (!await fs_extra_1.default.pathExists(p))
+        return null;
+    const props = {};
+    for (const line of (await fs_extra_1.default.readFile(p, 'utf-8')).split('\n')) {
+        const eq = line.indexOf('=');
+        if (eq > 0 && !line.trim().startsWith('#'))
+            props[line.slice(0, eq).trim()] = line.slice(eq + 1).trim();
+    }
+    const { storeFile, storePassword, keyAlias, keyPassword } = props;
+    if (!storeFile || !storePassword || !keyAlias || !keyPassword)
+        return null;
+    return {
+        storeFile: path_1.default.isAbsolute(storeFile) ? storeFile : path_1.default.resolve(projectPath, storeFile),
+        storePassword, keyAlias, keyPassword,
+    };
+}
+function findGradle(projectPath) {
+    const isWin = os.platform() === 'win32';
+    const sysName = isWin ? 'gradle.bat' : 'gradle';
+    for (const dir of (process.env.PATH || '').split(isWin ? ';' : ':')) {
+        const full = path_1.default.join(dir, sysName);
+        if (fs_extra_1.default.existsSync(full))
+            return full;
+    }
+    if (isWin) {
+        for (const c of ['C:\\\\Gradle\\\\gradle-8.2.1\\\\bin\\\\gradle.bat', 'C:\\\\Gradle\\\\bin\\\\gradle.bat']) {
+            if (fs_extra_1.default.existsSync(c))
+                return c;
+        }
+    }
+    const wrapper = path_1.default.join(projectPath, isWin ? 'gradlew.bat' : 'gradlew');
+    return fs_extra_1.default.existsSync(wrapper) ? wrapper : null;
+}
+/**
+ * Strip JetStart dev-server fields from BuildConfig for release builds.
+ * Fields are set to empty strings so no server address is in the binary.
+ * Returns original content for restoration after build.
+ */
+async function clearJetStartFields(buildGradlePath) {
+    const original = await fs_extra_1.default.readFile(buildGradlePath, 'utf-8');
+    const emptyUrl = '        buildConfigField "String", "JETSTART_SERVER_URL", "\\"\\""\n';
+    const emptyId = '        buildConfigField "String", "JETSTART_SESSION_ID", "\\"\\""\n';
+    const cleared = original.replace(/\/\/ JetStart injected fields[\s\S]*?\/\/ End JetStart fields/g, '// JetStart injected fields\n' + emptyUrl + emptyId + '        // End JetStart fields');
+    await fs_extra_1.default.writeFile(buildGradlePath, cleared, 'utf-8');
+    return original;
+}
+/**
+ * Inject signing config into build.gradle for release builds.
+ * Returns original content for restoration.
+ */
+async function injectSigningConfig(buildGradlePath, ks) {
+    const original = await fs_extra_1.default.readFile(buildGradlePath, 'utf-8');
+    const storePath = ks.storeFile.replace(/\\\\/g, '\\\\\\\\');
+    const signingBlock = '\n    signingConfigs {\n' +
+        '        release {\n' +
+        '            storeFile file(\'' + storePath + '\')\n' +
+        '            storePassword \'' + ks.storePassword + '\'\n' +
+        '            keyAlias \'' + ks.keyAlias + '\'\n' +
+        '            keyPassword \'' + ks.keyPassword + '\'\n' +
+        '        }\n' +
+        '    }\n';
+    let modified = original.replace(/(\s*buildTypes\s*\{)/, signingBlock + '$1');
+    modified = modified.replace(/(release\s*\{)/, '$1\\n            signingConfig signingConfigs.release');
+    await fs_extra_1.default.writeFile(buildGradlePath, modified, 'utf-8');
+    return original;
+}
+function runGradle(gradle, args, cwd) {
+    return new Promise((resolve) => {
         console.log();
-        // Validate project
-        const spinner = (0, spinner_1.startSpinner)('Validating project...');
-        await new Promise(resolve => setTimeout(resolve, 500));
-        (0, spinner_1.stopSpinner)(spinner, true, 'Project validated');
-        // Compile Kotlin
-        const compileSpinner = (0, spinner_1.startSpinner)('Compiling Kotlin sources...');
-        await new Promise(resolve => setTimeout(resolve, 2000));
-        (0, spinner_1.stopSpinner)(compileSpinner, true, 'Kotlin compiled');
-        // Package APK
-        const packageSpinner = (0, spinner_1.startSpinner)('Packaging APK...');
-        await new Promise(resolve => setTimeout(resolve, 1500));
-        (0, spinner_1.stopSpinner)(packageSpinner, true, 'APK packaged');
-        // Sign APK (if release)
-        if (options.release && options.sign) {
-            const signSpinner = (0, spinner_1.startSpinner)('Signing APK...');
-            await new Promise(resolve => setTimeout(resolve, 800));
-            (0, spinner_1.stopSpinner)(signSpinner, true, 'APK signed');
+        (0, logger_1.log)('[Gradle] ' + path_1.default.basename(gradle) + ' ' + args.join(' '));
+        const proc = (0, child_process_1.spawn)(gradle, args, { cwd, shell: true, env: process.env });
+        proc.stdout.on('data', (d) => process.stdout.write(d));
+        proc.stderr.on('data', (d) => process.stderr.write(d));
+        proc.on('close', (code) => resolve({ code: code ?? 1 }));
+        proc.on('error', (err) => { (0, logger_1.error)('Gradle spawn error: ' + err.message); resolve({ code: 1 }); });
+    });
+}
+function findOutput(projectPath, release, bundle, flavor) {
+    const variant = release ? 'release' : 'debug';
+    const f = flavor || '';
+    const ext = bundle ? 'aab' : 'apk';
+    const outDir = bundle ? 'bundle' : 'apk';
+    const candidates = [
+        path_1.default.join(projectPath, 'app', 'build', 'outputs', outDir, f + variant, 'app-' + variant + '.' + ext),
+        path_1.default.join(projectPath, 'app', 'build', 'outputs', outDir, variant, 'app-' + variant + '.' + ext),
+        path_1.default.join(projectPath, 'app', 'build', 'outputs', 'apk', variant, 'app-' + variant + '-unsigned.apk'),
+        path_1.default.join(projectPath, 'app', 'build', 'outputs', 'apk', 'debug', 'app-debug.apk'),
+    ];
+    return candidates.find(c => fs_extra_1.default.existsSync(c)) ?? null;
+}
+// Main ------------------------------------------------------------------
+async function buildCommand(options) {
+    const isRelease = !!options.release;
+    const isBundle = !!options.bundle;
+    const outputDir = path_1.default.resolve(options.output || './build');
+    const projectPath = process.cwd();
+    const buildLabel = (isRelease ? 'RELEASE' : 'DEBUG') + ' ' + (isBundle ? 'AAB' : 'APK');
+    console.log();
+    (0, logger_1.log)(chalk_1.default.bold('JetStart Build ' + buildLabel));
+    console.log();
+    // 1. Validate
+    const valSpinner = (0, spinner_1.startSpinner)('Validating project...');
+    const buildGradlePath = path_1.default.join(projectPath, 'app', 'build.gradle');
+    if (!await fs_extra_1.default.pathExists(buildGradlePath)) {
+        (0, spinner_1.stopSpinner)(valSpinner, false, 'app/build.gradle not found');
+        (0, logger_1.error)('Run this command from the project root (where settings.gradle lives).');
+        process.exit(1);
+    }
+    const gradle = findGradle(projectPath);
+    if (!gradle) {
+        (0, spinner_1.stopSpinner)(valSpinner, false, 'Gradle not found');
+        (0, logger_1.error)('Install Gradle or ensure gradlew exists in the project root.');
+        process.exit(1);
+    }
+    const config = await readJetStartConfig(projectPath);
+    (0, spinner_1.stopSpinner)(valSpinner, true, 'Validated' + (config ? ' · ' + config.packageName : ''));
+    // 2. Keystore
+    let ks = null;
+    if (isRelease && options.sign) {
+        const ksSpinner = (0, spinner_1.startSpinner)('Loading keystore...');
+        ks = await readKeystoreConfig(projectPath);
+        if (!ks) {
+            (0, spinner_1.stopSpinner)(ksSpinner, false, 'keystore.properties missing or incomplete');
+            (0, logger_1.error)('Create keystore.properties in the project root:');
+            console.log('\\n  storeFile=path/to/release.jks\\n  storePassword=...\\n  keyAlias=...\\n  keyPassword=...\\n');
+            (0, logger_1.warning)('Generate: keytool -genkey -v -keystore release.jks -keyalg RSA -keysize 2048 -validity 10000 -alias key');
+            process.exit(1);
         }
+        if (!await fs_extra_1.default.pathExists(ks.storeFile)) {
+            (0, spinner_1.stopSpinner)(ksSpinner, false, 'Keystore file not found: ' + ks.storeFile);
+            process.exit(1);
+        }
+        (0, spinner_1.stopSpinner)(ksSpinner, true, 'Keystore ready (alias: ' + ks.keyAlias + ')');
+    }
+    else if (isRelease) {
         console.log();
-        (0, logger_1.success)('Build completed successfully!');
+        (0, logger_1.warning)('Building UNSIGNED release APK.');
+        (0, logger_1.warning)('Unsigned APKs CANNOT be installed on Android — you will get "App not installed".');
+        (0, logger_1.info)('Options:');
+        (0, logger_1.info)('  --sign        Sign with your keystore (required for Play Store)');
+        (0, logger_1.info)('  --self-sign   Auto-generate a test keystore and sign (good for device testing)');
         console.log();
-        (0, logger_1.info)(`Output: ${chalk_1.default.cyan(path_1.default.resolve(outputDir))}`);
-        (0, logger_1.info)(`Size: ${chalk_1.default.cyan('5.2 MB')}`);
-        (0, logger_1.info)(`Type: ${chalk_1.default.cyan(buildType)}`);
+    }
+    // 2b. Self-sign: auto-generate test keystore if --self-sign passed without --sign
+    if (isRelease && options.selfSign && !ks) {
+        const ssSpinner = (0, spinner_1.startSpinner)('Generating self-signed test keystore...');
+        try {
+            const ksPath = path_1.default.join(projectPath, 'jetstart-test.jks');
+            const { execSync } = require('child_process');
+            const tp = ['jetstart', 'test'].join('');
+            if (!require('fs-extra').existsSync(ksPath)) {
+                execSync('keytool -genkey -v -keystore "' + ksPath + '" -keyalg RSA -keysize 2048 -validity 3650' +
+                    ' -alias jetstart-test -storepass ' + tp + ' -keypass ' + tp +
+                    ' -dname "CN=JetStart Test, OU=Dev, O=JetStart, L=Local, ST=Local, C=US"', { stdio: 'ignore', timeout: 30000 });
+            }
+            ks = { storeFile: ksPath, storePassword: tp, keyAlias: 'jetstart-test', keyPassword: tp };
+            (0, spinner_1.stopSpinner)(ssSpinner, true, 'Self-signed test keystore ready (NOT for Play Store)');
+        }
+        catch (err) {
+            (0, spinner_1.stopSpinner)(ssSpinner, false, 'Failed to generate keystore: ' + err.message);
+            (0, logger_1.error)('Make sure JDK is installed and keytool is in your PATH.');
+            process.exit(1);
+        }
+    }
+    // 3. Security hardening (release only)
+    let originalGradle = null;
+    if (isRelease) {
+        const secSpinner = (0, spinner_1.startSpinner)('Applying release security hardening...');
+        try {
+            originalGradle = await clearJetStartFields(buildGradlePath);
+            if (ks)
+                await injectSigningConfig(buildGradlePath, ks);
+            (0, spinner_1.stopSpinner)(secSpinner, true, 'Dev-server credentials stripped · debuggable=false · R8 enabled');
+        }
+        catch (err) {
+            (0, spinner_1.stopSpinner)(secSpinner, false, 'Hardening failed: ' + err.message);
+            if (originalGradle)
+                await fs_extra_1.default.writeFile(buildGradlePath, originalGradle, 'utf-8');
+            process.exit(1);
+        }
+    }
+    // 4. Build
+    await fs_extra_1.default.ensureDir(outputDir);
+    const cap = (s) => s.charAt(0).toUpperCase() + s.slice(1);
+    const variant = options.flavor
+        ? cap(options.flavor) + (isRelease ? 'Release' : 'Debug')
+        : isRelease ? 'Release' : 'Debug';
+    const task = (isBundle ? 'bundle' : 'assemble') + variant;
+    const gradleArgs = [task, '--parallel', '--build-cache', '--configure-on-demand', '--daemon', '--console=plain'];
+    const startTime = Date.now();
+    let buildResult = { code: 1 };
+    try {
+        buildResult = await runGradle(gradle, gradleArgs, projectPath);
+    }
+    finally {
+        if (originalGradle !== null) {
+            await fs_extra_1.default.writeFile(buildGradlePath, originalGradle, 'utf-8');
+            (0, logger_1.log)('[Build] build.gradle restored');
+        }
+    }
+    const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+    if (buildResult.code !== 0) {
         console.log();
+        (0, logger_1.error)('Build FAILED after ' + elapsed + 'see Gradle output above.');
+        process.exit(1);
     }
-    catch (err) {
-        (0, logger_1.error)(`Build failed: ${err.message}`);
+    // 5. Copy output
+    const outputPath = findOutput(projectPath, isRelease, isBundle, options.flavor);
+    if (!outputPath) {
+        (0, logger_1.error)('Build succeeded but output file not found. Check app/build/outputs/');
         process.exit(1);
     }
+    const ext = isBundle ? '.aab' : '.apk';
+    const suffix = (isRelease && !ks) ? '-unsigned' : '';
+    const destName = 'app-' + (isRelease ? 'release' : 'debug') + suffix + ext;
+    const destPath = path_1.default.join(outputDir, destName);
+    await fs_extra_1.default.copy(outputPath, destPath, { overwrite: true });
+    // 6. Summary
+    console.log();
+    (0, logger_1.success)(chalk_1.default.bold('Build complete in ' + elapsed + 's'));
+    console.log();
+    (0, logger_1.info)('Output:  ' + chalk_1.default.cyan(destPath));
+    console.log();
+    if (isRelease && !ks) {
+        console.log();
+    }
+    if (isRelease && isBundle) {
+        console.log();
+    }
 }
 //# sourceMappingURL=build.js.map