catalyst-core 0.2.0-beta.2 → 0.3.0-beta.1

package/babel.native.config.cjs

@@ -0,0 +1,8 @@
+module.exports = {
+    presets: [
+        ["@babel/preset-env", { targets: { node: "current" } }],
+        ["@babel/preset-react", { runtime: "automatic" }],
+        ["@babel/preset-typescript", { isTSX: true, allExtensions: true }],
+    ],
+    compact: false,
+}

package/bin/catalyst.js

@@ -1,128 +1,72 @@
 #!/usr/bin/env node
-"use strict"
-process.on("unhandledRejection", (err) => {
-    throw err
-})
-const { spawnSync } = require("node:child_process")
-const args = process.argv.slice(2)
 
-// Array of valid commands
-const validCommands = [
-    "build",
-    "start",
-    "serve",
-    "devBuild",
-    "devServe",
-    "plugin",
-    "plugins",
-    "buildApp",
-    "buildApp:ios",
-    "buildApp:android",
-    "setupEmulator",
-    "setupEmulator:ios",
-    "setupEmulator:android",
-]
+import { spawnSync } from "node:child_process"
+import { dirname, resolve } from "node:path"
+import { fileURLToPath } from "node:url"
+
+process.on("unhandledRejection", (error) => {
+    throw error
+})
 
-// Map of platform-specific commands to their script paths
+const __dirname = dirname(fileURLToPath(import.meta.url))
+const args = process.argv.slice(2)
+const webCommands = new Set(["build", "start", "serve", "serve:inspect", "plugin", "plugins"])
 const platformScripts = {
     "setupEmulator:ios": "../dist/native/setupEmulatorIos.js",
     "setupEmulator:android": "../dist/native/androidSetup.js",
     "buildApp:ios": "../dist/native/buildAppIos.js",
     "buildApp:android": "../dist/native/buildAppAndroid.js",
 }
+const validCommands = new Set([...webCommands, "buildApp", "setupEmulator", ...Object.keys(platformScripts)])
+
+const scriptIndex = args.findIndex((arg) => validCommands.has(arg))
+const script = scriptIndex === -1 ? args[0] : args[scriptIndex]
+const nodeArgs = scriptIndex > 0 ? args.slice(0, scriptIndex) : []
+const scriptArgs = args.slice(scriptIndex + 1)
 
