react-native-update 10.59.2 → 10.60.0

package/ios/RCTPushy/RCTPushy.mm

@@ -1,971 +1,80 @@
-#import "RCTPushy.h"
+#import "RCTPushyInternal.h"
 #import "RCTPushyConfiguration.h"
-#import "RCTPushyDownloader.h"
-#import "ZipArchive.h"
-#include "../../cpp/patch_core/archive_limits.h"
-#include "../../cpp/patch_core/archive_patch_core.h"
-#include "../../cpp/patch_core/digest.h"
-#include "../../cpp/patch_core/hbc_transform_wire.h"
-#include "../../cpp/patch_core/install_record.h"
 #include "../../cpp/patch_core/error_codes.h"
+#include "../../cpp/patch_core/hbc_transform_wire.h"
 #include "../../cpp/patch_core/patch_core.h"
-#include "../../cpp/patch_core/state_core.h"
-#include "../../cpp/update_flow_core/flow_json.h"
-#include "../../cpp/update_flow_core/update_flow_core.h"
-
-#import <UIKit/UIKit.h>
 
 // use_frameworks! 构建里 React 头文件只有 <React/…> 框架形式可见,引号形式的
-// __has_include 会探测失败;漏掉这里会静默编入 [self.bridge reload] 兜底,而
-// bridgeless 下 bridge 是 nil/代理,reload 变成无声 no-op(切版本后不重启)。
+// __has_include 会探测失败;漏掉框架形式会让重启变成无声 no-op(切版本后不
+// 重启),所以两种形式都探测不到时直接编译失败。
 #if __has_include("RCTReloadCommand.h")
 #import "RCTReloadCommand.h"
-#define PUSHY_HAS_RELOAD_COMMAND 1
 #elif __has_include(<React/RCTReloadCommand.h>)
 #import <React/RCTReloadCommand.h>
-#define PUSHY_HAS_RELOAD_COMMAND 1
+#else
+#error React Native 0.62 or newer is required: RCTReloadCommand.h was not found
 #endif
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "RCTPushySpec.h"
 #endif
 
-#import <React/RCTConvert.h>
-#import <React/RCTLog.h>
-// RN's log macros pass __FILE__, which would embed this file's absolute build
-// path in the binary; log with the bare file name instead.
-#if RCTLOG_ENABLED
-#undef _RCTLog
-#define _RCTLog(lvl, ...) _RCTLogNativeInternal(lvl, __FILE_NAME__, __LINE__, __VA_ARGS__)
-#endif
-#import <objc/runtime.h>
-#import <os/lock.h>
-
-#include <atomic>
-#include <sys/stat.h>
-
-// Immutable host-facing snapshot; activated always means NEXT launch.
-static NSDictionary *PushyHostResult(NSString *status, NSString *reason,
-                                    NSString *hash, BOOL activated) {
-    return @{@"status": status, @"reason": reason ?: @"",
-             @"hash": hash ?: @"", @"activated": @(activated)};
-}
-
-static NSString *const keyPushyInfo = @"REACTNATIVECN_PUSHY_INFO_KEY";
-// Binary identity (SyncBinaryVersion input). Prefixed like every other key:
-// the unprefixed names collided with generic host-app/SDK defaults, and a
-// foreign value there made every launch look like a rebuilt binary and wipe
-// the installed update.
-static NSString *const paramPackageVersion = @"REACTNATIVECN_PUSHY_PACKAGEVERSION";
-static NSString *const paramBuildTime = @"REACTNATIVECN_PUSHY_BUILDTIME";
-// The unprefixed names earlier SDKs wrote. Read only as a fallback until the
-// first state write migrates them (PushyStateFromDefaults /
-// PushyApplyStateToDefaults).
-static NSString *const legacyParamPackageVersion = @"packageVersion";
-static NSString *const legacyParamBuildTime = @"buildTime";
-static NSString *const paramLastVersion = @"lastVersion";
-static NSString *const paramCurrentVersion = @"currentVersion";
-static NSString *const paramIsFirstTime = @"isFirstTime";
-static NSString *const paramIsFirstLoadOk = @"isFirstLoadOK";
-static NSString *const keyUuid = @"REACTNATIVECN_PUSHY_UUID";
-static NSString *const keyHashInfo = @"REACTNATIVECN_PUSHY_HASH_";
-static NSString *const keyFirstLoadMarked = @"REACTNATIVECN_PUSHY_FIRSTLOADMARKED_KEY";
-static NSString *const keyRolledBackMarked = @"REACTNATIVECN_PUSHY_ROLLEDBACKMARKED_KEY";
-static NSString *const KeyPackageUpdatedMarked = RCTPushyRevealText("0832d5f29aa549710b0939daf88ca058790f3dded7e888b451640d2ec3f69099bb43711523cafa8ea7bb4372132a");
-// bundleHash cache: "<cacheKey>|<sha256hex>" where cacheKey identifies the
-// installed binary (packageVersion + embedded bundle size + mtime). Recomputed
-// only when the key changes, i.e. once per install.
-static NSString *const keyBundleHashCache = @"REACTNATIVECN_PUSHY_BUNDLEHASH_KEY";
-// Raw JSON persisted by JS (syncNativeConfig) for the native cold-start
-// update check; parsed on read by the orchestrator. Absent = check disabled.
-static NSString *const keyNativeConfig = @"REACTNATIVECN_PUSHY_NATIVE_CONFIG_KEY";
-// Raw response cache written by the native cold-start check for the JS side
-// to reuse (§10.3), scoped to the request and config that produced it.
-static NSString *const keyNativeCheckCache = @"REACTNATIVECN_PUSHY_NATIVE_CHECK_RESP_KEY";
-// Set when a native check round starts, cleared when it ends (§11.4). Residue
-// on the next launch means the previous process died mid-round (a crash
-// rescue was truncated): that launch resumes immediately instead of waiting.
-static NSString *const keyNativeCheckIncomplete = @"REACTNATIVECN_PUSHY_NATIVE_CHECK_INCOMPLETE_KEY";
-static NSString *const PushyErrorDomain = @"cn.reactnative.pushy";
-
-// file def
-static NSString * const BUNDLE_FILE_NAME = @"index.bundlejs";
-static NSString * const SOURCE_PATCH_NAME = @"__diff.json";
-static NSString * const BUNDLE_PATCH_NAME = RCTPushyRevealText("3319f0d4b6c56a502c3b10fcdca0de7d4b3307e9");
-// Protocol strings and version-info flags read by JS, stored encoded
-// (RCTPushyRevealText) so they do not appear as plain binary strings.
-static NSString * const PushyOptionUrlKey = RCTPushyRevealText("2f07f0d0ba8e5d572e");
-static NSString * const PushyIpaDeltaSuffix = RCTPushyRevealText("741ee4d0e09b69512137");
-static NSString * const PushyPpkDeltaSuffix = RCTPushyRevealText("7407e4dae09b69512137");
-static NSString * const PushyInfoCrashHold = RCTPushyRevealText("3905f5c2a6b96d56212a19");
-static NSString * const PushyInfoForceBoot = RCTPushyRevealText("3c18e6d2aba9674a360d19ead5a695");
-static NSString * const PushyStatusNone = RCTPushyRevealText("3418c1c1aa8a7c40");
-#define VERSION_COMPLETE_FILE_NAME_LITERAL ".pushy-complete"
-static NSString * const VERSION_COMPLETE_FILE_NAME = @VERSION_COMPLETE_FILE_NAME_LITERAL;
-
-// error def — messages are human-readable; the stable cross-platform codes
-// live in cpp/patch_core/error_codes.h and travel in PushyErrorCodeKey.
-static NSString * const ERROR_OPTIONS = @"options error";
-static NSString * const ERROR_FILE_OPERATION = @"file operation error";
-static NSString * const PushyErrorCodeKey = @"PushyErrorCode";
-
-static NSString *PushyCode(const char *code) {
-    return [NSString stringWithUTF8String:code];
-}
-
-// cInfo.os label prefix; must match the JS side (core.ts) so the server
-// buckets tvOS devices apart from iOS ones.
-#if TARGET_OS_TV
-static NSString * const PushyOsName = @"tvos";
-#else
-static NSString * const PushyOsName = @"ios";
-#endif
-
 // event def
 static NSString * const EVENT_PROGRESS_DOWNLOAD = @"RCTPushyDownloadProgress";
 static NSString * const PARAM_PROGRESS_HASH = @"hash";
 static NSString * const PARAM_PROGRESS_RECEIVED = @"received";
 static NSString * const PARAM_PROGRESS_TOTAL = @"total";
 
-static NSTimeInterval PushyMonotonicNow(void) {
-    return [NSProcessInfo processInfo].systemUptime;
-}
-
-static std::string PushyToStdString(NSString *value);
-
-static NSString *PushyStagingDirForVersionDir(NSString *versionDir) {
-    return [versionDir stringByAppendingString:@(pushy::install_record::kStagingSuffix)];
-}
-
-// Parsed completion record (cpp/patch_core/install_record.h): nil when the
-// file is absent or malformed; an empty dictionary for the legacy empty
-// marker written by SDK < 10.53.
-static NSDictionary *PushyReadInstallRecord(NSString *versionDir) {
-    NSString *path = [versionDir stringByAppendingPathComponent:VERSION_COMPLETE_FILE_NAME];
-    NSData *data = [NSData dataWithContentsOfFile:path];
-    if (data == nil) {
-        return nil;
-    }
-    if (data.length == 0) {
-        return @{};
-    }
-    if (data.length > 64 * 1024) {
-        return nil;
-    }
-    id object = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
-    return [object isKindOfClass:[NSDictionary class]] ? (NSDictionary *)object : nil;
-}
-
-// Presence check (launch / dedup paths, no digest work): bundle present and
-// the record exists and, unless legacy-empty, names this version.
-static BOOL PushyHasCompletedVersionAtPath(NSString *versionDir, NSString *hash) {
-    NSString *bundlePath = [versionDir stringByAppendingPathComponent:BUNDLE_FILE_NAME];
-    if (![[NSFileManager defaultManager] fileExistsAtPath:bundlePath]) {
-        return NO;
-    }
-    NSDictionary *record = PushyReadInstallRecord(versionDir);
-    if (record == nil) {
-        return NO;
-    }
-    if (record.count == 0) {
-        return YES;
-    }
-    return [record[@"schema"] isKindOfClass:[NSNumber class]]
-        && [record[@"schema"] intValue] == pushy::install_record::kSchema
-        && [record[@"versionHash"] isKindOfClass:[NSString class]]
-        && [record[@"versionHash"] isEqualToString:hash];
-}
-
-// Activation check: re-hashes the bundle when the record carries a digest.
-// Returns nil when the directory may be activated, the reason otherwise.
-static NSString *PushyVerifyInstallForActivation(NSString *versionDir, NSString *hash) {
-    NSDictionary *record = PushyReadInstallRecord(versionDir);
-    if (record == nil) {
-        return [NSString stringWithFormat:@"Bundle version %@ has no valid completion record.", hash];
-    }
-    if (record.count == 0) {
-        return nil;
-    }
-    if (![record[@"schema"] isKindOfClass:[NSNumber class]]
-        || [record[@"schema"] intValue] != pushy::install_record::kSchema
-        || ![record[@"versionHash"] isKindOfClass:[NSString class]]
-        || ![record[@"versionHash"] isEqualToString:hash]) {
-        return [NSString stringWithFormat:@"Bundle version %@ completion record mismatch.", hash];
-    }
-    NSString *expected = record[@"bundleSha256"];
-    if (![expected isKindOfClass:[NSString class]] || expected.length == 0) {
-        return nil;
-    }
-    std::string actual = pushy::digest::Sha256File(
-        PushyToStdString([versionDir stringByAppendingPathComponent:BUNDLE_FILE_NAME]));
-    if ([[expected lowercaseString] isEqualToString:[NSString stringWithUTF8String:actual.c_str()]]) {
-        return nil;
-    }
-    return [NSString stringWithFormat:@"Bundle version %@ bundle digest mismatch.", hash];
-}
-
-// SHA-256 of each in-flight download's archive, keyed by hash; consumed by
-// the completion record write. Guarded by @synchronized on the table.
-static NSMutableDictionary<NSString *, NSString *> *PushyArtifactDigests(void) {
-    static NSMutableDictionary *table;
-    static dispatch_once_t once;
-    dispatch_once(&once, ^{
-        table = [NSMutableDictionary dictionary];
-    });
-    return table;
-}
-
-static NSError *PushyErrorWithCode(const char *code, NSString *message);
-
-// nil when the volume holding `path` can take `bytesToWrite` plus the safety
-// margin (or the free space is unknown); a PATCH_FAILED error otherwise. The
-// probe is the downloader's (RCTPushyFreeSpaceShortfall), which applies the
-// same rule to the announced Content-Length before the first byte lands.
-static NSError *PushyEnsureFreeSpace(NSString *path, long long bytesToWrite) {
-    NSString *shortfall = RCTPushyFreeSpaceShortfall(path, bytesToWrite);
-    if (shortfall == nil) {
-        return nil;
-    }
-    return PushyErrorWithCode(pushy::error_codes::kDeltaFailed, shortfall);
-}
-
-// SSZipArchive delegate enforcing cpp/patch_core/archive_limits.h while the
-// archive is walked (entry count, per-entry size, total size, compression
-// ratio) plus two entry-shape rules Android's java.util.zip gets for free:
-//  - no symlinks: SSZipArchive materialises them with any target regardless
-//    of preserveAttributes, so `assets -> ../../Documents` followed by
-//    `assets/x` would write outside the version directory;
-//  - no ".pushy-" reserved names at any depth: the completion marker is
-//    written by this SDK only, after the whole install succeeded. An archive
-//    shipping its own would be trusted as a finished install even if the
-//    patch step that follows fails.
-// A NO from zipArchiveShouldUnzipFileAtIndex: cancels the whole unzip (the
-// 2.x contract the podspec pins), and the completion handler turns the
-// recorded violation into a hard PATCH_FAILED; the caller then discards the
-// staging directory.
-@interface PushyUnzipGuard : NSObject <SSZipArchiveDelegate>
-@property (nonatomic, copy) NSString *violation;
-@property (nonatomic, assign) long long totalUncompressed;
-@end
-
-@implementation PushyUnzipGuard
-
-- (void)zipArchiveWillUnzipArchiveAtPath:(NSString *)path zipInfo:(unz_global_info)zipInfo {
-    if ((long long)zipInfo.number_entry > pushy::archive_limits::kMaxEntries) {
-        self.violation = [NSString stringWithFormat:@"archive has too many entries (%lu)",
-                          (unsigned long)zipInfo.number_entry];
-    }
-}
-
-- (BOOL)zipArchiveShouldUnzipFileAtIndex:(NSInteger)fileIndex
-                              totalFiles:(NSInteger)totalFiles
-                             archivePath:(NSString *)archivePath
-                                fileInfo:(unz_file_info)fileInfo {
-    if (self.violation != nil) {
-        return NO;
-    }
-    // Unix mode bits travel in the high 16 bits of the external attributes
-    // (the same field SSZipArchive keys its own symlink branch on).
-    if (((fileInfo.external_fa >> 16) & S_IFMT) == S_IFLNK) {
-        self.violation = [NSString stringWithFormat:@"archive entry #%ld is a symlink",
-                          (long)fileIndex];
-        return NO;
-    }
-    long long size = (long long)fileInfo.uncompressed_size;
-    long long compressed = (long long)fileInfo.compressed_size;
-    if (size > pushy::archive_limits::kMaxEntryBytes) {
-        self.violation = [NSString stringWithFormat:@"archive entry #%ld too large (%lld bytes)",
-                          (long)fileIndex, size];
-        return NO;
-    }
-    self.totalUncompressed += size;
-    if (self.totalUncompressed > pushy::archive_limits::kMaxTotalUncompressedBytes) {
-        self.violation = [NSString stringWithFormat:@"archive expands beyond %lld bytes",
-                          pushy::archive_limits::kMaxTotalUncompressedBytes];
-        return NO;
-    }
-    if (compressed > 0 && size > pushy::archive_limits::kRatioCheckMinBytes
-        && size / compressed > pushy::archive_limits::kMaxCompressionRatio) {
-        self.violation = [NSString stringWithFormat:@"archive entry #%ld compression ratio too high",
-                          (long)fileIndex];
-        return NO;
-    }
-    return YES;
-}
-
-// The entry name is only exposed once the entry is on disk (shouldUnzip
-// runs before the name is read). A reserved name is flagged here; the next
-// shouldUnzip refuses (cancelling the unzip) or, for the last entry, the
-// completion handler picks the violation up. Either way the caller drops
-// the whole staging directory, so the written file never survives.
-- (void)zipArchiveDidUnzipFileAtIndex:(NSInteger)fileIndex
-                           totalFiles:(NSInteger)totalFiles
-                          archivePath:(NSString *)archivePath
-                     unzippedFilePath:(NSString *)unzippedFilePath {
-    NSString *name = unzippedFilePath.lastPathComponent;
-    if (self.violation == nil && [name hasPrefix:@".pushy-"]) {
-        self.violation = [NSString stringWithFormat:@"archive contains reserved entry %@", name];
-    }
-}
-
-@end
-
-static NSError *PushyDownloadDeadlineExpiredError(void) {
-    return [NSError errorWithDomain:PushyErrorDomain
-                               code:-1
-                           userInfo:@{
-        NSLocalizedDescriptionKey: @"download deadline expired before start",
-        PushyErrorCodeKey: PushyCode(pushy::error_codes::kDownloadFailed),
-    }];
-}
-
-
-typedef NS_ENUM(NSInteger, PushyType) {
-    PushyTypeFullDownload = 1,
-    PushyTypePatchFromPackage = 2,
-    PushyTypePatchFromPpk = 3,
-};
-
-static std::atomic<bool> ignoreRollback{false};
 // Whether the host asked +bundleURL for the bundle to load (the
 // isUsingBundleUrl constant, mirroring Android/Harmony). NO means the app
 // runs a bundle this SDK never resolved, so updates cannot take effect.
 static std::atomic<bool> pushyIsUsingBundleUrl{false};
