@_nazmiforreal/flutter-ota 0.1.28 → 0.1.30

package/dart-src/root/lib/src/ota_progress_overlay.dart

@@ -169,7 +169,7 @@ const Map<String, Color> _logColors = {
 ///  - Title bar (traffic lights + status pill)
 ///  - META (channel / version / bundle / size)
 ///  - STEPS (per-phase status list)
-///  - PROGRESS (monospace bar + speed / eta / phase)
+///  - PROGRESS (single-line determinate bar + percent)
 ///  - LOG (scrolling colored feed)
 ///  - Footer (deploy message, or error hint + retry)
 class OtaProgressOverlay extends StatefulWidget {
@@ -275,36 +275,35 @@ class _OtaProgressOverlayState extends State<OtaProgressOverlay> {
 
   // ── Title bar ─────────────────────────────────────────────────────────
   Widget _titleBar(OtaOverlayState s) => Container(
-        padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 11),
-        decoration: const BoxDecoration(
-          color: _C.head,
-          borderRadius: BorderRadius.vertical(top: Radius.circular(12)),
-          border: Border(bottom: BorderSide(color: _C.border)),
+    padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 11),
+    decoration: const BoxDecoration(
+      color: _C.head,
+      borderRadius: BorderRadius.vertical(top: Radius.circular(12)),
+      border: Border(bottom: BorderSide(color: _C.border)),
+    ),
+    child: Row(
+      children: [
+        _dot(_C.red),
+        const SizedBox(width: 6),
+        _dot(_C.yellow),
+        const SizedBox(width: 6),
+        _dot(_C.green),
+        const SizedBox(width: 12),
+        const Flexible(
+          child: Text(
+            'flutter-ota · forced update',
+            overflow: TextOverflow.ellipsis,
+            style: TextStyle(color: _C.text, fontFamily: _mono, fontSize: 12),
+          ),
         ),
-        child: Row(
-          children: [
-            _dot(_C.red),
-            const SizedBox(width: 6),
-            _dot(_C.yellow),
-            const SizedBox(width: 6),
-            _dot(_C.green),
-            const SizedBox(width: 12),
-            const Flexible(
-              child: Text(
-                'flutter-ota · forced update',
-                overflow: TextOverflow.ellipsis,
-                style: TextStyle(
-                    color: _C.text, fontFamily: _mono, fontSize: 12),
-              ),
-            ),
-            const SizedBox(width: 8),
-            _pill(
-              s.hasError ? 'FAILED' : 'RUNNING',
-              s.hasError ? _C.red : _C.green,
-            ),
-          ],
+        const SizedBox(width: 8),
+        _pill(
+          s.hasError ? 'FAILED' : 'RUNNING',
+          s.hasError ? _C.red : _C.green,
         ),
-      );
+      ],
+    ),
+  );
 
   // ── META ──────────────────────────────────────────────────────────────
   Widget _metaBlock(OtaOverlayState s) {
@@ -330,12 +329,15 @@ class _OtaProgressOverlayState extends State<OtaProgressOverlay> {
                   style: const TextStyle(fontFamily: _mono, fontSize: 13),
                   children: [
                     TextSpan(
-                        text: '${r[0].padRight(9)} ',
-                        style: const TextStyle(color: _C.dim)),
+                      text: '${r[0].padRight(9)} ',
+                      style: const TextStyle(color: _C.dim),
+                    ),
                     TextSpan(
-                        text: r[1],
-                        style: TextStyle(
-                            color: r[0] == 'version' ? _C.blue : _C.text)),
+                      text: r[1],
+                      style: TextStyle(
+                        color: r[0] == 'version' ? _C.blue : _C.text,
+                      ),
+                    ),
                   ],
                 ),
               ),
