Opt-in setting to log clear naps automatically

lib/compute/derivation_engine.dart

@@ -22,6 +22,8 @@
 import '../data/activity_store.dart';
 import '../sync/reset_gate.dart';
 import '../models/activity_suggestion.dart';
+import '../state/prefs.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io' show Platform;
@@ -3128,6 +3130,18 @@ class DerivationEngine {
   /// are decided before the write transaction, so the slower one's PARTIAL row
   /// could land on top of the faster one's complete row.
   static bool _running = false;
+
+  static int _autoLoggedNaps = 0;
+
+  /// How many naps the opt-in auto-log confirmed since the last call. Logging
+  /// one queues a durable review job for its day; the day's nap credit only
+  /// lands once that job runs, so the caller kicks it off after the pass
+  /// instead of leaving it for the next app resume.
+  static int takeAutoLoggedNaps() {
+    final n = _autoLoggedNaps;
+    _autoLoggedNaps = 0;
+    return n;
+  }
   bool get running => _running;
 
   /// Hold or release the process-wide latch, as another pass would.
@@ -6450,9 +6464,30 @@ class DerivationEngine {
         ...await activityStore.reconcile(ActivityKind.workout, blocks.suggestionsToPersist),
         ...await activityStore.reconcile(ActivityKind.nap, blocks.napSuggestions),
       ];
+      // Opt-in (#625): a clear, settled nap is logged without asking. Never
+      // on an import pass, which has no user at the other end of "just now".
+      // Inside its own try, like the prompts below: an optional convenience
+      // must not mark the day partial.
+      if (!forceFinalize) {
+        try {
+          final since = (await SharedPreferences.getInstance())
+              .getInt(Prefs.napAutoLogSinceSec);
+          _autoLoggedNaps += await activityStore.autoLogNaps(
+            // 0 is the switch turned back off.
+            sinceSec: (since ?? 0) > 0 ? since : null,
+            dataEdgeSec: dataNowSec,
+            settleSec: ana.napBridgeSec,
+            current: blocks.napSuggestions,
+          );
+        } catch (e) {
+          _log('nap auto-log failed for ${day.date}: $e');
+        }
+      }
       for (final suggestion in newSuggestions) {
         // The rows are already banked; a failed prompt must not mark the day partial.
         try {
+          // A nap logged just above is no longer pending, so [mayNotifyNew]
+          // already declines it. One that could not be logged yet still asks.
           if (forceFinalize || !await activityStore.mayNotifyNew(suggestion)) continue;
           final nap = suggestion.kind == ActivityKind.nap;
           await NotificationCenter.instance.emit(NotificationEvent(

lib/data/activity_store.dart

@@ -459,6 +459,7 @@ class ActivityStore {
     required int endTs,
     Map<String, dynamic>? session,
     bool edited = false,
+    bool auto = false,
   }) => db.transaction((tx) async {
     final row = await _check(tx, expected, 'confirmed');
     if (row == null) return;
@@ -520,6 +521,8 @@ class ActivityStore {
                 'start': startTs,
                 'end': endTs,
                 'source': 'confirmed',
+                // Logged by the opt-in setting, not by a tap (#625).
+                if (auto) 'auto_logged': true,
               }),
       });
       await _changed(tx, day);
@@ -533,6 +536,83 @@ class ActivityStore {
     await _changed(tx, row['day_id'] as String);
   });
 
+  /// The bar for logging a nap without asking (#625). The detector's
+  /// confidence is a composite of HR coverage, HR dip, stillness and wear,
+  /// in [0.2, 0.85]; it is not a probability and 0.8 is not a validated cut.
+  /// ponytail: one fixed bar, the value the issue asked for. Make it a user
+  /// choice if people want it looser or stricter.
+  static const double napAutoLogMinConfidence = 0.8;
+
+  /// Whether the opt-in setting would log [s] without asking. [sinceSec] is
+  /// when the setting was turned on (null = off): a nap that ended before
+  /// that is never logged behind the user's back.
+  static bool napAutoLoggable(ActivitySuggestion s, int? sinceSec) {
+    final c = s.details['confidence'];
+    return sinceSec != null &&
+        s.kind == ActivityKind.nap &&
+        s.status == ActivityReviewStatus.pending &&
+        c is num &&
+        c >= napAutoLogMinConfidence &&
+        // Strictly after: the switch is stored in whole seconds, and a nap
+        // that ended in that same second ended before it was turned on.
+        s.endTs > sinceSec;
+  }
+
+  /// Confirms every [napAutoLoggable] pending nap exactly as detected, once
+  /// the data edge is [settleSec] past its end, so sleep that resumes after a
+  /// short arousal can still be bridged into it first. A nap that cannot be
+  /// confirmed (it overlaps saved sleep, or changed underneath) stays pending.
+  /// Returns how many were logged.
+  ///
+  /// [current] is the nap candidates this pass detected. Only a pending row
+  /// that overlaps one of them is a candidate: [reconcile] only retires rows
+  /// that overlap a re-detection, so a nap a later pass no longer finds stays
+  /// pending, and must not be confirmed behind the user's back.
+  Future<int> autoLogNaps({
+    required int? sinceSec,
+    required int dataEdgeSec,
+    required int settleSec,
+    required List<Map<String, dynamic>> current,
+  }) async {
+    if (sinceSec == null) return 0;
+    final spans = <(int, int)>[
+      for (final c in current)
+        (
+          ((c['start_ts'] ?? c['start']) as num).toInt(),
+          ((c['end_ts'] ?? c['end']) as num).toInt(),
+        ),
+    ];
+    if (spans.isEmpty) return 0;
+    await migrateLegacy();
+    // Imported history is never logged for the user: the same line
+    // [mayNotifyNew] draws for prompts.
+    final importedThrough =
+        (await db.query('activity_review_meta')).single['alert_after_ts']
+            as int;
+    // Not [pending]: its seven-day floor is for what the review list shows. A
+    // band that syncs after a longer gap still has naps to log.
+    final rows = await db.query(
+      'activity_suggestions',
+      where: "status = 'pending' AND kind = 'nap' AND end_ts > ?",
+      whereArgs: [math.max(sinceSec, importedThrough)],
+      orderBy: 'start_ts ASC, id ASC',
+    );
+    var logged = 0;
+    for (final s in rows.map(ActivitySuggestion.fromRow)) {
+      if (!napAutoLoggable(s, sinceSec) || s.endTs + settleSec > dataEdgeSec) {
+        continue;
+      }
+      if (!spans.any((c) => s.startTs < c.$2 && s.endTs > c.$1)) continue;
+      try {
+        await confirm(s, startTs: s.startTs, endTs: s.endTs, auto: true);
+        logged++;
+      } on ActivityReviewException {
+        // Left for the user to review.
+      }
+    }
+    return logged;
+  }
+
   static Future<void> _changed(DatabaseExecutor tx, String day) async {
     await _ensureMeta(tx);
     await tx.rawUpdate(

lib/data/backup_extras.dart

@@ -89,6 +89,7 @@ class ImportSummary extends MapView<String, int> {
 /// backed-up key missing here is written as-is; the guard test keeps this
 /// table complete. Keys in [kPrefsNotBackedUp] need no entry.
 const Map<String, String> kPrefTypes = {
+  'activity.nap_auto_log_since_sec': 'int',
   'ai.journal_done_day': 'string',
   'ai_evening_enabled': 'bool',
   'ai_evening_min': 'int',

lib/l10n/app_de.arb

@@ -3502,6 +3502,9 @@
   "strengthBodyweight": "Körpergewicht",
   "strengthDelete": "Löschen",
   "strengthSaveFailed": "Änderungen konnten nicht gespeichert werden",
+  "napAutoLogTitle": "Eindeutige Nickerchen automatisch eintragen",
+  "napAutoLogSub": "Ein erkanntes Nickerchen mit starken Anzeichen wird ohne Nachfrage eingetragen. Du kannst es weiterhin bearbeiten oder entfernen",
+  "napAutoLogSaveFailed": "Die Einstellung konnte nicht gespeichert werden. Versuche es erneut.",
   "settingsStepCalibration": "Schrittkalibrierung",
   "settingsStepCalibrationSub": "Lernt, wie stark dein Band deine Schritte zu hoch oder zu niedrig zählt, und korrigiert das auf dem Smartphone. Nichts wird auf das Band geschrieben und nichts verlässt das Gerät",
   "stepCalTitle": "Schrittkalibrierung",

lib/l10n/app_en.arb

@@ -16398,5 +16398,8 @@
   "strengthDelete": "Delete",
   "@strengthDelete": {"description": "Strength set editor copy."},
   "strengthSaveFailed": "Failed to save changes",
-  "@strengthSaveFailed": {"description": "Strength set editor copy."}
+  "@strengthSaveFailed": {"description": "Strength set editor copy."},
+  "napAutoLogTitle": "Log clear naps automatically",
+  "napAutoLogSub": "A detected nap with strong evidence is added without asking. You can still edit or remove it",
+  "napAutoLogSaveFailed": "That setting could not be saved. Try again."
 }

lib/l10n/app_es.arb

@@ -2921,6 +2921,9 @@
   "strengthSaveFailed": "No se pudieron guardar los cambios",
   "reportContactLabel": "Contacto (opcional)",
   "reportContactHint": "Correo o Discord, solo si quieres una respuesta",
+  "napAutoLogTitle": "Registrar automáticamente las siestas claras",
+  "napAutoLogSub": "Una siesta detectada con indicios sólidos se añade sin preguntar. Puedes editarla o eliminarla después",
+  "napAutoLogSaveFailed": "No se pudo guardar el ajuste. Inténtalo de nuevo.",
   "pairBandNotSensor": "Ese dispositivo es una pulsera {label}, no un sensor sencillo. No se guardó nada.",
   "alarmNextLabel": "SIGUIENTE",
   "alarmScheduleGroup": "Horario semanal",

lib/l10n/app_fr.arb

@@ -2892,6 +2892,9 @@
   "strengthSaveFailed": "Échec de l'enregistrement des modifications",
   "reportContactLabel": "Contact (facultatif)",
   "reportContactHint": "E-mail ou Discord, seulement si vous voulez une réponse",
+  "napAutoLogTitle": "Enregistrer automatiquement les siestes nettes",
+  "napAutoLogSub": "Une sieste détectée avec des indices solides est ajoutée sans demander. Vous pouvez toujours la modifier ou la supprimer",
+  "napAutoLogSaveFailed": "Le réglage n’a pas pu être enregistré. Réessayez.",
   "pairBandNotSensor": "Cet appareil est un {label}, c’est-à-dire un bracelet, pas un simple capteur. Rien n’a été enregistré.",
   "whoopFirmwareWarningTitle": "Utilisateurs WHOOP : ne vous reconnectez pas à l’application WHOOP",
   "whoopFirmwareWarningAction": "Si vous utilisez OpenStrap ou une autre application open source, ou si vous comptez y passer plus tard, ne reconnectez pas votre bracelet à l’application WHOOP officielle. Elle peut installer des mises à jour du firmware automatiquement. Désinstallez ou désactivez l’application WHOOP pour l’empêcher de mettre à jour votre bracelet.",

lib/l10n/app_hi.arb

@@ -2892,6 +2892,9 @@
   "strengthSaveFailed": "परिवर्तन सहेजने में विफल",
   "reportContactLabel": "संपर्क (वैकल्पिक)",
   "reportContactHint": "ईमेल या Discord, केवल अगर आप जवाब चाहते हैं",
+  "napAutoLogTitle": "स्पष्ट झपकियाँ अपने-आप दर्ज करें",
+  "napAutoLogSub": "मज़बूत संकेतों वाली पहचानी गई झपकी बिना पूछे जोड़ दी जाती है। आप इसे बाद में भी बदल या हटा सकते हैं",
+  "napAutoLogSaveFailed": "यह सेटिंग सहेजी नहीं जा सकी। फिर से कोशिश करें।",
   "pairBandNotSensor": "यह डिवाइस {label} है, यानी एक बैंड, साधारण सेंसर नहीं। कुछ भी सहेजा नहीं गया।",
   "whoopFirmwareWarningTitle": "WHOOP उपयोगकर्ता: WHOOP ऐप से दोबारा कनेक्ट न करें",
   "whoopFirmwareWarningAction": "अगर आप OpenStrap या कोई दूसरा ओपन-सोर्स ऐप इस्तेमाल करते हैं, या बाद में किसी पर जाने की सोच रहे हैं, तो अपना बैंड आधिकारिक WHOOP ऐप से दोबारा कनेक्ट न करें। वह फ़र्मवेयर अपडेट अपने-आप इंस्टॉल कर सकता है। WHOOP ऐप को अनइंस्टॉल या अक्षम कर दें, ताकि वह आपके बैंड को अपडेट न कर सके।",

lib/l10n/app_ru.arb

@@ -7936,6 +7936,9 @@
   "whoopFirmwareWarningTitle": "Пользователям WHOOP: не подключайтесь снова к приложению WHOOP",
   "whoopFirmwareWarningAction": "Если вы пользуетесь OpenStrap или другим приложением с открытым кодом либо планируете перейти на него позже, не подключайте браслет к официальному приложению WHOOP снова. Оно может автоматически установить обновления прошивки. Удалите или отключите приложение WHOOP, чтобы оно не обновляло ваш браслет.",
   "whoopFirmwareWarningDetails": "В сообщениях о прошивках WHOOP 5.0 / MG 50.43.1.0 и 50.43.2.0 описывается заблокированный доступ к данным. Bluetooth при этом может подключаться. OpenStrap не может выпустить подписанный WHOOP токен членства, необходимый для разблокировки затронутых браслетов. Мы работаем над решением, но исправления пока нет.",
+  "napAutoLogTitle": "Автоматически записывать явный дневной сон",
+  "napAutoLogSub": "Обнаруженный дневной сон с убедительными признаками добавляется без запроса. Его по-прежнему можно изменить или удалить",
+  "napAutoLogSaveFailed": "Не удалось сохранить настройку. Попробуйте ещё раз.",
   "pairBandNotSensor": "Это устройство — {label}, то есть браслет, а не простой датчик. Ничего не сохранено.",
   "@pairBandNotSensor": {
     "placeholders": {

lib/l10n/app_th.arb

@@ -16357,6 +16357,9 @@
   "whoopFirmwareWarningTitle": "ผู้ใช้ WHOOP: อย่าเชื่อมต่อกับแอป WHOOP อีก",
   "whoopFirmwareWarningAction": "หากคุณใช้ OpenStrap หรือแอปโอเพนซอร์สอื่น หรือวางแผนจะเปลี่ยนไปใช้ในภายหลัง อย่าเชื่อมต่อสายรัดกับแอป WHOOP อย่างเป็นทางการอีก แอปอาจติดตั้งอัปเดตเฟิร์มแวร์โดยอัตโนมัติ ให้ถอนการติดตั้งหรือปิดใช้งานแอป WHOOP เพื่อไม่ให้แอปอัปเดตสายรัดของคุณ",
   "whoopFirmwareWarningDetails": "มีรายงานเกี่ยวกับเฟิร์มแวร์ WHOOP 5.0 / MG เวอร์ชัน 50.43.1.0 และ 50.43.2.0 ว่าเข้าถึงข้อมูลไม่ได้ บลูทูธอาจยังเชื่อมต่อได้ OpenStrap ไม่สามารถออกโทเค็นสมาชิกที่ WHOOP ลงนามซึ่งจำเป็นต่อการปลดล็อกสายรัดที่ได้รับผลกระทบ เรากำลังหาทางแก้ไข แต่ยังไม่มีวิธีแก้ในตอนนี้",
+  "napAutoLogTitle": "บันทึกการงีบที่ชัดเจนโดยอัตโนมัติ",
+  "napAutoLogSub": "การงีบที่ตรวจพบและมีหลักฐานชัดเจนจะถูกเพิ่มโดยไม่ถาม คุณยังแก้ไขหรือลบได้",
+  "napAutoLogSaveFailed": "บันทึกการตั้งค่าไม่สำเร็จ ลองอีกครั้ง",
   "pairBandNotSensor": "อุปกรณ์นั้นคือ {label} ซึ่งเป็นสายรัด ไม่ใช่เซ็นเซอร์ธรรมดา ไม่ได้บันทึกอะไรไว้",
   "@pairBandNotSensor": {
     "description": "Shown when a device picked as a plain sensor turns out to be a band. Nothing was saved. {label} is the band’s name.",

lib/l10n/app_zh.arb

@@ -2892,6 +2892,9 @@
   "strengthSaveFailed": "保存更改失败",
   "reportContactLabel": "联系方式（可选）",
   "reportContactHint": "邮箱或 Discord，仅在你希望得到回复时填写",
+  "napAutoLogTitle": "自动记录明确的小睡",
+  "napAutoLogSub": "证据充分的小睡会直接记录，不再询问。之后仍可编辑或删除",
+  "napAutoLogSaveFailed": "无法保存该设置，请重试。",
   "pairBandNotSensor": "这台设备是 {label}，是手环，不是普通传感器。没有保存任何内容。",
   "whoopFirmwareWarningTitle": "WHOOP 用户：请勿重新连接 WHOOP 应用",
   "whoopFirmwareWarningAction": "如果你在使用 OpenStrap 或其他开源应用，或打算以后改用，请不要再把手环连接到 WHOOP 官方应用。它可能会自动安装固件更新。请卸载或停用 WHOOP 应用，以免它更新你的手环。",

lib/state/derive_coordinator.dart

@@ -132,6 +132,12 @@ class DeriveCoordinator {
       } catch (e) {
         _log('[derive] session rescore failed: $e');
       }
+      // Naps the opt-in auto-log confirmed during this pass: their review job
+      // is durable but only runs on a resume or an edit, so the day's nap
+      // credit would otherwise wait for one of those.
+      if (DerivationEngine.takeAutoLoggedNaps() > 0) {
+        unawaited(refreshActivityReviews(retry: true));
+      }
       bumpInsights();
       _notify(); // screens re-fetch from the derived store
       // Same signal, for the surfaces that can't listen: home/lock-screen

lib/state/prefs.dart

@@ -80,6 +80,16 @@ class Prefs {
     }
   }
 
+  /// [setBoolAcked] for an int: false when there is no storage or the platform
+  /// refused the write, never a throw.
+  static Future<bool> setIntAcked(String key, int value) async {
+    try {
+      return await _sp?.setInt(key, value) ?? false;
+    } catch (_) {
+      return false;
+    }
+  }
+
   // ── selection keys (one namespace; keep them disjoint) ──────────────────────
   /// The five-tab bar's index (Home, Health, Nutrition, Workout, Wellness).
   /// Read once to migrate, never written.
@@ -101,6 +111,11 @@ class Prefs {
   /// list and nothing reads it except the surfaces it reveals.
   static const String devMode = 'dev.mode';
 
+  /// "Log clear naps automatically" (#625). Absent = off. Holds WHEN it was
+  /// turned on, in epoch seconds, so only naps that end after that are logged
+  /// without asking: switching it on never rewrites days already past.
+  static const String napAutoLogSinceSec = 'activity.nap_auto_log_since_sec';
+
   /// Per-metric range toggle on the shared MetricScreen (Today/Week/Month/3M).
   /// Keyed by the metric id so Sleep / Heart / Body each remember independently.
   static String metricTab(String metric) => 'ui.metric_tab.$metric';

lib/ui2/profile/gallery.dart

@@ -835,6 +835,8 @@ Map<String, Widget> extraCases() => {
           startTs: 1787157000, endTs: 1787164200, revision: 0,
           status: ActivityReviewStatus.pending, details: const {}),
         onConfirm: () {}, onEdit: () {}, onDiscard: () {}),
+      // Inert here: a tap on the real row changes the real setting.
+      'nap_auto_log_row': const IgnorePointer(child: NapAutoLogRow()),
       'nap_row': const MetricRow(LucideIcons.sun, C.indigo, 'Daytime sleep',
           '1h 12m',
           sub: '2 naps · Sunday, 16 August'),