@jetstart/cli 1.1.3 → 1.2.0

package/dist/utils/template.js

@@ -472,45 +472,619 @@ sdk.dir=${androidSdkPath.replace(/\\/g, '\\\\')}
 async function generateHotReload(projectPath, packageName) {
     const packagePath = packageName.replace(/\./g, '/');
     const hotReloadPath = path_1.default.join(projectPath, 'app/src/main/java', packagePath, 'HotReload.kt');
-    // Copy from my-app template
-    const sourceFile = path_1.default.join(__dirname, '../../../../my-app/app/src/main/java/com/jetstart/myapp/HotReload.kt');
-    try {
-        let content = await fs_extra_1.default.readFile(sourceFile, 'utf-8');
-        // Replace package name
-        content = content.replace(/package com\.jetstart\.myapp/g, `package ${packageName}`);
-        await fs_extra_1.default.ensureDir(path_1.default.dirname(hotReloadPath));
-        await fs_extra_1.default.writeFile(hotReloadPath, content);
-    }
-    catch (error) {
-        console.warn('[Warning] Could not copy HotReload.kt from my-app. You may need to add it manually.');
+    const content = `package ${packageName}
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.util.Log
+import androidx.core.content.FileProvider
+import okhttp3.*
+import org.json.JSONObject
+import java.io.File
+import java.io.IOException
+
+/**
+ * Hot Reload Manager
+ * Connects to JetStart dev server and automatically reloads the app when code changes
+ */
+object HotReload {
+    private const val TAG = "HotReload"
+    private var webSocket: WebSocket? = null
+    private var activity: Activity? = null
+    private var connectionTime: Long = 0
+    private var ignoreFirstBuild = true
+    private val httpClient = OkHttpClient()
+
+    fun connect(activity: Activity, serverUrl: String, sessionId: String) {
+        this.activity = activity
+
+        val wsUrl = serverUrl.replace("http://", "ws://").replace("https://", "wss://")
+        Log.d(TAG, "Connecting to dev server: \$wsUrl")
+
+        val client = OkHttpClient()
+        val request = Request.Builder()
+            .url(wsUrl)
+            .build()
+
+        webSocket = client.newWebSocket(request, object : WebSocketListener() {
+            override fun onOpen(webSocket: WebSocket, response: Response) {
+                Log.d(TAG, "WebSocket connected")
+                connectionTime = System.currentTimeMillis()
+                ignoreFirstBuild = true // Ignore the first build-complete after connecting
+
+                // Send connect message
+                val connectMsg = JSONObject().apply {
+                    put("type", "client:connect")
+                    put("sessionId", sessionId)
+                    put("clientType", "test-app")
+                }
+                webSocket.send(connectMsg.toString())
+            }
+
+            override fun onMessage(webSocket: WebSocket, text: String) {
+                Log.d(TAG, "Received: \$text")
+
+                try {
+                    val json = JSONObject(text)
+                    val type = json.getString("type")
+
+                    when (type) {
+                        "core:ui-update" -> {
+                            // DSL-based hot reload (FAST)
+                            if (ignoreFirstBuild) {
+                                Log.d(TAG, "Ignoring first UI update (old build)")
+                                ignoreFirstBuild = false
+                                return@onMessage
+                            }
+
+                            val timestamp = json.optLong("timestamp", 0)
+                            val dslContent = json.optString("dslContent", "")
+
+                            Log.d(TAG, "UI update received at \$timestamp, connection at \$connectionTime")
+
+                            // Only update if changes happened AFTER we connected
+                            if (timestamp > connectionTime && dslContent.isNotEmpty()) {
+                                Log.d(TAG, "New UI update detected, recomposing (\${dslContent.length} bytes)")
+
+                                // Update DSL on main thread
+                                activity?.runOnUiThread {
+                                    DSLInterpreter.updateDSL(dslContent)
+                                }
+                            } else {
+                                Log.d(TAG, "Ignoring old UI update")
+                            }
+                        }
+
+                        "core:reload" -> {
+                            Log.d(TAG, "Reload triggered!")
+                            // Restart activity on main thread
+                            activity?.runOnUiThread {
+                                activity?.recreate()
+                            }
+                        }
+
+                        "core:build-complete" -> {
+                            // Full APK rebuild (SLOW - fallback for non-UI changes)
+                            if (ignoreFirstBuild) {
+                                Log.d(TAG, "Ignoring first build-complete (old build)")
+                                ignoreFirstBuild = false
+                                return@onMessage
+                            }
+
+                            val timestamp = json.optLong("timestamp", 0)
+                            val downloadUrl = json.optString("downloadUrl", "")
+
+                            Log.d(TAG, "Build complete at \$timestamp, connection at \$connectionTime")
+                            Log.d(TAG, "Download URL: \$downloadUrl")
+
+                            // Only reload if build happened AFTER we connected
+                            if (timestamp > connectionTime && downloadUrl.isNotEmpty()) {
+                                Log.d(TAG, "New build detected, downloading and installing APK")
+                                downloadAndInstallApk(downloadUrl)
+                            } else {
+                                Log.d(TAG, "Ignoring old build (timestamp before connection)")
+                            }
+                        }
+                    }
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to parse message: \${e.message}")
+                }
+            }
+
+            override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                Log.e(TAG, "WebSocket error: \${t.message}")
+                // Auto-reconnect after 5 seconds
+                android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
+                    connect(activity!!, serverUrl, sessionId)
+                }, 5000)
+            }
+
+            override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+                Log.d(TAG, "WebSocket closed: \$reason")
+            }
+        })
+    }
+
+    fun disconnect() {
+        webSocket?.close(1000, "App closing")
+        webSocket = null
+        activity = null
     }
+
+    private fun downloadAndInstallApk(downloadUrl: String) {
+        Log.d(TAG, "Starting APK download from: \$downloadUrl")
+
+        val request = Request.Builder()
+            .url(downloadUrl)
+            .build()
+
+        httpClient.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                Log.e(TAG, "APK download failed: \${e.message}")
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                if (!response.isSuccessful) {
+                    Log.e(TAG, "APK download failed with code: \${response.code}")
+                    return
+                }
+
+                try {
+                    val apkData = response.body?.bytes()
+                    if (apkData == null) {
+                        Log.e(TAG, "APK data is null")
+                        return
+                    }
+
+                    Log.d(TAG, "APK downloaded successfully (\${apkData.size} bytes)")
+
+                    // Save APK to cache directory
+                    val cacheDir = activity?.cacheDir
+                    if (cacheDir == null) {
+                        Log.e(TAG, "Cache directory is null")
+                        return
+                    }
+
+                    val apkFile = File(cacheDir, "update.apk")
+                    apkFile.outputStream().use { output ->
+                        output.write(apkData)
+                    }
+
+                    Log.d(TAG, "APK saved to: \${apkFile.absolutePath}")
+
+                    // Install APK on main thread
+                    activity?.runOnUiThread {
+                        installApk(apkFile)
+                    }
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to save/install APK: \${e.message}")
+                }
+            }
+        })
+    }
+
+    private fun installApk(apkFile: File) {
+        try {
+            val context = activity ?: return
+
+            val uri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                FileProvider.getUriForFile(
+                    context,
+                    "\${context.packageName}.fileprovider",
+                    apkFile
+                )
+            } else {
+                Uri.fromFile(apkFile)
+            }
+
+            val intent = Intent(Intent.ACTION_VIEW).apply {
+                setDataAndType(uri, "application/vnd.android.package-archive")
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            }
+
+            context.startActivity(intent)
+            Log.d(TAG, "Installation intent started")
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to install APK: \${e.message}")
+        }
+    }
+}
+`;
+    await fs_extra_1.default.ensureDir(path_1.default.dirname(hotReloadPath));
+    await fs_extra_1.default.writeFile(hotReloadPath, content);
 }
 async function generateDSLInterpreter(projectPath, packageName) {
     const packagePath = packageName.replace(/\./g, '/');
     const interpreterPath = path_1.default.join(projectPath, 'app/src/main/java', packagePath, 'DSLInterpreter.kt');
-    const sourceFile = path_1.default.join(__dirname, '../../../../my-app/app/src/main/java/com/jetstart/myapp/DSLInterpreter.kt');
-    try {
-        let content = await fs_extra_1.default.readFile(sourceFile, 'utf-8');
-        content = content.replace(/package com\.jetstart\.myapp/g, `package ${packageName}`);
-        await fs_extra_1.default.ensureDir(path_1.default.dirname(interpreterPath));
-        await fs_extra_1.default.writeFile(interpreterPath, content);
+    const content = `package ${packageName}
+
+import android.util.Log
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+
+/**
+ * DSL Interpreter
+ * Converts JSON DSL to Compose UI at runtime
+ */
+object DSLInterpreter {
+    private const val TAG = "DSLInterpreter"
+
+    private val _currentDSL = MutableStateFlow<UIDefinition?>(null)
+    val currentDSL: StateFlow<UIDefinition?> = _currentDSL
+
+    /**
+     * Update the current DSL definition
+     */
+    fun updateDSL(jsonString: String) {
+        try {
+            val definition = parseUIDefinition(jsonString)
+            _currentDSL.value = definition
+            Log.d(TAG, "DSL updated successfully")
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to parse DSL: \${e.message}", e)
+        }
+    }
+
+    /**
+     * Render DSL as Compose UI
+     */
+    @Composable
+    fun RenderDSL(definition: UIDefinition) {
+        RenderElement(definition.screen)
+    }
+
+    /**
+     * Render individual DSL element
+     */
+    @Composable
+    fun RenderElement(element: DSLElement) {
+        when (element.type) {
+            "Column" -> RenderColumn(element)
+            "Row" -> RenderRow(element)
+            "Box" -> RenderBox(element)
+            "Text" -> RenderText(element)
+            "Button" -> RenderButton(element)
+            "Spacer" -> RenderSpacer(element)
+            else -> {
+                Log.w(TAG, "Unknown element type: \${element.type}")
+                Text("Unsupported: \${element.type}", color = Color.Red)
+            }
+        }
+    }
+
+    @Composable
+    private fun RenderColumn(element: DSLElement) {
+        Column(
+            modifier = parseModifier(element.modifier),
+            horizontalAlignment = parseHorizontalAlignment(element.horizontalAlignment),
+            verticalArrangement = parseVerticalArrangement(element.verticalArrangement)
+        ) {
+            element.children?.forEach { child ->
+                RenderElement(child)
+            }
+        }
+    }
+
+    @Composable
+    private fun RenderRow(element: DSLElement) {
+        Row(
+            modifier = parseModifier(element.modifier),
+            verticalAlignment = parseVerticalAlignment(element.horizontalAlignment),
+            horizontalArrangement = parseHorizontalArrangement(element.verticalArrangement)
+        ) {
+            element.children?.forEach { child ->
+                RenderElement(child)
+            }
+        }
+    }
+
+    @Composable
+    private fun RenderBox(element: DSLElement) {
+        Box(
+            modifier = parseModifier(element.modifier),
+            contentAlignment = parseContentAlignment(element.contentAlignment)
+        ) {
+            element.children?.forEach { child ->
+                RenderElement(child)
+            }
+        }
+    }
+
+    @Composable
+    private fun RenderText(element: DSLElement) {
+        Text(
+            text = element.text ?: "",
+            style = parseTextStyle(element.style),
+            color = parseColor(element.color) ?: Color.Unspecified,
+            modifier = parseModifier(element.modifier)
+        )
+    }
+
+    @Composable
+    private fun RenderButton(element: DSLElement) {
+        Button(
+            onClick = { handleClick(element.onClick) },
+            modifier = parseModifier(element.modifier),
+            enabled = element.enabled ?: true
+        ) {
+            Text(element.text ?: "Button")
+        }
+    }
+
+    @Composable
+    private fun RenderSpacer(element: DSLElement) {
+        Spacer(
+            modifier = Modifier
+                .height(element.height?.dp ?: 0.dp)
+                .width(element.width?.dp ?: 0.dp)
+        )
+    }
+
+    /**
+     * Parse DSL modifier to Compose Modifier
+     */
+    private fun parseModifier(dslModifier: DSLModifier?): Modifier {
+        var modifier: Modifier = Modifier
+
+        dslModifier?.let { m ->
+            if (m.fillMaxSize == true) modifier = modifier.fillMaxSize()
+            if (m.fillMaxWidth == true) modifier = modifier.fillMaxWidth()
+            if (m.fillMaxHeight == true) modifier = modifier.fillMaxHeight()
+
+            m.padding?.let { modifier = modifier.padding(it.dp) }
+            m.paddingHorizontal?.let { modifier = modifier.padding(horizontal = it.dp) }
+            m.paddingVertical?.let { modifier = modifier.padding(vertical = it.dp) }
+
+            m.size?.let { modifier = modifier.size(it.dp) }
+            m.height?.let { modifier = modifier.height(it.dp) }
+            m.width?.let { modifier = modifier.width(it.dp) }
+
+            // Note: weight() is only available in RowScope/ColumnScope
+            // We'll handle it separately when needed
+        }
+
+        return modifier
+    }
+
+    /**
+     * Parse alignment strings
+     */
+    private fun parseHorizontalAlignment(alignment: String?): Alignment.Horizontal {
+        return when (alignment?.lowercase()) {
+            "start" -> Alignment.Start
+            "centerhorizontally", "center" -> Alignment.CenterHorizontally
+            "end" -> Alignment.End
+            else -> Alignment.Start
+        }
     }
-    catch (error) {
-        console.warn('[Warning] Could not copy DSLInterpreter.kt from my-app. You may need to add it manually.');
+
+    private fun parseVerticalAlignment(alignment: String?): Alignment.Vertical {
+        return when (alignment?.lowercase()) {
+            "top" -> Alignment.Top
+            "centervertically", "center" -> Alignment.CenterVertically
+            "bottom" -> Alignment.Bottom
+            else -> Alignment.Top
+        }
+    }
+
+    private fun parseContentAlignment(alignment: String?): Alignment {
+        return when (alignment?.lowercase()) {
+            "center" -> Alignment.Center
+            "topcenter" -> Alignment.TopCenter
+            "topstart" -> Alignment.TopStart
+            "topend" -> Alignment.TopEnd
+            "bottomcenter" -> Alignment.BottomCenter
+            "bottomstart" -> Alignment.BottomStart
+            "bottomend" -> Alignment.BottomEnd
+            "centerstart" -> Alignment.CenterStart
+            "centerend" -> Alignment.CenterEnd
+            else -> Alignment.TopStart
+        }
+    }
+
+    private fun parseVerticalArrangement(arrangement: String?): Arrangement.Vertical {
+        return when (arrangement?.lowercase()) {
+            "top" -> Arrangement.Top
+            "center" -> Arrangement.Center
+            "bottom" -> Arrangement.Bottom
+            "spacebetween" -> Arrangement.SpaceBetween
+            "spacearound" -> Arrangement.SpaceAround
+            "spaceevenly" -> Arrangement.SpaceEvenly
+            else -> Arrangement.Top
+        }
+    }
+
+    private fun parseHorizontalArrangement(arrangement: String?): Arrangement.Horizontal {
+        return when (arrangement?.lowercase()) {
+            "start" -> Arrangement.Start
+            "center" -> Arrangement.Center
+            "end" -> Arrangement.End
+            "spacebetween" -> Arrangement.SpaceBetween
+            "spacearound" -> Arrangement.SpaceAround
+            "spaceevenly" -> Arrangement.SpaceEvenly
+            else -> Arrangement.Start
+        }
+    }
+
+    /**
+     * Parse text style
+     */
+    @Composable
+    private fun parseTextStyle(style: String?): androidx.compose.ui.text.TextStyle {
+        return when (style?.lowercase()) {
+            "headlinelarge" -> MaterialTheme.typography.headlineLarge
+            "headlinemedium" -> MaterialTheme.typography.headlineMedium
+            "headlinesmall" -> MaterialTheme.typography.headlineSmall
+            "titlelarge" -> MaterialTheme.typography.titleLarge
+            "titlemedium" -> MaterialTheme.typography.titleMedium
+            "titlesmall" -> MaterialTheme.typography.titleSmall
+            "bodylarge" -> MaterialTheme.typography.bodyLarge
+            "bodymedium" -> MaterialTheme.typography.bodyMedium
+            "bodysmall" -> MaterialTheme.typography.bodySmall
+            "labellarge" -> MaterialTheme.typography.labelLarge
+            "labelmedium" -> MaterialTheme.typography.labelMedium
+            "labelsmall" -> MaterialTheme.typography.labelSmall
+            else -> MaterialTheme.typography.bodyMedium
+        }
+    }
+
+    /**
+     * Parse color from string
+     */
+    private fun parseColor(colorString: String?): Color? {
+        if (colorString == null) return null
+
+        return try {
+            when {
+                colorString.startsWith("#") -> {
+                    // Hex color
+                    Color(android.graphics.Color.parseColor(colorString))
+                }
+                else -> null
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to parse color: \$colorString")
+            null
+        }
+    }
+
+    /**
+     * Handle click events
+     */
+    private fun handleClick(action: String?) {
+        if (action != null) {
+            Log.d(TAG, "Button clicked: \$action")
+            // TODO: Implement action handling
+        }
     }
 }
+`;
+    await fs_extra_1.default.ensureDir(path_1.default.dirname(interpreterPath));
+    await fs_extra_1.default.writeFile(interpreterPath, content);
+}
 async function generateDSLTypes(projectPath, packageName) {
     const packagePath = packageName.replace(/\./g, '/');
     const typesPath = path_1.default.join(projectPath, 'app/src/main/java', packagePath, 'DSLTypes.kt');
-    const sourceFile = path_1.default.join(__dirname, '../../../../my-app/app/src/main/java/com/jetstart/myapp/DSLTypes.kt');
-    try {
-        let content = await fs_extra_1.default.readFile(sourceFile, 'utf-8');
-        content = content.replace(/package com\.jetstart\.myapp/g, `package ${packageName}`);
-        await fs_extra_1.default.ensureDir(path_1.default.dirname(typesPath));
-        await fs_extra_1.default.writeFile(typesPath, content);
-    }
-    catch (error) {
-        console.warn('[Warning] Could not copy DSLTypes.kt from my-app. You may need to add it manually.');
-    }
+    const content = `package ${packageName}
+
+import org.json.JSONArray
+import org.json.JSONObject
+
+/**
+ * DSL Type Definitions
+ * Represents UI elements in JSON format that can be interpreted at runtime
+ */
+
+data class UIDefinition(
+    val version: String = "1.0",
+    val screen: DSLElement
+)
+
+data class DSLElement(
+    val type: String,
+    val text: String? = null,
+    val style: String? = null,
+    val color: String? = null,
+    val modifier: DSLModifier? = null,
+    val horizontalAlignment: String? = null,
+    val verticalArrangement: String? = null,
+    val contentAlignment: String? = null,
+    val height: Int? = null,
+    val width: Int? = null,
+    val onClick: String? = null,
+    val enabled: Boolean? = true,
+    val imageVector: String? = null,
+    val tint: String? = null,
+    val contentDescription: String? = null,
+    val children: List<DSLElement>? = null
+)
+
+data class DSLModifier(
+    val fillMaxSize: Boolean? = null,
+    val fillMaxWidth: Boolean? = null,
+    val fillMaxHeight: Boolean? = null,
+    val padding: Int? = null,
+    val paddingHorizontal: Int? = null,
+    val paddingVertical: Int? = null,
+    val size: Int? = null,
+    val height: Int? = null,
+    val width: Int? = null,
+    val weight: Float? = null
+)
+
+/**
+ * Parse JSON string to UIDefinition
+ */
+fun parseUIDefinition(json: String): UIDefinition {
+    val obj = JSONObject(json)
+    val version = obj.optString("version", "1.0")
+    val screenObj = obj.getJSONObject("screen")
+
+    return UIDefinition(
+        version = version,
+        screen = parseDSLElement(screenObj)
+    )
+}
+
+/**
+ * Parse JSONObject to DSLElement
+ */
+fun parseDSLElement(obj: JSONObject): DSLElement {
+    val children = if (obj.has("children")) {
+        val childrenArray = obj.getJSONArray("children")
+        List(childrenArray.length()) { i ->
+            parseDSLElement(childrenArray.getJSONObject(i))
+        }
+    } else null
+
+    val modifier = if (obj.has("modifier")) {
+        val modObj = obj.getJSONObject("modifier")
+        DSLModifier(
+            fillMaxSize = modObj.optBoolean("fillMaxSize"),
+            fillMaxWidth = modObj.optBoolean("fillMaxWidth"),
+            fillMaxHeight = modObj.optBoolean("fillMaxHeight"),
+            padding = if (modObj.has("padding")) modObj.getInt("padding") else null,
+            paddingHorizontal = if (modObj.has("paddingHorizontal")) modObj.getInt("paddingHorizontal") else null,
+            paddingVertical = if (modObj.has("paddingVertical")) modObj.getInt("paddingVertical") else null,
+            size = if (modObj.has("size")) modObj.getInt("size") else null,
+            height = if (modObj.has("height")) modObj.getInt("height") else null,
+            width = if (modObj.has("width")) modObj.getInt("width") else null,
+            weight = if (modObj.has("weight")) modObj.getDouble("weight").toFloat() else null
+        )
+    } else null
+
+    return DSLElement(
+        type = obj.getString("type"),
+        text = if (obj.has("text")) obj.getString("text") else null,
+        style = if (obj.has("style")) obj.getString("style") else null,
+        color = if (obj.has("color")) obj.getString("color") else null,
+        modifier = modifier,
+        horizontalAlignment = if (obj.has("horizontalAlignment")) obj.getString("horizontalAlignment") else null,
+        verticalArrangement = if (obj.has("verticalArrangement")) obj.getString("verticalArrangement") else null,
+        contentAlignment = if (obj.has("contentAlignment")) obj.getString("contentAlignment") else null,
+        height = if (obj.has("height")) obj.getInt("height") else null,
+        width = if (obj.has("width")) obj.getInt("width") else null,
+        onClick = if (obj.has("onClick")) obj.getString("onClick") else null,
+        enabled = obj.optBoolean("enabled", true),
+        imageVector = if (obj.has("imageVector")) obj.getString("imageVector") else null,
+        tint = if (obj.has("tint")) obj.getString("tint") else null,
+        contentDescription = if (obj.has("contentDescription")) obj.getString("contentDescription") else null,
+        children = children
+    )
+}
+`;
+    await fs_extra_1.default.ensureDir(path_1.default.dirname(typesPath));
+    await fs_extra_1.default.writeFile(typesPath, content);
 }
 //# sourceMappingURL=template.js.map

package/dist/utils/template.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetstart/cli",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "Command-line interface for JetStart",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -36,8 +36,8 @@
   },
   "homepage": "https://github.com/dev-phantom/jetstart#readme",
   "dependencies": {
-    "@jetstart/core": "^1.1.3",
-    "@jetstart/shared": "^1.1.3",
+    "@jetstart/core": "^1.2.0",
+    "@jetstart/shared": "^1.2.0",
     "axios": "^1.6.2",
     "chalk": "^4.1.2",
     "commander": "^11.1.0",

package/src/utils/template.ts

@@ -569,19 +569,230 @@ async function generateHotReload(
     'HotReload.kt'
   );
 
-  // Copy from my-app template
-  const sourceFile = path.join(__dirname, '../../../../my-app/app/src/main/java/com/jetstart/myapp/HotReload.kt');
-  
-  try {
-    let content = await fs.readFile(sourceFile, 'utf-8');
-    // Replace package name
-    content = content.replace(/package com\.jetstart\.myapp/g, `package ${packageName}`);
-    
-    await fs.ensureDir(path.dirname(hotReloadPath));
-    await fs.writeFile(hotReloadPath, content);
-  } catch (error) {
-    console.warn('[Warning] Could not copy HotReload.kt from my-app. You may need to add it manually.');
-  }
+  const content = `package ${packageName}
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.util.Log
+import androidx.core.content.FileProvider
+import okhttp3.*
+import org.json.JSONObject
+import java.io.File
+import java.io.IOException
+
+/**
+ * Hot Reload Manager
+ * Connects to JetStart dev server and automatically reloads the app when code changes
+ */
+object HotReload {
+    private const val TAG = "HotReload"
+    private var webSocket: WebSocket? = null
+    private var activity: Activity? = null
+    private var connectionTime: Long = 0
+    private var ignoreFirstBuild = true
+    private val httpClient = OkHttpClient()
+
+    fun connect(activity: Activity, serverUrl: String, sessionId: String) {
+        this.activity = activity
+
+        val wsUrl = serverUrl.replace("http://", "ws://").replace("https://", "wss://")
+        Log.d(TAG, "Connecting to dev server: \$wsUrl")
+
+        val client = OkHttpClient()
+        val request = Request.Builder()
+            .url(wsUrl)
+            .build()
+
+        webSocket = client.newWebSocket(request, object : WebSocketListener() {
+            override fun onOpen(webSocket: WebSocket, response: Response) {
+                Log.d(TAG, "WebSocket connected")
+                connectionTime = System.currentTimeMillis()
+                ignoreFirstBuild = true // Ignore the first build-complete after connecting
+
+                // Send connect message
+                val connectMsg = JSONObject().apply {
+                    put("type", "client:connect")
+                    put("sessionId", sessionId)
+                    put("clientType", "test-app")
+                }
+                webSocket.send(connectMsg.toString())
+            }
+
+            override fun onMessage(webSocket: WebSocket, text: String) {
+                Log.d(TAG, "Received: \$text")
+
+                try {
+                    val json = JSONObject(text)
+                    val type = json.getString("type")
+
+                    when (type) {
+                        "core:ui-update" -> {
+                            // DSL-based hot reload (FAST)
+                            if (ignoreFirstBuild) {
+                                Log.d(TAG, "Ignoring first UI update (old build)")
+                                ignoreFirstBuild = false
+                                return@onMessage
+                            }
+
+                            val timestamp = json.optLong("timestamp", 0)
+                            val dslContent = json.optString("dslContent", "")
+
+                            Log.d(TAG, "UI update received at \$timestamp, connection at \$connectionTime")
+
+                            // Only update if changes happened AFTER we connected
+                            if (timestamp > connectionTime && dslContent.isNotEmpty()) {
+                                Log.d(TAG, "New UI update detected, recomposing (\${dslContent.length} bytes)")
+
+                                // Update DSL on main thread
+                                activity?.runOnUiThread {
+                                    DSLInterpreter.updateDSL(dslContent)
+                                }
+                            } else {
+                                Log.d(TAG, "Ignoring old UI update")
+                            }
+                        }
+
+                        "core:reload" -> {
+                            Log.d(TAG, "Reload triggered!")
+                            // Restart activity on main thread
+                            activity?.runOnUiThread {
+                                activity?.recreate()
+                            }
+                        }
+
+                        "core:build-complete" -> {
+                            // Full APK rebuild (SLOW - fallback for non-UI changes)
+                            if (ignoreFirstBuild) {
+                                Log.d(TAG, "Ignoring first build-complete (old build)")
+                                ignoreFirstBuild = false
+                                return@onMessage
+                            }
+
+                            val timestamp = json.optLong("timestamp", 0)
+                            val downloadUrl = json.optString("downloadUrl", "")
+
+                            Log.d(TAG, "Build complete at \$timestamp, connection at \$connectionTime")
+                            Log.d(TAG, "Download URL: \$downloadUrl")
+
+                            // Only reload if build happened AFTER we connected
+                            if (timestamp > connectionTime && downloadUrl.isNotEmpty()) {
+                                Log.d(TAG, "New build detected, downloading and installing APK")
+                                downloadAndInstallApk(downloadUrl)
+                            } else {
+                                Log.d(TAG, "Ignoring old build (timestamp before connection)")
+                            }
+                        }
+                    }
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to parse message: \${e.message}")
+                }
+            }
+
+            override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                Log.e(TAG, "WebSocket error: \${t.message}")
+                // Auto-reconnect after 5 seconds
+                android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
+                    connect(activity!!, serverUrl, sessionId)
+                }, 5000)
+            }
+
+            override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+                Log.d(TAG, "WebSocket closed: \$reason")
+            }
+        })
+    }
+
+    fun disconnect() {
+        webSocket?.close(1000, "App closing")
+        webSocket = null
+        activity = null
+    }
+
+    private fun downloadAndInstallApk(downloadUrl: String) {
+        Log.d(TAG, "Starting APK download from: \$downloadUrl")
+
+        val request = Request.Builder()
+            .url(downloadUrl)
+            .build()
+
+        httpClient.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                Log.e(TAG, "APK download failed: \${e.message}")
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                if (!response.isSuccessful) {
+                    Log.e(TAG, "APK download failed with code: \${response.code}")
+                    return
+                }
+
+                try {
+                    val apkData = response.body?.bytes()
+                    if (apkData == null) {
+                        Log.e(TAG, "APK data is null")
+                        return
+                    }
+
+                    Log.d(TAG, "APK downloaded successfully (\${apkData.size} bytes)")
+
+                    // Save APK to cache directory
+                    val cacheDir = activity?.cacheDir
+                    if (cacheDir == null) {
+                        Log.e(TAG, "Cache directory is null")
+                        return
+                    }
+
+                    val apkFile = File(cacheDir, "update.apk")
+                    apkFile.outputStream().use { output ->
+                        output.write(apkData)
+                    }
+
+                    Log.d(TAG, "APK saved to: \${apkFile.absolutePath}")
+
+                    // Install APK on main thread
+                    activity?.runOnUiThread {
+                        installApk(apkFile)
+                    }
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to save/install APK: \${e.message}")
+                }
+            }
+        })
+    }
+
+    private fun installApk(apkFile: File) {
+        try {
+            val context = activity ?: return
+
+            val uri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                FileProvider.getUriForFile(
+                    context,
+                    "\${context.packageName}.fileprovider",
+                    apkFile
+                )
+            } else {
+                Uri.fromFile(apkFile)
+            }
+
+            val intent = Intent(Intent.ACTION_VIEW).apply {
+                setDataAndType(uri, "application/vnd.android.package-archive")
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            }
+
+            context.startActivity(intent)
+            Log.d(TAG, "Installation intent started")
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to install APK: \${e.message}")
+        }
+    }
+}
+`;
+
+  await fs.ensureDir(path.dirname(hotReloadPath));
+  await fs.writeFile(hotReloadPath, content);
 }
 
 async function generateDSLInterpreter(
@@ -596,17 +807,280 @@ async function generateDSLInterpreter(
     'DSLInterpreter.kt'
   );
 
-  const sourceFile = path.join(__dirname, '../../../../my-app/app/src/main/java/com/jetstart/myapp/DSLInterpreter.kt');
-  
-  try {
-    let content = await fs.readFile(sourceFile, 'utf-8');
-    content = content.replace(/package com\.jetstart\.myapp/g, `package ${packageName}`);
-    
-    await fs.ensureDir(path.dirname(interpreterPath));
-    await fs.writeFile(interpreterPath, content);
-  } catch (error) {
-    console.warn('[Warning] Could not copy DSLInterpreter.kt from my-app. You may need to add it manually.');
-  }
+  const content = `package ${packageName}
+
+import android.util.Log
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+
+/**
+ * DSL Interpreter
+ * Converts JSON DSL to Compose UI at runtime
+ */
+object DSLInterpreter {
+    private const val TAG = "DSLInterpreter"
+
+    private val _currentDSL = MutableStateFlow<UIDefinition?>(null)
+    val currentDSL: StateFlow<UIDefinition?> = _currentDSL
+
+    /**
+     * Update the current DSL definition
+     */
+    fun updateDSL(jsonString: String) {
+        try {
+            val definition = parseUIDefinition(jsonString)
+            _currentDSL.value = definition
+            Log.d(TAG, "DSL updated successfully")
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to parse DSL: \${e.message}", e)
+        }
+    }
+
+    /**
+     * Render DSL as Compose UI
+     */
+    @Composable
+    fun RenderDSL(definition: UIDefinition) {
+        RenderElement(definition.screen)
+    }
+
+    /**
+     * Render individual DSL element
+     */
+    @Composable
+    fun RenderElement(element: DSLElement) {
+        when (element.type) {
+            "Column" -> RenderColumn(element)
+            "Row" -> RenderRow(element)
+            "Box" -> RenderBox(element)
+            "Text" -> RenderText(element)
+            "Button" -> RenderButton(element)
+            "Spacer" -> RenderSpacer(element)
+            else -> {
+                Log.w(TAG, "Unknown element type: \${element.type}")
+                Text("Unsupported: \${element.type}", color = Color.Red)
+            }
+        }
+    }
+
+    @Composable
+    private fun RenderColumn(element: DSLElement) {
+        Column(
+            modifier = parseModifier(element.modifier),
+            horizontalAlignment = parseHorizontalAlignment(element.horizontalAlignment),
+            verticalArrangement = parseVerticalArrangement(element.verticalArrangement)
+        ) {
+            element.children?.forEach { child ->
+                RenderElement(child)
+            }
+        }
+    }
+
+    @Composable
+    private fun RenderRow(element: DSLElement) {
+        Row(
+            modifier = parseModifier(element.modifier),
+            verticalAlignment = parseVerticalAlignment(element.horizontalAlignment),
+            horizontalArrangement = parseHorizontalArrangement(element.verticalArrangement)
+        ) {
+            element.children?.forEach { child ->
+                RenderElement(child)
+            }
+        }
+    }
+
+    @Composable
+    private fun RenderBox(element: DSLElement) {
+        Box(
+            modifier = parseModifier(element.modifier),
+            contentAlignment = parseContentAlignment(element.contentAlignment)
+        ) {
+            element.children?.forEach { child ->
+                RenderElement(child)
+            }
+        }
+    }
+
+    @Composable
+    private fun RenderText(element: DSLElement) {
+        Text(
+            text = element.text ?: "",
+            style = parseTextStyle(element.style),
+            color = parseColor(element.color) ?: Color.Unspecified,
+            modifier = parseModifier(element.modifier)
+        )
+    }
+
+    @Composable
+    private fun RenderButton(element: DSLElement) {
+        Button(
+            onClick = { handleClick(element.onClick) },
+            modifier = parseModifier(element.modifier),
+            enabled = element.enabled ?: true
+        ) {
+            Text(element.text ?: "Button")
+        }
+    }
+
+    @Composable
+    private fun RenderSpacer(element: DSLElement) {
+        Spacer(
+            modifier = Modifier
+                .height(element.height?.dp ?: 0.dp)
+                .width(element.width?.dp ?: 0.dp)
+        )
+    }
+
+    /**
+     * Parse DSL modifier to Compose Modifier
+     */
+    private fun parseModifier(dslModifier: DSLModifier?): Modifier {
+        var modifier: Modifier = Modifier
+
+        dslModifier?.let { m ->
+            if (m.fillMaxSize == true) modifier = modifier.fillMaxSize()
+            if (m.fillMaxWidth == true) modifier = modifier.fillMaxWidth()
+            if (m.fillMaxHeight == true) modifier = modifier.fillMaxHeight()
+
+            m.padding?.let { modifier = modifier.padding(it.dp) }
+            m.paddingHorizontal?.let { modifier = modifier.padding(horizontal = it.dp) }
+            m.paddingVertical?.let { modifier = modifier.padding(vertical = it.dp) }
+
+            m.size?.let { modifier = modifier.size(it.dp) }
+            m.height?.let { modifier = modifier.height(it.dp) }
+            m.width?.let { modifier = modifier.width(it.dp) }
+
+            // Note: weight() is only available in RowScope/ColumnScope
+            // We'll handle it separately when needed
+        }
+
+        return modifier
+    }
+
+    /**
+     * Parse alignment strings
+     */
+    private fun parseHorizontalAlignment(alignment: String?): Alignment.Horizontal {
+        return when (alignment?.lowercase()) {
+            "start" -> Alignment.Start
+            "centerhorizontally", "center" -> Alignment.CenterHorizontally
+            "end" -> Alignment.End
+            else -> Alignment.Start
+        }
+    }
+
+    private fun parseVerticalAlignment(alignment: String?): Alignment.Vertical {
+        return when (alignment?.lowercase()) {
+            "top" -> Alignment.Top
+            "centervertically", "center" -> Alignment.CenterVertically
+            "bottom" -> Alignment.Bottom
+            else -> Alignment.Top
+        }
+    }
+
+    private fun parseContentAlignment(alignment: String?): Alignment {
+        return when (alignment?.lowercase()) {
+            "center" -> Alignment.Center
+            "topcenter" -> Alignment.TopCenter
+            "topstart" -> Alignment.TopStart
+            "topend" -> Alignment.TopEnd
+            "bottomcenter" -> Alignment.BottomCenter
+            "bottomstart" -> Alignment.BottomStart
+            "bottomend" -> Alignment.BottomEnd
+            "centerstart" -> Alignment.CenterStart
+            "centerend" -> Alignment.CenterEnd
+            else -> Alignment.TopStart
+        }
+    }
+
+    private fun parseVerticalArrangement(arrangement: String?): Arrangement.Vertical {
+        return when (arrangement?.lowercase()) {
+            "top" -> Arrangement.Top
+            "center" -> Arrangement.Center
+            "bottom" -> Arrangement.Bottom
+            "spacebetween" -> Arrangement.SpaceBetween
+            "spacearound" -> Arrangement.SpaceAround
+            "spaceevenly" -> Arrangement.SpaceEvenly
+            else -> Arrangement.Top
+        }
+    }
+
+    private fun parseHorizontalArrangement(arrangement: String?): Arrangement.Horizontal {
+        return when (arrangement?.lowercase()) {
+            "start" -> Arrangement.Start
+            "center" -> Arrangement.Center
+            "end" -> Arrangement.End
+            "spacebetween" -> Arrangement.SpaceBetween
+            "spacearound" -> Arrangement.SpaceAround
+            "spaceevenly" -> Arrangement.SpaceEvenly
+            else -> Arrangement.Start
+        }
+    }
+
+    /**
+     * Parse text style
+     */
+    @Composable
+    private fun parseTextStyle(style: String?): androidx.compose.ui.text.TextStyle {
+        return when (style?.lowercase()) {
+            "headlinelarge" -> MaterialTheme.typography.headlineLarge
+            "headlinemedium" -> MaterialTheme.typography.headlineMedium
+            "headlinesmall" -> MaterialTheme.typography.headlineSmall
+            "titlelarge" -> MaterialTheme.typography.titleLarge
+            "titlemedium" -> MaterialTheme.typography.titleMedium
+            "titlesmall" -> MaterialTheme.typography.titleSmall
+            "bodylarge" -> MaterialTheme.typography.bodyLarge
+            "bodymedium" -> MaterialTheme.typography.bodyMedium
+            "bodysmall" -> MaterialTheme.typography.bodySmall
+            "labellarge" -> MaterialTheme.typography.labelLarge
+            "labelmedium" -> MaterialTheme.typography.labelMedium
+            "labelsmall" -> MaterialTheme.typography.labelSmall
+            else -> MaterialTheme.typography.bodyMedium
+        }
+    }
+
+    /**
+     * Parse color from string
+     */
+    private fun parseColor(colorString: String?): Color? {
+        if (colorString == null) return null
+
+        return try {
+            when {
+                colorString.startsWith("#") -> {
+                    // Hex color
+                    Color(android.graphics.Color.parseColor(colorString))
+                }
+                else -> null
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "Failed to parse color: \$colorString")
+            null
+        }
+    }
+
+    /**
+     * Handle click events
+     */
+    private fun handleClick(action: String?) {
+        if (action != null) {
+            Log.d(TAG, "Button clicked: \$action")
+            // TODO: Implement action handling
+        }
+    }
+}
+`;
+
+  await fs.ensureDir(path.dirname(interpreterPath));
+  await fs.writeFile(interpreterPath, content);
 }
 
 async function generateDSLTypes(
@@ -621,15 +1095,115 @@ async function generateDSLTypes(
     'DSLTypes.kt'
   );
 
-  const sourceFile = path.join(__dirname, '../../../../my-app/app/src/main/java/com/jetstart/myapp/DSLTypes.kt');
-  
-  try {
-    let content = await fs.readFile(sourceFile, 'utf-8');
-    content = content.replace(/package com\.jetstart\.myapp/g, `package ${packageName}`);
-    
-    await fs.ensureDir(path.dirname(typesPath));
-    await fs.writeFile(typesPath, content);
-  } catch (error) {
-    console.warn('[Warning] Could not copy DSLTypes.kt from my-app. You may need to add it manually.');
-  }
+  const content = `package ${packageName}
+
+import org.json.JSONArray
+import org.json.JSONObject
+
+/**
+ * DSL Type Definitions
+ * Represents UI elements in JSON format that can be interpreted at runtime
+ */
+
+data class UIDefinition(
+    val version: String = "1.0",
+    val screen: DSLElement
+)
+
+data class DSLElement(
+    val type: String,
+    val text: String? = null,
+    val style: String? = null,
+    val color: String? = null,
+    val modifier: DSLModifier? = null,
+    val horizontalAlignment: String? = null,
+    val verticalArrangement: String? = null,
+    val contentAlignment: String? = null,
+    val height: Int? = null,
+    val width: Int? = null,
+    val onClick: String? = null,
+    val enabled: Boolean? = true,
+    val imageVector: String? = null,
+    val tint: String? = null,
+    val contentDescription: String? = null,
+    val children: List<DSLElement>? = null
+)
+
+data class DSLModifier(
+    val fillMaxSize: Boolean? = null,
+    val fillMaxWidth: Boolean? = null,
+    val fillMaxHeight: Boolean? = null,
+    val padding: Int? = null,
+    val paddingHorizontal: Int? = null,
+    val paddingVertical: Int? = null,
+    val size: Int? = null,
+    val height: Int? = null,
+    val width: Int? = null,
+    val weight: Float? = null
+)
+
+/**
+ * Parse JSON string to UIDefinition
+ */
+fun parseUIDefinition(json: String): UIDefinition {
+    val obj = JSONObject(json)
+    val version = obj.optString("version", "1.0")
+    val screenObj = obj.getJSONObject("screen")
+
+    return UIDefinition(
+        version = version,
+        screen = parseDSLElement(screenObj)
+    )
+}
+
+/**
+ * Parse JSONObject to DSLElement
+ */
+fun parseDSLElement(obj: JSONObject): DSLElement {
+    val children = if (obj.has("children")) {
+        val childrenArray = obj.getJSONArray("children")
+        List(childrenArray.length()) { i ->
+            parseDSLElement(childrenArray.getJSONObject(i))
+        }
+    } else null
+
+    val modifier = if (obj.has("modifier")) {
+        val modObj = obj.getJSONObject("modifier")
+        DSLModifier(
+            fillMaxSize = modObj.optBoolean("fillMaxSize"),
+            fillMaxWidth = modObj.optBoolean("fillMaxWidth"),
+            fillMaxHeight = modObj.optBoolean("fillMaxHeight"),
+            padding = if (modObj.has("padding")) modObj.getInt("padding") else null,
+            paddingHorizontal = if (modObj.has("paddingHorizontal")) modObj.getInt("paddingHorizontal") else null,
+            paddingVertical = if (modObj.has("paddingVertical")) modObj.getInt("paddingVertical") else null,
+            size = if (modObj.has("size")) modObj.getInt("size") else null,
+            height = if (modObj.has("height")) modObj.getInt("height") else null,
+            width = if (modObj.has("width")) modObj.getInt("width") else null,
+            weight = if (modObj.has("weight")) modObj.getDouble("weight").toFloat() else null
+        )
+    } else null
+
+    return DSLElement(
+        type = obj.getString("type"),
+        text = if (obj.has("text")) obj.getString("text") else null,
+        style = if (obj.has("style")) obj.getString("style") else null,
+        color = if (obj.has("color")) obj.getString("color") else null,
+        modifier = modifier,
+        horizontalAlignment = if (obj.has("horizontalAlignment")) obj.getString("horizontalAlignment") else null,
+        verticalArrangement = if (obj.has("verticalArrangement")) obj.getString("verticalArrangement") else null,
+        contentAlignment = if (obj.has("contentAlignment")) obj.getString("contentAlignment") else null,
+        height = if (obj.has("height")) obj.getInt("height") else null,
+        width = if (obj.has("width")) obj.getInt("width") else null,
+        onClick = if (obj.has("onClick")) obj.getString("onClick") else null,
+        enabled = obj.optBoolean("enabled", true),
+        imageVector = if (obj.has("imageVector")) obj.getString("imageVector") else null,
+        tint = if (obj.has("tint")) obj.getString("tint") else null,
+        contentDescription = if (obj.has("contentDescription")) obj.getString("contentDescription") else null,
+        children = children
+    )
+}
+`;
+
+  await fs.ensureDir(path.dirname(typesPath));
+  await fs.writeFile(typesPath, content);
 }