@@ -367,31 +369,32 @@ class _OtaProgressOverlayState extends State<OtaProgressOverlay> {
           final Color color = failed
               ? _C.red
               : done
-                  ? _C.green
-                  : active
-                      ? _C.blue
-                      : _C.faint;
+              ? _C.green
+              : active
+              ? _C.blue
+              : _C.faint;
 
           final String glyph = failed
               ? '✗'
               : done
-                  ? '✓'
-                  : active
-                      ? spinner
-                      : '·';
+              ? '✓'
+              : active
+              ? spinner
+              : '·';
 
           // Only the downloading step shows a percentage. Verify / install /
-          // finalize have no meaningful fraction, so they show a live "working"
-          // spinner instead of a frozen number — nothing looks hung.
+          // Only the download step shows a percentage. Other active phases show
+          // a steady "working…" (no spinning glyph in the status column — the
+          // row's leading glyph already spins), so nothing jitters.
           final String status;
           if (failed) {
             status = 'error';
           } else if (done) {
             status = 'done';
           } else if (active) {
-            final showPct = s.phase == PatchApplyPhase.downloading &&
-                s.fraction != null;
-            status = showPct ? _pct(s.fraction) : 'working $spinner';
+            final showPct =
+                s.phase == PatchApplyPhase.downloading && s.fraction != null;
+            status = showPct ? _pct(s.fraction) : 'working…';
           } else {
             status = 'wait';
           }
@@ -402,9 +405,14 @@ class _OtaProgressOverlayState extends State<OtaProgressOverlay> {
               children: [
                 SizedBox(
                   width: 18,
-                  child: Text(glyph,
-                      style: TextStyle(
-                          color: color, fontFamily: _mono, fontSize: 14)),
+                  child: Text(
+                    glyph,
+                    style: TextStyle(
+                      color: color,
+                      fontFamily: _mono,
+                      fontSize: 14,
+                    ),
+                  ),
                 ),
                 const SizedBox(width: 8),
                 Expanded(
@@ -437,68 +445,72 @@ class _OtaProgressOverlayState extends State<OtaProgressOverlay> {
 
   // ── PROGRESS ──────────────────────────────────────────────────────────
   Widget _progressBlock(OtaOverlayState s) {
-    final speed = (s.bytesPerSec != null && s.bytesPerSec! > 0)
-        ? '${(s.bytesPerSec! / 1048576).toStringAsFixed(1)} MB/s'
-        : '—';
-    String eta = '—';
-    if (s.bytesPerSec != null &&
-        s.bytesPerSec! > 0 &&
-        s.totalBytes > s.bytesReceived) {
-      final secs = ((s.totalBytes - s.bytesReceived) / s.bytesPerSec!).ceil();
-      eta = secs >= 60 ? '${(secs / 60).ceil()}m' : '${secs}s';
+    // Single honest fraction for the bar:
+    //  - preparing (no phase / no fraction yet) → empty
+    //  - downloading with a known size          → real fraction
+    //  - verifying / finalizing / restarting    → full (download is already
+    //    done, so the bar rests at 100%)
+    //  - error → freeze wherever it was
+    final double frac;
+    if (s.hasError) {
+      frac = (s.fraction ?? 0).clamp(0.0, 1.0);
+    } else if (s.restarting) {
+      frac = 1.0;
+    } else if (s.phase == PatchApplyPhase.downloading) {
+      frac = (s.fraction ?? 0).clamp(0.0, 1.0);
+    } else if (s.phase == PatchApplyPhase.verifying ||
+        s.phase == PatchApplyPhase.finalizing) {
+      frac = 1.0;
+    } else {
+      frac = 0.0; // preparing
+    }
+
+    // The readout lives on its own line above the bar (right aligned) so the
+    // bar itself spans the full panel width and can visibly reach the end.
+    // It used to sit in a fixed column beside the bar, which (a) reserved
+    // 54px the bar could never grow into and (b) hid the percent as soon as
+    // the download phase ended, making the bar look stuck below 100%.
+    final String pctLabel;
+    if (s.hasError) {
+      pctLabel = '';
+    } else if (s.restarting ||
+        s.phase == PatchApplyPhase.verifying ||
+        s.phase == PatchApplyPhase.finalizing) {
+      pctLabel = _pct(1.0);
+    } else if (s.phase == PatchApplyPhase.downloading && s.fraction != null) {
+      pctLabel = _pct(s.fraction);
+    } else {
+      pctLabel = '';
     }
-    final phase = s.hasError
-        ? 'halted'
-        : (s.restarting ? 'restarting' : (s.phase?.name ?? 'preparing'));
-
-    // A determinate fraction is only meaningful while downloading with a known
-    // Content-Length. Verifying / finalizing / unknown-size downloads render an
-    // indeterminate (sliding) bar so nothing ever looks stuck at 0%.
-    final bool determinate = !s.hasError &&
-        s.phase == PatchApplyPhase.downloading &&
-        s.fraction != null;
-    final double? frac = s.hasError
-        ? (s.fraction ?? 0)
-        : (determinate ? s.fraction : null);
 
     return _panelBox(
       child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
+        key: const Key('ota-progress-panel'),
+        crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
-          Row(
-            children: [
-              // The bar is a real widget (never wraps), and animates smoothly
-              // between values instead of snapping.
-              Expanded(
-                child: _ProgressBar(
-                  fraction: frac,
-                  color: s.hasError ? _C.red : _C.blue,
-                ),
-              ),
-              const SizedBox(width: 10),
-              SizedBox(
-                width: 44,
-                child: Text(
-                  determinate ? _pct(s.fraction) : '',
-                  textAlign: TextAlign.right,
-                  style: const TextStyle(
-                    fontFamily: _mono,
-                    fontSize: 13,
-                    color: _C.text,
-                    fontWeight: FontWeight.w700,
-                    fontFeatures: [FontFeature.tabularFigures()],
-                  ),
+          SizedBox(
+            height: 16,
+            child: Align(
+              alignment: Alignment.centerRight,
+              child: Text(
+                pctLabel,
+                style: const TextStyle(
+                  fontFamily: _mono,
+                  fontSize: 13,
+                  color: _C.text,
+                  fontWeight: FontWeight.w700,
+                  fontFeatures: [FontFeature.tabularFigures()],
                 ),
               ),
-            ],
+            ),
           ),
-          const SizedBox(height: 12),
-          Row(
-            children: [
-              _stat('speed', speed),
-              _stat('eta', eta),
-              _stat('phase', phase),
-            ],
+          const SizedBox(height: 4),
+          SizedBox(
+            key: const Key('ota-progress-bar'),
+            child: _ProgressBar(
+              fraction: frac,
+              color: s.hasError ? _C.red : _C.blue,
+            ),
           ),
         ],
       ),
@@ -536,7 +548,10 @@ class _OtaProgressOverlayState extends State<OtaProgressOverlay> {
                   child: Text(
                     s.errorHint ?? 'Close the app and reopen to retry.',
                     style: const TextStyle(
-                        color: _C.dim, fontFamily: _mono, fontSize: 12),
+                      color: _C.dim,
+                      fontFamily: _mono,
+                      fontSize: 12,
+                    ),
                   ),
                 ),
                 if (showRetry)
@@ -544,25 +559,35 @@ class _OtaProgressOverlayState extends State<OtaProgressOverlay> {
                     onTap: widget.onRetry,
                     child: Container(
                       padding: const EdgeInsets.symmetric(
-                          horizontal: 14, vertical: 7),
+                        horizontal: 14,
+                        vertical: 7,
+                      ),
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(7),
                         border: Border.all(color: _C.border),
                       ),
-                      child: const Text('[ retry ]',
-                          style: TextStyle(
-                              color: _C.blue,
-                              fontFamily: _mono,
-                              fontSize: 13)),
+                      child: const Text(
+                        '[ retry ]',
+                        style: TextStyle(
+                          color: _C.blue,
+                          fontFamily: _mono,
+                          fontSize: 13,
+                        ),
+                      ),
                     ),
                   ),
               ],
             )
           : Row(
               children: [
-                const Text('›',
-                    style: TextStyle(
-                        color: _C.green, fontFamily: _mono, fontSize: 13)),
+                const Text(
+                  '›',
+                  style: TextStyle(
+                    color: _C.green,
+                    fontFamily: _mono,
+                    fontSize: 13,
+                  ),
+                ),
                 const SizedBox(width: 8),
                 Expanded(
                   child: Text(
@@ -570,7 +595,10 @@ class _OtaProgressOverlayState extends State<OtaProgressOverlay> {
                         ? s.message!
                         : 'Applying update, please keep the app open…',
                     style: const TextStyle(
-                        color: _C.dim, fontFamily: _mono, fontSize: 12),
+                      color: _C.dim,
+                      fontFamily: _mono,
+                      fontSize: 12,
+                    ),
                   ),
                 ),
               ],
@@ -580,83 +608,68 @@ class _OtaProgressOverlayState extends State<OtaProgressOverlay> {
 
   // ── helpers ─────────────────────────────────────────────────────────
   Widget _sectionLabel(String t) => Row(
-        children: [
-          Text(t,
-              style: const TextStyle(
-                color: _C.dim,
-                fontFamily: _mono,
-                fontSize: 11,
-                fontWeight: FontWeight.w700,
-                letterSpacing: 1.5,
-              )),
-          const SizedBox(width: 10),
-          const Expanded(child: Divider(color: _C.sep, height: 1)),
-        ],
-      );
+    children: [
+      Text(
+        t,
+        style: const TextStyle(
+          color: _C.dim,
+          fontFamily: _mono,
+          fontSize: 11,
+          fontWeight: FontWeight.w700,
+          letterSpacing: 1.5,
+        ),
+      ),
+      const SizedBox(width: 10),
+      const Expanded(child: Divider(color: _C.sep, height: 1)),
+    ],
+  );
 
   Widget _panelBox({required Widget child}) => Container(
-        width: double.infinity,
-        padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
-        decoration: BoxDecoration(
-          color: _C.inner,
-          borderRadius: BorderRadius.circular(8),
-          border: Border.all(color: _C.sep),
-        ),
-        child: child,
-      );
-
-  Widget _stat(String k, String v) => Expanded(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(k,
-                style: const TextStyle(
-                    color: _C.faint, fontFamily: _mono, fontSize: 10)),
-            const SizedBox(height: 2),
-            Text(v,
-                overflow: TextOverflow.ellipsis,
-                style: const TextStyle(
-                    color: _C.text, fontFamily: _mono, fontSize: 12)),
-          ],
-        ),
-      );
+    width: double.infinity,
+    padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
+    decoration: BoxDecoration(
+      color: _C.inner,
+      borderRadius: BorderRadius.circular(8),
+      border: Border.all(color: _C.sep),
+    ),
+    child: child,
+  );
 
   Widget _dot(Color c) => Container(
-        width: 11,
-        height: 11,
-        decoration: BoxDecoration(color: c, shape: BoxShape.circle),
-      );
+    width: 11,
+    height: 11,
+    decoration: BoxDecoration(color: c, shape: BoxShape.circle),
+  );
 
   Widget _pill(String t, Color c) => Container(
-        padding: const EdgeInsets.symmetric(horizontal: 9, vertical: 3),
-        decoration: BoxDecoration(
-          color: c.withValues(alpha: 0.15),
-          borderRadius: BorderRadius.circular(6),
-          border: Border.all(color: c.withValues(alpha: 0.5)),
-        ),
-        child: Text(t,
-            style: TextStyle(
-                color: c,
-                fontFamily: _mono,
-                fontSize: 10,
-                fontWeight: FontWeight.w700,
-                letterSpacing: 0.5)),
-      );
+    padding: const EdgeInsets.symmetric(horizontal: 9, vertical: 3),
+    decoration: BoxDecoration(
+      color: c.withValues(alpha: 0.15),
+      borderRadius: BorderRadius.circular(6),
+      border: Border.all(color: c.withValues(alpha: 0.5)),
+    ),
+    child: Text(
+      t,
+      style: TextStyle(
+        color: c,
+        fontFamily: _mono,
+        fontSize: 10,
+        fontWeight: FontWeight.w700,
+        letterSpacing: 0.5,
+      ),
+    ),
+  );
 }
 