-// Helper to check if arg is a platform command
-const isPlatformCommand = (arg, prefix) => {
-    if (!arg.startsWith(`${prefix}:`)) return false
-    const platform = arg.split(":")[1]
-    return ["ios", "android"].includes(platform) || platform === undefined
+function handleProcessResult(result) {
+    if (result.signal) {
+        if (result.signal === "SIGKILL") {
+            console.error("The Catalyst process was terminated with SIGKILL.")
+        } else if (result.signal === "SIGTERM") {
+            console.error("The Catalyst process was terminated with SIGTERM.")
+        }
+        process.exit(1)
+    }
+    process.exit(result.status ?? 1)
 }
 
-// Helper function to run a platform command
-const runPlatformCommand = (baseCommand, platform) => {
-    const command = `${baseCommand}:${platform}`
-    const result = spawnSync(
+function runScript(relativePath, extraArgs = []) {
+    return spawnSync(
         process.execPath,
-        nodeArgs.concat(require.resolve(platformScripts[command])).concat(args.slice(scriptIndex + 1)),
-        { stdio: "inherit" }
+        [...nodeArgs, resolve(__dirname, relativePath), ...extraArgs, ...scriptArgs],
+        {
+            stdio: "inherit",
+        }
     )
-    return result
 }
 
-// Helper function to run commands for all platforms
-const runAllPlatforms = (baseCommand) => {
-    const platforms = ["ios", "android"]
-    for (const platform of platforms) {
-        const result = runPlatformCommand(baseCommand, platform)
-        if (result.status !== 0) {
-            handleProcessResult(result)
-            return
-        }
+function runPlatformCommand(command) {
+    return runScript(platformScripts[command])
+}
+
+if (script === "buildApp" || script === "setupEmulator") {
+    for (const platform of ["ios", "android"]) {
+        const result = runPlatformCommand(`${script}:${platform}`)
+        if (result.status !== 0 || result.signal) handleProcessResult(result)
     }
     process.exit(0)
 }
 
-const scriptIndex = args.findIndex(
-    (x) =>
-        x === "build" ||
-        x === "start" ||
-        x === "serve" ||
-        x === "devBuild" ||
-        x === "devServe" ||
-        x === "plugin" ||
-        x === "plugins" ||
-        isPlatformCommand(x, "buildApp") ||
-        isPlatformCommand(x, "setupEmulator")
-)
-const script = scriptIndex === -1 ? args[0] : args[scriptIndex]
-const nodeArgs = scriptIndex > 0 ? args.slice(0, scriptIndex) : []
-const resolvedScript = script === "plugin" ? "plugins" : script
-
-if (validCommands.includes(script)) {
-    // Handle platform-specific or combined commands
-    if (script === "buildApp" || script === "setupEmulator") {
-        // Run for all platforms if no specific platform is specified
-        runAllPlatforms(script)
-    } else if (script in platformScripts) {
-        // Run for specific platform
-        const result = spawnSync(
-            process.execPath,
-            nodeArgs.concat(require.resolve(platformScripts[script])).concat(args.slice(scriptIndex + 1)),
-            { stdio: "inherit" }
-        )
-        handleProcessResult(result)
-    } else {
-        // Original commands
-        const result = spawnSync(
-            process.execPath,
-            nodeArgs
-                .concat(require.resolve("../dist/scripts/" + resolvedScript))
-                .concat(args.slice(scriptIndex + 1)),
-            { stdio: "inherit" }
-        )
-        handleProcessResult(result)
-    }
-} else {
-    console.log('Unknown script "' + script + '".')
+if (platformScripts[script]) {
+    handleProcessResult(runPlatformCommand(script))
 }
 
-// Helper function to handle process results
-function handleProcessResult(result) {
-    if (result.signal) {
-        if (result.signal === "SIGKILL") {
-            console.log(
-                "The build failed because the process exited too early. " +
-                    "This probably means the system ran out of memory or someone called " +
-                    "`kill -9` on the process."
-            )
-        } else if (result.signal === "SIGTERM") {
-            console.log(
-                "The build failed because the process exited too early. " +
-                    "Someone might have called `kill` or `killall`, or the system could " +
-                    "be shutting down."
-            )
-        }
-        process.exit(1)
-    }
-    process.exit(result.status)
+if (webCommands.has(script)) {
+    const scriptName = script === "plugin" ? "plugins" : script === "serve:inspect" ? "serve" : script
+    const extraArgs = script === "serve:inspect" ? ["--inspect"] : []
+    handleProcessResult(runScript(`../dist/scripts/${scriptName}.js`, extraArgs))
 }
+
+console.error(`Unknown script "${script}".`)
+process.exit(1)

package/changelog.md

@@ -1,3 +1,11 @@
+# 1.0.0-beta.1
+
+- Replaced the Webpack build and SSR pipeline with Vite and ESM.
+- Added React 19 Suspense-aware routing, split components, and manifest-based asset loading.
+- Added opt-in request, compression, flush, and bot-aware OpenTelemetry spans.
+- Preserved native application builds, internal plugins, Sentry exports, and safe-area SSR hydration.
+- Removed the legacy `devBuild` and `devServe` commands.
+
 # Changelog
 
 ## [0.1.0-beta.2] - 2026-05-06

package/dist/caching.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:true});var _apiCaching=require("@tata1mg/api-caching");Object.keys(_apiCaching).forEach(function(key){if(key==="default"||key==="__esModule")return;if(key in exports&&exports[key]===_apiCaching[key])return;Object.defineProperty(exports,key,{enumerable:true,get:function(){return _apiCaching[key];}});});
+export * from "@tata1mg/api-caching"

package/dist/index.jsx

@@ -0,0 +1,8 @@
+export * from "react-router-dom"
+export * from "./web-router/components/RouterDataProvider.jsx"
+export * from "./web-router/components/MetaTag.jsx"
+export { split, hydrationReady } from "./web-router/components/Split.jsx"
+export { split as default } from "./web-router/components/Split.jsx"
+export * from "./web-router/hooks.jsx"
+export * from "./web-router/utils/metaDataUtils.jsx"
+export * from "./server/renderer/document/index.jsx"

package/dist/logger.js

@@ -1,4 +1,10 @@
-"use strict";const pc=require("picocolors");const winston=require("winston");const DailyRotateFile=require("winston-daily-rotate-file");const{createLogger,format,transports}=winston;/**
+import pc from "picocolors"
+import winston from "winston"
+import DailyRotateFile from "winston-daily-rotate-file"
+
+const { createLogger, format, transports } = winston
+
+/**
  * @description Logger library with rotational strategy. Creates a logs folder in root.
  *              With debug, error and info log directories with their respective log files.
  *
@@ -6,5 +12,70 @@
  * @param config { @enableDebugLogs: Bool // default: true }
  * @returns loggerInstance
  *
- */const configureLogger=(config={})=>{const{enableDebugLogs=true,enableFileLogging=true,enableConsoleLogging=true}=config;const consoleTransport=new transports.Console({level:"debug"});const fileTransport=(type="info")=>{return new DailyRotateFile({filename:`${process.env.src_path}/logs/${type}/%DATE%.${type}.log`,datePattern:"YYYY-MM-DD",maxFiles:"3d",// Logs will be removed after 2days,
-loglevel:type,level:type});};const infoLogger=createLogger({format:format.combine(format.timestamp({format:"YYYY-MM-DD HH:mm:ss"}),format.json()),defaultMeta:{loglevel:"info"}});const debugLogger=createLogger({format:format.combine(format.timestamp({format:"YYYY-MM-DD HH:mm:ss"}),format.json()),defaultMeta:{loglevel:"debug"}});const errorLogger=createLogger({format:format.combine(format.timestamp({format:"YYYY-MM-DD HH:mm:ss"}),format.json()),defaultMeta:{loglevel:"error"}});if(enableConsoleLogging&&JSON.parse(enableConsoleLogging)){infoLogger.add(consoleTransport);debugLogger.add(consoleTransport);errorLogger.add(consoleTransport);}if(enableFileLogging&&JSON.parse(enableFileLogging)){infoLogger.add(fileTransport("info"));debugLogger.add(fileTransport("debug"));errorLogger.add(fileTransport("error"));}const Logger={debug:()=>{},error:msg=>{console.log(pc.red(pc.bold("ERROR: "+JSON.stringify(msg))));errorLogger.error(msg);},info:msg=>{console.log(pc.green(pc.bold("INFO: "+JSON.stringify(msg))));infoLogger.info(msg);}};if(enableDebugLogs&&JSON.parse(enableDebugLogs)){Logger.debug=msg=>{console.log(pc.yellow(pc.bold("DEBUG: "+JSON.stringify(msg))));debugLogger.debug(msg);};}if(global)global.logger=Logger;return Logger;};module.exports={configureLogger};
+ */
+const configureLogger = (config = {}) => {
+    const { enableDebugLogs = true, enableFileLogging = true, enableConsoleLogging = true } = config
+
+    const consoleTransport = new transports.Console({ level: "debug" })
+
+    const fileTransport = (type = "info") => {
+        return new DailyRotateFile({
+            filename: `${process.env.src_path}/logs/${type}/%DATE%.${type}.log`,
+            datePattern: "YYYY-MM-DD",
+            maxFiles: "3d", // Logs will be removed after 2days,
+            loglevel: type,
+            level: type,
+        })
+    }
+
+    const infoLogger = createLogger({
+        format: format.combine(format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }), format.json()),
+        defaultMeta: { loglevel: "info" },
+    })
+
+    const debugLogger = createLogger({
+        format: format.combine(format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }), format.json()),
+        defaultMeta: { loglevel: "debug" },
+    })
+
+    const errorLogger = createLogger({
+        format: format.combine(format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }), format.json()),
+        defaultMeta: { loglevel: "error" },
+    })
+
+    if (enableConsoleLogging && JSON.parse(enableConsoleLogging)) {
+        infoLogger.add(consoleTransport)
+        debugLogger.add(consoleTransport)
+        errorLogger.add(consoleTransport)
+    }
+
+    if (enableFileLogging && JSON.parse(enableFileLogging)) {
+        infoLogger.add(fileTransport("info"))
+        debugLogger.add(fileTransport("debug"))
+        errorLogger.add(fileTransport("error"))
+    }
+
+    const Logger = {
+        debug: () => {},
+        error: (msg) => {
+            console.log(pc.red(pc.bold("ERROR: " + JSON.stringify(msg))))
+            errorLogger.error(msg)
+        },
+        info: (msg) => {
+            console.log(pc.green(pc.bold("INFO: " + JSON.stringify(msg))))
+            infoLogger.info(msg)
+        },
+    }
+
+    if (enableDebugLogs && JSON.parse(enableDebugLogs)) {
+        Logger.debug = (msg) => {
+            console.log(pc.yellow(pc.bold("DEBUG: " + JSON.stringify(msg))))
+            debugLogger.debug(msg)
+        }
+    }
+
+    if (global) global.logger = Logger
+    return Logger
+}
+
+export { configureLogger }