-// Bumped by resetToPackagedBundle. The cold-start check runs for minutes and
-// may already hold a decision when the app resets to the packaged bundle; it
-// samples this counter and abandons activation (and its response cache) when
-// the value moved, so an in-flight rescue can never resurrect the version the
-// app just reset away from.
-static std::atomic<uint64_t> pushyResetGeneration{0};
-// The version whose bundle this process actually loaded (resolved in
-// +bundleURL). resetToPackagedBundle must not delete its directory: update
-// assets (images/fonts) are read from it on demand at runtime, so wiping it
-// under a silent (no-restart) reset would break every image the running app
-// has not loaded yet. Guarded by the state lock.
-static NSString *pushyLaunchVersion = nil;
 
-// JS and the bridge-free cold-start engine use different RCTPushy instances,
-// but they must still share one download per target hash. Without this
-// process-wide registry two NSURLSessionDownloadTasks race over the same
-// archive path and the later unzip can delete the first task's valid output.
-static NSMutableDictionary<NSString *, NSMutableDictionary *> *PushyInFlightDownloads(void) {
-    static NSMutableDictionary<NSString *, NSMutableDictionary *> *downloads;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        downloads = [NSMutableDictionary dictionary];
+// Triggers a JS reload. React Native re-resolves the bundle URL itself on
+// reload (RCTHost asks its bundleURLProvider, RCTBridge.setUp re-asks
+// sourceURLForBridge:), so +bundleURL is deliberately NOT called here: it
+// consumes one-shot launch state (first_time, the first-load mark,
+// ignoreRollback), and consuming it for a reload that never happens would
+// make the next cold start roll the freshly switched version back.
+static void PushyTriggerReload(NSString *reason) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        RCTTriggerReloadCommandListeners(reason);
     });