-/// A single-line progress bar that never wraps.
-///
-/// - When [fraction] is non-null it's a determinate bar that animates smoothly
-///   between values (no snapping / jumping).
-/// - When [fraction] is null it's an indeterminate sliding bar, so
-///   verify/install/finalize (which have no meaningful percentage) never look
-///   frozen at 0%.
+/// A single-line determinate progress bar that never wraps.
 ///
 /// It's a real painted widget with a fixed height inside an [Expanded], so it
 /// always stays on one line regardless of width — unlike the old
-/// character-string bar, which wrapped when it didn't fit.
+/// character-string bar, which wrapped when it didn't fit. It eases toward its
+/// target (forward-only) instead of snapping, and has no indeterminate sliding
+/// mode — once a download completes the bar simply rests at 100%.
 class _ProgressBar extends StatefulWidget {
-  final double? fraction;
+  final double fraction;
   final Color color;
 
   const _ProgressBar({required this.fraction, required this.color});
@@ -665,40 +678,22 @@ class _ProgressBar extends StatefulWidget {
   State<_ProgressBar> createState() => _ProgressBarState();
 }
 
-class _ProgressBarState extends State<_ProgressBar>
-    with SingleTickerProviderStateMixin {
-  late final AnimationController _indeterminate = AnimationController(
-    vsync: this,
-    duration: const Duration(milliseconds: 1200),
-  );
-
-  // Smoothed determinate value so the bar eases toward the target instead of
-  // snapping. Monotonic — it never visually goes backwards.
+class _ProgressBarState extends State<_ProgressBar> {
+  // Smoothed value so the bar eases toward the target. Forward-only — it never
+  // visually goes backwards.
   double _shown = 0;
 
   @override
   void initState() {
     super.initState();
-    _shown = widget.fraction ?? 0;
-    if (widget.fraction == null) _indeterminate.repeat();
+    _shown = widget.fraction.clamp(0.0, 1.0);
   }
 
   @override
   void didUpdateWidget(covariant _ProgressBar old) {
     super.didUpdateWidget(old);
-    if (widget.fraction == null) {
-      if (!_indeterminate.isAnimating) _indeterminate.repeat();
-    } else {
-      if (_indeterminate.isAnimating) _indeterminate.stop();
-      final target = widget.fraction!.clamp(0.0, 1.0);
-      if (target >= _shown) _shown = target; // forward-only
-    }
-  }
-
-  @override
-  void dispose() {
-    _indeterminate.dispose();
-    super.dispose();
+    final target = widget.fraction.clamp(0.0, 1.0);
+    if (target >= _shown) _shown = target;
   }
 
   static const _height = 8.0;
@@ -712,60 +707,24 @@ class _ProgressBarState extends State<_ProgressBar>
         height: _height,
         child: ColoredBox(
           color: _track,
-          child: widget.fraction == null
-              ? _indeterminateBar()
-              : _determinateBar(),
-        ),
-      ),
-    );
-  }
-
-  Widget _determinateBar() {
-    return LayoutBuilder(
-      builder: (context, c) => TweenAnimationBuilder<double>(
-        // Ease toward the smoothed target; short duration keeps it responsive
-        // but never snappy.
-        tween: Tween(end: _shown),
-        duration: const Duration(milliseconds: 400),
-        curve: Curves.easeOut,
-        builder: (context, v, _) => Align(
-          alignment: Alignment.centerLeft,
-          child: Container(
-            width: (c.maxWidth * v.clamp(0.0, 1.0)),
-            decoration: BoxDecoration(
-              color: widget.color,
-              borderRadius: BorderRadius.circular(99),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _indeterminateBar() {
-    return LayoutBuilder(
-      builder: (context, c) => AnimatedBuilder(
-        animation: _indeterminate,
-        builder: (context, _) {
-          const segment = 0.35; // 35% wide moving segment
-          final t = _indeterminate.value; // 0..1
-          final left = (t * (1 + segment)) - segment; // slides in from the left
-          return Align(
-            alignment: Alignment.centerLeft,
-            child: Padding(
-              padding: EdgeInsets.only(
-                left: (left.clamp(0.0, 1.0)) * c.maxWidth,
-              ),
-              child: Container(
-                width: segment * c.maxWidth,
-                decoration: BoxDecoration(
-                  color: widget.color,
-                  borderRadius: BorderRadius.circular(99),
+          child: LayoutBuilder(
+            builder: (context, c) => TweenAnimationBuilder<double>(
+              tween: Tween(end: _shown),
+              duration: const Duration(milliseconds: 300),
+              curve: Curves.easeOut,
+              builder: (context, v, _) => Align(
+                alignment: Alignment.centerLeft,
+                child: Container(
+                  width: c.maxWidth * v.clamp(0.0, 1.0),
+                  decoration: BoxDecoration(
+                    color: widget.color,
+                    borderRadius: BorderRadius.circular(99),
+                  ),
                 ),
               ),
             ),
-          );
-        },
+          ),
+        ),
       ),
     );
   }
@@ -830,19 +789,20 @@ class _TerminalLogState extends State<_TerminalLog> {
               style: const TextStyle(fontFamily: _mono, fontSize: 12),
               children: [
                 TextSpan(
-                    text: '${match.group(1)!.padRight(8)} ',
-                    style: TextStyle(color: color)),
+                  text: '${match.group(1)!.padRight(8)} ',
+                  style: TextStyle(color: color),
+                ),
                 TextSpan(
-                    text: match.group(3),
-                    style: const TextStyle(color: _C.text)),
+                  text: match.group(3),
+                  style: const TextStyle(color: _C.text),
+                ),
               ],
             ),
           );
         } else {
           content = Text(
             line.text,
-            style: TextStyle(
-                fontFamily: _mono, fontSize: 12, color: color),
+            style: TextStyle(fontFamily: _mono, fontSize: 12, color: color),
           );
         }
 
@@ -869,9 +829,13 @@ class OtaOverlayManager {
   bool _disposed = false;
   DateTime? _startTime;
 
-  // Download-speed tracking.
-  int _lastBytes = 0;
-  DateTime? _lastBytesAt;
+  /// Completes once the active overlay entry has been removed. [begin] resets
+  /// it for every session; `FlutterPatcher.applyUpdate` awaits it so the
+  /// forced-update restart can never kill a still-visible install screen.
+  Completer<void>? _dismissed;
+
+  Future<void> get _dismissedFuture =>
+      _dismissed?.future ?? Future<void>.value();
 
   /// Last 10%-bucket we emitted a "download NN%" log line for, to throttle the
   /// feed. -1 = none yet.
@@ -911,9 +875,8 @@ class OtaOverlayManager {
     if (overlay == null) return null;
 
     _startTime = DateTime.now();
-    _lastBytes = 0;
-    _lastBytesAt = null;
     _lastLoggedPctBucket = -1;
+    _dismissed = Completer<void>();
 
     final logs = <LogLine>[
       if (channel != null) LogLine('gray', 'channel  $channel'),
@@ -984,30 +947,6 @@ class OtaOverlayManager {
     final phaseStep = _phaseToStep(progress.phase);
     final newStep = phaseStep < s.activeStep ? s.activeStep : phaseStep;
 
-    // Compute a smoothed download speed from byte deltas. A single sample can
-    // spike wildly (buffered reads), so we blend with the previous value.
-    int? bytesPerSec = s.bytesPerSec;
-    if (progress.phase == PatchApplyPhase.downloading &&
-        progress.bytesReceived > 0) {
-      final now = DateTime.now();
-      if (_lastBytesAt != null && progress.bytesReceived > _lastBytes) {
-        final dt = now.difference(_lastBytesAt!).inMilliseconds / 1000.0;
-        if (dt > 0.05) {
-          final sample =
-              ((progress.bytesReceived - _lastBytes) / dt).round();
-          // Exponential moving average → the speed/ETA read-out stops jumping.
-          bytesPerSec = bytesPerSec == null || bytesPerSec == 0
-              ? sample
-              : (bytesPerSec * 0.6 + sample * 0.4).round();
-          _lastBytes = progress.bytesReceived;
-          _lastBytesAt = now;
-        }
-      } else {
-        _lastBytes = progress.bytesReceived;
-        _lastBytesAt = now;
-      }
-    }
-
     // Log phase transitions once, with staggered detail lines.
     if (s.phase != progress.phase) {
       switch (progress.phase) {
@@ -1048,7 +987,6 @@ class OtaOverlayManager {
       fraction: progress.fraction,
       bytesReceived: progress.bytesReceived,
       totalBytes: progress.totalBytes > 0 ? progress.totalBytes : null,
-      bytesPerSec: bytesPerSec,
       activeStep: newStep,
     );
   }
@@ -1062,7 +1000,12 @@ class OtaOverlayManager {
   }
 
   void _end({bool hasError = false, String? errorText}) {
-    if (_disposed || _entry == null) return;
+    if (_disposed || _entry == null) {
+      if (_dismissed != null && !_dismissed!.isCompleted) {
+        _dismissed!.complete();
+      }
+      return;
+    }
     if (hasError) {
       _log('red', 'error    ${errorText ?? 'unknown'}');
       _log('yellow', 'action   rolling back to base apk');
@@ -1096,6 +1039,9 @@ class OtaOverlayManager {
       if (_disposed) return;
       entry?.remove();
       if (identical(_entry, entry)) _entry = null;
+      if (_dismissed != null && !_dismissed!.isCompleted) {
+        _dismissed!.complete();
+      }
     });
   }
 
@@ -1150,10 +1096,7 @@ class OtaOverlayManager {
                       ),
                       Text(
                         'Restored: $previousVersion',
-                        style: TextStyle(
-                          color: Colors.grey[400],
-                          fontSize: 12,
-                        ),
+                        style: TextStyle(color: Colors.grey[400], fontSize: 12),
                       ),
                     ],
                   ),
@@ -1183,4 +1126,8 @@ class OtaOverlayHandle {
 
   void end({bool hasError = false, String? errorText}) =>
       _manager._end(hasError: hasError, errorText: errorText);
+
+  /// Completes when the overlay has fully unmounted (dwell elapsed + removed),
+  /// or immediately if no overlay session is active.
+  Future<void> get dismissed => _manager._dismissedFuture;
 }