package/dist/native/androidProject/app/build.gradle.kts

@@ -110,6 +110,7 @@ android {
             applicationIdSuffix = ".debug"
             versionNameSuffix = "-debug"
             isMinifyEnabled = false
+            enableUnitTestCoverage = true
             buildConfigField("Boolean", "ALLOW_MIXED_CONTENT", "true")
             buildConfigField("String", "LOCAL_IP", "\"${getLocalIpAddress()}\"")
         }

package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/CustomWebview.kt

@@ -7,18 +7,26 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
+import android.view.GestureDetector
+import android.view.MotionEvent
 import android.view.View
 import android.webkit.*
 import androidx.webkit.ServiceWorkerClientCompat
 import androidx.webkit.ServiceWorkerControllerCompat
+import androidx.webkit.WebViewCompat
+import androidx.webkit.WebViewFeature
 import androidx.webkit.WebResourceRequestCompat
 import android.widget.ProgressBar
 import androidx.webkit.WebViewAssetLoader
 import io.yourname.androidproject.WebCacheManager
 import io.yourname.androidproject.URLWhitelistManager
 import io.yourname.androidproject.matchesCachePattern
+import io.yourname.androidproject.utils.BridgeUtils
 import io.yourname.androidproject.utils.CameraUtils
 import io.yourname.androidproject.utils.NetworkUtils
