peachsim 0.1.658 → 0.1.660

package/dist-lib/native-app-identity.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/native-app-identity.ts
 var NATIVE_APP_IDENTITY_PREFIX = "globalThis.__sootsimNativeAppIdentity=";

package/dist-lib/plist.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/plist.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/plist.ts
 import plistModule from "@expo/plist";

package/dist-lib/profiles.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/public-brand.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/react-native-host-modules.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/react-native-host-modules.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/react-native-host-modules.ts
 var REACT_NATIVE_PASSTHROUGH_SPECIFIERS = [

package/dist-lib/render-mode.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/scripts/dev-server-scanner.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/sdk.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/sdk.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);

package/dist-lib/skills.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;
@@ -58,7 +58,7 @@ function processIdentity(pid) {
 }
 function softwareChromeAllowed(runtime = currentRuntime()) {
   if (runtime.platform !== "linux") return false;
-  return runtime.env.GITHUB_ACTIONS === "true" && runtime.env.RUNNER_OS === "Linux" || runtime.env.CONTRAST_CF_FACTORY_CONTAINER === "1";
+  return runtime.env.GITHUB_ACTIONS === "true" && runtime.env.RUNNER_OS === "Linux" || runtime.env.CONTRAST_CF_FACTORY_CONTAINER === "1" || runtime.env.PEACH_NATIVE_COMPOSITOR === "1";
 }
 function isSoftwareRendererArgument(value) {
   const arg = String(value);
@@ -8896,16 +8896,16 @@ var init_registry = __esm({
           {
             range: ">=2.0.0 <3.0.0",
             coverage: 0,
-            note: "native seam: published JavaScript loads against the Compressor Nitro hybrid object; native media and filesystem operations reject explicitly",
-            working: "published Image, Video, Audio and utility exports load; transcoding rejects with UNSUPPORTED_OPERATION instead of returning an unchanged asset as a success",
-            missing: "native media transcoding, metadata, thumbnails, cache files, upload/download and background execution"
+            note: "native seam: published JavaScript runs over the Compressor Nitro object; worker WebCodecs and a lazy container backend export H.264 MP4 and AAC M4A files",
+            working: "image encoding; video/audio transcoding to writable file URIs; native bitrate, resize, quality, sample rate and channel options; progress and UUID cancellation; real metadata; 512px thumbnails; fetch upload/download and cache utilities",
+            missing: "PhotoKit assets, EXIF preservation, UIApplication background assertions; encoding depends on browser H.264/AAC codec availability"
           },
           {
             range: ">=1.0.0 <2.0.0",
             coverage: 0.78,
-            note: "native-seam: real package JS runs from the bundle; the Compressor TurboModule is browser-backed (canvas raster compression, HTMLVideoElement metadata/thumbnail, fetch upload/download)",
-            working: "Image.compress loads uri/base64 inputs, preserves aspect ratio, resizes/re-encodes jpg/png, returns uri or base64; getImageMetaData/getVideoMetaData report real dimensions+size; createVideoThumbnail captures the first frame; clearCache resolves (composer onClose); Video.compress passes through and drives progress to completion; backgroundUpload/download use fetch",
-            missing: "native cache file paths, EXIF preservation, ph:// assets, native video/audio transcoding, granular byte-level progress events, background execution beyond browser fetch"
+            note: "native seam: published JavaScript runs over the browser-backed Compressor TurboModule; worker media decoding and H.264/AAC export use the v1 native bitrate and resize rules",
+            working: "Image.compress resizes/re-encodes jpg/png and returns URI/base64; video/audio export writes MP4/M4A files; video progress and UUID cancellation; missing metadata rejects -15; real dimensions, duration and size; 512px thumbnails; cache, upload and download operations",
+            missing: "EXIF preservation, PhotoKit assets, granular upload byte progress and UIApplication background assertions; encoding depends on browser H.264/AAC codec availability"
           }
         ]
       },
@@ -31488,6 +31488,10 @@ var init_current_sim = __esm({
       // claude code, if ever set
       "CODEX_THREAD_ID",
       // codex / openai agent thread, stable across tool invocations
+      // a Team Machine session, per agent run. its other runners set no session
+      // variable of their own, and the terminal variables below are inherited from
+      // whatever shell started the daemon, so every such agent would share one key.
+      "TM_SESSION",
       "TERM_SESSION_ID",
       // macOS Terminal.app + iTerm2
       "ITERM_SESSION_ID",
@@ -36840,7 +36844,7 @@ async function runUseLikeCommand(args, opts = {}) {
     try {
       const sims = await bridge.listSims();
       const target = resolveTargetSim(sims, parsed.positional[0] || parsed.simId);
-      if (target.lockedBy && target.lockExpiresAt && target.lockExpiresAt > Date.now()) {
+      if (target.lockedBy && !target.lockedByMe && target.lockExpiresAt && target.lockExpiresAt > Date.now()) {
         const secs = Math.max(0, Math.round((target.lockExpiresAt - Date.now()) / 1e3));
         if (target.lockedByKind === "user-active") {
           console.error(
@@ -36851,7 +36855,7 @@ async function runUseLikeCommand(args, opts = {}) {
         }
         if (!force) {
           console.error(
-            `  refused: ${target.id} is leased by ${target.lockedBy} (${secs}s)`
+            `  refused: ${target.id} is leased by ${formatLockOwner(target.lockedBy)} (${secs}s)`
           );
           console.error(
             `  \`peach use ${target.id} --force\` to take it, or \`peach open --new\` for a fresh sim`
@@ -36891,7 +36895,7 @@ async function runClaimCommand(args, opts = {}) {
     try {
       const sims = await bridge.listSims();
       const target = resolveTargetSim(sims, parsed.positional[0] || parsed.simId);
-      const priorHolder = force && target.lockedBy && target.lockedByKind !== "user-active" ? target.lockedBy : null;
+      const priorHolder = force && target.lockedBy && !target.lockedByMe && target.lockedByKind !== "user-active" ? target.lockedBy : null;
       const result = await bridge.claim(target.id, { force });
       saveCurrentSimId(target.id);
       const ttl = Math.max(0, Math.round((result.lockExpiresAt - Date.now()) / 1e3));

package/dist-lib/swift-compile.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/swift-compile.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-compile.ts
 import { execFile as execFile2 } from "node:child_process";

package/dist-lib/swift-package.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/swift-package.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-package.ts
 function isSwiftManifestFile(file) {

package/dist-lib/swift-submit.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/swift-submit.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-submit.ts
 var SWIFT_COMPILE_PATH = "/api/swift-compile";

package/dist-lib/swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/vite-swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/vite.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.658 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/kotlin/AppSources/android/app/Activity.kt

@@ -3,6 +3,7 @@ package android.app
 import android.content.ComponentName
 import android.content.ContextWrapper
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.Bundle
 import android.util.SuperNotCalledException
 import android.view.View
@@ -28,11 +29,28 @@ open class Activity : ContextWrapper() {
     // still names the alias
     val componentName: ComponentName get() = checkNotNull(attachedComponent)
 
-    internal fun attach(application: Application, component: ComponentName, intent: Intent, window: Window) {
+    // what the activity this one replaces returned from
+    // onRetainNonConfigurationInstance, across a configuration relaunch
+    var lastNonConfigurationInstance: Any? = null
+        private set
+
+    // true from the start of a configuration relaunch until this instance is
+    // destroyed, so its owners keep what the next instance takes over
+    var isChangingConfigurations = false
+        internal set
+
+    internal fun attach(
+        application: Application,
+        component: ComponentName,
+        intent: Intent,
+        window: Window,
+        lastNonConfigurationInstance: Any?,
+    ) {
         attachedApplication = application
         attachedComponent = component
         attachedIntent = intent
         attachedWindow = window
+        this.lastNonConfigurationInstance = lastNonConfigurationInstance
     }
 
     open fun setContentView(view: View) {
@@ -48,12 +66,40 @@ open class Activity : ContextWrapper() {
     protected open fun onPostCreate(savedInstanceState: Bundle?) { called = true }
     protected open fun onResume() { called = true }
     protected open fun onPostResume() { called = true }
+    protected open fun onPause() { called = true }
+    protected open fun onStop() { called = true }
+    protected open fun onRestart() { called = true }
+
+    protected open fun onDestroy() { called = true }
+
+    // a configuration change the manifest's configChanges lets it handle
+    // itself, without a relaunch
+    open fun onConfigurationChanged(newConfig: Configuration) { called = true }
+
+    // Activity's own save and restore carry the window's view hierarchy state;
+    // the decor window here holds no view state of its own
+    protected open fun onSaveInstanceState(outState: Bundle) {}
+    protected open fun onRestoreInstanceState(savedInstanceState: Bundle) {}
+
+    open fun onRetainNonConfigurationInstance(): Any? = null
+
+    // a back the window's callbacks left: the activity asks the task manager,
+    // which moves a root launcher task to the back rather than finishing it
+    // (from Android 12). the only activity Peach runs is that task's root.
+    open fun onBackPressed() {
+        movedTaskToBack = true
+    }
+
+    internal var movedTaskToBack = false
 
     // ActivityLifecycleCallbacks' post events; ComponentActivity's lifecycle
     // moves on these, as its ReportFragment does from API 29.
     internal open fun dispatchActivityPostCreated() {}
     internal open fun dispatchActivityPostStarted() {}
     internal open fun dispatchActivityPostResumed() {}
+    internal open fun dispatchActivityPrePaused() {}
+    internal open fun dispatchActivityPreStopped() {}
+    internal open fun dispatchActivityPreDestroyed() {}
 
     private fun require(method: String, call: () -> Unit) {
         called = false
@@ -77,6 +123,49 @@ open class Activity : ContextWrapper() {
         require("onPostCreate") { onPostCreate(icicle) }
     }
 
+    internal fun performPause() {
+        dispatchActivityPrePaused()
+        require("onPause") { onPause() }
+    }
+
+    private var stopped = false
+
+    internal fun performStop() {
+        dispatchActivityPreStopped()
+        require("onStop") { onStop() }
+        stopped = true
+    }
+
+    internal fun performSaveInstanceState(outState: Bundle) {
+        onSaveInstanceState(outState)
+    }
+
+    // ActivityThread restores after onStart, only with saved state
+    internal fun performRestoreInstanceState(savedInstanceState: Bundle) {
+        onRestoreInstanceState(savedInstanceState)
+    }
+
+    // ActivityThread collects what the next instance keeps before onDestroy
+    internal fun retainNonConfigurationInstances(): Any? = onRetainNonConfigurationInstance()
+
+    internal fun performDestroy() {
+        dispatchActivityPreDestroyed()
+        require("onDestroy") { onDestroy() }
+    }
+
+    internal fun performConfigurationChanged(newConfig: Configuration) {
+        require("onConfigurationChanged") { onConfigurationChanged(newConfig) }
+    }
+
+    // ActivityThread brings a stopped activity back with onRestart, then
+    // onStart; one that never stopped has nothing to restart
+    internal fun performRestart() {
+        if (!stopped) return
+        stopped = false
+        require("onRestart") { onRestart() }
+        performStart()
+    }
+
     internal fun performResume() {
         require("onResume") { onResume() }
         require("onPostResume") { onPostResume() }

package/kotlin/AppSources/android/app/Application.kt

@@ -1,7 +1,11 @@
 package android.app
 
 import android.content.ContextWrapper
+import android.content.res.Configuration
 
 open class Application : ContextWrapper() {
     open fun onCreate() {}
+
+    // the process's configuration changed, before any activity relaunches
+    open fun onConfigurationChanged(newConfig: Configuration) {}
 }

package/kotlin/AppSources/android/content/res/Configuration.kt

@@ -5,6 +5,10 @@ package android.content.res
 class Configuration {
     var uiMode: Int = UI_MODE_TYPE_NORMAL or UI_MODE_NIGHT_NO
 
+    fun setTo(other: Configuration) {
+        uiMode = other.uiMode
+    }
+
     companion object {
         const val UI_MODE_TYPE_MASK = 0x0f
         const val UI_MODE_TYPE_NORMAL = 0x01

package/kotlin/AppSources/android/content/res/Resources.kt

@@ -3,5 +3,7 @@ package android.content.res
 class Resources internal constructor(val configuration: Configuration)
 
 // the app process's resources, set once the device configuration is known at
-// cold start; every context in the process reads the same configuration
+// cold start; every context in the process reads the same configuration, which
+// a configuration change updates in place, as ResourcesManager does, so a
+// Resources or Configuration an app holds reads the new values
 internal lateinit var processResources: Resources

package/kotlin/AppSources/android/os/Bundle.kt

@@ -1,5 +1,11 @@
 package android.os
 
-// a cold start has no saved instance state, so the launcher receives null;
-// the type exists for the signatures that name it.
-class Bundle
+import androidx.savedstate.SavedState
+import androidx.savedstate.savedState
+
+// on Android androidx's SavedState is Bundle; here a Bundle holds the
+// multiplatform SavedState that a save writes into. a cold start has no saved
+// instance state, so the launcher receives null.
+class Bundle internal constructor(internal val state: SavedState) {
+    constructor() : this(savedState())
+}

package/kotlin/AppSources/androidx/activity/BackEventCompat.kt

@@ -0,0 +1,17 @@
+package androidx.activity
+
+// androidx.activity's BackEventCompat: one predictive back gesture sample
+class BackEventCompat(
+    val touchX: Float,
+    val touchY: Float,
+    val progress: Float,
+    val swipeEdge: Int,
+) {
+    override fun toString(): String =
+        "BackEventCompat{touchX=$touchX, touchY=$touchY, progress=$progress, swipeEdge=$swipeEdge}"
+
+    companion object {
+        const val EDGE_LEFT = 0
+        const val EDGE_RIGHT = 1
+    }
+}

package/kotlin/AppSources/androidx/activity/Cancellable.kt

@@ -0,0 +1,5 @@
+package androidx.activity
+
+internal interface Cancellable {
+    fun cancel()
+}

package/kotlin/AppSources/androidx/activity/ComponentActivity.kt

@@ -21,15 +21,32 @@ import androidx.savedstate.SavedStateRegistryOwner
 
 // androidx.activity's ComponentActivity owners, on the multiplatform
 // lifecycle, viewmodel and savedstate libraries: the registry attaches in the
-// constructor and restores in onCreate before super, the lifecycle moves on
-// the post callbacks, and destroy clears the view model store.
+// constructor and restores in onCreate before super, the lifecycle moves up on
+// the post callbacks and down on the pre callbacks, as ReportFragment does from
+// API 29, and destroy clears the view model store.
 open class ComponentActivity : Activity(), LifecycleOwner, ViewModelStoreOwner,
-    HasDefaultViewModelProviderFactory, SavedStateRegistryOwner {
+    HasDefaultViewModelProviderFactory, SavedStateRegistryOwner, OnBackPressedDispatcherOwner {
     private val lifecycleRegistry = LifecycleRegistry(this)
     private val savedStateRegistryController = SavedStateRegistryController.create(this)
 
+    // the last instance's store after a configuration relaunch, else a new one
+    private var _viewModelStore: ViewModelStore? = null
+
+    private class NonConfigurationInstances(val custom: Any?, val viewModelStore: ViewModelStore?)
+
     override val lifecycle: Lifecycle get() = lifecycleRegistry
-    override val viewModelStore: ViewModelStore = ViewModelStore()
+    override val viewModelStore: ViewModelStore
+        get() {
+            ensureViewModelStore()
+            return checkNotNull(_viewModelStore)
+        }
+
+    private fun ensureViewModelStore() {
+        if (_viewModelStore == null) {
+            _viewModelStore = (lastNonConfigurationInstance as? NonConfigurationInstances)?.viewModelStore
+                ?: ViewModelStore()
+        }
+    }
     override val savedStateRegistry: SavedStateRegistry get() = savedStateRegistryController.savedStateRegistry
     override val defaultViewModelProviderFactory = SavedStateViewModelFactory()
     override val defaultViewModelCreationExtras: CreationExtras
@@ -40,18 +57,53 @@ open class ComponentActivity : Activity(), LifecycleOwner, ViewModelStoreOwner,
 
     init {
         lifecycleRegistry.addObserver(LifecycleEventObserver { _, event ->
-            if (event == Lifecycle.Event.ON_DESTROY) viewModelStore.clear()
+            if (event == Lifecycle.Event.ON_DESTROY && !isChangingConfigurations) viewModelStore.clear()
         })
         savedStateRegistryController.performAttach()
         enableSavedStateHandles()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        savedStateRegistryController.performRestore(null)
+        savedStateRegistryController.performRestore(savedInstanceState?.state)
         super.onCreate(savedInstanceState)
     }
 
+    @Suppress("DEPRECATION")
+    final override fun onRetainNonConfigurationInstance(): Any? {
+        val custom = onRetainCustomNonConfigurationInstance()
+        val viewModelStore = _viewModelStore
+            ?: (lastNonConfigurationInstance as? NonConfigurationInstances)?.viewModelStore
+        if (viewModelStore == null && custom == null) return null
+        return NonConfigurationInstances(custom, viewModelStore)
+    }
+
+    @Deprecated("Use a ViewModel to store non config state.")
+    open fun onRetainCustomNonConfigurationInstance(): Any? = null
+
+    @Deprecated("Use a ViewModel to store non config state.")
+    open val lastCustomNonConfigurationInstance: Any?
+        get() = (lastNonConfigurationInstance as? NonConfigurationInstances)?.custom
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        lifecycleRegistry.currentState = Lifecycle.State.CREATED
+        super.onSaveInstanceState(outState)
+        savedStateRegistryController.performSave(outState.state)
+    }
+
+    // the dispatcher gets the back first; without an enabled callback it falls
+    // back to Activity's own
+    override fun onBackPressed() {
+        onBackPressedDispatcher.onBackPressed()
+    }
+
+    final override val onBackPressedDispatcher: OnBackPressedDispatcher by lazy {
+        OnBackPressedDispatcher { super@ComponentActivity.onBackPressed() }
+    }
+
     override fun dispatchActivityPostCreated() = lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
     override fun dispatchActivityPostStarted() = lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
     override fun dispatchActivityPostResumed() = lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
+    override fun dispatchActivityPrePaused() = lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+    override fun dispatchActivityPreStopped() = lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+    override fun dispatchActivityPreDestroyed() = lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
 }

package/kotlin/AppSources/androidx/activity/OnBackPressedCallback.kt

@@ -0,0 +1,28 @@
+package androidx.activity
+
+// androidx.activity 1.9.3's OnBackPressedCallback
+abstract class OnBackPressedCallback(enabled: Boolean) {
+    var isEnabled: Boolean = enabled
+        set(value) {
+            field = value
+            enabledChangedCallback?.invoke()
+        }
+
+    private val cancellables = mutableListOf<Cancellable>()
+    internal var enabledChangedCallback: (() -> Unit)? = null
+
+    fun remove() = cancellables.toList().forEach { it.cancel() }
+
+    open fun handleOnBackStarted(backEvent: BackEventCompat) {}
+    open fun handleOnBackProgressed(backEvent: BackEventCompat) {}
+    abstract fun handleOnBackPressed()
+    open fun handleOnBackCancelled() {}
+
+    internal fun addCancellable(cancellable: Cancellable) {
+        cancellables.add(cancellable)
+    }
+
+    internal fun removeCancellable(cancellable: Cancellable) {
+        cancellables.remove(cancellable)
+    }
+}