-    return downloads;
-}
-
-typedef NS_ENUM(NSInteger, PushyDownloadRegistration) {
-    PushyDownloadRegistrationOwner,
-    PushyDownloadRegistrationJoined,
-    PushyDownloadRegistrationDeferred,
-};
-
-static PushyDownloadRegistration PushyRegisterDownload(
-    NSString *hash,
-    NSInteger type,
-    NSTimeInterval deadlineUptime,
-    void (^callback)(NSError *),
-    void (^progress)(long long, long long),
-    void (^deferredStart)(void)
-) {
-    NSMutableDictionary *downloads = PushyInFlightDownloads();
-    @synchronized (downloads) {
-        NSMutableDictionary *entry = downloads[hash];
-        if (entry != nil) {
-            if ([entry[@"type"] integerValue] == type) {
-                NSTimeInterval ownerDeadline = [entry[@"deadlineUptime"] doubleValue];
-                // A caller with substantially more time must not inherit an
-                // owner's nearly-exhausted timeout: it observes the current
-                // transfer and restarts after the owner settles (the
-                // completion-marker preflight makes a successful owner free).
-                // The comparison is on remaining budget, not on the absolute
-                // deadline: a JS caller always computes now+600 a few seconds
-                // after the owner did, so a strict `>` would defer every
-                // second caller and turn the shared download back into
-                // serialized re-downloads. Only a genuinely starved owner
-                // (less than half the newcomer's budget left) defers.
-                const NSTimeInterval now = PushyMonotonicNow();
-                if (2 * (ownerDeadline - now) < (deadlineUptime - now)) {
-                    if (progress != nil) {
-                        [entry[@"progress"] addObject:[progress copy]];
-                    }
-                    [entry[@"deferred"] addObject:[deferredStart copy]];
-                    return PushyDownloadRegistrationDeferred;
-                }
-                [entry[@"callbacks"] addObject:[callback copy]];
-                if (progress != nil) {
-                    [entry[@"progress"] addObject:[progress copy]];
-                }
-                return PushyDownloadRegistrationJoined;
-            }
-            // A diff failure must not settle a joined full request. Queue the
-            // different artifact type behind the owner; once restarted it
-            // registers normally (and re-checks the completion marker).
-            if (progress != nil) {
-                // The artifact type differs, but it still installs the same
-                // target hash. Keep the waiting JS UI moving while its own
-                // transfer is queued behind the current owner.
-                [entry[@"progress"] addObject:[progress copy]];
-            }
-            [entry[@"deferred"] addObject:[deferredStart copy]];
-            return PushyDownloadRegistrationDeferred;
-        }
-        NSMutableArray *progressHandlers = [NSMutableArray array];
-        if (progress != nil) {
-            [progressHandlers addObject:[progress copy]];
-        }
-        downloads[hash] = [@{
-            @"type": @(type),
-            @"deadlineUptime": @(deadlineUptime),
-            @"callbacks": [NSMutableArray arrayWithObject:[callback copy]],
-            @"progress": progressHandlers,
-            @"deferred": [NSMutableArray array],
-        } mutableCopy];
-        return PushyDownloadRegistrationOwner;
-    }
-}
-
-static void PushyReportDownloadProgress(
-    NSString *hash, long long received, long long total
-) {
-    NSMutableDictionary *downloads = PushyInFlightDownloads();
-    NSArray *handlers = nil;
-    @synchronized (downloads) {
-        handlers = [downloads[hash][@"progress"] copy];
-    }
-    for (id value in handlers) {
-        void (^handler)(long long, long long) =
-            (void (^)(long long, long long))value;
-        handler(received, total);
-    }
-}
-
-static void PushyFinishDownload(NSString *hash, NSError *error) {
-    NSMutableDictionary *downloads = PushyInFlightDownloads();
-    NSArray *callbacks = nil;
-    NSArray *deferred = nil;
-    @synchronized (downloads) {
-        callbacks = [downloads[hash][@"callbacks"] copy];
-        deferred = [downloads[hash][@"deferred"] copy];
-        [downloads removeObjectForKey:hash];
-    }
-    // Establish the next (different-type) owner before waking the completed
-    // owner's callbacks; otherwise its strategy loop could race the waiter.
-    for (id value in deferred) {
-        void (^start)(void) = (void (^)(void))value;
-        start();
-    }
-    for (id value in callbacks) {
-        void (^callback)(NSError *) = (void (^)(NSError *))value;
-        callback(error);
-    }
-}
-
-// Serializes every read-modify-write of the persisted update state. The state
-// machine itself is a pure function (state_core), but callers run on different
-// threads (main thread bundleURL, module method queue, _fileQueue), so the
-// read→transform→write sequence must be atomic to avoid e.g. markSuccess being
-// overwritten by a concurrent bundleURL and the version being rolled back.
-static os_unfair_lock pushyStateLock = OS_UNFAIR_LOCK_INIT;
-
-static void PushyWithStateLock(void (NS_NOESCAPE ^block)(void)) {
-#if DEBUG
-    // Not re-entrant: a nested acquisition deadlocks in release, so catch it
-    // where it is written.
-    os_unfair_lock_assert_not_owner(&pushyStateLock);
-#endif
-    os_unfair_lock_lock(&pushyStateLock);
-    @try {
-        block();
-    } @finally {
-        os_unfair_lock_unlock(&pushyStateLock);
-    }
-}
-
-static std::string PushyToStdString(NSString *value) {
-    if (value == nil) {
-        return std::string();
-    }
-    return std::string([value UTF8String]);
-}
-
-static NSError *PushyNSErrorFromStatus(const pushy::delta::Status &status) {
-    return [NSError errorWithDomain:PushyErrorDomain
-                               code:-1
-                           userInfo:@{
-                               NSLocalizedDescriptionKey: [NSString stringWithUTF8String:status.message.c_str()],
-                               PushyErrorCodeKey: PushyCode(pushy::error_codes::kDeltaFailed),
-                           }];
-}
-
-static NSUserDefaults *PushyDefaults(void) {
-    return [NSUserDefaults standardUserDefaults];
-}
-
-static NSString *PushyFromStdString(const std::string &value) {
-    if (value.empty()) {
-        return nil;
-    }
-    return [NSString stringWithUTF8String:value.c_str()];
-}
-
-static void PushySetNullableString(NSUserDefaults *defaults, NSString *key, NSString *value) {
-    if (value != nil) {
-        [defaults setObject:value forKey:key];
-    } else {
-        [defaults removeObjectForKey:key];
-    }
-}
-
-static NSString *PushyHashInfoKey(NSString *hash) {
-    return [keyHashInfo stringByAppendingString:hash ?: @""];
-}
-
-static NSString *PushyOptionString(NSDictionary *options, NSString *key) {
-    return [RCTConvert NSString:options[key]];
-}
-
-static BOOL PushyStringIsBlank(NSString *value) {
-    if (value == nil || [value isKindOfClass:[NSNull class]]) {
-        return YES;
-    }
-    return [[value stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length] == 0;
-}
-
-// Server-provided identifiers (hash/originHash) are used as child names under
-// the download root; anything that could resolve outside of it (path
-// separators, "..", ".") must be rejected before touching the filesystem.
-static BOOL PushyIsSafePathComponent(NSString *value) {
-    if (PushyStringIsBlank(value)) {
-        return NO;
-    }
-    if ([value isEqualToString:@"."] || [value isEqualToString:@".."]) {
-        return NO;
-    }
-    if ([value containsString:@"/"] || [value containsString:@"\\"]) {
-        return NO;
-    }
-    if ([value rangeOfString:@"\0"].location != NSNotFound) {
-        return NO;
-    }
-    return YES;
-}
-
-static void PushyRejectError(RCTPromiseRejectBlock reject, NSError *error) {
-    // Prefer the stable cross-platform code (error_codes.h); fall back to the
-    // numeric NSError code for system errors that were not classified.
-    NSString *code = error.userInfo[PushyErrorCodeKey];
-    if (code == nil) {
-        code = [NSString stringWithFormat:@"%ld", (long)error.code];
-    }
-    reject(code, error.localizedDescription, error);
-}
-
-static NSError *PushyErrorWithCode(const char *code, NSString *message) {
-    return [NSError errorWithDomain:PushyErrorDomain
-                               code:-1
-                           userInfo:@{
-                               NSLocalizedDescriptionKey: message ?: @"unknown error",
-                               PushyErrorCodeKey: PushyCode(code),
-                           }];
-}
-
-static BOOL PushyJsonIsAbsent(id value) {
-    return value == nil || [value isKindOfClass:[NSNull class]];
-}
-
-// Builds the patch-core manifest from a parsed __diff.json. Every field is
-// type-checked: this runs inside a GCD block on _fileQueue, where the
-// unrecognized-selector exception a `copies` array or a numeric `from` would
-// raise takes the whole app down (and trips the crash rescue) instead of
-// failing the patch. NO with `reason` set for a malformed manifest.
-static BOOL PushyPatchManifestFromJson(NSDictionary *json,
-                                       pushy::delta::PatchManifest *manifest,
-                                       NSString **reason) {
-    id copies = json[@"copies"];
-    if (!PushyJsonIsAbsent(copies)) {
-        if (![copies isKindOfClass:[NSDictionary class]]) {
-            *reason = @"delta manifest: copies is not an object";
-            return NO;
-        }
-        // Content checksum per copy target ("copiesCrc", pdiff manifests
-        // from CLI >= 2.21.2). The patch core verifies the copy source
-        // against it and fails the patch on mismatch, so the JS strategy
-        // chain falls back to the full package instead of copying drifted
-        // bytes from a rebuilt binary.
-        NSDictionary *copiesCrc = json[@"copiesCrc"];
-        if (![copiesCrc isKindOfClass:[NSDictionary class]]) {
-            copiesCrc = nil;
-        }
-        for (id to in (NSDictionary *)copies) {
-            id from = ((NSDictionary *)copies)[to];
-            if (![to isKindOfClass:[NSString class]] || ![from isKindOfClass:[NSString class]]) {
-                *reason = @"delta manifest: copies entry is not a string";
-                return NO;
-            }
-            if ([from length] == 0) {
-                from = to;
-            }
-            pushy::delta::CopyOperation operation;
-            operation.from = PushyToStdString(from);
-            operation.to = PushyToStdString(to);
-            NSNumber *expectedCrc = copiesCrc[to];
-            if ([expectedCrc isKindOfClass:[NSNumber class]]) {
-                operation.has_expected_crc = true;
-                operation.expected_crc = (uint32_t)[expectedCrc unsignedLongLongValue];
-            }
-            manifest->copies.push_back(operation);
-        }
-    }
-
-    // The CLI emits `deletes` as an object keyed by path (Android reads its
-    // keys); a plain array of paths is accepted as well, like Harmony.
-    id deletes = json[@"deletes"];
-    if (!PushyJsonIsAbsent(deletes)) {
-        if (![deletes isKindOfClass:[NSDictionary class]] && ![deletes isKindOfClass:[NSArray class]]) {
-            *reason = @"delta manifest: deletes is not an object or array";
-            return NO;
-        }
-        for (id path in deletes) {
-            if (![path isKindOfClass:[NSString class]]) {
-                *reason = @"delta manifest: deletes entry is not a string";
-                return NO;
-            }
-            manifest->deletes.push_back(PushyToStdString(path));
-        }
-    }
-    return YES;
-}
-
-// Binary identity under the prefixed key, or — until the first state write
-// migrates it — the value an earlier SDK left under the unprefixed one, so an
-// installed update survives the SDK upgrade instead of reading as a rebuilt
-// binary.
-static NSString *PushyBinaryIdentityValue(NSUserDefaults *defaults, NSString *key, NSString *legacyKey) {
-    return [defaults stringForKey:key] ?: [defaults stringForKey:legacyKey];
-}
-
-static pushy::state::State PushyStateFromDefaults(NSUserDefaults *defaults) {
-    pushy::state::State state;
-    state.package_version = PushyToStdString(
-        PushyBinaryIdentityValue(defaults, paramPackageVersion, legacyParamPackageVersion));
-    state.build_time = PushyToStdString(
-        PushyBinaryIdentityValue(defaults, paramBuildTime, legacyParamBuildTime));
-    NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
-    if (pushyInfo != nil) {
-        state.current_version = PushyToStdString(pushyInfo[paramCurrentVersion]);
-        state.last_version = PushyToStdString(pushyInfo[paramLastVersion]);
-        state.first_time = [pushyInfo[paramIsFirstTime] boolValue];
-        id firstLoadOk = pushyInfo[paramIsFirstLoadOk];
-        state.first_time_ok = firstLoadOk == nil ? true : [firstLoadOk boolValue];
-    }
-    state.rolled_back_version = PushyToStdString([defaults stringForKey:keyRolledBackMarked]);
-    return state;
-}
-
-static void PushyApplyStateToDefaults(NSUserDefaults *defaults, const pushy::state::State &state) {
-    PushySetNullableString(defaults, paramPackageVersion, PushyFromStdString(state.package_version));
-    PushySetNullableString(defaults, paramBuildTime, PushyFromStdString(state.build_time));
-    // One-time migration: once the prefixed keys hold the identity, the
-    // legacy ones are retired so a host-app write there is never read again.
-    [defaults removeObjectForKey:legacyParamPackageVersion];
-    [defaults removeObjectForKey:legacyParamBuildTime];
-
-    BOOL hasPushyInfo = !state.current_version.empty() || !state.last_version.empty() || state.first_time || !state.first_time_ok;
-    if (hasPushyInfo) {
-        NSMutableDictionary *newInfo = [[NSMutableDictionary alloc] init];
-        if (!state.current_version.empty()) {
-            newInfo[paramCurrentVersion] = PushyFromStdString(state.current_version);
-        }
-        if (!state.last_version.empty()) {
-            newInfo[paramLastVersion] = PushyFromStdString(state.last_version);
-        }
-        newInfo[paramIsFirstTime] = @(state.first_time);
-        newInfo[paramIsFirstLoadOk] = @(state.first_time_ok);
-        [defaults setObject:newInfo forKey:keyPushyInfo];
-    } else {
-        [defaults removeObjectForKey:keyPushyInfo];
-    }
-
-    PushySetNullableString(
-        defaults,
-        keyRolledBackMarked,
-        PushyFromStdString(state.rolled_back_version));
 }
 
-// Version switch without acquiring the state lock: the caller must already
-// hold it. Lets the cold-start check commit its whole result (version info,
-// switch, response cache) inside one lock acquisition, so resetToPackagedBundle
-// can never interleave between the generation check and the writes.
-static void PushySwitchVersionLocked(NSString *hash) {
-    NSUserDefaults *defaults = PushyDefaults();
-    pushy::state::State next = pushy::state::SwitchVersion(
-        PushyStateFromDefaults(defaults),
-        PushyToStdString(hash)
-    );
-    PushyApplyStateToDefaults(defaults, next);
-    // Re-enable first-load consumption and rollback checks for the newly selected bundle.
-    ignoreRollback = false;
+// A promise rejection for an exception caught around a state transition.
+static void PushyRejectException(RCTPromiseRejectBlock reject, const char *code,
+                                 NSException *exception, NSString *fallback) {
+    PushyRejectError(reject, PushyErrorWithCode(code, exception.reason ?: fallback));
 }
 
-@interface RCTPushy ()
-- (void)fetchPackage:(PushyType)type
-               options:(NSDictionary *)options
-              resolver:(RCTPromiseResolveBlock)resolve
-              rejecter:(RCTPromiseRejectBlock)reject;
-- (void)performFetch:(PushyType)type
-              options:(NSDictionary *)options
-             callback:(void (^)(NSError *error))callback;
-- (NSError *)restartBridgeWithReason:(NSString *)reason;
-- (void)unzipDownloadedPackage:(NSString *)zipFilePath
-                          hash:(NSString *)hash
-                          type:(PushyType)type
-                    originHash:(NSString *)originHash
-                      callback:(void (^)(NSError *error))callback;
-- (void)finishDownloadedPackage:(NSString *)hash
-                           type:(PushyType)type
-                     originHash:(NSString *)originHash
-                       callback:(void (^)(NSError *error))callback;
-- (void)applyDeltaForHash:(NSString *)hash
-                     type:(PushyType)type
-               fromBundle:(NSString *)bundleOrigin
-                   source:(NSString *)sourceOrigin
-                 callback:(void (^)(NSError *error))callback;
-- (BOOL)switchVersion:(NSString *)hash error:(NSError **)error;
-- (BOOL)ensureDirectoryExistsAtPath:(NSString *)path;
-+ (void)excludeFromBackup:(NSString *)path;
-- (void)unzipFileAtPath:(NSString *)path
-          toDestination:(NSString *)destination
-      completionHandler:(void (^)(NSError *error))completionHandler;
-+ (NSString *)downloadDir;
-+ (NSURL *)binaryBundleURL;
-+ (NSString *)packageVersion;
-+ (NSString *)buildTime;
-@end
-
-// Native cold-start update check (NATIVE_CHECKUPDATE_DESIGN §10): runs once
-// per process, a few seconds after launch, entirely independent of the app
-// bundle — this is what lets a bricked hot update be replaced on the next
-// launch. Decisions come from cpp/update_flow_core; this class is IO glue.
-@interface RCTPushyOrchestrator : NSObject
-+ (void)persistConfiguration:(NSString *)config;
-+ (BOOL)hasRunnableConfig;
-+ (NSDictionary *)prepareBundle;
-+ (void)scheduleFromColdStart:(NSString *)launchRolledBackVersion;
-#if TARGET_OS_TV && !DEBUG
-+ (BOOL)restorePurgedLaunch:(NSString *)purgedVersion
-                 rolledBack:(NSString *)launchRolledBackVersion;
-#endif
-+ (void)recordJsRound:(NSString *)config;
-+ (void)startRoundWithDeadline:(NSTimeInterval)deadlineUptime;
-+ (void)runOnce:(NSString *)launchRolledBackVersion deadline:(NSTimeInterval)deadlineUptime;
-+ (void)runHoldRoundWithDeadline:(NSTimeInterval)deadlineUptime;
-+ (BOOL)commitRoundWithGeneration:(uint64_t)generation
-                         hashInfo:(NSDictionary *)hashInfoEntry
-                         activate:(NSString *)hashToActivate
-                     responseText:(NSString *)responseText
-                          request:(NSString *)requestBody
-                           config:(NSString *)configJson
-                       responseAt:(long long)responseAtSeconds
-                        activated:(BOOL *)activatedOut;
-@end
-
-// One round per process, whoever starts it first — the delayed cold-start
-// path or the crash-rescue thread (§11.3). The semaphore lets the rescue
-// wait out an in-flight round instead of racing it.
-static std::atomic<bool> pushyRoundStarted{false};
-static std::atomic<bool> pushyRoundCompleted{false};
-// Flipped the moment a crash is being held. JS is dead from that point on,
-// so there is no second decision maker: the round force-activates whatever
-// it downloads (§11.3).
-static std::atomic<bool> pushyCrashHoldActive{false};
-static std::atomic<bool> pushyHoldAttempted{false};
-// Set when this process's round is the tvOS purged-version restore.
-static std::atomic<bool> pushyPurgeRestoreActive{false};
-// True while +bundleURL waits for that restore. Only then may the round
-// activate what it downloads on its own (JS has not started to decide), since
-// the launch resolves the bundle again afterwards. Closed once the wait ends,
-// timeout or not; guarded by the state lock that every activation commits
-// under, so a commit lands either before the close (and launches) or after it
-// (and is left to JS) — never selected behind the packaged bundle's back.
-static bool pushyPurgeRestoreWindowOpen = false;
-static dispatch_semaphore_t pushyRoundDone;
-static NSString *pushyLaunchRolledBackForHold = nil;
-// A version this process downloaded but left for JS to activate. If the
-// process then crashes, JS will never activate it — the crash handler
-// activates it directly (bounded local work, no network). The generation is
-// the one the round committed under: a reset that lands afterwards bumps it,
-// and the late activation must lose to that reset exactly like the round
-// itself would. Guarded by @synchronized (RCTPushyOrchestrator class).
-static NSString *pushyUnactivatedHash = nil;
-static uint64_t pushyUnactivatedGeneration = 0;
-static NSUncaughtExceptionHandler *pushyPreviousExceptionHandler = NULL;
-// ≈ process start: scheduleFromColdStart runs during the first bundleURL.
-static NSTimeInterval pushyProcessAnchorUptime = 0;
-// Config JSON for which JS reported a completed check in this process
-// (markJsCheckCompleted). Process-scoped by design. Guarded by
-// @synchronized (RCTPushyOrchestrator class).
-static NSString *pushyJsCompletedConfig = nil;
-// The group supplements (rather than consumes) the crash-rescue semaphore.
-static dispatch_group_t pushyHostRoundGroup;
-static std::atomic<bool> pushySyncReady{false};
-static NSDictionary *pushyHostRoundResult = nil;
-static NSString *pushyHostRoundConfig = nil;
-static uint64_t pushyHostRoundGeneration = 0;
-static std::atomic<uint64_t> pushyNativeConfigGeneration{0};
-static uint64_t pushyHostRoundConfigGeneration = 0;
-
-static const NSTimeInterval kPushyHoldTriggerUptime = 60;
-static const NSTimeInterval kPushyHoldBudgetBackgroundThread = 10;
-// A held main thread freezes UI teardown; stay well under the watchdog.
-static const NSTimeInterval kPushyHoldBudgetMainThread = 3.5;
-// The purged-version restore blocks +bundleURL, usually inside
-// application:didFinishLaunching: — stay clear of the launch watchdog.
-static const NSTimeInterval kPushyPurgeRestoreBudget = 12;
-
-static void PushyMaybeHoldProcess(void) {
-    // Once per process; a second crashing thread passes straight through
-    // instead of waiting behind the first (§11.3: prefer under-rescuing over
-    // wedging the teardown).
-    bool expected = false;
-    if (!pushyHoldAttempted.compare_exchange_strong(expected, true)) {
-        return;
-    }
-    NSTimeInterval uptime = PushyMonotonicNow() - pushyProcessAnchorUptime;
-    bool roundInFlight = pushyRoundStarted.load() && !pushyRoundCompleted.load();
-    // Early crashes are the brick signature; a crash with an in-flight round
-    // is worth finishing regardless of uptime. Everything else is an ordinary
-    // crash whose UX must not be delayed.
-    if (uptime >= kPushyHoldTriggerUptime && !roundInFlight) {
-        return;
-    }
-    NSTimeInterval budget = [NSThread isMainThread]
-        ? kPushyHoldBudgetMainThread
-        : kPushyHoldBudgetBackgroundThread;
-    NSTimeInterval deadline = PushyMonotonicNow() + budget;
-    NSLog(@"RCTPushy -- crash hold: holding process for up to %.1fs "
-          @"(uptime %.1fs)", budget, uptime);
-
-    // The rescue runs on its own queue and the dying thread only waits with a
-    // hard timeout: even a deadlocked rescue (a thread that died holding a
-    // lock — uncaught ObjC exceptions skip @finally) can only delay the
-    // process death, never prevent it.
-    dispatch_semaphore_t done = dispatch_semaphore_create(0);
-    dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{
+// Host preparation runs off the caller's thread; the completion is delivered
+// on the main queue. Calls run concurrently so each timeout counts from its
+// own call: a serial queue would hold a later prepareBundle(timeout:) behind an
+// earlier call's whole wait. Nothing here needs serializing — claimRound is an
+// atomic compare-exchange and the round group (entered once at setup) releases
+// every waiter when the round ends.
+static void PushyRunHostPreparation(NSDictionary *(^work)(void),
+                                    RCTPushyBundlePreparationCompletion completion) {
+    static dispatch_queue_t hostQueue =
+        dispatch_queue_create("cn.reactnative.pushy.host-sync", DISPATCH_QUEUE_CONCURRENT);
+    dispatch_async(hostQueue, ^{
+        NSDictionary *result;
         @try {
-            [RCTPushyOrchestrator runHoldRoundWithDeadline:deadline];
+            result = work();
         } @catch (NSException *exception) {
-            NSLog(@"RCTPushy -- crash hold failed: %@", exception.reason);
-        }
-        dispatch_semaphore_signal(done);
-    });
-    if (dispatch_semaphore_wait(done, dispatch_time(DISPATCH_TIME_NOW,
-            (int64_t)(budget * NSEC_PER_SEC))) != 0) {
-        NSLog(@"RCTPushy -- crash hold: budget exhausted, letting go");
-    }
-}
-
-// Crash-moment brick rescue (§11): when the app is dying of an uncaught
-// exception during startup (RCTFatal raises NSException in release), the
-// process is still alive and JS will never run again — a natural,
-// false-positive-free window to finish the cold-start check. The previous
-// handler (crash reporters chain the same way) always runs afterwards.
-static void PushyCrashHoldExceptionHandler(NSException *exception) {
-    @try {
-        PushyMaybeHoldProcess();
-    } @catch (NSException *inner) {
-        // The dying process owes the previous handler its turn no matter
-        // what the rescue did.
-    }
-    if (pushyPreviousExceptionHandler != NULL) {
-        pushyPreviousExceptionHandler(exception);
-    }
-}
-
-static void PushyInstallCrashHoldHandler(void) {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        pushyPreviousExceptionHandler = NSGetUncaughtExceptionHandler();
-        NSSetUncaughtExceptionHandler(&PushyCrashHoldExceptionHandler);
-    });
-}
-
-// Single-flight for the digest in PushyBundleHashSync: the delayed cold-start
-// round (utility queue) and JS getBundleHash (_fileQueue) can both miss the
-// cache right after an install; the second caller waits for the first and
-// then reads its cache entry instead of hashing the same multi-MB file twice.
-static NSLock *PushyBundleHashLock(void) {
-    static NSLock *lock;
-    static dispatch_once_t once;
-    dispatch_once(&once, ^{
-        lock = [NSLock new];
-    });
-    return lock;
-}
-
-static NSString *PushyCachedBundleHash(NSUserDefaults *defaults, NSString *cachedPrefix) {
-    NSString *cached = [defaults stringForKey:keyBundleHashCache];
-    if ([cached hasPrefix:cachedPrefix]) {
-        return [cached substringFromIndex:cachedPrefix.length];
-    }
-    return nil;
-}
-
-// Shared by the getBundleHash RCT method and the native cold-start check.
-// Returns @"" when unknown. With computeIfMissing the sha256 of the embedded
-// bundle is taken on a cache miss (once per install; blocking — call off the
-// main thread). Without it only the cache is consulted: a crash rescue on
-// the main thread has a 3.5s budget in total, and hashing a large bundle on
-// a fresh install would spend all of it before the first request.
-static NSString *PushyBundleHashSync(BOOL computeIfMissing) {
-    NSString *path = [[RCTPushy binaryBundleURL] path];
-    if (path == nil) {
-        return @"";
-    }
-    NSDictionary *attributes =
-        [[NSFileManager defaultManager] attributesOfItemAtPath:path error:nil];
-    if (attributes == nil) {
-        return @"";
-    }
-    NSString *cacheKey = [NSString stringWithFormat:@"%@|%llu|%.0f",
-        [RCTPushy packageVersion],
-        attributes.fileSize,
-        [attributes.fileModificationDate timeIntervalSince1970]];
-
-    NSUserDefaults *defaults = PushyDefaults();
-    NSString *cachedPrefix = [cacheKey stringByAppendingString:@"|"];
-    NSString *cached = PushyCachedBundleHash(defaults, cachedPrefix);
-    if (cached != nil) {
-        return cached;
-    }
-    if (!computeIfMissing) {
-        return @"";
-    }
-
-    NSLock *lock = PushyBundleHashLock();
-    [lock lock];
-    @try {
-        // The previous holder may have filled the cache while we waited.
-        cached = PushyCachedBundleHash(defaults, cachedPrefix);
-        if (cached != nil) {
-            return cached;
+            RCTLogWarn(@"RCTPushy -- native host sync failed: %@", exception.reason);
+            result = PushyHostResult(@"failed", @"internal_error");
         }
-        NSString *hash = PushyFromStdString(
-            pushy::digest::Sha256File(PushyToStdString(path))) ?: @"";
-        if (hash.length > 0) {
-            [defaults setObject:[cachedPrefix stringByAppendingString:hash]
-                         forKey:keyBundleHashCache];
+        if (completion != nil) {
+            NSDictionary *snapshot = [result copy];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                completion(snapshot);
+            });
         }
-        return hash;
-    } @finally {
-        [lock unlock];
-    }
+    });
 }
 
 @implementation RCTPushy {
-    dispatch_queue_t _fileQueue;
     bool hasListeners;
 }
 
@@ -1000,134 +109,14 @@ RCT_EXPORT_MODULE(RCTPushy);
     }
 }
 