+import io.yourname.androidproject.utils.PerfEventBuffer
+import io.yourname.androidproject.utils.ProfilerNavigationState
+import org.json.JSONObject
 import kotlinx.coroutines.*
 import java.io.FileNotFoundException
 import java.util.Properties
@@ -45,11 +53,15 @@ class CustomWebView(
     private var isInitialApiCalled: Boolean = false  // Flag to track initial page load
     private var isInitialPageLoaded: Boolean = false
     private var buildOptimisation: Boolean = false // Added property for build optimization
+    private var profilerEnabled: Boolean = false
+    private val profilerNavigationState = ProfilerNavigationState()
     private lateinit var assetLoader: WebViewAssetLoader
     private var allowedUrls: List<String> = emptyList()
     private var accessControlEnabled: Boolean = false
     private val offlineAssetPath = "offline/offline.html"
     private val offlineAssetUrl = "file:///android_asset/$offlineAssetPath"
+    private var scrollSessionOpen = false
+    private lateinit var scrollGestureDetector: GestureDetector
     private var offlinePageVisible = false
     private var lastTargetUrl: String? = null
     private var activeOfflineRouteOrigin: String? = null
@@ -62,8 +74,16 @@ class CustomWebView(
     private var assetLoadFailures = 0
 
     init {
+        if (BuildConfig.DEBUG) {
+            PerfEventBuffer.add(JSONObject().apply {
+                put("type", "boot-webview-constructed")
+                put("nativeTime", android.os.SystemClock.elapsedRealtime())
+                put("thread", Thread.currentThread().name)
+            })
+        }
         setupFromProperties()
         cacheManager = WebCacheManager(context, properties)
+        if (profilerEnabled) metricsMonitor.attachWebView(webView)
         offlineCacheService = OfflineCacheService(context)
         setupWebView()
     }
@@ -90,6 +110,7 @@ class CustomWebView(
 
         // Parse buildOptimisation property
         buildOptimisation = properties.getProperty("buildOptimisation", "false").toBoolean()
+        profilerEnabled = PerfEventBuffer.isEnabled()
 
         // Load allowed URLs from properties
         allowedUrls = properties.getProperty("accessControl.allowedUrls", "")
@@ -162,12 +183,26 @@ class CustomWebView(
         }
     }
 
+    private fun loadTopLevelUrl(url: String) {
+        if (BuildConfig.DEBUG) {
+            val navigation = profilerNavigationState.begin(url)
+            if (navigation.shouldReset) PerfEventBuffer.reset()
+            PerfEventBuffer.add(JSONObject().apply {
+                put("type", "boot-load-url")
+                put("nativeTime", android.os.SystemClock.elapsedRealtime())
+                put("url", navigation.url)
+                put("thread", Thread.currentThread().name)
+            })
+        }
+        loadUrlInternal(url)
+    }
+
     fun loadUrl(url: String) {
         lastTargetUrl = url
         offlinePageVisible = false
         visibleOfflineSnapshotUrl = null
         activeOfflineRouteOrigin = null
-        loadUrlInternal(url)
+        loadTopLevelUrl(url)
     }
 
     fun updateLastTargetUrl(url: String) {
@@ -185,7 +220,7 @@ class CustomWebView(
             offlinePageVisible = true
             visibleOfflineSnapshotUrl = null
             activeOfflineRouteOrigin = null
-            loadUrlInternal(offlineAssetUrl)
+            loadTopLevelUrl(offlineAssetUrl)
             if (BuildConfig.DEBUG) {
                 Log.d(TAG, "📴 Showing offline page from assets: $offlineAssetPath")
             }
@@ -228,7 +263,7 @@ class CustomWebView(
             offlinePageVisible = false
             visibleOfflineSnapshotUrl = snapshotUrl
             updateActiveOfflineRoute(url, true)
-            loadUrlInternal(url)
+            loadTopLevelUrl(url)
             if (BuildConfig.DEBUG) {
                 Log.d(TAG, "📴 Loading cached offline route through request interceptor: $url")
             }
@@ -304,6 +339,7 @@ class CustomWebView(
 
     fun destroy() {
         job.cancel()
+        metricsMonitor.detachWebView()
         webView.destroy()
     }
 
@@ -335,6 +371,13 @@ class CustomWebView(
             if (BuildConfig.DEBUG) {
                 Log.d(TAG, "🚀 Hardware acceleration enabled - Thread: ${Thread.currentThread().name}")
             }
+            BridgeUtils.emitPerfEvent(webView, JSONObject().apply {
+                put("type", "hw-accel-change")
+                put("state", "on")
+                put("trigger", "cleanup")
+                put("thread", Thread.currentThread().name)
+                put("nativeTime", android.os.SystemClock.elapsedRealtime())
+            })
         }
     }
 
@@ -345,6 +388,13 @@ class CustomWebView(
             if (BuildConfig.DEBUG) {
                 Log.d(TAG, "⚫ Hardware acceleration disabled - Thread: ${Thread.currentThread().name}")
             }
+            BridgeUtils.emitPerfEvent(webView, JSONObject().apply {
+                put("type", "hw-accel-change")
+                put("state", "off")
+                put("trigger", "cache-serve")
+                put("thread", Thread.currentThread().name)
+                put("nativeTime", android.os.SystemClock.elapsedRealtime())
+            })
         }
     }
 
@@ -472,7 +522,7 @@ class CustomWebView(
                     }
                     offlinePageVisible = false
                     lastTargetUrl = target
-                    loadUrlInternal(target)
+                    loadTopLevelUrl(target)
                 } else if (BuildConfig.DEBUG) {
                     Log.w(TAG, "🔄 Retry requested but no target URL is known")
                 }
@@ -718,6 +768,13 @@ class CustomWebView(
 
     @SuppressLint("SetJavaScriptEnabled")
     private fun setupWebView() {
+        if (profilerEnabled && WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT)) {
+            WebViewCompat.addDocumentStartJavaScript(
+                webView,
+                "window.__CATALYST_PROFILER_ENABLED = true;",
+                setOf("*")
+            )
+        }
         if (BuildConfig.DEBUG) {
             Log.d(TAG, "🌐 Setting up WebView on thread: ${Thread.currentThread().name}")
         }
@@ -1057,14 +1114,53 @@ class CustomWebView(
                     Log.d(TAG, "⏳ Page load started for: $url - Hardware Acceleration: $isHardwareAccelerationEnabled")
                     Log.d(FLOW_TAG, "PAGE started url=$url online=${NetworkUtils.getCurrentStatus(context).isOnline} offlinePageVisible=$offlinePageVisible visibleSnapshot=${visibleOfflineSnapshotUrl ?: "none"} activeOrigin=${activeOfflineRouteOrigin ?: "none"}")
                 }
+
+                if (profilerEnabled) {
+                    val nativeNow = android.os.SystemClock.elapsedRealtime()
+                    view?.evaluateJavascript(
+                        "window.__CATALYST_PROFILER_ENABLED = true; window.__NATIVE_TIME_OFFSET = $nativeNow - performance.now();",
+                        null
+                    )
+                }
+                if (profilerEnabled && url != null) {
+                    val nativeNow = android.os.SystemClock.elapsedRealtime()
+                    PerfEventBuffer.add(JSONObject().apply {
+                        put("type", "boot-page-started")
+                        put("nativeTime", nativeNow)
+                        put("url", url)
+                    })
+                    PerfEventBuffer.add(JSONObject().apply {
+                        put("type", "page-load-start")
+                        put("nativeTime", nativeNow)
+                        put("url", url)
+                    })
+                }
             }
 
             override fun onPageFinished(view: WebView?, url: String?) {
                 progressBar.visibility = View.GONE
                 if(!isInitialPageLoaded){
                     isInitialPageLoaded = true
+                    metricsMonitor.markAppStartComplete()
                 }
                 url?.let { metricsMonitor.trackPageLoadEnd(it) }
+
+                val pageFinishedNative = android.os.SystemClock.elapsedRealtime()
+                if (profilerEnabled && url != null) {
+                    PerfEventBuffer.add(JSONObject().apply {
+                        put("type", "boot-page-finished")
+                        put("nativeTime", pageFinishedNative)
+                        put("url", url)
+                    })
+                    val pageStart = view?.tag as? Long
+                    PerfEventBuffer.add(JSONObject().apply {
+                        put("type", "page-load-end")
+                        put("nativeTime", pageFinishedNative)
+                        put("url", url)
+                        put("durationMs", if (pageStart != null) System.currentTimeMillis() - pageStart else 0L)
+                    })
+                    if (view != null) PerfEventBuffer.scheduleFlush(view)
+                }
                 if (BuildConfig.DEBUG) {
                     val startTime = view?.tag as? Long ?: return
                     val loadTime = System.currentTimeMillis() - startTime
@@ -1095,6 +1191,15 @@ class CustomWebView(
                     if (BuildConfig.DEBUG) {
                         Log.e(FLOW_TAG, "PAGE resource-error mainFrame=${request?.isForMainFrame} method=${request?.method} code=${error.errorCode} description=${error.description} url=${request?.url}")
                     }
+                    if (view != null && request?.isForMainFrame == true) {
+                        BridgeUtils.emitPerfEvent(view, JSONObject().apply {
+                            put("type", "page-load-error")
+                            put("nativeTime", android.os.SystemClock.elapsedRealtime())
+                            put("url", request.url?.toString() ?: "")
+                            put("errorCode", error.errorCode)
+                            put("description", error.description?.toString() ?: "")
+                        })
+                    }
                 }
 
                 val failedUrl = request?.url?.toString()
@@ -1204,5 +1309,39 @@ class CustomWebView(
 
         // Only enable WebView debugging in debug builds
         WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG)
+
+        if (profilerEnabled) {
+            scrollGestureDetector = GestureDetector(context,
+                object : GestureDetector.SimpleOnGestureListener() {
+                    override fun onScroll(
+                        e1: MotionEvent?,
+                        e2: MotionEvent,
+                        distanceX: Float,
+                        distanceY: Float
+                    ): Boolean {
+                        if (!scrollSessionOpen) {
+                            scrollSessionOpen = true
+                            BridgeUtils.emitPerfEvent(webView, JSONObject().apply {
+                                put("type", "scroll-start")
+                                put("nativeTime", android.os.SystemClock.elapsedRealtime())
+                            })
+                        }
+                        return false
+                    }
+                }
+            )
+            webView.setOnTouchListener { _, event ->
+                scrollGestureDetector.onTouchEvent(event)
+                if (scrollSessionOpen &&
+                    (event.action == MotionEvent.ACTION_UP || event.action == MotionEvent.ACTION_CANCEL)) {
+                    scrollSessionOpen = false
+                    BridgeUtils.emitPerfEvent(webView, JSONObject().apply {
+                        put("type", "scroll-end")
+                        put("nativeTime", android.os.SystemClock.elapsedRealtime())
+                    })
+                }
+                false
+            }
+        }
     }
 }

package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/MainActivity.kt

@@ -274,6 +274,9 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
             properties.setProperty("buildType", if (BuildConfig.DEBUG) "debug" else "release")
             properties.setProperty("buildOptimisation", (!BuildConfig.DEBUG).toString())
         }
+        io.yourname.androidproject.utils.PerfEventBuffer.configure(
+            properties.getProperty("profiler.enabled", "false").toBoolean()
+        )
 
         configureEdgeToEdge()
 
@@ -286,16 +289,29 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
             })
         }
 
-        // Initialize MetricsMonitor
+        // Initialize MetricsMonitor — recordAppStart() resets the cold-start clock for this
+        // Activity lifecycle. The singleton may have been constructed in a previous session
+        // (hot restart / Activity recreation), so appStartTime would be stale without this.
         metricsMonitor = MetricsMonitor.getInstance(this)
+        metricsMonitor.recordAppStart()
+
+        // Boot timing: record activity onCreate as the earliest boot event
+        if (BuildConfig.DEBUG) {
+            io.yourname.androidproject.utils.PerfEventBuffer.reset()
+            io.yourname.androidproject.utils.PerfEventBuffer.add(org.json.JSONObject().apply {
+                put("type", "boot-activity-created")
+                put("nativeTime", android.os.SystemClock.elapsedRealtime())
+                put("thread", Thread.currentThread().name)
+            })
+        }
 
         // Setup UI
         binding = ActivityMainBinding.inflate(layoutInflater)
         supportActionBar?.hide()
         setContentView(binding.root)
         
-        // Initialize keyboard utility
-        keyboardUtil = KeyboardUtil(this, binding.webviewContainer)
+        // Initialize keyboard utility (pass webView so keyboard events reach WebPerfCollector)
+        keyboardUtil = KeyboardUtil(this, binding.webviewContainer, binding.webview)
         keyboardUtil.initialize()
         
         // Enable hardware acceleration for the window
@@ -351,6 +367,12 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
         onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 if (customWebView.canGoBack()) {
+                    if (BuildConfig.DEBUG) {
+                        BridgeUtils.emitPerfEvent(customWebView.getWebView(), org.json.JSONObject().apply {
+                            put("type", "navigation-back")
+                            put("nativeTime", android.os.SystemClock.elapsedRealtime())
+                        })
+                    }
                     customWebView.goBack()
                 } else {
                     // Disable this callback and let the system handle back press
@@ -389,9 +411,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
                     customWebView.showOfflineRouteOrOfflinePage(currentUrl)
                 }
             }
-
-            metricsMonitor.markAppStartComplete()
-
         } catch (e: Exception) {
             Log.e(TAG, "Failed to load initial URL: ${e.message}")
             // TODO: Add HTML file workflow - error.html not available yet
@@ -453,6 +472,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
     }
 
     override fun onDestroy() {
+        io.yourname.androidproject.utils.PerfEventBuffer.reset()
         // Log all performance metrics before destroying
         if (BuildConfig.DEBUG) {
             Log.d(TAG, "🏁 App shutting down - logging final metrics...")