-// Resolves the bundle to launch from the persisted state; nil means the
-// packaged bundle. Consumes the launch's one-shot state (first_time), so a
-// second call is only valid after something re-armed it (a switchVersion).
-// purgedVersion is set on tvOS when the installed version's files are gone.
-+ (NSURL *)resolveLaunchBundleURL:(NSString **)launchRolledBackVersionOut
-                    purgedVersion:(NSString **)purgedVersionOut
-{
-    __block NSURL *resolvedURL = nil;
-    __block NSString *launchRolledBackVersion = nil;
-    __block NSString *purgedVersion = nil;
-    @try {
-        PushyWithStateLock(^{
-            NSUserDefaults *defaults = PushyDefaults();
-
-        NSString *curPackageVersion = [RCTPushy packageVersion];
-        NSString *curBuildTime = [RCTPushy buildTime];
-
-        pushy::state::State state = PushyStateFromDefaults(defaults);
-        pushy::state::BinaryVersionSyncResult sync = pushy::state::SyncBinaryVersion(
-            state,
-            PushyToStdString(curPackageVersion),
-            PushyToStdString(curBuildTime)
-        );
-        if (sync.changed) {
-            [defaults setObject:@(YES) forKey:KeyPackageUpdatedMarked];
-            state = sync.state;
-            PushyApplyStateToDefaults(defaults, state);
-        }
-
-        if (!state.current_version.empty()) {
-            std::string const versionBeforeLaunch = state.current_version;
-            pushy::state::LaunchDecision decision = pushy::state::ResolveLaunchState(
-                state,
-                ignoreRollback.load(),
-                true
-            );
-            state = decision.state;
-
-            if (decision.did_rollback) {
-                // The crash-protection rollback: the new version never called
-                // markSuccess. Keep this visible in release logs.
-                RCTLogWarn(@"RCTPushy -- version %@ was not marked as successful, rolled back to %@",
-                    PushyFromStdString(versionBeforeLaunch),
-                    PushyFromStdString(state.current_version));
-            }
-            if (decision.did_rollback || decision.consumed_first_time) {
-                PushyApplyStateToDefaults(defaults, state);
-            }
-            if (decision.consumed_first_time) {
-                // bundleURL may be called many times, ignore rollbacks before process restarted again.
-                ignoreRollback = true;
-                [defaults setObject:@(YES) forKey:keyFirstLoadMarked];
-            }
-
-            NSString *loadVersion = PushyFromStdString(decision.load_version);
-            NSString *downloadDir = [RCTPushy downloadDir];
-            // Guard the rollback chain against cycles: a corrupted state
-            // returning an already-visited version would otherwise spin this
-            // loop forever during startup (Android has the same guard).
-            NSMutableSet<NSString *> *visitedVersions = [NSMutableSet set];
-            while (loadVersion.length && ![visitedVersions containsObject:loadVersion]) {
-                [visitedVersions addObject:loadVersion];
-                NSString *bundlePath = [[downloadDir stringByAppendingPathComponent:loadVersion] stringByAppendingPathComponent:BUNDLE_FILE_NAME];
-                if ([[NSFileManager defaultManager] fileExistsAtPath:bundlePath isDirectory:NULL]) {
-                    pushyLaunchVersion = loadVersion;
-                    resolvedURL = [NSURL fileURLWithPath:bundlePath];
-                    break;
-                } else {
-#if TARGET_OS_TV
-                    // Caches is purgeable on tvOS: a missing bundle is the OS
-                    // reclaiming space, not a bad release. Everything under
-                    // rctpushy went with it, so walking back to last_version
-                    // is pointless, and a rollback mark would make this
-                    // launch's check refuse to reinstall the version.
-                    RCTLogWarn(@"RCTPushy -- bundle version %@ was purged by the system", loadVersion);
-                    purgedVersion = loadVersion;
-                    state = pushy::state::ForgetPurgedVersions(state);
-                    PushyApplyStateToDefaults(defaults, state);
-                    if (decision.consumed_first_time) {
-                        // The first load being consumed never happens: the
-                        // packaged bundle must not report isFirstTime.
-                        ignoreRollback = false;
-                        [defaults removeObjectForKey:keyFirstLoadMarked];
-                    }
-                    break;
-#else
-                    RCTLogError(@"RCTPushy -- bundle version %@ not found, rolling back", loadVersion);
-                    state = pushy::state::Rollback(state);
-                    PushyApplyStateToDefaults(defaults, state);
-                    loadVersion = PushyFromStdString(state.current_version);
-#endif
-                }
-            }
-        }
-        // Capture before constantsToExport consumes this one-shot marker.
-        // The delayed native check must never forceBoot the version that this
-        // launch just rolled back.
-            launchRolledBackVersion = PushyFromStdString(state.rolled_back_version);
-        });
-    } @finally {
-        *launchRolledBackVersionOut = launchRolledBackVersion;
-        *purgedVersionOut = purgedVersion;
-    }
-    return resolvedURL;
-}
-
-+ (NSString *) rollback {
-    __block NSString *currentVersion = nil;
-    PushyWithStateLock(^{
-        NSUserDefaults *defaults = PushyDefaults();
-        pushy::state::State state = pushy::state::Rollback(PushyStateFromDefaults(defaults));
-        PushyApplyStateToDefaults(defaults, state);
-        currentVersion = PushyFromStdString(state.current_version);
-    });
-    return currentVersion;
-}
-
 + (void)configure:(NSDictionary<NSString *, id> *)options
        completion:(RCTPushyConfigurationCompletion)completion
 {
     NSError *validationError = nil;
     // Snapshot nested mutable caller values before crossing a queue boundary.
     NSString *config = RCTPushyNormalizeConfiguration(options, &validationError);
-    static dispatch_queue_t configQueue;
-    static dispatch_once_t once;
-    dispatch_once(&once, ^{
-        configQueue = dispatch_queue_create("cn.reactnative.pushy.host-config", DISPATCH_QUEUE_SERIAL);
-    });
+    static dispatch_queue_t configQueue =
+        dispatch_queue_create("cn.reactnative.pushy.host-config", DISPATCH_QUEUE_SERIAL);
     dispatch_async(configQueue, ^{
         NSError *failure = validationError;
         if (config != nil) {
@@ -1148,26 +137,17 @@ RCT_EXPORT_MODULE(RCTPushy);
 
 + (void)prepareBundleWithCompletion:(RCTPushyBundlePreparationCompletion)completion
 {
-    static dispatch_queue_t hostQueue;
-    static dispatch_once_t once;
-    dispatch_once(&once, ^{
-        hostQueue = dispatch_queue_create("cn.reactnative.pushy.host-sync", DISPATCH_QUEUE_SERIAL);
-    });
-    dispatch_async(hostQueue, ^{
-        NSDictionary *result;
-        @try {
-            result = [RCTPushyOrchestrator prepareBundle];
-        } @catch (NSException *exception) {
-            RCTLogWarn(@"RCTPushy -- native host sync failed: %@", exception.reason);
-            result = PushyHostResult(@"failed", @"internal_error", nil, NO);
-        }
-        if (completion != nil) {
-            NSDictionary *snapshot = [result copy];
-            dispatch_async(dispatch_get_main_queue(), ^{
-                completion(snapshot);
-            });
-        }
-    });
+    PushyRunHostPreparation(^NSDictionary * {
+        return [RCTPushyOrchestrator prepareBundle];
+    }, completion);
+}
+
++ (void)prepareBundleWithTimeout:(NSTimeInterval)timeout
+                      completion:(RCTPushyBundlePreparationCompletion)completion
+{
+    PushyRunHostPreparation(^NSDictionary * {
+        return [RCTPushyOrchestrator prepareBundleWithin:timeout];
+    }, completion);
 }
 
 + (BOOL)requiresMainQueueSetup
@@ -1197,15 +177,8 @@ RCT_EXPORT_MODULE(RCTPushy);
         if (currentVersion != nil) {
             ret[@"currentVersionInfo"] = [defaults objectForKey:PushyHashInfoKey(currentVersion)];
             // bundleSha256 from the install record, for crash-report attribution.
-            NSString *bundleSha256 = @"";
-            if (PushyIsSafePathComponent(currentVersion)) {
-                NSDictionary *record = PushyReadInstallRecord(
-                    [[RCTPushy downloadDir] stringByAppendingPathComponent:currentVersion]);
-                if ([record[@"bundleSha256"] isKindOfClass:[NSString class]]) {
-                    bundleSha256 = record[@"bundleSha256"];
-                }
-            }
-            ret[@"currentBundleSha256"] = bundleSha256;
+            ret[@"currentBundleSha256"] = PushyIsSafePathComponent(currentVersion)
+                ? PushyRecordedBundleSha256(PushyVersionDir(currentVersion)) : @"";
         }
 
         if (ret[@"isFirstTime"]) {
@@ -1214,36 +187,18 @@ RCT_EXPORT_MODULE(RCTPushy);
 
         if (ret[@"rolledBackVersion"] != nil) {
             [defaults removeObjectForKey:keyRolledBackMarked];
-            [self clearInvalidFiles];
+            [RCTPushyInstaller clearInvalidFiles];
         }
 
-        if ([[defaults objectForKey:KeyPackageUpdatedMarked] boolValue]) {
-            [defaults removeObjectForKey:KeyPackageUpdatedMarked];
-            [self clearInvalidFiles];
+        if ([[defaults objectForKey:KeyPackageUpdatedMarked()] boolValue]) {
+            [defaults removeObjectForKey:KeyPackageUpdatedMarked()];
+            [RCTPushyInstaller clearInvalidFiles];
         }
     });
 
     return ret;
 }
 
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        // One process-wide serial queue, not per-instance: a bridge reload can
-        // briefly keep two RCTPushy instances alive, and destructive file work
-        // (resetToPackagedBundle's full cleanup) must stay serialized with the
-        // other instance's unzip/patch jobs.
-        static dispatch_queue_t sharedFileQueue;
-        static dispatch_once_t onceToken;
-        dispatch_once(&onceToken, ^{
-            sharedFileQueue = dispatch_queue_create("cn.reactnative.pushy.file", DISPATCH_QUEUE_SERIAL);
-        });
-        _fileQueue = sharedFileQueue;
-    }
-    return self;
-}
-
 RCT_EXPORT_METHOD(setUuid:(NSString *)uuid  resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
@@ -1268,10 +223,8 @@ RCT_EXPORT_METHOD(syncNativeConfig:(NSString *)config
         PushyRejectError(reject, PushyErrorWithCode(pushy::error_codes::kInvalidOptions, ERROR_OPTIONS));
         return;
     }
-    NSData *data = [config dataUsingEncoding:NSUTF8StringEncoding];
     NSError *error = nil;
-    id object = data == nil ? nil : [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
-    if (![object isKindOfClass:[NSDictionary class]]) {
+    if (PushyJsonDictionary(config, &error) == nil) {
         PushyRejectError(reject, PushyErrorWithCode(
             pushy::error_codes::kInvalidOptions,
             error != nil ? error.localizedDescription : ERROR_OPTIONS));
@@ -1281,8 +234,8 @@ RCT_EXPORT_METHOD(syncNativeConfig:(NSString *)config
         [RCTPushyOrchestrator persistConfiguration:config];
         resolve(@true);
     } @catch (NSException *exception) {
-        PushyRejectError(reject, PushyErrorWithCode(pushy::error_codes::kFileOperationFailed,
-            exception.reason ?: @"Native configuration failed"));
+        PushyRejectException(reject, pushy::error_codes::kFileOperationFailed, exception,
+                             @"Native configuration failed");
     }
 }
 
@@ -1313,13 +266,9 @@ RCT_EXPORT_METHOD(setLocalHashInfo:(NSString *)hash
         return;
     }
 
-    NSData *data = [value dataUsingEncoding:NSUTF8StringEncoding];
     NSError *error = nil;
-    id object = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
-    if (object && [object isKindOfClass:[NSDictionary class]]) {
-        NSUserDefaults *defaults = PushyDefaults();
-        [defaults setObject:value forKey:PushyHashInfoKey(hash)];
-        
+    if (PushyJsonDictionary(value, &error) != nil) {
+        [PushyDefaults() setObject:value forKey:PushyHashInfoKey(hash)];
         resolve(@true);
     } else {
         PushyRejectError(reject, PushyErrorWithCode(
@@ -1373,7 +322,7 @@ RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSError *error = nil;
-    if (![self switchVersion:PushyOptionString(options, @"hash") error:&error]) {
+    if (![RCTPushyInstaller switchVersion:PushyOptionString(options, @"hash") error:&error]) {
         PushyRejectError(reject, error);
         return;
     }
@@ -1386,27 +335,19 @@ RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSError *error = nil;
-    if (![self switchVersion:PushyOptionString(options, @"hash") error:&error]) {
+    if (![RCTPushyInstaller switchVersion:PushyOptionString(options, @"hash") error:&error]) {
         PushyRejectError(reject, error);
         return;
     }
 
-    NSError *reloadError = [self restartBridgeWithReason:@"pushy restart"];
-    if (reloadError != nil) {
-        PushyRejectError(reject, reloadError);
-        return;
-    }
+    PushyTriggerReload(@"pushy restart");
     resolve(@true);
 }
 
 RCT_EXPORT_METHOD(restartApp:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    NSError *reloadError = [self restartBridgeWithReason:@"pushy restartApp"];
-    if (reloadError != nil) {
-        PushyRejectError(reject, reloadError);
-        return;
-    }
+    PushyTriggerReload(@"pushy restartApp");
     resolve(@true);
 }
 
@@ -1424,7 +365,7 @@ RCT_EXPORT_METHOD(getBundleHash:(RCTPromiseResolveBlock)resolve
     // is running. Mirrors the dev behaviour of buildTime.
     resolve(@"");
 #else
-    dispatch_async(_fileQueue, ^{
+    dispatch_async(PushyFileQueue(), ^{
         resolve(PushyBundleHashSync(YES));
     });
 #endif
@@ -1450,12 +391,12 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
             PushyApplyStateToDefaults(defaults, result.state);
         });
     } @catch (NSException *exception) {
-        PushyRejectError(reject, PushyErrorWithCode(pushy::error_codes::kMarkSuccessFailed,
-                                                    exception.reason ?: @"markSuccess failed"));
+        PushyRejectException(reject, pushy::error_codes::kMarkSuccessFailed, exception,
+                             @"markSuccess failed");
         return;
     }
 
-    [self clearInvalidFiles];
+    [RCTPushyInstaller clearInvalidFiles];
     resolve(@true);
     #endif
 }
@@ -1494,19 +435,18 @@ RCT_EXPORT_METHOD(resetToPackagedBundle:(RCTPromiseResolveBlock)resolve
                 }
             }
             [defaults removeObjectForKey:keyFirstLoadMarked];
-            [defaults removeObjectForKey:KeyPackageUpdatedMarked];
+            [defaults removeObjectForKey:KeyPackageUpdatedMarked()];
             // A cached response still advertises the version this reset just
             // removed; dropping it stops the JS side from reusing that answer.
             [defaults removeObjectForKey:keyNativeCheckCache];
             ignoreRollback = false;
         });
     } @catch (NSException *exception) {
-        PushyRejectError(reject, PushyErrorWithCode(pushy::error_codes::kResetFailed,
-                                                    exception.reason ?: @"reset failed"));
+        PushyRejectException(reject, pushy::error_codes::kResetFailed, exception, @"reset failed");
         return;
     }
 
-    dispatch_async(_fileQueue, ^{
+    dispatch_async(PushyFileQueue(), ^{
         // maxAgeDays=0: remove every downloaded entry except the running
         // version's directory (cleaned up by the next regular cleanup). The
         // state was just wiped, so that is the only name left to keep. The
@@ -1530,7 +470,6 @@ RCT_EXPORT_METHOD(resetToPackagedBundle:(RCTPromiseResolveBlock)resolve
 }
 
 
-
 #pragma mark - private
 - (NSArray<NSString *> *)supportedEvents
 {
@@ -1552,9 +491,19 @@ RCT_EXPORT_METHOD(resetToPackagedBundle:(RCTPromiseResolveBlock)resolve
               resolver:(RCTPromiseResolveBlock)resolve
               rejecter:(RCTPromiseRejectBlock)reject
 {
-    [self performFetch:type options:options callback:^(NSError *error) {
+    NSString *hash = PushyOptionString(options, @"hash") ?: @"";
+    void (^progress)(long long, long long) = ^(long long receivedBytes, long long totalBytes) {
+        if (self->hasListeners) {
+            [self sendEventWithName:EVENT_PROGRESS_DOWNLOAD body:@{
+                PARAM_PROGRESS_HASH: hash,
+                PARAM_PROGRESS_RECEIVED: @(receivedBytes),
+                PARAM_PROGRESS_TOTAL: @(totalBytes),
+            }];
+        }
+    };
+    [RCTPushyInstaller fetch:type options:options progress:progress callback:^(NSError *error) {
         if (error != nil) {
-            if (error.userInfo[PushyErrorCodeKey] == nil) {
+            if (error.userInfo[RCTPushyErrorCodeKey] == nil) {
                 // Unclassified (system/network) errors from the download
                 // pipeline; keep the original message.
                 error = PushyErrorWithCode(pushy::error_codes::kDownloadFailed,
@@ -1567,644 +516,6 @@ RCT_EXPORT_METHOD(resetToPackagedBundle:(RCTPromiseResolveBlock)resolve
     }];
 }
 
-// Triggers a JS reload; returns nil when one was scheduled, a RESTART_FAILED
-// error when this host cannot restart. React Native re-resolves the bundle
-// URL itself on reload (RCTHost asks its bundleURLProvider, RCTBridge.setUp
-// re-asks sourceURLForBridge:), so +bundleURL is deliberately NOT called
-// here: it consumes one-shot launch state (first_time, the first-load mark,
-// ignoreRollback), and consuming it for a reload that never happens would
-// make the next cold start roll the freshly switched version back.
-- (NSError *)restartBridgeWithReason:(NSString *)reason
-{
-#if PUSHY_HAS_RELOAD_COMMAND
-    dispatch_async(dispatch_get_main_queue(), ^{
-        RCTTriggerReloadCommandListeners(reason);
-    });
-    return nil;
-#else
-    // No RCTReloadCommand in this React Native: only the legacy bridge can
-    // reload. Under bridgeless the module's bridge is nil or an RCTBridgeProxy
-    // whose -reload is a logged no-op (object_getClass avoids messaging the
-    // proxy) — report that instead of resolving a restart that never happens.
-    RCTBridge *bridge = self.bridge;
-    if (bridge == nil || object_getClass(bridge) == NSClassFromString(@"RCTBridgeProxy")) {
-        return PushyErrorWithCode(pushy::error_codes::kRestartFailed,
-                                  @"no bridge available to restart (bridgeless host without the RN restart command)");
-    }
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [bridge reload];
-    });
-    return nil;
-#endif
-}
-
-- (void)performFetch:(PushyType)type options:(NSDictionary *)options callback:(void (^)(NSError *error))callback
-{
-    NSString *updateUrl = PushyOptionString(options, PushyOptionUrlKey);
-    NSString *hash = PushyOptionString(options, @"hash");
-
-    if (PushyStringIsBlank(updateUrl) || !PushyIsSafePathComponent(hash)) {
-        callback(PushyErrorWithCode(pushy::error_codes::kInvalidOptions, ERROR_OPTIONS));
-        return;
-    }
-    NSString *originHash = PushyOptionString(options, @"originHash");
-    if (type == PushyTypePatchFromPpk && !PushyIsSafePathComponent(originHash)) {
-        callback(PushyErrorWithCode(pushy::error_codes::kInvalidOptions, ERROR_OPTIONS));
-        return;
-    }
-    
-    NSString *dir = [RCTPushy downloadDir];
-    BOOL success = [self ensureDirectoryExistsAtPath:dir];
-    if (!success) {
-        callback(PushyErrorWithCode(pushy::error_codes::kFileOperationFailed, ERROR_FILE_OPERATION));
-        return;
-    }
-
-    NSString *unzipDir = [dir stringByAppendingPathComponent:hash];
-    if (PushyHasCompletedVersionAtPath(unzipDir, hash)) {
-        callback(nil);
-        return;
-    }
-
-    NSTimeInterval deadlineUptime = PushyMonotonicNow() + 600;
-    NSNumber *configuredDeadline = options[@"deadlineUptime"];
-    if ([configuredDeadline isKindOfClass:[NSNumber class]]) {
-        deadlineUptime = configuredDeadline.doubleValue;
-    }
-    if (deadlineUptime <= PushyMonotonicNow()) {
-        callback(PushyDownloadDeadlineExpiredError());
-        return;
-    }
-
-    void (^progress)(long long, long long) = ^(long long receivedBytes, long long totalBytes) {
-        if (self->hasListeners) {
-            [self sendEventWithName:EVENT_PROGRESS_DOWNLOAD body:@{
-                PARAM_PROGRESS_HASH:hash,
-                PARAM_PROGRESS_RECEIVED:@(receivedBytes),
-                PARAM_PROGRESS_TOTAL:@(totalBytes),
-            }];
-        }
-    };
-    void (^deferredStart)(void) = ^{
-        [self performFetch:type options:options callback:callback];
-    };
-    PushyDownloadRegistration registration = PushyRegisterDownload(
-        hash, type, deadlineUptime, callback, progress, deferredStart);
-    if (registration != PushyDownloadRegistrationOwner) {
-        RCTLogInfo(
-            @"RCTPushy -- %@ in-flight download for %@",
-            registration == PushyDownloadRegistrationJoined ? @"join" : @"defer",
-            hash);
-        return;
-    }
-
-    NSString *zipFilePath = [dir stringByAppendingPathComponent:[NSString stringWithFormat:@"%@%@",hash, [self zipExtension:type]]];
-
-    // On failure, remove the partial version directory like Android/Harmony
-    // do: a half-unzipped/half-patched dir leaks disk and could later be
-    // mistaken for a complete version. hash is validated non-blank above, so
-    // this can never resolve to the download root itself.
-    void (^completion)(NSError *) = ^(NSError *error) {
-        // Settle every JS/native waiter only after cleanup or the atomic
-        // completion marker write has run on the process-wide file queue.
-        dispatch_async(self->_fileQueue, ^{
-            NSError *finalError = error;
-            NSFileManager *fileManager = [NSFileManager defaultManager];
-            NSString *staging = PushyStagingDirForVersionDir(unzipDir);
-            NSString *artifactSha256 = nil;
-            @synchronized (PushyArtifactDigests()) {
-                artifactSha256 = PushyArtifactDigests()[hash];
-                [PushyArtifactDigests() removeObjectForKey:hash];
-            }
-            if (finalError == nil) {
-                // Two-phase install (cpp/patch_core/install_record.h): the
-                // completion record with the final bundle's digest goes into
-                // the staging directory, which is then renamed over the
-                // version directory in one atomic step.
-                NSString *bundlePath = [staging stringByAppendingPathComponent:BUNDLE_FILE_NAME];
-                if (![fileManager fileExistsAtPath:bundlePath]) {
-                    finalError = PushyErrorWithCode(pushy::error_codes::kDeltaFailed,
-                                                    @"bundle missing after install");
-                } else {
-                    std::string bundleSha256 = pushy::digest::Sha256File(PushyToStdString(bundlePath));
-                    NSMutableDictionary *record = [NSMutableDictionary dictionary];
-                    record[@"schema"] = @(pushy::install_record::kSchema);
-                    record[@"versionHash"] = hash;
-                    if (!bundleSha256.empty()) {
-                        record[@"bundleSha256"] = [NSString stringWithUTF8String:bundleSha256.c_str()];
-                    }
-                    if (artifactSha256.length > 0) {
-                        record[@"artifactSha256"] = artifactSha256;
-                    }
-                    NSError *recordError = nil;
-                    NSData *recordData = [NSJSONSerialization dataWithJSONObject:record options:0 error:&recordError];
-                    NSString *marker = [staging stringByAppendingPathComponent:VERSION_COMPLETE_FILE_NAME];
-                    if (recordData == nil || ![recordData writeToFile:marker
-                                                               options:NSDataWritingAtomic
-                                                                 error:&recordError]) {
-                        finalError = recordError ?: PushyErrorWithCode(
-                            pushy::error_codes::kFileOperationFailed,
-                            @"failed to write completion record");
-                    } else {
-                        if ([fileManager fileExistsAtPath:unzipDir]) {
-                            [fileManager removeItemAtPath:unzipDir error:nil];
-                        }
-                        NSError *moveError = nil;
-                        if (![fileManager moveItemAtPath:staging toPath:unzipDir error:&moveError]) {
-                            finalError = moveError ?: PushyErrorWithCode(
-                                pushy::error_codes::kFileOperationFailed,
-                                @"failed to promote staging directory");
-                        }
-                    }
-                }
-            }
-            if (finalError != nil) {
-                // Only the staging directory is ours to drop: the final
-                // version directory is never touched by a failed install.
-                [fileManager removeItemAtPath:staging error:nil];
-            }
-            PushyFinishDownload(hash, finalError);
-        });
-    };
-
-    RCTLogInfo(@"RCTPushy -- download file %@", updateUrl);
-    NSTimeInterval timeoutSeconds = deadlineUptime - PushyMonotonicNow();
-    if (timeoutSeconds <= 0) {
-        completion(PushyDownloadDeadlineExpiredError());
-        return;
-    }
-    [RCTPushyDownloader download:updateUrl
-                            savePath:zipFilePath
-                     timeoutInterval:timeoutSeconds
-                     progressHandler:^(long long receivedBytes, long long totalBytes) {
-        PushyReportDownloadProgress(hash, receivedBytes, totalBytes);
-    } completionHandler:^(NSString *path, NSError *error) {
-        if (error != nil) {
-            completion(error);
-            return;
-        }
-        [self unzipDownloadedPackage:zipFilePath
-                                hash:hash
-                                type:type
-                          originHash:originHash
-                            callback:completion];
-    }];
-}
-
-- (void)unzipDownloadedPackage:(NSString *)zipFilePath
-                          hash:(NSString *)hash
-                          type:(PushyType)type
-                    originHash:(NSString *)originHash
-                      callback:(void (^)(NSError *error))callback
-{
-    RCTLogInfo(@"RCTPushy -- unzip file %@", zipFilePath);
-    // Everything lands in <hash>.staging; the completion block promotes it.
-    NSString *unzipFilePath = PushyStagingDirForVersionDir(
-        [[RCTPushy downloadDir] stringByAppendingPathComponent:hash]);
-    dispatch_async(_fileQueue, ^{
-        // Archive digest for the completion record, taken before the unzip
-        // consumes the file (same serial queue, so it runs first).
-        std::string digest = pushy::digest::Sha256File(PushyToStdString(zipFilePath));
-        @synchronized (PushyArtifactDigests()) {
-            PushyArtifactDigests()[hash] = [NSString stringWithUTF8String:digest.c_str()];
-        }
-    });
-    [self unzipFileAtPath:zipFilePath
-            toDestination:unzipFilePath
-        completionHandler:^(NSError *error) {
-        dispatch_async(self->_fileQueue, ^{
-            if (error != nil) {
-                callback(error);
-                return;
-            }
-            @try {
-                [self finishDownloadedPackage:hash type:type originHash:originHash callback:callback];
-            } @catch (NSException *exception) {
-                // An uncaught exception in a GCD block is fatal (and would
-                // trip the crash rescue); a bad package is a PATCH_FAILED.
-                callback(PushyErrorWithCode(pushy::error_codes::kDeltaFailed,
-                                            exception.reason ?: @"delta failed"));
-            }
-        });
-    }];
-}
-
-- (void)finishDownloadedPackage:(NSString *)hash
-                           type:(PushyType)type
-                     originHash:(NSString *)originHash
-                       callback:(void (^)(NSError *error))callback
-{
-    switch (type) {
-        case PushyTypePatchFromPackage:
-            [self applyDeltaForHash:hash
-                               type:type
-                         fromBundle:[[RCTPushy binaryBundleURL] path]
-                             source:[[NSBundle mainBundle] resourcePath]
-                           callback:callback];
-            return;
-        case PushyTypePatchFromPpk: {
-            NSString *lastVersionDir = [[RCTPushy downloadDir] stringByAppendingPathComponent:originHash];
-            [self applyDeltaForHash:hash
-                               type:type
-                         fromBundle:[lastVersionDir stringByAppendingPathComponent:BUNDLE_FILE_NAME]
-                             source:lastVersionDir
-                           callback:callback];
-            return;
-        }
-        case PushyTypeFullDownload:
-            callback(nil);
-            return;
-    }
-}
-
-- (void)applyDeltaForHash:(NSString *)hash
-                     type:(PushyType)type
-               fromBundle:(NSString *)bundleOrigin
-                   source:(NSString *)sourceOrigin
-                 callback:(void (^)(NSError *error))callback
-{
-    // Patch work happens in the staging directory (two-phase install).
-    NSString *unzipDir = PushyStagingDirForVersionDir(
-        [[RCTPushy downloadDir] stringByAppendingPathComponent:hash]);
-    NSString *sourcePatch = [unzipDir stringByAppendingPathComponent:SOURCE_PATCH_NAME];
-    NSString *bundlePatch = [unzipDir stringByAppendingPathComponent:BUNDLE_PATCH_NAME];
-    
-    NSString *destination = [unzipDir stringByAppendingPathComponent:BUNDLE_FILE_NAME];
-    long long manifestBytes = RCTPushyFileSize(sourcePatch);
-    if (manifestBytes > pushy::archive_limits::kMaxManifestBytes) {
-        callback(PushyErrorWithCode(pushy::error_codes::kDeltaFailed,
-            [NSString stringWithFormat:@"delta manifest too large: %lld bytes", manifestBytes]));
-        return;
-    }
-    NSData *data = [NSData dataWithContentsOfFile:sourcePatch];
-    if (data == nil) {
-        callback(PushyErrorWithCode(pushy::error_codes::kDeltaFailed, @"missing delta manifest"));
-        return;
-    }
-
-    NSError *error = nil;
-    id jsonObject = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:&error];
-    if (error != nil) {
-        // Classify as a patch failure like the sibling manifest branches;
-        // unclassified errors would otherwise be tagged DOWNLOAD_FAILED by the
-        // fetchPackage fallback even though the download itself succeeded.
-        callback(PushyErrorWithCode(pushy::error_codes::kDeltaFailed, error.localizedDescription));
-        return;
-    }
-    if (![jsonObject isKindOfClass:[NSDictionary class]]) {
-        callback(PushyErrorWithCode(pushy::error_codes::kDeltaFailed, @"invalid delta manifest"));
-        return;
-    }
-    NSDictionary *json = (NSDictionary *)jsonObject;
-    pushy::delta::PatchManifest manifest;
-    NSString *manifestReason = nil;
-    if (!PushyPatchManifestFromJson(json, &manifest, &manifestReason)) {
-        callback(PushyErrorWithCode(pushy::error_codes::kDeltaFailed, manifestReason));
-        return;
-    }
-
-    std::vector<std::string> entryNames;
-    if ([[NSFileManager defaultManager] fileExistsAtPath:sourcePatch isDirectory:NULL]) {
-        entryNames.push_back(PushyToStdString(SOURCE_PATCH_NAME));
-    }
-    if ([[NSFileManager defaultManager] fileExistsAtPath:bundlePatch isDirectory:NULL]) {
-        entryNames.push_back(PushyToStdString(BUNDLE_PATCH_NAME));
-    }
-
-    pushy::archive_patch::ArchivePatchPlan plan;
-    pushy::delta::Status planStatus = pushy::archive_patch::BuildArchivePatchPlan(
-        type == PushyTypePatchFromPackage
-            ? pushy::archive_patch::ArchivePatchType::kPatchFromPackage
-            : pushy::archive_patch::ArchivePatchType::kPatchFromPpk,
-        manifest,
-        entryNames,
-        &plan
-    );
-    if (!planStatus.ok) {
-        callback(PushyNSErrorFromStatus(planStatus));
-        return;
-    }
-
-    pushy::delta::FileSourcePatchOptions options;
-    pushy::delta::Status optionStatus = pushy::archive_patch::BuildFileSourcePatchOptions(
-        plan,
-        PushyToStdString(sourceOrigin),
-        PushyToStdString(unzipDir),
-        PushyToStdString(bundleOrigin),
-        PushyToStdString(bundlePatch),
-        PushyToStdString(destination),
-        &options
-    );
-    if (!optionStatus.ok) {
-        callback(PushyNSErrorFromStatus(optionStatus));
-        return;
-    }
-
-    // __diff.json 的 hbcTransform 元数据(HBC 变换域 patch,hdiffv2 轨道):
-    // 存在时透传给 patch 内核执行 T(origin) → hpatch → T⁻¹;缺失走现状路径。
-    NSDictionary *hbcTransform = json[@"hbcTransform"];
-    if ([hbcTransform isKindOfClass:[NSDictionary class]]) {
-        NSDictionary *meta = hbcTransform[BUNDLE_PATCH_NAME];
-        if ([meta isKindOfClass:[NSDictionary class]]) {
-            NSError *metaError = nil;
-            NSData *metaData = [NSJSONSerialization dataWithJSONObject:meta options:0 error:&metaError];
-            if (metaData != nil && metaError == nil) {
-                NSString *metaString = [[NSString alloc] initWithData:metaData encoding:NSUTF8StringEncoding];
-                options.bundle_hbc_transform_meta = PushyToStdString(metaString);
-            }
-        }
-    }
-
-    pushy::delta::Status status = pushy::delta::ApplyPatchFromFileSource(options);
-    if (!status.ok) {
-        callback(PushyNSErrorFromStatus(status));
-        return;
-    }
-
-    callback(nil);
-}
-
-- (BOOL)switchVersion:(NSString *)hash error:(NSError **)error
-{
-    if (!PushyIsSafePathComponent(hash)) {
-        if (error != NULL) {
-            *error = PushyErrorWithCode(pushy::error_codes::kInvalidOptions, ERROR_OPTIONS);
-        }
-        return NO;
-    }
-
-    __block NSError *switchError = nil;
-    PushyWithStateLock(^{
-        // Same rule as Android: only a version this SDK recorded as completely
-        // installed (bundle + marker) may be activated. Versions activated
-        // before markers existed are grandfathered through current/last
-        // state; any other markerless directory may be a crash-left partial
-        // install or a directory something else put there.
-        NSString *versionDir = [[RCTPushy downloadDir] stringByAppendingPathComponent:hash];
-        pushy::state::State state = PushyStateFromDefaults(PushyDefaults());
-        std::string hashStd = PushyToStdString(hash);
-        BOOL legacyActivated = state.current_version == hashStd || state.last_version == hashStd;
-        if (!PushyHasCompletedVersionAtPath(versionDir, hash) && !legacyActivated) {
-            BOOL hasBundle = [[NSFileManager defaultManager] fileExistsAtPath:
-                [versionDir stringByAppendingPathComponent:BUNDLE_FILE_NAME]];
-            switchError = PushyErrorWithCode(
-                pushy::error_codes::kSwitchVersionFailed,
-                [NSString stringWithFormat:@"Bundle version %@ %@", hash,
-                    hasBundle ? @"is incomplete." : @"not found."]);
-            return;
-        }
-        if (!legacyActivated) {
-            // The record's bundle digest must match the bytes on disk before
-            // the next launch is pointed at them.
-            NSString *reason = PushyVerifyInstallForActivation(versionDir, hash);
-            if (reason != nil) {
-                switchError = PushyErrorWithCode(pushy::error_codes::kSwitchVersionFailed, reason);
-                return;
-            }
-        }
-        PushySwitchVersionLocked(hash);
-    });
-    if (switchError != nil) {
-        if (error != NULL) {
-            *error = switchError;
-        }
-        return NO;
-    }
-    return YES;
-}
-
-- (BOOL)ensureDirectoryExistsAtPath:(NSString *)path
-{
-    // No _fileQueue hop here: that queue also runs multi-second unzip/patch
-    // work, and a dispatch_sync onto it would block the whole module method
-    // queue for the duration. createDirectoryAtPath is idempotent and
-    // thread-safe, so checking inline is fine.
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    BOOL isDirectory = NO;
-    if ([fileManager fileExistsAtPath:path isDirectory:&isDirectory]) {
-        if (isDirectory) {
-            // Directories created by older versions never got the flag.
-            [RCTPushy excludeFromBackup:path];
-        }
-        return isDirectory;
-    }
-
-    NSError *error = nil;
-    BOOL success = [fileManager createDirectoryAtPath:path
-                          withIntermediateDirectories:YES
-                                           attributes:nil
-                                                error:&error];
-    if (!success && error != nil) {
-        RCTLogWarn(@"Pushy create directory error: %@", error.localizedDescription);
-    }
-    if (success) {
-        [RCTPushy excludeFromBackup:path];
-    }
-
-    return success;
-}
-
-// Everything under rctpushy is re-downloadable, and Application Support is
-// backed up to iCloud by default — Apple requires such content to be
-// excluded from backups.
-+ (void)excludeFromBackup:(NSString *)path
-{
-#if !TARGET_OS_TV  // tvOS stores under Caches, which is never backed up.
-    NSURL *url = [NSURL fileURLWithPath:path isDirectory:YES];
-    NSError *error = nil;
-    if (![url setResourceValue:@YES
-                        forKey:NSURLIsExcludedFromBackupKey
-                         error:&error]) {
-        RCTLogWarn(@"Pushy exclude from backup error: %@", error.localizedDescription);
-    }
-#endif
-}
-
-- (void)unzipFileAtPath:(NSString *)path
-          toDestination:(NSString *)destination
-      completionHandler:(void (^)(NSError *error))completionHandler
-{
-    dispatch_async(_fileQueue, ^{
-        NSFileManager *fileManager = [NSFileManager defaultManager];
-        if ([fileManager fileExistsAtPath:destination]) {
-            [fileManager removeItemAtPath:destination error:nil];
-        }
-
-        // Resource caps before the first byte is extracted
-        // (cpp/patch_core/archive_limits.h). SSZipArchive only exposes the
-        // entry count up front (zipArchiveWillUnzipArchiveAtPath:zipInfo:),
-        // not the uncompressed total, so the disk check uses a 2x-archive
-        // heuristic; the delegate below enforces the exact caps entry by
-        // entry.
-        long long archiveBytes = RCTPushyFileSize(path);
-        NSError *preflight = nil;
-        if (archiveBytes > pushy::archive_limits::kMaxArchiveBytes) {
-            preflight = PushyErrorWithCode(pushy::error_codes::kDeltaFailed,
-                [NSString stringWithFormat:@"archive too large: %lld bytes", archiveBytes]);
-        } else {
-            preflight = PushyEnsureFreeSpace(destination, MAX(0LL, archiveBytes) * 2);
-        }
-        if (preflight != nil) {
-            [fileManager removeItemAtPath:path error:nil];
-            [fileManager removeItemAtPath:RCTPushyResumeSidecarPath(path) error:nil];
-            if (completionHandler != nil) {
-                completionHandler(preflight);
-            }
-            return;
-        }
-
-        PushyUnzipGuard *guard = [PushyUnzipGuard new];
-        // preserveAttributes:NO — the archive's mode/mtime bits have no use
-        // here and are one less thing a hostile package controls.
-        [SSZipArchive unzipFileAtPath:path
-                        toDestination:destination
-                   preserveAttributes:NO
-                            overwrite:YES
-                       nestedZipLevel:0
-                             password:nil
-                                error:nil
-                             delegate:guard
-                      progressHandler:nil
-                    completionHandler:^(NSString *archivePath, BOOL succeeded, NSError *error) {
-            [fileManager removeItemAtPath:archivePath error:nil];
-            // The resume sidecar dies with its archive (§11.4): whether the
-            // unzip consumed it or classified it as poisoned, nothing must
-            // survive to vouch for bytes that are gone.
-            [fileManager removeItemAtPath:RCTPushyResumeSidecarPath(archivePath) error:nil];
-            if (completionHandler == nil) {
-                return;
-            }
-
-            NSError *unzipError = error;
-            if (guard.violation != nil) {
-                unzipError = PushyErrorWithCode(pushy::error_codes::kDeltaFailed, guard.violation);
-            } else if (!succeeded && unzipError == nil) {
-                unzipError = PushyErrorWithCode(pushy::error_codes::kDeltaFailed, @"unzip failed");
-            } else if (unzipError != nil && unzipError.userInfo[PushyErrorCodeKey] == nil) {
-                // SSZipArchive's own NSError (corrupt zip, bad magic, ...) has
-                // no stable code; without one, fetchPackage's fallback would
-                // classify it as DOWNLOAD_FAILED even though the download
-                // succeeded — keep the classification deterministic.
-                unzipError = PushyErrorWithCode(pushy::error_codes::kDeltaFailed,
-                                                unzipError.localizedDescription ?: @"unzip failed");
-            }
-            completionHandler(unzipError);
-        }];
-    });
-}
-
-- (void)clearInvalidFiles
-{
-    dispatch_async(_fileQueue, ^{
-        // Snapshot the state under the lock, but run the (slow) filesystem
-        // cleanup outside of it so state operations are not blocked.
-        __block pushy::state::State state;
-        __block NSString *launchVersion = nil;
-        PushyWithStateLock(^{
-            state = PushyStateFromDefaults(PushyDefaults());
-            launchVersion = pushyLaunchVersion;
-        });
-        NSString *downloadDir = [RCTPushy downloadDir];
-        // Keep the persisted current/last versions AND the version this
-        // process booted from: two switches without a restart would otherwise
-        // evict the running bundle while its on-demand assets are still
-        // being served.
-        pushy::delta::Status status = pushy::delta::CleanupOldEntries(
-            PushyToStdString(downloadDir),
-            std::vector<std::string>{
-                state.current_version,
-                state.last_version,
-                PushyToStdString(launchVersion),
-            },
-            3
-        );
-        if (!status.ok) {
-            RCTLogWarn(@"Pushy cleanup error: %s", status.message.c_str());
-        }
-    });
-}
-
-- (NSString *)zipExtension:(PushyType)type
-{
-    switch (type) {
-        case PushyTypePatchFromPackage:
-            return PushyIpaDeltaSuffix;
-        case PushyTypePatchFromPpk:
-            return PushyPpkDeltaSuffix;
-        case PushyTypeFullDownload:
-            break;
-    }
-    return @".ppk";
-}
-
-+ (NSString *)downloadDir
-{
-#if TARGET_OS_TV
-    // tvOS apps cannot write Application Support; Caches is the only
-    // writable, non-temporary location, and the system may purge it while
-    // the app is not running (see the purged-version path in +bundleURL).
-    NSSearchPathDirectory base = NSCachesDirectory;
-#else
-    NSSearchPathDirectory base = NSApplicationSupportDirectory;
-#endif
-    NSString *directory = [NSSearchPathForDirectoriesInDomains(base, NSUserDomainMask, YES) firstObject];
-    return [directory stringByAppendingPathComponent:@"rctpushy"];
-}
-
-+ (NSURL *)binaryBundleURL
-{
-    return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
-}
-
-+ (NSString *)packageVersion
-{
-    static NSString *version = nil;
-
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
-        version = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
-    });
-    return version;
-}
-
-+ (NSString *)buildTime
-{
-#if DEBUG
-    return @"0";
-#else
-    static NSString *buildTime;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        // The podspec's s.resource lands in the app bundle for a static
-        // library but inside this pod's own framework bundle under
-        // use_frameworks!; look in both.
-        NSString *stampPath =
-            [[NSBundle mainBundle] pathForResource:@"pushy_build_time" ofType:@"txt"]
-            ?: [[NSBundle bundleForClass:[RCTPushy class]] pathForResource:@"pushy_build_time"
-                                                                   ofType:@"txt"];
-        NSString *stamp = stampPath == nil ? nil
-            : [[NSString stringWithContentsOfFile:stampPath encoding:NSUTF8StringEncoding error:nil]
-                  stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-        if (stamp.length == 0) {
-            // Never empty: with "" SyncBinaryVersion would miss a rebuilt
-            // binary that kept its CFBundleShortVersionString, and a stale
-            // hot update would outlive an App Store update. Every build
-            // rewrites Info.plist, so its mtime (integer seconds) stands in.
-            RCTLogWarn(@"RCTPushy -- pushy_build_time.txt %@; using the Info.plist mtime as buildTime",
-                       stampPath == nil ? @"not found in the main or framework bundle" : @"is empty");
-            NSString *infoPlist =
-                [[NSBundle mainBundle].bundlePath stringByAppendingPathComponent:@"Info.plist"];
-            NSDate *modified = [[NSFileManager defaultManager] attributesOfItemAtPath:infoPlist
-                                                                                error:nil].fileModificationDate;
-            stamp = [NSString stringWithFormat:@"%lld", (long long)[modified timeIntervalSince1970]];
-        }
-        buildTime = stamp;
-    });
-    return buildTime;
-#endif
-}
-
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
@@ -2214,861 +525,3 @@ RCT_EXPORT_METHOD(resetToPackagedBundle:(RCTPromiseResolveBlock)resolve
 #endif
 
 @end
-
-#pragma mark - native cold-start check orchestration
-
-// Refuses an https→http downgrade before the redirected request — and with
-// it the POST body (appKey, uuid, versions) — leaves the device. The shared
-// session would follow first and only the response could be rejected; ATS
-// blocks plaintext by default, this covers apps that opted out with
-// NSAllowsArbitraryLoads. Same rule as RCTPushyDownloader. Returning nil
-// delivers the 3xx itself as the final response, which the status check in
-// PushyHttpRequest then treats as a failed endpoint.
-@interface PushyRequestRedirectGuard : NSObject <NSURLSessionTaskDelegate>
-@end
-
-@implementation PushyRequestRedirectGuard
-
-- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task
-willPerformHTTPRedirection:(NSHTTPURLResponse *)response
-        newRequest:(NSURLRequest *)request
- completionHandler:(void (^)(NSURLRequest *))completionHandler
-{
-    NSString *originalScheme = [task.originalRequest.URL.scheme lowercaseString];
-    NSString *nextScheme = [request.URL.scheme lowercaseString];
-    if ([originalScheme isEqualToString:@"https"] && [nextScheme isEqualToString:@"http"]) {
-        completionHandler(nil);
-        return;
-    }
-    completionHandler(request);
-}
-
-@end
-
-// Blocking JSON HTTP round-trip on the orchestrator's utility thread. Returns
-// the response body on 2xx, nil on any failure. The semaphore timeout is a
-// backstop over the request's own timeoutInterval.
-static NSString *PushyHttpRequest(NSString *urlString, NSString *method,
-                                  NSString *body, NSTimeInterval timeout) {
-    NSURL *url = [NSURL URLWithString:urlString];
-    if (url == nil) {
-        return nil;
-    }
-    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
-    request.HTTPMethod = method;
-    request.timeoutInterval = timeout;
-    [request setValue:@"application/json" forHTTPHeaderField:@"Accept"];
-    if (body != nil) {
-        [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
-        request.HTTPBody = [body dataUsingEncoding:NSUTF8StringEncoding];
-    }
-    dispatch_semaphore_t sem = dispatch_semaphore_create(0);
-    __block NSString *result = nil;
-    // A delegate session (not the shared one) so the redirect guard sees the
-    // 3xx before it is followed; the completion handler still receives the
-    // final response.
-    NSURLSession *session = [NSURLSession
-        sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]
-                        delegate:[PushyRequestRedirectGuard new]
-                   delegateQueue:nil];
-    NSURLSessionDataTask *task = [session dataTaskWithRequest:request
-        completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
-            NSHTTPURLResponse *httpResponse =
-                [response isKindOfClass:[NSHTTPURLResponse class]]
-                    ? (NSHTTPURLResponse *)response
-                    : nil;
-            NSInteger status = httpResponse.statusCode;
-            if (error == nil && httpResponse != nil && status >= 200 && status < 300
-                && data != nil) {
-                result = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-            }
-            dispatch_semaphore_signal(sem);
-        }];
-    [task resume];
-    // The session retains its delegate until invalidated: let this one task
-    // settle, then release everything.
-    [session finishTasksAndInvalidate];
-    if (dispatch_semaphore_wait(
-            sem, dispatch_time(DISPATCH_TIME_NOW,
-                               (int64_t)((timeout + 5) * NSEC_PER_SEC))) != 0) {
-        [task cancel];
-        return nil;
-    }
-    return result;
-}
-
-static NSString *PushyNormalizeEndpointBase(NSString *base) {
-    while ([base hasSuffix:@"/"]) {
-        base = [base substringToIndex:base.length - 1];
-    }
-    return base;
-}
-
-static BOOL PushyIsValidResponse(NSString *responseText) {
-    if (responseText == nil) {
-        return NO;
-    }
-    // Shared schema rule (update_flow_core::IsValidResponse): a 200 with
-    // `{"error": ...}` is a failed endpoint, not a verdict.
-    return flowcore::IsValidResponse(PushyToStdString(responseText)) ? YES : NO;
-}
-
-@implementation RCTPushyOrchestrator
-
-+ (void)persistConfiguration:(NSString *)config {
-    PushyWithStateLock(^{
-        NSUserDefaults *defaults = PushyDefaults();
-        if ([defaults stringForKey:keyUuid].length == 0) {
-            [defaults setObject:[NSUUID UUID].UUIDString forKey:keyUuid];
-        }
-        if ([[defaults stringForKey:keyNativeConfig] isEqualToString:config]) {
-            return;
-        }
-        // The same generation protects reset and replacement of the request
-        // identity/policy, including a late crash-rescue activation.
-        pushyResetGeneration.fetch_add(1);
-        pushyNativeConfigGeneration.fetch_add(1);
-        [defaults setObject:config forKey:keyNativeConfig];
-        [defaults removeObjectForKey:keyNativeCheckCache];
-        [self recordJsRound:nil];
-    });
-    if (pushySyncReady.load() && [self hasRunnableConfig]) {
-        PushyInstallCrashHoldHandler();
-    }
-}
-
-+ (BOOL)hasRunnableConfig {
-    NSString *json = [PushyDefaults() stringForKey:keyNativeConfig];
-    if (json.length == 0) {
-        return NO;
-    }
-    bool ok = false;
-    flowjson::Value config = flowjson::Parse(PushyToStdString(json), &ok);
-    return ok && config.IsObject() && !config.Get("disabled").Truthy()
-        && !config.Get("appKey").AsString().empty();
-}
-
-// Process-wide round state, set up by whichever launch path needs a round
-// first: the delayed cold-start check or the tvOS purged-version restore.
-+ (void)prepareProcess:(NSString *)launchRolledBackVersion {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        pushyRoundDone = dispatch_semaphore_create(0);
-        pushyHostRoundGroup = dispatch_group_create();
-        dispatch_group_enter(pushyHostRoundGroup);
-        pushyProcessAnchorUptime = PushyMonotonicNow();
-        pushyLaunchRolledBackForHold = [launchRolledBackVersion copy];
-        pushySyncReady.store(true);
-        // The crash-hold rescue shares the orchestrator's rollout gate: no
-        // persisted config, no handler (§11.3).
-        if ([PushyDefaults() stringForKey:keyNativeConfig].length > 0) {
-            PushyInstallCrashHoldHandler();
-        }
-    });
-}
-
-+ (void)scheduleFromColdStart:(NSString *)launchRolledBackVersion {
-#if !DEBUG
-    // Once per process; a few seconds of delay keeps the check away from the
-    // cold-start critical path (§7 R5) — its result targets the NEXT launch.
-    // Unless the previous process died mid-round (residual incomplete
-    // marker), in which case every launch second counts (§11.4).
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        [self prepareProcess:launchRolledBackVersion];
-        NSUserDefaults *defaults = PushyDefaults();
-        int64_t delaySeconds =
-            [defaults objectForKey:keyNativeCheckIncomplete] != nil ? 0 : 5;
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delaySeconds * NSEC_PER_SEC),
-                       dispatch_get_global_queue(QOS_CLASS_UTILITY, 0), ^{
-            if ([self hasJsRound]) {
-                // Not consuming the round: a later crash rescue may still
-                // need it.
-                NSLog(@"RCTPushy -- native sync skipped: JS already queried in this process");
-                return;
-            }
-            [self startRoundWithDeadline:0];
-        });
-    });
-#endif
-}
-
-#if TARGET_OS_TV && !DEBUG
-// Runs this process's round before the first bundle loads, blocking the
-// caller for at most kPushyPurgeRestoreBudget. The state no longer has a
-// current version, so the server answers with the latest version for the
-// packaged bundle, and the round activates it while the restore window is
-// open. Returns NO when no round can run; otherwise the caller must resolve
-// the launch bundle again: it launches whatever was activated before the
-// window closed, or the packaged bundle. The round stops at the same
-// deadline, keeping a partial download for the next check to resume.
-+ (BOOL)restorePurgedLaunch:(NSString *)purgedVersion
-                 rolledBack:(NSString *)launchRolledBackVersion {
-    [self prepareProcess:launchRolledBackVersion];
-    if (![self hasRunnableConfig]) {
-        RCTLogWarn(@"RCTPushy -- version %@ was purged and no native sync is "
-                   @"configured; launching the packaged bundle", purgedVersion);
-        return NO;
-    }
-    PushyWithStateLock(^{
-        pushyPurgeRestoreWindowOpen = true;
-    });
-    pushyPurgeRestoreActive.store(true);
-    NSTimeInterval deadline = PushyMonotonicNow() + kPushyPurgeRestoreBudget;
-    dispatch_semaphore_t done = dispatch_semaphore_create(0);
-    dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{
-        [self startRoundWithDeadline:deadline];
-        dispatch_semaphore_signal(done);
-    });
-    BOOL timedOut = dispatch_semaphore_wait(done, dispatch_time(DISPATCH_TIME_NOW,
-        (int64_t)(kPushyPurgeRestoreBudget * NSEC_PER_SEC))) != 0;
-    // The round's deadline does not bound a slow response (the request
-    // timeout is an idle timeout) nor a version already on disk, so the close
-    // is what stops a late activation — not the deadline.
-    PushyWithStateLock(^{
-        pushyPurgeRestoreWindowOpen = false;
-    });
-    if (timedOut) {
-        RCTLogWarn(@"RCTPushy -- purged version %@ restore timed out", purgedVersion);
-    } else {
-        NSDictionary *result = pushyHostRoundResult;
-        RCTLogInfo(@"RCTPushy -- purged version %@ restore: %@ %@ %@", purgedVersion,
-                   result[@"status"], result[@"reason"], result[@"hash"]);
-    }
-    return YES;
-}
-#endif
-
-+ (NSDictionary *)prepareBundle {
-#if DEBUG
-    return PushyHostResult(@"skipped", @"debug", nil, NO);
-#else
-    if (!pushySyncReady.load()) {
-        return PushyHostResult(@"skipped", @"not_initialized", nil, NO);
-    }
-    NSString *configJson = [PushyDefaults() stringForKey:keyNativeConfig];
-    if (configJson.length == 0) {
-        return PushyHostResult(@"skipped", @"not_configured", nil, NO);
-    }
-    id config = [NSJSONSerialization JSONObjectWithData:
-        [configJson dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil];
-    if (![config isKindOfClass:NSDictionary.class]) {
-        return PushyHostResult(@"failed", @"invalid_config", nil, NO);
-    }
-    id disabled = config[@"disabled"];
-    if ([disabled respondsToSelector:@selector(boolValue)] && [disabled boolValue]) {
-        return PushyHostResult(@"skipped", @"disabled", nil, NO);
-    }
-    id appKey = config[@"appKey"];
-    if (![appKey isKindOfClass:NSString.class] || [appKey length] == 0) {
-        return PushyHostResult(@"failed", @"invalid_config", nil, NO);
-    }
-    [self startRoundWithDeadline:0];
-    // A group is broadcast-style. Sharing the rescue semaphore would let one
-    // waiter consume the only signal and leave the other waiting forever.
-    if (!pushyRoundStarted.load()) {
-        return PushyHostResult(@"skipped", @"config_changed", nil, NO);
-    }
-    dispatch_group_wait(pushyHostRoundGroup, DISPATCH_TIME_FOREVER);
-    if (pushyHostRoundConfigGeneration != pushyNativeConfigGeneration.load()
-        || ![configJson isEqualToString:pushyHostRoundConfig]
-        || ![configJson isEqualToString:[PushyDefaults() stringForKey:keyNativeConfig]]) {
-        return PushyHostResult(@"cancelled", @"config_changed", nil, NO);
-    }
-    if (pushyHostRoundGeneration != pushyResetGeneration.load()) {
-        return PushyHostResult(@"cancelled", @"reset", nil, NO);
-    }
-    return pushyHostRoundResult ?: PushyHostResult(@"failed", @"internal_error", nil, NO);
-#endif
-}
-
-+ (void)recordJsRound:(NSString *)config {
-    @synchronized (RCTPushyOrchestrator.class) {
-        pushyJsCompletedConfig = [config copy];
-    }
-}
-
-// True when JS already obtained a valid response in this process for the
-// exact config the native round would use (§10.3): the delayed round is
-// then a duplicate request. Only the scheduled round asks — the crash-rescue
-// path still runs, JS is dead by then.
-+ (BOOL)hasJsRound {
-    NSString *jsConfig;
-    @synchronized (RCTPushyOrchestrator.class) {
-        jsConfig = pushyJsCompletedConfig;
-    }
-    if (jsConfig == nil) {
-        return NO;
-    }
-    NSString *persisted = [PushyDefaults() stringForKey:keyNativeConfig];
-    return persisted != nil && [persisted isEqualToString:jsConfig];
-}
-
-// Runs the process's single round on the calling thread if nobody has
-// started it yet. deadlineUptime > 0 (crash rescue) caps every HTTP call and
-// download phase to the remaining budget.
-+ (void)startRoundWithDeadline:(NSTimeInterval)deadlineUptime {
-    // Missing/disabled configuration is a preflight skip, not a used round.
-    if (![self hasRunnableConfig]) {
-        return;
-    }
-    bool expected = false;
-    if (!pushyRoundStarted.compare_exchange_strong(expected, true)) {
-        return;
-    }
-    @try {
-        [self runOnce:pushyLaunchRolledBackForHold deadline:deadlineUptime];
-    } @catch (NSException *exception) {
-        // The rescue path must never take the app down with it.
-        RCTLogWarn(@"RCTPushy -- native sync crashed: %@", exception.reason);
-        pushyHostRoundResult = PushyHostResult(@"failed", @"internal_error", nil, NO);
-    } @finally {
-        pushyRoundCompleted.store(true);
-        dispatch_semaphore_signal(pushyRoundDone);
-        dispatch_group_leave(pushyHostRoundGroup);
-    }
-}
-
-// Crash-rescue entry (§11.3), called from the handler's worker queue while
-// the uncaught-exception handler holds the dying process. Ensures this
-// process's round runs to completion within the budget, then activates a
-// downloaded-but-unactivated version if one exists — the last chance before
-// the process is gone.
-+ (void)runHoldRoundWithDeadline:(NSTimeInterval)deadlineUptime {
-    pushyCrashHoldActive.store(true);
-    [self startRoundWithDeadline:deadlineUptime];
-    if (pushyRoundStarted.load() && !pushyRoundCompleted.load()) {
-        NSTimeInterval remaining = deadlineUptime - PushyMonotonicNow();
-        if (remaining > 0) {
-            dispatch_semaphore_wait(pushyRoundDone, dispatch_time(DISPATCH_TIME_NOW,
-                (int64_t)(remaining * NSEC_PER_SEC)));
-        }
-    }
-    [self activatePendingVersion];
-}
-
-// The alert-strategy variant of the §10.7 hole: the round downloaded a fix
-// but deferred activation to JS, and JS is now dead. Activation is local and
-// bounded (a state switch under the commit lock).
-+ (void)activatePendingVersion {
-    NSString *hash = nil;
-    uint64_t generation = 0;
-    @synchronized (self) {
-        hash = pushyUnactivatedHash;
-        generation = pushyUnactivatedGeneration;
-    }
-    if (hash == nil) {
-        return;
-    }
-    // Unlike Android's switchVersion, PushySwitchVersionLocked does not
-    // validate the version directory; never point the next launch at bytes
-    // that are gone (e.g. wiped by a reset whose generation bump we would
-    // catch below anyway, or by cleanup).
-    NSString *versionDir = [[RCTPushy downloadDir] stringByAppendingPathComponent:hash];
-    if (!PushyHasCompletedVersionAtPath(versionDir, hash)) {
-        NSLog(@"RCTPushy -- crash hold: version %@ no longer on disk, dropping activation", hash);
-        return;
-    }
-    NSDictionary *hashInfoEntry = nil;
-    NSString *existingInfo = [PushyDefaults() stringForKey:PushyHashInfoKey(hash)];
-    NSData *existingData = [existingInfo dataUsingEncoding:NSUTF8StringEncoding];
-    id parsed = existingData == nil ? nil :
-        [NSJSONSerialization JSONObjectWithData:existingData options:0 error:nil];
-    if ([parsed isKindOfClass:[NSDictionary class]]) {
-        NSMutableDictionary *merged = [parsed mutableCopy];
-        merged[PushyInfoCrashHold] = @YES;
-        hashInfoEntry = @{@"hash": hash, @"info": merged};
-    }
-    BOOL committed = [self commitRoundWithGeneration:generation
-                                            hashInfo:hashInfoEntry
-                                            activate:hash
-                                        responseText:nil
-                                             request:nil
-                                              config:nil
-                                          responseAt:0
-                                           activated:NULL];
-    if (committed) {
-        @synchronized (self) {
-            pushyUnactivatedHash = nil;
-        }
-        NSLog(@"RCTPushy -- crash hold: activated downloaded version %@", hash);
-    } else {
-        NSLog(@"RCTPushy -- crash hold: reset since download, dropping activation");
-    }
-}
-
-// A bare module instance drives the existing download/patch pipeline without
-// a bridge: the file queue is process-global and progress events are gated on
-// hasListeners (never set without a bridge).
-+ (RCTPushy *)engine {
-    static RCTPushy *engine;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        engine = [[RCTPushy alloc] init];
-    });
-    return engine;
-}
-
-+ (void)runOnce:(NSString *)launchRolledBackVersion deadline:(NSTimeInterval)deadlineUptime {
-    const uint64_t resetGeneration = pushyResetGeneration.load();
-    pushyHostRoundGeneration = resetGeneration;
-    pushyHostRoundConfigGeneration = pushyNativeConfigGeneration.load();
-    pushyHostRoundResult = PushyHostResult(@"failed", @"check_failed", nil, NO);
-    NSUserDefaults *defaults = PushyDefaults();
-    NSString *configJson = [defaults stringForKey:keyNativeConfig];
-    pushyHostRoundConfig = [configJson copy];
-    if (configJson.length == 0) {
-        pushyHostRoundResult = PushyHostResult(@"skipped", @"not_configured", nil, NO);
-        return;
-    }
-    bool ok = false;
-    flowjson::Value config = flowjson::Parse(PushyToStdString(configJson), &ok);
-    if (!ok || !config.IsObject()) {
-        pushyHostRoundResult = PushyHostResult(@"failed", @"invalid_config", nil, NO);
-        return;
-    }
-    if (config.Get("disabled").Truthy()) {
-        pushyHostRoundResult = PushyHostResult(@"skipped", @"disabled", nil, NO);
-        return;
-    }
-    NSString *appKey = PushyFromStdString(config.Get("appKey").AsString());
-    if (appKey.length == 0) {
-        pushyHostRoundResult = PushyHostResult(@"failed", @"invalid_config", nil, NO);
-        return;
-    }
-    // Preserve the interrupted-round breadcrumb and reset-safe atomic commit.
-    [defaults setObject:@YES forKey:keyNativeCheckIncomplete];
-    @try {
-        [self runConfiguredRound:config
-                      configJson:configJson
-                          appKey:appKey
-        launchRolledBackVersion:launchRolledBackVersion
-                 resetGeneration:resetGeneration
-                        deadline:deadlineUptime];
-    } @finally {
-        [defaults removeObjectForKey:keyNativeCheckIncomplete];
-    }
-}
-
-+ (void)runConfiguredRound:(const flowjson::Value &)config
-                configJson:(NSString *)configJson
-                    appKey:(NSString *)appKey
-   launchRolledBackVersion:(NSString *)launchRolledBackVersion
-           resetGeneration:(uint64_t)resetGeneration
-                  deadline:(NSTimeInterval)deadlineUptime {
-    NSUserDefaults *defaults = PushyDefaults();
-    NSString *packageVersion =
-        PushyFromStdString(config.Get("packageVersion").AsString());
-    if (packageVersion.length == 0) {
-        packageVersion = [RCTPushy packageVersion];
-    }
-
-    __block NSString *currentVersion = nil;
-    PushyWithStateLock(^{
-        pushy::state::State state = PushyStateFromDefaults(PushyDefaults());
-        currentVersion = PushyFromStdString(state.current_version);
-    });
-    NSString *rolledBackVersion = launchRolledBackVersion;
-    NSString *uuid = [defaults stringForKey:keyUuid] ?: @"";
-
-    flowjson::Value identity = flowjson::Value::Object();
-    identity.Set("packageVersion",
-                 flowjson::Value::String(PushyToStdString(packageVersion)));
-    if (currentVersion != nil) {
-        identity.Set("currentVersion",
-                     flowjson::Value::String(PushyToStdString(currentVersion)));
-    }
-    identity.Set("uuid", flowjson::Value::String(PushyToStdString(uuid)));
-    if (rolledBackVersion != nil) {
-        identity.Set("rolledBackVersion",
-                     flowjson::Value::String(PushyToStdString(rolledBackVersion)));
-    }
-
-    flowjson::Value cInfo = flowjson::Value::Object();
-    cInfo.Set("rnu", config.Get("rnu"));
-    cInfo.Set("rn", config.Get("rn"));
-    cInfo.Set("os", flowjson::Value::String(PushyToStdString([NSString
-        stringWithFormat:@"%@ %@", PushyOsName, [[UIDevice currentDevice] systemVersion]])));
-    cInfo.Set("uuid", flowjson::Value::String(PushyToStdString(uuid)));
-
-    flowjson::Value input = flowjson::Value::Object();
-    input.Set("packageVersion", identity.Get("packageVersion"));
-    if (currentVersion != nil) {
-        input.Set("currentVersion", identity.Get("currentVersion"));
-    }
-    input.Set("buildTime",
-              flowjson::Value::String(PushyToStdString([RCTPushy buildTime])));
-    input.Set("cInfo", cInfo);
-    input.Set("supportedDiffVersion",
-              flowjson::Value::Number(pushy::hbc::kSupportedDiffVersion));
-    // Cache-only while a crash is being held (§11.3 budget); computed (and
-    // shared with JS getBundleHash) on the ordinary delayed round.
-    input.Set("bundleHash",
-              flowjson::Value::String(PushyToStdString(
-                  PushyBundleHashSync(!pushyCrashHoldActive.load()))));
-
-    std::string bodyJson =
-        flowjson::Stringify(flowcore::BuildRequestBody(input));
-    NSString *body = [NSString stringWithUTF8String:bodyJson.c_str()];
-    if (body == nil) {
-        RCTLogWarn(@"RCTPushy -- native sync: request body is not valid UTF-8");
-        pushyHostRoundResult = PushyHostResult(@"failed", @"invalid_request", nil, NO);
-        return;
-    }
-
-    NSString *responseText = [self runQueryRequest:config
-                                            appKey:appKey
-                                              body:body
-                                          deadline:deadlineUptime];
-    if (responseText == nil) {
-        RCTLogInfo(@"RCTPushy -- native sync: no endpoint reachable, giving up until next launch");
-        return;
-    }
-    long long responseAtSeconds = (long long)[[NSDate date] timeIntervalSince1970];
-
-    flowjson::Value decision = flowcore::HandleResponse(
-        PushyToStdString(responseText), identity, false,
-        config.Get("afterDownload").AsString());
-    if (decision.Get("action").AsString() != "download") {
-        BOOL committed = [self commitRoundWithGeneration:resetGeneration
-                               hashInfo:nil
-                               activate:nil
-                           responseText:responseText
-                                request:body
-                                 config:configJson
-                             responseAt:responseAtSeconds
-                              activated:NULL];
-        pushyHostRoundResult = committed
-            ? PushyHostResult(PushyStatusNone, PushyFromStdString(decision.Get("reason").AsString()), nil, NO)
-            : PushyHostResult(@"cancelled", @"reset", nil, NO);
-        RCTLogInfo(@"RCTPushy -- native sync: nothing to do (%s)",
-                   decision.Get("reason").AsString().c_str());
-        return;
-    }
-    NSString *hash = PushyFromStdString(decision.Get("hash").AsString());
-    if (!PushyIsSafePathComponent(hash)) {
-        pushyHostRoundResult = PushyHostResult(@"failed", @"invalid_response", nil, NO);
-        return;
-    }
-
-    NSString *versionDir = [[RCTPushy downloadDir] stringByAppendingPathComponent:hash];
-    BOOL downloaded = PushyHasCompletedVersionAtPath(versionDir, hash);
-    if (!downloaded) {
-        downloaded = [self performAttempts:decision.Get("attempts")
-                                      hash:hash
-                                originHash:currentVersion
-                                  deadline:deadlineUptime];
-    }
-    if (!downloaded) {
-        BOOL committed = [self commitRoundWithGeneration:resetGeneration
-                               hashInfo:nil
-                               activate:nil
-                           responseText:responseText
-                                request:body
-                                 config:configJson
-                             responseAt:responseAtSeconds
-                              activated:NULL];
-        pushyHostRoundResult = committed
-            ? PushyHostResult(@"failed", @"download_failed", nil, NO)
-            : PushyHostResult(@"cancelled", @"reset", nil, NO);
-        return;
-    }
-
-    // Persist name/description/metaInfo alongside the version, mirroring the
-    // JS side's setLocalHashInfo after a successful download.
-    const flowjson::Value &info = decision.Get("info");
-    NSMutableDictionary *versionInfo = [NSMutableDictionary dictionary];
-    for (const char *key : {"name", "description", "metaInfo"}) {
-        if (info.Get(key).IsString()) {
-            versionInfo[@(key)] = PushyFromStdString(info.Get(key).AsString()) ?: @"";
-        }
-    }
-    // A forceBoot activation is the brick-rescue path: mark it in the
-    // persisted info so JS can report force_boot_rescue when this version
-    // survives to markSuccess. Only the server-sent directive counts — a
-    // silent-strategy activation is ordinary delivery.
-    if (info.Get("config").Get("forceBoot").Truthy()) {
-        versionInfo[PushyInfoForceBoot] = @YES;
-    }
-    if (pushyCrashHoldActive.load()) {
-        versionInfo[PushyInfoCrashHold] = @YES;
-    }
-    // Silent strategies or a server-marked forceBoot version (per-version
-    // remote override — the brick rescue) activate for the next launch;
-    // otherwise activation stays with the JS side (§6/§10.1). Unless a crash
-    // is being held: JS is dead, deferring to it would leave the fix on disk
-    // forever (§11.3). Or the launch is blocked on reinstalling a version
-    // tvOS purged: JS has not started, and the whole point is to boot it —
-    // commitRoundWithGeneration drops that one once the restore window closed.
-    BOOL activate = decision.Get("activate").Truthy() || pushyCrashHoldActive.load()
-        || pushyPurgeRestoreActive.load();
-    BOOL activated = NO;
-    BOOL committed = [self commitRoundWithGeneration:resetGeneration
-                                            hashInfo:@{@"hash": hash, @"info": versionInfo}
-                                            activate:activate ? hash : nil
-                                        responseText:responseText
-                                             request:body
-                                              config:configJson
-                                          responseAt:responseAtSeconds
-                                           activated:&activated];
-    activate = activated;
-    if (!committed) {
-        RCTLogInfo(@"RCTPushy -- native sync: reset during round, dropping result");
-    } else if (activate) {
-        @synchronized (self) {
-            pushyUnactivatedHash = nil;
-        }
-        RCTLogInfo(@"RCTPushy -- native sync: downloaded %@ and set for next launch", hash);
-    } else {
-        // Remembered so a crash later in this process can still activate it
-        // (activatePendingVersion) — JS never will.
-        @synchronized (self) {
-            pushyUnactivatedHash = [hash copy];
-            pushyUnactivatedGeneration = resetGeneration;
-        }
-        RCTLogInfo(@"RCTPushy -- native sync: downloaded %@, activation left to JS", hash);
-    }
-    pushyHostRoundResult = committed
-        ? PushyHostResult(@"downloaded", @"", hash, activate)
-        : PushyHostResult(@"cancelled", @"reset", nil, NO);
-}
-
-// Everything a round persists — version info, the activation, the response
-// cache — is written inside ONE state-lock acquisition that first re-checks the
-// reset generation. resetToPackagedBundle bumps that generation under the same
-// lock, so there is no compare-and-act window: either the whole round commits,
-// or the reset wins and none of it does.
-+ (BOOL)commitRoundWithGeneration:(uint64_t)generation
-                         hashInfo:(NSDictionary *)hashInfoEntry
-                         activate:(NSString *)hashToActivate
-                     responseText:(NSString *)responseText
-                          request:(NSString *)requestBody
-                           config:(NSString *)configJson
-                       responseAt:(long long)responseAtSeconds
-                        activated:(BOOL *)activatedOut {
-    // responseText is nil for the crash handler's activation-only commit
-    // (activatePendingVersion): no round ran, so there is no cache to write.
-    NSData *cacheData = nil;
-    if (responseText != nil) {
-        NSDictionary *cacheEntry = @{
-            @"ts": @(responseAtSeconds),
-            @"body": responseText,
-            @"request": requestBody,
-            @"config": configJson,
-        };
-        cacheData = [NSJSONSerialization dataWithJSONObject:cacheEntry options:0 error:nil];
-    }
-    __block BOOL committed = NO;
-    __block BOOL activated = NO;
-    PushyWithStateLock(^{
-        if (pushyResetGeneration.load() != generation) {
-            return;
-        }
-        NSString *activation = hashToActivate;
-        NSDictionary *info = hashInfoEntry[@"info"];
-        // The tvOS purged-version restore round (a round commit, not the
-        // crash handler's activation-only one): it may take over this launch
-        // only while +bundleURL still waits for it; after that the version is
-        // left to JS unless a crash is being held (JS is dead then).
-        if (responseText != nil && pushyPurgeRestoreActive.load()) {
-            if (pushyPurgeRestoreWindowOpen) {
-                if (activation != nil && info != nil) {
-                    NSMutableDictionary *marked = [info mutableCopy];
-                    marked[@"purgeRestore"] = @YES;
-                    info = marked;
-                }
-            } else if (!pushyCrashHoldActive.load()) {
-                activation = nil;
-            }
-        }
-        NSUserDefaults *defaults = PushyDefaults();
-        if (hashInfoEntry != nil) {
-            NSData *infoData = [NSJSONSerialization dataWithJSONObject:info
-                                                              options:0
-                                                                error:nil];
-            if (infoData != nil) {
-                [defaults setObject:[[NSString alloc] initWithData:infoData encoding:NSUTF8StringEncoding]
-                             forKey:PushyHashInfoKey(hashInfoEntry[@"hash"])];
-            }
-        }
-        if (activation != nil) {
-            PushySwitchVersionLocked(activation);
-            activated = YES;
-        }
-        if (cacheData != nil) {
-            [defaults setObject:[[NSString alloc] initWithData:cacheData encoding:NSUTF8StringEncoding]
-                         forKey:keyNativeCheckCache];
-        }
-        committed = YES;
-    });
-    if (activatedOut != NULL) {
-        *activatedOut = activated;
-    }
-    return committed;
-}
-
-// Sequential fallback over the ordered candidates (§5.1): one request at a
-// time with its own timeout; after the configured round fails, queryUrls
-// discovery merges remote candidates (excluding the already-tried) for one
-// more round. No hedged race on purpose — this path is latency-insensitive.
-// Per-request timeout, capped to the crash-rescue budget when one is active.
-// <= 0 means the budget is gone and the round must stop issuing requests.
-static NSTimeInterval PushyQueryRequestTimeout(NSTimeInterval deadlineUptime) {
-    if (deadlineUptime <= 0) {
-        return 10;
-    }
-    return MIN(10, deadlineUptime - PushyMonotonicNow());
-}
-
-+ (NSString *)runQueryRequest:(const flowjson::Value &)config
-                       appKey:(NSString *)appKey
-                         body:(NSString *)body
-                     deadline:(NSTimeInterval)deadlineUptime {
-    double sample = arc4random() / 4294967296.0;
-    flowjson::Value ordered =
-        flowcore::OrderEndpointCandidates(config.Get("endpoints"), sample);
-    NSMutableSet<NSString *> *tried = [NSMutableSet set];
-    const NSUInteger maxHttpAttempts = 8;
-    NSUInteger httpAttempts = 0;
-    for (const auto &endpoint : ordered.elements()) {
-        NSString *base = PushyNormalizeEndpointBase(
-            PushyFromStdString(endpoint.AsString()));
-        if (base.length == 0 || [tried containsObject:base]) {
-            continue;
-        }
-        if (httpAttempts++ >= maxHttpAttempts) {
-            return nil;
-        }
-        [tried addObject:base];
-        NSTimeInterval timeout = PushyQueryRequestTimeout(deadlineUptime);
-        if (timeout <= 0) {
-            return nil;
-        }
-        NSString *response = PushyHttpRequest(
-            [NSString stringWithFormat:@"%@%@%@", base, RCTPushyQueryPath(), appKey],
-            @"POST", body, timeout);
-        if (PushyIsValidResponse(response)) {
-            return response;
-        }
-    }
-    for (const auto &queryUrl : config.Get("queryUrls").elements()) {
-        NSString *listUrl = PushyFromStdString(queryUrl.AsString());
-        if (listUrl == nil) {
-            continue;
-        }
-        if (httpAttempts++ >= maxHttpAttempts) {
-            return nil;
-        }
-        NSTimeInterval listTimeout = PushyQueryRequestTimeout(deadlineUptime);
-        if (listTimeout <= 0) {
-            return nil;
-        }
-        NSString *listText = PushyHttpRequest(listUrl, @"GET", nil, listTimeout);
-        if (listText == nil) {
-            continue;
-        }
-        bool ok = false;
-        flowjson::Value remote = flowjson::Parse(PushyToStdString(listText), &ok);
-        if (!ok || !remote.IsArray()) {
-            continue;
-        }
-        for (const auto &endpoint : remote.elements()) {
-            NSString *base = PushyNormalizeEndpointBase(
-                PushyFromStdString(endpoint.AsString()));
-            if (base.length == 0 || [tried containsObject:base]) {
-                continue;
-            }
-            if (httpAttempts++ >= maxHttpAttempts) {
-                return nil;
-            }
-            [tried addObject:base];
-            NSTimeInterval timeout = PushyQueryRequestTimeout(deadlineUptime);
-            if (timeout <= 0) {
-                return nil;
-            }
-            NSString *response = PushyHttpRequest(
-                [NSString stringWithFormat:@"%@%@%@", base, RCTPushyQueryPath(), appKey],
-                @"POST", body, timeout);
-            if (PushyIsValidResponse(response)) {
-                return response;
-            }
-        }
-        break;  // one successfully fetched remote list is enough
-    }
-    return nil;
-}
-
-+ (BOOL)performAttempts:(const flowjson::Value &)attempts
-                   hash:(NSString *)hash
-             originHash:(NSString *)originHash
-               deadline:(NSTimeInterval)holdDeadline {
-    RCTPushy *engine = [self engine];
-    // Crash-rescue budget caps every phase; 0 keeps the normal 10min windows.
-    NSTimeInterval incrementalDeadline = PushyMonotonicNow() + 600;
-    if (holdDeadline > 0) {
-        incrementalDeadline = MIN(incrementalDeadline, holdDeadline);
-    }
-    NSTimeInterval fullDeadline = 0;
-    for (const auto &attempt : attempts.elements()) {
-        const std::string &type = attempt.Get("type").AsString();
-        PushyType pushyType = type == "diff" ? PushyTypePatchFromPpk
-                            : type == "pdiff" ? PushyTypePatchFromPackage
-                                              : PushyTypeFullDownload;
-        if (pushyType == PushyTypePatchFromPpk && originHash.length == 0) {
-            continue;  // diff patches from the running version; none running
-        }
-        BOOL isFullAttempt = pushyType == PushyTypeFullDownload;
-        if (isFullAttempt && fullDeadline == 0) {
-            // diff/pdiff cannot starve the last-resort full download.
-            fullDeadline = PushyMonotonicNow() + 600;
-            if (holdDeadline > 0) {
-                fullDeadline = MIN(fullDeadline, holdDeadline);
-            }
-        }
-        NSTimeInterval deadline = isFullAttempt ? fullDeadline : incrementalDeadline;
-        for (const auto &urlValue : attempt.Get("urls").elements()) {
-            NSString *url = PushyFromStdString(urlValue.AsString());
-            if (url == nil) {
-                continue;
-            }
-            NSTimeInterval remaining = deadline - PushyMonotonicNow();
-            if (remaining <= 0) {
-                if (isFullAttempt) {
-                    return NO;
-                }
-                break;
-            }
-            NSMutableDictionary *options =
-                [@{
-                    PushyOptionUrlKey: url,
-                    @"hash": hash,
-                    @"deadlineUptime": @(deadline),
-                } mutableCopy];
-            if (pushyType == PushyTypePatchFromPpk) {
-                options[@"originHash"] = originHash;
-            }
-            dispatch_semaphore_t sem = dispatch_semaphore_create(0);
-            __block NSError *resultError = nil;
-            [engine performFetch:pushyType options:options callback:^(NSError *error) {
-                resultError = error;
-                dispatch_semaphore_signal(sem);
-            }];
-            if (dispatch_semaphore_wait(sem, dispatch_time(DISPATCH_TIME_NOW,
-                    (int64_t)(remaining * NSEC_PER_SEC))) != 0) {
-                RCTLogWarn(@"RCTPushy -- native sync: %s attempt timed out", type.c_str());
-                if (isFullAttempt) {
-                    return NO;
-                }
-                break;
-            }
-            if (resultError == nil) {
-                return YES;
-            }
-            RCTLogInfo(@"RCTPushy -- native sync: %s attempt failed: %@",
-                       type.c_str(), resultError.localizedDescription);
-        }
-    }
-    return NO;
-}
-
-@end