diff --git a/.codecov.yml b/.codecov.yml new file mode 100644 index 0000000..b49ab01 --- /dev/null +++ b/.codecov.yml @@ -0,0 +1,22 @@ +# Codecov Configuration for RepForge (Devasy/RepForge) +codecov: + require_ci_to_pass: yes + +coverage: + precision: 2 + round: down + range: "70...100" + + status: + project: + default: + target: auto + threshold: 1% + patch: + default: + target: auto + +ignore: + - "**/*.g.dart" + - "**/*.freezed.dart" + - "workout-logger/test/**/*" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 62890d7..02e711d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,20 +2,31 @@ name: Test on: push: - branches: [main] + branches: + - main + - 'r[0-9]+.[0-9]+.*' pull_request: - branches: [main] + branches: + - main + - 'r[0-9]+.[0-9]+.*' release: types: [published] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + jobs: test: name: Analyze & Test runs-on: ubuntu-latest + permissions: + contents: read + steps: - name: Checkout repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Set up Flutter id: flutter-action @@ -28,13 +39,14 @@ jobs: pub-cache-key: "flutter-pub-:os:-:channel:-:version:-:arch:-${{ hashFiles('workout-logger/pubspec.lock') }}" - name: Install dependencies - if: steps.flutter-action.outputs.PUB-CACHE-HIT != 'true' + if: steps.flutter-action.outputs.CACHE-HIT != 'true' working-directory: ./workout-logger run: flutter pub get - name: Analyze working-directory: ./workout-logger run: | + set -o pipefail # Only fail on errors, ignore warnings and info messages flutter analyze --no-fatal-infos --no-fatal-warnings | tee analyze_output.txt @@ -53,3 +65,5 @@ jobs: with: files: workout-logger/coverage/lcov.info token: ${{ secrets.CODECOV_TOKEN }} + slug: Devasy/RepForge + diff --git a/.gitignore b/.gitignore index 82e5c63..70d9a18 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,12 @@ repforge_backup_*.json # Claude Code project memory & session files .claude/ + +# Hive test databases and temporary directories +*.hive +tmp_hive_*/ +**/tmp_hive_*/ + + +# Subagent-driven-development scratch workspace +.superpowers/ diff --git a/README.md b/README.md index 04b7dcf..47a480d 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ RepForge is licensed under the [Apache License 2.0](LICENSE). **Devasy Patel** - Email: patel.devasy.23@gmail.com -- GitHub: [@Devasy23](https://github.com/Devasy23) +- GitHub: [@Devasy](https://github.com/Devasy) ---
diff --git a/docs/superpowers/plans/2026-08-08-sqlite-migration-and-coach-sql-tool.md b/docs/superpowers/plans/2026-08-08-sqlite-migration-and-coach-sql-tool.md new file mode 100644 index 0000000..e93a790 --- /dev/null +++ b/docs/superpowers/plans/2026-08-08-sqlite-migration-and-coach-sql-tool.md @@ -0,0 +1,2413 @@ +# Hive → SQLite Migration + Coach SQL Query Tool Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Replace Hive with SQLite (`sqflite`) as RepForge's persistence backend via a safe, one-time, reversible migration, then add a `run_sql_query` tool to the AI Coach that queries the live database directly. + +**Architecture:** A new `SqliteStorageService implements IStorageService` sits alongside the existing Hive-backed `StorageService`. A `StorageMigrationService` copies data from one to the other exactly once, gated by a flag stored in the Hive settings box, with no deletion of Hive data and automatic fallback to Hive on any migration failure. `main.dart`'s composition root resolves which backend to hand to the rest of the app before `runApp()`. The Coach's new `run_sql_query` tool opens a dedicated **read-only** connection to the same SQLite file and runs model-submitted `SELECT` statements against live data. + +**Tech Stack:** Flutter/Dart, `sqflite` (runtime), `sqflite_common_ffi` (dev/test only), existing `hive`/`hive_flutter` (kept, not removed), `google_generative_ai` (existing Coach tool-calling), `flutter_test`. + +## Global Constraints + +- No changes to any `IStorageService` method signature (spec §2 non-goal). Additions to concrete classes are fine. +- No changes to any manager, `WorkoutProvider`, or screen — all depend on `IStorageService`/`MockStorageService`, never a concrete backend. +- Hive boxes are never deleted at any point in this plan (spec §6.6). +- All new SQLite code lives under `lib/services/` (storage) and `lib/services/ai/` (SQL tool), matching existing structure. +- Follow the schema exactly as specified in `docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md` §4. + +--- + +### Task 1: Add SQLite dependencies + +**Files:** +- Modify: `workout-logger/pubspec.yaml` + +**Interfaces:** +- Produces: `sqflite` and `sqflite_common_ffi` packages available for import in later tasks. + +- [ ] **Step 1: Add dependencies** + +In `workout-logger/pubspec.yaml`, add to the `dependencies:` section (after the `hive_flutter` line): + +```yaml + # SQLite persistence (replacing Hive) + sqflite: ^2.4.2 +``` + +Add to the `dev_dependencies:` section (after `build_runner`): + +```yaml + # sqflite testing on the Dart VM (flutter test has no platform binding) + sqflite_common_ffi: ^2.3.4+4 +``` + +- [ ] **Step 2: Install** + +Run: `cd workout-logger && flutter pub get` +Expected: resolves successfully, `pubspec.lock` updated with `sqflite` and `sqflite_common_ffi`. + +- [ ] **Step 3: Commit** + +```bash +git add workout-logger/pubspec.yaml workout-logger/pubspec.lock +git commit -m "chore: add sqflite dependencies for SQLite storage migration" +``` + +--- + +### Task 2: `SqliteStorageService` — schema + workout sessions + +**Files:** +- Create: `workout-logger/lib/services/sqlite_storage_service.dart` +- Test: `workout-logger/test/sqlite_storage_service_test.dart` + +**Interfaces:** +- Consumes: `IStorageService` (`lib/services/interfaces/storage_service_interface.dart`), models from `lib/models/models.dart`, `ExerciseDatabase`/`MuscleGroups` from `lib/data/exercise_database.dart`. +- Produces: `class SqliteStorageService implements IStorageService` with: + - `Future init()` + - `String get databasePath` (exposes the open DB's file path for `SqlQueryService`, Task 10) + - `SqliteStorageService({String? databasePathOverride})` constructor (override used by tests for `inMemoryDatabasePath`) + - Full workout-session CRUD this task implements: `saveWorkoutSession`, `getAllWorkoutSessions`, `getWorkoutSession`, `deleteWorkoutSession`, `getSessionsForExercise`, `getSessionsInDateRange` + - Remaining `IStorageService` methods stubbed with `throw UnimplementedError()` (filled in by Tasks 3–6) + +- [ ] **Step 1: Write the failing test** + +Create `workout-logger/test/sqlite_storage_service_test.dart`: + +```dart +import 'package:flutter_test/flutter_test.dart'; +import 'package:sqflite_common_ffi/sqflite_ffi.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/sqlite_storage_service.dart'; + +void main() { + late SqliteStorageService storage; + + setUpAll(() { + sqfliteFfiInit(); + databaseFactory = databaseFactoryFfi; + }); + + setUp(() async { + storage = SqliteStorageService(databasePathOverride: inMemoryDatabasePath); + await storage.init(); + }); + + group('SqliteStorageService — init', () { + test('seeds default muscle groups', () async { + final groups = await storage.getAllMuscleGroups(); + expect(groups, isNotEmpty); + expect(groups.any((g) => g.name == 'Chest'), isTrue); + }); + }); + + group('SqliteStorageService — workout sessions', () { + test('saveWorkoutSession + getWorkoutSession round-trips nested sets', () async { + final session = WorkoutSession( + id: 's1', + date: DateTime(2026, 7, 10), + duration: 45, + exercises: [ + ExerciseLog( + exerciseId: 'bench_press', + sets: [ + WorkoutSet(weight: 60, reps: 8), + WorkoutSet(weight: 65, reps: 6, isDropset: true, drops: [ + DropsetEntry(weight: 50, reps: 10), + ]), + ], + ), + ], + ); + + await storage.saveWorkoutSession(session); + final fetched = await storage.getWorkoutSession('s1'); + + expect(fetched, isNotNull); + expect(fetched!.duration, 45); + expect(fetched.exercises.single.sets.length, 2); + expect(fetched.exercises.single.sets.first.weight, 60); + expect(fetched.exercises.single.sets[1].isDropset, isTrue); + expect(fetched.exercises.single.sets[1].drops!.single.weight, 50); + }); + + test('saveWorkoutSession overwrites previous sets on re-save', () async { + final session = WorkoutSession( + id: 's2', + date: DateTime(2026, 7, 1), + duration: 30, + exercises: [ + ExerciseLog(exerciseId: 'squat', sets: [WorkoutSet(weight: 100, reps: 5)]), + ], + ); + await storage.saveWorkoutSession(session); + + final updated = session.copyWith( + exercises: [ + ExerciseLog(exerciseId: 'squat', sets: [WorkoutSet(weight: 110, reps: 3)]), + ], + ); + await storage.saveWorkoutSession(updated); + + final fetched = await storage.getWorkoutSession('s2'); + expect(fetched!.exercises.single.sets.length, 1); + expect(fetched.exercises.single.sets.first.weight, 110); + }); + + test('deleteWorkoutSession removes the session', () async { + final session = WorkoutSession( + id: 's3', + date: DateTime.now(), + duration: 20, + exercises: [ExerciseLog(exerciseId: 'row', sets: [WorkoutSet(weight: 40, reps: 10)])], + ); + await storage.saveWorkoutSession(session); + await storage.deleteWorkoutSession('s3'); + expect(await storage.getWorkoutSession('s3'), isNull); + }); + + test('getAllWorkoutSessions returns most-recent first', () async { + await storage.saveWorkoutSession( + WorkoutSession(id: 'old', date: DateTime(2026, 1, 1), duration: 10, exercises: []), + ); + await storage.saveWorkoutSession( + WorkoutSession(id: 'new', date: DateTime(2026, 6, 1), duration: 10, exercises: []), + ); + final all = await storage.getAllWorkoutSessions(); + expect(all.first.id, 'new'); + }); + + test('getSessionsInDateRange filters by date', () async { + await storage.saveWorkoutSession( + WorkoutSession(id: 'a', date: DateTime(2026, 1, 1), duration: 10, exercises: []), + ); + await storage.saveWorkoutSession( + WorkoutSession(id: 'b', date: DateTime(2026, 6, 1), duration: 10, exercises: []), + ); + final result = await storage.getSessionsInDateRange(DateTime(2026, 5, 1), DateTime(2026, 7, 1)); + expect(result.map((s) => s.id), ['b']); + }); + + test('getSessionsForExercise filters by exercise id', () async { + await storage.saveWorkoutSession(WorkoutSession( + id: 'c1', date: DateTime.now(), duration: 10, + exercises: [ExerciseLog(exerciseId: 'deadlift', sets: [WorkoutSet(weight: 120, reps: 5)])], + )); + await storage.saveWorkoutSession(WorkoutSession( + id: 'c2', date: DateTime.now(), duration: 10, + exercises: [ExerciseLog(exerciseId: 'squat', sets: [WorkoutSet(weight: 100, reps: 5)])], + )); + final result = await storage.getSessionsForExercise('deadlift'); + expect(result.map((s) => s.id), ['c1']); + }); + }); +} +``` + +- [ ] **Step 2: Run test to verify it fails** + +Run: `cd workout-logger && flutter test test/sqlite_storage_service_test.dart` +Expected: FAIL — `lib/services/sqlite_storage_service.dart` does not exist. + +- [ ] **Step 3: Implement schema + sessions CRUD** + +Create `workout-logger/lib/services/sqlite_storage_service.dart`: + +```dart +// SQLite-backed implementation of IStorageService — replaces Hive as the +// persistence backend. See docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md +// for the schema and migration design this implements. + +import 'dart:convert'; +import 'package:package_info_plus/package_info_plus.dart'; +import 'package:sqflite/sqflite.dart'; +import '../models/models.dart'; +import '../data/exercise_database.dart'; +import 'interfaces/storage_service_interface.dart'; + +class SqliteStorageService implements IStorageService { + SqliteStorageService({String? databasePathOverride}) + : _databasePathOverride = databasePathOverride; + + static const String _dbName = 'repforge.db'; + static const int _dbVersion = 1; + + static const List _schemaStatements = [ + '''CREATE TABLE exercises ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + category TEXT NOT NULL, + is_custom INTEGER NOT NULL DEFAULT 0, + available_handles TEXT + )''', + '''CREATE TABLE muscle_groups ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + growth_rate REAL NOT NULL DEFAULT 0, + last_updated TEXT NOT NULL + )''', + '''CREATE TABLE exercise_muscle_activations ( + exercise_id TEXT NOT NULL, + muscle_group_id TEXT NOT NULL, + activation_percentage INTEGER NOT NULL + )''', + '''CREATE TABLE routines ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + created_at TEXT NOT NULL + )''', + '''CREATE TABLE routine_exercises ( + routine_id TEXT NOT NULL, + exercise_id TEXT NOT NULL, + position INTEGER NOT NULL + )''', + '''CREATE TABLE sessions ( + id TEXT PRIMARY KEY, + date TEXT NOT NULL, + routine_id TEXT, + duration_min INTEGER NOT NULL, + notes TEXT, + hc_synced_at TEXT + )''', + '''CREATE TABLE exercise_logs ( + id TEXT PRIMARY KEY, + session_id TEXT NOT NULL, + exercise_id TEXT NOT NULL, + notes TEXT, + handle TEXT + )''', + '''CREATE TABLE sets ( + id TEXT PRIMARY KEY, + exercise_log_id TEXT NOT NULL, + weight REAL NOT NULL, + reps INTEGER NOT NULL, + is_dropset INTEGER NOT NULL DEFAULT 0, + drops_json TEXT, + time_taken INTEGER, + timestamp TEXT NOT NULL, + assist_weight REAL, + extra_weight REAL, + handle TEXT + )''', + '''CREATE TABLE targets ( + id TEXT PRIMARY KEY, + exercise_id TEXT NOT NULL, + target_type TEXT NOT NULL, + target_value REAL NOT NULL, + current_value REAL NOT NULL DEFAULT 0, + estimated_completion_date TEXT, + created_at TEXT NOT NULL, + is_completed INTEGER NOT NULL DEFAULT 0 + )''', + '''CREATE TABLE personal_records ( + exercise_id TEXT PRIMARY KEY, + best_weight REAL NOT NULL, + best_reps INTEGER NOT NULL, + best_volume REAL NOT NULL, + achieved_at TEXT NOT NULL + )''', + '''CREATE TABLE training_programs ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + description TEXT, + total_weeks INTEGER NOT NULL, + author TEXT, + is_imported INTEGER NOT NULL DEFAULT 0, + created_at TEXT NOT NULL, + phases_json TEXT NOT NULL, + weeks_json TEXT NOT NULL + )''', + '''CREATE TABLE conversations ( + id TEXT PRIMARY KEY, + title TEXT NOT NULL, + kind TEXT NOT NULL DEFAULT 'coach', + created_at TEXT NOT NULL, + updated_at TEXT NOT NULL, + messages_json TEXT NOT NULL + )''', + '''CREATE TABLE settings ( + key TEXT PRIMARY KEY, + value TEXT + )''', + 'CREATE INDEX idx_sets_exercise_log ON sets(exercise_log_id)', + 'CREATE INDEX idx_exercise_logs_session ON exercise_logs(session_id)', + 'CREATE INDEX idx_exercise_logs_exercise ON exercise_logs(exercise_id)', + 'CREATE INDEX idx_sessions_date ON sessions(date)', + ]; + + final String? _databasePathOverride; + late Database _db; + bool _initialized = false; + + String _appVersion = const String.fromEnvironment( + 'APP_VERSION', + defaultValue: 'unknown', + ); + + /// File path of the open database — used by SqlQueryService to open a + /// separate read-only connection for the coach's SQL tool. + String get databasePath => _db.path; + + @override + Future init() async { + if (_initialized) return; + + try { + final packageInfo = await PackageInfo.fromPlatform(); + final version = packageInfo.version; + final buildNumber = packageInfo.buildNumber; + _appVersion = buildNumber.isNotEmpty ? '$version+$buildNumber' : version; + } catch (_) { + // Keep build-time fallback in environments without platform metadata. + } + + final dbPath = _databasePathOverride ?? '${await getDatabasesPath()}/$_dbName'; + _db = await openDatabase( + dbPath, + version: _dbVersion, + onCreate: (db, version) async { + for (final statement in _schemaStatements) { + await db.execute(statement); + } + }, + ); + + final count = Sqflite.firstIntValue( + await _db.rawQuery('SELECT COUNT(*) FROM muscle_groups'), + ) ?? + 0; + if (count == 0) { + await _seedDefaultMuscleGroups(); + } + + _initialized = true; + } + + Future _seedDefaultMuscleGroups() async { + final batch = _db.batch(); + for (final mg in MuscleGroups.getAll()) { + batch.insert('muscle_groups', { + 'id': mg.id, + 'name': mg.name, + 'growth_rate': mg.growthRate, + 'last_updated': mg.lastUpdated.toIso8601String(), + }); + } + await batch.commit(noResult: true); + } + + // ==================== WORKOUT SESSIONS ==================== + + @override + Future saveWorkoutSession(WorkoutSession session) async { + await _db.transaction((txn) async { + final oldLogs = await txn.query( + 'exercise_logs', + columns: ['id'], + where: 'session_id = ?', + whereArgs: [session.id], + ); + for (final row in oldLogs) { + await txn.delete('sets', where: 'exercise_log_id = ?', whereArgs: [row['id']]); + } + await txn.delete('exercise_logs', where: 'session_id = ?', whereArgs: [session.id]); + await txn.delete('sessions', where: 'id = ?', whereArgs: [session.id]); + + await txn.insert('sessions', { + 'id': session.id, + 'date': session.date.toIso8601String(), + 'routine_id': session.routineId, + 'duration_min': session.duration, + 'notes': session.notes, + 'hc_synced_at': session.hcSyncedAt?.toIso8601String(), + }); + + for (var i = 0; i < session.exercises.length; i++) { + final log = session.exercises[i]; + final logId = '${session.id}_$i'; + await txn.insert('exercise_logs', { + 'id': logId, + 'session_id': session.id, + 'exercise_id': log.exerciseId, + 'notes': log.notes, + 'handle': log.handle, + }); + for (var j = 0; j < log.sets.length; j++) { + final set = log.sets[j]; + await txn.insert('sets', { + 'id': '${logId}_$j', + 'exercise_log_id': logId, + 'weight': set.weight, + 'reps': set.reps, + 'is_dropset': set.isDropset ? 1 : 0, + 'drops_json': set.drops == null + ? null + : jsonEncode(set.drops!.map((d) => d.toJson()).toList()), + 'time_taken': set.timeTaken, + 'timestamp': set.timestamp.toIso8601String(), + 'assist_weight': set.assistWeight, + 'extra_weight': set.extraWeight, + 'handle': set.handle, + }); + } + } + }); + } + + Future> _loadSessions({String? where, List? whereArgs}) async { + final sessionRows = await _db.query('sessions', where: where, whereArgs: whereArgs); + final sessions = []; + for (final row in sessionRows) { + final sessionId = row['id'] as String; + final logRows = await _db.query( + 'exercise_logs', + where: 'session_id = ?', + whereArgs: [sessionId], + orderBy: 'id ASC', + ); + final exerciseLogs = []; + for (final logRow in logRows) { + final logId = logRow['id'] as String; + final setRows = await _db.query( + 'sets', + where: 'exercise_log_id = ?', + whereArgs: [logId], + orderBy: 'id ASC', + ); + final sets = setRows + .map((s) => WorkoutSet( + weight: (s['weight'] as num).toDouble(), + reps: s['reps'] as int, + isDropset: (s['is_dropset'] as int) == 1, + drops: s['drops_json'] == null + ? null + : (jsonDecode(s['drops_json'] as String) as List) + .map((d) => DropsetEntry.fromJson(d as Map)) + .toList(), + timeTaken: s['time_taken'] as int?, + timestamp: DateTime.parse(s['timestamp'] as String), + assistWeight: (s['assist_weight'] as num?)?.toDouble(), + extraWeight: (s['extra_weight'] as num?)?.toDouble(), + handle: s['handle'] as String?, + )) + .toList(); + exerciseLogs.add(ExerciseLog( + exerciseId: logRow['exercise_id'] as String, + sets: sets, + notes: logRow['notes'] as String?, + handle: logRow['handle'] as String?, + )); + } + sessions.add(WorkoutSession( + id: sessionId, + date: DateTime.parse(row['date'] as String), + routineId: row['routine_id'] as String?, + exercises: exerciseLogs, + duration: row['duration_min'] as int, + notes: row['notes'] as String?, + hcSyncedAt: row['hc_synced_at'] == null + ? null + : DateTime.parse(row['hc_synced_at'] as String), + )); + } + sessions.sort((a, b) => b.date.compareTo(a.date)); + return sessions; + } + + @override + Future> getAllWorkoutSessions() => _loadSessions(); + + @override + Future getWorkoutSession(String id) async { + final result = await _loadSessions(where: 'id = ?', whereArgs: [id]); + return result.isEmpty ? null : result.first; + } + + @override + Future deleteWorkoutSession(String id) async { + await _db.transaction((txn) async { + final logRows = await txn.query( + 'exercise_logs', + columns: ['id'], + where: 'session_id = ?', + whereArgs: [id], + ); + for (final row in logRows) { + await txn.delete('sets', where: 'exercise_log_id = ?', whereArgs: [row['id']]); + } + await txn.delete('exercise_logs', where: 'session_id = ?', whereArgs: [id]); + await txn.delete('sessions', where: 'id = ?', whereArgs: [id]); + }); + } + + @override + Future> getSessionsForExercise(String exerciseId) async { + final all = await getAllWorkoutSessions(); + return all.where((s) => s.exercises.any((e) => e.exerciseId == exerciseId)).toList(); + } + + @override + Future> getSessionsInDateRange(DateTime start, DateTime end) async { + final all = await getAllWorkoutSessions(); + final lo = start.isAfter(end) ? end : start; + final hi = start.isAfter(end) ? start : end; + return all.where((s) => !s.date.isBefore(lo) && !s.date.isAfter(hi)).toList(); + } + + // ==================== ROUTINES (Task 3) ==================== + + @override + Future saveRoutine(Routine routine) => throw UnimplementedError(); + @override + Future> getAllRoutines() => throw UnimplementedError(); + @override + Future getRoutine(String id) => throw UnimplementedError(); + @override + Future deleteRoutine(String id) => throw UnimplementedError(); + + // ==================== TARGETS (Task 3) ==================== + + @override + Future saveTarget(Target target) => throw UnimplementedError(); + @override + Future> getAllTargets() => throw UnimplementedError(); + @override + Future getTarget(String id) => throw UnimplementedError(); + @override + Future deleteTarget(String id) => throw UnimplementedError(); + @override + Future> getTargetsForExercise(String exerciseId) => throw UnimplementedError(); + + // ==================== MUSCLE GROUPS / EXERCISES (Task 4) ==================== + + @override + Future updateMuscleGroupGrowthRate(String muscleGroupId, double rate) => + throw UnimplementedError(); + @override + Future> getAllMuscleGroups() => throw UnimplementedError(); + @override + Future getMuscleGroup(String id) => throw UnimplementedError(); + @override + Future saveCustomExercise(Exercise exercise) => throw UnimplementedError(); + @override + Future> getCustomExercises() => throw UnimplementedError(); + @override + Future deleteCustomExercise(String id) => throw UnimplementedError(); + @override + Future> getAllExercises() => throw UnimplementedError(); + @override + Future getExercise(String id) => throw UnimplementedError(); + + // ==================== SETTINGS / PROGRAMS / PRs / CONVERSATIONS (Task 5) ==================== + + @override + Future saveSetting(String key, String value) => throw UnimplementedError(); + @override + Future getSetting(String key) => throw UnimplementedError(); + @override + Future saveTrainingProgram(TrainingProgram program) => throw UnimplementedError(); + @override + Future> getAllTrainingPrograms() => throw UnimplementedError(); + @override + Future getTrainingProgram(String id) => throw UnimplementedError(); + @override + Future deleteTrainingProgram(String id) => throw UnimplementedError(); + @override + Future savePersonalRecord(PersonalRecord record) => throw UnimplementedError(); + @override + Future getPersonalRecord(String exerciseId) => throw UnimplementedError(); + @override + Future> getAllPersonalRecords() => throw UnimplementedError(); + @override + Future saveConversation(Conversation conversation) => throw UnimplementedError(); + @override + Future> getAllConversations() => throw UnimplementedError(); + @override + Future getConversation(String id) => throw UnimplementedError(); + @override + Future deleteConversation(String id) => throw UnimplementedError(); + @override + Future> getQuickStats() => throw UnimplementedError(); + + // ==================== EXPORT / IMPORT (Task 6) ==================== + + @override + Future exportAllData() => throw UnimplementedError(); + @override + Future importData(String jsonData) => throw UnimplementedError(); +} +``` + +- [ ] **Step 4: Run test to verify it passes** + +Run: `cd workout-logger && flutter test test/sqlite_storage_service_test.dart` +Expected: PASS (all 7 tests). + +- [ ] **Step 5: Commit** + +```bash +git add workout-logger/lib/services/sqlite_storage_service.dart workout-logger/test/sqlite_storage_service_test.dart +git commit -m "feat: add SqliteStorageService with schema and workout session CRUD" +``` + +--- + +### Task 3: `SqliteStorageService` — routines + targets + +**Files:** +- Modify: `workout-logger/lib/services/sqlite_storage_service.dart` +- Modify: `workout-logger/test/sqlite_storage_service_test.dart` + +**Interfaces:** +- Consumes: schema from Task 2 (`routines`, `routine_exercises`, `targets` tables). +- Produces: working `saveRoutine`, `getAllRoutines`, `getRoutine`, `deleteRoutine`, `saveTarget`, `getAllTargets`, `getTarget`, `deleteTarget`, `getTargetsForExercise`. + +- [ ] **Step 1: Write the failing tests** + +Append to `workout-logger/test/sqlite_storage_service_test.dart` (inside `main()`, alongside the existing groups): + +```dart + group('SqliteStorageService — routines', () { + test('saveRoutine + getRoutine round-trips ordered exercise ids', () async { + await storage.saveRoutine(Routine( + id: 'r1', + name: 'Push Day', + exerciseIds: ['bench_press', 'shoulder_press', 'triceps_pushdown'], + )); + final fetched = await storage.getRoutine('r1'); + expect(fetched!.name, 'Push Day'); + expect(fetched.exerciseIds, ['bench_press', 'shoulder_press', 'triceps_pushdown']); + }); + + test('saveRoutine overwrites exercise order on re-save', () async { + await storage.saveRoutine(Routine(id: 'r2', name: 'Pull Day', exerciseIds: ['a', 'b'])); + await storage.saveRoutine(Routine(id: 'r2', name: 'Pull Day', exerciseIds: ['b', 'a', 'c'])); + final fetched = await storage.getRoutine('r2'); + expect(fetched!.exerciseIds, ['b', 'a', 'c']); + }); + + test('deleteRoutine removes it', () async { + await storage.saveRoutine(Routine(id: 'r3', name: 'Legs', exerciseIds: ['squat'])); + await storage.deleteRoutine('r3'); + expect(await storage.getRoutine('r3'), isNull); + }); + + test('getAllRoutines returns all saved routines', () async { + await storage.saveRoutine(Routine(id: 'r4', name: 'A', exerciseIds: [])); + await storage.saveRoutine(Routine(id: 'r5', name: 'B', exerciseIds: [])); + final all = await storage.getAllRoutines(); + expect(all.map((r) => r.id), containsAll(['r4', 'r5'])); + }); + }); + + group('SqliteStorageService — targets', () { + test('saveTarget + getTarget round-trips', () async { + await storage.saveTarget(Target( + id: 't1', + exerciseId: 'bench_press', + targetType: 'weight', + targetValue: 100, + currentValue: 70, + )); + final fetched = await storage.getTarget('t1'); + expect(fetched!.targetValue, 100); + expect(fetched.currentValue, 70); + }); + + test('deleteTarget removes it', () async { + await storage.saveTarget(Target(id: 't2', exerciseId: 'squat', targetType: 'weight', targetValue: 150)); + await storage.deleteTarget('t2'); + expect(await storage.getTarget('t2'), isNull); + }); + + test('getTargetsForExercise filters by exercise id', () async { + await storage.saveTarget(Target(id: 't3', exerciseId: 'squat', targetType: 'weight', targetValue: 150)); + await storage.saveTarget(Target(id: 't4', exerciseId: 'deadlift', targetType: 'weight', targetValue: 180)); + final result = await storage.getTargetsForExercise('squat'); + expect(result.map((t) => t.id), ['t3']); + }); + }); +``` + +- [ ] **Step 2: Run test to verify it fails** + +Run: `cd workout-logger && flutter test test/sqlite_storage_service_test.dart` +Expected: FAIL with `UnimplementedError` on the routine/target tests. + +- [ ] **Step 3: Implement routines + targets** + +In `workout-logger/lib/services/sqlite_storage_service.dart`, replace the `// ==================== ROUTINES (Task 3) ====================` and `// ==================== TARGETS (Task 3) ====================` sections with: + +```dart + // ==================== ROUTINES ==================== + + @override + Future saveRoutine(Routine routine) async { + await _db.transaction((txn) async { + await txn.delete('routine_exercises', where: 'routine_id = ?', whereArgs: [routine.id]); + await txn.insert( + 'routines', + { + 'id': routine.id, + 'name': routine.name, + 'created_at': routine.createdAt.toIso8601String(), + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + for (var i = 0; i < routine.exerciseIds.length; i++) { + await txn.insert('routine_exercises', { + 'routine_id': routine.id, + 'exercise_id': routine.exerciseIds[i], + 'position': i, + }); + } + }); + } + + Future _loadRoutineRow(Map row) async { + final exRows = await _db.query( + 'routine_exercises', + where: 'routine_id = ?', + whereArgs: [row['id']], + orderBy: 'position ASC', + ); + return Routine( + id: row['id'] as String, + name: row['name'] as String, + exerciseIds: exRows.map((r) => r['exercise_id'] as String).toList(), + createdAt: DateTime.parse(row['created_at'] as String), + ); + } + + @override + Future> getAllRoutines() async { + final rows = await _db.query('routines'); + final result = []; + for (final row in rows) { + result.add(await _loadRoutineRow(row)); + } + return result; + } + + @override + Future getRoutine(String id) async { + final rows = await _db.query('routines', where: 'id = ?', whereArgs: [id]); + if (rows.isEmpty) return null; + return _loadRoutineRow(rows.first); + } + + @override + Future deleteRoutine(String id) async { + await _db.transaction((txn) async { + await txn.delete('routine_exercises', where: 'routine_id = ?', whereArgs: [id]); + await txn.delete('routines', where: 'id = ?', whereArgs: [id]); + }); + } + + // ==================== TARGETS ==================== + + @override + Future saveTarget(Target target) async { + await _db.insert( + 'targets', + { + 'id': target.id, + 'exercise_id': target.exerciseId, + 'target_type': target.targetType, + 'target_value': target.targetValue, + 'current_value': target.currentValue, + 'estimated_completion_date': target.estimatedCompletionDate?.toIso8601String(), + 'created_at': target.createdAt.toIso8601String(), + 'is_completed': target.isCompleted ? 1 : 0, + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + } + + Target _targetFromRow(Map row) => Target( + id: row['id'] as String, + exerciseId: row['exercise_id'] as String, + targetType: row['target_type'] as String, + targetValue: (row['target_value'] as num).toDouble(), + currentValue: (row['current_value'] as num).toDouble(), + estimatedCompletionDate: row['estimated_completion_date'] == null + ? null + : DateTime.parse(row['estimated_completion_date'] as String), + createdAt: DateTime.parse(row['created_at'] as String), + isCompleted: (row['is_completed'] as int) == 1, + ); + + @override + Future> getAllTargets() async { + final rows = await _db.query('targets'); + return rows.map(_targetFromRow).toList(); + } + + @override + Future getTarget(String id) async { + final rows = await _db.query('targets', where: 'id = ?', whereArgs: [id]); + return rows.isEmpty ? null : _targetFromRow(rows.first); + } + + @override + Future deleteTarget(String id) async { + await _db.delete('targets', where: 'id = ?', whereArgs: [id]); + } + + @override + Future> getTargetsForExercise(String exerciseId) async { + final rows = await _db.query('targets', where: 'exercise_id = ?', whereArgs: [exerciseId]); + return rows.map(_targetFromRow).toList(); + } +``` + +- [ ] **Step 4: Run test to verify it passes** + +Run: `cd workout-logger && flutter test test/sqlite_storage_service_test.dart` +Expected: PASS (all tests, including Task 2's). + +- [ ] **Step 5: Commit** + +```bash +git add workout-logger/lib/services/sqlite_storage_service.dart workout-logger/test/sqlite_storage_service_test.dart +git commit -m "feat: implement routine and target CRUD in SqliteStorageService" +``` + +--- + +### Task 4: `SqliteStorageService` — muscle groups + custom exercises + +**Files:** +- Modify: `workout-logger/lib/services/sqlite_storage_service.dart` +- Modify: `workout-logger/test/sqlite_storage_service_test.dart` + +**Interfaces:** +- Consumes: `exercises`, `exercise_muscle_activations`, `muscle_groups` tables; `ExerciseDatabase.getAll()` / `getById()` for built-ins. +- Produces: working `updateMuscleGroupGrowthRate`, `getAllMuscleGroups`, `getMuscleGroup`, `saveCustomExercise`, `getCustomExercises`, `deleteCustomExercise`, `getAllExercises`, `getExercise`. + +- [ ] **Step 1: Write the failing tests** + +Append to `workout-logger/test/sqlite_storage_service_test.dart`: + +```dart + group('SqliteStorageService — muscle groups', () { + test('updateMuscleGroupGrowthRate updates an existing group', () async { + final groups = await storage.getAllMuscleGroups(); + final chest = groups.firstWhere((g) => g.name == 'Chest'); + await storage.updateMuscleGroupGrowthRate(chest.id, 2.5); + final updated = await storage.getMuscleGroup(chest.id); + expect(updated!.growthRate, 2.5); + }); + }); + + group('SqliteStorageService — custom exercises', () { + test('saveCustomExercise + getExercise round-trips muscle activations', () async { + final exercise = Exercise( + id: 'custom1', + name: 'Cable Crossover', + category: 'isolation', + isCustom: true, + muscleActivations: [ + MuscleActivation(muscleGroupId: 'chest', activationPercentage: 80), + MuscleActivation(muscleGroupId: 'triceps', activationPercentage: 20), + ], + ); + await storage.saveCustomExercise(exercise); + + final fetched = await storage.getExercise('custom1'); + expect(fetched, isNotNull); + expect(fetched!.name, 'Cable Crossover'); + expect(fetched.muscleActivations.length, 2); + expect(fetched.primaryMuscle, 'chest'); + }); + + test('getExercise falls back to built-in exercises', () async { + final builtIns = ExerciseDatabase.getAll(); + final known = builtIns.first; + final fetched = await storage.getExercise(known.id); + expect(fetched!.name, known.name); + }); + + test('getAllExercises merges built-in and custom', () async { + await storage.saveCustomExercise(Exercise( + id: 'custom2', + name: 'My Exercise', + category: 'compound', + isCustom: true, + muscleActivations: [MuscleActivation(muscleGroupId: 'back', activationPercentage: 100)], + )); + final all = await storage.getAllExercises(); + expect(all.any((e) => e.id == 'custom2'), isTrue); + expect(all.length, greaterThan(1)); + }); + + test('deleteCustomExercise removes it and its activations', () async { + await storage.saveCustomExercise(Exercise( + id: 'custom3', + name: 'Temp', + category: 'isolation', + isCustom: true, + muscleActivations: [MuscleActivation(muscleGroupId: 'biceps', activationPercentage: 100)], + )); + await storage.deleteCustomExercise('custom3'); + expect(await storage.getExercise('custom3'), isNull); + final custom = await storage.getCustomExercises(); + expect(custom.any((e) => e.id == 'custom3'), isFalse); + }); + }); +``` + +- [ ] **Step 2: Run test to verify it fails** + +Run: `cd workout-logger && flutter test test/sqlite_storage_service_test.dart` +Expected: FAIL with `UnimplementedError` on the muscle group / custom exercise tests. + +- [ ] **Step 3: Implement muscle groups + custom exercises** + +In `workout-logger/lib/services/sqlite_storage_service.dart`, replace the `// ==================== MUSCLE GROUPS / EXERCISES (Task 4) ====================` section with: + +```dart + // ==================== MUSCLE GROUPS ==================== + + @override + Future updateMuscleGroupGrowthRate(String muscleGroupId, double rate) async { + await _db.update( + 'muscle_groups', + {'growth_rate': rate, 'last_updated': DateTime.now().toIso8601String()}, + where: 'id = ?', + whereArgs: [muscleGroupId], + ); + } + + MuscleGroup _muscleGroupFromRow(Map row) => MuscleGroup( + id: row['id'] as String, + name: row['name'] as String, + growthRate: (row['growth_rate'] as num).toDouble(), + lastUpdated: DateTime.parse(row['last_updated'] as String), + ); + + @override + Future> getAllMuscleGroups() async { + final rows = await _db.query('muscle_groups'); + return rows.map(_muscleGroupFromRow).toList(); + } + + @override + Future getMuscleGroup(String id) async { + final rows = await _db.query('muscle_groups', where: 'id = ?', whereArgs: [id]); + return rows.isEmpty ? null : _muscleGroupFromRow(rows.first); + } + + // ==================== CUSTOM EXERCISES ==================== + + @override + Future saveCustomExercise(Exercise exercise) async { + await _db.transaction((txn) async { + await txn.delete('exercise_muscle_activations', where: 'exercise_id = ?', whereArgs: [exercise.id]); + await txn.insert( + 'exercises', + { + 'id': exercise.id, + 'name': exercise.name, + 'category': exercise.category, + 'is_custom': 1, + 'available_handles': + exercise.availableHandles == null ? null : jsonEncode(exercise.availableHandles), + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + for (final ma in exercise.muscleActivations) { + await txn.insert('exercise_muscle_activations', { + 'exercise_id': exercise.id, + 'muscle_group_id': ma.muscleGroupId, + 'activation_percentage': ma.activationPercentage, + }); + } + }); + } + + Future _loadCustomExerciseRow(Map row) async { + final activations = await _db.query( + 'exercise_muscle_activations', + where: 'exercise_id = ?', + whereArgs: [row['id']], + ); + return Exercise( + id: row['id'] as String, + name: row['name'] as String, + category: row['category'] as String, + isCustom: true, + availableHandles: row['available_handles'] == null + ? null + : (jsonDecode(row['available_handles'] as String) as List).cast(), + muscleActivations: activations + .map((a) => MuscleActivation( + muscleGroupId: a['muscle_group_id'] as String, + activationPercentage: a['activation_percentage'] as int, + )) + .toList(), + ); + } + + @override + Future> getCustomExercises() async { + final rows = await _db.query('exercises'); + final result = []; + for (final row in rows) { + result.add(await _loadCustomExerciseRow(row)); + } + return result; + } + + @override + Future deleteCustomExercise(String id) async { + await _db.transaction((txn) async { + await txn.delete('exercise_muscle_activations', where: 'exercise_id = ?', whereArgs: [id]); + await txn.delete('exercises', where: 'id = ?', whereArgs: [id]); + }); + } + + @override + Future> getAllExercises() async { + final builtIn = ExerciseDatabase.getAll(); + final custom = await getCustomExercises(); + return [...builtIn, ...custom]; + } + + @override + Future getExercise(String id) async { + final builtIn = ExerciseDatabase.getById(id); + if (builtIn != null) return builtIn; + final rows = await _db.query('exercises', where: 'id = ?', whereArgs: [id]); + if (rows.isEmpty) return null; + return _loadCustomExerciseRow(rows.first); + } +``` + +- [ ] **Step 4: Run test to verify it passes** + +Run: `cd workout-logger && flutter test test/sqlite_storage_service_test.dart` +Expected: PASS (all tests). + +- [ ] **Step 5: Commit** + +```bash +git add workout-logger/lib/services/sqlite_storage_service.dart workout-logger/test/sqlite_storage_service_test.dart +git commit -m "feat: implement muscle group and custom exercise CRUD in SqliteStorageService" +``` + +--- + +### Task 5: `SqliteStorageService` — settings, personal records, training programs, conversations, stats + +**Files:** +- Modify: `workout-logger/lib/services/sqlite_storage_service.dart` +- Modify: `workout-logger/test/sqlite_storage_service_test.dart` + +**Interfaces:** +- Consumes: `settings`, `personal_records`, `training_programs`, `conversations` tables. `TrainingPhase`/`ProgramWeek`/`ChatMessage` `toJson`/`fromJson` (already defined in `lib/models/models.dart`, used the same way the existing Hive `StorageService` uses them). +- Produces: working `saveSetting`, `getSetting`, `savePersonalRecord`, `getPersonalRecord`, `getAllPersonalRecords`, `saveTrainingProgram`, `getAllTrainingPrograms`, `getTrainingProgram`, `deleteTrainingProgram`, `saveConversation`, `getAllConversations`, `getConversation`, `deleteConversation`, `getQuickStats`. + +- [ ] **Step 1: Write the failing tests** + +Append to `workout-logger/test/sqlite_storage_service_test.dart`: + +```dart + group('SqliteStorageService — settings', () { + test('saveSetting + getSetting round-trips, overwrite replaces value', () async { + await storage.saveSetting('user_name', 'Alex'); + expect(await storage.getSetting('user_name'), 'Alex'); + await storage.saveSetting('user_name', 'Sam'); + expect(await storage.getSetting('user_name'), 'Sam'); + }); + + test('getSetting returns null for unknown key', () async { + expect(await storage.getSetting('does_not_exist'), isNull); + }); + }); + + group('SqliteStorageService — personal records', () { + test('savePersonalRecord + getPersonalRecord round-trips', () async { + await storage.savePersonalRecord(PersonalRecord( + exerciseId: 'bench_press', + bestWeight: 90, + bestReps: 5, + bestVolume: 450, + achievedAt: DateTime(2026, 4, 1), + )); + final pr = await storage.getPersonalRecord('bench_press'); + expect(pr!.bestWeight, 90); + }); + + test('getAllPersonalRecords returns everything saved', () async { + await storage.savePersonalRecord(PersonalRecord( + exerciseId: 'squat', bestWeight: 150, bestReps: 3, bestVolume: 450, achievedAt: DateTime(2026, 3, 1), + )); + final all = await storage.getAllPersonalRecords(); + expect(all.any((r) => r.exerciseId == 'squat'), isTrue); + }); + }); + + group('SqliteStorageService — training programs', () { + test('saveTrainingProgram + getTrainingProgram round-trips phases/weeks', () async { + final program = TrainingProgram( + id: 'p1', + name: '12-Week Strength', + totalWeeks: 12, + phases: [], + weeks: [], + ); + await storage.saveTrainingProgram(program); + final fetched = await storage.getTrainingProgram('p1'); + expect(fetched!.name, '12-Week Strength'); + expect(fetched.totalWeeks, 12); + }); + + test('deleteTrainingProgram removes it', () async { + await storage.saveTrainingProgram(TrainingProgram(id: 'p2', name: 'X', totalWeeks: 4, phases: [], weeks: [])); + await storage.deleteTrainingProgram('p2'); + expect(await storage.getTrainingProgram('p2'), isNull); + }); + }); + + group('SqliteStorageService — conversations', () { + test('saveConversation + getConversation round-trips messages', () async { + final conversation = Conversation( + id: 'c1', + title: 'Progress check', + messages: [ChatMessage(role: 'user', text: 'How is my bench doing?')], + ); + await storage.saveConversation(conversation); + final fetched = await storage.getConversation('c1'); + expect(fetched!.messages.single.text, 'How is my bench doing?'); + }); + + test('getAllConversations returns most-recently-updated first', () async { + await storage.saveConversation(Conversation( + id: 'c2', title: 'Old', updatedAt: DateTime(2026, 1, 1), messages: [], + )); + await storage.saveConversation(Conversation( + id: 'c3', title: 'New', updatedAt: DateTime(2026, 6, 1), messages: [], + )); + final all = await storage.getAllConversations(); + expect(all.first.id, 'c3'); + }); + + test('deleteConversation removes it', () async { + await storage.saveConversation(Conversation(id: 'c4', title: 'Temp', messages: [])); + await storage.deleteConversation('c4'); + expect(await storage.getConversation('c4'), isNull); + }); + }); + + group('SqliteStorageService — quick stats', () { + test('getQuickStats aggregates the last 7 days', () async { + await storage.saveWorkoutSession(WorkoutSession( + id: 'stat1', + date: DateTime.now(), + duration: 30, + exercises: [ExerciseLog(exerciseId: 'bench_press', sets: [WorkoutSet(weight: 60, reps: 10)])], + )); + final stats = await storage.getQuickStats(); + expect(stats['totalWorkouts'], greaterThanOrEqualTo(1)); + expect(stats['weeklyWorkouts'], greaterThanOrEqualTo(1)); + }); + }); +``` + +- [ ] **Step 2: Run test to verify it fails** + +Run: `cd workout-logger && flutter test test/sqlite_storage_service_test.dart` +Expected: FAIL with `UnimplementedError` on the new tests. + +- [ ] **Step 3: Implement settings, PRs, training programs, conversations, stats** + +In `workout-logger/lib/services/sqlite_storage_service.dart`, replace the `// ==================== SETTINGS / PROGRAMS / PRs / CONVERSATIONS (Task 5) ====================` section with: + +```dart + // ==================== SETTINGS ==================== + + @override + Future saveSetting(String key, String value) async { + await _db.insert('settings', {'key': key, 'value': value}, + conflictAlgorithm: ConflictAlgorithm.replace); + } + + @override + Future getSetting(String key) async { + final rows = await _db.query('settings', where: 'key = ?', whereArgs: [key]); + return rows.isEmpty ? null : rows.first['value'] as String?; + } + + // ==================== TRAINING PROGRAMS ==================== + + @override + Future saveTrainingProgram(TrainingProgram program) async { + await _db.insert( + 'training_programs', + { + 'id': program.id, + 'name': program.name, + 'description': program.description, + 'total_weeks': program.totalWeeks, + 'author': program.author, + 'is_imported': program.isImported ? 1 : 0, + 'created_at': program.createdAt.toIso8601String(), + 'phases_json': jsonEncode(program.phases.map((p) => p.toJson()).toList()), + 'weeks_json': jsonEncode(program.weeks.map((w) => w.toJson()).toList()), + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + } + + TrainingProgram _programFromRow(Map row) => TrainingProgram( + id: row['id'] as String, + name: row['name'] as String, + description: row['description'] as String?, + totalWeeks: row['total_weeks'] as int, + phases: (jsonDecode(row['phases_json'] as String) as List) + .map((p) => TrainingPhase.fromJson(p as Map)) + .toList(), + weeks: (jsonDecode(row['weeks_json'] as String) as List) + .map((w) => ProgramWeek.fromJson(w as Map)) + .toList(), + author: row['author'] as String?, + isImported: (row['is_imported'] as int) == 1, + createdAt: DateTime.parse(row['created_at'] as String), + ); + + @override + Future> getAllTrainingPrograms() async { + final rows = await _db.query('training_programs', orderBy: 'created_at DESC'); + return rows.map(_programFromRow).toList(); + } + + @override + Future getTrainingProgram(String id) async { + final rows = await _db.query('training_programs', where: 'id = ?', whereArgs: [id]); + return rows.isEmpty ? null : _programFromRow(rows.first); + } + + @override + Future deleteTrainingProgram(String id) async { + await _db.delete('training_programs', where: 'id = ?', whereArgs: [id]); + } + + // ==================== PERSONAL RECORDS ==================== + + @override + Future savePersonalRecord(PersonalRecord record) async { + await _db.insert( + 'personal_records', + { + 'exercise_id': record.exerciseId, + 'best_weight': record.bestWeight, + 'best_reps': record.bestReps, + 'best_volume': record.bestVolume, + 'achieved_at': record.achievedAt.toIso8601String(), + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + } + + PersonalRecord _prFromRow(Map row) => PersonalRecord( + exerciseId: row['exercise_id'] as String, + bestWeight: (row['best_weight'] as num).toDouble(), + bestReps: row['best_reps'] as int, + bestVolume: (row['best_volume'] as num).toDouble(), + achievedAt: DateTime.parse(row['achieved_at'] as String), + ); + + @override + Future getPersonalRecord(String exerciseId) async { + final rows = await _db.query('personal_records', where: 'exercise_id = ?', whereArgs: [exerciseId]); + return rows.isEmpty ? null : _prFromRow(rows.first); + } + + @override + Future> getAllPersonalRecords() async { + final rows = await _db.query('personal_records'); + return rows.map(_prFromRow).toList(); + } + + // ==================== AI CONVERSATIONS ==================== + + @override + Future saveConversation(Conversation conversation) async { + await _db.insert( + 'conversations', + { + 'id': conversation.id, + 'title': conversation.title, + 'kind': conversation.kind, + 'created_at': conversation.createdAt.toIso8601String(), + 'updated_at': conversation.updatedAt.toIso8601String(), + 'messages_json': jsonEncode(conversation.messages.map((m) => m.toJson()).toList()), + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + } + + Conversation _conversationFromRow(Map row) => Conversation( + id: row['id'] as String, + title: row['title'] as String, + kind: row['kind'] as String, + createdAt: DateTime.parse(row['created_at'] as String), + updatedAt: DateTime.parse(row['updated_at'] as String), + messages: (jsonDecode(row['messages_json'] as String) as List) + .map((m) => ChatMessage.fromJson(m as Map)) + .toList(), + ); + + @override + Future> getAllConversations() async { + final rows = await _db.query('conversations', orderBy: 'updated_at DESC'); + return rows.map(_conversationFromRow).toList(); + } + + @override + Future getConversation(String id) async { + final rows = await _db.query('conversations', where: 'id = ?', whereArgs: [id]); + return rows.isEmpty ? null : _conversationFromRow(rows.first); + } + + @override + Future deleteConversation(String id) async { + await _db.delete('conversations', where: 'id = ?', whereArgs: [id]); + } + + // ==================== STATS ==================== + + @override + Future> getQuickStats() async { + final sessions = await getAllWorkoutSessions(); + final now = DateTime.now(); + final weekAgo = now.subtract(const Duration(days: 7)); + final weekSessions = sessions.where((s) => s.date.isAfter(weekAgo)).toList(); + + double weeklyVolume = 0; + int exercisesCompleted = 0; + for (var session in weekSessions) { + weeklyVolume += session.totalVolume; + exercisesCompleted += session.exercises.length; + } + + return { + 'totalWorkouts': sessions.length, + 'weeklyWorkouts': weekSessions.length, + 'weeklyVolume': weeklyVolume, + 'exercisesThisWeek': exercisesCompleted, + }; + } +``` + +- [ ] **Step 4: Run test to verify it passes** + +Run: `cd workout-logger && flutter test test/sqlite_storage_service_test.dart` +Expected: PASS (all tests). + +- [ ] **Step 5: Commit** + +```bash +git add workout-logger/lib/services/sqlite_storage_service.dart workout-logger/test/sqlite_storage_service_test.dart +git commit -m "feat: implement settings, PR, training program, and conversation CRUD in SqliteStorageService" +``` + +--- + +### Task 6: `SqliteStorageService` — export/import + +**Files:** +- Modify: `workout-logger/lib/services/sqlite_storage_service.dart` +- Modify: `workout-logger/test/sqlite_storage_service_test.dart` + +**Interfaces:** +- Consumes: all read/write methods implemented in Tasks 2–5. +- Produces: working `exportAllData` (JSON shape matching the existing Hive `StorageService.exportAllData` — same top-level keys: `sessions`, `routines`, `targets`, `muscleGroups`, `customExercises`, `conversations`, `settings`, `exportDate`, `appVersion`) and `importData` (same merge-skip-existing semantics as Hive's). + +- [ ] **Step 1: Write the failing tests** + +Append to `workout-logger/test/sqlite_storage_service_test.dart`: + +```dart + group('SqliteStorageService — export/import', () { + test('exportAllData includes sessions, routines, settings', () async { + await storage.saveWorkoutSession(WorkoutSession( + id: 'exp1', date: DateTime(2026, 5, 1), duration: 20, + exercises: [ExerciseLog(exerciseId: 'row', sets: [WorkoutSet(weight: 40, reps: 10)])], + )); + await storage.saveRoutine(Routine(id: 'exp_r1', name: 'Export Routine', exerciseIds: ['row'])); + await storage.saveSetting('unit', 'kg'); + + final json = await storage.exportAllData(); + final data = jsonDecode(json) as Map; + + expect((data['sessions'] as List).any((s) => s['id'] == 'exp1'), isTrue); + expect((data['routines'] as List).any((r) => r['id'] == 'exp_r1'), isTrue); + expect((data['settings'] as Map)['unit'], 'kg'); + }); + + test('importData merges without overwriting existing ids', () async { + await storage.saveWorkoutSession(WorkoutSession( + id: 'imp1', date: DateTime(2026, 1, 1), duration: 15, + exercises: [ExerciseLog(exerciseId: 'row', sets: [WorkoutSet(weight: 30, reps: 12)])], + )); + + final payload = jsonEncode({ + 'sessions': [ + { + 'id': 'imp1', // already exists — must be skipped + 'date': DateTime(2099, 1, 1).toIso8601String(), + 'duration': 999, + 'exercises': [], + }, + { + 'id': 'imp2', // new — must be imported + 'date': DateTime(2026, 2, 1).toIso8601String(), + 'duration': 25, + 'exercises': [], + }, + ], + 'settings': {'imported_key': 'imported_value'}, + }); + + await storage.importData(payload); + + final existing = await storage.getWorkoutSession('imp1'); + expect(existing!.duration, 15); // untouched + final imported = await storage.getWorkoutSession('imp2'); + expect(imported!.duration, 25); + expect(await storage.getSetting('imported_key'), 'imported_value'); + }); + }); +``` + +- [ ] **Step 2: Run test to verify it fails** + +Run: `cd workout-logger && flutter test test/sqlite_storage_service_test.dart` +Expected: FAIL with `UnimplementedError` on export/import tests. + +- [ ] **Step 3: Implement export/import** + +In `workout-logger/lib/services/sqlite_storage_service.dart`, replace the `// ==================== EXPORT / IMPORT (Task 6) ====================` section with: + +```dart + // ==================== EXPORT / IMPORT ==================== + + Map? _normalizeImportItem(dynamic item) { + if (item is Map) return item; + if (item is Map) return Map.from(item); + if (item is String) { + try { + final decoded = jsonDecode(item); + if (decoded is Map) return Map.from(decoded); + } catch (_) { + return null; + } + } + return null; + } + + @override + Future exportAllData() async { + final sessions = await getAllWorkoutSessions(); + final routines = await getAllRoutines(); + final targets = await getAllTargets(); + final muscleGroups = await getAllMuscleGroups(); + final customExercises = await getCustomExercises(); + final conversations = await getAllConversations(); + final settingsRows = await _db.query('settings'); + final settingsMap = { + for (final row in settingsRows) + if (row['value'] != null) row['key'] as String: row['value'] as String, + }; + + final data = { + 'sessions': sessions.map((s) => s.toJson()).toList(), + 'routines': routines.map((r) => r.toJson()).toList(), + 'targets': targets.map((t) => t.toJson()).toList(), + 'muscleGroups': muscleGroups.map((m) => m.toJson()).toList(), + 'customExercises': customExercises.map((e) => e.toJson()).toList(), + 'conversations': conversations.map((c) => c.toJson()).toList(), + 'settings': settingsMap, + 'exportDate': DateTime.now().toIso8601String(), + 'appVersion': _appVersion, + }; + return jsonEncode(data); + } + + @override + Future importData(String jsonData) async { + final data = jsonDecode(jsonData) as Map; + + final sessions = data['sessions']; + if (sessions is List) { + for (final item in sessions) { + final map = _normalizeImportItem(item); + if (map == null) continue; + final session = WorkoutSession.fromJson(map); + if (await getWorkoutSession(session.id) == null) { + await saveWorkoutSession(session); + } + } + } + + final routines = data['routines']; + if (routines is List) { + for (final item in routines) { + final map = _normalizeImportItem(item); + if (map == null) continue; + final routine = Routine.fromJson(map); + if (await getRoutine(routine.id) == null) { + await saveRoutine(routine); + } + } + } + + final targets = data['targets']; + if (targets is List) { + for (final item in targets) { + final map = _normalizeImportItem(item); + if (map == null) continue; + final target = Target.fromJson(map); + if (await getTarget(target.id) == null) { + await saveTarget(target); + } + } + } + + final muscleGroups = data['muscleGroups']; + if (muscleGroups is List) { + for (final item in muscleGroups) { + final map = _normalizeImportItem(item); + if (map == null) continue; + final mg = MuscleGroup.fromJson(map); + if (await getMuscleGroup(mg.id) == null) { + await _db.insert('muscle_groups', { + 'id': mg.id, + 'name': mg.name, + 'growth_rate': mg.growthRate, + 'last_updated': mg.lastUpdated.toIso8601String(), + }); + } + } + } + + final customExercises = data['customExercises']; + if (customExercises is List) { + for (final item in customExercises) { + final map = _normalizeImportItem(item); + if (map == null) continue; + final exercise = Exercise.fromJson(map); + final rows = await _db.query('exercises', where: 'id = ?', whereArgs: [exercise.id]); + if (rows.isEmpty) { + await saveCustomExercise(exercise); + } + } + } + + if (data['settings'] is Map) { + final settings = data['settings'] as Map; + for (final entry in settings.entries) { + if (await getSetting(entry.key) == null) { + await saveSetting(entry.key, entry.value.toString()); + } + } + } + + final conversations = data['conversations']; + if (conversations is List) { + for (final item in conversations) { + final map = _normalizeImportItem(item); + if (map == null) continue; + final conversation = Conversation.fromJson(map); + if (await getConversation(conversation.id) == null) { + await saveConversation(conversation); + } + } + } + } +``` + +- [ ] **Step 4: Run test to verify it passes** + +Run: `cd workout-logger && flutter test test/sqlite_storage_service_test.dart` +Expected: PASS — full file, all tasks 2–6 combined (roughly 25 tests). + +- [ ] **Step 5: Commit** + +```bash +git add workout-logger/lib/services/sqlite_storage_service.dart workout-logger/test/sqlite_storage_service_test.dart +git commit -m "feat: implement export/import in SqliteStorageService, completing IStorageService" +``` + +--- + +### Task 7: `StorageService` (Hive) — settings enumeration for migration + +**Files:** +- Modify: `workout-logger/lib/services/storage_service.dart` +- Test: `workout-logger/test/storage_service_test.dart` + +**Interfaces:** +- Produces: `Future> getAllSettingsForMigration()` — a concrete-class-only addition (not part of `IStorageService`), used exclusively by `StorageMigrationService` (Task 8) to enumerate every settings key. Not on the interface because no other consumer needs to list all keys. + +- [ ] **Step 1: Write the failing test** + +Append to `workout-logger/test/storage_service_test.dart`, inside the existing `group('StorageService CRUD & Operations', () { ... })`: + +```dart + test('getAllSettingsForMigration returns every saved key/value', () async { + await storage.saveSetting('mig_key_1', 'value_1'); + await storage.saveSetting('mig_key_2', 'value_2'); + + final all = await storage.getAllSettingsForMigration(); + + expect(all['mig_key_1'], 'value_1'); + expect(all['mig_key_2'], 'value_2'); + }); +``` + +- [ ] **Step 2: Run test to verify it fails** + +Run: `cd workout-logger && flutter test test/storage_service_test.dart` +Expected: FAIL — `getAllSettingsForMigration` is not defined on `StorageService`. + +- [ ] **Step 3: Implement the helper** + +In `workout-logger/lib/services/storage_service.dart`, add this method right after `getSetting` (inside the `// ==================== SETTINGS ====================` section): + +```dart + /// Every stored setting key/value. Used only by [StorageMigrationService] + /// to migrate the settings box to the SQLite backend — not part of + /// [IStorageService] since no other consumer needs to enumerate all keys. + Future> getAllSettingsForMigration() async { + final map = {}; + for (final key in _settingsBoxInstance.keys) { + final value = _settingsBoxInstance.get(key); + if (value != null) map[key as String] = value; + } + return map; + } +``` + +- [ ] **Step 4: Run test to verify it passes** + +Run: `cd workout-logger && flutter test test/storage_service_test.dart` +Expected: PASS. + +- [ ] **Step 5: Commit** + +```bash +git add workout-logger/lib/services/storage_service.dart workout-logger/test/storage_service_test.dart +git commit -m "feat: add settings enumeration helper to StorageService for migration" +``` + +--- + +### Task 8: `StorageMigrationService` + +**Files:** +- Create: `workout-logger/lib/services/storage_migration_service.dart` +- Test: `workout-logger/test/storage_migration_service_test.dart` + +**Interfaces:** +- Consumes: `StorageService` (Hive, Task 7's `getAllSettingsForMigration`), `SqliteStorageService` (Tasks 2–6, full `IStorageService`). +- Produces: `class StorageMigrationService { StorageMigrationService(StorageService source, SqliteStorageService target); Future migrate(); }`. Throws on any failure (caller in Task 9 decides fallback) — does not catch internally. + +- [ ] **Step 1: Write the failing test** + +Create `workout-logger/test/storage_migration_service_test.dart`: + +```dart +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:hive/hive.dart'; +import 'package:sqflite_common_ffi/sqflite_ffi.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/storage_service.dart'; +import 'package:repforge/services/sqlite_storage_service.dart'; +import 'package:repforge/services/storage_migration_service.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + late StorageService hiveStorage; + late SqliteStorageService sqliteStorage; + + setUpAll(() async { + const channel = MethodChannel('plugins.flutter.io/path_provider'); + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler( + channel, + (call) async => + call.method == 'getApplicationDocumentsDirectory' ? './test/tmp_hive_migration_service' : null, + ); + Hive.init('./test/tmp_hive_migration_service'); + sqfliteFfiInit(); + databaseFactory = databaseFactoryFfi; + }); + + setUp(() async { + hiveStorage = StorageService(); + await hiveStorage.init(); + sqliteStorage = SqliteStorageService(databasePathOverride: inMemoryDatabasePath); + await sqliteStorage.init(); + }); + + tearDownAll(() async { + await Hive.close(); + await Hive.deleteFromDisk(); + }); + + test('migrate copies every entity type from Hive to SQLite', () async { + await hiveStorage.saveWorkoutSession(WorkoutSession( + id: 'sess1', date: DateTime(2026, 5, 1), duration: 40, + exercises: [ExerciseLog(exerciseId: 'bench_press', sets: [WorkoutSet(weight: 70, reps: 8)])], + )); + await hiveStorage.saveRoutine(Routine(id: 'r1', name: 'Push Day', exerciseIds: ['bench_press'])); + await hiveStorage.saveTarget(Target(id: 't1', exerciseId: 'bench_press', targetType: 'weight', targetValue: 100)); + await hiveStorage.savePersonalRecord(PersonalRecord( + exerciseId: 'bench_press', bestWeight: 90, bestReps: 5, bestVolume: 450, achievedAt: DateTime(2026, 4, 1), + )); + await hiveStorage.saveCustomExercise(Exercise( + id: 'custom_mig', name: 'Migrated Exercise', category: 'isolation', isCustom: true, + muscleActivations: [MuscleActivation(muscleGroupId: 'chest', activationPercentage: 100)], + )); + await hiveStorage.saveConversation(Conversation(id: 'conv1', title: 'Chat', messages: [])); + await hiveStorage.saveSetting('user_name', 'Alex'); + + await StorageMigrationService(hiveStorage, sqliteStorage).migrate(); + + expect((await sqliteStorage.getWorkoutSession('sess1'))?.duration, 40); + expect((await sqliteStorage.getRoutine('r1'))?.name, 'Push Day'); + expect((await sqliteStorage.getTarget('t1'))?.targetValue, 100); + expect((await sqliteStorage.getPersonalRecord('bench_press'))?.bestWeight, 90); + expect((await sqliteStorage.getExercise('custom_mig'))?.name, 'Migrated Exercise'); + expect((await sqliteStorage.getConversation('conv1'))?.title, 'Chat'); + expect(await sqliteStorage.getSetting('user_name'), 'Alex'); + }); +} +``` + +- [ ] **Step 2: Run test to verify it fails** + +Run: `cd workout-logger && flutter test test/storage_migration_service_test.dart` +Expected: FAIL — `lib/services/storage_migration_service.dart` does not exist. + +- [ ] **Step 3: Implement `StorageMigrationService`** + +Create `workout-logger/lib/services/storage_migration_service.dart`: + +```dart +// One-time migration from the Hive-backed StorageService to +// SqliteStorageService. Reads exclusively through StorageService's existing, +// already-correct read methods; writes exclusively through +// SqliteStorageService's write methods. Throws on any failure — the caller +// (main.dart) decides whether to fall back to Hive. See +// docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md §6. + +import 'storage_service.dart'; +import 'sqlite_storage_service.dart'; + +class StorageMigrationService { + StorageMigrationService(this._source, this._target); + + final StorageService _source; + final SqliteStorageService _target; + + Future migrate() async { + for (final session in await _source.getAllWorkoutSessions()) { + await _target.saveWorkoutSession(session); + } + for (final routine in await _source.getAllRoutines()) { + await _target.saveRoutine(routine); + } + for (final target in await _source.getAllTargets()) { + await _target.saveTarget(target); + } + for (final mg in await _source.getAllMuscleGroups()) { + await _target.updateMuscleGroupGrowthRate(mg.id, mg.growthRate); + } + for (final exercise in await _source.getCustomExercises()) { + await _target.saveCustomExercise(exercise); + } + for (final record in await _source.getAllPersonalRecords()) { + await _target.savePersonalRecord(record); + } + for (final program in await _source.getAllTrainingPrograms()) { + await _target.saveTrainingProgram(program); + } + for (final conversation in await _source.getAllConversations()) { + await _target.saveConversation(conversation); + } + final settings = await _source.getAllSettingsForMigration(); + for (final entry in settings.entries) { + await _target.saveSetting(entry.key, entry.value); + } + } +} +``` + +- [ ] **Step 4: Run test to verify it passes** + +Run: `cd workout-logger && flutter test test/storage_migration_service_test.dart` +Expected: PASS. + +- [ ] **Step 5: Commit** + +```bash +git add workout-logger/lib/services/storage_migration_service.dart workout-logger/test/storage_migration_service_test.dart +git commit -m "feat: add StorageMigrationService for one-time Hive-to-SQLite migration" +``` + +--- + +### Task 9: Wire the storage backend resolution into `main.dart` + +**Files:** +- Modify: `workout-logger/lib/main.dart` + +**Interfaces:** +- Consumes: `StorageService`, `SqliteStorageService`, `StorageMigrationService` (Tasks 2, 7, 8). +- Produces: top-level `IStorageService? _resolvedStorageService` and `Future _resolveStorageBackend()`, called from `main()` before `runApp()`. `WorkoutLoggerApp._storageService`'s existing `static final` initializer reads `_resolvedStorageService!` — this works correctly because Dart `static`/top-level variables are lazily initialized on first access, and `_storageService` isn't accessed until `build()` runs, by which point `_resolveStorageBackend()` has already completed inside `main()`. + +This task has no automated test — `main()`/composition-root wiring isn't unit-testable without a larger DI refactor that's out of scope here (every dependent entity — `WorkoutProvider`, `CoachToolService`, etc. — is already covered by its own tests against `IStorageService`/`MockStorageService`). Verification is `flutter analyze` plus a manual run. + +- [ ] **Step 1: Add imports** + +In `workout-logger/lib/main.dart`, add these imports alongside the existing `services/storage_service.dart` import: + +```dart +import 'package:hive_flutter/hive_flutter.dart'; +import 'services/sqlite_storage_service.dart'; +import 'services/storage_migration_service.dart'; +import 'services/ai/sql_query_service.dart'; +``` + +- [ ] **Step 2: Add the resolver function** + +In `workout-logger/lib/main.dart`, add this above `void main() async {`: + +```dart +/// Resolved once in main() before runApp(). Read lazily by +/// WorkoutLoggerApp._storageService's static initializer, which only runs +/// on first access (during build()) — by then this is already set. +IStorageService? _resolvedStorageService; + +/// One-time, flag-gated, reversible Hive -> SQLite cutover. See +/// docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md §6. +Future _resolveStorageBackend() async { + await Hive.initFlutter(); + final settingsBox = await Hive.openBox('settings'); + final alreadyMigrated = settingsBox.get('storage_migrated_v1') == 'true'; + + if (alreadyMigrated) { + final sqlite = SqliteStorageService(); + await sqlite.init(); + _resolvedStorageService = sqlite; + return; + } + + final hiveStorage = StorageService(); + await hiveStorage.init(); + final sqliteStorage = SqliteStorageService(); + await sqliteStorage.init(); + + var migrationSucceeded = false; + try { + await StorageMigrationService(hiveStorage, sqliteStorage).migrate(); + await hiveStorage.saveSetting('storage_migrated_v1', 'true'); + migrationSucceeded = true; + } catch (e, st) { + debugPrint('Storage migration to SQLite failed, staying on Hive: $e\n$st'); + } + + _resolvedStorageService = migrationSucceeded ? sqliteStorage : hiveStorage; +} +``` + +- [ ] **Step 3: Call the resolver before `runApp`** + +In `workout-logger/lib/main.dart`, modify `void main() async { ... }` to call the resolver right before `runApp`: + +```dart + // Keep all system overlays transparent; content uses SafeArea for insets + SystemChrome.setSystemUIOverlayStyle( + const SystemUiOverlayStyle( + statusBarColor: Colors.transparent, + statusBarIconBrightness: Brightness.light, + systemStatusBarContrastEnforced: false, + systemNavigationBarColor: Colors.transparent, + systemNavigationBarDividerColor: Colors.transparent, + systemNavigationBarIconBrightness: Brightness.dark, + systemNavigationBarContrastEnforced: false, + ), + ); + + await _resolveStorageBackend(); + + runApp(const WorkoutLoggerApp()); +} +``` + +- [ ] **Step 4: Point the composition root at the resolved backend** + +In `workout-logger/lib/main.dart`, change the `_storageService` static field: + +```dart + static final IStorageService _storageService = StorageService(); +``` + +to: + +```dart + static final IStorageService _storageService = _resolvedStorageService!; +``` + +- [ ] **Step 5: Wire the coach's SQL tool, only when SQLite is active** + +In `workout-logger/lib/main.dart`, modify the `Provider` block: + +```dart + // CoachToolService backs AI tool calls; reads from WorkoutProvider + PRManager. + Provider( + create: (ctx) => CoachToolService( + ctx.read(), + ctx.read(), + healthHistory: ctx.read(), + ), + ), +``` + +to: + +```dart + // CoachToolService backs AI tool calls; reads from WorkoutProvider + PRManager. + // run_sql_query is only offered once the app has cut over to SQLite — + // it needs a live database file to open a read-only connection against. + Provider( + create: (ctx) => CoachToolService( + ctx.read(), + ctx.read(), + healthHistory: ctx.read(), + sqlQuery: _storageService is SqliteStorageService + ? SqlQueryService((_storageService as SqliteStorageService).databasePath) + : null, + ), + ), +``` + +- [ ] **Step 6: Verify with static analysis** + +Run: `cd workout-logger && flutter analyze lib/main.dart` +Expected: no errors. (`sqlQuery` and `SqlQueryService` won't exist yet — Task 11 adds the `CoachToolService` constructor parameter. If `flutter analyze` fails here because of that, that's expected; re-run this step after Task 11 instead and treat this as a checkpoint, not a blocker to committing Task 9's `main.dart` changes on their own branch state.) + +- [ ] **Step 7: Commit** + +```bash +git add workout-logger/lib/main.dart +git commit -m "feat: resolve Hive-vs-SQLite storage backend in main() before runApp" +``` + +--- + +### Task 10: `SqlQueryService` — read-only SQL execution + +**Files:** +- Create: `workout-logger/lib/services/ai/sql_query_service.dart` +- Test: `workout-logger/test/sql_query_service_test.dart` + +**Interfaces:** +- Produces: `class SqlQueryService { SqlQueryService(String databasePath); Future> runQuery(String rawQuery, {int? limit}); }`. Returns `{'row_count': int, 'rows': List>}` on success, `{'error': String}` on any validation or execution failure — never throws. + +- [ ] **Step 1: Write the failing test** + +Create `workout-logger/test/sql_query_service_test.dart`: + +```dart +import 'dart:io'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:sqflite_common_ffi/sqflite_ffi.dart'; +import 'package:repforge/services/ai/sql_query_service.dart'; + +void main() { + late String dbPath; + late Database seedDb; + + setUpAll(() { + sqfliteFfiInit(); + databaseFactory = databaseFactoryFfi; + }); + + setUp(() async { + dbPath = '${Directory.systemTemp.path}/sql_query_test_${DateTime.now().microsecondsSinceEpoch}.db'; + seedDb = await openDatabase(dbPath, version: 1, onCreate: (db, _) async { + await db.execute('CREATE TABLE widgets (id INTEGER PRIMARY KEY, name TEXT)'); + await db.insert('widgets', {'id': 1, 'name': 'foo'}); + await db.insert('widgets', {'id': 2, 'name': 'bar'}); + }); + }); + + tearDown(() async { + await seedDb.close(); + final f = File(dbPath); + if (await f.exists()) await f.delete(); + }); + + test('valid SELECT returns rows', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM widgets ORDER BY id'); + expect(result['row_count'], 2); + expect((result['rows'] as List).first, {'id': 1, 'name': 'foo'}); + }); + + test('rejects non-SELECT statements', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('DELETE FROM widgets'); + expect(result['error'], contains('Only SELECT')); + }); + + test('rejects multi-statement input', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM widgets; DROP TABLE widgets;'); + expect(result['error'], contains('single SQL statement')); + }); + + test('caps row count via limit', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM widgets', limit: 1); + expect(result['row_count'], 1); + }); + + test('returns error map instead of throwing on invalid SQL', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM does_not_exist'); + expect(result['error'], isNotNull); + }); +} +``` + +- [ ] **Step 2: Run test to verify it fails** + +Run: `cd workout-logger && flutter test test/sql_query_service_test.dart` +Expected: FAIL — `lib/services/ai/sql_query_service.dart` does not exist. + +- [ ] **Step 3: Implement `SqlQueryService`** + +Create `workout-logger/lib/services/ai/sql_query_service.dart`: + +```dart +// Executes model-submitted read-only SQL against a dedicated read-only +// connection to the app's live SQLite database. Used only by the coach's +// run_sql_query tool — never the app's own read/write connection. See +// docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md §7. + +import 'package:sqflite/sqflite.dart'; + +class SqlValidationException implements Exception { + SqlValidationException(this.message); + final String message; + + @override + String toString() => message; +} + +class SqlQueryService { + SqlQueryService(this.databasePath); + + final String databasePath; + + static const _forbiddenKeywords = [ + 'INSERT', + 'UPDATE', + 'DELETE', + 'DROP', + 'ALTER', + 'CREATE', + 'ATTACH', + 'DETACH', + 'PRAGMA', + 'VACUUM', + 'REPLACE', + 'TRIGGER', + ]; + + String _sanitize(String rawQuery) { + var q = rawQuery.trim(); + if (q.endsWith(';')) { + q = q.substring(0, q.length - 1).trim(); + } + if (q.contains(';')) { + throw SqlValidationException('Only a single SQL statement is allowed.'); + } + final upper = q.toUpperCase(); + if (!(upper.startsWith('SELECT') || upper.startsWith('WITH'))) { + throw SqlValidationException('Only SELECT queries are allowed.'); + } + for (final kw in _forbiddenKeywords) { + if (RegExp('\\b$kw\\b').hasMatch(upper)) { + throw SqlValidationException('Query contains a forbidden keyword: $kw'); + } + } + return q; + } + + /// Runs [rawQuery] read-only and returns {'row_count', 'rows'} on success + /// or {'error': message} on any validation or execution failure. Never + /// throws — callers (the coach tool loop) always get a JSON-safe result. + Future> runQuery(String rawQuery, {int? limit}) async { + final cappedLimit = (limit ?? 200).clamp(1, 500); + + final String safeQuery; + try { + safeQuery = _sanitize(rawQuery); + } on SqlValidationException catch (e) { + return {'error': e.message}; + } + + Database? db; + try { + db = await openReadOnlyDatabase(databasePath); + final rows = await db.rawQuery('SELECT * FROM ($safeQuery) LIMIT ?', [cappedLimit]); + return {'row_count': rows.length, 'rows': rows}; + } catch (e) { + return {'error': 'Query failed: $e'}; + } finally { + await db?.close(); + } + } +} +``` + +- [ ] **Step 4: Run test to verify it passes** + +Run: `cd workout-logger && flutter test test/sql_query_service_test.dart` +Expected: PASS (all 5 tests). + +- [ ] **Step 5: Commit** + +```bash +git add workout-logger/lib/services/ai/sql_query_service.dart workout-logger/test/sql_query_service_test.dart +git commit -m "feat: add SqlQueryService for read-only SQL execution" +``` + +--- + +### Task 11: Wire `run_sql_query` into `CoachToolService` + +**Files:** +- Modify: `workout-logger/lib/services/ai/coach_tool_service.dart` +- Modify: `workout-logger/test/coach_tool_service_test.dart` + +**Interfaces:** +- Consumes: `SqlQueryService` (Task 10). +- Produces: `CoachToolService(WorkoutProvider, PRManager, {HealthHistoryManager? healthHistory, SqlQueryService? sqlQuery})`. `run_sql_query` is only advertised in `buildTools()` when `sqlQuery` is non-null. + +- [ ] **Step 1: Write the failing tests** + +In `workout-logger/test/coach_tool_service_test.dart`, add these imports at the top: + +```dart +import 'dart:io'; +import 'package:sqflite_common_ffi/sqflite_ffi.dart'; +import 'package:repforge/services/sqlite_storage_service.dart'; +import 'package:repforge/services/ai/sql_query_service.dart'; +``` + +Then, inside the existing `group('CoachToolService', () { ... })` (after the existing `setUp`), add a nested group: + +```dart + group('run_sql_query', () { + late String dbPath; + late SqliteStorageService sqliteStorage; + + setUpAll(() { + sqfliteFfiInit(); + databaseFactory = databaseFactoryFfi; + }); + + setUp(() async { + dbPath = '${Directory.systemTemp.path}/coach_sql_test_${DateTime.now().microsecondsSinceEpoch}.db'; + sqliteStorage = SqliteStorageService(databasePathOverride: dbPath); + await sqliteStorage.init(); + await sqliteStorage.saveWorkoutSession(WorkoutSession( + id: 'sess1', date: DateTime(2026, 5, 1), duration: 40, + exercises: [ExerciseLog(exerciseId: 'bench_press', sets: [WorkoutSet(weight: 70, reps: 8)])], + )); + }); + + tearDown(() async { + final f = File(dbPath); + if (await f.exists()) await f.delete(); + }); + + test('is not advertised when no SqlQueryService is provided', () { + final declared = + tools.buildTools().expand((t) => t.functionDeclarations ?? []).map((f) => f.name); + expect(declared, isNot(contains('run_sql_query'))); + }); + + test('is advertised and runs a live SELECT when wired', () async { + final withSql = CoachToolService(provider, pr, sqlQuery: SqlQueryService(dbPath)); + + final declared = + withSql.buildTools().expand((t) => t.functionDeclarations ?? []).map((f) => f.name); + expect(declared, contains('run_sql_query')); + + final result = await withSql.handleCall( + FunctionCall('run_sql_query', {'query': 'SELECT id, duration_min FROM sessions'}), + ); + expect(result['row_count'], 1); + expect((result['rows'] as List).first, {'id': 'sess1', 'duration_min': 40}); + }); + }); +``` + +- [ ] **Step 2: Run test to verify it fails** + +Run: `cd workout-logger && flutter test test/coach_tool_service_test.dart` +Expected: FAIL — `sqlQuery` is not a recognized named parameter on `CoachToolService`. + +- [ ] **Step 3: Wire the tool** + +In `workout-logger/lib/services/ai/coach_tool_service.dart`: + +Add the import at the top, alongside the existing imports: + +```dart +import 'sql_query_service.dart'; +``` + +Change the class fields and constructor: + +```dart +class CoachToolService { + final WorkoutProvider _wp; + final PRManager _pr; + final HealthHistoryManager? _hh; + final SqlQueryService? _sql; + + CoachToolService( + this._wp, + this._pr, { + HealthHistoryManager? healthHistory, + SqlQueryService? sqlQuery, + }) : _hh = healthHistory, + _sql = sqlQuery; +``` + +In `buildTools()`, find the closing of the `functionDeclarations` list (right after the `get_sleeping_hr_analytics` declaration, before the final `]),` that closes the `Tool(...)`), and add the conditional entry: + +```dart + FunctionDeclaration( + 'get_sleeping_hr_analytics', + // ... (existing declaration body, unchanged) + ), + if (_sql != null) _runSqlQueryDeclaration, + ]), + ]; +``` + +Add this getter right after `buildTools()` (before `/// Dispatch a model function call...`): + +```dart + /// Schema-aware declaration for run_sql_query — only included when a + /// SqlQueryService is wired (i.e. the app has cut over to SQLite). + FunctionDeclaration get _runSqlQueryDeclaration => FunctionDeclaration( + 'run_sql_query', + 'Run a read-only SQL SELECT query directly against the workout database ' + 'for questions the other tools cannot answer (custom joins, filters, ' + 'or aggregations). Tables:\n' + 'sessions(id, date, routine_id, duration_min, notes, hc_synced_at)\n' + 'exercise_logs(id, session_id, exercise_id, notes, handle)\n' + 'sets(id, exercise_log_id, weight, reps, is_dropset, drops_json, ' + 'time_taken, timestamp, assist_weight, extra_weight, handle)\n' + 'exercises(id, name, category, is_custom, available_handles) — custom ' + 'exercises only; built-ins are not stored here\n' + 'muscle_groups(id, name, growth_rate, last_updated)\n' + 'exercise_muscle_activations(exercise_id, muscle_group_id, activation_percentage)\n' + 'routines(id, name, created_at)\n' + 'routine_exercises(routine_id, exercise_id, position)\n' + 'targets(id, exercise_id, target_type, target_value, current_value, ' + 'estimated_completion_date, created_at, is_completed)\n' + 'personal_records(exercise_id, best_weight, best_reps, best_volume, achieved_at)\n' + 'Only SELECT/WITH statements are allowed, one statement per call.', + Schema.object( + properties: { + 'query': Schema.string( + description: 'A single read-only SQL SELECT statement.', + ), + 'limit': Schema.integer( + description: 'Optional. Max rows to return (default 200, max 500).', + nullable: true, + ), + }, + requiredProperties: ['query'], + ), + ); +``` + +In `handleCall()`, add a case to the `switch (call.name)`: + +```dart + case 'run_sql_query': + final sql = _sql; + if (sql == null) return {'error': 'SQL query tool is not available.'}; + return await sql.runQuery( + (call.args['query'] as String?) ?? '', + limit: (call.args['limit'] as num?)?.toInt(), + ); +``` + +- [ ] **Step 4: Run test to verify it passes** + +Run: `cd workout-logger && flutter test test/coach_tool_service_test.dart` +Expected: PASS (all existing tests plus the two new `run_sql_query` tests). + +- [ ] **Step 5: Re-verify `main.dart` now compiles end-to-end** + +Run: `cd workout-logger && flutter analyze lib/main.dart lib/services/ai/coach_tool_service.dart` +Expected: no errors — this closes the loop left open at the end of Task 9 Step 6. + +- [ ] **Step 6: Commit** + +```bash +git add workout-logger/lib/services/ai/coach_tool_service.dart workout-logger/test/coach_tool_service_test.dart +git commit -m "feat: wire run_sql_query tool into CoachToolService" +``` + +--- + +### Task 12: Full verification + +**Files:** none (verification only). + +- [ ] **Step 1: Static analysis across the whole project** + +Run: `cd workout-logger && flutter analyze` +Expected: no errors introduced by this plan's changes (pre-existing warnings, if any, are out of scope). + +- [ ] **Step 2: Full test suite** + +Run: `cd workout-logger && flutter test` +Expected: all tests pass, including every test added in Tasks 2–11 plus the full pre-existing suite (managers, providers, screens — all unaffected since they depend on `IStorageService`/`MockStorageService`, never a concrete backend). + +- [ ] **Step 3: Manual smoke test — fresh install path** + +Run: `cd workout-logger && flutter run` (with no existing app data, e.g. a fresh emulator or `flutter clean` + reinstall). +Expected: app launches normally, `storage_migrated_v1` gets set on first launch (no prior Hive data to migrate, so migration is instant), Coach chat still works, and asking the Coach a question that needs `run_sql_query` (e.g. "what's the total volume for each exercise this month, sorted highest to lowest?") produces a sensible answer — confirms the tool is both advertised and functional against real live data. + +- [ ] **Step 4: Manual smoke test — upgrade path (if a build with existing Hive data is available)** + +Install a version prior to this change, log a few workouts, then install this branch's build over it. +Expected: app launches normally, prior workout history is visible (now served from SQLite), and re-launching the app a second time does not re-run the migration (check via logs — `_resolveStorageBackend` should hit the `alreadyMigrated` branch and skip straight to opening `SqliteStorageService`). + +- [ ] **Step 5: Commit (if any fixups were needed)** + +```bash +git add -A +git commit -m "chore: fix issues found during full verification of SQLite migration" +``` + +(Skip this step if Steps 1–4 all passed cleanly with no changes needed.) diff --git a/docs/superpowers/plans/2026-08-11-health-data-sync-and-coach-sql.md b/docs/superpowers/plans/2026-08-11-health-data-sync-and-coach-sql.md new file mode 100644 index 0000000..5d9e210 --- /dev/null +++ b/docs/superpowers/plans/2026-08-11-health-data-sync-and-coach-sql.md @@ -0,0 +1,1032 @@ +# Health Data Sync (Sleep + HR) into SQLite — Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Persist sleep and heart-rate data from Health Connect into new SQLite tables so the AI coach's `run_sql_query` tool can join workout data against health data in a single query. + +**Architecture:** A new `HealthDataSyncService` reads from the existing `IHealthConnectService` abstraction and writes into three new tables via new methods added directly on `SqliteStorageService` (not on `IStorageService` — this data has no manager/provider consumer, matching how `SqlQueryService` already bypasses that interface). Sync runs once per app launch (throttled 30 min) plus on-demand via a "Sync now" button on the Profile screen. `run_sql_query`'s embedded schema description is extended with the new tables. + +**Tech Stack:** Flutter/Dart, `sqflite` (already a dependency), `sqflite_common_ffi` (test-only, already a dev dependency), `provider`. + +## Global Constraints + +- No new pubspec dependencies. +- No changes to `IStorageService`'s method signatures, `MockStorageService`, or any manager/provider — the new tables and methods are additive on `SqliteStorageService` only. +- 90-day backfill window on first sync per stream; subsequent syncs re-fetch from `watermark - 3 days` (look-back for late corrections). +- 30-minute throttle between non-forced syncs; manual "Sync now" always forces. +- Health sync is only constructed/run when the active backend is `SqliteStorageService` (guarded like `SqlQueryService` already is in `main.dart`). +- The existing live `get_health_metrics` coach tool is untouched. +- Timestamps are stored as ISO8601 strings, matching every other table in this schema. + +Reference spec: `docs/superpowers/specs/2026-08-11-health-data-sync-and-coach-sql-design.md`. + +--- + +### Task 1: Schema + upsert methods on `SqliteStorageService` + +**Files:** +- Modify: `workout-logger/lib/services/sqlite_storage_service.dart` +- Test: `workout-logger/test/sqlite_storage_service_test.dart` + +**Interfaces:** +- Produces (used by Task 2): `SqliteStorageService.upsertHealthSamples(String type, List samples) -> Future`, `SqliteStorageService.upsertSleepSessions(List periods) -> Future`, and the existing `getSetting`/`saveSetting` (unchanged, already public) used for sync watermarks. +- Produces (used by Task 5): tables `health_samples(id, type, timestamp, value)`, `sleep_sessions(id, start_ts, end_ts, light_min, deep_min, rem_min, awake_min)`, `sleep_stage_intervals(sleep_session_id, start_ts, end_ts, stage)`. +- Consumes: `HealthSample { DateTime time, double value }` and `SleepPeriod { DateTime start, end; int? lightMinutes, deepMinutes, remMinutes, awakeMinutes; List stageTimeline }` / `SleepStageInterval { DateTime start, end; String stage }` — all already defined in `lib/models/models.dart`. + +- [ ] **Step 1: Write the failing tests** + +Add `import 'dart:io';` to the top of `workout-logger/test/sqlite_storage_service_test.dart` (alongside the existing `dart:convert` import), and add this helper + these three tests anywhere inside `main()` (e.g. right after the existing `group('SqliteStorageService — init', ...)` block): + +```dart + Future>> rawQuery( + SqliteStorageService s, + String sql, [ + List? args, + ]) async { + final db = await openReadOnlyDatabase(s.databasePath, singleInstance: false); + final rows = await db.rawQuery(sql, args); + await db.close(); + return rows; + } + + group('SqliteStorageService — health data', () { + test('upsertHealthSamples replaces duplicates on (type, timestamp)', () async { + final t = DateTime(2026, 8, 10, 22, 30); + await storage.upsertHealthSamples('heart_rate', [HealthSample(time: t, value: 60)]); + await storage.upsertHealthSamples('heart_rate', [HealthSample(time: t, value: 65)]); + + final rows = await rawQuery( + storage, + "SELECT value FROM health_samples WHERE type = 'heart_rate'", + ); + expect(rows.length, 1); + expect(rows.first['value'], 65.0); + }); + + test('upsertSleepSessions replaces stage intervals for a re-synced session', () async { + final start = DateTime(2026, 8, 10, 23); + final end = DateTime(2026, 8, 11, 7); + + await storage.upsertSleepSessions([ + SleepPeriod( + start: start, + end: end, + lightMinutes: 200, + deepMinutes: 60, + remMinutes: 100, + awakeMinutes: 10, + stageTimeline: [ + SleepStageInterval(start: start, end: start.add(const Duration(hours: 1)), stage: 'light'), + ], + ), + ]); + + await storage.upsertSleepSessions([ + SleepPeriod( + start: start, + end: end, + lightMinutes: 190, + deepMinutes: 70, + remMinutes: 100, + awakeMinutes: 10, + stageTimeline: [ + SleepStageInterval(start: start, end: start.add(const Duration(hours: 2)), stage: 'deep'), + ], + ), + ]); + + final sessions = await rawQuery(storage, 'SELECT id, deep_min FROM sleep_sessions'); + expect(sessions.length, 1); + expect(sessions.first['deep_min'], 70); + + final intervals = await rawQuery( + storage, + 'SELECT stage FROM sleep_stage_intervals WHERE sleep_session_id = ?', + [sessions.first['id']], + ); + expect(intervals.length, 1); + expect(intervals.first['stage'], 'deep'); + }); + }); + + group('SqliteStorageService — schema upgrade', () { + test('onUpgrade adds health tables to a pre-existing v1 database', () async { + final path = + '${Directory.systemTemp.path}/sqlite_v1_upgrade_${DateTime.now().microsecondsSinceEpoch}.db'; + final v1 = await openDatabase( + path, + version: 1, + onCreate: (db, v) async { + await db.execute('''CREATE TABLE muscle_groups ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + growth_rate REAL NOT NULL DEFAULT 0, + last_updated TEXT NOT NULL + )'''); + }, + ); + await v1.close(); + + final upgraded = SqliteStorageService(databasePathOverride: path); + await upgraded.init(); + + final tableRows = await rawQuery( + upgraded, + "SELECT name FROM sqlite_master WHERE type = 'table'", + ); + final names = tableRows.map((r) => r['name'] as String).toSet(); + expect(names, containsAll(['health_samples', 'sleep_sessions', 'sleep_stage_intervals'])); + + await File(path).delete(); + }); + }); +``` + +- [ ] **Step 2: Run tests to verify they fail** + +Run: `flutter test test/sqlite_storage_service_test.dart` (from `workout-logger/`) +Expected: FAIL — `upsertHealthSamples`/`upsertSleepSessions` are not defined on `SqliteStorageService`, and the upgrade test fails because `health_samples` etc. don't exist yet. + +- [ ] **Step 3: Implement the schema + upsert methods** + +In `workout-logger/lib/services/sqlite_storage_service.dart`: + +Change the version constant: + +```dart + static const int _dbVersion = 2; +``` + +Add a new const list right above `_schemaStatements`, and spread it into `_schemaStatements`'s closing entries (immediately after the existing `'CREATE INDEX idx_sessions_date ON sessions(date)',` line): + +```dart + /// Added in schema v2 (health sync). Kept separate from the rest of + /// [_schemaStatements] so `onUpgrade` can run exactly these statements + /// against pre-v2 databases without re-running the full v1 DDL. + static const List _healthSchemaStatements = [ + '''CREATE TABLE health_samples ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + type TEXT NOT NULL, + timestamp TEXT NOT NULL, + value REAL NOT NULL + )''', + 'CREATE UNIQUE INDEX idx_health_samples_unique ON health_samples(type, timestamp)', + 'CREATE INDEX idx_health_samples_type_ts ON health_samples(type, timestamp)', + '''CREATE TABLE sleep_sessions ( + id TEXT PRIMARY KEY, + start_ts TEXT NOT NULL, + end_ts TEXT NOT NULL, + light_min INTEGER, + deep_min INTEGER, + rem_min INTEGER, + awake_min INTEGER + )''', + 'CREATE INDEX idx_sleep_sessions_start ON sleep_sessions(start_ts)', + '''CREATE TABLE sleep_stage_intervals ( + sleep_session_id TEXT NOT NULL, + start_ts TEXT NOT NULL, + end_ts TEXT NOT NULL, + stage TEXT NOT NULL + )''', + 'CREATE INDEX idx_sleep_stage_session ON sleep_stage_intervals(sleep_session_id)', + ]; + + static const List _schemaStatements = [ + // ...existing statements unchanged... + 'CREATE INDEX idx_sessions_date ON sessions(date)', + ..._healthSchemaStatements, + ]; +``` + +Update the `openDatabase` call inside `init()` to add `onUpgrade`: + +```dart + _db = await openDatabase( + dbPath, + version: _dbVersion, + onCreate: (db, version) async { + for (final statement in _schemaStatements) { + await db.execute(statement); + } + }, + onUpgrade: (db, oldVersion, newVersion) async { + if (oldVersion < 2) { + for (final statement in _healthSchemaStatements) { + await db.execute(statement); + } + } + }, + ); +``` + +Add a new section right after `// ==================== STATS ====================` and its method (before `// ==================== EXPORT / IMPORT ====================`): + +```dart + // ==================== HEALTH DATA (coach SQL joins only) ==================== + // Written by HealthDataSyncService; never read through IStorageService — + // consumed only via the coach's run_sql_query tool. See + // docs/superpowers/specs/2026-08-11-health-data-sync-and-coach-sql-design.md. + + Future upsertHealthSamples(String type, List samples) async { + if (samples.isEmpty) return; + final batch = _db.batch(); + for (final s in samples) { + batch.insert( + 'health_samples', + { + 'type': type, + 'timestamp': s.time.toIso8601String(), + 'value': s.value, + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + } + await batch.commit(noResult: true); + } + + Future upsertSleepSessions(List periods) async { + if (periods.isEmpty) return; + await _db.transaction((txn) async { + for (final p in periods) { + final id = p.start.toIso8601String(); + await txn.delete( + 'sleep_stage_intervals', + where: 'sleep_session_id = ?', + whereArgs: [id], + ); + await txn.insert( + 'sleep_sessions', + { + 'id': id, + 'start_ts': p.start.toIso8601String(), + 'end_ts': p.end.toIso8601String(), + 'light_min': p.lightMinutes, + 'deep_min': p.deepMinutes, + 'rem_min': p.remMinutes, + 'awake_min': p.awakeMinutes, + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + for (final seg in p.stageTimeline) { + await txn.insert('sleep_stage_intervals', { + 'sleep_session_id': id, + 'start_ts': seg.start.toIso8601String(), + 'end_ts': seg.end.toIso8601String(), + 'stage': seg.stage, + }); + } + } + }); + } +``` + +- [ ] **Step 4: Run tests to verify they pass** + +Run: `flutter test test/sqlite_storage_service_test.dart` +Expected: PASS (all tests, including the pre-existing ones in this file). + +- [ ] **Step 5: Commit** + +```bash +git add lib/services/sqlite_storage_service.dart test/sqlite_storage_service_test.dart +git commit -m "feat: add health_samples/sleep_sessions tables + upsert methods to SqliteStorageService" +``` + +--- + +### Task 2: `HealthDataSyncService` + +**Files:** +- Create: `workout-logger/lib/services/health_data_sync_service.dart` +- Test: Create `workout-logger/test/health_data_sync_service_test.dart` + +**Interfaces:** +- Consumes (from Task 1): `SqliteStorageService.upsertHealthSamples`, `SqliteStorageService.upsertSleepSessions`, `SqliteStorageService.getSetting`/`saveSetting`, `SqliteStorageService.databasePath`. +- Consumes (existing): `IHealthConnectService.readSleepSessions(DateTime, DateTime) -> Future>`, `.readHeartRateSamples(DateTime, DateTime) -> Future>`, `.readRestingHeartRate(DateTime, DateTime) -> Future>`, `.readHrvRmssd(DateTime, DateTime) -> Future>` (all in `lib/services/interfaces/health_connect_service_interface.dart`). +- Produces (used by Task 3 and Task 4): `HealthDataSyncService(IHealthConnectService hc, SqliteStorageService storage, {DateTime Function()? now})` with method `Future sync({bool force = false})`. + +- [ ] **Step 1: Write the failing tests** + +Create `workout-logger/test/health_data_sync_service_test.dart`: + +```dart +import 'dart:io'; + +import 'package:flutter_test/flutter_test.dart'; +import 'package:sqflite_common_ffi/sqflite_ffi.dart'; + +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/health_data_sync_service.dart'; +import 'package:repforge/services/interfaces/health_connect_service_interface.dart'; +import 'package:repforge/services/sqlite_storage_service.dart'; + +class _RecordingHcService implements IHealthConnectService { + final List<({String method, DateTime from, DateTime to})> calls = []; + List heartRateSamples = const []; + List restingHrSamples = const []; + bool throwOnHeartRate = false; + + @override + Future> readSleepSessions(DateTime start, DateTime end) async { + calls.add((method: 'sleep', from: start, to: end)); + return const []; + } + + @override + Future> readHeartRateSamples(DateTime start, DateTime end) async { + calls.add((method: 'heart_rate', from: start, to: end)); + if (throwOnHeartRate) throw Exception('boom'); + return heartRateSamples; + } + + @override + Future> readRestingHeartRate(DateTime start, DateTime end) async { + calls.add((method: 'resting_heart_rate', from: start, to: end)); + return restingHrSamples; + } + + @override + Future> readHrvRmssd(DateTime start, DateTime end) async { + calls.add((method: 'hrv_rmssd', from: start, to: end)); + return const []; + } + + @override + Future> grantedReadTypes() async => HealthReadType.values.toSet(); + @override + Future isAvailable() async => true; + @override + Future requestPermissions() async => true; + @override + Future hasPermissions() async => true; + @override + Future requestReadPermissions() async => true; + @override + Future syncWorkoutSession(WorkoutSession session, {String? title}) async => true; +} + +Future>> _rawQuery( + SqliteStorageService s, + String sql, [ + List? args, +]) async { + final db = await openReadOnlyDatabase(s.databasePath, singleInstance: false); + final rows = await db.rawQuery(sql, args); + await db.close(); + return rows; +} + +void main() { + late SqliteStorageService storage; + late _RecordingHcService hc; + + setUpAll(() { + sqfliteFfiInit(); + databaseFactory = databaseFactoryFfi; + }); + + setUp(() async { + storage = SqliteStorageService(databasePathOverride: inMemoryDatabasePath); + await storage.init(); + hc = _RecordingHcService(); + }); + + test('first sync backfills 90 days plus the 3-day lookback', () async { + final now = DateTime(2026, 8, 11, 9); + final service = HealthDataSyncService(hc, storage, now: () => now); + + await service.sync(); + + final sleepCall = hc.calls.firstWhere((c) => c.method == 'sleep'); + expect(sleepCall.to, now); + expect(sleepCall.from, now.subtract(const Duration(days: 93))); + }); + + test('second sync only re-fetches from watermark minus the 3-day lookback', () async { + final firstRun = DateTime(2026, 8, 1, 9); + final secondRun = DateTime(2026, 8, 11, 9); + var current = firstRun; + final service = HealthDataSyncService(hc, storage, now: () => current); + + await service.sync(force: true); + hc.calls.clear(); + current = secondRun; + await service.sync(force: true); + + final sleepCall = hc.calls.firstWhere((c) => c.method == 'sleep'); + expect(sleepCall.from, firstRun.subtract(const Duration(days: 3))); + expect(sleepCall.to, secondRun); + }); + + test('a sync within the 30-minute throttle window is skipped unless forced', () async { + final firstRun = DateTime(2026, 8, 11, 9, 0); + final soonAfter = DateTime(2026, 8, 11, 9, 10); + var current = firstRun; + final service = HealthDataSyncService(hc, storage, now: () => current); + + await service.sync(); + hc.calls.clear(); + current = soonAfter; + await service.sync(); + + expect(hc.calls, isEmpty); + }); + + test('force:true bypasses the throttle', () async { + final firstRun = DateTime(2026, 8, 11, 9, 0); + final soonAfter = DateTime(2026, 8, 11, 9, 10); + var current = firstRun; + final service = HealthDataSyncService(hc, storage, now: () => current); + + await service.sync(); + hc.calls.clear(); + current = soonAfter; + await service.sync(force: true); + + expect(hc.calls, isNotEmpty); + }); + + test('re-syncing the same sample does not duplicate rows', () async { + final now = DateTime(2026, 8, 11, 9); + hc.heartRateSamples = [HealthSample(time: DateTime(2026, 8, 10, 22), value: 62)]; + final service = HealthDataSyncService(hc, storage, now: () => now); + + await service.sync(force: true); + await service.sync(force: true); + + final rows = await _rawQuery( + storage, + "SELECT COUNT(*) AS c FROM health_samples WHERE type = 'heart_rate'", + ); + expect(rows.first['c'], 1); + }); + + test('a stream that throws does not block the others and leaves its watermark untouched', () async { + final now = DateTime(2026, 8, 11, 9); + hc.throwOnHeartRate = true; + hc.restingHrSamples = [HealthSample(time: now, value: 55)]; + final service = HealthDataSyncService(hc, storage, now: () => now); + + await service.sync(force: true); + + expect(await storage.getSetting('health_sync.heart_rate'), isNull); + expect(await storage.getSetting('health_sync.resting_heart_rate'), now.toIso8601String()); + + final rows = await _rawQuery( + storage, + "SELECT COUNT(*) AS c FROM health_samples WHERE type = 'resting_heart_rate'", + ); + expect(rows.first['c'], 1); + }); +} +``` + +- [ ] **Step 2: Run tests to verify they fail** + +Run: `flutter test test/health_data_sync_service_test.dart` +Expected: FAIL — `package:repforge/services/health_data_sync_service.dart` doesn't exist yet. + +- [ ] **Step 3: Implement `HealthDataSyncService`** + +Create `workout-logger/lib/services/health_data_sync_service.dart`: + +```dart +// health_data_sync_service.dart — pulls sleep + heart-rate data from Health +// Connect into SqliteStorageService's health_samples/sleep_sessions tables +// so the coach's run_sql_query tool can join them against workout data. +// See docs/superpowers/specs/2026-08-11-health-data-sync-and-coach-sql-design.md. + +import 'interfaces/health_connect_service_interface.dart'; +import 'sqlite_storage_service.dart'; + +class HealthDataSyncService { + HealthDataSyncService(this._hc, this._storage, {DateTime Function()? now}) + : _now = now ?? DateTime.now; + + final IHealthConnectService _hc; + final SqliteStorageService _storage; + final DateTime Function() _now; + + static const Duration _backfillWindow = Duration(days: 90); + static const Duration _lookback = Duration(days: 3); + static const Duration _throttleWindow = Duration(minutes: 30); + + static const String _sleepWatermarkKey = 'health_sync.sleep'; + static const String _lastRunKey = 'health_sync.last_run'; + static const Map _sampleWatermarkKeys = { + 'heart_rate': 'health_sync.heart_rate', + 'resting_heart_rate': 'health_sync.resting_heart_rate', + 'hrv_rmssd': 'health_sync.hrv_rmssd', + }; + + /// Pulls any new sleep/HR data since the last sync into SQLite. Skipped if + /// the last sync ran under 30 minutes ago, unless [force] is true. Each of + /// the 4 underlying data streams fails independently and best-effort — + /// one stream throwing never blocks the others or this call. + Future sync({bool force = false}) async { + final now = _now(); + if (!force) { + final lastRunRaw = await _storage.getSetting(_lastRunKey); + final lastRun = lastRunRaw == null ? null : DateTime.tryParse(lastRunRaw); + if (lastRun != null && now.difference(lastRun) < _throttleWindow) return; + } + + await _syncSleep(now); + await _syncSamples('heart_rate', now, _hc.readHeartRateSamples); + await _syncSamples('resting_heart_rate', now, _hc.readRestingHeartRate); + await _syncSamples('hrv_rmssd', now, _hc.readHrvRmssd); + + await _storage.saveSetting(_lastRunKey, now.toIso8601String()); + } + + Future _windowStart(String watermarkKey, DateTime now) async { + final raw = await _storage.getSetting(watermarkKey); + final watermark = raw == null ? null : DateTime.tryParse(raw); + final base = watermark ?? now.subtract(_backfillWindow); + return base.subtract(_lookback); + } + + Future _syncSleep(DateTime now) async { + try { + final from = await _windowStart(_sleepWatermarkKey, now); + final periods = await _hc.readSleepSessions(from, now); + await _storage.upsertSleepSessions(periods); + await _storage.saveSetting(_sleepWatermarkKey, now.toIso8601String()); + } catch (_) { + // Best-effort; leave the watermark untouched so the next sync retries. + } + } + + Future _syncSamples( + String type, + DateTime now, + Future> Function(DateTime, DateTime) reader, + ) async { + final watermarkKey = _sampleWatermarkKeys[type]!; + try { + final from = await _windowStart(watermarkKey, now); + final samples = await reader(from, now); + await _storage.upsertHealthSamples(type, samples); + await _storage.saveSetting(watermarkKey, now.toIso8601String()); + } catch (_) { + // Best-effort; leave the watermark untouched so the next sync retries. + } + } +} +``` + +Note: `HealthSample` is used here only as a type annotation on the `reader` function parameter — it comes transitively from `interfaces/health_connect_service_interface.dart`, which imports `../../models/models.dart`. No separate models import is needed in this file. + +- [ ] **Step 4: Run tests to verify they pass** + +Run: `flutter test test/health_data_sync_service_test.dart` +Expected: PASS (all 6 tests). + +- [ ] **Step 5: Commit** + +```bash +git add lib/services/health_data_sync_service.dart test/health_data_sync_service_test.dart +git commit -m "feat: add HealthDataSyncService to pull sleep/HR data into SQLite" +``` + +--- + +### Task 3: Wire sync-on-launch into `main.dart` + +**Files:** +- Modify: `workout-logger/lib/main.dart` + +**Interfaces:** +- Consumes: `HealthDataSyncService(IHealthConnectService, SqliteStorageService, {DateTime Function()? now})` and `.sync({bool force})` from Task 2. + +- [ ] **Step 1: Add the import** + +In `workout-logger/lib/main.dart`, add near the other service imports (after `import 'services/health_connect_service.dart';`): + +```dart +import 'services/health_data_sync_service.dart'; +``` + +- [ ] **Step 2: Add the guarded static field** + +In `WorkoutLoggerApp`, add after the existing `_healthHistoryManager` field (`main.dart:131-132`): + +```dart + // Populates the SQLite health tables the coach's run_sql_query tool joins + // against workout data. Null under the pre-migration Hive fallback path — + // there's no live SQLite database file to sync into. Mirrors the + // sqlQuery ? ... : null guard used for CoachToolService below. + static final HealthDataSyncService? _healthDataSyncService = + _storageService is SqliteStorageService + ? HealthDataSyncService( + _healthConnectService, + _storageService as SqliteStorageService, + ) + : null; +``` + +- [ ] **Step 3: Provide it in the widget tree** + +In the `MultiProvider` `providers` list, add right after `Provider.value(value: _healthHistoryManager),` (`main.dart:164`): + +```dart + Provider.value(value: _healthDataSyncService), +``` + +- [ ] **Step 4: Trigger sync on app launch** + +In `_AppInitializerState._initializeApp()`, add `healthDataSync` to the synchronous provider-capture block at the top (alongside `readiness`): + +```dart + final readiness = context.read(); + final healthDataSync = context.read(); +``` + +Then, right after the existing `readiness.refresh();` fire-and-forget call, add: + +```dart + // Fire-and-forget: populates the SQLite tables run_sql_query joins + // against. No-op under the pre-migration Hive fallback (null there). + healthDataSync?.sync(); +``` + +- [ ] **Step 5: Verify with static analysis** + +Run: `flutter analyze` (from `workout-logger/`) +Expected: `No issues found!` + +- [ ] **Step 6: Commit** + +```bash +git add lib/main.dart +git commit -m "feat: sync health data into SQLite once per app launch" +``` + +--- + +### Task 4: "Sync now" button on the Profile screen + +**Files:** +- Modify: `workout-logger/lib/screens/widgets/profile_sections.dart` +- Modify: `workout-logger/lib/screens/profile_screen.dart` +- Modify: `workout-logger/test/test_utils/test_harness.dart` +- Test: Create `workout-logger/test/screens/widgets/profile_sections_health_sync_test.dart` + +**Interfaces:** +- Consumes: `HealthDataSyncService.sync({bool force})` from Task 2, provided via `Provider` from Task 3. +- Produces: `HealthConnectSection` gains two new required constructor params: `bool isHealthSyncLoading` and `VoidCallback? onHealthSyncNow`. + +- [ ] **Step 1: Write the failing widget tests** + +Create `workout-logger/test/screens/widgets/profile_sections_health_sync_test.dart`: + +```dart +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:repforge/screens/widgets/profile_sections.dart'; +import 'package:repforge/services/settings_provider.dart'; + +import '../../test_utils/mock_storage_service.dart'; + +void main() { + testWidgets('Sync now tile appears when readiness is enabled and invokes callback on tap', + (tester) async { + final settings = SettingsProvider(MockStorageService()); + await settings.init(); + await settings.setReadinessEnabled(true); + + var tapped = false; + await tester.pumpWidget(MaterialApp( + home: Scaffold( + body: HealthConnectSection( + settings: settings, + isLoading: false, + onToggle: (_) async {}, + isReadinessLoading: false, + onReadinessToggle: (_) async {}, + isHealthSyncLoading: false, + onHealthSyncNow: () => tapped = true, + ), + ), + )); + await tester.pumpAndSettle(); + + expect(find.text('Sync coach data now'), findsOneWidget); + await tester.tap(find.text('Sync coach data now')); + await tester.pump(); + + expect(tapped, isTrue); + }); + + testWidgets('Sync now tile is hidden when readiness is disabled', (tester) async { + final settings = SettingsProvider(MockStorageService()); + await settings.init(); + + await tester.pumpWidget(MaterialApp( + home: Scaffold( + body: HealthConnectSection( + settings: settings, + isLoading: false, + onToggle: (_) async {}, + isReadinessLoading: false, + onReadinessToggle: (_) async {}, + isHealthSyncLoading: false, + onHealthSyncNow: () {}, + ), + ), + )); + await tester.pumpAndSettle(); + + expect(find.text('Sync coach data now'), findsNothing); + }); +} +``` + +- [ ] **Step 2: Run tests to verify they fail** + +Run: `flutter test test/screens/widgets/profile_sections_health_sync_test.dart` +Expected: FAIL — `HealthConnectSection` has no `isHealthSyncLoading`/`onHealthSyncNow` parameters yet, and no "Sync coach data now" text exists. + +- [ ] **Step 3: Add the tile to `HealthConnectSection`** + +In `workout-logger/lib/screens/widgets/profile_sections.dart`, update the `HealthConnectSection` constructor (around line 234-248): + +```dart +class HealthConnectSection extends StatelessWidget { + const HealthConnectSection({ + super.key, + required this.settings, + required this.isLoading, + required this.onToggle, + required this.isReadinessLoading, + required this.onReadinessToggle, + required this.isHealthSyncLoading, + required this.onHealthSyncNow, + }); + + final SettingsProvider settings; + final bool isLoading; + final Future Function(bool) onToggle; + final bool isReadinessLoading; + final Future Function(bool) onReadinessToggle; + final bool isHealthSyncLoading; + final VoidCallback? onHealthSyncNow; +``` + +Then, inside `build()`, right after the closing `],\n ),` of the readiness `Row` (the block ending around line 346, immediately before the final `],\n ),\n );\n }\n}` that closes the outer `Column`/`_ProfileSection`), add: + +```dart + if (settings.readinessEnabled) ...[ + const SizedBox(height: AppSpacing.sm), + const Divider(color: AppColors.glassBorder, height: 1), + const SizedBox(height: AppSpacing.sm), + _ActionTile( + icon: Icons.sync_rounded, + iconColor: _hcColor, + title: 'Sync coach data now', + subtitle: "Pull recent sleep & heart rate into the coach's database", + loading: isHealthSyncLoading, + onTap: onHealthSyncNow, + ), + ], +``` + +(`_ActionTile` is already defined later in this same file and used by `DataManagementSection`.) + +- [ ] **Step 4: Wire it up in `ProfileScreen`** + +In `workout-logger/lib/screens/profile_screen.dart`, add an import and state field near the existing ones: + +```dart +import '../services/health_data_sync_service.dart'; +``` + +```dart + bool _isSyncingHealthData = false; +``` + +Add a handler method near `_requestReadinessPermission`: + +```dart + Future _syncHealthDataNow() async { + setState(() => _isSyncingHealthData = true); + try { + final sync = context.read(); + if (sync == null) { + _showSnack('Health data sync is not available.', AppColors.error); + return; + } + await sync.sync(force: true); + if (mounted) _showSnack('Coach data synced!', AppColors.success); + } catch (e) { + if (mounted) _showSnack('Sync failed. Try again later.', AppColors.error); + } finally { + if (mounted) setState(() => _isSyncingHealthData = false); + } + } +``` + +Update the `HealthConnectSection(...)` call in `build()` (around `profile_screen.dart:359-377`) to pass the two new params: + +```dart + HealthConnectSection( + settings: settings, + isLoading: _isRequestingHcPermission, + onToggle: (value) async { + if (value) { + await _requestHealthConnectPermission(); + } else { + await settings.setHealthConnectEnabled(false); + } + }, + isReadinessLoading: _isRequestingReadinessPermission, + onReadinessToggle: (value) async { + if (value) { + await _requestReadinessPermission(); + } else { + await settings.setReadinessEnabled(false); + } + }, + isHealthSyncLoading: _isSyncingHealthData, + onHealthSyncNow: _isSyncingHealthData ? null : _syncHealthDataNow, + ), +``` + +- [ ] **Step 5: Keep existing widget tests passing** + +`ProfileScreen` reads `HealthDataSyncService?` via `context.read`, and `TestHarness.wrap` (used by `test/screens/profile_screen_test.dart` and others) doesn't register that provider. Provider's nullable-type lookup returns `null` when no matching provider is registered, so this works without changes — but add it explicitly for clarity. In `workout-logger/test/test_utils/test_harness.dart`, add the import: + +```dart +import 'package:repforge/services/health_data_sync_service.dart'; +``` + +and add to the `providers` list (after `Provider.value(value: const StubHcService()),`): + +```dart + Provider.value(value: null), +``` + +- [ ] **Step 6: Run tests to verify they pass** + +Run: `flutter test test/screens/widgets/profile_sections_health_sync_test.dart test/screens/profile_screen_test.dart test/screens/profile_screen_full_test.dart test/userflow_health_and_profile_screen_test.dart` +Expected: PASS for all four files. + +- [ ] **Step 7: Commit** + +```bash +git add lib/screens/widgets/profile_sections.dart lib/screens/profile_screen.dart test/test_utils/test_harness.dart test/screens/widgets/profile_sections_health_sync_test.dart +git commit -m "feat: add manual 'Sync coach data now' action to Profile screen" +``` + +--- + +### Task 5: Extend `run_sql_query`'s schema for the coach + +**Files:** +- Modify: `workout-logger/lib/services/ai/coach_tool_service.dart` +- Test: Create `workout-logger/test/coach_tool_service_schema_test.dart` +- Test: Modify `workout-logger/test/sql_query_service_test.dart` + +**Interfaces:** +- Consumes: the `health_samples`, `sleep_sessions`, `sleep_stage_intervals` tables from Task 1. Consumes `CoachToolService.buildTools() -> List` (existing, public) and `FunctionDeclaration.name`/`.description` (public fields from the `google_generative_ai` package) to assert on the schema text. + +- [ ] **Step 1: Write the failing tests** + +Create `workout-logger/test/coach_tool_service_schema_test.dart`: + +```dart +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/services/ai/coach_tool_service.dart'; +import 'package:repforge/services/ai/sql_query_service.dart'; +import 'package:repforge/services/managers/pr_manager.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/workout_provider.dart'; + +import 'test_utils/mock_ml_service.dart'; +import 'test_utils/mock_storage_service.dart'; + +void main() { + test('run_sql_query schema description includes the new health tables', () { + final storage = MockStorageService(); + final wp = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + ); + final prm = PRManager(storage); + final tools = CoachToolService(wp, prm, sqlQuery: SqlQueryService('unused.db')); + + final decl = tools + .buildTools() + .single + .functionDeclarations! + .firstWhere((d) => d.name == 'run_sql_query'); + + expect(decl.description, contains('health_samples')); + expect(decl.description, contains('sleep_sessions')); + expect(decl.description, contains('sleep_stage_intervals')); + }); +} +``` + +This test fails before Step 3's edit (the current description has none of those table names) and passes after — it's the actual TDD-relevant assertion for this task, since the schema text is what the model reads and nothing else in the codebase asserts on it. + +Also add this regression test to `workout-logger/test/sql_query_service_test.dart`, inside `main()` (e.g. after the `'does not close the app\'s shared connection...'` test added previously), to confirm the join shape the coach will actually run works end-to-end once the tables exist: + +```dart + test('can join workouts against sleep and HR data', () async { + await seedDb.execute('''CREATE TABLE health_samples ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + type TEXT NOT NULL, + timestamp TEXT NOT NULL, + value REAL NOT NULL + )'''); + await seedDb.execute('''CREATE TABLE sleep_sessions ( + id TEXT PRIMARY KEY, + start_ts TEXT NOT NULL, + end_ts TEXT NOT NULL, + light_min INTEGER, + deep_min INTEGER, + rem_min INTEGER, + awake_min INTEGER + )'''); + await seedDb.insert('health_samples', { + 'type': 'resting_heart_rate', + 'timestamp': '2026-08-10T07:00:00.000', + 'value': 58.0, + }); + await seedDb.insert('sleep_sessions', { + 'id': '2026-08-09T23:00:00.000', + 'start_ts': '2026-08-09T23:00:00.000', + 'end_ts': '2026-08-10T07:00:00.000', + 'light_min': 200, + 'deep_min': 70, + 'rem_min': 90, + 'awake_min': 5, + }); + + final service = SqlQueryService(dbPath); + final result = await service.runQuery(''' + SELECT w.name AS widget_name, s.deep_min AS deep_min, h.value AS resting_hr + FROM widgets w, sleep_sessions s + JOIN health_samples h ON h.type = 'resting_heart_rate' + WHERE w.id = 1 + '''); + + expect(result['error'], isNull); + expect(result['row_count'], 1); + expect((result['rows'] as List).first, { + 'widget_name': 'foo', + 'deep_min': 70, + 'resting_hr': 58.0, + }); + }); +``` + +- [ ] **Step 2: Run tests to verify they fail/pass as expected** + +Run: `flutter test test/coach_tool_service_schema_test.dart` +Expected: FAIL — the current `run_sql_query` description doesn't mention `health_samples`, `sleep_sessions`, or `sleep_stage_intervals`. + +Run: `flutter test test/sql_query_service_test.dart --plain-name "can join workouts against sleep and HR data"` +Expected: PASS already — this test only exercises the query engine against tables it creates itself, not the schema description, so it isn't failing-first. It's included as regression coverage for the join shape the coach will actually run once Step 3 tells it these tables exist. + +- [ ] **Step 3: Extend the coach's schema description** + +In `workout-logger/lib/services/ai/coach_tool_service.dart`, in `_runSqlQueryDeclaration` (around line 391-393), insert the three new table lines right after the `personal_records(...)` line and before the `'When joining tables, ...'` line: + +```dart + 'personal_records(exercise_id, best_weight, best_reps, best_volume, achieved_at)\n' + 'health_samples(id, type, timestamp, value) — type is heart_rate | ' + 'resting_heart_rate | hrv_rmssd; one row per Health Connect sample\n' + 'sleep_sessions(id, start_ts, end_ts, light_min, deep_min, rem_min, ' + 'awake_min) — one row per night, id is the session start_ts\n' + 'sleep_stage_intervals(sleep_session_id, start_ts, end_ts, stage) — ' + 'stage is deep | rem | light | awake\n' + 'When joining tables, select explicit columns with aliases (e.g. s.id AS ' + 'session_id, l.id AS log_id) instead of SELECT *, since duplicate column ' + 'names across joined tables will silently collide.\n' + 'Only SELECT/WITH statements are allowed, one statement per call.', +``` + +(Delete the old `'When joining tables, ...'` and `'Only SELECT/WITH...'` lines from their original position — they're being replaced by the block above, unchanged in content but moved after the three new lines.) + +- [ ] **Step 4: Run tests to verify everything passes** + +Run: `flutter test test/sql_query_service_test.dart test/coach_tool_service_schema_test.dart` +Expected: PASS for both files. + +- [ ] **Step 5: Commit** + +```bash +git add lib/services/ai/coach_tool_service.dart test/sql_query_service_test.dart test/coach_tool_service_schema_test.dart +git commit -m "feat: teach run_sql_query about the new health_samples/sleep_sessions tables" +``` + +--- + +### Final Verification + +- [ ] Run the full test suite: `flutter test` (from `workout-logger/`). Expected: all tests PASS, no regressions. +- [ ] Run `flutter analyze`. Expected: `No issues found!` diff --git a/docs/superpowers/plans/2026-08-18-recommendation-engine-upgrade.md b/docs/superpowers/plans/2026-08-18-recommendation-engine-upgrade.md new file mode 100644 index 0000000..14d2c5e --- /dev/null +++ b/docs/superpowers/plans/2026-08-18-recommendation-engine-upgrade.md @@ -0,0 +1,205 @@ +# Recommendation Engine Upgrade Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Close the gap between what `MLService` can already compute and what actually reaches the user during a workout, then extend the model with the inputs it's currently blind to (readiness, effort, intra-session fatigue) — all estimated from data already collected, with **zero additional per-set user input** — without breaking the offline, zero-latency requirement of the in-workout recommendation card. Along the way, split `MLService`'s accumulated responsibilities to match this codebase's existing SOLID conventions (`managers/`, `strategies/`, `interfaces/`). + +**Non-goal:** Replacing the classical model with a cloud LLM call on the hot path. The recommendation must render synchronously while the user is mid-set with no network. An LLM-backed layer is scoped as an optional *secondary* explanation feature (Phase 6), not a replacement for the deterministic engine. + +**Product decisions locked in for this plan:** +- No manual per-set RPE picker — the user logs weight/reps only, same as today. Effort is *estimated*, never asked, per set. +- One optional once-per-workout question ("How did that session feel?" — 3 chips) is acceptable since it's asked once, not per set, and it's the only real calibration anchor the estimator has. +- Heart-rate data is optional and frequently absent (sync gaps) — every HR-dependent signal must degrade to a fully HR-less computation with no behavior change when HR is missing, never block or error. +- Flutter SDK is `3.44.8` (`workout-logger/pubspec.yaml:23`) — `CLAUDE.md`'s "3.41.5" is stale; no action needed here, just don't trust that doc for the SDK version. + +--- + +## Audit findings (why each task exists) + +Confirmed by reading `lib/services/ml_service.dart`, `lib/services/workout_provider.dart`, `lib/services/managers/analytics_manager.dart`, `lib/services/managers/readiness_manager.dart`, `lib/services/utils/readiness_calculator.dart`, `lib/services/ai/coach_tool_service.dart`, and `lib/models/models.dart`: + +1. **Recovery-aware branch is dead code in production.** `MLService.recommendSets()` has a fully-implemented "under-recovered primary muscle → hold, don't progress" path (`ml_service.dart:433-476`), gated on `recoveryScores` + `primaryMuscleIds` params. **Neither live caller passes them** — not `WorkoutProvider.getRecommendations` (`workout_provider.dart:666`, the one the workout screen actually uses) nor `AnalyticsManager.getRecommendations` (`analytics_manager.dart:135`). +2. **No intra-session fatigue.** Zero awareness of what the user already did *earlier in today's session*. Deload/plateau detection only looks at day-to-day history of the *same* exercise. +3. **Readiness (sleep/RHR/HRV) is display-only.** `ReadinessManager`/`ReadinessCalculator` compute a real 0–100 score, cached and shown on `readiness_card.dart`, never read by `MLService`. +4. **No effort signal at all**, estimated or otherwise. `WorkoutSet` has no RPE-like field; the model can't tell an easy top set from a grinder. +5. **Per-exercise, not program-aware.** Each exercise's recommendation is computed in isolation. +6. **Two call sites, diverging behavior.** `WorkoutProvider.getRecommendations` passes `pastSessions` (deload detection works there) but not recovery data. `AnalyticsManager.getRecommendations` passes neither (deload detection dead there too). Every future param has to be added in both places or they drift further. +7. **`MLService` violates SRP.** One 640-line class does curve-fitting math, recovery scoring, recommendation heuristics, and target-date prediction — unlike the rest of the codebase's `managers/`/`strategies/`/`interfaces/` split. +8. **A second "brain" already exists and is underused.** The Gemini-backed AI Coach (`coach_tool_service.dart`) already has tool-calling access to muscle recovery, targets, and history, but it's a separate on-demand chat feature, not wired into the automatic per-set card. + +--- + +## Global Constraints + +- Flutter SDK `3.44.8`. All commands run from `workout-logger/`. +- `flutter analyze` reports 0 issues at the end of every task. +- The in-workout recommendation call (`WorkoutProvider.getRecommendations`) stays **synchronous and offline** — no `await`, no network, no fresh Health Connect reads. Anything needing I/O (readiness, HR) must already be cached in memory before the card renders, exactly as `ReadinessManager` caches its snapshot today. +- Preserve `IMLService`'s role as the stable facade every call site depends on — see Phase 2's "keep the facade" decision. `MockMLService` (`test/test_utils/mock_ml_service.dart`) and Mockito-generated mocks must be updated in lockstep with any interface signature change (`dart run build_runner build --delete-conflicting-outputs`). +- No behavior change ships without a test in `test/ml_service_test.dart` (or a new file) demonstrating the new branch fires and every existing branch's output is byte-identical to before. +- New tunable constants (thresholds, caps) go in as named `static const` near the existing ones (e.g. `_plateauWeeklyPct` in `ml_service.dart:341`), never as magic numbers inline. +- Commit after every task. Conventional commit prefixes (`feat:`, `fix:`, `test:`, `refactor:`). + +--- + +## Phase 1 — Wire up what already exists (ship first, independent of everything else) + +Pure bug fix: connect signals that are already computed but discarded. No new logic. + +- [x] **1.1** Add `recoveryScores` + `primaryMuscleIds` to the call in `WorkoutProvider.getRecommendations` (`workout_provider.dart:666`). Source: `computeMuscleRecoveryScores(_sessions, exerciseMap)` (already used at `workout_provider.dart:1053`) + `Exercise.primaryMuscle` (the existing single-highest-activation getter, reused as-is rather than inventing a new "≥50%" threshold not used elsewhere in the codebase). +- [x] **1.2** Did the same for `AnalyticsManager.getRecommendations` (`analytics_manager.dart:135`), plus `pastSessions` (was missing — its deload detection was dead too). Note: `AnalyticsManager` currently has **zero live callers** anywhere in the app (verified — not wired into `main.dart` or any screen); this fix is precautionary/for whenever it's wired up, not a live-bug fix like 1.1. Signature follows the existing `exercises`/`exerciseMap` optional-param convention already used by `getWeeklyVolumeByMuscle` in the same file, so old 2-arg call sites stay valid. +- [x] **1.3** Tests added: `workout_provider_test.dart` ("holds load when the primary muscle is still under-recovered...", exercised through `WorkoutProvider`, not `MLService` directly — the test that would've caught the original gap) and two in `analytics_manager_test.dart` (params reach the mock when exercise data is supplied; omitted when it isn't, for backward compatibility). `MockMLService` extended with `lastPastSessions`/`lastRecoveryScores`/`lastPrimaryMuscleIds` tracking fields. +- [x] **1.4** `flutter analyze` clean (5 files), `flutter test` green (103/103, including the 3 new tests). Not committed — awaiting the user's go-ahead per this repo's "only commit when explicitly asked" policy. + +## Phase 2 — MLService refactor into SOLID collaborators + +**Decision:** keep `IMLService` as a stable facade; split the *implementation* into four collaborators, so DI wiring (`main.dart`) and every call site are untouched while the internals become testable independently. Land this **before** Phases 3–5 so the new signals arrive as additive rules, not more edits to a 70-line if/else. + +| New file | Owns | Moved from | +|---|---|---| +| `lib/services/strategies/growth_curve_fitter.dart` (`IGrowthCurveFitter`) | WLS fit, Tukey re-weighting, linear/log selection, `predictTargetCompletion`/`predictTargetWithConfidence` (prediction is the curve's inverse — belongs with the fit) | `ml_service.dart:17-216, 545-621` | +| `lib/services/utils/recovery_calculator.dart` (`const RecoveryCalculator()`) | `_tauHours`, `computeMuscleRecoveryScores`, shared `muscleVolumes` helper | `ml_service.dart:34-53, 269-334` | +| `lib/services/utils/effort_estimator.dart` | Estimated-RPE logic — see Phase 3 | new | +| `lib/services/strategies/progression_rules.dart` | `ProgressionRule.apply(ProgressionContext) → SetRecommendation?` (null = "not mine, try next") + an ordered `ProgressionRuleChain`, registry shaped like `TargetCalculatorFactory` (`target_calculator.dart:88-125`) with a `reset()` for test isolation | `ml_service.dart:459-529` | + +Recovery goes in `utils/`, not `managers/` — managers in this repo are `ChangeNotifier` state owners (`managers.dart`); recovery scoring is stateless and pure, same shape as `ReadinessCalculator`. + +`MLService` shrinks to ~120 lines of delegation, collaborators injected as optional constructor params defaulting to concretes (the same idiom `WorkoutProvider(..., IMLService? mlService)` already uses at `workout_provider.dart:91-94`). `extractExerciseDataPoints`/`extractMuscleDataPoints` stay put (thin model→`DataPoint` adapters). `trainGrowthModelStatic` (`ml_service.dart:65`) has no external callers — delete it, don't migrate it. + +Call-site convergence for the Phase 1 fix and future params: one shared parameter-assembly function in `lib/services/utils/exercise_history.dart` (already imported by `AnalyticsManager`), so `WorkoutProvider.getRecommendations` and `AnalyticsManager.getRecommendations` can no longer drift apart (audit item 6). + +- [x] **2.1** Extracted `GrowthCurveFitter` + `IGrowthCurveFitter` into `lib/services/strategies/growth_curve_fitter.dart`; `MLService` delegates via an injected `_curveFitter`. Deleted `trainGrowthModelStatic`. `predictTargetWithConfidence` moved to `GrowthCurveFitter.predictTargetWithConfidence` (static) — the one test call site (`ml_service_test.dart`) updated to match. `MLService`/`IGrowthCurveFitter`/`GrowthCurveFitter` re-exported from `ml_service.dart` so existing `import 'ml_service.dart'` call sites needed no changes. +- [x] **2.2** Extracted `RecoveryCalculator` (incl. public `muscleVolumes`, reusable by Phase 5's fatigue accumulator) into `lib/services/utils/recovery_calculator.dart`; `MLService` delegates via an injected `_recoveryCalculator`. +- [x] **2.3** Introduced `ProgressionContext` + `ProgressionRule` + `ProgressionRuleFactory` in `lib/services/strategies/progression_rules.dart`; ported all five branches (under-recovered, post-deload, decline, plateau, double-progression) verbatim as `UnderRecoveredRule`/`PostDeloadRecoveryRule`/`DeclineDeloadRule`/`PlateauRule`/`DoubleProgressionRule`. `MLService.recommendSets` now builds a `ProgressionContext` and calls `ProgressionRuleFactory.apply`. +- [x] **2.4** Added `ProgressionRuleFactory.reset()` + `registerRuleAtHead()`; new `test/progression_rules_test.dart` (15 tests) covers every rule in isolation plus chain ordering, override, and reset — mirroring `target_calculator_test.dart`'s pattern. +- [x] **2.5** Added `recoveryRecommendationInputs()` to `lib/services/utils/exercise_history.dart`; both `WorkoutProvider.getRecommendations` and `AnalyticsManager.getRecommendations` now call it instead of duplicating the recovery-score/primary-muscle assembly, so they can't drift apart again. + +**Verification:** whole-project `flutter analyze` clean; full `flutter test` run is 963/964 green — the 1 failure (`readiness_manager_test.dart`, an HR-fallback test) reproduces only in the full-suite run and passes standalone, and touches no file this refactor changed (confirmed unrelated pre-existing flakiness, not investigated further as out of scope). All pre-existing `ml_service_test.dart`/`workout_provider_test.dart`/`analytics_manager_test.dart`/`target_calculator_test.dart` assertions pass unmodified except the one `predictTargetWithConfidence` call-site rename noted in 2.1 — confirming the refactor is behavior-preserving. Not committed (repo policy: commit only on explicit request). + +## Phase 3 — Estimated effort (RPE), no per-set input + +**Decision:** a pure `EffortEstimator` (`lib/services/utils/effort_estimator.dart`, `const`-constructible, injected like `ReadinessCalculator` into `ReadinessManager`) producing a continuous **0–10 estimated RPE plus an explicit source + confidence** — never a bare number, so a future real RPE picker is a drop-in `EffortSource.userReported, confidence: 1.0` with zero call-site churn. + +New model in `lib/models/models.dart` near `SetRecommendation` (`models.dart:469`): `EffortEstimate { double rpe; EffortSource source; double confidence; }`, `enum EffortSource { userReported, estimatedWithHr, estimatedHrless }`. + +Anchor at RPE 8 (double progression already assumes near-failure working sets), four additive terms, all using data already logged today: + +1. **Trend deviation** — `z = (actualVolume − growthModel.predict(x)) / max(stdError, 0.05·predict(x))`, gated on `r2 > 0.2` (reuses `_minR2ForTrendSignal`, `ml_service.dart:343`). Term `−0.8·clamp(z, −2, 2)`. +2. **Intra-session decline** — volume ratio of last set vs. first set of the same exercise this session (via `WorkoutSet.volume`, not rep count, so it absorbs dropsets/assisted-weight sets correctly). Deadband ≤5%. Term `+3.0·clamp(declineFrac − 0.05, 0, 0.5)`. +3. **Rest/tempo (free, already logged, currently unused)** — `WorkoutSet.timestamp` (`models.dart:134`) gives inter-set gaps, `timeTaken` (`models.dart:133`) gives per-set duration. Longer-than-usual gaps or slower-than-usual reps vs. this exercise's own history both push RPE up. +4. **HR — optional, additive only.** Only used if Health Connect returns ≥3 samples inside the set window; normalized *within the session* (`hrFrac = (setPeak − sessionFloor)/(sessionPeak − sessionFloor)`). Absent → term 0, confidence unaffected downward, never blocks the estimate. + +`rpe = clamp(8.0 + calibrationOffset + Σterms, 5.0, 10.0)`. + +**Confidence:** base 0.35, +0.20 trend gate passed, +0.20 if ≥3 sets logged, +0.15 if HR term fired, +0.10 if ≥6 sessions history — **capped at 0.85** (real user-reported RPE, if ever added, is the only thing that reaches 1.0). Consumers may only let effort change a *branch* at `confidence ≥ 0.6`; below that it only enriches `SetRecommendation.reasoning` text. + +**Once-per-workout chip (Easy / Solid / Brutal) — include it.** It's the only real calibration signal available: rolling `calibrationOffset = mean(chipValue − estimatedSessionMeanRpe)` over the last 10 answered sessions (Easy→6.5, Solid→8, Brutal→9.5), clamped ±1.0. Store as nullable `WorkoutSession.sessionEffort` (int 1–3) — nullable means no Hive migration, and skipping it is a first-class path with `calibrationOffset = 0`. + +- [x] **3.1** Added `EffortEstimate`/`EffortSource` to `models.dart` (next to `SetRecommendation`); added nullable `WorkoutSession.sessionEffort` with `toJson`/`fromJson`/`copyWith` round-trip. +- [x] **3.2** Created `lib/services/utils/effort_estimator.dart` with terms 1–3 (trend deviation, intra-session decline, rest/tempo drift — all HR-less, pure, synchronous). 19 unit tests in `test/effort_estimator_test.dart` covering every term in isolation, the confidence ladder, and RPE clamping. +- [x] **3.3 (revised design):** Rather than accepting `IHealthConnectService?` and fetching samples itself, `EffortEstimator.estimate()` takes an optional **pre-resolved** `HrEffortSignal?` (peak bpm in the set's window + session floor/ceiling). Reason: the in-workout recommendation path must stay synchronous/offline (a hard constraint from this plan's Global Constraints), so `EffortEstimator` cannot do Health Connect I/O itself. It's a pure function ready to receive HR data whenever an upstream caller resolves it — tested directly with synthetic `HrEffortSignal` values (4 tests: null, too-few-samples, near-ceiling, well-below-ceiling). **Not done in this pass:** actually wiring a live Health Connect read into the hot path — that needs a caching layer analogous to `ReadinessManager`'s snapshot, which doesn't exist yet for per-set HR. Flagged as a natural follow-up, not built speculatively (no consumer ready to use it yet). +- [x] **3.4** Added the post-workout chip row (`_EffortChipRow` in `workout_summary_screen.dart`, Easy/Solid/Brutal) + `EffortCalibration` (`lib/services/utils/effort_calibration.dart`) implementing the rolling offset as an exponential moving average (α≈0.1, approximates a ~10-session rolling mean without persisting per-session history) rather than storing raw history. `WorkoutProvider.recordSessionEffort()` persists both the session's `sessionEffort` and the offset via `IStorageService.saveSetting`. Tests: `test/effort_calibration_test.dart` (7, incl. convergence/clamping) + 4 in `workout_provider_test.dart` (default 0.0, records + updates offset, persists across reload, no-op for unknown session). + +## Phase 4 — Readiness-aware modulation + +- [x] **4.1** `WorkoutProvider.getRecommendations` now takes an optional `ReadinessBand? readinessBand` (not the full snapshot — the rule chain only ever needed the band). Wired from `WorkoutFlowScreen` via `context.watch()?.snapshot?.band` — the **nullable-typed** lookup was required: an earlier attempt with `context.watch()` (non-nullable) threw `ProviderNotFoundException` in `userflow_workout_logging_test.dart`, which mounts `WorkoutFlowScreen` without the full `main.dart` provider tree. Nullable lookup resolves to `null` gracefully instead, preserving the screen's existing testability. +- [x] **4.2** Added `ReadinessRule` to `progression_rules.dart` at priority 3 (after under-recovered/post-deload, before the new `SessionFatigueRule` and decline/plateau) — reasoning: readiness is a whole-day physiological signal like under-recovery, so it outranks same-session-local fatigue and multi-session trend holds. `ProgressionContext` gained `bool isLowReadiness = false` (defaulted, so the one existing `ml_service.dart` call site needed no changes for this field alone). +- [x] **4.3** No explicit check needed in `MLService`/`WorkoutProvider` — `ReadinessManager.refresh()` already gates on `_settings.readinessEnabled` internally (`readiness_manager.dart:66`) and leaves `snapshot` `null` when disabled/no Health Connect permission, so a disabled/unavailable readiness feature naturally degrades to `readinessBand: null` → `isLowReadiness: false` with zero behavior change. +- [x] **4.4** Tests in `workout_provider_test.dart`: low band holds load even when reps are at the ceiling (verified against a same-setup baseline that *does* progress, to prove the suppression is real); moderate band is a no-op. + +## Phase 5 — Intra-session fatigue model + +**Decision: per-muscle *hard-set-equivalent* accumulation with a continuous dampening factor**, using the Phase 3 effort estimate — not raw tonnage (a leg-press set and a lateral-raise set aren't comparable in kg), not relative-to-typical-volume (would need a history query on the synchronous hot path). + +```text +hardSets[muscleId] = Σ over sets already logged today, excluding the current exercise + (activation% / 100) × clamp((estimatedRpe − 6) / 3, 0, 1) +``` +Activation weighting reuses the Phase 2 `RecoveryCalculator.muscleVolumes` helper rather than a second copy of that loop. + +```text +f = clamp((hardSets − softCap) / (hardCap − softCap), 0, 1) // softCap = 6, hardCap = 12 +``` +- `f = 0` → untouched. +- `0 < f < 1` → **scales, doesn't block**: weight-progression increment × `(1 − f)`, snapped to the nearest 2.5 kg plate (so `f > 0.5` naturally becomes "hold weight, reset reps"), confidence drops `high → medium`. +- `f ≥ 1` → early exit, same output shape as the under-recovered rule, distinct reasoning ("≈N hard sets for chest already this session — hold and finish strong"). + +**Priority in the Phase 2 rule chain:** the `f ≥ 1` exit sits *after* under-recovered and post-deload (those are multi-day physiological/protocol states and dominate), but *before* decline/plateau — deloading 10% while also mid-session-fatigued double-penalizes, and "rebuild next session" isn't the right advice for a fatigue state that resolves by tomorrow. `0 < f < 1` doesn't short-circuit; it flows through as a multiplier on whatever the later rules decide. + +Data source: `WorkoutProvider`'s in-progress session state, already in memory — zero I/O, preserves the offline constraint. + +- [x] **5.1** Added `SessionFatigueAccumulator` (`lib/services/utils/session_fatigue.dart`): `hardSetEquivalents({exerciseLogs, exerciseMap, excludeExerciseId})`, using `EffortEstimator` (HR-less, no growth model — just the decline/tempo terms plus the RPE-8 base anchor) per set, `clamp((rpe-6)/3, 0, 1)` for hardness, weighted by each exercise's muscle-activation percentages. 7 tests in `test/session_fatigue_test.dart`. +- [x] **5.2** Added `readinessBand`/`sessionHardSets` params to `recommendSets` on both `IMLService` and `MLService` (no separate `primaryMuscleIds` needed — it already existed and is reused for the fatigue lookup too, same as recovery). Updated `MockMLService` with `lastReadinessBand`/`lastSessionHardSets` tracking. No Mockito-generated mock exists for `IMLService` (verified via search) — only the hand-written `MockMLService` needed updating. +- [x] **5.3** Added `SessionFatigueRule` (hard-hold at `f ≥ 1.0`) to the chain, plus modified `DoubleProgressionRule` itself to scale its weight-progression increment by `(1 − f)` for `0 < f < 1`, snapped to the nearest 2.5kg plate — this couldn't be a separate rule since partial dampening isn't a "hold, stop the chain" decision, it has to modify what the terminal rule would otherwise do. Verified byte-identical output at `f = 0` (the default) with a dedicated test. `_fatigueSoftCap`/`_fatigueHardCap` (6.0/12.0) added as named constants in `ml_service.dart` beside `_plateauWeeklyPct`; the `recommendSets` priority-order doc comment updated to the full 8-tier list. +- [x] **5.4** Wired from `WorkoutProvider.getRecommendations` via a `SessionFatigueAccumulator` field, computed from `_currentExerciseLogs` (already in memory — zero I/O) excluding the exercise being recommended. 4 integration tests in `workout_provider_test.dart` using real `startWorkout`/`addSet`/`nextExercise` flows: same-primary-muscle exercise dampened after heavy prior sets (compared against a fresh provider with no in-progress session, to isolate the effect); a different, unrelated muscle group is unaffected. + +## Phase 6 — "Bigger model" evaluation (spike, completed 2026-08-18) + +Executed as a code-grounded architecture review (Opus subagent) plus an actual backtest of the shipped engine against a real 74-session export (`repforge_backup_2026-08-02_221350.json`, 832 simulated set-recommendations). No code changed in this phase — findings only. + +### Q1: Keep the ordered rule chain, or convert to a scored/weighted composite? + +**Decision: keep the chain.** Four of the seven rules (`UnderRecoveredRule`, `ReadinessRule`, `SessionFatigueRule`, `PlateauRule`) return numerically identical output (`weight: c.set.weight, reps: c.set.reps`) — they differ only in which *reasoning string* wins, i.e. the chain isn't blending four numbers, it's selecting an explanation for one shared "hold" outcome. A scored composite would have to sum contributors into a pressure number and then separately argmax them back apart to pick a sentence — that's the chain, reimplemented with extra state. Worse, `isUnderRecovered`'s veto (it must win outright regardless of how good the trend looks) isn't expressible as a smooth weight without a sentinel/infinite term, i.e. a hard gate wearing a score's clothing. Where the code genuinely needed continuity (partial same-session fatigue), it already lives *inside* the chain as a multiplier on the one rule that computes a delta (`DoubleProgressionRule`), not as a competing score. That's the correct shape: hard gates for veto states, one continuous modulator on the terminal rule. + +### Q2: Give the Gemini AI Coach a `_setRecommendation`/`_explainRecommendation` tool? + +**Decision: no — and the actual blocker is upstream of the LLM question.** `SetRecommendation.reasoning` — the carefully-worded string every rule produces — has exactly one reference in all of `lib/`: its own declaration. `_RecommendationCard` (`exercise_input_section.dart`) renders only the weight/reps and an unlabelled confidence dot; the reasoning text is asserted in tests but never shown to a user. Building a Coach tool to *explain* a decision nobody has been shown a single word about is solving the wrong layer. Do the free fix first: render `rec.reasoning` in the card (and label the confidence dot). Revisit the Coach tool only if, after reasoning is visible, chat transcripts or a "why?" tap-through show real demand for something richer than what's already computed and sitting unused. + +### Real-data backtest — the second most useful finding of this phase + +Backtested the exact shipped `MLService`/`ProgressionRuleFactory` against 74 real sessions (832 simulated recommendations, mirroring `WorkoutProvider.getRecommendations`'s exact inputs at each historical point in time — no data leakage from future sessions): + +| Rule | Fired | +|---|---| +| `DoubleProgressionRule` (add rep) | 420 (50.5%) | +| `DoubleProgressionRule` (weight bump) | 137 (16.5%) | +| `UnderRecoveredRule` | 119 (14.3%) | +| `PostDeloadRecoveryRule` | 77 (9.3%) | +| `DeclineDeloadRule` | 50 (6.0%) | +| `PlateauRule` | 29 (3.5%) | +| `SessionFatigueRule` / fatigue-scaled progression | **0 (0.0%)** | + +The Phase 1 recovery-gate fix (`UnderRecoveredRule` + `PostDeloadRecoveryRule`) is doing real, substantial work for this user — nearly a quarter of all recommendations. **Phase 5's same-session fatigue signal never fired once.** 159 of 832 sets had *some* non-zero same-session hard-set accumulation for their primary muscle, but the highest value ever reached across all 74 sessions was **5.13** — under the `_fatigueSoftCap = 6.0` threshold every time. This user's actual training pattern (rotating through many distinct exercises per session rather than stacking several heavy sets on overlapping muscles back-to-back) never generates enough same-session overlap to cross into the dampening zone as calibrated. + +This doesn't mean Phase 5 is wrong — it means `_fatigueSoftCap`/`_fatigueHardCap` (6.0/12.0, always flagged as unvalidated guesses) are calibrated for a different training style than this real user's. **Action for whenever this gets tuned:** lower `_fatigueSoftCap` toward ~4–5 and re-backtest, or gather a session with genuinely stacked same-muscle work (e.g. a push-day superset) to find a real threshold instead of guessing again. Also confirmed separately: `readiness.snapshot` in this export was cached once at `band: moderate` — never `low` — so `ReadinessRule` had no opportunity to fire in this dataset either; no conclusion possible from this backup about its calibration. + +**Also surfaced, unrelated to the two questions but found while reading the export:** the backup's `settings` block contains a plaintext `geminiApiKey`. Flagged to the user directly — recommend rotating that key and confirming this export file isn't synced/committed anywhere. + +--- + +## Phase 7 — Remove `muscleActivations` from the fatigue path (completed 2026-08-19) + +The user pointed out a concrete real case the Phase 6 backtest's calibration missed: their back/bicep routine trains Lat Pulldown, Seated Cable Row, and Pull-ups back to back, and order visibly affects performance — but investigating found `seated_cable_row`'s highest-activation muscle is `'back'` (70%) while `lat_pulldown`/`pull_ups`' is `'lats'` (75–80%) — **separate, non-aliased ids** in this app's hand-authored taxonomy (`exercise_database.dart:9-16`). Since Phase 5's fatigue gate only checked `[exercise.primaryMuscle]` (a single label) against the accumulated map, cross-talk between these three near-identical pulling movements depended on accidents of which label the exercise database's author happened to pick as "primary" for each. The user's explicit instruction: *"Don't rely much on this muscle activation data (as it's hardcoded, and I don't think any medical reference backs this), just make relationships based on the data."* + +Rather than patch the taxonomy (e.g. broadening to "all significantly-activated muscles"), a deeper spike (Opus subagent, grounded in the real 74-session export) tested whether a same-session order effect is statistically detectable **at all**, independent of muscle labels: + +- **Pooled effect across all exercises: r = 0.005, t = 0.09, n = 309** (session-demeaned regression of trend-residual performance against prior in-session hard-set count). Effectively zero. +- **Per-exercise coefficients that looked real didn't replicate** on a split-half check (e.g. `hammer_curl`: −0.52 in the first half of history, +0.11 in the second). +- **Order barely varies in this user's real routine** — 73 of 85 logged exercise pairs have *zero* counterfactual observations (always trained in the same relative order), and a plausible 3–5% order effect is smaller than the 2.6–13.8% session-to-session noise on most exercises' top-set performance. No model — linear, GRU, or transformer — can be fit reliably against noise this size with this little contrastive data; a user-proposed LSTM/attention approach was evaluated and rejected on the same grounds (far more parameters than the 1-parameter linear model that already failed to generalize, against the same starved, noisy dataset). +- **The only identifiable unit was a single exercise-agnostic scalar** — total prior same-session hard-set-equivalents, not attributed to any muscle or specific prior exercise. + +**Implemented:** `SessionFatigueAccumulator.factorFor()` (`lib/services/utils/session_fatigue.dart`) now sums RPE-weighted hardness across all of today's earlier sets with **no `Exercise.muscleActivations` dependency at all** — it no longer even takes an `exerciseMap` parameter. `IMLService.recommendSets`/`MLService.recommendSets` replaced `Map? sessionHardSets` with a single `double sessionFatigueFactor = 0.0`, computed upstream by `WorkoutProvider` and passed straight through — `ml_service.dart` no longer does any per-muscle lookup or cap math itself (`primaryMuscleIds` now serves the recovery gate only). `ProgressionContext`, `SessionFatigueRule`, and `DoubleProgressionRule` needed **zero changes** — they already consumed a plain `double`. + +**Calibration, not a guess:** re-ran a backtest of the new formula against the same 74-session export (254 real same-session contexts) and found real-set totals up to **11.87**, median 4.56. The new `_softCap`/`_hardCap` (16.0/24.0) sit comfortably above the observed max, so the factor evaluates to exactly `0.0` on every real historical case — an explicit, verified "must not ship as a behavior change" guarantee rather than an assumption. This is an intentionally inert placeholder, documented as such in the accumulator's file header, ready to be recalibrated downward once genuine order-variation data exists (the deferred "occasionally suggest swapping exercise order" data-collection nudge from the Phase 6 spike is what would generate that data). + +Tests: `test/session_fatigue_test.dart` fully rewritten for the new scalar API (no `Exercise` fixtures needed at all now); two `workout_provider_test.dart` integration tests updated — one confirms realistic session sizes produce zero behavior change (verified against a fresh-provider baseline), one confirms an extreme, unrealistic session (40 sets) still dampens, proving the mechanism is wired end-to-end even though real sessions never reach it. Full suite verified green. + +--- + +## Suggested sequencing + +**1 → 2 → 3 → (4 and 5 in either order, 5 depends on 3) → 6.** Phase 1 is a same-day bug fix. Phase 2 is a pure refactor with no behavior change — verify with byte-identical-output tests before adding anything new on top of it. Phases 3–5 are each independently shippable; 5 needs 3's effort estimate as an input, so it can't land first. Ship and observe after each phase rather than batching — the thresholds introduced in Phases 3 and 5 in particular (the 8.0 RPE anchor, `softCap`/`hardCap`) are unvalidated constants that will need tuning against real user feedback, and that's much easier to isolate one phase at a time. + +--- + +## Status: Phases 1–5 implemented (2026-08-18) + +All tasks above are done. Final verification: whole-project `flutter analyze` — 0 issues. Full `flutter test` — **1014/1014 passing** (the 1 pre-existing flaky failure noted after Phase 2 did not reproduce in the final full run, consistent with it being unrelated ordering/timing flakiness in `readiness_manager_test.dart`, not a regression from this work). + +**New files:** `strategies/growth_curve_fitter.dart`, `strategies/progression_rules.dart`, `utils/recovery_calculator.dart`, `utils/effort_estimator.dart`, `utils/effort_calibration.dart`, `utils/session_fatigue.dart`, plus 6 new test files (`progression_rules_test.dart`, `effort_estimator_test.dart`, `effort_calibration_test.dart`, `session_fatigue_test.dart`, and additions to `model_serialization_test.dart`/`workout_provider_test.dart`/`analytics_manager_test.dart`). + +**Known gaps, called out honestly rather than papered over:** +- The HR term in `EffortEstimator` is fully implemented and tested but not wired to a live Health Connect read anywhere — it needs a caching layer that doesn't exist yet (see Phase 3.3's note). Every constant fed to it in production today is `null`, so it never fires outside of tests. +- All the new thresholds (RPE-8 anchor, `_fatigueSoftCap`/`_fatigueHardCap`, `EffortCalibration`'s α=0.1) are engineering estimates, not tuned against real user data. Expect to revisit them after Phase 6's usage-data checkpoint. +- `AnalyticsManager.getRecommendations` received the Phase 1 recovery-data fix for consistency but was **not** extended with `readinessBand`/`sessionHardSets` — it still has zero live callers in the app, so this was judged out of scope rather than speculative work. + +**Not committed.** Every phase's changes are sitting in the working tree, verified but uncommitted, per this repo's "only commit when explicitly asked" policy. diff --git a/docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md b/docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md new file mode 100644 index 0000000..783524f --- /dev/null +++ b/docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md @@ -0,0 +1,224 @@ +# Hive → SQLite Migration + Coach SQL Query Tool — Design Spec + +**Date:** 2026-08-08 +**Status:** Approved +**Feature area:** Storage layer (`lib/services/`) + AI Coach tools (`lib/services/ai/`) + +--- + +## 1. Problem + +The AI Coach (`CoachToolService`) currently exposes ~15 narrow, purpose-built tools (`get_exercise_performance`, `get_workouts_in_range`, etc.), each hand-wrapping a specific `WorkoutProvider`/`PRManager` query. This is fine for known question shapes but can't answer arbitrary analytical questions the model wasn't given a preset tool for (e.g. ad-hoc joins, unusual aggregations, novel filters). + +The fix — a generic SQL query tool — is a poor fit for the current storage layer: RepForge persists to **Hive**, a key-value store with no query language. Any SQL tool would need a translation layer. + +Two paths were considered: +- **Ephemeral snapshot**: build a throwaway in-memory SQLite mirror on every coach tool call, rebuilt from Hive-backed in-memory lists each time. +- **Real migration**: replace Hive with SQLite as the actual persistence backend, so the coach's SQL tool queries live data directly with no translation step. + +This spec chooses the second path. `IStorageService` (`lib/services/interfaces/storage_service_interface.dart`) is already a clean DIP boundary — every method takes/returns plain Dart models, no Hive types leak through — so a `SqliteStorageService implements IStorageService` swap is architecturally sound without touching any manager, `WorkoutProvider`, or screen. `MockStorageService` already fulfills the same interface, so the existing test suite is unaffected by the backend swap. + +This is two dependent efforts: (A) migrate the storage backend, (B) add the coach's SQL tool on top of it. (A) is materially riskier — it touches real user data — and is the majority of this spec. + +--- + +## 2. Goal + +1. Replace Hive with SQLite (`sqflite`) as RepForge's persistence backend, via a new `SqliteStorageService implements IStorageService`, with a safe, reversible, one-time migration for existing installs. +2. Add `run_sql_query` to `CoachToolService`: the model submits a read-only SQL `SELECT`, executed against a dedicated read-only connection to the live database, results returned as JSON rows. + +Non-goals: no UI changes, no new user-facing features, no change to any existing `IStorageService` method signature or manager/provider code. + +--- + +## 3. Package Choice: `sqflite` + +Considered `sqlite3` (FFI, synchronous) vs `sqflite` (platform channel, async). Chose **`sqflite`**: + +- `IStorageService` is entirely `Future`-based already. `sqflite` runs DB work on a native background thread and returns via `Future` naturally — no extra isolate-management code. `sqlite3` is synchronous on the calling isolate; matching the same non-blocking behavior would require hand-rolling a background isolate, which is unjustified complexity at this app's data scale. +- `sqflite` supports `rawQuery(sql, args)` / `rawInsert` / `rawUpdate`, so the coach's arbitrary-SQL tool works identically to how it would under `sqlite3`. No capability is lost. +- No native binary bundling (`sqlite3_flutter_libs`) needed; uses the OS-provided SQLite. + +**Known tradeoff:** `sqflite` uses the Android-bundled SQLite version rather than a pinned one, so very old devices could lack newer SQL features (e.g. window functions, SQLite 3.25+/Android 9+). Accepted as low risk for this app's scale and audience. + +**Test dependency:** add `sqflite_common_ffi` (dev dependency) — required to run `sqflite`-backed code under `flutter test`, since plain `sqflite` needs a real platform binding unavailable off-device. + +--- + +## 4. Schema + +All tables live in one SQLite database file, created in `onCreate`. + +```sql +CREATE TABLE exercises ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + category TEXT NOT NULL, -- 'compound' | 'isolation' + is_custom INTEGER NOT NULL DEFAULT 0, + available_handles TEXT -- JSON array or NULL +); + +CREATE TABLE muscle_groups ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + growth_rate REAL NOT NULL DEFAULT 0, + last_updated TEXT NOT NULL +); + +CREATE TABLE exercise_muscle_activations ( + exercise_id TEXT NOT NULL REFERENCES exercises(id), + muscle_group_id TEXT NOT NULL, + activation_percentage INTEGER NOT NULL +); + +CREATE TABLE routines ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + created_at TEXT NOT NULL +); + +CREATE TABLE routine_exercises ( + routine_id TEXT NOT NULL REFERENCES routines(id), + exercise_id TEXT NOT NULL, + position INTEGER NOT NULL +); + +CREATE TABLE sessions ( + id TEXT PRIMARY KEY, + date TEXT NOT NULL, + routine_id TEXT, + duration_min INTEGER NOT NULL, + notes TEXT, + hc_synced_at TEXT +); + +CREATE TABLE exercise_logs ( + id TEXT PRIMARY KEY, -- synthetic: '${session_id}_${index}' + session_id TEXT NOT NULL REFERENCES sessions(id), + exercise_id TEXT NOT NULL, + notes TEXT, + handle TEXT +); + +CREATE TABLE sets ( + id TEXT PRIMARY KEY, -- synthetic: '${exercise_log_id}_${index}' + exercise_log_id TEXT NOT NULL REFERENCES exercise_logs(id), + weight REAL NOT NULL, + reps INTEGER NOT NULL, + is_dropset INTEGER NOT NULL DEFAULT 0, + drops_json TEXT, -- JSON array of {id, weight, reps} or NULL + time_taken INTEGER, + timestamp TEXT NOT NULL, + assist_weight REAL, + extra_weight REAL, + handle TEXT +); + +CREATE TABLE targets ( + id TEXT PRIMARY KEY, + exercise_id TEXT NOT NULL, + target_type TEXT NOT NULL, + target_value REAL NOT NULL, + current_value REAL NOT NULL DEFAULT 0, + estimated_completion_date TEXT, + created_at TEXT NOT NULL, + is_completed INTEGER NOT NULL DEFAULT 0 +); + +CREATE TABLE personal_records ( + exercise_id TEXT PRIMARY KEY, + best_weight REAL NOT NULL, + best_reps INTEGER NOT NULL, + best_volume REAL NOT NULL, + achieved_at TEXT NOT NULL +); + +CREATE TABLE training_programs ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + description TEXT, + total_weeks INTEGER NOT NULL, + author TEXT, + is_imported INTEGER NOT NULL DEFAULT 0, + created_at TEXT NOT NULL, + phases_json TEXT NOT NULL, -- List.toJson() + weeks_json TEXT NOT NULL -- List.toJson() +); + +CREATE TABLE conversations ( + id TEXT PRIMARY KEY, + title TEXT NOT NULL, + kind TEXT NOT NULL DEFAULT 'coach', + created_at TEXT NOT NULL, + updated_at TEXT NOT NULL, + messages_json TEXT NOT NULL -- List.toJson() +); + +CREATE TABLE settings ( + key TEXT PRIMARY KEY, + value TEXT +); + +CREATE INDEX idx_sets_exercise_log ON sets(exercise_log_id); +CREATE INDEX idx_exercise_logs_session ON exercise_logs(session_id); +CREATE INDEX idx_exercise_logs_exercise ON exercise_logs(exercise_id); +CREATE INDEX idx_sessions_date ON sessions(date); +``` + +**Deliberately not fully normalized:** `training_programs` (phases/weeks/days/exercises) and `conversations` (messages) are stored as JSON-blob columns rather than exploded into child tables. Both are always read/written as a whole object via existing `toJson()`/`fromJson()` methods, never queried piecemeal by any manager or by the coach's SQL tool. Normalizing them would add several more tables for no query benefit — YAGNI. + +--- + +## 5. `SqliteStorageService` + +New file: `lib/services/sqlite_storage_service.dart`, `class SqliteStorageService implements IStorageService`. + +- `init()`: opens the database (`openDatabase`), runs `onCreate` (schema above) on first creation. +- Every `IStorageService` method gets a real implementation: entity writes that touch multiple tables (e.g. `saveWorkoutSession` → `sessions` + `exercise_logs` + `sets`) run inside a single `db.transaction()` — delete-then-reinsert child rows for the given parent id, so updates and inserts share one code path. +- `exportAllData()` / `importData()` keep their existing JSON contract (used by the migration below and by the user-facing export/import feature) — implemented by reading/writing through the same model `toJson()`/`fromJson()` methods already used elsewhere. + +No changes to `IStorageService`'s method signatures. + +--- + +## 6. Migration & Cutover + +**Goal:** existing installs upgrade from Hive to SQLite exactly once, safely, with no possibility of a half-migrated state. + +1. On app start, `AppInitializer` (in `main.dart`) checks `settings['storage_migrated_v1']` **in the existing Hive settings box** (the migration hasn't happened yet at this point, so Hive is still authoritative for this check). +2. If unset: instantiate both the existing `StorageService` (Hive) and a fresh `SqliteStorageService`. For every entity type, read via the existing, already-correct Hive read methods (`getAllWorkoutSessions()`, `getAllRoutines()`, `getAllTargets()`, `getAllMuscleGroups()`, `getCustomExercises()`, `getAllTrainingPrograms()`, `getAllPersonalRecords()`, `getAllConversations()`, plus raw settings keys) and write each into `SqliteStorageService` through its normal write methods. This trusts only the new write path — reads reuse logic that already works. +3. Only if every entity type migrates without throwing: write `storage_migrated_v1 = true` into the Hive settings box. +4. From that point on (this launch and all future launches), `AppInitializer` hands `WorkoutProvider` a `SqliteStorageService` instead of `StorageService`. +5. If migration throws partway through anything, the flag is never set. The app falls back to `StorageService` (Hive) for that launch, and retries the full migration on the next app start. There is no partial-migration state a user can get stuck in. +6. **Hive boxes are never deleted.** They remain on disk indefinitely as a passive backup — the data volume for a personal fitness log is small, so the disk cost is negligible next to the safety value. + +This keeps the app in exactly one of two well-defined states at all times: fully on Hive, or fully on SQLite. + +--- + +## 7. Coach SQL Tool: `run_sql_query` + +Added to `CoachToolService.buildTools()` / `handleCall()`, alongside (not replacing) the existing curated tools. + +- **Connection:** a dedicated **read-only** `sqflite` connection (`openReadOnlyDatabase`) to the same database file used by `SqliteStorageService`. This is the real safety boundary — the OS/SQLite layer itself refuses writes on this connection, regardless of what SQL text is submitted. +- **Text validation (defense-in-depth, not the primary guard):** trim the query, strip a single trailing `;`, reject if a second `;` remains (multi-statement), reject case-insensitively if it doesn't start with `SELECT` or `WITH`, reject if it contains `insert|update|delete|drop|alter|create|attach|detach|pragma|vacuum|replace|trigger` as a keyword. +- **Row cap:** wrap the model's query as `SELECT * FROM () LIMIT ?` with a default of 200, model-adjustable up to 500 — never trusts a `LIMIT` the model wrote itself. +- **Error handling:** any exception (syntax error, cap violation, etc.) returns `{'error': message}`, matching every other tool's contract — a bad query is a recoverable turn, not a crash. +- **Function description** embeds the full schema (table + column names, one line each) so the model always has it in context without a separate schema-discovery round trip. + +--- + +## 8. Testing + +- **`SqliteStorageService`**: new test file, run against an in-memory database via `sqflite_common_ffi` (`databaseFactory = databaseFactoryFfi`, `inMemoryDatabasePath`). Covers every `IStorageService` method, mirroring the existing `MockStorageService`-based test patterns for shape. +- **Migration**: seed a `StorageService` (Hive, using the existing test Hive setup) with representative data across every entity type, run the migration routine against a fresh in-memory `SqliteStorageService`, assert the data matches, assert the flag is set, assert re-running the migration is a no-op (skips already-migrated). +- **Existing test suite** (managers, `WorkoutProvider`, screens): unaffected — all depend on `IStorageService`/`MockStorageService`, never the concrete backend. +- **`run_sql_query`**: valid `SELECT` → correct JSON rows; non-`SELECT` → rejected with error; multi-statement → rejected; row cap enforced; schema-referencing query (e.g. a join across `sessions`/`exercise_logs`/`sets`) returns expected shape. + +--- + +## 9. Rollout Notes + +- `pubspec.yaml` additions: `sqflite` (runtime), `sqflite_common_ffi` (dev, for tests). +- `hive`/`hive_flutter` dependencies and `StorageService` (Hive) are **kept**, not removed — they remain the migration source and the pre-migration fallback path indefinitely (or until a future spec decides it's safe to drop them, informed by real-world migration success rates). +- No changes to `CLAUDE.md`'s documented Hive box list are needed for this spec beyond noting the SQLite migration exists; a follow-up doc update once this ships is reasonable but out of scope here. diff --git a/docs/superpowers/specs/2026-08-11-health-data-sync-and-coach-sql-design.md b/docs/superpowers/specs/2026-08-11-health-data-sync-and-coach-sql-design.md new file mode 100644 index 0000000..5dcaf59 --- /dev/null +++ b/docs/superpowers/specs/2026-08-11-health-data-sync-and-coach-sql-design.md @@ -0,0 +1,135 @@ +# Health Data Sync (Sleep + HR) into SQLite — Design Spec + +**Date:** 2026-08-11 +**Status:** Approved +**Feature area:** Storage layer (`lib/services/`) + AI Coach SQL tool (`lib/services/ai/`) + +--- + +## 1. Problem + +The AI Coach's `run_sql_query` tool (added in `docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md`) can query workouts, sets, targets, and PRs directly — but health data (sleep stages, heart rate, resting HR, HRV) is fetched live from Health Connect on every request via `HealthConnectService`/`HealthHistoryManager` and is never persisted. This means the coach cannot join health data against workout data in a single SQL query (e.g. "average sleep the night before a PR attempt" or "HR trend across the last 8 weeks of leg day sessions") — each half of the question requires a separate tool call and the model has to reconcile the join itself, unreliably. + +This spec adds three SQLite tables that mirror Health Connect data, plus a sync service that keeps them populated, so `run_sql_query` can join across workout and health data directly. + +--- + +## 2. Goal + +1. Persist sleep sessions (with stage breakdown) and HR-related samples (raw heart rate, resting heart rate, HRV RMSSD) into the same SQLite database `SqliteStorageService` already owns. +2. Keep this data reasonably fresh via sync-on-app-launch (throttled) plus a manual "Sync now" action — no background service. +3. Extend `run_sql_query`'s schema description so the coach can query and join the new tables. +4. Keep the existing live `get_health_metrics` coach tool as-is, for "right now" freshness the synced tables won't have until the next sync. + +Non-goals: no background/periodic sync (WorkManager or equivalent), no downsampling/compaction of old raw samples, no changes to `IStorageService`'s method signatures (this feature is additive on `SqliteStorageService` directly, matching how `SqlQueryService` already bypasses that interface), no UI beyond one manual sync button. + +--- + +## 3. Schema + +Added to the same database `SqliteStorageService` manages, created in `onCreate` (and via a migration step for existing installs already past `onCreate` — see §6). + +```sql +-- Raw heart rate, resting heart rate, and HRV RMSSD samples all share the +-- same {time, value} shape from Health Connect; one EAV-style table avoids +-- three near-identical tables and keeps the coach's query surface simple +-- ("WHERE type = 'heart_rate'") instead of three tables to remember. +CREATE TABLE health_samples ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + type TEXT NOT NULL, -- 'heart_rate' | 'resting_heart_rate' | 'hrv_rmssd' + timestamp TEXT NOT NULL, -- ISO8601 + value REAL NOT NULL +); +CREATE UNIQUE INDEX idx_health_samples_unique ON health_samples(type, timestamp); +CREATE INDEX idx_health_samples_type_ts ON health_samples(type, timestamp); + +CREATE TABLE sleep_sessions ( + id TEXT PRIMARY KEY, -- synthetic: the start_ts ISO string + start_ts TEXT NOT NULL, + end_ts TEXT NOT NULL, + light_min INTEGER, + deep_min INTEGER, + rem_min INTEGER, + awake_min INTEGER +); +CREATE INDEX idx_sleep_sessions_start ON sleep_sessions(start_ts); + +CREATE TABLE sleep_stage_intervals ( + sleep_session_id TEXT NOT NULL REFERENCES sleep_sessions(id), + start_ts TEXT NOT NULL, + end_ts TEXT NOT NULL, + stage TEXT NOT NULL -- 'deep' | 'rem' | 'light' | 'awake' +); +CREATE INDEX idx_sleep_stage_session ON sleep_stage_intervals(sleep_session_id); +``` + +Sync watermarks (one ISO8601 timestamp per data stream, e.g. key `health_sync.heart_rate`) are stored as ordinary rows in the existing `settings` table — no new table needed for that. + +`sleep_sessions.id` is derived from `start_ts` so re-syncing the same session (e.g. after a Health Connect correction) is a natural upsert target, not a duplicate. + +--- + +## 4. `HealthSyncService` + +New file: `lib/services/health_sync_service.dart`. + +```dart +class HealthSyncService { + HealthSyncService(this._hc, this._db); + + final IHealthConnectService _hc; + final SqliteStorageService _db; + + Future sync({bool force = false}) async { ... } +} +``` + +- **Throttle:** skip if the most recent sync (tracked via a `health_sync.last_run` watermark) was less than 30 minutes ago, unless `force: true`. +- **Per-stream incremental fetch with look-back:** for each of `sleep`, `heart_rate`, `resting_heart_rate`, `hrv_rmssd`: read that stream's watermark from `settings` (default `now - 90 days` if absent — the agreed backfill window). Fetch from `watermark - 3 days` through `now` — the 3-day look-back re-pulls recent data even though it was already synced, to catch late corrections Health Connect or the watch itself makes to recent records (e.g. a sleep session Health Connect revises the next morning). Anything before the look-back window is assumed final and is never re-fetched. +- **Upsert:** + - `health_samples`: `INSERT OR REPLACE` keyed by the `(type, timestamp)` unique index — naturally idempotent and self-correcting. + - `sleep_sessions` / `sleep_stage_intervals`: for each `SleepPeriod` in the fetch window, delete-then-reinsert `sleep_stage_intervals` for that session id and upsert the `sleep_sessions` row — same delete/reinsert-child-rows pattern the original migration spec already uses for `sets`/`exercise_logs`. + - After all four streams succeed, advance each stream's watermark to `now` and the `last_run` throttle marker to `now`. +- **Failure handling:** any exception (permission not granted, Health Connect unavailable, one stream fails) is caught per-stream — a failed stream's watermark is left untouched so the next sync retries it, and does not block the other streams or crash the caller. Matches the existing best-effort caching posture in `HealthHistoryManager._readCachedHrDay`. + +### Wiring + +Only constructed when the active backend is `SqliteStorageService` — mirrors the existing guard in `main.dart:191-192` (`_storageService is SqliteStorageService ? SqlQueryService(...) : null`). Health data has no meaning under the pre-migration Hive fallback path. + +- `AppInitializer` calls `sync()` once after both `HealthConnectService` and `SqliteStorageService` are ready, fire-and-forget (does not block first frame). +- A "Sync now" button is added to the existing health-permissions area of the Profile screen, calling `sync(force: true)`. + +--- + +## 5. Coach SQL Tool Update + +`CoachToolService`'s embedded schema description (used by `run_sql_query`, §7 of the original migration spec) gets the three new tables appended in the same one-line-per-table/column format as the existing schema text, so the model can join them against `sessions`, `exercise_logs`, and `sets` without a separate discovery call. + +`get_health_metrics` (the existing live Health Connect tool) is unchanged — it remains the source for "right now" data that the synced tables won't have until the next app-open or manual sync. + +--- + +## 6. Migration for Existing Installs + +Existing SQLite installs (already past `onCreate`) need the three new tables added without a fresh install. `SqliteStorageService.init()` bumps `_dbVersion` and adds an `onUpgrade` step that runs the `CREATE TABLE`/`CREATE INDEX` statements from §3 if the new tables don't already exist (`CREATE TABLE IF NOT EXISTS`, safe to run unconditionally on upgrade). No data migration needed — these are brand-new tables with no prior data to carry forward; the first post-upgrade sync populates them via the normal 90-day backfill path. + +--- + +## 7. Testing + +- **`HealthSyncService`** (new test file, in-memory DB via `sqflite_common_ffi` + a fake `IHealthConnectService`): + - First sync with no prior watermark backfills the full 90-day window. + - Second sync only re-fetches from `watermark - 3 days` onward (verify the fake service receives the narrower range). + - Re-running sync is idempotent: no duplicate rows in `health_samples` or `sleep_sessions`, and changed values from a "corrected" fake response overwrite the prior row. + - A sync attempted less than 30 minutes after the last one is skipped unless `force: true`. + - An exception thrown by the fake health service for one stream doesn't propagate, doesn't advance that stream's watermark, and doesn't block the other streams from syncing. +- **`SqliteStorageService`**: extend the existing test file to cover the new upsert methods and the `onUpgrade` path (open a v-1 schema DB, run `init()`, assert the new tables exist). +- **`run_sql_query`**: extend `sql_query_service_test.dart` with a join query across `sessions`, `sets`, `sleep_sessions`, and `health_samples`, confirming the schema and join work end-to-end. + +--- + +## 8. Rollout Notes + +- No new dependencies — reuses `sqflite`, `sqflite_common_ffi` (test), and the existing `IHealthConnectService`. +- No changes to `IStorageService`, `MockStorageService`, or any manager/provider — additive on `SqliteStorageService` only, same boundary `SqlQueryService` already uses. +- `CLAUDE.md`'s "6 boxes" / schema references would benefit from a follow-up doc note once this ships, but that's out of scope here (same deferral pattern as the original migration spec, §9). diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 72e44bb..97cb3aa 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -20,4 +20,4 @@ RepForge is fully offline by default. The optional AI Coach feature sends data t LICENSE -Apache-2.0. Source code: https://github.com/Devasy23/Workout-logger \ No newline at end of file +Apache-2.0. Source code: https://github.com/Devasy/RepForge \ No newline at end of file diff --git a/fdroid/metadata/com.devasy.repforge.yml b/fdroid/metadata/com.devasy.repforge.yml index 3925e15..db8ae7f 100644 --- a/fdroid/metadata/com.devasy.repforge.yml +++ b/fdroid/metadata/com.devasy.repforge.yml @@ -30,10 +30,12 @@ Builds: - git -C $$flutter$$ checkout -f $FLUTTER_VERSION - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter pub get --enforce-lockfile + - sed -i -e 's/-Wl,/-Wl,--build-id=none,/' $PUB_CACHE/hosted/pub.dev/jni-*/src/CMakeLists.txt scandelete: - workout-logger/.pub-cache build: - export PUB_CACHE=$(pwd)/.pub-cache + - export LDFLAGS="-Wl,--build-id=none" - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm" - versionName: 2.0.6 @@ -50,10 +52,12 @@ Builds: - git -C $$flutter$$ checkout -f $FLUTTER_VERSION - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter pub get --enforce-lockfile + - sed -i -e 's/-Wl,/-Wl,--build-id=none,/' $PUB_CACHE/hosted/pub.dev/jni-*/src/CMakeLists.txt scandelete: - workout-logger/.pub-cache build: - export PUB_CACHE=$(pwd)/.pub-cache + - export LDFLAGS="-Wl,--build-id=none" - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64" - versionName: 2.0.6 @@ -70,10 +74,12 @@ Builds: - git -C $$flutter$$ checkout -f $FLUTTER_VERSION - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter pub get --enforce-lockfile + - sed -i -e 's/-Wl,/-Wl,--build-id=none,/' $PUB_CACHE/hosted/pub.dev/jni-*/src/CMakeLists.txt scandelete: - workout-logger/.pub-cache build: - export PUB_CACHE=$(pwd)/.pub-cache + - export LDFLAGS="-Wl,--build-id=none" - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-x64" AutoUpdateMode: Version diff --git a/scripts/patch_so.py b/scripts/patch_so.py deleted file mode 100644 index 08638e7..0000000 --- a/scripts/patch_so.py +++ /dev/null @@ -1,191 +0,0 @@ -import sys -import zipfile -import tempfile -import os -import shutil - -def get_elf_build_id_info(data): - if not data.startswith(b"\x7fELF"): - return None - - # Parse 32-bit vs 64-bit ELF - elf_class = data[4] - is_32 = elf_class == 1 - - if is_32: - shoff = int.from_bytes(data[32:36], 'little') - shentsize = int.from_bytes(data[46:48], 'little') - shnum = int.from_bytes(data[48:50], 'little') - shstrndx = int.from_bytes(data[50:52], 'little') - else: - shoff = int.from_bytes(data[40:48], 'little') - shentsize = int.from_bytes(data[58:60], 'little') - shnum = int.from_bytes(data[60:62], 'little') - shstrndx = int.from_bytes(data[62:64], 'little') - - str_sec_offset = shoff + shstrndx * shentsize - if is_32: - str_offset = int.from_bytes(data[str_sec_offset+16:str_sec_offset+20], 'little') - else: - str_offset = int.from_bytes(data[str_sec_offset+24:str_sec_offset+32], 'little') - - for i in range(shnum): - sec_offset = shoff + i * shentsize - name_offset = int.from_bytes(data[sec_offset:sec_offset+4], 'little') - - if is_32: - offset = int.from_bytes(data[sec_offset+16:sec_offset+20], 'little') - size = int.from_bytes(data[sec_offset+20:sec_offset+24], 'little') - else: - offset = int.from_bytes(data[sec_offset+24:sec_offset+32], 'little') - size = int.from_bytes(data[sec_offset+32:sec_offset+40], 'little') - - # Read name - idx = str_offset + name_offset - name = b'' - while idx < len(data) and data[idx] != 0: - name += bytes([data[idx]]) - idx += 1 - name = name.decode('utf-8', errors='ignore') - - if name == ".note.gnu.build-id": - # Search for the actual build-id descriptor inside the section - # Format: [namesz (4 bytes)][descsz (4 bytes)][type (4 bytes)][name][desc] - sec_data = data[offset : offset + size] - if len(sec_data) >= 16: - namesz = int.from_bytes(sec_data[0:4], 'little') - descsz = int.from_bytes(sec_data[4:8], 'little') - type_id = int.from_bytes(sec_data[8:12], 'little') - if type_id == 3: # NT_GNU_BUILD_ID - # Align to 4 bytes for name - name_aligned_sz = (namesz + 3) & ~3 - build_id_offset = offset + 12 + name_aligned_sz - return { - 'offset': build_id_offset, - 'size': descsz, - 'value': data[build_id_offset : build_id_offset + descsz] - } - return None - -def patch_so_data(built_so_data, ref_so_data): - if len(built_so_data) != len(ref_so_data): - print(f"[-] Sizes differ: Built={len(built_so_data)}, Ref={len(ref_so_data)}") - return None - - built_info = get_elf_build_id_info(built_so_data) - ref_info = get_elf_build_id_info(ref_so_data) - - if not built_info or not ref_info: - print("[-] Build-ID section not found in one of the SO files") - return None - - if built_info['size'] != ref_info['size']: - print(f"[-] Build-ID size mismatch: Built={built_info['size']}, Ref={ref_info['size']}") - return None - - # Replace the build-id bytes in the built SO with the reference ones - so_mutable = bytearray(built_so_data) - start = built_info['offset'] - end = start + built_info['size'] - so_mutable[start:end] = ref_info['value'] - patched_data = bytes(so_mutable) - - # Check if they are now 100% identical - if patched_data == ref_so_data: - print("[+] Patched SO matches reference SO exactly!") - return patched_data - else: - # Check if there are other differences - diffs = [i for i in range(len(patched_data)) if patched_data[i] != ref_so_data[i]] - print(f"[-] Patched SO still differs from reference at {len(diffs)} positions.") - return None - -import zlib - -def find_cd_header_offset(data, filename): - fname_bytes = filename.encode('utf-8') - idx = 0 - while True: - idx = data.find(b"\x50\x4b\x01\x02", idx) - if idx == -1: - break - fn_len = int.from_bytes(data[idx+28:idx+30], 'little') - if fn_len == len(fname_bytes): - if data[idx+46 : idx+46+fn_len] == fname_bytes: - return idx - idx += 4 - return -1 - -def patch_apk(built_apk, ref_apk, output_apk): - try: - if os.path.abspath(built_apk) != os.path.abspath(output_apk): - shutil.copy2(built_apk, output_apk) - - with open(output_apk, "rb") as f: - apk_data = bytearray(f.read()) - - with zipfile.ZipFile(ref_apk, 'r') as z_ref: - ref_so_entries = {name: z_ref.read(name) for name in z_ref.namelist() if name.endswith(".so")} - - with zipfile.ZipFile(output_apk, 'r') as z_built: - built_so_entries = {} - built_so_info = {} - for info in z_built.infolist(): - if info.filename.endswith(".so"): - built_so_entries[info.filename] = z_built.read(info) - built_so_info[info.filename] = info - - patched_count = 0 - for name, built_data in built_so_entries.items(): - if name in ref_so_entries: - print(f"[+] Found shared library in both: {name}") - ref_data = ref_so_entries[name] - patched_so = patch_so_data(built_data, ref_data) - if patched_so: - info = built_so_info[name] - if info.compress_type != 0: - print(f"[-] Shared library {name} is compressed. In-place patching is not supported.") - return False - - new_crc = zlib.crc32(patched_so) & 0xffffffff - local_header_offset = info.header_offset - local_extra_len = int.from_bytes(apk_data[local_header_offset+28 : local_header_offset+30], 'little') - filename_len = len(name.encode('utf-8')) - - data_offset = local_header_offset + 30 + filename_len + local_extra_len - print(f"[+] Writing patched SO to APK data offset: {hex(data_offset)}") - apk_data[data_offset : data_offset + len(patched_so)] = patched_so - - print(f"[+] Updating Local Header CRC-32 to: {hex(new_crc)}") - apk_data[local_header_offset+14 : local_header_offset+18] = new_crc.to_bytes(4, 'little') - - cd_offset = find_cd_header_offset(apk_data, name) - if cd_offset == -1: - print(f"[-] Could not find Central Directory Header for {name}") - return False - - print(f"[+] Updating Central Directory CRC-32 to: {hex(new_crc)}") - apk_data[cd_offset+16 : cd_offset+20] = new_crc.to_bytes(4, 'little') - patched_count += 1 - - if patched_count == 0: - print("[-] No patchable SO files found or patching failed.") - return False - - with open(output_apk, "wb") as f: - f.write(apk_data) - - print(f"[+] Successfully patched APK in-place: {output_apk}") - return True - except Exception as e: - print(f"[-] Exception occurred during patching: {e}") - import traceback - traceback.print_exc() - return False - -if __name__ == "__main__": - if len(sys.argv) < 4: - print("Usage: python patch_so.py ") - sys.exit(1) - success = patch_apk(sys.argv[1], sys.argv[2], sys.argv[3]) - sys.exit(0 if success else 1) diff --git a/workout-logger/.gitignore b/workout-logger/.gitignore index 3820a95..905f107 100644 --- a/workout-logger/.gitignore +++ b/workout-logger/.gitignore @@ -43,3 +43,19 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release + +# Signing Keystore & Credentials +**/android/key.properties +*.jks +*.keystore +*.p12 +.env +.env.* + +# Hive test databases and temporary directories +*.hive +tmp_hive_*/ +**/tmp_hive_*/ + + + diff --git a/workout-logger/CLAUDE.md b/workout-logger/CLAUDE.md index 805596b..06b667e 100644 --- a/workout-logger/CLAUDE.md +++ b/workout-logger/CLAUDE.md @@ -1,9 +1,9 @@ -## graphify +## Guidelines for this flutter app's REPO: +- No inline comments greater then 1 lines +- Only TODO comments are allowed to be multiline +- Always try using modular code, common components, and utility functions to avoid code duplication +- Don't add the spec docs to the commits, just look into this repo: Workout-logger\workout-logger +- Enforce clean UI practices, like splitting widgets when a build method exceeds 80 lines and using StatelessWidget by default +- In every Response provide a userlevel impacts description, and in simple language explain the changes made, why they were made, and how they improve the app's functionality or user experience, and Don't waste tokens on artifacts when it can be explained in simple language +- Use skills at: .agents\skills -This project has a knowledge graph at graphify-out/ with god nodes, community structure, and cross-file relationships. - -Rules: -- ALWAYS read graphify-out/GRAPH_REPORT.md before reading any source files, running grep/glob searches, or answering codebase questions. The graph is your primary map of the codebase. -- IF graphify-out/wiki/index.md EXISTS, navigate it instead of reading raw files -- For cross-module "how does X relate to Y" questions, prefer `graphify query ""`, `graphify path "" ""`, or `graphify explain ""` over grep — these traverse the graph's EXTRACTED + INFERRED edges instead of scanning files -- After modifying code, run `graphify update .` to keep the graph current (AST-only, no API cost). diff --git a/workout-logger/android/app/build.gradle.kts b/workout-logger/android/app/build.gradle.kts index 32e478b..d68c9d8 100644 --- a/workout-logger/android/app/build.gradle.kts +++ b/workout-logger/android/app/build.gradle.kts @@ -1,25 +1,28 @@ import com.android.build.gradle.internal.api.ApkVariantOutputImpl +import java.io.FileInputStream +import java.util.Properties plugins { id("com.android.application") - id("kotlin-android") - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // kotlin-android is injected automatically by Flutter's built-in Kotlin support. + // (android.builtInKotlin=true in gradle.properties) id("dev.flutter.flutter-gradle-plugin") } android { namespace = "com.devasy.repforge" - compileSdk = 36 - compileSdkExtension = 19 + compileSdk = 37 ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } } // Strip AGP's "Dependency metadata" signing block from the APK. It embeds a @@ -33,11 +36,16 @@ android { signingConfigs { create("release") { - val keystorePath = System.getenv("KEYSTORE_PATH") - val storePass = System.getenv("KEY_STORE_PASSWORD") - val alias = System.getenv("KEY_ALIAS") - val keyPass = System.getenv("KEY_PASSWORD") - if (keystorePath != null && storePass != null && alias != null && keyPass != null) { + val keyProperties = Properties() + val keyPropertiesFile = rootProject.file("key.properties") + if (keyPropertiesFile.exists()) { + keyProperties.load(FileInputStream(keyPropertiesFile)) + } + val keystorePath = System.getenv("KEYSTORE_PATH") ?: keyProperties.getProperty("storeFile") + val storePass = System.getenv("KEY_STORE_PASSWORD") ?: keyProperties.getProperty("storePassword") + val alias = System.getenv("KEY_ALIAS") ?: keyProperties.getProperty("keyAlias") + val keyPass = System.getenv("KEY_PASSWORD") ?: keyProperties.getProperty("keyPassword") + if (!keystorePath.isNullOrEmpty() && !storePass.isNullOrEmpty() && !alias.isNullOrEmpty() && !keyPass.isNullOrEmpty()) { storeFile = file(keystorePath) storePassword = storePass keyAlias = alias @@ -53,7 +61,7 @@ android { // supported. If downgrading, remove the health_connector dependency and // all HealthConnectService usages, then restore minSdk to flutter.minSdkVersion. minSdk = 26 - targetSdk = 36 + targetSdk = 37 versionCode = flutter.versionCode versionName = flutter.versionName // App display name; overridden per build type below so debug installs @@ -71,6 +79,12 @@ android { manifestPlaceholders["appLabel"] = "RepForge (Debug)" } release { + isMinifyEnabled = true + isShrinkResources = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) // Uses the production EC P-256 keystore when KEYSTORE_PATH env var is set // (CI injects it via GitHub Secrets). Falls back to the debug key for a // local `flutter run --release` without env vars configured. diff --git a/workout-logger/android/app/proguard-rules.pro b/workout-logger/android/app/proguard-rules.pro new file mode 100644 index 0000000..3dde057 --- /dev/null +++ b/workout-logger/android/app/proguard-rules.pro @@ -0,0 +1,14 @@ +# Suppress missing class warnings for Play Core deferred components in Flutter engine +-dontwarn com.google.android.play.core.** + +# Flutter Wrapper Rules +-keep class io.flutter.app.** { *; } +-keep class io.flutter.plugin.** { *; } +-keep class io.flutter.util.** { *; } +-keep class io.flutter.view.** { *; } +-keep class io.flutter.embedding.** { *; } +-keep class io.flutter.provider.** { *; } +-keep class io.flutter.plugin.editing.** { *; } + +# Keep Native plugins and Health Connect interfaces +-dontwarn com.google.android.gms.** diff --git a/workout-logger/android/gradle.properties b/workout-logger/android/gradle.properties index f018a61..aae5292 100644 --- a/workout-logger/android/gradle.properties +++ b/workout-logger/android/gradle.properties @@ -1,3 +1,7 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=true +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=true diff --git a/workout-logger/android/gradle/wrapper/gradle-wrapper.properties b/workout-logger/android/gradle/wrapper/gradle-wrapper.properties index ac3b479..f587a47 100644 --- a/workout-logger/android/gradle/wrapper/gradle-wrapper.properties +++ b/workout-logger/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip diff --git a/workout-logger/android/key.properties.example b/workout-logger/android/key.properties.example new file mode 100644 index 0000000..24133ee --- /dev/null +++ b/workout-logger/android/key.properties.example @@ -0,0 +1,8 @@ +# Local Android Release Keystore Configuration +# Fill in your local keystore path and passwords below. +# Note: This file should NEVER be committed to Git. + +storeFile=C:/path/to/your/upload-keystore.jks +storePassword=your_store_password +keyAlias=your_key_alias +keyPassword=your_key_password diff --git a/workout-logger/android/settings.gradle.kts b/workout-logger/android/settings.gradle.kts index fb605bc..ca7fe06 100644 --- a/workout-logger/android/settings.gradle.kts +++ b/workout-logger/android/settings.gradle.kts @@ -19,8 +19,8 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.9.1" apply false - id("org.jetbrains.kotlin.android") version "2.1.0" apply false + id("com.android.application") version "8.11.1" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false } include(":app") diff --git a/workout-logger/lib/data/exercise_database.dart b/workout-logger/lib/data/exercise_database.dart index 117b099..31b04e8 100644 --- a/workout-logger/lib/data/exercise_database.dart +++ b/workout-logger/lib/data/exercise_database.dart @@ -116,6 +116,7 @@ class ExerciseDatabase { MuscleActivation(muscleGroupId: MuscleGroups.chest, activationPercentage: 85), ], category: 'isolation', + availableHandles: ['D-Handles', 'Single Arm'], ), Exercise( id: 'pec_deck', @@ -156,6 +157,7 @@ class ExerciseDatabase { MuscleActivation(muscleGroupId: MuscleGroups.rearDelts, activationPercentage: 15), ], category: 'compound', + availableHandles: ['Wide Bar', 'Close Grip V-Bar', 'Neutral Handles'], ), Exercise( id: 'pull_ups', @@ -206,6 +208,7 @@ class ExerciseDatabase { MuscleActivation(muscleGroupId: MuscleGroups.biceps, activationPercentage: 25), ], category: 'compound', + availableHandles: ['V-Bar', 'Straight Bar', 'D-Handles'], ), Exercise( id: 't_bar_row', @@ -238,6 +241,7 @@ class ExerciseDatabase { MuscleActivation(muscleGroupId: MuscleGroups.back, activationPercentage: 20), ], category: 'isolation', + availableHandles: ['Rope', 'V-Bar'], ), // ==================== SHOULDERS ==================== @@ -378,6 +382,7 @@ class ExerciseDatabase { MuscleActivation(muscleGroupId: MuscleGroups.biceps, activationPercentage: 95), ], category: 'isolation', + availableHandles: ['Barbell', 'Dumbbell', 'EZ-Bar', 'Cable Rope'], ), Exercise( id: 'hammer_curl', @@ -411,6 +416,7 @@ class ExerciseDatabase { MuscleActivation(muscleGroupId: MuscleGroups.triceps, activationPercentage: 90), ], category: 'isolation', + availableHandles: ['Rope', 'Bar', 'V-Bar'], ), Exercise( id: 'skull_crushers', @@ -427,6 +433,7 @@ class ExerciseDatabase { MuscleActivation(muscleGroupId: MuscleGroups.triceps, activationPercentage: 90), ], category: 'isolation', + availableHandles: ['Rope', 'Bar', 'Dumbbell'], ), Exercise( id: 'close_grip_bench', @@ -478,6 +485,7 @@ class ExerciseDatabase { MuscleActivation(muscleGroupId: MuscleGroups.core, activationPercentage: 90), ], category: 'isolation', + availableHandles: ['Rope', 'Bar'], ), ]; diff --git a/workout-logger/lib/genui/a2ui.dart b/workout-logger/lib/genui/a2ui.dart new file mode 100644 index 0000000..c8b4873 --- /dev/null +++ b/workout-logger/lib/genui/a2ui.dart @@ -0,0 +1,18 @@ +/// A2UI — a domain-free, model-driven UI layer. +/// +/// Parse untrusted LLM JSON with [A2UiParser], render the resulting +/// [A2UiNode] with [A2UiRenderer], and generate the model's instructions from +/// the same registry with `buildA2UiPromptSection`, so the vocabulary the model +/// is told about and the vocabulary the app can render never diverge. +library; + +export 'src/a2ui_node.dart'; +export 'src/a2ui_parser.dart'; +export 'src/a2ui_prompt.dart'; +export 'src/a2ui_props.dart'; +export 'src/a2ui_registry.dart'; +export 'src/a2ui_renderer.dart'; +export 'src/a2ui_series.dart'; +export 'src/a2ui_spec.dart'; +export 'src/a2ui_theme.dart'; +export 'src/default_registry.dart'; diff --git a/workout-logger/lib/genui/src/a2ui_node.dart b/workout-logger/lib/genui/src/a2ui_node.dart new file mode 100644 index 0000000..ed6e708 --- /dev/null +++ b/workout-logger/lib/genui/src/a2ui_node.dart @@ -0,0 +1,26 @@ +import 'a2ui_props.dart'; + +/// A single parsed node in an A2UI tree. +/// +/// [name] is always canonical (as produced by `A2UiRegistry.canonicalName`), so +/// downstream code never re-normalizes. [children] is populated by the parser +/// for any node that carried a `children` array, which keeps container-ness out +/// of individual specs. +/// +/// [children] is not defensively copied (this is a `const`-constructible +/// value type). Callers must not retain a mutable reference to the list they +/// pass in and mutate it afterward. +class A2UiNode { + const A2UiNode({ + required this.name, + required this.props, + this.children = const [], + }); + + final String name; + final A2UiProps props; + final List children; + + @override + String toString() => 'A2UiNode($name, ${children.length} children)'; +} diff --git a/workout-logger/lib/genui/src/a2ui_panels.dart b/workout-logger/lib/genui/src/a2ui_panels.dart new file mode 100644 index 0000000..1b6ba64 --- /dev/null +++ b/workout-logger/lib/genui/src/a2ui_panels.dart @@ -0,0 +1,145 @@ +import 'package:flutter/widgets.dart'; + +import 'a2ui_theme.dart'; + +/// The card chrome every A2UI component sits inside. +class A2UiPanel extends StatelessWidget { + const A2UiPanel({ + super.key, + required this.child, + required this.theme, + this.padded = true, + }); + + final Widget child; + final A2UiTheme theme; + final bool padded; + + @override + Widget build(BuildContext context) => Container( + padding: padded ? EdgeInsets.all(theme.spacing) : EdgeInsets.zero, + decoration: BoxDecoration( + color: theme.surface, + borderRadius: BorderRadius.circular(theme.radius), + border: Border.all(color: theme.border), + ), + child: child, + ); +} + +/// A panel heading with optional right-aligned trailing text. +class A2UiPanelTitle extends StatelessWidget { + const A2UiPanelTitle({ + super.key, + required this.title, + required this.theme, + this.trailing, + }); + + final String title; + final String? trailing; + final A2UiTheme theme; + + @override + Widget build(BuildContext context) { + final label = trailing; + return Row( + children: [ + Expanded( + child: Text( + title, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: TextStyle( + color: theme.textPrimary, + fontSize: 14, + fontWeight: FontWeight.w700, + ), + ), + ), + if (label != null && label.isNotEmpty) + Flexible( + child: Text( + label, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle(color: theme.textFaint, fontSize: 11), + ), + ), + ], + ); + } +} + +/// Shown in place of a chart when a component parsed but carries no data. +/// +/// Deliberately visible rather than a blank `SizedBox`: a silent disappearance +/// hides model errors, a labelled panel surfaces them. +class A2UiEmptyPanel extends StatelessWidget { + const A2UiEmptyPanel({ + super.key, + required this.message, + required this.theme, + }); + + final String message; + final A2UiTheme theme; + + @override + Widget build(BuildContext context) => A2UiPanel( + theme: theme, + child: Center( + child: Text( + message, + textAlign: TextAlign.center, + style: TextStyle(color: theme.textMuted, fontSize: 12), + ), + ), + ); +} + +/// Series legend shared by the line, bar and radar renderers. +class A2UiLegend extends StatelessWidget { + const A2UiLegend({ + super.key, + required this.names, + required this.theme, + this.dots = false, + }); + + final List names; + final A2UiTheme theme; + final bool dots; + + @override + Widget build(BuildContext context) => Wrap( + spacing: 12, + runSpacing: 4, + children: [ + for (var i = 0; i < names.length; i++) + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Container( + width: dots ? 8 : 10, + height: dots ? 8 : 3, + decoration: BoxDecoration( + color: theme.seriesColor(i), + shape: dots ? BoxShape.circle : BoxShape.rectangle, + borderRadius: dots ? null : BorderRadius.circular(2), + ), + ), + const SizedBox(width: 4), + Text( + names[i], + style: TextStyle( + color: theme.textMuted, + fontSize: 11, + fontWeight: FontWeight.w500, + ), + ), + ], + ), + ], + ); +} diff --git a/workout-logger/lib/genui/src/a2ui_parser.dart b/workout-logger/lib/genui/src/a2ui_parser.dart new file mode 100644 index 0000000..7d5ee66 --- /dev/null +++ b/workout-logger/lib/genui/src/a2ui_parser.dart @@ -0,0 +1,295 @@ +import 'dart:convert'; + +import 'a2ui_node.dart'; +import 'a2ui_props.dart'; +import 'a2ui_registry.dart'; + +/// Turns model output into an [A2UiNode] tree, or null when the text is prose. +/// +/// This is the single gate that decides whether a reply is a UI payload. Once a +/// tree exists, every spec's `parseProps` is guaranteed to succeed, so no +/// component-level validation is needed or wanted. +class A2UiParser { + const A2UiParser(this.registry); + + final A2UiRegistry registry; + + /// Canonical name used when auto-wrapping a bare list of components. + static const String _containerName = 'GridContainer'; + + /// Keys that may hold an envelope of components at the top level. + static const List _envelopeKeys = [ + 'components', + 'children', + 'ui', + 'elements', + ]; + + /// Keys that may hold a node's structural child components. + /// + /// This mirrors `_envelopeKeys` minus `ui` (which only makes sense as a + /// whole-document envelope, not a per-node prop): `components`/`elements`/ + /// `content` are accepted tolerantly alongside the canonical `children`, + /// but `items` is deliberately excluded — see `_firstChildList` for why. + static const List _childKeys = [ + 'children', + 'components', + 'elements', + 'content', + ]; + + A2UiNode? parse(String text) { + final json = _extractJson(text); + if (json == null) return null; + // A bare top-level array is ambiguous when it holds exactly one item — + // it may be an intentional list or just a single component that happens + // to be array-wrapped, so a single item collapses to itself rather than + // being wrapped in a container. + if (json is List) return _wrap(json, collapseSingle: true); + if (json is Map) return parseJson(A2UiProps.stringKeyed(json)); + return null; + } + + A2UiNode? parseJson(Map json) { + final props = A2UiProps(json); + + final rawName = props.textOrNull('component'); + final spec = rawName == null ? null : registry.specFor(rawName); + + if (spec == null) { + // No component key — try each envelope shape before giving up. An + // envelope key is an explicit "this is a container of components" + // signal from the model, so even a single-item envelope still + // produces a GridContainer rather than collapsing to the bare child. + for (final key in _envelopeKeys) { + final candidate = json[key]; + if (candidate is List) { + final wrapped = _wrap( + candidate, + columns: props.integer('columns', or: 1), + collapseSingle: false, + ); + if (wrapped != null) return wrapped; + } + } + return null; + } + + // Accept both `{component, props:{...}}` and the flat `{component, ...}`. + final rawProps = json['props']; + final Map effective; + if (rawProps is Map) { + final merged = A2UiProps.stringKeyed(rawProps); + // A model may write a node's children as a sibling of `props` rather + // than nested inside it, e.g. `{component, props:{...}, children:[...]}`. + // Fold any such outer child-key into `effective` when `props` doesn't + // already define it — `props` always wins on a genuine conflict. + for (final key in _childKeys) { + if (!merged.containsKey(key) && json.containsKey(key)) { + merged[key] = json[key]; + } + } + effective = merged; + } else { + effective = Map.from(json)..remove('component'); + } + + final children = _parseChildren(A2UiProps(effective)); + + // A container that lost every child carries no information — treat the + // whole payload as unusable so the caller falls back to Markdown. + if (children.isEmpty && _declaresChildren(effective)) return null; + + return A2UiNode( + name: spec.name, + props: A2UiProps(effective), + children: children, + ); + } + + /// True when the text is on its way to being a JSON payload, so a streaming + /// UI can show a "building" indicator instead of raw JSON. + bool looksLikeUi(String partialText) { + final t = stripFences(partialText).trimLeft(); + if (t.isNotEmpty && (t.startsWith('{') || t.startsWith('['))) return true; + + // `stripFences` only strips a *leading* fence, so a model that writes a + // sentence before opening a fenced block (e.g. "Here's your data:\n```json\n{...") + // falls through to here. Cheaply check for a ``` fence opened anywhere + // in the streamed-so-far text that hasn't been closed yet — that's a + // strong signal a payload is arriving inside it, without re-scanning or + // parsing the whole string on every frame. + final openFence = partialText.indexOf('```'); + if (openFence == -1) return false; + final closeFence = partialText.indexOf('```', openFence + 3); + return closeFence == -1; + } + + /// Removes a leading ``` fence (with or without a language tag) and a + /// trailing ``` fence, tolerating an unterminated fence mid-stream. + static String stripFences(String text) { + var t = text.trim(); + if (!t.startsWith('```')) return t; + final firstLineEnd = t.indexOf('\n'); + t = firstLineEnd == -1 ? '' : t.substring(firstLineEnd + 1); + if (t.endsWith('```')) t = t.substring(0, t.length - 3); + return t.trim(); + } + + // Structural children are a tree-shape signal, not a semantic content + // value like `title` — so unlike other props they must NOT go through + // A2UiProps.lookup's alias resolution. `keyAliases['children']` includes + // `items` as a convenience alias, but `items` is also DataListGroup's own + // canonical key for its (non-component) data rows; resolving it there + // would make the parser mistake a DataListGroup's `items` list for child + // nodes, fail to parse any of them as components, and then discard the + // whole node as if it had declared-but-empty children. `_childKeys` checks + // a fixed, literal set of keys instead — the same tolerant spelling + // `_envelopeKeys` already accepts at the top level (`components`/ + // `elements`/`content` alongside `children`), while still deliberately + // excluding `items`, which is the one key that actually collides. + List _parseChildren(A2UiProps props) { + final raw = _firstChildList(props.raw); + if (raw is! List) return const []; + final out = []; + for (final child in raw) { + if (child is! Map) continue; + final node = parseJson(A2UiProps.stringKeyed(child)); + if (node != null) out.add(node); + } + return out; + } + + bool _declaresChildren(Map props) => + _firstChildList(props) is List; + + /// Returns the value of the first key in `_childKeys` present in [props], + /// or null if none of them are — a literal, non-alias-resolved lookup. + Object? _firstChildList(Map props) { + for (final key in _childKeys) { + final value = props[key]; + if (value != null) return value; + } + return null; + } + + /// Wraps [items] in a `GridContainer`, dropping any item that isn't a + /// recognised component. When [collapseSingle] is true, a single + /// surviving child is returned bare instead of wrapped — used for the + /// bare top-level array case, where a one-item array is ambiguous + /// between "a list with one component" and "just a component". Envelope + /// keys (`components`, `children`, `ui`, `elements`) pass + /// `collapseSingle: false` because naming an envelope key is an explicit + /// request for a container, even with one child. + A2UiNode? _wrap( + List items, { + int columns = 1, + required bool collapseSingle, + }) { + final children = []; + for (final item in items) { + if (item is! Map) continue; + final node = parseJson(A2UiProps.stringKeyed(item)); + if (node != null) children.add(node); + } + if (children.isEmpty) return null; + if (collapseSingle && children.length == 1) return children.single; + return A2UiNode( + name: _containerName, + props: A2UiProps({'columns': columns}), + children: children, + ); + } + + /// Pulls a JSON object or array out of [text], tolerating fences and + /// surrounding prose. Returns null when nothing decodes. + /// + /// Rather than slicing from the first `{`/`[` to the last `}`/`]` in the + /// whole text (which breaks the moment prose contains any stray brace, + /// e.g. "add reps {optional}"), this scans every position that could + /// start a JSON value, walks forward with a bracket-depth counter that + /// tracks whether it's inside a string literal (so quoted brackets don't + /// affect balance and `\"` doesn't end a string early), and attempts + /// `jsonDecode` on each balanced span found. Among all spans that decode + /// successfully to a Map or List, the longest one wins: the actual + /// payload is normally the largest well-formed JSON structure in the + /// text, while incidental prose braces either fail to decode (not valid + /// JSON) or are short. + static Object? _extractJson(String text) { + final t = stripFences(text); + if (t.isEmpty) return null; + + // Fast path: the common case is a reply that's nothing but JSON, with no + // surrounding prose. Trying the whole trimmed text first avoids the + // per-position balanced-span scan below for that case; it changes no + // behaviour, since a fully-decodable whole string is always the longest + // possible candidate the scan could have found anyway. + try { + final whole = jsonDecode(t); + if (whole is Map || whole is List) return whole; + } catch (_) { + // Not decodable as-is — fall through to the scan for prose-wrapped JSON. + } + + String? bestCandidate; + Object? bestValue; + + for (var i = 0; i < t.length; i++) { + final ch = t[i]; + if (ch != '{' && ch != '[') continue; + final end = _findBalancedEnd(t, i); + if (end == -1) continue; + + final candidate = t.substring(i, end + 1); + Object? decoded; + try { + decoded = jsonDecode(candidate); + } catch (_) { + continue; + } + if (decoded is! Map && decoded is! List) continue; + + if (bestCandidate == null || candidate.length > bestCandidate.length) { + bestCandidate = candidate; + bestValue = decoded; + } + } + + return bestValue; + } + + /// Returns the index of the character that closes the bracket opened at + /// [start] (a `{` or `[`), or -1 if the text ends before it balances. + /// Characters inside a `"..."` string literal never affect the depth + /// count, and a `\` inside a string escapes the next character so `\"` + /// doesn't end the string early. + static int _findBalancedEnd(String t, int start) { + var depth = 0; + var inString = false; + var escaped = false; + for (var i = start; i < t.length; i++) { + final ch = t[i]; + if (inString) { + if (escaped) { + escaped = false; + } else if (ch == '\\') { + escaped = true; + } else if (ch == '"') { + inString = false; + } + continue; + } + if (ch == '"') { + inString = true; + continue; + } + if (ch == '{' || ch == '[') { + depth++; + } else if (ch == '}' || ch == ']') { + depth--; + if (depth == 0) return i; + } + } + return -1; + } +} diff --git a/workout-logger/lib/genui/src/a2ui_prompt.dart b/workout-logger/lib/genui/src/a2ui_prompt.dart new file mode 100644 index 0000000..fe9162f --- /dev/null +++ b/workout-logger/lib/genui/src/a2ui_prompt.dart @@ -0,0 +1,68 @@ +import 'dart:convert'; + +import 'a2ui_registry.dart'; + +/// Builds the A2UI instruction block for an LLM system prompt. +/// +/// Generated from [registry] rather than hand-written, so a schema change in a +/// spec reaches the model automatically and the vocabulary advertised can never +/// exceed the vocabulary the renderer supports. +/// +/// Output is deterministic for a given registry so it can sit inside a cached +/// prompt prefix. +String buildA2UiPromptSection(A2UiRegistry registry, {String? envelopeNote}) { + final buf = StringBuffer() + ..writeln( + 'To answer with a visual dashboard instead of prose, return ONE JSON ' + 'object and nothing else — no Markdown fence, no commentary before or ' + 'after. Wrap multiple components in a GridContainer.', + ) + ..writeln() + ..writeln('Envelope: {"component": "", "props": { ... }}') + ..writeln(); + + if (envelopeNote != null && envelopeNote.isNotEmpty) { + buf + ..writeln(envelopeNote) + ..writeln(); + } + + buf.writeln('AVAILABLE COMPONENTS — use these names and props only:'); + for (final spec in registry.specs) { + buf + ..writeln(' ${spec.doc.schema}') + ..writeln(' ${spec.doc.purpose}'); + } + + buf + ..writeln() + ..writeln('WORKED EXAMPLE:') + ..writeln(_example(registry)) + ..writeln() + ..writeln( + 'TOLERANCES — you do not need to be perfect: a number may be sent as a ' + 'number or a numeric string, prop names are matched ignoring case and ' + 'underscores, unknown props are ignored, and any prop marked ? may be ' + 'omitted. Prefer real numbers and the exact names above.', + ) + ..writeln( + 'Never invent a component name that is not listed. If you have no data ' + 'to show, reply in prose instead of returning an empty dashboard.', + ); + + return buf.toString(); +} + +/// A GridContainer wrapping the first two non-container examples, pretty-printed +/// so the model sees the nesting clearly. +String _example(A2UiRegistry registry) { + final children = [ + for (final spec in registry.specs) + if (spec.name != 'GridContainer') spec.doc.example, + ].take(2).toList(); + + return const JsonEncoder.withIndent(' ').convert({ + 'component': 'GridContainer', + 'props': {'columns': 2, 'children': children}, + }); +} diff --git a/workout-logger/lib/genui/src/a2ui_props.dart b/workout-logger/lib/genui/src/a2ui_props.dart new file mode 100644 index 0000000..ba5087c --- /dev/null +++ b/workout-logger/lib/genui/src/a2ui_props.dart @@ -0,0 +1,143 @@ +/// A never-throwing, alias-aware, coercing view over a component's raw props. +/// +/// Model-generated JSON is unreliable: keys arrive in the wrong case, numbers +/// arrive as strings, optional keys go missing. Every accessor here degrades to +/// a documented fallback instead of throwing, so renderer widgets can be +/// written against typed data with no defensive casting. +class A2UiProps { + const A2UiProps(this.raw); + + final Map raw; + + static const A2UiProps empty = A2UiProps({}); + + /// Semantic aliases, keyed by the canonical name a component asks for. + /// + /// Resolution is per-requested-key, so the same alias may appear under more + /// than one canonical key (`data` means `values` to a chart and `items` to a + /// list) without ambiguity — each component only asks for keys it owns. + static const Map> keyAliases = { + 'title': ['name', 'label', 'heading', 'header'], + 'subtitle': ['caption', 'description', 'sub', 'summary'], + 'value': ['val', 'amount', 'number', 'metric', 'score'], + 'unit': ['units', 'suffix'], + 'labels': ['axes', 'categories', 'xLabels', 'xAxis', 'x'], + 'values': ['data', 'ys', 'y', 'points'], + 'series': ['datasets', 'lines', 'groups'], + 'items': ['rows', 'entries', 'records', 'data'], + 'children': ['components', 'elements', 'content', 'items'], + 'points': ['data', 'coordinates', 'coords', 'pairs'], + 'options': ['chips', 'choices', 'tags', 'filters'], + 'activeOption': ['active', 'selected', 'selectedOption', 'current'], + 'type': ['chartType', 'kind', 'variant'], + 'trend': ['direction', 'change'], + 'status': ['state', 'badge'], + 'columns': ['cols', 'columnCount'], + 'xLabel': ['xTitle', 'xAxisLabel'], + 'yLabel': ['yTitle', 'yAxisLabel'], + 'primaryText': ['primary', 'title', 'name', 'left'], + 'secondaryText': ['secondary', 'subtitle', 'detail', 'description'], + 'trailingValue': ['trailing', 'value', 'right', 'amount'], + 'correlation': ['r', 'pearson', 'pearsonR'], + 'min': ['minimum', 'minValue'], + 'max': ['maximum', 'maxValue'], + }; + + /// Strips case, underscores, hyphens and spaces so `x_label`, `X Label` and + /// `XLABEL` all collapse to the same lookup token. + static String normalizeKey(String key) { + final buf = StringBuffer(); + for (final rune in key.runes) { + final ch = String.fromCharCode(rune); + if (ch == '_' || ch == '-' || ch == ' ') continue; + buf.write(ch.toLowerCase()); + } + return buf.toString(); + } + + /// Resolves [key] against the raw map: exact hit, then normalized hit, then + /// each semantic alias in declaration order. Returns null when nothing + /// matches or the matched value is null. + Object? lookup(String key) { + final direct = raw[key]; + if (direct != null) return direct; + + final wanted = normalizeKey(key); + for (final entry in raw.entries) { + if (entry.value == null) continue; + if (normalizeKey(entry.key) == wanted) return entry.value; + } + + for (final alias in keyAliases[key] ?? const []) { + final aliasWanted = normalizeKey(alias); + for (final entry in raw.entries) { + if (entry.value == null) continue; + if (normalizeKey(entry.key) == aliasWanted) return entry.value; + } + } + return null; + } + + String? textOrNull(String key) { + final v = lookup(key); + if (v == null) return null; + if (v is String) return v; + if (v is num || v is bool) return v.toString(); + return null; + } + + String text(String key, {String or = ''}) => textOrNull(key) ?? or; + + double? numberOrNull(String key) => _toNumber(lookup(key)); + + double number(String key, {double or = 0}) => numberOrNull(key) ?? or; + + int integer(String key, {int or = 0}) => numberOrNull(key)?.toInt() ?? or; + + List stringList(String key) { + final v = lookup(key); + if (v is! List) return const []; + return [ + for (final item in v) + if (item != null) item.toString(), + ]; + } + + List numberList(String key) { + final v = lookup(key); + if (v is! List) return const []; + return [ + for (final item in v) + if (_toNumber(item) case final double n) n, + ]; + } + + List objectList(String key) { + final v = lookup(key); + if (v is! List) return const []; + return [ + for (final item in v) + if (item is Map) A2UiProps(stringKeyed(item)), + ]; + } + + /// Re-keys a decoded JSON map to `Map`. + static Map stringKeyed(Map input) => { + for (final entry in input.entries) entry.key.toString(): entry.value, + }; + + static double? _toNumber(Object? value) { + if (value is num) { + if (value.isNaN || value.isInfinite) return null; + return value.toDouble(); + } + if (value is String) { + final cleaned = value.replaceAll(',', '').replaceAll('%', '').trim(); + final parsed = double.tryParse(cleaned); + if (parsed == null || parsed.isNaN || parsed.isInfinite) return null; + return parsed; + } + if (value is bool) return value ? 1 : 0; + return null; + } +} diff --git a/workout-logger/lib/genui/src/a2ui_registry.dart b/workout-logger/lib/genui/src/a2ui_registry.dart new file mode 100644 index 0000000..3a917ef --- /dev/null +++ b/workout-logger/lib/genui/src/a2ui_registry.dart @@ -0,0 +1,79 @@ +import 'package:flutter/widgets.dart'; + +import 'a2ui_props.dart'; +import 'a2ui_spec.dart'; +import 'default_registry.dart'; + +/// Normalized-name → spec lookup. +/// +/// Replaces the old triple of `allowedA2UiComponents`, the validation `switch` +/// and the render `switch`: registering a spec adds it to all three at once. +class A2UiRegistry { + A2UiRegistry(List specs) : _specs = List.unmodifiable(specs) { + for (final spec in _specs) { + _register(A2UiProps.normalizeKey(spec.name), spec); + for (final alias in spec.aliases) { + _register(A2UiProps.normalizeKey(alias), spec); + } + } + } + + /// Inserts [spec] under [key], throwing if [key] is already claimed — + /// whether by a canonical name, an alias, or a repeat registration of the + /// same spec class. Collisions are checked at insertion time in + /// registration order so the error always names both the spec already + /// registered and the one that collided with it, rather than silently + /// overwriting or being silently dropped. (Const specs with identical + /// fields canonicalize to `==` instances, so identity/equality checks + /// can't be used to distinguish "same spec registered twice" from "two + /// different specs that happen to collide" — every repeat claim of a key + /// is treated as a collision.) + void _register(String key, A2UiSpec spec) { + final existing = _byName[key]; + if (existing != null) { + throw StateError( + 'A2UiRegistry: "$key" is claimed by both ' + '${existing.name} and ${spec.name} (canonical name or alias ' + 'collision). Component names and aliases must be unique across ' + 'the registry.', + ); + } + _byName[key] = spec; + } + + final List _specs; + final Map _byName = {}; + + List get specs => _specs; + + /// Looks up a spec by canonical name or any alias, ignoring case and + /// separators (`stat_card`, `Stat Card` and `STATCARD` all match `StatCard`). + A2UiSpec? specFor(String rawName) => + _byName[A2UiProps.normalizeKey(rawName)]; + + String? canonicalName(String rawName) => specFor(rawName)?.name; +} + +/// Supplies an [A2UiRegistry] to the renderer subtree. +/// +/// Absent a provider, [of] returns [defaultA2UiRegistry] so the package +/// renders standalone in tests and previews. +class A2UiRegistryProvider extends InheritedWidget { + const A2UiRegistryProvider({ + super.key, + required this.registry, + required super.child, + }); + + final A2UiRegistry registry; + + static A2UiRegistry of(BuildContext context) => + context + .dependOnInheritedWidgetOfExactType() + ?.registry ?? + defaultA2UiRegistry; + + @override + bool updateShouldNotify(A2UiRegistryProvider oldWidget) => + oldWidget.registry != registry; +} diff --git a/workout-logger/lib/genui/src/a2ui_renderer.dart b/workout-logger/lib/genui/src/a2ui_renderer.dart new file mode 100644 index 0000000..8938523 --- /dev/null +++ b/workout-logger/lib/genui/src/a2ui_renderer.dart @@ -0,0 +1,42 @@ +import 'package:flutter/foundation.dart'; +import 'package:flutter/widgets.dart'; + +import 'a2ui_node.dart'; +import 'a2ui_registry.dart'; +import 'a2ui_theme.dart'; + +/// Renders an [A2UiNode] tree as Flutter widgets. +/// +/// Purely presentational and fully local — no network, no side effects. Theme +/// comes from the nearest [A2UiThemeProvider], falling back to +/// [A2UiTheme.dark]. Registry comes from the explicit [registry] override if +/// given, else the nearest [A2UiRegistryProvider], falling back to +/// [defaultA2UiRegistry] — and whichever registry is resolved here is made +/// ambient to nested [A2UiRenderer] calls (e.g. from `GridContainer`) via +/// [A2UiRegistryProvider], so an override at any level of the tree propagates +/// to everything below it instead of silently reverting to the default past +/// one level of nesting. +class A2UiRenderer extends StatelessWidget { + const A2UiRenderer({super.key, required this.node, this.registry}); + + final A2UiNode node; + + /// Defaults to [defaultA2UiRegistry]; override to render a custom vocabulary. + final A2UiRegistry? registry; + + @override + Widget build(BuildContext context) { + final resolvedRegistry = registry ?? A2UiRegistryProvider.of(context); + final spec = resolvedRegistry.specFor(node.name); + if (spec == null) { + if (kDebugMode) { + debugPrint('A2UiRenderer: no spec registered for "${node.name}"'); + } + return const SizedBox.shrink(); + } + return A2UiRegistryProvider( + registry: resolvedRegistry, + child: spec.render(context, node, A2UiThemeProvider.of(context)), + ); + } +} diff --git a/workout-logger/lib/genui/src/a2ui_series.dart b/workout-logger/lib/genui/src/a2ui_series.dart new file mode 100644 index 0000000..2f49db1 --- /dev/null +++ b/workout-logger/lib/genui/src/a2ui_series.dart @@ -0,0 +1,70 @@ +import 'a2ui_props.dart'; + +/// One named run of numbers plotted against a shared categorical axis. +/// +/// This is the single categorical shape in A2UI: line, bar, pie and radar all +/// consume it, so a model that learns `{labels, series}` once can drive four +/// components. +class A2UiSeries { + const A2UiSeries({required this.name, required this.values}); + + final String name; + final List values; + + /// Pulls series out of [props], accepting either the full + /// `series:[{name, values}]` form or the `values:[...]` shorthand. + /// + /// Entries with no parseable numbers are dropped, so callers can treat a + /// non-empty result as renderable. + static List extract( + A2UiProps props, { + String fallbackName = 'Value', + }) { + final rawSeries = props.objectList('series'); + if (rawSeries.isNotEmpty) { + final out = []; + for (var i = 0; i < rawSeries.length; i++) { + final values = rawSeries[i].numberList('values'); + if (values.isEmpty) continue; + out.add(A2UiSeries( + name: rawSeries[i].text('name', or: 'Series ${i + 1}'), + values: values, + )); + } + if (out.isNotEmpty) return out; + } + + final flat = props.numberList('values'); + if (flat.isNotEmpty) { + return [A2UiSeries(name: fallbackName, values: flat)]; + } + + return const []; + } + + /// Largest value across [series], or 0 when there is nothing to plot. + static double maxValue(List series) { + double? max; + for (final s in series) { + for (final v in s.values) { + if (max == null || v > max) max = v; + } + } + return max ?? 0.0; + } + + /// Smallest value across [series], or 0 when there is nothing to plot. + /// + /// Mirrors [maxValue]: returns the true minimum (which may be negative or + /// positive) rather than clamping to 0, so callers can distinguish "no + /// data" from "all values are positive/negative". + static double minValue(List series) { + double? min; + for (final s in series) { + for (final v in s.values) { + if (min == null || v < min) min = v; + } + } + return min ?? 0.0; + } +} diff --git a/workout-logger/lib/genui/src/a2ui_spec.dart b/workout-logger/lib/genui/src/a2ui_spec.dart new file mode 100644 index 0000000..6735080 --- /dev/null +++ b/workout-logger/lib/genui/src/a2ui_spec.dart @@ -0,0 +1,67 @@ +import 'package:flutter/widgets.dart'; + +import 'a2ui_node.dart'; +import 'a2ui_theme.dart'; + +/// Prompt-facing documentation for a component. +/// +/// This is the single source the LLM system prompt is generated from, so a +/// schema change here propagates to the model automatically. +@immutable +class A2UiDoc { + const A2UiDoc({ + required this.schema, + required this.purpose, + required this.example, + }); + + /// One-line prop signature, e.g. `StatCard {title, value, subtitle?, trend?}`. + final String schema; + + /// When the model should reach for this component, in one sentence. + final String purpose; + + /// A complete, valid payload used as a few-shot example. + final Map example; +} + +/// The four-in-one contract for an A2UI component: it names itself, parses its +/// own props into a typed record, builds itself from that record, and documents +/// itself for the prompt. +/// +/// Because all four live on one object, the vocabulary advertised to the model, +/// the shapes accepted by the parser and the shapes consumed by the renderer +/// cannot drift apart. +abstract class A2UiSpec

{ + const A2UiSpec(); + + /// Canonical component name as it appears in JSON, e.g. `StatCard`. + String get name; + + /// Additional names accepted for this component. Matching is case- and + /// separator-insensitive, so only semantically distinct spellings belong here. + List get aliases => const []; + + A2UiDoc get doc; + + /// Converts a node into a typed props record. + /// + /// Implementations MUST NOT throw and MUST NOT return null — degrade to + /// documented fallbacks instead. Deciding whether a payload is UI at all is + /// the parser's job, not this method's. + P parseProps(A2UiNode node); + + // `buildWidget`/`render` deliberately keep positional arguments rather than + // named ones: this is a build-style API (context, then the thing being + // built, then ambient config), mirroring Flutter's own `Widget + // build(BuildContext context)` convention that every implementation and + // call site in this codebase already follows. Every implementation is a + // one-line override, so argument-order mistakes surface immediately as a + // type error rather than silently compiling wrong — named parameters would + // add call-site noise without a corresponding safety win here. + Widget buildWidget(BuildContext context, P props, A2UiTheme theme); + + /// Type-erased entry point used by the renderer. + Widget render(BuildContext context, A2UiNode node, A2UiTheme theme) => + buildWidget(context, parseProps(node), theme); +} diff --git a/workout-logger/lib/genui/src/a2ui_theme.dart b/workout-logger/lib/genui/src/a2ui_theme.dart new file mode 100644 index 0000000..1611352 --- /dev/null +++ b/workout-logger/lib/genui/src/a2ui_theme.dart @@ -0,0 +1,99 @@ +import 'package:flutter/widgets.dart'; + +/// Visual tokens the A2UI renderer draws with. +/// +/// Injected rather than imported so `lib/genui/` carries no dependency on any +/// particular app's design system. +@immutable +class A2UiTheme { + const A2UiTheme({ + required this.surface, + required this.border, + required this.divider, + required this.textPrimary, + required this.textSoft, + required this.textMuted, + required this.textFaint, + required this.accent, + required this.positive, + required this.negative, + required this.seriesPalette, + required this.spacing, + required this.radius, + required this.pillRadius, + }); + + final Color surface; + final Color border; + final Color divider; + final Color textPrimary; + final Color textSoft; + final Color textMuted; + final Color textFaint; + final Color accent; + final Color positive; + final Color negative; + final List seriesPalette; + final double spacing; + final double radius; + final double pillRadius; + + /// Colour for series index [i], cycling through [seriesPalette]. + Color seriesColor(int i) { + assert( + seriesPalette.isNotEmpty, + 'seriesPalette must not be empty — seriesColor() indexes into it ' + 'with a modulo, which throws on an empty list.', + ); + if (seriesPalette.isEmpty) return accent; + return seriesPalette[i % seriesPalette.length]; + } + + /// Neutral dark default so the package renders standalone. + static const A2UiTheme dark = A2UiTheme( + surface: Color(0xFF11111A), + border: Color(0x12FFFFFF), + divider: Color(0x0FFFFFFF), + textPrimary: Color(0xFFF4F4F8), + textSoft: Color(0xB8F4F4F8), + textMuted: Color(0x7AF4F4F8), + textFaint: Color(0x52F4F4F8), + accent: Color(0xFF7C3AED), + positive: Color(0xFF00C89B), + negative: Color(0xFFE05040), + seriesPalette: [ + Color(0xFF7C3AED), + Color(0xFF00C2D4), + Color(0xFF00C89B), + Color(0xFFDBA520), + Color(0xFFE05040), + ], + spacing: 16, + radius: 16, + pillRadius: 999, + ); +} + +/// Supplies an [A2UiTheme] to the renderer subtree. +/// +/// Absent a provider, [of] returns [A2UiTheme.dark] so the package renders +/// standalone in tests and previews. +class A2UiThemeProvider extends InheritedWidget { + const A2UiThemeProvider({ + super.key, + required this.theme, + required super.child, + }); + + final A2UiTheme theme; + + static A2UiTheme of(BuildContext context) => + context + .dependOnInheritedWidgetOfExactType() + ?.theme ?? + A2UiTheme.dark; + + @override + bool updateShouldNotify(A2UiThemeProvider oldWidget) => + oldWidget.theme != theme; +} diff --git a/workout-logger/lib/genui/src/components/data_list_group.dart b/workout-logger/lib/genui/src/components/data_list_group.dart new file mode 100644 index 0000000..a2db1d0 --- /dev/null +++ b/workout-logger/lib/genui/src/components/data_list_group.dart @@ -0,0 +1,241 @@ +import 'package:flutter/material.dart'; + +import '../a2ui_node.dart'; +import '../a2ui_panels.dart'; +import '../a2ui_props.dart'; +import '../a2ui_spec.dart'; +import '../a2ui_theme.dart'; + +@immutable +class A2UiListRow { + const A2UiListRow({ + required this.primaryText, + this.secondaryText, + this.trailingValue, + }); + + final String primaryText; + final String? secondaryText; + final String? trailingValue; +} + +@immutable +class DataListGroupProps { + const DataListGroupProps({required this.rows, this.title}); + + /// Null renders no header — the old code cast this to a non-null String. + final String? title; + final List rows; + + bool get hasData => rows.isNotEmpty; +} + +/// A titled list of primary / secondary / trailing rows. +class DataListGroupSpec extends A2UiSpec { + const DataListGroupSpec(); + + @override + String get name => 'DataListGroup'; + + @override + List get aliases => const ['DataList', 'ListGroup', 'Table', 'List']; + + @override + A2UiDoc get doc => const A2UiDoc( + schema: 'DataListGroup {title?, items: ' + '[{primaryText, secondaryText?, trailingValue?}]}', + purpose: + 'A short ranked or dated list. Use for records, recent sessions ' + 'and top-N breakdowns.', + example: { + 'component': 'DataListGroup', + 'props': { + 'title': 'Recent Personal Records', + 'items': [ + { + 'primaryText': 'Bench Press', + 'secondaryText': '2026-07-04', + 'trailingValue': '102.5 kg', + }, + { + 'primaryText': 'Back Squat', + 'secondaryText': '2026-06-28', + 'trailingValue': '140 kg', + }, + ], + }, + }, + ); + + @override + DataListGroupProps parseProps(A2UiNode node) { + final p = node.props; + final title = p.textOrNull('title'); + + final rows = []; + final raw = p.lookup('items'); + if (raw is List) { + for (final item in raw) { + final row = _row(item); + if (row != null) rows.add(row); + } + } + + return DataListGroupProps( + title: (title == null || title.isEmpty) ? null : title, + rows: rows, + ); + } + + /// Builds a row from a map or a bare scalar, or returns null when the item + /// carries nothing displayable. + A2UiListRow? _row(Object? item) { + if (item is String || item is num || item is bool) { + return A2UiListRow(primaryText: item.toString()); + } + if (item is! Map) return null; + + final props = A2UiProps(A2UiProps.stringKeyed(item)); + var primary = props.textOrNull('primaryText'); + + // Last resort: the first value in the map that stringifies, so a row keyed + // with unexpected names still shows something. + if (primary == null || primary.isEmpty) { + for (final value in props.raw.values) { + if (value is String && value.isNotEmpty) { + primary = value; + break; + } + if (value is num || value is bool) { + primary = value.toString(); + break; + } + } + } + if (primary == null || primary.isEmpty) return null; + + final secondary = props.textOrNull('secondaryText'); + final trailing = props.textOrNull('trailingValue'); + + return A2UiListRow( + primaryText: primary, + secondaryText: + (secondary == null || secondary.isEmpty || secondary == primary) + ? null + : secondary, + trailingValue: (trailing == null || trailing.isEmpty || trailing == primary) + ? null + : trailing, + ); + } + + @override + Widget buildWidget( + BuildContext context, + DataListGroupProps props, + A2UiTheme theme, + ) { + if (!props.hasData) { + return A2UiEmptyPanel( + message: '${props.title ?? 'List'}: No items available', + theme: theme, + ); + } + + return A2UiPanel( + theme: theme, + padded: false, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + if (props.title case final String title) + Padding( + padding: EdgeInsets.all(theme.spacing), + child: Text( + title, + style: TextStyle( + color: theme.textPrimary, + fontSize: 14, + fontWeight: FontWeight.w700, + ), + ), + ), + for (var i = 0; i < props.rows.length; i++) + _Row( + row: props.rows[i], + theme: theme, + showDivider: i < props.rows.length - 1, + ), + ], + ), + ); + } +} + +class _Row extends StatelessWidget { + const _Row({ + required this.row, + required this.theme, + required this.showDivider, + }); + + final A2UiListRow row; + final A2UiTheme theme; + final bool showDivider; + + @override + Widget build(BuildContext context) => Container( + padding: EdgeInsets.symmetric( + horizontal: theme.spacing, + vertical: theme.spacing / 2 + 2, + ), + decoration: BoxDecoration( + border: showDivider + ? Border(bottom: BorderSide(color: theme.divider)) + : null, + ), + child: Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + row.primaryText, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + color: theme.textPrimary, + fontSize: 13, + fontWeight: FontWeight.w600, + ), + ), + if (row.secondaryText case final String secondary) ...[ + const SizedBox(height: 2), + Text( + secondary, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: TextStyle(color: theme.textMuted, fontSize: 11), + ), + ], + ], + ), + ), + if (row.trailingValue case final String trailing) ...[ + SizedBox(width: theme.spacing / 2), + Text( + trailing, + style: TextStyle( + color: theme.seriesColor(1), + fontSize: 12, + fontWeight: FontWeight.w700, + ), + ), + ], + ], + ), + ); +} diff --git a/workout-logger/lib/genui/src/components/dynamic_chart.dart b/workout-logger/lib/genui/src/components/dynamic_chart.dart new file mode 100644 index 0000000..961d8e1 --- /dev/null +++ b/workout-logger/lib/genui/src/components/dynamic_chart.dart @@ -0,0 +1,370 @@ +import 'package:fl_chart/fl_chart.dart'; +import 'package:flutter/material.dart'; + +import '../a2ui_node.dart'; +import '../a2ui_panels.dart'; +import '../a2ui_series.dart'; +import '../a2ui_spec.dart'; +import '../a2ui_theme.dart'; + +enum A2UiChartType { + line, + bar, + pie; + + /// Normalizes separators and common model spellings (`LineChart`, + /// `bar_chart`, `donut`) onto the three supported types, defaulting to line. + static A2UiChartType parse(String? raw) { + final t = raw?.toLowerCase().replaceAll(RegExp(r'[\s_\-]'), '') ?? ''; + if (t.contains('pie') || t.contains('donut') || t.contains('doughnut')) { + return A2UiChartType.pie; + } + if (t.contains('bar') || t.contains('column') || t.contains('histogram')) { + return A2UiChartType.bar; + } + return A2UiChartType.line; + } +} + +@immutable +class DynamicChartProps { + const DynamicChartProps({ + required this.title, + required this.type, + required this.labels, + required this.series, + this.subtitle, + }); + + final String title; + final String? subtitle; + final A2UiChartType type; + + /// Always at least as long as the longest series, padded with empty strings, + /// so axis label lookup by index can never go out of range. + final List labels; + final List series; + + bool get hasData => series.isNotEmpty; +} + +/// Line, bar or pie over the shared `{labels, series}` shape. +class DynamicChartSpec extends A2UiSpec { + const DynamicChartSpec(); + + @override + String get name => 'DynamicChart'; + + @override + List get aliases => const [ + 'Chart', + 'LineChart', + 'BarChart', + 'PieChart', + 'TimeSeries', + ]; + + @override + A2UiDoc get doc => const A2UiDoc( + schema: 'DynamicChart {type: line|bar|pie, title, labels: [string], ' + 'series: [{name, values: [number]}]} ' + '// or values: [number] for a single series', + purpose: + 'Trends over time (line), category comparisons (bar), or a share ' + 'breakdown (pie). Use multiple series to compare.', + example: { + 'component': 'DynamicChart', + 'props': { + 'type': 'line', + 'title': 'Biceps vs Triceps Volume', + 'labels': ['07-06', '07-09', '07-12'], + 'series': [ + {'name': 'Biceps', 'values': [640, 720, 810]}, + {'name': 'Triceps', 'values': [1200, 1150, 1290]}, + ], + }, + }, + ); + + @override + DynamicChartProps parseProps(A2UiNode node) { + final p = node.props; + final title = p.text('title', or: 'Chart'); + final series = A2UiSeries.extract(p, fallbackName: title); + + var longest = 0; + for (final s in series) { + if (s.values.length > longest) longest = s.values.length; + } + final labels = p.stringList('labels'); + final padded = [ + ...labels, + for (var i = labels.length; i < longest; i++) '', + ]; + + final subtitle = p.textOrNull('subtitle'); + + return DynamicChartProps( + title: title, + subtitle: (subtitle == null || subtitle.isEmpty) ? null : subtitle, + type: A2UiChartType.parse(p.textOrNull('type')), + labels: padded, + series: series, + ); + } + + @override + Widget buildWidget( + BuildContext context, + DynamicChartProps props, + A2UiTheme theme, + ) { + if (!props.hasData) { + return A2UiEmptyPanel( + message: '${props.title}: No chart data available', + theme: theme, + ); + } + + final showLegend = + props.series.length > 1 && props.type != A2UiChartType.pie; + + return A2UiPanel( + theme: theme, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + A2UiPanelTitle( + title: props.title, + trailing: props.type == A2UiChartType.pie ? props.subtitle : null, + theme: theme, + ), + if (showLegend) ...[ + const SizedBox(height: 6), + A2UiLegend( + names: [for (final s in props.series) s.name], + theme: theme, + ), + ], + SizedBox(height: theme.spacing), + SizedBox( + height: 195, + child: switch (props.type) { + A2UiChartType.bar => _bar(props, theme), + A2UiChartType.pie => _pie(props, theme), + A2UiChartType.line => _line(props, theme), + }, + ), + ], + ), + ); + } + + Widget _line(DynamicChartProps props, A2UiTheme theme) { + final (minY, maxY) = _yBounds(props.series); + return LineChart( + LineChartData( + minY: minY, + maxY: maxY, + gridData: a2uiGridData(theme), + borderData: FlBorderData(show: false), + titlesData: a2uiTitlesData(props.labels, theme), + lineBarsData: [ + for (var i = 0; i < props.series.length; i++) + LineChartBarData( + spots: [ + for (var x = 0; x < props.series[i].values.length; x++) + FlSpot(x.toDouble(), props.series[i].values[x]), + ], + isCurved: true, + color: theme.seriesColor(i), + barWidth: 3, + dotData: FlDotData(show: props.series[i].values.length < 10), + belowBarData: BarAreaData( + show: props.series.length == 1, + color: theme.seriesColor(i).withValues(alpha: 0.12), + ), + ), + ], + ), + ); + } + + Widget _bar(DynamicChartProps props, A2UiTheme theme) { + final (minY, maxY) = _yBounds(props.series); + return BarChart( + BarChartData( + minY: minY, + maxY: maxY, + gridData: a2uiGridData(theme), + borderData: FlBorderData(show: false), + titlesData: a2uiTitlesData(props.labels, theme), + barGroups: [ + for (var group = 0; group < props.labels.length; group++) + BarChartGroupData( + x: group, + barRods: [ + for (var i = 0; i < props.series.length; i++) + if (group < props.series[i].values.length) + BarChartRodData( + toY: props.series[i].values[group], + width: props.series.length > 1 ? 8 : 14, + borderRadius: BorderRadius.circular(6), + color: theme.seriesColor(i), + ), + ], + ), + ], + ), + ); + } + + Widget _pie(DynamicChartProps props, A2UiTheme theme) { + final rawValues = props.series.first.values; + // A pie slice needs a positive share of the whole; negative or zero + // entries have no geometric meaning. Filter them out, but keep each + // surviving entry's ORIGINAL index so theme.seriesColor(i) and + // props.labels[i] — both indexed by original position — stay aligned. + final positive = [ + for (var i = 0; i < rawValues.length; i++) + if (rawValues[i] > 0) i, + ]; + if (positive.isEmpty) { + return A2UiEmptyPanel( + message: '${props.title}: No positive values to chart', + theme: theme, + ); + } + final total = positive.fold(0, (sum, i) => sum + rawValues[i]); + + return Row( + children: [ + Expanded( + child: PieChart( + PieChartData( + sectionsSpace: 2, + centerSpaceRadius: 32, + sections: [ + for (final i in positive) + PieChartSectionData( + value: rawValues[i], + color: theme.seriesColor(i), + radius: 44, + title: '${(rawValues[i] / total * 100).round()}%', + titleStyle: TextStyle( + color: theme.textPrimary, + fontSize: 11, + fontWeight: FontWeight.w700, + ), + ), + ], + ), + ), + ), + SizedBox(width: theme.spacing / 2), + Expanded( + child: SingleChildScrollView( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + for (final i in positive) + Padding( + padding: const EdgeInsets.only(bottom: 6), + child: Row( + children: [ + Container( + width: 8, + height: 8, + decoration: BoxDecoration( + color: theme.seriesColor(i), + shape: BoxShape.circle, + ), + ), + const SizedBox(width: 6), + Expanded( + child: Text( + '${i < props.labels.length ? props.labels[i] : ''} ' + '(${rawValues[i].round()})', + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: + TextStyle(color: theme.textMuted, fontSize: 11), + ), + ), + ], + ), + ), + ], + ), + ), + ), + ], + ); + } +} + +/// Y-axis bounds for [series], shared by `_line` and `_bar` so both charts +/// agree on the same visible range. +/// +/// When every value is non-negative, the axis starts at 0 (existing +/// behavior), with a 15% headroom margin above the max — clamped to a +/// minimum span of 1 so an all-zero series doesn't collapse to a +/// zero-height axis. +/// +/// When any value is negative, both bounds are derived from the true min +/// and max (via [A2UiSeries.minValue]/[A2UiSeries.maxValue], which return +/// real negative extrema rather than clamping to 0) so every data point — +/// including an all-negative series — falls within the visible range with +/// a margin, instead of silently rendering off-chart. +(double, double) _yBounds(List series) { + final max = A2UiSeries.maxValue(series); + final min = A2UiSeries.minValue(series); + if (min >= 0) { + return (0, max <= 0 ? 1 : max * 1.15); + } + final minY = min * 1.15; + final maxY = max <= 0 ? max * 0.85 : max * 1.15; + return (minY, maxY); +} + +/// Horizontal-only grid lines in the theme's border colour. +FlGridData a2uiGridData(A2UiTheme theme) => FlGridData( + show: true, + drawVerticalLine: false, + getDrawingHorizontalLine: (_) => + FlLine(color: theme.border, strokeWidth: 1), + ); + +/// Bottom axis labelled from [labels] by index, with a bounds check so an +/// out-of-range tick renders nothing rather than throwing. +FlTitlesData a2uiTitlesData(List labels, A2UiTheme theme) => + FlTitlesData( + topTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), + rightTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), + leftTitles: const AxisTitles( + sideTitles: SideTitles(showTitles: true, reservedSize: 34), + ), + bottomTitles: AxisTitles( + sideTitles: SideTitles( + showTitles: true, + reservedSize: 30, + getTitlesWidget: (value, meta) { + final index = value.round(); + if (index < 0 || index >= labels.length) { + return const SizedBox.shrink(); + } + return Padding( + padding: const EdgeInsets.only(top: 6), + child: Text( + labels[index], + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle(color: theme.textFaint, fontSize: 10), + ), + ); + }, + ), + ), + ); diff --git a/workout-logger/lib/genui/src/components/filter_chips.dart b/workout-logger/lib/genui/src/components/filter_chips.dart new file mode 100644 index 0000000..7c09fcf --- /dev/null +++ b/workout-logger/lib/genui/src/components/filter_chips.dart @@ -0,0 +1,129 @@ +import 'package:flutter/material.dart'; + +import '../a2ui_node.dart'; +import '../a2ui_spec.dart'; +import '../a2ui_theme.dart'; + +@immutable +class FilterChipsProps { + const FilterChipsProps({required this.options, this.activeOption}); + + final List options; + + /// Null when the model omitted it or named an option that does not exist. + /// The old renderer cast this to a non-null String and crashed. + final String? activeOption; + + bool get hasData => options.isNotEmpty; +} + +/// A decorative row of context chips showing the window a dashboard covers. +/// +/// Deliberately non-interactive: A2UI has no action contract yet, so a tappable +/// chip would imply behaviour the renderer cannot deliver. Adding interactivity +/// means threading an `onAction` callback through `A2UiRenderer` first. +class FilterChipsSpec extends A2UiSpec { + const FilterChipsSpec(); + + @override + String get name => 'FilterChips'; + + @override + List get aliases => const ['Chips', 'FilterRow', 'Tags']; + + @override + A2UiDoc get doc => const A2UiDoc( + schema: 'FilterChips {options: [string], activeOption?}', + purpose: + 'Labels the window or scope a dashboard covers. Decorative — the ' + 'chips are not tappable.', + example: { + 'component': 'FilterChips', + 'props': { + 'options': ['7 days', '30 days', '90 days'], + 'activeOption': '30 days', + }, + }, + ); + + @override + FilterChipsProps parseProps(A2UiNode node) { + final p = node.props; + final options = p.stringList('options'); + final requested = p.textOrNull('activeOption'); + + String? active; + if (requested != null) { + for (final option in options) { + if (option.toLowerCase() == requested.toLowerCase()) { + active = option; + break; + } + } + } + + return FilterChipsProps(options: options, activeOption: active); + } + + @override + Widget buildWidget( + BuildContext context, + FilterChipsProps props, + A2UiTheme theme, + ) { + // Deliberately blank rather than an empty-state panel — chips are + // decorative chrome describing a dashboard's scope, not data the model + // attempted to show; an empty panel here would be noise, not a useful + // error signal. + if (!props.hasData) return const SizedBox.shrink(); + + return Wrap( + spacing: theme.spacing / 2, + runSpacing: theme.spacing / 2, + children: [ + for (final option in props.options) + _Chip( + label: option, + active: option == props.activeOption, + theme: theme, + ), + ], + ); + } +} + +class _Chip extends StatelessWidget { + const _Chip({ + required this.label, + required this.active, + required this.theme, + }); + + final String label; + final bool active; + final A2UiTheme theme; + + @override + Widget build(BuildContext context) => Container( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + decoration: BoxDecoration( + color: active + ? theme.accent.withValues(alpha: 0.18) + : theme.border, + borderRadius: BorderRadius.circular(theme.pillRadius), + border: Border.all( + color: active + ? theme.accent.withValues(alpha: 0.45) + : theme.border, + ), + ), + child: Text( + label, + style: TextStyle( + color: active ? theme.accent : theme.textSoft, + fontSize: 12, + fontWeight: FontWeight.w600, + ), + ), + ); +} diff --git a/workout-logger/lib/genui/src/components/grid_container.dart b/workout-logger/lib/genui/src/components/grid_container.dart new file mode 100644 index 0000000..407e3d7 --- /dev/null +++ b/workout-logger/lib/genui/src/components/grid_container.dart @@ -0,0 +1,118 @@ +import 'package:flutter/material.dart'; + +import '../a2ui_node.dart'; +import '../a2ui_renderer.dart'; +import '../a2ui_spec.dart'; +import '../a2ui_theme.dart'; + +@immutable +class GridContainerProps { + const GridContainerProps({required this.columns, required this.children}); + + /// Always 1 or 2. + final int columns; + final List children; +} + +/// Vertical stack or two-column grid of other components. +/// +/// Children are already parsed by [A2UiParser]; this spec only lays them out, +/// and recursion runs through the public [A2UiRenderer] so the injected theme +/// keeps flowing down the tree. +class GridContainerSpec extends A2UiSpec { + const GridContainerSpec(); + + /// Below this width a two-column grid squeezes charts unreadably. + static const double _collapseWidth = 420; + + @override + String get name => 'GridContainer'; + + @override + List get aliases => const ['Grid', 'Dashboard', 'Container', 'Layout']; + + @override + A2UiDoc get doc => const A2UiDoc( + schema: 'GridContainer {columns: 1|2, children: [component, ...]}', + purpose: + 'The wrapper for a multi-part dashboard. Use columns:2 for compact ' + 'StatCards and columns:1 when it contains charts.', + example: { + 'component': 'GridContainer', + 'props': { + 'columns': 2, + 'children': [ + { + 'component': 'StatCard', + 'props': {'title': 'Sessions', 'value': 14, 'trend': 'up'}, + }, + { + 'component': 'StatCard', + 'props': {'title': 'Volume', 'value': 128000, 'unit': 'kg'}, + }, + ], + }, + }, + ); + + @override + GridContainerProps parseProps(A2UiNode node) => GridContainerProps( + columns: node.props.integer('columns', or: 1).clamp(1, 2), + children: node.children, + ); + + @override + Widget buildWidget( + BuildContext context, + GridContainerProps props, + A2UiTheme theme, + ) { + final children = props.children; + if (children.isEmpty) return const SizedBox.shrink(); + + return LayoutBuilder( + builder: (context, constraints) { + final columns = + constraints.maxWidth < _collapseWidth ? 1 : props.columns; + + if (columns == 1) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + for (var i = 0; i < children.length; i++) ...[ + A2UiRenderer(node: children[i]), + if (i < children.length - 1) + SizedBox(height: theme.spacing / 2), + ], + ], + ); + } + + final rows = []; + for (var i = 0; i < children.length; i += 2) { + final right = i + 1 < children.length ? children[i + 1] : null; + rows.add( + IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Expanded(child: A2UiRenderer(node: children[i])), + SizedBox(width: theme.spacing / 2), + Expanded( + child: right == null + ? const SizedBox.shrink() + : A2UiRenderer(node: right), + ), + ], + ), + ), + ); + if (i + 2 < children.length) { + rows.add(SizedBox(height: theme.spacing / 2)); + } + } + return Column(mainAxisSize: MainAxisSize.min, children: rows); + }, + ); + } +} diff --git a/workout-logger/lib/genui/src/components/metric_gauge.dart b/workout-logger/lib/genui/src/components/metric_gauge.dart new file mode 100644 index 0000000..22be6f0 --- /dev/null +++ b/workout-logger/lib/genui/src/components/metric_gauge.dart @@ -0,0 +1,223 @@ +import 'dart:math' as math; + +import 'package:flutter/material.dart'; + +import '../a2ui_node.dart'; +import '../a2ui_panels.dart'; +import '../a2ui_spec.dart'; +import '../a2ui_theme.dart'; + +@immutable +class MetricGaugeProps { + const MetricGaugeProps({ + required this.title, + required this.value, + required this.min, + required this.max, + required this.unit, + this.status, + }); + + final String title; + + /// Null when the model supplied nothing parseable — the renderer shows an + /// empty panel rather than drawing an arc from a bogus number. + final double? value; + final double min; + final double max; + final String unit; + final String? status; + + /// Fill fraction in `[0, 1]`. Returns 0 for a degenerate range so a NaN + /// sweep angle can never reach the canvas. + double get progress { + final v = value; + if (v == null) return 0; + final span = max - min; + if (span <= 0) return 0; + final raw = (v - min) / span; + if (raw.isNaN || raw.isInfinite) return 0; + return raw.clamp(0.0, 1.0); + } +} + +/// A radial gauge for a bounded score such as readiness or recovery. +class MetricGaugeSpec extends A2UiSpec { + const MetricGaugeSpec(); + + @override + String get name => 'MetricGauge'; + + @override + List get aliases => const ['Gauge', 'Dial', 'ScoreGauge']; + + @override + A2UiDoc get doc => const A2UiDoc( + schema: + 'MetricGauge {title, value: number, min?, max?, unit?, status?}', + purpose: + 'A bounded score shown as a dial. Use when the number has a natural ' + 'floor and ceiling.', + example: { + 'component': 'MetricGauge', + 'props': { + 'title': 'Readiness', + 'value': 82, + 'min': 0, + 'max': 100, + 'unit': 'pts', + 'status': 'Optimal', + }, + }, + ); + + @override + MetricGaugeProps parseProps(A2UiNode node) { + final p = node.props; + final status = p.textOrNull('status'); + return MetricGaugeProps( + title: p.text('title', or: 'Metric'), + value: p.numberOrNull('value'), + min: p.number('min', or: 0), + max: p.number('max', or: 100), + unit: p.text('unit'), + status: (status == null || status.isEmpty) ? null : status, + ); + } + + @override + Widget buildWidget( + BuildContext context, + MetricGaugeProps props, + A2UiTheme theme, + ) { + final value = props.value; + if (value == null) { + return A2UiEmptyPanel( + message: '${props.title}: No value available', + theme: theme, + ); + } + + final display = + value % 1 == 0 ? value.toInt().toString() : value.toStringAsFixed(1); + + return A2UiPanel( + theme: theme, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + props.title, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: TextStyle( + color: theme.textPrimary, + fontSize: 14, + fontWeight: FontWeight.w700, + ), + ), + SizedBox(height: theme.spacing), + SizedBox( + height: 120, + width: 120, + child: CustomPaint( + painter: _GaugeArcPainter( + progress: props.progress, + track: theme.border, + from: theme.accent, + to: theme.seriesColor(1), + ), + child: Center( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + display, + style: TextStyle( + color: theme.textPrimary, + fontSize: 24, + fontWeight: FontWeight.w800, + ), + ), + if (props.unit.isNotEmpty) + Text( + props.unit, + style: TextStyle(color: theme.textMuted, fontSize: 11), + ), + ], + ), + ), + ), + ), + if (props.status case final String status) ...[ + SizedBox(height: theme.spacing / 2), + Container( + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 3), + decoration: BoxDecoration( + color: theme.accent.withValues(alpha: 0.12), + borderRadius: BorderRadius.circular(theme.pillRadius), + border: Border.all(color: theme.accent.withValues(alpha: 0.3)), + ), + child: Text( + status, + style: TextStyle( + color: theme.accent, + fontSize: 11, + fontWeight: FontWeight.w600, + ), + ), + ), + ], + ], + ), + ); + } +} + +class _GaugeArcPainter extends CustomPainter { + const _GaugeArcPainter({ + required this.progress, + required this.track, + required this.from, + required this.to, + }); + + final double progress; + final Color track; + final Color from; + final Color to; + + static const double _startAngle = math.pi * 0.75; + static const double _sweepAngle = math.pi * 1.5; + + @override + void paint(Canvas canvas, Size size) { + final center = Offset(size.width / 2, size.height / 2); + final radius = math.min(size.width, size.height) / 2 - 8; + if (radius <= 0) return; + final rect = Rect.fromCircle(center: center, radius: radius); + + final bg = Paint() + ..color = track + ..style = PaintingStyle.stroke + ..strokeWidth = 10 + ..strokeCap = StrokeCap.round; + + final fg = Paint() + ..shader = LinearGradient(colors: [from, to]).createShader(rect) + ..style = PaintingStyle.stroke + ..strokeWidth = 10 + ..strokeCap = StrokeCap.round; + + canvas.drawArc(rect, _startAngle, _sweepAngle, false, bg); + canvas.drawArc(rect, _startAngle, _sweepAngle * progress, false, fg); + } + + @override + bool shouldRepaint(_GaugeArcPainter oldDelegate) => + oldDelegate.progress != progress || + oldDelegate.track != track || + oldDelegate.from != from || + oldDelegate.to != to; +} diff --git a/workout-logger/lib/genui/src/components/radar_chart.dart b/workout-logger/lib/genui/src/components/radar_chart.dart new file mode 100644 index 0000000..2ec2725 --- /dev/null +++ b/workout-logger/lib/genui/src/components/radar_chart.dart @@ -0,0 +1,152 @@ +import 'package:fl_chart/fl_chart.dart'; +import 'package:flutter/material.dart'; + +import '../a2ui_node.dart'; +import '../a2ui_panels.dart'; +import '../a2ui_series.dart'; +import '../a2ui_spec.dart'; +import '../a2ui_theme.dart'; + +@immutable +class RadarChartProps { + const RadarChartProps({ + required this.title, + required this.labels, + required this.series, + }); + + final String title; + final List labels; + + /// Every series is exactly [labels].length long — fl_chart requires a uniform + /// entry count across datasets, so normalization happens at parse time. + final List series; + + /// fl_chart's radar needs at least three axes to form a polygon. + bool get hasData => labels.length >= 3 && series.isNotEmpty; +} + +/// Multi-axis balance view over the shared `{labels, series}` shape. +class RadarChartSpec extends A2UiSpec { + const RadarChartSpec(); + + @override + String get name => 'RadarChart'; + + @override + List get aliases => const ['Radar', 'SpiderChart', 'BalanceChart']; + + @override + A2UiDoc get doc => const A2UiDoc( + schema: 'RadarChart {title, labels: [string], ' + 'series: [{name, values: [number]}]}', + purpose: + 'Balance across 3+ comparable axes. Use for holistic summaries ' + 'where every axis shares a scale.', + example: { + 'component': 'RadarChart', + 'props': { + 'title': 'Recovery Balance', + 'labels': ['Readiness', 'Sleep', 'Volume', 'Intensity'], + 'series': [ + {'name': 'This week', 'values': [85, 90, 75, 80]}, + {'name': 'Baseline', 'values': [70, 70, 70, 70]}, + ], + }, + }, + ); + + @override + RadarChartProps parseProps(A2UiNode node) { + final p = node.props; + final labels = p.stringList('labels'); + final raw = A2UiSeries.extract(p); + + // fl_chart throws when datasets disagree on entry count, so pad or truncate + // every series to the axis count before it can reach the widget. + final normalized = [ + for (final s in raw) + A2UiSeries( + name: s.name, + values: [ + for (var i = 0; i < labels.length; i++) + i < s.values.length ? s.values[i] : 0.0, + ], + ), + ]; + + return RadarChartProps( + title: p.text('title', or: 'Radar Chart'), + labels: labels, + series: normalized, + ); + } + + @override + Widget buildWidget( + BuildContext context, + RadarChartProps props, + A2UiTheme theme, + ) { + if (!props.hasData) { + return A2UiEmptyPanel( + message: '${props.title}: No radar data available', + theme: theme, + ); + } + + return A2UiPanel( + theme: theme, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + A2UiPanelTitle(title: props.title, theme: theme), + if (props.series.length > 1) ...[ + const SizedBox(height: 6), + A2UiLegend( + names: [for (final s in props.series) s.name], + theme: theme, + dots: true, + ), + ], + SizedBox(height: theme.spacing), + SizedBox( + height: 200, + child: RadarChart( + RadarChartData( + dataSets: [ + for (var i = 0; i < props.series.length; i++) + RadarDataSet( + fillColor: + theme.seriesColor(i).withValues(alpha: 0.2), + borderColor: theme.seriesColor(i), + entryRadius: 3, + borderWidth: 2, + dataEntries: [ + for (final v in props.series[i].values) + RadarEntry(value: v), + ], + ), + ], + radarBorderData: BorderSide(color: theme.border), + gridBorderData: BorderSide(color: theme.border, width: 0.8), + tickBorderData: const BorderSide(color: Color(0x00000000)), + ticksTextStyle: const TextStyle(color: Color(0x00000000)), + getTitle: (index, angle) => RadarChartTitle( + text: index < props.labels.length ? props.labels[index] : '', + positionPercentageOffset: 0.1, + ), + titleTextStyle: TextStyle( + color: theme.textMuted, + fontSize: 11, + fontWeight: FontWeight.w600, + ), + ), + ), + ), + ], + ), + ); + } +} diff --git a/workout-logger/lib/genui/src/components/scatter_plot.dart b/workout-logger/lib/genui/src/components/scatter_plot.dart new file mode 100644 index 0000000..e062b07 --- /dev/null +++ b/workout-logger/lib/genui/src/components/scatter_plot.dart @@ -0,0 +1,232 @@ +import 'package:fl_chart/fl_chart.dart'; +import 'package:flutter/material.dart'; + +import '../a2ui_node.dart'; +import '../a2ui_panels.dart'; +import '../a2ui_spec.dart'; +import '../a2ui_theme.dart'; + +@immutable +class A2UiPoint { + const A2UiPoint(this.x, this.y); + final double x; + final double y; +} + +@immutable +class ScatterPlotProps { + const ScatterPlotProps({ + required this.title, + required this.xLabel, + required this.yLabel, + required this.points, + this.correlation, + }); + + final String title; + final String xLabel; + final String yLabel; + final List points; + final double? correlation; + + bool get hasData => points.isNotEmpty; + + /// Axis bounds with a 10% margin, widened to ±1 when every point shares a + /// coordinate so fl_chart never receives a zero-span axis. + ({double minX, double maxX, double minY, double maxY}) get bounds { + if (points.isEmpty) { + return (minX: 0, maxX: 10, minY: 0, maxY: 10); + } + var minX = points.first.x, maxX = points.first.x; + var minY = points.first.y, maxY = points.first.y; + for (final p in points) { + if (p.x < minX) minX = p.x; + if (p.x > maxX) maxX = p.x; + if (p.y < minY) minY = p.y; + if (p.y > maxY) maxY = p.y; + } + final xMargin = (maxX - minX) * 0.1; + final yMargin = (maxY - minY) * 0.1; + return ( + minX: (minX - (xMargin == 0 ? 1 : xMargin)).floorToDouble(), + maxX: (maxX + (xMargin == 0 ? 1 : xMargin)).ceilToDouble(), + minY: (minY - (yMargin == 0 ? 1 : yMargin)).floorToDouble(), + maxY: (maxY + (yMargin == 0 ? 1 : yMargin)).ceilToDouble(), + ); + } +} + +/// Paired x/y observations with an optional correlation badge. +class ScatterPlotSpec extends A2UiSpec { + const ScatterPlotSpec(); + + @override + String get name => 'ScatterPlot'; + + @override + List get aliases => const ['Scatter', 'XYPlot', 'Correlation']; + + @override + A2UiDoc get doc => const A2UiDoc( + schema: 'ScatterPlot {title, xLabel, yLabel, ' + 'points: [{x: number, y: number}], correlation?: number}', + purpose: + 'Relationship between two measures. Use when showing whether one ' + 'metric moves with another.', + example: { + 'component': 'ScatterPlot', + 'props': { + 'title': 'Sleep vs Training Volume', + 'xLabel': 'Sleep Hours', + 'yLabel': 'Volume (kg)', + 'correlation': 0.62, + 'points': [ + {'x': 6.2, 'y': 8200}, + {'x': 7.4, 'y': 11500}, + {'x': 8.1, 'y': 12900}, + ], + }, + }, + ); + + @override + ScatterPlotProps parseProps(A2UiNode node) { + final p = node.props; + final points = []; + for (final raw in p.objectList('points')) { + final x = raw.numberOrNull('x'); + final y = raw.numberOrNull('y'); + if (x == null || y == null) continue; + points.add(A2UiPoint(x, y)); + } + + return ScatterPlotProps( + title: p.text('title', or: 'Scatter Plot'), + xLabel: p.text('xLabel', or: 'X'), + yLabel: p.text('yLabel', or: 'Y'), + points: points, + correlation: p.numberOrNull('correlation'), + ); + } + + @override + Widget buildWidget( + BuildContext context, + ScatterPlotProps props, + A2UiTheme theme, + ) { + if (!props.hasData) { + return A2UiEmptyPanel( + message: '${props.title}: No paired data available', + theme: theme, + ); + } + + final b = props.bounds; + final r = props.correlation; + final strong = r != null && r.abs() >= 0.5; + final badgeColor = strong ? theme.accent : theme.seriesColor(1); + + return A2UiPanel( + theme: theme, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + child: A2UiPanelTitle(title: props.title, theme: theme), + ), + if (r != null) + Container( + padding: + const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + decoration: BoxDecoration( + color: badgeColor.withValues(alpha: 0.15), + borderRadius: BorderRadius.circular(6), + border: + Border.all(color: badgeColor.withValues(alpha: 0.4)), + ), + child: Text( + 'r = ${r >= 0 ? '+' : ''}${r.toStringAsFixed(2)}', + style: TextStyle( + color: badgeColor, + fontSize: 11, + fontWeight: FontWeight.w700, + ), + ), + ), + ], + ), + const SizedBox(height: 4), + Text( + '${props.yLabel} vs. ${props.xLabel}', + style: TextStyle(color: theme.textMuted, fontSize: 11), + ), + SizedBox(height: theme.spacing), + SizedBox( + height: 195, + child: ScatterChart( + ScatterChartData( + minX: b.minX, + maxX: b.maxX, + minY: b.minY, + maxY: b.maxY, + scatterSpots: [ + for (final p in props.points) ScatterSpot(p.x, p.y), + ], + gridData: FlGridData( + show: true, + drawVerticalLine: true, + getDrawingHorizontalLine: (_) => + FlLine(color: theme.border, strokeWidth: 1), + getDrawingVerticalLine: (_) => + FlLine(color: theme.border, strokeWidth: 1), + ), + borderData: FlBorderData(show: false), + titlesData: FlTitlesData( + topTitles: const AxisTitles( + sideTitles: SideTitles(showTitles: false)), + rightTitles: const AxisTitles( + sideTitles: SideTitles(showTitles: false)), + bottomTitles: AxisTitles( + axisNameWidget: Text( + props.xLabel, + style: TextStyle(color: theme.textFaint, fontSize: 10), + ), + sideTitles: SideTitles( + showTitles: true, + reservedSize: 22, + getTitlesWidget: (v, meta) => Text( + v.round().toString(), + style: + TextStyle(color: theme.textFaint, fontSize: 10), + ), + ), + ), + leftTitles: AxisTitles( + axisNameWidget: Text( + props.yLabel, + style: TextStyle(color: theme.textFaint, fontSize: 10), + ), + sideTitles: SideTitles( + showTitles: true, + reservedSize: 30, + getTitlesWidget: (v, meta) => Text( + v.round().toString(), + style: + TextStyle(color: theme.textFaint, fontSize: 10), + ), + ), + ), + ), + ), + ), + ), + ], + ), + ); + } +} diff --git a/workout-logger/lib/genui/src/components/stat_card.dart b/workout-logger/lib/genui/src/components/stat_card.dart new file mode 100644 index 0000000..e1f2e1a --- /dev/null +++ b/workout-logger/lib/genui/src/components/stat_card.dart @@ -0,0 +1,172 @@ +import 'package:flutter/material.dart'; + +import '../a2ui_node.dart'; +import '../a2ui_panels.dart'; +import '../a2ui_spec.dart'; +import '../a2ui_theme.dart'; + +/// Direction badge shown on a [StatCardSpec]. +enum A2UiTrend { + up, + down, + neutral; + + /// Accepts the canonical words plus the synonyms models reach for, so + /// `improving` and `declining` do not silently render as neutral. + static A2UiTrend parse(String? raw) { + switch (raw?.toLowerCase().trim()) { + case 'up': + case 'improving': + case 'positive': + case 'rising': + case 'increasing': + case 'better': + return A2UiTrend.up; + case 'down': + case 'declining': + case 'decline': + case 'negative': + case 'falling': + case 'decreasing': + case 'worse': + return A2UiTrend.down; + default: + return A2UiTrend.neutral; + } + } +} + +@immutable +class StatCardProps { + const StatCardProps({ + required this.title, + required this.value, + required this.trend, + this.subtitle, + }); + + final String title; + final String value; + final String? subtitle; + final A2UiTrend trend; +} + +/// A single headline number with an optional caption and direction badge. +class StatCardSpec extends A2UiSpec { + const StatCardSpec(); + + @override + String get name => 'StatCard'; + + @override + List get aliases => const ['Stat', 'KpiCard', 'Kpi', 'MetricCard']; + + @override + A2UiDoc get doc => const A2UiDoc( + schema: + 'StatCard {title, value, unit?, subtitle?, trend?: up|down|neutral}', + purpose: 'One headline number. Use for totals, averages and deltas.', + example: { + 'component': 'StatCard', + 'props': { + 'title': 'Weekly Volume', + 'value': 12400, + 'unit': 'kg', + 'subtitle': 'Last 7 days', + 'trend': 'up', + }, + }, + ); + + @override + StatCardProps parseProps(A2UiNode node) { + final p = node.props; + + final rawValue = p.textOrNull('value'); + final unit = p.textOrNull('unit'); + final String value; + if (rawValue == null) { + value = '—'; + } else if (unit == null || + unit.isEmpty || + rawValue.trimRight().endsWith(unit)) { + // Only a trailing-suffix match counts as "already present" — a naive + // substring check would false-positive on e.g. value "10 reps" with + // unit "s" (a substring of "reps"), silently dropping a real unit. + value = rawValue; + } else { + value = '$rawValue $unit'; + } + + final subtitle = p.textOrNull('subtitle'); + + return StatCardProps( + title: p.text('title', or: 'Metric'), + value: value, + subtitle: (subtitle == null || subtitle.isEmpty) ? null : subtitle, + trend: A2UiTrend.parse(p.textOrNull('trend')), + ); + } + + @override + Widget buildWidget( + BuildContext context, + StatCardProps props, + A2UiTheme theme, + ) { + final (icon, color) = switch (props.trend) { + A2UiTrend.up => (Icons.trending_up_rounded, theme.positive), + A2UiTrend.down => (Icons.trending_down_rounded, theme.negative), + A2UiTrend.neutral => (Icons.trending_flat_rounded, theme.textMuted), + }; + + return A2UiPanel( + theme: theme, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Row( + children: [ + Expanded( + child: Text( + props.title, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: TextStyle( + color: theme.textMuted, + fontSize: 11, + fontWeight: FontWeight.w600, + ), + ), + ), + Icon(icon, color: color, size: 18), + ], + ), + SizedBox(height: theme.spacing / 2), + FittedBox( + alignment: Alignment.centerLeft, + fit: BoxFit.scaleDown, + child: Text( + props.value, + style: TextStyle( + color: theme.textPrimary, + fontSize: 22, + fontWeight: FontWeight.w800, + ), + ), + ), + if (props.subtitle case final String subtitle) ...[ + const SizedBox(height: 2), + Text( + subtitle, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: TextStyle(color: theme.textFaint, fontSize: 11), + ), + ], + ], + ), + ); + } +} diff --git a/workout-logger/lib/genui/src/default_registry.dart b/workout-logger/lib/genui/src/default_registry.dart new file mode 100644 index 0000000..5283428 --- /dev/null +++ b/workout-logger/lib/genui/src/default_registry.dart @@ -0,0 +1,25 @@ +import 'a2ui_registry.dart'; +import 'components/data_list_group.dart'; +import 'components/dynamic_chart.dart'; +import 'components/filter_chips.dart'; +import 'components/grid_container.dart'; +import 'components/metric_gauge.dart'; +import 'components/radar_chart.dart'; +import 'components/scatter_plot.dart'; +import 'components/stat_card.dart'; + +/// The standard A2UI vocabulary. +/// +/// Registration order is the order components appear in the generated prompt, +/// so the most commonly useful ones come first. Adding a component here adds it +/// to the parser, the renderer and the model's instructions at once. +final A2UiRegistry defaultA2UiRegistry = A2UiRegistry(const [ + GridContainerSpec(), + StatCardSpec(), + DynamicChartSpec(), + DataListGroupSpec(), + MetricGaugeSpec(), + ScatterPlotSpec(), + RadarChartSpec(), + FilterChipsSpec(), +]); diff --git a/workout-logger/lib/main.dart b/workout-logger/lib/main.dart index 2460957..a6d2f4f 100644 --- a/workout-logger/lib/main.dart +++ b/workout-logger/lib/main.dart @@ -3,16 +3,23 @@ // Following Dependency Inversion Principle: we create concrete implementations // here at the composition root and inject them into high-level modules. +import 'dart:async'; + import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; +import 'package:hive_flutter/hive_flutter.dart'; import 'services/debug_log_buffer.dart'; import 'services/storage_service.dart'; +import 'services/sqlite_storage_service.dart'; +import 'services/storage_backend_resolver.dart'; +import 'services/ai/sql_query_service.dart'; import 'services/ml_service.dart'; import 'services/ai/gemini_ai_service.dart'; import 'services/ai/coach_tool_service.dart'; import 'services/health_connect_service.dart'; +import 'services/health_data_sync_service.dart'; import 'services/interfaces/storage_service_interface.dart'; import 'services/interfaces/ml_service_interface.dart'; import 'services/interfaces/health_connect_service_interface.dart'; @@ -26,8 +33,59 @@ import 'services/managers/readiness_manager.dart'; import 'services/managers/health_history_manager.dart'; import 'services/managers/conversation_manager.dart'; import 'theme/app_theme.dart'; +import 'genui/a2ui.dart'; +import 'theme/a2ui_app_theme.dart'; import 'screens/home_screen.dart'; import 'screens/onboarding_screen.dart'; +import 'screens/widgets/rf_widgets.dart'; + +/// Resolved once in main() before runApp(). Read lazily by +/// WorkoutLoggerApp._storageService's static initializer, which only runs +/// on first access (during build()) — by then this is already set. +IStorageService? _resolvedStorageService; + +/// One-time, flag-gated, reversible Hive -> SQLite cutover. See +/// docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md §6. +Future _resolveStorageBackend() async { + // Hive must be initialized before the cutover check itself, since the + // migration flag below is read directly from the Hive 'settings' box. + await Hive.initFlutter(); + final settingsBox = await Hive.openBox('settings'); + final alreadyMigrated = settingsBox.get(storageMigratedFlagKey) == 'true'; + + if (alreadyMigrated) { + final sqlite = SqliteStorageService(); + try { + await sqlite.init(); + } catch (e, st) { + debugPrint('SQLite init failed, staying on Hive: $e\n$st'); + final hiveStorage = StorageService(); + await hiveStorage.init(); + _resolvedStorageService = hiveStorage; + return; + } + _resolvedStorageService = sqlite; + return; + } + + final hiveStorage = StorageService(); + await hiveStorage.init(); + final sqliteStorage = SqliteStorageService(); + + try { + await sqliteStorage.init(); + } catch (e, st) { + debugPrint('SQLite init failed, staying on Hive: $e\n$st'); + _resolvedStorageService = hiveStorage; + return; + } + + _resolvedStorageService = await resolveStorageBackend( + hiveStorage: hiveStorage, + sqliteStorage: sqliteStorage, + alreadyMigrated: false, + ); +} void main() async { DebugLogBuffer.attach(); @@ -55,13 +113,15 @@ void main() async { ), ); + await _resolveStorageBackend(); + runApp(const WorkoutLoggerApp()); } class WorkoutLoggerApp extends StatelessWidget { // Singleton instances created once at app startup // This ensures the same instances are used throughout the app lifecycle - static final IStorageService _storageService = StorageService(); + static final IStorageService _storageService = _resolvedStorageService ?? StorageService(); static final IMLService _mlService = MLService(); static final IHealthConnectService _healthConnectService = HealthConnectService(); static final ProgramManager _programManager = ProgramManager(_storageService); @@ -80,6 +140,17 @@ class WorkoutLoggerApp extends StatelessWidget { // Serves arbitrary-range sleep/HR data to the detail screens. static final HealthHistoryManager _healthHistoryManager = HealthHistoryManager(_healthConnectService, _storageService); + // Populates the SQLite health tables the coach's run_sql_query tool joins + // against workout data. Null under the pre-migration Hive fallback path — + // there's no live SQLite database file to sync into. Mirrors the + // sqlQuery ? ... : null guard used for CoachToolService below. + static final HealthDataSyncService? _healthDataSyncService = + _storageService is SqliteStorageService + ? HealthDataSyncService( + healthConnectService: _healthConnectService, + storage: _storageService as SqliteStorageService, + ) + : null; static final GeminiAiService _geminiService = GeminiAiService(storage: _storageService); static final ConversationManager _conversationManager = @@ -110,6 +181,7 @@ class WorkoutLoggerApp extends StatelessWidget { ChangeNotifierProvider.value(value: _prManager), ChangeNotifierProvider.value(value: _readinessManager), Provider.value(value: _healthHistoryManager), + Provider.value(value: _healthDataSyncService), // GeminiAiService is the single AI backend instance. It's a ChangeNotifier // (settings UI watches isConfigured/model), so it's provided as such. // Consumers that should depend on the abstraction (the coach ViewModel, @@ -129,18 +201,30 @@ class WorkoutLoggerApp extends StatelessWidget { ), ), // CoachToolService backs AI tool calls; reads from WorkoutProvider + PRManager. + // run_sql_query is only offered once the app has cut over to SQLite — + // it needs a live database file to open a read-only connection against. Provider( create: (ctx) => CoachToolService( - ctx.read(), - ctx.read(), + workoutProvider: ctx.read(), + prManager: ctx.read(), + healthHistory: ctx.read(), + sqlQuery: _storageService is SqliteStorageService + ? SqlQueryService((_storageService as SqliteStorageService).databasePath) + : null, ), ), ], - child: MaterialApp( - title: 'Workout Logger', - debugShowCheckedModeBanner: false, - theme: AppTheme.darkTheme, - home: const AppInitializer(), + child: A2UiThemeProvider( + theme: repforgeA2UiTheme, + child: MaterialApp( + title: 'Workout Logger', + debugShowCheckedModeBanner: false, + theme: AppTheme.darkTheme, + // Above the Navigator, so every route feeds the ambient glow. + builder: (context, child) => + AmbientMotionScope(child: child ?? const SizedBox.shrink()), + home: const AppInitializer(), + ), ), ); } @@ -172,11 +256,17 @@ class _AppInitializerState extends State { final prManager = context.read(); final gemini = context.read(); final readiness = context.read(); + final healthDataSync = context.read(); try { await provider.init(); await settings.init(); - gemini.init(settings.geminiApiKey, model: settings.geminiModel); + gemini.init( + settings.geminiApiKey, + model: settings.geminiModel, + maxToolRounds: settings.geminiMaxToolRounds, + thinkingLevel: settings.geminiThinkingLevel, + ); try { await gemini.loadUsage(); } catch (e, st) { @@ -196,6 +286,17 @@ class _AppInitializerState extends State { // so the opt-in flag is loaded; never blocks or fails app init. readiness.refresh(); + // Fire-and-forget: populates the SQLite tables run_sql_query joins + // against. No-op under the pre-migration Hive fallback (null there). + // Errors are swallowed here since main.dart discards the returned + // Future — sync() has no caller to propagate a failure to. + unawaited( + healthDataSync?.sync().catchError( + (Object e, StackTrace st) => + debugPrint('healthDataSync.sync failed: $e\n$st'), + ), + ); + if (!mounted) return; setState(() { _initialized = true; diff --git a/workout-logger/lib/models/models.dart b/workout-logger/lib/models/models.dart index 493013a..3b2f04b 100644 --- a/workout-logger/lib/models/models.dart +++ b/workout-logger/lib/models/models.dart @@ -64,19 +64,34 @@ class MuscleActivation { // ==================== Exercise ==================== +// Exercise IDs treated as bodyweight-assisted (e.g. an assisted-dip/pull-up +// machine). Computed once here so every consumer (the load panel, the input +// row, set persistence) agrees on which exercises count as "assisted". +const Set _assistedBodyweightExerciseIds = { + 'pull_ups', + 'chin_ups', + 'dips', + 'push_ups', +}; + +bool isAssistedBodyweightExercise(String? exerciseId) => + exerciseId != null && _assistedBodyweightExerciseIds.contains(exerciseId); + class Exercise { final String id; final String name; final List muscleActivations; final String category; // 'compound' or 'isolation' final bool isCustom; // User-created exercise + final List? availableHandles; // Attachment/handle options e.g. ['Rope', 'Bar'] - Exercise({ + const Exercise({ required this.id, required this.name, required this.muscleActivations, required this.category, this.isCustom = false, + this.availableHandles, }); String get primaryMuscle { @@ -93,6 +108,7 @@ class Exercise { 'muscleActivations': muscleActivations.map((m) => m.toJson()).toList(), 'category': category, 'isCustom': isCustom, + 'availableHandles': availableHandles, }; factory Exercise.fromJson(Map json) => Exercise( @@ -103,6 +119,7 @@ class Exercise { .toList(), category: json['category'], isCustom: json['isCustom'] ?? false, + availableHandles: (json['availableHandles'] as List?)?.cast(), ); } @@ -115,6 +132,10 @@ class WorkoutSet { final List? drops; // For dropsets final int? timeTaken; // seconds final DateTime timestamp; + final double? assistWeight; + final double? extraWeight; + final String? handle; + final double? bodyWeightAtLog; WorkoutSet({ required this.weight, @@ -123,18 +144,47 @@ class WorkoutSet { this.drops, this.timeTaken, DateTime? timestamp, + this.assistWeight, + this.extraWeight, + this.handle, + this.bodyWeightAtLog, }) : timestamp = timestamp ?? DateTime.now(); - double get volume { - double vol = weight * reps; + /// Per-rep effective load for the main (non-drop) entry of this set: for + /// assisted-bodyweight sets (i.e. [assistWeight] is set) this is + /// `bodyweight − assist + extra`, snapshotted against [bodyWeightAtLog] + /// (falling back to 70.0) so historical values stay correct even if the + /// user's current bodyweight later changes. Conventional (non-assisted) + /// sets just use [weight]. Use this (not raw [weight]) wherever a + /// "how heavy was this set" comparison needs to be consistent with + /// [calculateVolume] for assisted-bodyweight exercises. + double get effectiveWeight { + final assist = assistWeight; + if (assist == null) return weight; + final bw = bodyWeightAtLog ?? 70.0; + return max(0.0, bw - assist + (extraWeight ?? 0.0)); + } + + double calculateVolume({double? userBodyWeight, bool? isAssistedBW}) { + final assisted = isAssistedBW ?? (assistWeight != null); + final bw = bodyWeightAtLog ?? userBodyWeight ?? 70.0; + final effW = assisted + ? max(0.0, bw - (assistWeight ?? weight) + (extraWeight ?? 0.0)) + : weight; + double vol = effW * reps; if (isDropset && drops != null) { - for (var drop in drops!) { - vol += drop.weight * drop.reps; + for (final drop in drops!) { + final dropEff = assisted + ? max(0.0, bw - drop.weight + (extraWeight ?? 0.0)) + : drop.weight; + vol += dropEff * drop.reps; } } return vol; } + double get volume => calculateVolume(); + Map toJson() => { 'weight': weight, 'reps': reps, @@ -142,6 +192,10 @@ class WorkoutSet { 'drops': drops?.map((d) => d.toJson()).toList(), 'timeTaken': timeTaken, 'timestamp': timestamp.toIso8601String(), + 'assistWeight': assistWeight, + 'extraWeight': extraWeight, + 'handle': handle, + 'bodyWeightAtLog': bodyWeightAtLog, }; factory WorkoutSet.fromJson(Map json) => WorkoutSet( @@ -153,6 +207,10 @@ class WorkoutSet { : null, timeTaken: json['timeTaken'], timestamp: DateTime.parse(json['timestamp']), + assistWeight: (json['assistWeight'] as num?)?.toDouble(), + extraWeight: (json['extraWeight'] as num?)?.toDouble(), + handle: json['handle'] as String?, + bodyWeightAtLog: (json['bodyWeightAtLog'] as num?)?.toDouble(), ); WorkoutSet copyWith({ @@ -162,6 +220,10 @@ class WorkoutSet { Object? drops = _sentinel, Object? timeTaken = _sentinel, Object? timestamp = _sentinel, + Object? assistWeight = _sentinel, + Object? extraWeight = _sentinel, + Object? handle = _sentinel, + Object? bodyWeightAtLog = _sentinel, }) => WorkoutSet( weight: weight == _sentinel ? this.weight : weight as double, reps: reps == _sentinel ? this.reps : reps as int, @@ -169,6 +231,10 @@ class WorkoutSet { drops: drops == _sentinel ? this.drops : drops as List?, timeTaken: timeTaken == _sentinel ? this.timeTaken : timeTaken as int?, timestamp: timestamp == _sentinel ? this.timestamp : timestamp as DateTime?, + assistWeight: assistWeight == _sentinel ? this.assistWeight : assistWeight as double?, + extraWeight: extraWeight == _sentinel ? this.extraWeight : extraWeight as double?, + handle: handle == _sentinel ? this.handle : handle as String?, + bodyWeightAtLog: bodyWeightAtLog == _sentinel ? this.bodyWeightAtLog : bodyWeightAtLog as double?, ); } @@ -195,8 +261,17 @@ class ExerciseLog { final String exerciseId; final List sets; final String? notes; + final String? handle; - ExerciseLog({required this.exerciseId, required this.sets, this.notes}); + const ExerciseLog({ + required this.exerciseId, + required this.sets, + this.notes, + this.handle, + }); + + double calculateTotalVolume({double? userBodyWeight, bool? isAssistedBW}) => + sets.fold(0.0, (sum, set) => sum + set.calculateVolume(userBodyWeight: userBodyWeight, isAssistedBW: isAssistedBW)); double get totalVolume => sets.fold(0.0, (sum, set) => sum + set.volume); @@ -204,24 +279,28 @@ class ExerciseLog { 'exerciseId': exerciseId, 'sets': sets.map((s) => s.toJson()).toList(), 'notes': notes, + 'handle': handle, }; factory ExerciseLog.fromJson(Map json) => ExerciseLog( exerciseId: json['exerciseId'], sets: (json['sets'] as List).map((s) => WorkoutSet.fromJson(s)).toList(), notes: json['notes'], + handle: json['handle'] as String?, ); ExerciseLog copyWith({ Object? exerciseId = _sentinel, Object? sets = _sentinel, Object? notes = _sentinel, + Object? handle = _sentinel, }) => ExerciseLog( exerciseId: exerciseId == _sentinel ? this.exerciseId : exerciseId as String, sets: sets == _sentinel ? this.sets : sets as List, notes: notes == _sentinel ? this.notes : notes as String?, + handle: handle == _sentinel ? this.handle : handle as String?, ); } @@ -236,6 +315,10 @@ class WorkoutSession { final String? notes; /// Non-null when this session was successfully synced to Health Connect. final DateTime? hcSyncedAt; + /// Optional once-per-workout subjective effort (1 = Easy, 2 = Solid, + /// 3 = Brutal), captured on the post-workout summary screen. Used only to + /// calibrate [EffortEstimator]'s per-set RPE anchor — never required. + final int? sessionEffort; WorkoutSession({ required this.id, @@ -245,6 +328,7 @@ class WorkoutSession { required this.duration, this.notes, this.hcSyncedAt, + this.sessionEffort, }); double get totalVolume => @@ -258,6 +342,7 @@ class WorkoutSession { 'duration': duration, 'notes': notes, 'hcSyncedAt': hcSyncedAt?.toIso8601String(), + 'sessionEffort': sessionEffort, }; factory WorkoutSession.fromJson(Map json) => WorkoutSession( @@ -272,6 +357,7 @@ class WorkoutSession { hcSyncedAt: json['hcSyncedAt'] != null ? DateTime.parse(json['hcSyncedAt'] as String) : null, + sessionEffort: json['sessionEffort'] as int?, ); WorkoutSession copyWith({ @@ -282,6 +368,7 @@ class WorkoutSession { Object? duration = _sentinel, Object? notes = _sentinel, Object? hcSyncedAt = _sentinel, + Object? sessionEffort = _sentinel, }) => WorkoutSession( id: id == _sentinel ? this.id : id as String, date: date == _sentinel ? this.date : date as DateTime, @@ -294,6 +381,9 @@ class WorkoutSession { hcSyncedAt: hcSyncedAt == _sentinel ? this.hcSyncedAt : hcSyncedAt as DateTime?, + sessionEffort: sessionEffort == _sentinel + ? this.sessionEffort + : sessionEffort as int?, ); } @@ -401,6 +491,34 @@ class SetRecommendation { }); } +// ==================== Effort Estimate ==================== + +/// Where an [EffortEstimate]'s RPE value came from. +/// +/// No per-set RPE picker exists in this app — [userReported] is reserved +/// for if one is ever added, so estimated values can never be confused with +/// a real logged one. +enum EffortSource { userReported, estimatedWithHr, estimatedHrless } + +/// A 0–10 RPE (rate of perceived exertion) estimate for one set, inferred +/// from data already logged rather than asked of the user. See +/// [EffortEstimator] for how it's computed. +class EffortEstimate { + final double rpe; + final EffortSource source; + + /// 0–1. Capped below 1.0 (see [EffortEstimator.maxEstimatedConfidence]) — + /// an estimate can never claim the certainty a real user-reported value + /// would have. + final double confidence; + + const EffortEstimate({ + required this.rpe, + required this.source, + required this.confidence, + }); +} + // ==================== Growth Model ==================== /// Functional form of a fitted growth curve. @@ -870,12 +988,16 @@ class ChatMessage { final String role; // 'user' | 'model' final String text; final DateTime timestamp; + // Names of tools the model called (in order) while producing this reply. + // Null/empty for user messages and replies that used no tools. + final List? toolCalls; ChatMessage({ String? id, required this.role, required this.text, DateTime? timestamp, + this.toolCalls, }) : id = id ?? _uuid.v4(), timestamp = timestamp ?? DateTime.now(); @@ -884,6 +1006,7 @@ class ChatMessage { 'role': role, 'text': text, 'timestamp': timestamp.toIso8601String(), + if (toolCalls != null && toolCalls!.isNotEmpty) 'toolCalls': toolCalls, }; factory ChatMessage.fromJson(Map json) => ChatMessage( @@ -891,17 +1014,22 @@ class ChatMessage { role: json['role'] as String, text: json['text'] as String, timestamp: DateTime.parse(json['timestamp'] as String), + toolCalls: (json['toolCalls'] as List?)?.cast(), ); ChatMessage copyWith({ Object? role = _sentinel, Object? text = _sentinel, Object? timestamp = _sentinel, + Object? toolCalls = _sentinel, }) => ChatMessage( id: id, role: role == _sentinel ? this.role : role as String, text: text == _sentinel ? this.text : text as String, timestamp: timestamp == _sentinel ? this.timestamp : timestamp as DateTime, + toolCalls: toolCalls == _sentinel + ? this.toolCalls + : toolCalls as List?, ); } diff --git a/workout-logger/lib/screens/ai_coach_screen.dart b/workout-logger/lib/screens/ai_coach_screen.dart index f24758f..0f9a56c 100644 --- a/workout-logger/lib/screens/ai_coach_screen.dart +++ b/workout-logger/lib/screens/ai_coach_screen.dart @@ -10,6 +10,7 @@ import 'package:provider/provider.dart'; import 'package:gpt_markdown/gpt_markdown.dart'; import '../models/models.dart'; +import '../genui/a2ui.dart'; import '../viewmodels/ai_coach_view_model.dart'; import '../services/ai/gemini_ai_service.dart'; import '../services/ai/coach_tool_service.dart'; @@ -17,8 +18,12 @@ import '../services/managers/conversation_manager.dart'; import '../services/settings_provider.dart'; import '../theme/app_theme.dart'; import 'widgets/rf_widgets.dart'; +import 'widgets/rf_shell.dart'; import 'profile_screen.dart'; +/// Bubbles stop short of the far edge; full-bleed ones read as banners. +const double _kBubbleMaxWidthFactor = 0.82; + /// Public entry point. Owns the screen-scoped [AiCoachViewModel]. class AiCoachScreen extends StatelessWidget { const AiCoachScreen({super.key, this.seedPrompt}); @@ -102,7 +107,7 @@ class _AiCoachViewState extends State<_AiCoachView> { if (_scrollCtrl.hasClients) { _scrollCtrl.animateTo( _scrollCtrl.position.maxScrollExtent, - duration: const Duration(milliseconds: 250), + duration: AppDurations.moderate, curve: Curves.easeOut, ); } @@ -118,18 +123,17 @@ class _AiCoachViewState extends State<_AiCoachView> { body: Stack( children: [ const AmbientGlow(), - SafeArea( - child: Column( - children: [ - _buildHeader(context, vm), - Expanded( - child: vm.isConfigured - ? _buildChatArea(vm) - : _buildNoKeyState(context), - ), - if (vm.isConfigured) _buildInputBar(vm), - ], - ), + // No wrapping SafeArea: header takes the top inset, input bar the bottom. + Column( + children: [ + _buildHeader(context, vm), + Expanded( + child: vm.isConfigured + ? _buildChatArea(vm) + : _buildNoKeyState(context), + ), + if (vm.isConfigured) _buildInputBar(vm), + ], ), ], ), @@ -137,91 +141,25 @@ class _AiCoachViewState extends State<_AiCoachView> { } Widget _buildHeader(BuildContext context, AiCoachViewModel vm) { - return Padding( - padding: const EdgeInsets.fromLTRB( - AppSpacing.md, - AppSpacing.sm, - AppSpacing.md, - 0, - ), - child: Row( - children: [ - GestureDetector( - onTap: () => Navigator.pop(context), - child: Container( - padding: const EdgeInsets.all(8), - decoration: BoxDecoration( - color: AppColors.glass3, - borderRadius: BorderRadius.circular(AppRadius.sm), - border: Border.all(color: AppColors.glassBorder), - ), - child: const Icon( - Icons.arrow_back_rounded, - color: AppColors.textSoft, - size: 18, - ), - ), + return RFScreenHeader( + title: 'AI Coach', + subtitle: 'Powered by Gemini', + badgeIcon: Icons.auto_awesome_rounded, + onBack: () => Navigator.pop(context), + actions: [ + if (vm.isConfigured) ...[ + RFIconButton( + icon: Icons.history_rounded, + tooltip: 'Past conversations', + onTap: () => _openHistory(context, vm), ), - const SizedBox(width: AppSpacing.md), - Container( - padding: const EdgeInsets.all(8), - decoration: BoxDecoration( - gradient: const LinearGradient( - colors: [AppColors.primary, Color(0xFF5B21B6)], - begin: Alignment.topLeft, - end: Alignment.bottomRight, - ), - borderRadius: BorderRadius.circular(AppRadius.sm), - boxShadow: [ - BoxShadow( - color: AppColors.primaryGlow(0.4), - blurRadius: 12, - spreadRadius: -4, - ), - ], - ), - child: const Icon(Icons.auto_awesome_rounded, color: Colors.white, size: 16), + RFIconButton( + icon: Icons.add_rounded, + tooltip: 'New chat', + onTap: vm.newConversation, ), - const SizedBox(width: AppSpacing.sm), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'AI Coach', - style: TextStyle(fontFamily: 'Geist', - color: AppColors.textPrimary, - fontSize: 16, - fontWeight: FontWeight.w700, - letterSpacing: -0.3, - ), - ), - Text( - 'Powered by Gemini', - style: TextStyle(fontFamily: 'Geist', - color: AppColors.textMuted, - fontSize: 11, - ), - ), - ], - ), - ), - if (vm.isConfigured) ...[ - _HeaderIconButton( - icon: Icons.history_rounded, - onTap: () => _openHistory(context, vm), - ), - const SizedBox(width: AppSpacing.sm), - _HeaderIconButton( - icon: Icons.add_rounded, - onTap: () { - HapticFeedback.lightImpact(); - vm.newConversation(); - }, - ), - ], ], - ), + ], ); } @@ -245,16 +183,21 @@ class _AiCoachViewState extends State<_AiCoachView> { return ListView.builder( controller: _scrollCtrl, + physics: const BouncingScrollPhysics(), + // Extra bottom room so the last turn settles clear of the input bar. padding: const EdgeInsets.fromLTRB( AppSpacing.md, AppSpacing.md, AppSpacing.md, - AppSpacing.sm, + AppSpacing.lg, ), itemCount: messages.length + (vm.isLoading ? 1 : 0), itemBuilder: (_, i) { if (i == messages.length) { - return _StreamingBubble(text: vm.streamingText); + return _StreamingBubble( + text: vm.streamingText, + toolCalls: vm.streamingToolCalls, + ); } return _MessageBubble(message: messages[i]); }, @@ -269,34 +212,19 @@ class _AiCoachViewState extends State<_AiCoachView> { child: Column( mainAxisSize: MainAxisSize.min, children: [ - Container( - width: 72, - height: 72, - decoration: BoxDecoration( - gradient: const LinearGradient( - colors: [AppColors.primary, Color(0xFF5B21B6)], - begin: Alignment.topLeft, - end: Alignment.bottomRight, - ), - borderRadius: BorderRadius.circular(AppRadius.xl), - boxShadow: [ - BoxShadow( - color: AppColors.primaryGlow(0.45), - blurRadius: 28, - spreadRadius: -4, - ), - ], - ), - child: const Icon( - Icons.auto_awesome_rounded, - color: Colors.white, - size: 32, - ), + const RFGradientBadge( + icon: Icons.auto_awesome_rounded, + size: 72, + radius: AppRadius.xl, + glow: 0.45, ), const SizedBox(height: AppSpacing.lg), Text( - name != null && name.isNotEmpty ? 'Hey $name 👋' : 'Your AI Coach', - style: TextStyle(fontFamily: 'Geist', + name != null && name.isNotEmpty + ? 'Hey $name 👋' + : 'Your AI Coach', + style: TextStyle( + fontFamily: 'Geist', color: AppColors.textPrimary, fontSize: 22, fontWeight: FontWeight.w700, @@ -307,7 +235,8 @@ class _AiCoachViewState extends State<_AiCoachView> { Text( 'Ask me anything — what to train today, how to break a plateau, reading your progress, anything.', textAlign: TextAlign.center, - style: TextStyle(fontFamily: 'Geist', + style: TextStyle( + fontFamily: 'Geist', color: AppColors.textMuted, fontSize: 14, height: 1.5, @@ -325,7 +254,7 @@ class _AiCoachViewState extends State<_AiCoachView> { 'Am I progressing on bench?', 'Suggest a deload week', ]) - _SuggestionChip( + RFOptionChip( label: s, onTap: () { _controller.text = s; @@ -350,7 +279,8 @@ class _AiCoachViewState extends State<_AiCoachView> { const RFEmptyState( icon: Icons.key_rounded, title: 'API Key Required', - subtitle: 'Add your Gemini API key in\nProfile → AI Features to start chatting', + subtitle: + 'Add your Gemini API key in\nProfile → AI Features to start chatting', ), const SizedBox(height: AppSpacing.lg), GlowButton( @@ -369,44 +299,46 @@ class _AiCoachViewState extends State<_AiCoachView> { } Widget _buildInputBar(AiCoachViewModel vm) { - final loading = vm.isLoading; - return Container( - padding: EdgeInsets.fromLTRB( - AppSpacing.md, - AppSpacing.sm, - AppSpacing.md, - AppSpacing.md + MediaQuery.of(context).padding.bottom, - ), - decoration: BoxDecoration( - color: AppColors.surface.withValues(alpha: 0.9), - border: const Border(top: BorderSide(color: AppColors.glassBorder)), - ), + return RFBottomBar( child: Row( + crossAxisAlignment: CrossAxisAlignment.end, children: [ Expanded( child: Container( + constraints: const BoxConstraints(minHeight: 44), + alignment: Alignment.centerLeft, decoration: BoxDecoration( - color: AppColors.glass3, + color: AppColors.glass2, borderRadius: BorderRadius.circular(AppRadius.xl), border: Border.all(color: AppColors.glassBorderStrong), ), child: TextField( controller: _controller, - style: TextStyle(fontFamily: 'Geist', + style: const TextStyle( + fontFamily: 'Geist', color: AppColors.textPrimary, fontSize: 14, + height: 1.4, ), - maxLines: 4, + maxLines: 5, minLines: 1, textCapitalization: TextCapitalization.sentences, - decoration: InputDecoration( - hintText: 'Ask your coach...', - hintStyle: TextStyle(fontFamily: 'Geist', + cursorColor: AppColors.primary, + decoration: const InputDecoration( + hintText: 'Ask your coach…', + hintStyle: TextStyle( + fontFamily: 'Geist', color: AppColors.textFaint, fontSize: 14, ), + // The container draws the only frame; the theme otherwise nests + // a filled 12-radius box and focus ring inside this 18-radius pill. + filled: false, border: InputBorder.none, - contentPadding: const EdgeInsets.symmetric( + enabledBorder: InputBorder.none, + focusedBorder: InputBorder.none, + isDense: true, + contentPadding: EdgeInsets.symmetric( horizontal: AppSpacing.md, vertical: AppSpacing.sm + 4, ), @@ -416,48 +348,13 @@ class _AiCoachViewState extends State<_AiCoachView> { ), ), const SizedBox(width: AppSpacing.sm), - GestureDetector( - onTap: loading ? null : _send, - child: AnimatedContainer( - duration: const Duration(milliseconds: 150), - width: 44, - height: 44, - decoration: BoxDecoration( - gradient: loading - ? null - : const LinearGradient( - colors: [AppColors.primary, Color(0xFF5B21B6)], - begin: Alignment.topLeft, - end: Alignment.bottomRight, - ), - color: loading ? AppColors.glass3 : null, - borderRadius: BorderRadius.circular(AppRadius.xl), - boxShadow: loading - ? null - : [ - BoxShadow( - color: AppColors.primaryGlow(0.4), - blurRadius: 12, - spreadRadius: -4, - ), - ], - ), - child: loading - ? const Center( - child: SizedBox( - width: 18, - height: 18, - child: CircularProgressIndicator( - strokeWidth: 1.5, - valueColor: AlwaysStoppedAnimation(AppColors.primary), - ), - ), - ) - : const Icon( - Icons.arrow_upward_rounded, - color: Colors.white, - size: 20, - ), + // Keystrokes rebuild only this button, not the whole transcript. + ValueListenableBuilder( + valueListenable: _controller, + builder: (_, value, _) => _SendButton( + loading: vm.isLoading, + enabled: value.text.trim().isNotEmpty, + onTap: _send, ), ), ], @@ -466,25 +363,75 @@ class _AiCoachViewState extends State<_AiCoachView> { } } -// ── Header icon button ────────────────────────────────────────────────────── +// ── Send button ────────────────────────────────────────────────────────────── + +/// Three distinguishable states: sending, ready, and nothing-to-send. +class _SendButton extends StatelessWidget { + const _SendButton({ + required this.loading, + required this.enabled, + required this.onTap, + }); -class _HeaderIconButton extends StatelessWidget { - const _HeaderIconButton({required this.icon, required this.onTap}); - final IconData icon; + final bool loading; + final bool enabled; final VoidCallback onTap; @override Widget build(BuildContext context) { - return GestureDetector( - onTap: onTap, - child: Container( - padding: const EdgeInsets.all(8), - decoration: BoxDecoration( - color: AppColors.glass, - borderRadius: BorderRadius.circular(AppRadius.sm), - border: Border.all(color: AppColors.glassBorder), + final active = enabled && !loading; + return Semantics( + button: true, + enabled: active, + label: loading ? 'Sending' : 'Send message', + // InkWell, not a bare GestureDetector: the button needs to sit in the + // focus traversal order and activate from the keyboard. Enter already + // sends from the text field, so this is about reaching the control + // itself, not about the action being unavailable. + child: Material( + type: MaterialType.transparency, + child: InkWell( + onTap: active ? onTap : null, + borderRadius: BorderRadius.circular(AppRadius.xl), + focusColor: AppColors.primaryGlow(0.35), + child: AnimatedContainer( + duration: AppDurations.fast, + curve: Curves.easeOut, + width: 44, + height: 44, + decoration: BoxDecoration( + gradient: active ? AppColors.primaryGradient : null, + color: active ? null : AppColors.glass2, + borderRadius: BorderRadius.circular(AppRadius.xl), + border: active ? null : Border.all(color: AppColors.glassBorder), + boxShadow: active + ? [ + BoxShadow( + color: AppColors.primaryGlow(0.4), + blurRadius: 12, + spreadRadius: -4, + ), + ] + : null, + ), + child: Center( + child: loading + ? const SizedBox( + width: 18, + height: 18, + child: CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation(AppColors.primary), + ), + ) + : Icon( + Icons.arrow_upward_rounded, + color: active ? Colors.white : AppColors.textFaint, + size: 20, + ), + ), + ), ), - child: Icon(icon, color: AppColors.textSoft, size: 18), ), ); } @@ -514,7 +461,8 @@ class _ConversationsSheet extends StatelessWidget { children: [ Text( 'Conversations', - style: TextStyle(fontFamily: 'Geist', + style: TextStyle( + fontFamily: 'Geist', color: AppColors.textPrimary, fontSize: 16, fontWeight: FontWeight.w700, @@ -528,12 +476,16 @@ class _ConversationsSheet extends StatelessWidget { }, child: Row( children: [ - const Icon(Icons.add_rounded, - color: AppColors.primary, size: 18), + const Icon( + Icons.add_rounded, + color: AppColors.primary, + size: 18, + ), const SizedBox(width: 4), Text( 'New chat', - style: TextStyle(fontFamily: 'Geist', + style: TextStyle( + fontFamily: 'Geist', color: AppColors.primary, fontSize: 13, fontWeight: FontWeight.w600, @@ -547,10 +499,13 @@ class _ConversationsSheet extends StatelessWidget { const SizedBox(height: AppSpacing.md), if (conversations.isEmpty) Padding( - padding: const EdgeInsets.symmetric(vertical: AppSpacing.lg), + padding: const EdgeInsets.symmetric( + vertical: AppSpacing.lg, + ), child: Text( 'No saved conversations yet.', - style: TextStyle(fontFamily: 'Geist', + style: TextStyle( + fontFamily: 'Geist', color: AppColors.textMuted, fontSize: 13, ), @@ -613,23 +568,31 @@ class _ConversationTile extends StatelessWidget { vertical: AppSpacing.sm + 2, ), decoration: BoxDecoration( - color: isActive ? AppColors.primary.withValues(alpha: 0.12) : AppColors.glass3, + color: isActive + ? AppColors.primary.withValues(alpha: 0.12) + : AppColors.glass3, borderRadius: BorderRadius.circular(AppRadius.md), border: Border.all( - color: isActive ? AppColors.primary.withValues(alpha: 0.4) : AppColors.glassBorder, + color: isActive + ? AppColors.primary.withValues(alpha: 0.4) + : AppColors.glassBorder, ), ), child: Row( children: [ - const Icon(Icons.chat_bubble_outline_rounded, - color: AppColors.textMuted, size: 16), + const Icon( + Icons.chat_bubble_outline_rounded, + color: AppColors.textMuted, + size: 16, + ), const SizedBox(width: AppSpacing.sm), Expanded( child: Text( conversation.title.isEmpty ? 'New chat' : conversation.title, maxLines: 1, overflow: TextOverflow.ellipsis, - style: TextStyle(fontFamily: 'Geist', + style: TextStyle( + fontFamily: 'Geist', color: AppColors.textPrimary, fontSize: 13, fontWeight: FontWeight.w500, @@ -640,8 +603,11 @@ class _ConversationTile extends StatelessWidget { onTap: onDelete, child: const Padding( padding: EdgeInsets.only(left: AppSpacing.sm), - child: Icon(Icons.delete_outline_rounded, - color: AppColors.textFaint, size: 18), + child: Icon( + Icons.delete_outline_rounded, + color: AppColors.textFaint, + size: 18, + ), ), ), ], @@ -651,150 +617,302 @@ class _ConversationTile extends StatelessWidget { } } -// ── Suggestion chip ─────────────────────────────────────────────────────────── +// ── Message bubble ──────────────────────────────────────────────────────────── -class _SuggestionChip extends StatelessWidget { - const _SuggestionChip({required this.label, required this.onTap}); - final String label; - final VoidCallback onTap; +class _MessageBubble extends StatelessWidget { + const _MessageBubble({required this.message}); + final ChatMessage message; @override Widget build(BuildContext context) { - return GestureDetector( - onTap: onTap, - child: Container( - padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 8), - decoration: BoxDecoration( - color: AppColors.primary.withValues(alpha: 0.10), - borderRadius: BorderRadius.circular(AppRadius.full), - border: Border.all(color: AppColors.primary.withValues(alpha: 0.30)), - ), - child: Text( - label, - style: TextStyle(fontFamily: 'Geist', - color: AppColors.primary, - fontSize: 13, - fontWeight: FontWeight.w500, - ), - ), - ), + final isUser = message.role == 'user'; + return _Turn( + isUser: isUser, + toolCalls: isUser ? const [] : (message.toolCalls ?? const []), + child: isUser + ? Text( + message.text, + style: const TextStyle( + fontFamily: 'Geist', + color: Colors.white, + fontSize: 14, + height: 1.55, + ), + ) + : CoachMessageContent(text: message.text), ); } } -// ── Message bubble ──────────────────────────────────────────────────────────── +class _StreamingBubble extends StatelessWidget { + const _StreamingBubble({required this.text, this.toolCalls = const []}); + final String text; + final List toolCalls; -class _MessageBubble extends StatelessWidget { - const _MessageBubble({required this.message}); - final ChatMessage message; + @override + Widget build(BuildContext context) { + return _Turn( + isUser: false, + toolCalls: toolCalls, + toolCallsActive: true, + // An empty stream is still a bubble — the dots need somewhere to sit. + forceBubble: text.isEmpty, + child: text.isEmpty + ? const RFLoadingDots() + : CoachMessageContent(text: text, streaming: true), + ); + } +} + +// ── Turn layout ────────────────────────────────────────────────────────────── + +/// One turn: avatar, tool-call chips, and content — bubbled for prose, bare +/// for a dashboard, whose own cards would otherwise sit in a second frame. +class _Turn extends StatelessWidget { + const _Turn({ + required this.isUser, + required this.child, + this.toolCalls = const [], + this.toolCallsActive = false, + this.forceBubble = false, + }); + + final bool isUser; + final Widget child; + final List toolCalls; + final bool toolCallsActive; + final bool forceBubble; @override Widget build(BuildContext context) { - final isUser = message.role == 'user'; + // A dashboard takes the full column; prose takes a bubble. + final isDashboard = + !forceBubble && + !isUser && + child is CoachMessageContent && + CoachMessageContent.rendersAsDashboard( + (child as CoachMessageContent).text, + ); + + final content = isDashboard + ? child + : Container( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm + 2, + ), + decoration: BoxDecoration( + gradient: isUser ? AppColors.primaryGradient : null, + color: isUser ? null : AppColors.glass2, + // The square corner marks the speaker's side. + borderRadius: BorderRadius.only( + topLeft: const Radius.circular(AppRadius.lg), + topRight: const Radius.circular(AppRadius.lg), + bottomLeft: Radius.circular(isUser ? AppRadius.lg : 4), + bottomRight: Radius.circular(isUser ? 4 : AppRadius.lg), + ), + border: isUser ? null : Border.all(color: AppColors.glassBorder), + boxShadow: isUser + ? [ + BoxShadow( + color: AppColors.primaryGlow(0.25), + blurRadius: 12, + spreadRadius: -4, + ), + ] + : null, + ), + child: child, + ); + + final column = Column( + crossAxisAlignment: isUser + ? CrossAxisAlignment.end + : CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + if (toolCalls.isNotEmpty) + Padding( + padding: const EdgeInsets.only(bottom: AppSpacing.sm), + child: _ToolCallChips( + toolNames: toolCalls, + active: toolCallsActive, + ), + ), + content, + ], + ); + return Padding( padding: const EdgeInsets.only(bottom: AppSpacing.md), child: Row( - mainAxisAlignment: - isUser ? MainAxisAlignment.end : MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.end, + mainAxisAlignment: isUser + ? MainAxisAlignment.end + : MainAxisAlignment.start, + // Top, so a tall turn's avatar sits beside its first line, not its last. + crossAxisAlignment: CrossAxisAlignment.start, children: [ if (!isUser) ...[ - _AiAvatar(), + const _AiAvatar(), const SizedBox(width: AppSpacing.sm), ], - Flexible( - child: Container( - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.md, - vertical: AppSpacing.sm + 2, - ), - decoration: BoxDecoration( - gradient: isUser - ? const LinearGradient( - colors: [AppColors.primary, Color(0xFF5B21B6)], - begin: Alignment.topLeft, - end: Alignment.bottomRight, - ) - : null, - color: isUser ? null : AppColors.glass3, - borderRadius: BorderRadius.only( - topLeft: const Radius.circular(AppRadius.lg), - topRight: const Radius.circular(AppRadius.lg), - bottomLeft: Radius.circular(isUser ? AppRadius.lg : 4), - bottomRight: Radius.circular(isUser ? 4 : AppRadius.lg), + if (isDashboard) + Expanded(child: column) + else + Flexible( + child: ConstrainedBox( + constraints: BoxConstraints( + maxWidth: + MediaQuery.sizeOf(context).width * _kBubbleMaxWidthFactor, ), - border: isUser - ? null - : Border.all(color: AppColors.glassBorder), - boxShadow: isUser - ? [ - BoxShadow( - color: AppColors.primaryGlow(0.25), - blurRadius: 12, - spreadRadius: -4, - ), - ] - : null, + child: column, ), - child: isUser - ? Text( - message.text, - style: TextStyle(fontFamily: 'Geist', - color: AppColors.textPrimary, - fontSize: 14, - height: 1.55, - ), - ) - : _CoachMarkdown(text: message.text), ), - ), ], ), ); } } -class _StreamingBubble extends StatelessWidget { - const _StreamingBubble({required this.text}); +// ── Tool-call indicator chips ───────────────────────────────────────────────── + +/// Small pill row showing which coach tools were invoked while producing a +/// reply. [active] pulses subtly to indicate a tool call is in flight. +class _ToolCallChips extends StatelessWidget { + const _ToolCallChips({required this.toolNames, this.active = false}); + final List toolNames; + final bool active; + + // Dedupe while preserving first-seen order — a tool can be called more + // than once per turn (e.g. re-checking after an update), but the chip row + // only needs to say *which* tools ran, not how many times. + List get _unique => {...toolNames}.toList(); + + String _label(String toolName) => toolName + .split('_') + .map((w) => w.isEmpty ? w : '${w[0].toUpperCase()}${w.substring(1)}') + .join(' '); + + @override + Widget build(BuildContext context) { + return Wrap( + spacing: 6, + runSpacing: 6, + children: [ + for (final name in _unique) + Container( + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + decoration: BoxDecoration( + color: AppColors.secondary.withValues(alpha: 0.10), + borderRadius: BorderRadius.circular(AppRadius.full), + border: Border.all( + color: AppColors.secondary.withValues(alpha: 0.3), + ), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + active ? Icons.bolt_rounded : Icons.build_rounded, + color: AppColors.secondary, + size: 11, + ), + const SizedBox(width: 4), + Text( + _label(name), + style: const TextStyle( + fontFamily: 'GeistMono', + color: AppColors.secondary, + fontSize: 10, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + ], + ); + } +} + +/// Renders one coach reply: an A2UI dashboard when the text is a UI payload, +/// otherwise Markdown. +/// +/// Public so widget tests can drive it directly. Parsing is memoized per text +/// value — the old code re-parsed on every rebuild, including on every partial +/// frame of a stream. +class CoachMessageContent extends StatefulWidget { + const CoachMessageContent({ + super.key, + required this.text, + this.streaming = false, + }); + + static final _parser = A2UiParser(defaultA2UiRegistry); + + /// Parsed nodes by source text. Shared because the turn layout needs the + /// result before this widget builds; bounded so transcripts don't accumulate. + static final Map _nodeCache = {}; + static const _nodeCacheLimit = 32; + + static A2UiNode? nodeFor(String text) { + if (_nodeCache.containsKey(text)) return _nodeCache[text]; + if (_nodeCache.length >= _nodeCacheLimit) { + _nodeCache.remove(_nodeCache.keys.first); + } + return _nodeCache[text] = _parser.parse(text); + } + + /// True when [text] is a complete A2UI payload, so renders full-width. + static bool rendersAsDashboard(String text) => nodeFor(text) != null; + + /// True when [text] is a partial A2UI payload still arriving. + static bool looksLikeUi(String text) => _parser.looksLikeUi(text); + final String text; + /// True while tokens are still arriving, so a half-written JSON payload + /// shows a placeholder instead of raw braces. + final bool streaming; + + @override + State createState() => _CoachMessageContentState(); +} + +class _CoachMessageContentState extends State { @override Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.only(bottom: AppSpacing.md), - child: Row( - crossAxisAlignment: CrossAxisAlignment.end, + final node = CoachMessageContent.nodeFor(widget.text); + if (node != null) return A2UiRenderer(node: node); + + // Mid-stream JSON: hide the braces behind a progress row rather than + // letting the Markdown renderer spill raw payload into the bubble. + if (widget.streaming && CoachMessageContent.looksLikeUi(widget.text)) { + return Row( + mainAxisSize: MainAxisSize.min, children: [ - _AiAvatar(), + const SizedBox( + width: 12, + height: 12, + child: CircularProgressIndicator(strokeWidth: 2), + ), const SizedBox(width: AppSpacing.sm), - Flexible( - child: Container( - padding: const EdgeInsets.symmetric( - horizontal: AppSpacing.md, - vertical: AppSpacing.sm + 2, - ), - decoration: BoxDecoration( - color: AppColors.glass3, - borderRadius: const BorderRadius.only( - topLeft: Radius.circular(AppRadius.lg), - topRight: Radius.circular(AppRadius.lg), - bottomLeft: Radius.circular(4), - bottomRight: Radius.circular(AppRadius.lg), - ), - border: Border.all(color: AppColors.glassBorder), - ), - child: text.isEmpty - ? const RFLoadingDots() - : _CoachMarkdown(text: text), + const Text( + 'Building dashboard…', + style: TextStyle( + fontFamily: 'Geist', + color: AppColors.textMuted, + fontSize: 13, ), ), ], - ), - ); + ); + } + + return _CoachMarkdown(text: widget.text); } } -/// Markdown renderer for coach replies, styled to the app theme. class _CoachMarkdown extends StatelessWidget { const _CoachMarkdown({required this.text}); final String text; @@ -803,7 +921,8 @@ class _CoachMarkdown extends StatelessWidget { Widget build(BuildContext context) { return GptMarkdown( text, - style: TextStyle(fontFamily: 'Geist', + style: TextStyle( + fontFamily: 'Geist', color: AppColors.textPrimary, fontSize: 14, height: 1.55, @@ -813,27 +932,14 @@ class _CoachMarkdown extends StatelessWidget { } class _AiAvatar extends StatelessWidget { + const _AiAvatar(); + @override Widget build(BuildContext context) { - return Container( - width: 28, - height: 28, - decoration: BoxDecoration( - gradient: const LinearGradient( - colors: [AppColors.primary, Color(0xFF5B21B6)], - begin: Alignment.topLeft, - end: Alignment.bottomRight, - ), - borderRadius: BorderRadius.circular(AppRadius.sm), - boxShadow: [ - BoxShadow( - color: AppColors.primaryGlow(0.35), - blurRadius: 8, - spreadRadius: -2, - ), - ], - ), - child: const Icon(Icons.auto_awesome_rounded, color: Colors.white, size: 14), + return const RFGradientBadge( + icon: Icons.auto_awesome_rounded, + size: 28, + radius: AppRadius.sm, ); } } diff --git a/workout-logger/lib/screens/edit_workout_session_screen.dart b/workout-logger/lib/screens/edit_workout_session_screen.dart index 94da3db..90495e1 100644 --- a/workout-logger/lib/screens/edit_workout_session_screen.dart +++ b/workout-logger/lib/screens/edit_workout_session_screen.dart @@ -9,6 +9,7 @@ import '../models/models.dart'; import '../services/workout_provider.dart'; import '../theme/app_theme.dart'; import 'widgets/rf_widgets.dart'; +import 'widgets/rf_dialogs.dart'; import 'widgets/editable_exercise_card.dart'; class EditWorkoutSessionScreen extends StatefulWidget { @@ -206,50 +207,20 @@ class _EditWorkoutSessionScreenState extends State { Future _onWillPop() async { if (!_hasChanges) return true; - final result = await showDialog( - context: context, - builder: (ctx) => AlertDialog( - backgroundColor: AppColors.cardHigh, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(AppRadius.lg), - ), - title: const Text( - 'Discard Changes?', - style: TextStyle(color: AppColors.textPrimary), - ), - content: const Text( - 'You have unsaved changes. Discard them?', - style: TextStyle(color: AppColors.textSoft), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(false), - child: const Text( - 'Cancel', - style: TextStyle(color: AppColors.textSoft), - ), - ), - TextButton( - onPressed: () => Navigator.of(ctx).pop(true), - style: TextButton.styleFrom(foregroundColor: AppColors.error), - child: const Text('Discard'), - ), - ], - ), + final result = await showRFConfirmDialog( + context, + title: 'Discard Changes?', + content: 'You have unsaved changes. Discard them?', + confirmText: 'Discard', + isDanger: true, ); return result ?? false; } void _snack(String msg, {bool isError = false}) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text(msg, style: const TextStyle(color: AppColors.textPrimary)), - backgroundColor: isError ? AppColors.error : AppColors.cardHigh, - behavior: SnackBarBehavior.floating, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(AppRadius.md), - ), - ), + context.showRFSnackBar( + msg, + type: isError ? RFSnackBarType.error : RFSnackBarType.info, ); } diff --git a/workout-logger/lib/screens/home_screen.dart b/workout-logger/lib/screens/home_screen.dart index 5ad5b8f..caf412d 100644 --- a/workout-logger/lib/screens/home_screen.dart +++ b/workout-logger/lib/screens/home_screen.dart @@ -22,6 +22,7 @@ import 'widgets/readiness_card.dart'; import 'widgets/sleep_hr_card.dart'; import 'widgets/heart_rate_card.dart'; import 'widgets/rf_widgets.dart'; +import 'widgets/floating_nav_bar.dart'; import 'widgets/sparkline_painter.dart'; import 'widgets/activity_heatmap.dart'; import 'widgets/body_heatmap.dart'; @@ -39,19 +40,34 @@ class _HomeScreenState extends State { int _currentIndex = 0; static const _navItems = [ - RFNavItem(icon: Icons.home_rounded, label: 'Home'), - RFNavItem(icon: Icons.layers_rounded, label: 'Routines'), - RFNavItem(icon: Icons.history_rounded, label: 'History'), - RFNavItem(icon: Icons.bar_chart_rounded, label: 'Stats'), + FloatingNavItem(icon: Icons.home_rounded, label: 'Home'), + FloatingNavItem(icon: Icons.layers_rounded, label: 'Routines'), + FloatingNavItem(icon: Icons.history_rounded, label: 'History'), + FloatingNavItem(icon: Icons.bar_chart_rounded, label: 'Stats'), ]; void switchTab(int index) => setState(() => _currentIndex = index); @override Widget build(BuildContext context) { - return Scaffold( - extendBody: true, - backgroundColor: AppColors.background, + return FloatingNavBarScaffold( + scaffoldBackgroundColor: AppColors.background, + // App-specific colour overrides — all other values use the + // FloatingNavBarTheme defaults which adapt to ThemeData.colorScheme. + theme: FloatingNavBarTheme( + backgroundColor: AppColors.surface, + borderColor: AppColors.glassBorderStrong, + // Chip colours (replaces old pill API) + selectedChipColor: AppColors.glass3, + selectedChipBorderColor: AppColors.primary.withValues(alpha: 0.25), + selectedChipShadowColor: AppColors.primary.withValues(alpha: 0.15), + selectedContentColor: AppColors.textPrimary, + inactiveIconColor: AppColors.textMuted, + outerGlowColor: AppColors.primary.withValues(alpha: 0.08), + ), + items: _navItems, + currentIndex: _currentIndex, + onTabChanged: switchTab, body: IndexedStack( index: _currentIndex, children: const [ @@ -61,11 +77,6 @@ class _HomeScreenState extends State { AnalyticsScreen(), ], ), - bottomNavigationBar: RFNavBar( - currentIndex: _currentIndex, - onTap: switchTab, - items: _navItems, - ), ); } diff --git a/workout-logger/lib/screens/profile_screen.dart b/workout-logger/lib/screens/profile_screen.dart index 21e2910..9460ba3 100644 --- a/workout-logger/lib/screens/profile_screen.dart +++ b/workout-logger/lib/screens/profile_screen.dart @@ -16,6 +16,7 @@ import '../services/workout_provider.dart'; import '../services/settings_provider.dart'; import '../services/interfaces/health_connect_service_interface.dart'; import '../services/managers/readiness_manager.dart'; +import '../services/health_data_sync_service.dart'; import '../theme/app_theme.dart'; import 'widgets/profile_sections.dart'; @@ -32,6 +33,7 @@ class _ProfileScreenState extends State bool _isImporting = false; bool _isRequestingHcPermission = false; bool _isRequestingReadinessPermission = false; + bool _isSyncingHealthData = false; String _appVersion = ''; @override @@ -192,6 +194,25 @@ class _ProfileScreenState extends State } } + Future _syncHealthDataNow() async { + setState(() => _isSyncingHealthData = true); + try { + final sync = context.read(); + if (sync == null) { + if (mounted) { + _showSnack('Health data sync is not available.', AppColors.error); + } + return; + } + await sync.sync(force: true); + if (mounted) _showSnack('Coach data synced!', AppColors.success); + } catch (e) { + if (mounted) _showSnack('Sync failed. Try again later.', AppColors.error); + } finally { + if (mounted) setState(() => _isSyncingHealthData = false); + } + } + Future _exportToFile() async { setState(() => _isExporting = true); try { @@ -351,6 +372,8 @@ class _ProfileScreenState extends State await settings.setReadinessEnabled(false); } }, + isHealthSyncLoading: _isSyncingHealthData, + onHealthSyncNow: _isSyncingHealthData ? null : _syncHealthDataNow, ), const SizedBox(height: AppSpacing.md), DataManagementSection( diff --git a/workout-logger/lib/screens/programs/import_program_screen.dart b/workout-logger/lib/screens/programs/import_program_screen.dart index 81de167..84f2a05 100644 --- a/workout-logger/lib/screens/programs/import_program_screen.dart +++ b/workout-logger/lib/screens/programs/import_program_screen.dart @@ -269,7 +269,6 @@ class _ImportProgramScreenState extends State { final result = await FilePicker.pickFiles( type: FileType.custom, allowedExtensions: ['json'], - allowMultiple: false, ); if (result == null || result.files.isEmpty) return; diff --git a/workout-logger/lib/screens/widgets/exercise_input_section.dart b/workout-logger/lib/screens/widgets/exercise_input_section.dart index 687809d..923d222 100644 --- a/workout-logger/lib/screens/widgets/exercise_input_section.dart +++ b/workout-logger/lib/screens/widgets/exercise_input_section.dart @@ -5,14 +5,14 @@ import 'package:flutter/services.dart'; import '../../models/models.dart'; import '../../services/settings_provider.dart'; import '../../theme/app_theme.dart'; -import 'rf_widgets.dart'; +import 'rf_shell.dart'; // ── ExerciseInputSection ────────────────────────────────────────────────────── -// Renders: AI suggestion card, weight/reps inputs, dropset section, -// LOG SET button, previous sets, last session info, program metadata banner. +// Suggestion card, weight/reps inputs, dropset, session history, program meta. class ExerciseInputSection extends StatelessWidget { const ExerciseInputSection({ super.key, + required this.contentWidth, required this.currentWeight, required this.currentReps, required this.isDropset, @@ -32,13 +32,18 @@ class ExerciseInputSection extends StatelessWidget { required this.onDropRemoved, required this.onDropWeightChanged, required this.onDropRepsChanged, - required this.onLogSet, required this.onApplyRecommendation, this.programSlot, this.programWeek, this.exerciseId, + this.availableHandles, + this.selectedHandle, + this.onHandleChanged, }); + /// Layout width minus padding. Passed in, not measured: the host screen's [IntrinsicHeight] (which [Spacer] needs) forbids a [LayoutBuilder] under it. + final double contentWidth; + final double currentWeight; final int currentReps; final bool isDropset; @@ -58,14 +63,22 @@ class ExerciseInputSection extends StatelessWidget { final ValueChanged onDropRemoved; final void Function(int index, double weight) onDropWeightChanged; final void Function(int index, int reps) onDropRepsChanged; - final VoidCallback onLogSet; final VoidCallback onApplyRecommendation; final ProgramExerciseSlot? programSlot; final ProgramWeek? programWeek; final String? exerciseId; + final List? availableHandles; + final String? selectedHandle; + final ValueChanged? onHandleChanged; @override Widget build(BuildContext context) { + final isAssistedBW = isAssistedBodyweightExercise(exerciseId); + final effectiveWeight = (settings.userBodyWeight - currentWeight).clamp(0.0, 500.0); + final effectiveWeightDisplay = settings.toDisplay(effectiveWeight); + final bodyWeightDisplay = settings.toDisplay(settings.userBodyWeight); + final currentWeightDisplay = settings.toDisplay(currentWeight); + return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -73,6 +86,20 @@ class ExerciseInputSection extends StatelessWidget { if (programSlot != null && programWeek != null) _ProgramMetaBanner(slot: programSlot!, week: programWeek!), + // Handle / Attachment Selector + if (availableHandles != null && availableHandles!.isNotEmpty) ...[ + _HandleSelector( + availableHandles: availableHandles!, + selectedHandle: selectedHandle, + onChanged: onHandleChanged, + // Once a set has been logged for this exercise instance, the + // handle is locked — the selector must not let the user (or + // silently appear to) relabel already-recorded sets. + locked: previousSets.isNotEmpty, + ), + const SizedBox(height: AppSpacing.sm), + ], + // AI suggestion if (recommendations.isNotEmpty) _RecommendationCard( @@ -88,13 +115,38 @@ class ExerciseInputSection extends StatelessWidget { // Weight + reps inputs if (!isDropset) ...[ _InputRow( + contentWidth: contentWidth, currentWeight: currentWeight, currentReps: currentReps, settings: settings, - exerciseId: exerciseId, + isAssistedBW: isAssistedBW, onWeightChanged: onWeightChanged, onRepsChanged: onRepsChanged, ), + if (isAssistedBW) ...[ + const SizedBox(height: 6), + Container( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), + decoration: BoxDecoration( + color: AppColors.primary.withValues(alpha: 0.1), + borderRadius: BorderRadius.circular(AppRadius.sm), + border: Border.all(color: AppColors.primary.withValues(alpha: 0.2)), + ), + child: Row( + children: [ + const Icon(Icons.fitness_center_rounded, size: 14, color: AppColors.primary), + const SizedBox(width: 6), + // Long enough to wrap on a narrow phone, more so at a large text scale. + Expanded( + child: Text( + 'Effective Volume Load: ${effectiveWeightDisplay.toStringAsFixed(1)} ${settings.unitLabel} (${bodyWeightDisplay.toStringAsFixed(1)} BW − ${currentWeightDisplay.toStringAsFixed(1)} Assist) × $currentReps reps', + style: const TextStyle(fontSize: 11, color: AppColors.textSoft, fontWeight: FontWeight.w500), + ), + ), + ], + ), + ), + ], const SizedBox(height: AppSpacing.md), ], @@ -118,27 +170,66 @@ class ExerciseInputSection extends StatelessWidget { const SizedBox(height: AppSpacing.lg), - // LOG SET button - GlowButton( - label: 'LOG SET', - icon: Icons.check_rounded, - onPressed: onLogSet, - ), + // Absorbs leftover height so the history below reads as a footer. + const Spacer(), - // Previous sets if (previousSets.isNotEmpty) ...[ - const SizedBox(height: AppSpacing.lg), _PreviousSetsSection(sets: previousSets, settings: settings), + const SizedBox(height: AppSpacing.lg), ], - - // Last session - const SizedBox(height: AppSpacing.lg), _LastSessionSection(lastSession: lastSession, settings: settings), ], ); } } +// ── Handle Selector ────────────────────────────────────────────────────────── +class _HandleSelector extends StatelessWidget { + const _HandleSelector({ + required this.availableHandles, + required this.selectedHandle, + required this.onChanged, + this.locked = false, + }); + + final List availableHandles; + final String? selectedHandle; + final ValueChanged? onChanged; + final bool locked; + + @override + Widget build(BuildContext context) { + // Only show a chip as selected once the user (or a restored draft) has + // actually chosen it — never default-highlight the first handle just + // because nothing has been persisted yet. + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const RFLabel('Attachment'), + const SizedBox(height: AppSpacing.sm), + SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: Row( + children: availableHandles.map((handle) { + return Padding( + padding: const EdgeInsets.only(right: 6), + child: RFOptionChip( + label: handle, + selected: selectedHandle == handle, + inMutuallyExclusiveGroup: true, + onTap: locked || onChanged == null + ? null + : () => onChanged!(handle), + ), + ); + }).toList(), + ), + ), + ], + ); + } +} + // ── Recommendation Card ──────────────────────────────────────────────────────── class _RecommendationCard extends StatelessWidget { const _RecommendationCard({ @@ -198,13 +289,17 @@ class _RecommendationCard extends StatelessWidget { children: [ Row( children: [ - const Text( - 'AI Suggestion', - style: TextStyle( - color: AppColors.textSoft, - fontSize: 11, - fontWeight: FontWeight.w600, - letterSpacing: 0.5, + const Flexible( + child: Text( + 'AI Suggestion', + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + color: AppColors.textSoft, + fontSize: 11, + fontWeight: FontWeight.w600, + letterSpacing: 0.5, + ), ), ), const SizedBox(width: 6), @@ -254,50 +349,65 @@ class _RecommendationCard extends StatelessWidget { // ── Input Row ──────────────────────────────────────────────────────────────── class _InputRow extends StatelessWidget { const _InputRow({ + required this.contentWidth, required this.currentWeight, required this.currentReps, required this.settings, required this.onWeightChanged, required this.onRepsChanged, - this.exerciseId, + this.isAssistedBW = false, }); + final double contentWidth; final double currentWeight; final int currentReps; final SettingsProvider settings; final ValueChanged onWeightChanged; final ValueChanged onRepsChanged; - final String? exerciseId; + final bool isAssistedBW; @override Widget build(BuildContext context) { - final isAssistedBW = - exerciseId == 'pull_ups' || exerciseId == 'chin_ups'; final weightLabel = isAssistedBW ? 'Assist (${settings.unitLabel})' : settings.unitLabel; final displayWeight = settings.toDisplay(currentWeight); + // Once a large system font squeezes the value past legibility, stack rather than shrink the digits further. + final pairedWidth = (contentWidth - AppSpacing.md) / 2; + final stacked = !_NumberInputCard.valueFits(context, pairedWidth); + final cardWidth = stacked ? contentWidth : pairedWidth; + + final weightCard = _NumberInputCard( + cardWidth: cardWidth, + label: weightLabel, + value: displayWeight, + step: settings.weightIncrement, + decimals: 1, + onChanged: (v) => onWeightChanged(settings.toStorage(v)), + ); + final repsCard = _NumberInputCard( + cardWidth: cardWidth, + label: 'Reps', + value: currentReps.toDouble(), + step: 1, + decimals: 0, + onChanged: (v) => onRepsChanged(v.toInt()), + ); + + if (stacked) { + return Column( + children: [ + weightCard, + const SizedBox(height: AppSpacing.md), + repsCard, + ], + ); + } return Row( children: [ - Expanded( - child: _NumberInputCard( - label: weightLabel, - value: displayWeight, - step: settings.weightIncrement, - decimals: 1, - onChanged: (v) => onWeightChanged(settings.toStorage(v)), - ), - ), + Expanded(child: weightCard), const SizedBox(width: AppSpacing.md), - Expanded( - child: _NumberInputCard( - label: 'Reps', - value: currentReps.toDouble(), - step: 1, - decimals: 0, - onChanged: (v) => onRepsChanged(v.toInt()), - ), - ), + Expanded(child: repsCard), ], ); } @@ -306,6 +416,7 @@ class _InputRow extends StatelessWidget { // ── Number Input Card ───────────────────────────────────────────────────────── class _NumberInputCard extends StatefulWidget { const _NumberInputCard({ + required this.cardWidth, required this.label, required this.value, required this.step, @@ -313,12 +424,49 @@ class _NumberInputCard extends StatefulWidget { required this.onChanged, }); + /// Laid-out width; passed for the reason [ExerciseInputSection.contentWidth] gives. + final double cardWidth; + final String label; final double value; final double step; final int decimals; final ValueChanged onChanged; + /// Tighter than the usual `md`, to leave the value more of the row. + static const double hPadding = AppSpacing.sm + 2; + + static const double maxValueFontSize = 36; + static const double minValueFontSize = 18; + + /// Room left for the value between the two steppers in a card [cardWidth] wide. + static double valueSlotWidth(BuildContext context, double cardWidth) => + cardWidth - hPadding * 2 - _StepBtn.sizeOf(context) * 2; + + /// Whether a card [cardWidth] wide still shows `100.0` legibly — [_InputRow] stacks when it does not. + static bool valueFits(BuildContext context, double cardWidth) => + valueSlotWidth(context, cardWidth) >= + measureValue(context, '100.0', minValueFontSize); + + static TextStyle valueStyle(double fontSize) => TextStyle( + fontFamily: 'GeistMono', + color: AppColors.textPrimary, + fontSize: fontSize, + fontWeight: FontWeight.w700, + ); + + /// Width [text] paints at, honouring the reader's text scale. + static double measureValue( + BuildContext context, String text, double fontSize) { + final painter = TextPainter( + text: TextSpan(text: text, style: valueStyle(fontSize)), + textDirection: Directionality.of(context), + textScaler: MediaQuery.textScalerOf(context), + maxLines: 1, + )..layout(); + return painter.width; + } + @override State<_NumberInputCard> createState() => _NumberInputCardState(); } @@ -354,10 +502,27 @@ class _NumberInputCardState extends State<_NumberInputCard> { ? widget.value.toStringAsFixed(widget.decimals) : widget.value.toInt().toString(); + /// Largest size that paints [text] inside the value slot, floored at [_NumberInputCard.minValueFontSize]. + double _fitFontSize(BuildContext context, String text) { + const maxSize = _NumberInputCard.maxValueFontSize; + final slot = _NumberInputCard.valueSlotWidth(context, widget.cardWidth); + if (!slot.isFinite) return maxSize; + // A few pixels for the caret, which sits past the last glyph. + final available = slot - 4; + if (available <= 0) return _NumberInputCard.minValueFontSize; + final natural = _NumberInputCard.measureValue(context, text, maxSize); + if (natural <= available || natural <= 0) return maxSize; + return (maxSize * available / natural) + .clamp(_NumberInputCard.minValueFontSize, maxSize); + } + @override Widget build(BuildContext context) { return Container( - padding: const EdgeInsets.all(AppSpacing.md), + padding: const EdgeInsets.symmetric( + horizontal: _NumberInputCard.hPadding, + vertical: AppSpacing.md, + ), decoration: BoxDecoration( color: AppColors.card, borderRadius: BorderRadius.circular(AppRadius.lg), @@ -365,14 +530,10 @@ class _NumberInputCardState extends State<_NumberInputCard> { ), child: Column( children: [ - Text( - widget.label, - style: TextStyle(fontFamily: 'Geist', - color: AppColors.textMuted, - fontSize: 11, - fontWeight: FontWeight.w600, - letterSpacing: 0.5, - ), + // Kept to one line so the two cards in a row stay the same height. + FittedBox( + fit: BoxFit.scaleDown, + child: RFLabel(widget.label), ), const SizedBox(height: AppSpacing.sm), Row( @@ -385,41 +546,49 @@ class _NumberInputCardState extends State<_NumberInputCard> { ), ), Expanded( - child: TextField( - controller: _controller, - focusNode: _focusNode, - style: TextStyle(fontFamily: 'GeistMono', - color: AppColors.textPrimary, - fontSize: 36, - fontWeight: FontWeight.w700, - ), - textAlign: TextAlign.center, - keyboardType: TextInputType.numberWithOptions( - decimal: widget.decimals > 0, - ), - inputFormatters: widget.decimals > 0 - ? [ - FilteringTextInputFormatter.allow( - RegExp(r'^\d*\.?\d*$'), - ), - ] - : [FilteringTextInputFormatter.digitsOnly], - decoration: const InputDecoration( - border: InputBorder.none, - contentPadding: EdgeInsets.zero, - isDense: true, + // Re-fitted per keystroke: a 3-digit weight or a large system font would otherwise be clipped. + child: ValueListenableBuilder( + valueListenable: _controller, + builder: (context, value, _) => TextField( + controller: _controller, + focusNode: _focusNode, + style: _NumberInputCard.valueStyle( + _fitFontSize( + context, + value.text.isEmpty ? _format() : value.text, + ), + ), + maxLines: 1, + textAlign: TextAlign.center, + keyboardType: TextInputType.numberWithOptions( + decimal: widget.decimals > 0, + ), + inputFormatters: widget.decimals > 0 + ? [ + FilteringTextInputFormatter.allow( + RegExp(r'^\d*\.?\d*$'), + ), + ] + : [FilteringTextInputFormatter.digitsOnly], + decoration: const InputDecoration( + border: InputBorder.none, + contentPadding: EdgeInsets.zero, + isDense: true, + ), + onChanged: (text) { + final parsed = double.tryParse(text); + if (parsed != null) { + widget.onChanged(parsed.clamp(0, 999).toDouble()); + } + }, + onEditingComplete: () { + final formatted = _format(); + if (_controller.text != formatted) { + _controller.text = formatted; + } + _focusNode.unfocus(); + }, ), - onChanged: (text) { - final parsed = double.tryParse(text); - if (parsed != null) { - widget.onChanged(parsed.clamp(0, 999).toDouble()); - } - }, - onEditingComplete: () { - final formatted = _format(); - if (_controller.text != formatted) _controller.text = formatted; - _focusNode.unfocus(); - }, ), ), _StepBtn( @@ -441,9 +610,13 @@ class _StepBtn extends StatelessWidget { final IconData icon; final VoidCallback onTap; + /// Fixed: a stepper stays a thumb target, so the value beside it is what gives. + static double sizeOf(BuildContext context) => + MediaQuery.sizeOf(context).width < AppBreakpoints.narrow ? 36.0 : 40.0; + @override Widget build(BuildContext context) { - final size = MediaQuery.sizeOf(context).width < AppBreakpoints.narrow ? 36.0 : 40.0; + final size = sizeOf(context); return GestureDetector( onTap: () { onTap(); @@ -517,15 +690,16 @@ class _DropsetSection extends StatelessWidget { size: 18, ), const SizedBox(width: 8), - const Text( - 'Dropset', - style: TextStyle( - color: AppColors.textPrimary, - fontSize: 14, - fontWeight: FontWeight.w600, + const Expanded( + child: Text( + 'Dropset', + style: TextStyle( + color: AppColors.textPrimary, + fontSize: 14, + fontWeight: FontWeight.w600, + ), ), ), - const Spacer(), Switch( value: isDropset, onChanged: onToggled, @@ -684,15 +858,7 @@ class _PreviousSetsSection extends StatelessWidget { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - 'THIS SESSION', - style: TextStyle(fontFamily: 'Geist', - color: AppColors.textFaint, - fontSize: 10, - fontWeight: FontWeight.w600, - letterSpacing: 1.2, - ), - ), + const RFLabel('This session', dim: true), const SizedBox(height: AppSpacing.sm), Wrap( spacing: 6, @@ -805,9 +971,11 @@ class _LastSessionSection extends StatelessWidget { Icon(Icons.star_outline_rounded, color: AppColors.textMuted, size: 16), SizedBox(width: 8), - Text( - 'First time doing this exercise!', - style: TextStyle(color: AppColors.textMuted, fontSize: 13), + Expanded( + child: Text( + 'First time doing this exercise!', + style: TextStyle(color: AppColors.textMuted, fontSize: 13), + ), ), ], ), @@ -817,15 +985,7 @@ class _LastSessionSection extends StatelessWidget { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - 'LAST SESSION', - style: TextStyle(fontFamily: 'Geist', - color: AppColors.textFaint, - fontSize: 10, - fontWeight: FontWeight.w600, - letterSpacing: 1.2, - ), - ), + const RFLabel('Last session', dim: true), const SizedBox(height: AppSpacing.sm), Wrap( spacing: 6, @@ -890,12 +1050,14 @@ class _ProgramMetaBanner extends StatelessWidget { child: Icon(Icons.battery_charging_full_rounded, size: 14, color: Colors.amber), ), - Text( - 'Target: $displaySets × $repRange', - style: const TextStyle( - color: AppColors.textPrimary, - fontSize: 13, - fontWeight: FontWeight.w600, + Flexible( + child: Text( + 'Target: $displaySets × $repRange', + style: const TextStyle( + color: AppColors.textPrimary, + fontSize: 13, + fontWeight: FontWeight.w600, + ), ), ), ], diff --git a/workout-logger/lib/screens/widgets/floating_nav_bar.dart b/workout-logger/lib/screens/widgets/floating_nav_bar.dart new file mode 100644 index 0000000..408c30c --- /dev/null +++ b/workout-logger/lib/screens/widgets/floating_nav_bar.dart @@ -0,0 +1,810 @@ +// floating_nav_bar.dart — Self-contained floating navigation bar for Flutter. +// +// Redesigned with the "expanding chip" pattern from EssentialsFloatingToolbar: +// • Selected tab expands horizontally (spring physics) to reveal an inline label +// • Unselected tabs show icon-only at a fixed compact size +// • Badge dot support on any nav item +// • Glassmorphic container — backdrop blur + border + outer glow +// • Scroll-aware hide/show via FloatingNavBarScaffold +// +// ─── Quick start ────────────────────────────────────────────────────────────── +// +// ```dart +// const items = [ +// FloatingNavItem(icon: Icons.home, label: 'Home'), +// FloatingNavItem(icon: Icons.search, label: 'Search'), +// FloatingNavItem(icon: Icons.person, label: 'Profile'), +// ]; +// +// FloatingNavBarScaffold( +// items: items, +// currentIndex: _index, +// onTabChanged: (i) => setState(() => _index = i), +// body: IndexedStack(index: _index, children: _pages), +// ) +// ``` +// +// ─── Drop-in dependency ─────────────────────────────────────────────────────── +// Only needs the Flutter SDK (material.dart · dart:ui · flutter/physics.dart). + +import 'dart:ui' show ImageFilter; +import 'package:flutter/material.dart'; +import 'package:flutter/physics.dart'; +import 'package:flutter/services.dart'; + +// ───────────────────────────────────────────────────────────────────────────── +// FloatingNavItem +// ───────────────────────────────────────────────────────────────────────────── + +/// A single tab entry for [FloatingNavBar]. +/// +/// [label] is displayed as an expanding inline text when the tab is active +/// and is also used for screen-reader semantics (TalkBack / VoiceOver). +/// Supply [activeIcon] for a distinct icon when selected. +/// Set [hasBadge] to `true` to render a small red indicator dot. +@immutable +class FloatingNavItem { + const FloatingNavItem({ + required this.icon, + required this.label, + this.activeIcon, + this.hasBadge = false, + }); + + /// Icon shown when this tab is **inactive**. + final IconData icon; + + /// Optional icon shown when this tab is **active**. Falls back to [icon]. + final IconData? activeIcon; + + /// Text displayed as an expanding label when active, and used for semantics. + final String label; + + /// When `true`, a small red dot is painted at the top-right of the icon. + final bool hasBadge; + + /// Returns the correct icon for the given [active] state. + IconData iconFor(bool active) => active ? (activeIcon ?? icon) : icon; +} + +// ───────────────────────────────────────────────────────────────────────────── +// FloatingNavBarTheme +// ───────────────────────────────────────────────────────────────────────────── + +/// Visual and behavioural configuration for [FloatingNavBar] and +/// [FloatingNavBarScaffold]. +/// +/// All colour fields are nullable — `null` values derive from the ambient +/// [ThemeData.colorScheme] at runtime. Override only what you need. +@immutable +class FloatingNavBarTheme { + const FloatingNavBarTheme({ + // ── Colours ────────────────────────────────────────────────────────────── + this.backgroundColor, + this.backgroundOpacity = 0.82, + this.borderColor, + this.borderWidth = 1.2, + /// Background of the selected tab chip. + this.selectedChipColor, + /// Border of the selected tab chip. + this.selectedChipBorderColor, + /// Glow shadow of the selected tab chip. + this.selectedChipShadowColor, + /// Icon + label colour inside the selected chip. + this.selectedContentColor, + this.inactiveIconColor, + this.outerShadowColor, + this.outerGlowColor, + /// Colour of the unread-indicator dot on a badged item. + this.badgeColor = const Color(0xFFE05040), + // ── Sizes ──────────────────────────────────────────────────────────────── + this.navHeight = 60.0, + this.chipHeight = 46.0, + /// Fixed width of each icon tap cell (active and inactive). + this.iconCellSize = 48.0, + /// Extra width that slides open when a chip becomes active (label area). + this.labelWidth = 80.0, + this.iconSize = 22.0, + /// Symmetric horizontal inset inside the container. + this.horizontalPadding = 8.0, + /// Gap between adjacent chips. + this.itemSpacing = 4.0, + this.blurSigma = 18.0, + // ── Label ──────────────────────────────────────────────────────────────── + /// Set to `false` to disable label expansion (icon-only compact mode). + this.showLabels = true, + /// Override the label [TextStyle]. Colour is always resolved from theme. + this.labelStyle, + // ── Spring animation ───────────────────────────────────────────────────── + /// Spring mass (heavier = slower). + this.springMass = 1.0, + /// Spring stiffness (higher = snappier). + this.springStiffness = 500.0, + /// Damping ratio: 0.5 = bouncy, 1.0 = critically damped. + this.springDampingRatio = 0.72, + /// Duration for collapsing (non-spring ease-in). + this.collapseDuration = const Duration(milliseconds: 200), + // ── Show / hide animation ───────────────────────────────────────────────── + this.showDuration = const Duration(milliseconds: 250), + this.hideDuration = const Duration(milliseconds: 280), + this.showCurve = Curves.easeInOutCubic, + this.hideCurve = Curves.easeInOutCubic, + // ── Scroll behaviour ───────────────────────────────────────────────────── + /// Set to false to keep the nav bar permanently visible. + this.hideOnScroll = true, + /// Cumulative downward travel, in pixels, before the bar hides. + this.scrollDownThreshold = 48.0, + /// Cumulative upward travel before it returns; smaller, so it comes back fast. + this.scrollUpThreshold = 16.0, + // ── Misc ───────────────────────────────────────────────────────────────── + this.bottomMargin = 16.0, + this.hapticFeedback = true, + // ── Fallback colour opacities ───────────────────────────────────────────── + this.defaultBorderOpacity = 0.13, + this.defaultChipOpacity = 0.10, + this.defaultChipBorderOpacity = 0.25, + this.defaultChipShadowOpacity = 0.15, + this.defaultInactiveOpacity = 0.48, + this.defaultShadowOpacity = 0.45, + this.defaultGlowOpacity = 0.08, + // ── Shadow geometry ─────────────────────────────────────────────────────── + this.outerShadowBlurRadius = 28.0, + this.outerShadowSpread = -4.0, + this.outerShadowOffset = const Offset(0, 10), + this.outerGlowBlurRadius = 32.0, + // ── Slide animation ─────────────────────────────────────────────────────── + /// Offset applied to [AnimatedSlide] when the nav bar hides. + this.slideHideOffset = const Offset(0, 1.5), + /// Fade-out duration = hideDuration × fadeOutDurationFactor. + this.fadeOutDurationFactor = 0.75, + }); + + // ── Colours ───────────────────────────────────────────────────────────────── + final Color? backgroundColor; + final double backgroundOpacity; + final Color? borderColor; + final double borderWidth; + final Color? selectedChipColor; + final Color? selectedChipBorderColor; + final Color? selectedChipShadowColor; + final Color? selectedContentColor; + final Color? inactiveIconColor; + final Color? outerShadowColor; + final Color? outerGlowColor; + final Color badgeColor; + + // ── Sizes ──────────────────────────────────────────────────────────────────── + final double navHeight; + final double chipHeight; + final double iconCellSize; + final double labelWidth; + final double iconSize; + final double horizontalPadding; + final double itemSpacing; + final double blurSigma; + + // ── Label ──────────────────────────────────────────────────────────────────── + final bool showLabels; + final TextStyle? labelStyle; + + // ── Spring animation ───────────────────────────────────────────────────────── + final double springMass; + final double springStiffness; + final double springDampingRatio; + final Duration collapseDuration; + + // ── Show / hide animation ──────────────────────────────────────────────────── + final Duration showDuration; + final Duration hideDuration; + final Curve showCurve; + final Curve hideCurve; + + // ── Scroll ─────────────────────────────────────────────────────────────────── + final bool hideOnScroll; + final double scrollDownThreshold; + final double scrollUpThreshold; + + // ── Misc ───────────────────────────────────────────────────────────────────── + final double bottomMargin; + final bool hapticFeedback; + + // ── Fallback opacities ─────────────────────────────────────────────────────── + final double defaultBorderOpacity; + final double defaultChipOpacity; + final double defaultChipBorderOpacity; + final double defaultChipShadowOpacity; + final double defaultInactiveOpacity; + final double defaultShadowOpacity; + final double defaultGlowOpacity; + + // ── Shadow geometry ────────────────────────────────────────────────────────── + final double outerShadowBlurRadius; + final double outerShadowSpread; + final Offset outerShadowOffset; + final double outerGlowBlurRadius; + + // ── Slide animation ────────────────────────────────────────────────────────── + final Offset slideHideOffset; + final double fadeOutDurationFactor; +} + +// ───────────────────────────────────────────────────────────────────────────── +// FloatingNavBar — pure stateless presentation widget +// ───────────────────────────────────────────────────────────────────────────── + +/// A compact, pill-shaped, glassmorphic navigation bar with expanding chip tabs. +/// +/// The selected tab chips open sideways with a spring animation to reveal the +/// tab label; inactive tabs show the icon only. Inspired by the +/// EssentialsFloatingToolbar pattern from the Compose world. +/// +/// **Purely presentational** — no internal state, no scroll listening. +/// +/// Use [FloatingNavBarScaffold] for the full scroll-aware experience. +class FloatingNavBar extends StatelessWidget { + const FloatingNavBar({ + super.key, + required this.currentIndex, + required this.onTap, + required this.items, + this.theme = const FloatingNavBarTheme(), + }) : assert(items.length >= 2, 'FloatingNavBar requires at least 2 items.'); + + /// Index of the currently selected tab. + final int currentIndex; + + /// Called with the tapped tab index. + final ValueChanged onTap; + + /// Tab definitions. Minimum 2. + final List items; + + /// Visual and layout configuration. + final FloatingNavBarTheme theme; + + @override + Widget build(BuildContext context) { + final cs = Theme.of(context).colorScheme; + final bottomPad = MediaQuery.paddingOf(context).bottom; + // Never below bottomMargin, and always a visible gap above any inset. + final bottomInset = + bottomPad + 8 > theme.bottomMargin ? bottomPad + 8 : theme.bottomMargin; + + // ── Resolve colours ────────────────────────────────────────────────────── + final bg = theme.backgroundColor ?? + cs.surface.withValues(alpha: theme.backgroundOpacity); + final border = theme.borderColor ?? + cs.outline.withValues(alpha: theme.defaultBorderOpacity); + final chipBg = theme.selectedChipColor ?? + cs.primary.withValues(alpha: theme.defaultChipOpacity); + final chipContent = theme.selectedContentColor ?? cs.onSurface; + final inactiveContent = theme.inactiveIconColor ?? + cs.onSurface.withValues(alpha: theme.defaultInactiveOpacity); + final outerShadow = theme.outerShadowColor ?? + Colors.black.withValues(alpha: theme.defaultShadowOpacity); + final outerGlow = theme.outerGlowColor ?? + cs.primary.withValues(alpha: theme.defaultGlowOpacity); + + return Align( + alignment: Alignment.bottomCenter, + child: Padding( + // Clears the system inset and keeps a margin off the gesture handle. + padding: EdgeInsets.only(bottom: bottomInset), + child: _ShadowWrapper( + outerShadow: outerShadow, + outerGlow: outerGlow, + shadowBlurRadius: theme.outerShadowBlurRadius, + shadowSpread: theme.outerShadowSpread, + shadowOffset: theme.outerShadowOffset, + glowBlurRadius: theme.outerGlowBlurRadius, + child: ClipRRect( + borderRadius: BorderRadius.circular(9999), + child: BackdropFilter( + filter: ImageFilter.blur( + sigmaX: theme.blurSigma, + sigmaY: theme.blurSigma, + ), + child: Container( + height: theme.navHeight, + decoration: BoxDecoration( + color: bg, + borderRadius: BorderRadius.circular(9999), + border: Border.all(color: border, width: theme.borderWidth), + ), + child: Padding( + padding: EdgeInsets.symmetric( + horizontal: theme.horizontalPadding, + ), + child: Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + for (int i = 0; i < items.length; i++) ...[ + _NavCell( + item: items[i], + active: i == currentIndex, + theme: theme, + chipBg: chipBg, + chipContent: chipContent, + inactiveContent: inactiveContent, + onTap: () => onTap(i), + ), + if (i < items.length - 1) + SizedBox(width: theme.itemSpacing), + ], + ], + ), + ), + ), + ), + ), + ), + ), + ); + } +} + +// ───────────────────────────────────────────────────────────────────────────── +// _ShadowWrapper — outer drop-shadow + ambient glow +// ───────────────────────────────────────────────────────────────────────────── + +/// Applies a drop-shadow and ambient glow **outside** the clipped pill shape. +/// Must be a separate widget because [ClipRRect] clips its own BoxDecoration +/// shadows. +class _ShadowWrapper extends StatelessWidget { + const _ShadowWrapper({ + required this.outerShadow, + required this.outerGlow, + required this.shadowBlurRadius, + required this.shadowSpread, + required this.shadowOffset, + required this.glowBlurRadius, + required this.child, + }); + + final Color outerShadow; + final Color outerGlow; + final double shadowBlurRadius; + final double shadowSpread; + final Offset shadowOffset; + final double glowBlurRadius; + final Widget child; + + @override + Widget build(BuildContext context) { + return Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(9999), + boxShadow: [ + BoxShadow( + color: outerShadow, + blurRadius: shadowBlurRadius, + spreadRadius: shadowSpread, + offset: shadowOffset, + ), + BoxShadow(color: outerGlow, blurRadius: glowBlurRadius), + ], + ), + child: child, + ); + } +} + +// ───────────────────────────────────────────────────────────────────────────── +// _NavCell — stateful, spring-animated expanding chip +// ───────────────────────────────────────────────────────────────────────────── + +/// A single tappable chip inside [FloatingNavBar]. +/// +/// When [active] becomes `true`, the chip expands rightward using a +/// [SpringSimulation] (bouncy, lively) to reveal the label text. +/// When [active] becomes `false`, the chip collapses with a quick ease-in. +class _NavCell extends StatefulWidget { + const _NavCell({ + required this.item, + required this.active, + required this.theme, + required this.chipBg, + required this.chipContent, + required this.inactiveContent, + required this.onTap, + }); + + final FloatingNavItem item; + final bool active; + final FloatingNavBarTheme theme; + final Color chipBg; + final Color chipContent; + final Color inactiveContent; + final VoidCallback onTap; + + @override + State<_NavCell> createState() => _NavCellState(); +} + +class _NavCellState extends State<_NavCell> + with SingleTickerProviderStateMixin { + /// Unbounded controller so the spring can overshoot > 1.0 naturally, + /// producing the satisfying bounce on expansion. + late final AnimationController _ctrl; + + @override + void initState() { + super.initState(); + _ctrl = AnimationController.unbounded(vsync: this) + ..value = widget.active ? 1.0 : 0.0; + } + + @override + void didUpdateWidget(_NavCell old) { + super.didUpdateWidget(old); + if (old.active == widget.active) return; + + if (widget.active) { + // Spring expand — medium bounce feel, matching DampingRatioMediumBouncy. + _ctrl.animateWith( + SpringSimulation( + SpringDescription.withDampingRatio( + mass: widget.theme.springMass, + stiffness: widget.theme.springStiffness, + ratio: widget.theme.springDampingRatio, + ), + _ctrl.value, + 1.0, + 0.0, // initial velocity + ), + ); + } else { + // Quick ease-in collapse — no spring, feels intentional / snappy. + _ctrl.animateTo( + 0.0, + duration: widget.theme.collapseDuration, + curve: Curves.easeIn, + ); + } + } + + @override + void dispose() { + _ctrl.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final t = widget.theme; + + void handleTap() { + if (t.hapticFeedback) HapticFeedback.lightImpact(); + widget.onTap(); + } + + return Semantics( + button: true, + label: widget.item.label, + selected: widget.active, + // A semantics action, not just a button role: GestureDetector alone leaves assistive tech unable to activate the tab. + onTap: handleTap, + child: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: handleTap, + child: AnimatedBuilder( + animation: _ctrl, + builder: (context, _) { + // Raw spring value — may overshoot [0,1] during bounce. + final raw = _ctrl.value; + + // Clamped to [0,1] for colour interpolation (no weird colours). + final colorP = raw.clamp(0.0, 1.0); + + // Width can overshoot slightly for the spring bounce feel. + // Clamp at 1.2× to prevent excessively wide chips on large oscillation. + final widthP = raw.clamp(0.0, 1.2); + + // Label fades in during the second half of expansion. + final labelOpacity = ((colorP - 0.5) * 2.0).clamp(0.0, 1.0); + + // Extra width contributed by the label area. + final extraW = + t.showLabels ? widthP * t.labelWidth : 0.0; + + // Right padding inside chip (breathing room for the label). + final rightPad = t.showLabels ? colorP * 10.0 : 0.0; + + final iconColor = Color.lerp( + widget.inactiveContent, + widget.chipContent, + colorP, + )!; + + return Container( + height: t.chipHeight, + width: (t.iconCellSize + extraW).clamp( + t.iconCellSize, + t.iconCellSize + t.labelWidth * 1.2, + ), + decoration: BoxDecoration( + color: Color.lerp(Colors.transparent, widget.chipBg, colorP), + borderRadius: BorderRadius.circular(9999), + border: colorP > 0.05 + ? Border.all( + color: (t.selectedChipBorderColor ?? widget.chipContent) + .withValues(alpha: 0.28 * colorP), + width: 1.0, + ) + : null, + boxShadow: colorP > 0.05 + ? [ + BoxShadow( + color: + (t.selectedChipShadowColor ?? widget.chipContent) + .withValues(alpha: 0.18 * colorP), + blurRadius: 14, + spreadRadius: -2, + ), + ] + : null, + ), + child: ClipRRect( + borderRadius: BorderRadius.circular(9999), + child: ClipRect( + child: OverflowBox( + maxWidth: double.infinity, + child: Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + // ── Icon (fixed width cell) ────────────────────────────── + SizedBox( + width: t.iconCellSize, + height: t.chipHeight, + child: Center( + child: Stack( + clipBehavior: Clip.none, + alignment: Alignment.center, + children: [ + Icon( + widget.item.iconFor(widget.active), + size: t.iconSize, + color: iconColor, + ), + // Badge dot + if (widget.item.hasBadge) + Positioned( + right: -3, + top: -3, + child: Container( + width: 8, + height: 8, + decoration: BoxDecoration( + color: t.badgeColor, + shape: BoxShape.circle, + border: Border.all( + // border matches the chip bg for a + // "punched out" halo effect + color: widget.chipBg, + width: 1.5, + ), + ), + ), + ), + ], + ), + ), + ), + + // ── Expanding label area ───────────────────────────────── + if (t.showLabels && extraW > 1.0) ...[ + Opacity( + opacity: labelOpacity, + child: Text( + widget.item.label, + style: (t.labelStyle ?? + const TextStyle( + fontSize: 13, + fontWeight: FontWeight.w600, + letterSpacing: 0.1, + )) + .copyWith(color: widget.chipContent), + maxLines: 1, + softWrap: false, + overflow: TextOverflow.clip, + ), + ), + SizedBox(width: rightPad), + ], + ], + ), + ), + ), + ), + ); + }, + ), + ), + ); + } +} + +// ───────────────────────────────────────────────────────────────────────────── +// FloatingNavBarScaffold — all-in-one convenience wrapper +// ───────────────────────────────────────────────────────────────────────────── + +/// A ready-to-use [Scaffold] that wires [FloatingNavBar] with automatic +/// scroll-aware hide/show logic. +/// +/// Scroll notifications propagate from **any** nested scrollable without +/// any [ScrollController] wiring in child widgets. +/// +/// ### Visibility rules +/// | Event | Result | +/// |---|---| +/// | Scroll down `> scrollDownThreshold` | Nav hides | +/// | Scroll up `> scrollUpThreshold` | Nav shows | +/// | Scroll reaches position `0` (top) | Nav always shows | +/// | Tab switch via [onTabChanged] | Nav always shows | +/// +/// ### Bottom content padding +/// The floating nav overlaps content. Add bottom padding to inner lists: +/// ```dart +/// ListView( +/// padding: EdgeInsets.only( +/// bottom: MediaQuery.of(context).padding.bottom +/// + theme.navHeight +/// + theme.bottomMargin +/// + 8, +/// ), +/// ) +/// ``` +class FloatingNavBarScaffold extends StatefulWidget { + const FloatingNavBarScaffold({ + super.key, + required this.items, + required this.body, + required this.currentIndex, + required this.onTabChanged, + this.theme = const FloatingNavBarTheme(), + this.scaffoldBackgroundColor, + }) : assert( + items.length >= 2, + 'FloatingNavBarScaffold requires at least 2 items.', + ); + + /// Tab definitions. Minimum 2. + final List items; + + /// Main content — typically an [IndexedStack] or [PageView]. + final Widget body; + + /// Currently selected index, managed by the parent. + final int currentIndex; + + /// Called when the user taps a tab. The parent must update [currentIndex]. + final ValueChanged onTabChanged; + + /// Visual and behavioural config. + final FloatingNavBarTheme theme; + + /// [Scaffold] background colour. + final Color? scaffoldBackgroundColor; + + @override + State createState() => _FloatingNavBarScaffoldState(); +} + +class _FloatingNavBarScaffoldState extends State { + bool _visible = true; + + // ── Tab change — always restore visibility ──────────────────────────────── + + void _handleTabChange(int index) { + _travel = 0; + if (!_visible) setState(() => _visible = true); + widget.onTabChanged(index); + } + + // ── Scroll detection ────────────────────────────────────────────────────── + + /// Travel since the last direction change; positive is down, reset on reversal. + double _travel = 0; + + bool _handleScrollNotification(ScrollNotification n) { + if (!widget.theme.hideOnScroll) return false; + + // Only the outermost vertical scrollable drives the bar: nested lists (depth > 0) and sideways carousel swipes must not hide it. + if (n.depth != 0 || n.metrics.axis != Axis.vertical) return false; + + // A settled scroll starts a fresh gesture — don't carry momentum across. + if (n is ScrollEndNotification) { + _travel = 0; + return false; + } + + if (n is ScrollUpdateNotification) { + // Ignore overscroll bounce: rubber-banding reads as a drag it isn't. + final m = n.metrics; + if (m.pixels < m.minScrollExtent || m.pixels > m.maxScrollExtent) { + return false; + } + + final delta = n.scrollDelta ?? 0; + // Direction reversal restarts the count. + if (delta.sign != _travel.sign) _travel = 0; + _travel += delta; + + if (_travel > widget.theme.scrollDownThreshold && _visible) { + _travel = 0; + setState(() => _visible = false); + } else if (-_travel > widget.theme.scrollUpThreshold && !_visible) { + _travel = 0; + setState(() => _visible = true); + } + + // Near the very top → always show. A small band rather than an exact + // zero, so the bar is already back by the time the bounce settles. + if (m.pixels <= m.minScrollExtent + 8 && !_visible) { + _travel = 0; + setState(() => _visible = true); + } + } + + // Never absorb — let notifications keep bubbling. + return false; + } + + // ── Build ───────────────────────────────────────────────────────────────── + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: widget.scaffoldBackgroundColor, + body: Stack( + children: [ + // Content: scroll notifications propagate upward from here. + NotificationListener( + onNotification: _handleScrollNotification, + child: widget.body, + ), + + // Positioned leaves height unbounded so Align shrink-wraps to the pill: AnimatedSlide offsets by a fraction of CHILD size, so an unpositioned child would slide ~1.5 screen heights. + Positioned( + left: 0, + right: 0, + bottom: 0, + child: AnimatedSlide( + offset: _visible ? Offset.zero : widget.theme.slideHideOffset, + duration: _visible + ? widget.theme.showDuration + : widget.theme.hideDuration, + curve: + _visible ? widget.theme.showCurve : widget.theme.hideCurve, + child: AnimatedOpacity( + opacity: _visible ? 1.0 : 0.0, + duration: _visible + ? widget.theme.showDuration + : Duration( + milliseconds: (widget.theme.hideDuration.inMilliseconds * + widget.theme.fadeOutDurationFactor) + .round(), + ), + curve: + _visible ? widget.theme.showCurve : widget.theme.hideCurve, + // Disable hit-testing when fully hidden. + child: IgnorePointer( + ignoring: !_visible, + child: FloatingNavBar( + currentIndex: widget.currentIndex, + onTap: _handleTabChange, + items: widget.items, + theme: widget.theme, + ), + ), + ), + ), + ), + ], + ), + ); + } +} diff --git a/workout-logger/lib/screens/widgets/health_detail_shell.dart b/workout-logger/lib/screens/widgets/health_detail_shell.dart index fbac10c..25914d6 100644 --- a/workout-logger/lib/screens/widgets/health_detail_shell.dart +++ b/workout-logger/lib/screens/widgets/health_detail_shell.dart @@ -40,7 +40,7 @@ class HealthDetailShell extends StatelessWidget { backgroundColor: AppColors.background, body: Stack( children: [ - const Positioned.fill(child: AmbientGlow()), + const AmbientGlow(), SafeArea( child: Column( children: [ diff --git a/workout-logger/lib/screens/widgets/profile_sections.dart b/workout-logger/lib/screens/widgets/profile_sections.dart index 3abd5f6..dd9c7c9 100644 --- a/workout-logger/lib/screens/widgets/profile_sections.dart +++ b/workout-logger/lib/screens/widgets/profile_sections.dart @@ -8,6 +8,7 @@ import '../../services/debug_log_buffer.dart'; import '../../services/settings_provider.dart'; import '../../services/ai/gemini_ai_service.dart'; import '../../theme/app_theme.dart'; +import 'rf_dialogs.dart'; import 'rf_widgets.dart'; const String _createdBy = 'Devasy Patel'; @@ -239,6 +240,8 @@ class HealthConnectSection extends StatelessWidget { required this.onToggle, required this.isReadinessLoading, required this.onReadinessToggle, + required this.isHealthSyncLoading, + required this.onHealthSyncNow, }); final SettingsProvider settings; @@ -246,6 +249,8 @@ class HealthConnectSection extends StatelessWidget { final Future Function(bool) onToggle; final bool isReadinessLoading; final Future Function(bool) onReadinessToggle; + final bool isHealthSyncLoading; + final VoidCallback? onHealthSyncNow; static const _hcColor = Color(0xFF00BFA5); @@ -344,6 +349,19 @@ class HealthConnectSection extends StatelessWidget { ), ], ), + if (settings.readinessEnabled) ...[ + const SizedBox(height: AppSpacing.sm), + const Divider(color: AppColors.glassBorder, height: 1), + const SizedBox(height: AppSpacing.sm), + _ActionTile( + icon: Icons.sync_rounded, + iconColor: _hcColor, + title: 'Sync coach data now', + subtitle: "Pull recent sleep & heart rate into the coach's database", + loading: isHealthSyncLoading, + onTap: isHealthSyncLoading ? null : onHealthSyncNow, + ), + ], ], ), ); @@ -696,6 +714,11 @@ class _AiSettingsSectionState extends State { bool _obscure = true; bool _saving = false; + // Live value shown while dragging the slider; null when not dragging (in + // which case the persisted settings value is shown instead). + double? _draggingMaxToolRounds; + double? _draggingThinkingLevelIndex; + @override void initState() { super.initState(); @@ -710,6 +733,22 @@ class _AiSettingsSectionState extends State { super.dispose(); } + /// Reports the outcome of a settings write. Success is only worth a toast + /// for the deliberate actions (Save, picking a model) — the thinking + /// slider commits on every drag-release, so it stays quiet unless it fails. + void _reportSaved(String message) { + if (!mounted) return; + context.showRFSnackBar(message, type: RFSnackBarType.success); + } + + void _reportSaveFailed(String what) { + if (!mounted) return; + context.showRFSnackBar( + "Couldn't save $what — the change wasn't applied.", + type: RFSnackBarType.error, + ); + } + Future _save() async { setState(() => _saving = true); final key = _ctrl.text.trim(); @@ -718,16 +757,74 @@ class _AiSettingsSectionState extends State { try { await settings.setGeminiApiKey(key); gemini.updateApiKey(key); + _reportSaved(key.isEmpty ? 'API key cleared' : 'API key saved'); + } catch (e, st) { + debugPrint('Failed to save Gemini API key: $e\n$st'); + _reportSaveFailed('your API key'); } finally { if (mounted) setState(() => _saving = false); } } Future _selectModel(String modelId) async { + // Same contract as _commitThinkingLevel below: the dropdown's onChanged + // drops this Future, so a storage failure would otherwise surface as an + // unhandled error. On failure the provider keeps the previous model and + // the dropdown rebuilds back onto it, so there's nothing to undo here. + final settings = context.read(); + final gemini = context.read(); + try { + await settings.setGeminiModel(modelId); + gemini.updateModel(modelId); + _reportSaved('Model saved'); + } catch (e, st) { + debugPrint('Failed to save Gemini model: $e\n$st'); + _reportSaveFailed('the model'); + } + } + + Future _commitMaxToolRounds(int rounds) async { + // onChangeEnd discards this Future, so a storage failure would otherwise + // surface as an unhandled error; and the await means the widget can be + // disposed before setState runs. final settings = context.read(); final gemini = context.read(); - await settings.setGeminiModel(modelId); - gemini.updateModel(modelId); + try { + await settings.setGeminiMaxToolRounds(rounds); + } catch (e, st) { + debugPrint('Failed to save max tool rounds: $e\n$st'); + // The drag already pushed each intermediate value into the live + // service, so put it back to what was actually stored — otherwise + // requests keep using a limit the user was just told wasn't saved. + gemini.updateMaxToolRounds(settings.geminiMaxToolRounds); + _reportSaveFailed('the tool-round limit'); + } finally { + if (mounted) { + setState(() => _draggingMaxToolRounds = null); + } + } + } + + Future _commitThinkingLevel(String level) async { + // Same contract as _commitMaxToolRounds above: onChangeEnd drops the + // Future, and the widget may be gone by the time the await returns. + final settings = context.read(); + final gemini = context.read(); + try { + await settings.setGeminiThinkingLevel(level); + gemini.updateThinkingLevel(level); + } catch (e, st) { + debugPrint('Failed to save thinking level: $e\n$st'); + // Same reason as _commitMaxToolRounds: the drag updated the live + // service on every tick, so restore the stored level rather than + // leaving the service on one that was never written. + gemini.updateThinkingLevel(settings.geminiThinkingLevel); + _reportSaveFailed('the thinking level'); + } finally { + if (mounted) { + setState(() => _draggingThinkingLevelIndex = null); + } + } } @override @@ -821,41 +918,176 @@ class _AiSettingsSectionState extends State { const SizedBox(height: AppSpacing.md), const _SectionLabel('GEMINI MODEL'), const SizedBox(height: AppSpacing.sm), - Wrap( - spacing: 8, - runSpacing: 8, - children: kGeminiModels.map(((String, String) entry) { - final (id, label) = entry; - final selected = settings.geminiModel == id; - return GestureDetector( - onTap: () => _selectModel(id), - child: AnimatedContainer( - duration: AppDurations.fast, - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 7), - decoration: BoxDecoration( - color: selected - ? AppColors.primary.withValues(alpha: 0.15) - : AppColors.glass, - borderRadius: BorderRadius.circular(AppRadius.full), - border: Border.all( - color: selected - ? AppColors.primary.withValues(alpha: 0.5) - : AppColors.glassBorder, - width: selected ? 1.5 : 1, + Container( + decoration: BoxDecoration( + color: AppColors.glass, + borderRadius: BorderRadius.circular(AppRadius.sm), + border: Border.all(color: AppColors.glassBorderStrong), + ), + child: DropdownButtonHideUnderline( + child: DropdownButtonFormField( + key: ValueKey(settings.geminiModel), + initialValue: settings.geminiModel, + isExpanded: true, + isDense: false, + dropdownColor: AppColors.card, + icon: const Icon(Icons.keyboard_arrow_down_rounded, color: AppColors.textFaint), + decoration: const InputDecoration( + border: InputBorder.none, + contentPadding: EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm, + ), + ), + style: TextStyle(fontFamily: 'GeistMono', + color: AppColors.textPrimary, + fontSize: 13, + ), + items: kGeminiModels.map(((String, String) entry) { + final (id, label) = entry; + return DropdownMenuItem(value: id, child: Text(label)); + }).toList(), + onChanged: (id) { + if (id != null) _selectModel(id); + }, + ), + ), + ), + if (supportedThinkingLevels(settings.geminiModel).isNotEmpty) ...[ + const SizedBox(height: AppSpacing.md), + const _SectionLabel('THINKING LEVEL'), + const SizedBox(height: AppSpacing.sm), + Text( + 'How much the model reasons before replying. Lower is faster and cheaper; higher is more capable on hard problems.', + style: TextStyle(fontFamily: 'Geist', + color: AppColors.textFaint, + fontSize: 11, + fontStyle: FontStyle.italic, + ), + ), + const SizedBox(height: AppSpacing.xs), + Builder(builder: (context) { + final levels = supportedThinkingLevels(settings.geminiModel); + final currentIndex = levels.indexOf(settings.geminiThinkingLevel); + // Clamped because a drag in progress can outlive the level list + // it was started against: picking a model with fewer levels + // leaves _draggingThinkingLevelIndex past the new max, which + // Slider asserts on. + final liveIndex = (_draggingThinkingLevelIndex ?? + (currentIndex >= 0 ? currentIndex.toDouble() : 0.0)) + .clamp(0.0, (levels.length - 1).toDouble()); + final liveLevel = levels[liveIndex.round().clamp(0, levels.length - 1)]; + final liveLevelLabel = liveLevel[0].toUpperCase() + liveLevel.substring(1); + return Row( + children: [ + Expanded( + child: SliderTheme( + data: SliderTheme.of(context).copyWith( + activeTrackColor: AppColors.primary, + inactiveTrackColor: AppColors.glassBorderStrong, + thumbColor: AppColors.primary, + overlayColor: AppColors.primary.withValues(alpha: 0.15), + valueIndicatorColor: AppColors.primary, + trackHeight: 3, + ), + child: Slider( + value: liveIndex, + min: 0, + max: (levels.length - 1).toDouble(), + divisions: levels.length > 1 ? levels.length - 1 : null, + label: liveLevelLabel, + onChanged: (v) { + setState(() => _draggingThinkingLevelIndex = v); + context.read().updateThinkingLevel( + levels[v.round().clamp(0, levels.length - 1)], + ); + }, + onChangeEnd: (v) => _commitThinkingLevel( + levels[v.round().clamp(0, levels.length - 1)], + ), + ), ), ), - child: Text( - label, - style: TextStyle(fontFamily: 'GeistMono', - color: selected ? AppColors.primary : AppColors.textSoft, - fontWeight: selected ? FontWeight.w700 : FontWeight.w400, - fontSize: 11, + Container( + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5), + decoration: BoxDecoration( + color: AppColors.primary.withValues(alpha: 0.12), + borderRadius: BorderRadius.circular(AppRadius.sm), + border: Border.all(color: AppColors.primary.withValues(alpha: 0.35)), + ), + child: Text( + liveLevelLabel, + style: TextStyle(fontFamily: 'GeistMono', + color: AppColors.primary, + fontWeight: FontWeight.w700, + fontSize: 12, + ), ), ), - ), + ], ); - }).toList(), + }), + ], + const SizedBox(height: AppSpacing.md), + const _SectionLabel('MAX TOOL-CALL STEPS'), + const SizedBox(height: AppSpacing.sm), + Text( + 'How many tool rounds the coach can take per message before it must reply. Raise this if it stops mid-task; lower it to limit token usage.', + style: TextStyle(fontFamily: 'Geist', + color: AppColors.textFaint, + fontSize: 11, + fontStyle: FontStyle.italic, + ), ), + const SizedBox(height: AppSpacing.xs), + Builder(builder: (context) { + final liveValue = + _draggingMaxToolRounds ?? settings.geminiMaxToolRounds.toDouble(); + return Row( + children: [ + Expanded( + child: SliderTheme( + data: SliderTheme.of(context).copyWith( + activeTrackColor: AppColors.primary, + inactiveTrackColor: AppColors.glassBorderStrong, + thumbColor: AppColors.primary, + overlayColor: AppColors.primary.withValues(alpha: 0.15), + valueIndicatorColor: AppColors.primary, + trackHeight: 3, + ), + child: Slider( + value: liveValue, + min: kMinMaxToolRounds.toDouble(), + max: kMaxMaxToolRounds.toDouble(), + divisions: kMaxMaxToolRounds - kMinMaxToolRounds, + label: '${liveValue.round()}', + onChanged: (v) { + setState(() => _draggingMaxToolRounds = v); + context.read().updateMaxToolRounds(v.round()); + }, + onChangeEnd: (v) => _commitMaxToolRounds(v.round()), + ), + ), + ), + Container( + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5), + decoration: BoxDecoration( + color: AppColors.primary.withValues(alpha: 0.12), + borderRadius: BorderRadius.circular(AppRadius.sm), + border: Border.all(color: AppColors.primary.withValues(alpha: 0.35)), + ), + child: Text( + '${liveValue.round()}', + style: TextStyle(fontFamily: 'GeistMono', + color: AppColors.primary, + fontWeight: FontWeight.w700, + fontSize: 12, + ), + ), + ), + ], + ); + }), const SizedBox(height: AppSpacing.md), SizedBox( width: double.infinity, diff --git a/workout-logger/lib/screens/widgets/readiness_card.dart b/workout-logger/lib/screens/widgets/readiness_card.dart index 521243e..fc6d3cf 100644 --- a/workout-logger/lib/screens/widgets/readiness_card.dart +++ b/workout-logger/lib/screens/widgets/readiness_card.dart @@ -107,22 +107,23 @@ class ReadinessCard extends StatelessWidget { /// One line of evidence from the weakest available component. static String _subtitle(ReadinessSnapshot s) { final parts = <(int, String)>[ - if (s.sleepScore != null) + if (s.sleepScore != null && s.sleepMinutes != null && s.sleepBaselineMinutes != null) ( s.sleepScore!, 'Sleep ${_fmtSleep(s.sleepMinutes!)} vs ${_fmtSleep(s.sleepBaselineMinutes!.round())} avg' ), - if (s.rhrScore != null) + if (s.rhrScore != null && s.restingHr != null && s.rhrBaseline != null) ( s.rhrScore!, 'Resting HR ${s.restingHr!.round()} vs ${s.rhrBaseline!.round()} avg' ), - if (s.hrvScore != null) + if (s.hrvScore != null && s.hrvMs != null && s.hrvBaseline != null) ( s.hrvScore!, 'HRV ${s.hrvMs!.round()}ms vs ${s.hrvBaseline!.round()}ms avg' ), ]; + if (parts.isEmpty) return 'Ready to train'; parts.sort((a, b) => a.$1.compareTo(b.$1)); return parts.first.$2; } diff --git a/workout-logger/lib/screens/widgets/rest_timer_view.dart b/workout-logger/lib/screens/widgets/rest_timer_view.dart index b614e6a..687f15f 100644 --- a/workout-logger/lib/screens/widgets/rest_timer_view.dart +++ b/workout-logger/lib/screens/widgets/rest_timer_view.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import '../../theme/app_theme.dart'; import 'rf_widgets.dart'; +import 'rf_shell.dart'; class RestTimerView extends StatelessWidget { const RestTimerView({ @@ -31,15 +32,7 @@ class RestTimerView extends StatelessWidget { // Top hint Padding( padding: const EdgeInsets.only(top: AppSpacing.lg), - child: Text( - 'REST', - style: const TextStyle( - color: AppColors.textMuted, - fontSize: 11, - fontWeight: FontWeight.w700, - letterSpacing: 2, - ), - ), + child: const RFLabel('Rest'), ), // Ring + time fills most of the screen Expanded( @@ -66,15 +59,8 @@ class RestTimerView extends StatelessWidget { ), if (nextExerciseName != null) ...[ const SizedBox(height: AppSpacing.lg), - Text( - 'Next up', - style: const TextStyle( - color: AppColors.textMuted, - fontSize: 11, - letterSpacing: 0.5, - ), - ), - const SizedBox(height: 4), + const RFLabel('Next up', dim: true), + const SizedBox(height: AppSpacing.sm), Text( nextExerciseName!, style: const TextStyle( @@ -98,7 +84,7 @@ class RestTimerView extends StatelessWidget { AppSpacing.xl, ), child: OutlineGlowButton( - label: 'SKIP REST', + label: 'Skip rest', onPressed: onSkip, color: AppColors.textSoft, fullWidth: true, diff --git a/workout-logger/lib/screens/widgets/rf_dialogs.dart b/workout-logger/lib/screens/widgets/rf_dialogs.dart new file mode 100644 index 0000000..b936518 --- /dev/null +++ b/workout-logger/lib/screens/widgets/rf_dialogs.dart @@ -0,0 +1,313 @@ +// rf_dialogs.dart — Reusable RepForge confirmation dialogs and floating toast notifications + +import 'package:flutter/material.dart'; +import '../../theme/app_theme.dart'; +import 'rf_widgets.dart'; + +/// Types of snackbar toast notifications. +enum RFSnackBarType { info, success, warning, error } + +extension RFSnackBarContext on BuildContext { + /// Displays a standardized RepForge floating SnackBar. + void showRFSnackBar( + String message, { + RFSnackBarType type = RFSnackBarType.info, + Duration duration = const Duration(seconds: 3), + }) { + final Color bgColor; + final Color fgColor; + final IconData icon; + + switch (type) { + case RFSnackBarType.success: + bgColor = AppColors.success; + // Light text on this bright teal is only ~2.0:1; dark text matches how `warning` solves the same problem. + fgColor = const Color(0xFF001A14); // near-black on #00C89B: ~8.8:1 ✓ + icon = Icons.check_circle_outline_rounded; + break; + case RFSnackBarType.warning: + bgColor = AppColors.warning; + fgColor = const Color(0xFF1A1200); // near-black on #DBA520: >7:1 ✓ + icon = Icons.warning_amber_rounded; + break; + case RFSnackBarType.error: + // AppColors.error (#E05040) is only ~3.6:1 against light text; darkened locally so the brand red is unchanged elsewhere. + bgColor = const Color(0xFFB3251A); + fgColor = AppColors.textPrimary; // #F4F4F8 on #B3251A: ~6.0:1 ✓ + icon = Icons.error_outline_rounded; + break; + case RFSnackBarType.info: + bgColor = AppColors.cardHigh; + fgColor = AppColors.textPrimary; // neutral — unchanged + icon = Icons.info_outline_rounded; + break; + } + + ScaffoldMessenger.of(this).hideCurrentSnackBar(); + ScaffoldMessenger.of(this).showSnackBar( + SnackBar( + duration: duration, + behavior: SnackBarBehavior.floating, + backgroundColor: bgColor, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(AppRadius.md), + side: const BorderSide(color: AppColors.glassBorder), + ), + content: Row( + children: [ + Icon(icon, color: fgColor, size: 20), + const SizedBox(width: AppSpacing.sm), + Expanded( + child: Text( + message, + style: TextStyle( + fontFamily: 'Geist', + color: fgColor, + fontSize: 14, + ), + ), + ), + ], + ), + ), + ); + } +} + +/// One choice in an [showRFActionSheet]. +class RFAction { + const RFAction({ + required this.label, + required this.value, + this.description, + this.icon, + this.isPrimary = false, + this.isDanger = false, + }); + + final String label; + final T value; + + /// One short line under the label saying what the choice does. + final String? description; + final IconData? icon; + + /// Renders as the filled brand button. At most one per sheet. + final bool isPrimary; + final bool isDanger; +} + +/// Bottom sheet for three or more choices, where a dialog's action row wraps. +/// Returns null if dismissed without a choice. +Future showRFActionSheet( + BuildContext context, { + required String title, + String? message, + required List> actions, +}) { + return showModalBottomSheet( + context: context, + backgroundColor: AppColors.surface, + barrierColor: Colors.black.withValues(alpha: 0.6), + // Without this the sheet is capped at 9/16 of the viewport. Three actions + // with descriptions already fill most of that, so at a large text scale + // the bottom action would be clipped with no way to scroll to it. + isScrollControlled: true, + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.vertical(top: Radius.circular(AppRadius.xl)), + ), + builder: (ctx) => SafeArea( + child: SingleChildScrollView( + padding: const EdgeInsets.fromLTRB( + AppSpacing.md, + AppSpacing.sm, + AppSpacing.md, + AppSpacing.md, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // Grabber + Center( + child: Container( + width: 36, + height: 4, + margin: const EdgeInsets.only(bottom: AppSpacing.md), + decoration: BoxDecoration( + color: AppColors.glassBorderStrong, + borderRadius: BorderRadius.circular(AppRadius.full), + ), + ), + ), + Text( + title, + style: const TextStyle( + fontFamily: 'Geist', + color: AppColors.textPrimary, + fontSize: 18, + fontWeight: FontWeight.w700, + letterSpacing: -0.3, + ), + ), + if (message != null) ...[ + const SizedBox(height: AppSpacing.xs), + Text( + message, + style: const TextStyle( + fontFamily: 'Geist', + color: AppColors.textMuted, + fontSize: 14, + height: 1.4, + ), + ), + ], + const SizedBox(height: AppSpacing.lg), + for (final action in actions) ...[ + if (action.isPrimary) + GlowButton( + label: action.label, + icon: action.icon, + onPressed: () => Navigator.pop(ctx, action.value), + ) + else + _SheetChoice(action: action, ctx: ctx), + if (action != actions.last) const SizedBox(height: AppSpacing.sm), + ], + ], + ), + ), + ), + ); +} + +class _SheetChoice extends StatelessWidget { + const _SheetChoice({required this.action, required this.ctx}); + + final RFAction action; + final BuildContext ctx; + + @override + Widget build(BuildContext context) { + final fg = action.isDanger ? AppColors.error : AppColors.textPrimary; + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => Navigator.pop(ctx, action.value), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.md - 2, + ), + decoration: BoxDecoration( + color: AppColors.glass2, + borderRadius: BorderRadius.circular(AppRadius.button), + border: Border.all( + color: action.isDanger + ? AppColors.error.withValues(alpha: 0.35) + : AppColors.glassBorder, + ), + ), + child: Row( + children: [ + if (action.icon != null) ...[ + Icon(action.icon, size: 18, color: fg), + const SizedBox(width: AppSpacing.sm + 2), + ], + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + action.label, + style: TextStyle( + fontFamily: 'Geist', + color: fg, + fontSize: 15, + fontWeight: FontWeight.w600, + ), + ), + if (action.description != null) ...[ + const SizedBox(height: 2), + Text( + action.description!, + style: const TextStyle( + fontFamily: 'Geist', + color: AppColors.textMuted, + fontSize: 12, + ), + ), + ], + ], + ), + ), + ], + ), + ), + ); + } +} + +/// Displays a standardized glassmorphic confirm dialog. +Future showRFConfirmDialog( + BuildContext context, { + required String title, + required String content, + String cancelText = 'Cancel', + String confirmText = 'Confirm', + bool isDanger = false, +}) { + return showDialog( + context: context, + builder: (ctx) => AlertDialog( + backgroundColor: AppColors.cardHigh, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(AppRadius.lg), + side: const BorderSide(color: AppColors.glassBorder), + ), + title: Text( + title, + style: const TextStyle( + fontFamily: 'Geist', + color: AppColors.textPrimary, + fontWeight: FontWeight.w700, + fontSize: 18, + ), + ), + content: Text( + content, + style: const TextStyle( + fontFamily: 'Geist', + color: AppColors.textSoft, + fontSize: 14, + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.of(ctx).pop(false), + child: Text( + cancelText, + style: const TextStyle( + fontFamily: 'Geist', + color: AppColors.textMuted, + ), + ), + ), + TextButton( + onPressed: () => Navigator.of(ctx).pop(true), + style: TextButton.styleFrom( + foregroundColor: isDanger ? AppColors.error : AppColors.primary, + ), + child: Text( + confirmText, + style: TextStyle( + fontFamily: 'Geist', + fontWeight: FontWeight.w600, + color: isDanger ? AppColors.error : AppColors.primary, + ), + ), + ), + ], + ), + ); +} diff --git a/workout-logger/lib/screens/widgets/rf_shell.dart b/workout-logger/lib/screens/widgets/rf_shell.dart new file mode 100644 index 0000000..150f3fd --- /dev/null +++ b/workout-logger/lib/screens/widgets/rf_shell.dart @@ -0,0 +1,440 @@ +// rf_shell.dart — Screen chrome shared by every RepForge screen. + +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import '../../theme/app_theme.dart'; + +// ── RFIconButton ───────────────────────────────────────────────────────────── +// The glass square icon button used in every screen header. One fill, one size. +class RFIconButton extends StatelessWidget { + const RFIconButton({ + super.key, + required this.icon, + required this.onTap, + this.tooltip, + this.color, + this.size = standardSize, + }); + + /// The painted box size for every header button. [RFScreenHeader]'s + /// centred-title counterweight assumes each action is this wide. + static const double standardSize = 38; + + /// Material's minimum touch target. The painted box stays [size]; the + /// gesture area is expanded to this when [size] is smaller. + static const double minTapTarget = 48; + + /// The width a default-size button actually occupies once the tap target is + /// applied — what a caller laying out around it needs, not [standardSize]. + static const double standardExtent = standardSize > minTapTarget + ? standardSize + : minTapTarget; + + final IconData icon; + final VoidCallback? onTap; + + /// Screen-reader label and tooltip. Always supply one: these are icon-only. + final String? tooltip; + + /// Tints the icon (e.g. destructive actions). Defaults to soft text. + final Color? color; + final double size; + + @override + Widget build(BuildContext context) { + final enabled = onTap != null; + final target = size < minTapTarget ? minTapTarget : size; + // InkWell, not a bare GestureDetector: this is the back/close control in + // every header, so it has to be reachable by keyboard and switch access — + // the same requirement RFOptionChip states below. The Material is there + // for headers that sit outside a Scaffold, where InkWell has no ancestor + // to paint its splash into. + final button = Semantics( + button: true, + enabled: enabled, + label: tooltip, + child: Material( + type: MaterialType.transparency, + child: InkWell( + borderRadius: BorderRadius.circular(AppRadius.md), + onTap: enabled + ? () { + HapticFeedback.lightImpact(); + onTap!(); + } + : null, + // The gesture area is the full 48pt target; only the decorated box + // inside it is painted at `size`. + child: SizedBox( + width: target, + height: target, + child: Center( + child: Container( + width: size, + height: size, + alignment: Alignment.center, + decoration: BoxDecoration( + color: AppColors.glass2, + borderRadius: BorderRadius.circular(AppRadius.md), + border: Border.all(color: AppColors.glassBorder), + ), + child: Icon( + icon, + size: 18, + color: enabled + ? (color ?? AppColors.textSoft) + : AppColors.textFaint, + ), + ), + ), + ), + ), + ), + ); + return tooltip == null ? button : Tooltip(message: tooltip!, child: button); + } +} + +// ── RFGradientBadge ────────────────────────────────────────────────────────── +// Small brand-gradient tile — the AI mark in headers, avatars and empty states. +class RFGradientBadge extends StatelessWidget { + const RFGradientBadge({ + super.key, + required this.icon, + this.size = standardSize, + this.radius = AppRadius.md, + this.glow = 0.35, + }); + + /// Painted extent of a default-size badge. Exposed so callers laying out + /// around one — the centred-title counterweight — need not construct it. + static const double standardSize = 34; + + final IconData icon; + final double size; + final double radius; + final double glow; + + @override + Widget build(BuildContext context) { + return Container( + width: size, + height: size, + alignment: Alignment.center, + decoration: BoxDecoration( + gradient: AppColors.primaryGradient, + borderRadius: BorderRadius.circular(radius), + boxShadow: [ + BoxShadow( + color: AppColors.primaryGlow(glow), + blurRadius: size * 0.4, + spreadRadius: -size * 0.12, + ), + ], + ), + child: Icon(icon, color: Colors.white, size: size * 0.5), + ); + } +} + +// ── RFScreenHeader ─────────────────────────────────────────────────────────── +// Leading affordance · optional badge · title/subtitle · actions. +class RFScreenHeader extends StatelessWidget { + const RFScreenHeader({ + super.key, + required this.title, + this.subtitle, + this.badgeIcon, + this.onBack, + this.leadingIcon = Icons.arrow_back_rounded, + this.leadingTooltip = 'Back', + this.actions = const [], + this.centreTitle = false, + this.bottom, + }); + + final String title; + final String? subtitle; + + /// When set, a brand-gradient badge sits between the back button and title. + final IconData? badgeIcon; + + /// Omit to hide the leading button entirely (root-level screens). + final VoidCallback? onBack; + final IconData leadingIcon; + final String leadingTooltip; + final List actions; + final bool centreTitle; + + /// Rendered full-bleed under the header row — e.g. a progress bar. + final Widget? bottom; + + @override + Widget build(BuildContext context) { + // One action = one default-size button plus its 8pt gap. + // + // This counterweight is only correct while every action is an + // RFIconButton at the default size: the header cannot measure its actions + // before layout, so a caller passing differently-sized actions (as + // workout_header.dart does) with centreTitle: true will see the title sit + // off centre. Measure the trailing cluster if that case ever needs to work. + const cellWidth = RFIconButton.standardExtent + AppSpacing.sm; + // The badge shares the leading run with the back button, so it carries + // its own weight on that side too. + const badgeWidth = RFGradientBadge.standardSize + AppSpacing.sm; + final leadingWidth = + (onBack != null ? cellWidth : 0.0) + + (badgeIcon != null ? badgeWidth : 0.0); + final trailingWidth = actions.length * cellWidth; + + final titleBlock = Column( + crossAxisAlignment: centreTitle + ? CrossAxisAlignment.center + : CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + title, + maxLines: 1, + overflow: TextOverflow.ellipsis, + textAlign: centreTitle ? TextAlign.center : TextAlign.start, + style: const TextStyle( + fontFamily: 'Geist', + color: AppColors.textPrimary, + fontSize: 16, + fontWeight: FontWeight.w700, + letterSpacing: -0.3, + ), + ), + if (subtitle != null) ...[ + const SizedBox(height: 2), + Text( + subtitle!, + maxLines: 1, + overflow: TextOverflow.ellipsis, + textAlign: centreTitle ? TextAlign.center : TextAlign.start, + style: const TextStyle( + fontFamily: 'Geist', + color: AppColors.textMuted, + fontSize: 11, + ), + ), + ], + ], + ); + + return Container( + decoration: const BoxDecoration( + border: Border(bottom: BorderSide(color: AppColors.glassBorder)), + ), + child: SafeArea( + bottom: false, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Padding( + padding: const EdgeInsets.fromLTRB( + AppSpacing.md, + AppSpacing.sm, + AppSpacing.md, + AppSpacing.sm, + ), + child: Row( + children: [ + if (onBack != null) ...[ + RFIconButton( + icon: leadingIcon, + tooltip: leadingTooltip, + onTap: onBack, + ), + const SizedBox(width: AppSpacing.sm), + ], + if (badgeIcon != null) ...[ + RFGradientBadge(icon: badgeIcon!), + const SizedBox(width: AppSpacing.sm), + ], + // Counterweight, so a centred title lands on true centre. + if (centreTitle && trailingWidth > leadingWidth) + SizedBox(width: trailingWidth - leadingWidth), + Expanded(child: titleBlock), + if (centreTitle && leadingWidth > trailingWidth) + SizedBox(width: leadingWidth - trailingWidth), + for (final action in actions) ...[ + const SizedBox(width: AppSpacing.sm), + action, + ], + ], + ), + ), + if (bottom != null) + Padding( + padding: const EdgeInsets.fromLTRB( + AppSpacing.md, + 0, + AppSpacing.md, + AppSpacing.sm, + ), + child: bottom!, + ), + ], + ), + ), + ); + } +} + +// ── RFBottomBar ────────────────────────────────────────────────────────────── +// Sticky foot-of-screen action strip. Owns its safe-area inset; never add one. +class RFBottomBar extends StatelessWidget { + const RFBottomBar({super.key, required this.child}); + + final Widget child; + + /// Floor for the space a scroll view must reserve to clear a one-row bar. + static double clearance(BuildContext context) => + 72 + MediaQuery.paddingOf(context).bottom; + + @override + Widget build(BuildContext context) { + return Container( + padding: EdgeInsets.fromLTRB( + AppSpacing.md, + AppSpacing.sm + 4, + AppSpacing.md, + AppSpacing.sm + 4 + MediaQuery.paddingOf(context).bottom, + ), + decoration: const BoxDecoration( + color: AppColors.surface, + border: Border(top: BorderSide(color: AppColors.glassBorder)), + ), + child: child, + ); + } +} + +// ── RFLabel ────────────────────────────────────────────────────────────────── +// The one uppercase micro-label: headings, captions and overlines share it. +class RFLabel extends StatelessWidget { + const RFLabel(this.text, {super.key, this.color, this.dim = false}); + + final String text; + final Color? color; + + /// Drops to the faintest text tier — for labels over already-quiet content. + final bool dim; + + @override + Widget build(BuildContext context) { + return Text( + text.toUpperCase(), + style: TextStyle( + fontFamily: 'Geist', + color: color ?? (dim ? AppColors.textFaint : AppColors.textMuted), + fontSize: 11, + fontWeight: FontWeight.w700, + letterSpacing: 1.2, + ), + ); + } +} + +// ── RFOptionChip ───────────────────────────────────────────────────────────── +// A chip the user picks, as opposed to RFChip which only labels. +class RFOptionChip extends StatelessWidget { + const RFOptionChip({ + super.key, + required this.label, + required this.onTap, + this.selected = false, + this.color, + this.icon, + this.inMutuallyExclusiveGroup = false, + }); + + final String label; + + /// Null renders the chip inert (shown, but not selectable). + final VoidCallback? onTap; + final bool selected; + + /// Accent for the selected state. Defaults to the brand violet. + final Color? color; + final IconData? icon; + + /// Set when this chip is one of a single-choice group (handle picker, + /// effort rating) so a screen reader announces it as a radio-style choice + /// rather than a standalone button. Left false for chips that are just + /// actions, e.g. the coach's suggested prompts. + final bool inMutuallyExclusiveGroup; + + @override + Widget build(BuildContext context) { + final c = color ?? AppColors.primary; + final enabled = onTap != null; + final fg = selected + ? c + : enabled + ? AppColors.textSoft + : AppColors.textFaint; + + return Semantics( + button: enabled, + enabled: enabled, + inMutuallyExclusiveGroup: inMutuallyExclusiveGroup, + selected: selected, + label: label, + // InkWell, not a bare GestureDetector: these need to be reachable by + // keyboard/switch access and to show a focus + press response, not just + // fire a haptic. + child: InkWell( + onTap: enabled + ? () { + HapticFeedback.selectionClick(); + onTap!(); + } + : null, + borderRadius: BorderRadius.circular(AppRadius.full), + child: AnimatedContainer( + duration: AppDurations.fast, + curve: Curves.easeOut, + padding: const EdgeInsets.symmetric( + horizontal: 14, + vertical: AppSpacing.sm + 1, + ), + decoration: BoxDecoration( + color: selected ? c.withValues(alpha: 0.16) : AppColors.glass2, + borderRadius: BorderRadius.circular(AppRadius.full), + border: Border.all( + color: selected + ? c.withValues(alpha: 0.55) + : AppColors.glassBorder, + ), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + if (icon != null) ...[ + Icon(icon, size: 13, color: fg), + const SizedBox(width: 6), + ], + Flexible( + child: Text( + label, + maxLines: 1, + overflow: TextOverflow.ellipsis, + textAlign: TextAlign.center, + style: TextStyle( + fontFamily: 'Geist', + color: fg, + fontSize: 13, + fontWeight: selected ? FontWeight.w700 : FontWeight.w500, + ), + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/workout-logger/lib/screens/widgets/rf_widgets.dart b/workout-logger/lib/screens/widgets/rf_widgets.dart index 261a498..b3efb5c 100644 --- a/workout-logger/lib/screens/widgets/rf_widgets.dart +++ b/workout-logger/lib/screens/widgets/rf_widgets.dart @@ -2,10 +2,10 @@ // All widgets consume AppColors/AppSpacing/AppRadius tokens only. import 'dart:math' as math; -import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import '../../theme/app_theme.dart'; +import 'rf_shell.dart'; // ── Route helper ────────────────────────────────────────────────────────────── // Right-to-left slide push, shared by the home screen and detail entry points. @@ -45,6 +45,7 @@ class GlassCard extends StatelessWidget { final BorderRadius? borderRadius; final Color? glowColor; final Color? borderColor; + /// When true, uses accent colour border (e.g. Analytics exercise selector). final bool accentBorder; final VoidCallback? onTap; @@ -53,18 +54,22 @@ class GlassCard extends StatelessWidget { @override Widget build(BuildContext context) { final radius = borderRadius ?? BorderRadius.circular(AppRadius.xl); - final effectiveBorderColor = accentBorder - ? AppColors.primary - : (borderColor ?? AppColors.glassBorder); + + // An explicit border is a state signal (selected, accented), so it stays a + // flat ring at full strength. The graded ring is the default *material*, + // and grading it would mute the signal. + final overrideColor = accentBorder ? AppColors.primary : borderColor; final decoration = BoxDecoration( gradient: const LinearGradient( begin: Alignment.topCenter, end: Alignment.bottomCenter, - colors: [Color(0x09FFFFFF), Color(0x04FFFFFF)], + colors: [AppColors.glassFillTop, AppColors.glassFillBottom], ), borderRadius: radius, - border: Border.all(color: effectiveBorderColor, width: 1), + border: overrideColor != null + ? Border.all(color: overrideColor, width: 1) + : null, boxShadow: glowColor != null ? [ BoxShadow( @@ -76,208 +81,375 @@ class GlassCard extends StatelessWidget { : null, ); - final content = Container( + Widget content = Container( padding: padding ?? const EdgeInsets.all(AppSpacing.md), - margin: margin, decoration: decoration, child: child, ); + if (overrideColor == null) { + content = CustomPaint( + foregroundPainter: _GradedRingPainter(radius: radius), + child: content, + ); + } + if (margin != null) { + content = Padding(padding: margin!, child: content); + } + if (onTap == null) return content; return Semantics( button: true, label: semanticsLabel, - child: GestureDetector( - onTap: onTap, - child: content, - ), + child: GestureDetector(onTap: onTap, child: content), + ); + } +} + +/// A 1px border that grades from [AppColors.glassEdgeTop] down to +/// [AppColors.glassEdgeBottom]. +/// +/// Real glass catches light on the edge facing the source; a flat ring on all +/// four sides is the thing that made these panels read as outlines. Flutter's +/// [Border] takes a single colour per side, so the ring is stroked by hand. +class _GradedRingPainter extends CustomPainter { + const _GradedRingPainter({required this.radius}); + + final BorderRadius radius; + + @override + void paint(Canvas canvas, Size size) { + final rect = Offset.zero & size; + // A stroke straddles its path, so pull in by half the width to keep the + // full pixel inside the card rather than bleeding over the neighbour. + final rrect = radius.toRRect(rect).deflate(0.5); + final paint = Paint() + ..style = PaintingStyle.stroke + ..strokeWidth = 1 + ..shader = const LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [AppColors.glassEdgeTop, AppColors.glassEdgeBottom], + ).createShader(rect); + canvas.drawRRect(rrect, paint); + } + + @override + bool shouldRepaint(_GradedRingPainter oldDelegate) => + oldDelegate.radius != radius; +} + +// ── AmbientMotion ──────────────────────────────────────────────────────────── + +/// App-wide vertical scroll position, published for [AmbientGlow] to lean against. +class AmbientMotion extends InheritedNotifier> { + const AmbientMotion({ + super.key, + required ValueNotifier super.notifier, + required super.child, + }); + + /// Reads the current offset without subscribing. + static double read(BuildContext context) { + final element = context + .getElementForInheritedWidgetOfExactType(); + final widget = element?.widget as AmbientMotion?; + return widget?.notifier?.value ?? 0; + } +} + +/// Installs the [AmbientMotion] signal. Mount once, above the app's Navigator. +class AmbientMotionScope extends StatefulWidget { + const AmbientMotionScope({super.key, required this.child}); + + final Widget child; + + @override + State createState() => _AmbientMotionScopeState(); +} + +class _AmbientMotionScopeState extends State { + final _offset = ValueNotifier(0); + + @override + void dispose() { + _offset.dispose(); + super.dispose(); + } + + bool _onScroll(ScrollNotification n) { + if (n is ScrollUpdateNotification && n.metrics.axis == Axis.vertical) { + _offset.value = n.metrics.pixels; + } + return false; + } + + @override + Widget build(BuildContext context) { + return NotificationListener( + onNotification: _onScroll, + child: AmbientMotion(notifier: _offset, child: widget.child), ); } } // ── AmbientGlow ────────────────────────────────────────────────────────────── -// Matches the design's rf-ambient pseudo-elements. -class AmbientGlow extends StatelessWidget { + +/// Violet wash behind every screen: a full-height floor plus three radial +/// pools that drift slowly and lean against the user's scroll. Only transforms +/// and opacity animate. +/// +/// The floor is not decorative. Pools are finite and a scrolling column is not, +/// so pools alone can only ever light the top of a screen — the previous rig +/// lit the content column from 0 to 264dp and left the remaining 70% of a +/// Pixel flat. The floor guarantees light everywhere; the pools give it a +/// direction. +class AmbientGlow extends StatefulWidget { const AmbientGlow({super.key}); + /// Set false to render the wash static. The drift loop never ends, so under + /// the test binding it would hold `pumpAndSettle` open forever. + static bool motionEnabled = true; + + @override + State createState() => _AmbientGlowState(); +} + +class _AmbientGlowState extends State + with SingleTickerProviderStateMixin { + /// Every drift period divides this evenly, so the loop closes without a snap. + static const _cycle = Duration(seconds: 120); + + /// Scroll travel that maps to the full counter-offset. + static const _parallaxRange = 640.0; + + /// Peak counter-offset, in logical pixels. + static const _parallaxDepthNear = 34.0; + static const _parallaxDepthFar = 14.0; + + /// Pool boxes are a fraction of viewport height, not fixed dp. The old fixed + /// sizes meant coverage degraded as phones got taller — the same 480dp pool + /// lit 37% of a 720dp screen but only 28% of a 956dp one. + static const _keyScale = 0.82; + static const _counterScale = 0.97; + + /// Counterweight centre, as a fraction of viewport height, and its horizontal + /// offset from centre. Offset rather than centred so the pair reads as two + /// sources instead of a symmetric vignette. + static const _counterCentreY = 0.74; + static const _counterOffsetX = 58.0; + + /// The far pool hugs the right bezel: its centre sits 166dp from the content + /// column with a 108dp reach, so it never touches the cards. It is edge + /// atmosphere, and sized in fixed dp on purpose. + static const _farBox = 360.0; + + late final AnimationController _ctrl; + + double _parallax = 0; + + @override + void initState() { + super.initState(); + // Constructed eagerly: a lazy late-final would build its Ticker inside + // dispose(), when ancestor lookup is already unsafe. + _ctrl = AnimationController(vsync: this, duration: _cycle); + } + + @override + void didChangeDependencies() { + super.didChangeDependencies(); + if (_animates) { + if (!_ctrl.isAnimating) _ctrl.repeat(); + } else if (_ctrl.isAnimating) { + _ctrl.stop(); + } + } + + bool get _animates => + AmbientGlow.motionEnabled && !MediaQuery.disableAnimationsOf(context); + + @override + void dispose() { + _ctrl.dispose(); + super.dispose(); + } + + /// Sine at [harmonic] cycles per loop; coprime harmonics never resync. + double _wave(double t, int harmonic) => math.sin(2 * math.pi * harmonic * t); + + /// Eased toward the live scroll position so route changes glide, not jump. + double _sampleParallax(BuildContext context) { + final target = (AmbientMotion.read(context) / _parallaxRange).clamp( + 0.0, + 1.0, + ); + _parallax += (target - _parallax) * 0.08; + return _parallax; + } + + /// One pool. When the rig is static the drift and fade are skipped entirely + /// rather than sampled at rest, so nothing wraps the wash that need not. + Widget _pool({ + required double box, + required double left, + required double top, + required double opacity, + required bool animate, + Offset drift = Offset.zero, + double fade = 1, + }) { + // The fade is folded into the gradient's own alpha rather than wrapped in + // an Opacity: these boxes are a large fraction of the viewport and the + // drift loop never stops, so an Opacity here would mean three + // near-fullscreen saveLayers on every frame, forever. Equivalent output — + // the gradient's far stop is fully transparent, so scaling the near stop + // scales the whole ramp. + return Positioned( + left: left, + top: top, + child: animate + ? Transform.translate( + offset: drift, + child: _Wash(size: box, opacity: opacity * fade), + ) + : _Wash(size: box, opacity: opacity), + ); + } + + Widget _rig(Size size, {required bool animate, double t = 0, double p = 0}) { + final w = size.width; + final h = size.height; + final keyBox = h * _keyScale; + final counterBox = h * _counterScale; + + return Stack( + children: [ + const Positioned.fill(child: _WashFloor()), + // Key: top-anchored and centred. Establishes the light direction. + _pool( + box: keyBox, + left: (w - keyBox) / 2, + top: -120, + opacity: 0.32, + animate: animate, + drift: Offset( + _wave(t, 2) * 20, + _wave(t, 3) * 13 - p * _parallaxDepthNear, + ), + fade: 0.86 + 0.14 * (0.5 + 0.5 * _wave(t, 5)), + ), + // Far: right bezel only. Less travel — the gap is the parallax. + _pool( + box: _farBox, + left: w + 140 - _farBox, + top: 40, + opacity: 0.16, + animate: animate, + drift: Offset( + _wave(t, 3) * -9, + _wave(t, 2) * 7 - p * _parallaxDepthFar, + ), + fade: 0.80 + 0.20 * (0.5 + 0.5 * _wave(t, 3)), + ), + // Counterweight: lower third, off-axis, and quiet. It gives the bottom + // of the screen a source rather than a flat tint. + _pool( + box: counterBox, + left: (w - counterBox) / 2 + _counterOffsetX, + top: h * _counterCentreY - counterBox / 2, + opacity: 0.14, + animate: animate, + drift: Offset( + _wave(t, 2) * -11, + _wave(t, 3) * 8 - p * _parallaxDepthFar, + ), + fade: 0.84 + 0.16 * (0.5 + 0.5 * _wave(t, 2)), + ), + ], + ); + } + @override Widget build(BuildContext context) { return Positioned.fill( child: IgnorePointer( - child: Stack( - children: [ - // Top violet wash - Positioned( - top: -120, - left: 0, - right: 0, - child: Center( - child: Container( - width: 480, - height: 480, - decoration: BoxDecoration( - shape: BoxShape.circle, - gradient: RadialGradient( - colors: [ - const Color(0xFF5B21B6).withValues(alpha: 0.35), - Colors.transparent, - ], - stops: const [0, 0.6], - ), - ), + child: RepaintBoundary( + child: LayoutBuilder( + builder: (context, constraints) { + final size = constraints.biggest; + // An always-moving backdrop is what this setting exists to stop. + if (!_animates) return _rig(size, animate: false); + return AnimatedBuilder( + animation: _ctrl, + builder: (context, _) => _rig( + size, + animate: true, + t: _ctrl.value, + p: _sampleParallax(context), ), - ), - ), - ], + ); + }, + ), ), ), ); } } -// ── RFNavBar ───────────────────────────────────────────────────────────────── -// Premium floating glassmorphic bottom navigation bar with perfect rounded blur, -// deep drop shadow, and clean transparent padding so it sits elegantly above the content. -class RFNavBar extends StatelessWidget { - const RFNavBar({ - super.key, - required this.currentIndex, - required this.onTap, - required this.items, - }); - - final int currentIndex; - final ValueChanged onTap; - final List items; +/// The floor: a full-height grade that keeps every pixel of canvas fractionally +/// above flat black, so glass always has something behind it to sit on. +class _WashFloor extends StatelessWidget { + const _WashFloor(); @override Widget build(BuildContext context) { - final bottomPadding = MediaQuery.of(context).padding.bottom; - return Container( - color: Colors.transparent, // Completely transparent outer container - padding: EdgeInsets.fromLTRB( - 16, - 8, - 16, - bottomPadding > 0 ? bottomPadding + 8 : 16, - ), - child: Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(AppRadius.xxl), - boxShadow: [ - BoxShadow( - color: Colors.black.withValues(alpha: 0.4), - blurRadius: 28, - spreadRadius: -4, - offset: const Offset(0, 10), - ), + return const DecoratedBox( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + AppColors.washFloorTop, + AppColors.washFloorMid, + AppColors.washFloorBottom, ], - ), - child: ClipRRect( - borderRadius: BorderRadius.circular(AppRadius.xxl), - child: BackdropFilter( - filter: ImageFilter.blur(sigmaX: 16, sigmaY: 16), - child: Container( - decoration: BoxDecoration( - color: AppColors.surface.withValues(alpha: 0.8), // Sleek transparent surface - borderRadius: BorderRadius.circular(AppRadius.xxl), - border: Border.all( - color: AppColors.glassBorderStrong, - width: 1.5, - ), - ), - padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 10), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: List.generate(items.length, (i) { - final active = i == currentIndex; - return _NavItem( - item: items[i], - active: active, - onTap: () => onTap(i), - ); - }), - ), - ), - ), + stops: [0, 0.45, 1], ), ), ); } } -class RFNavItem { - const RFNavItem({required this.icon, required this.label}); - final IconData icon; - final String label; -} - -class _NavItem extends StatelessWidget { - const _NavItem({ - required this.item, - required this.active, - required this.onTap, - }); +class _Wash extends StatelessWidget { + const _Wash({required this.size, required this.opacity}); - final RFNavItem item; - final bool active; - final VoidCallback onTap; + final double size; + final double opacity; @override Widget build(BuildContext context) { - return Semantics( - button: true, - label: item.label, - child: GestureDetector( - onTap: onTap, - behavior: HitTestBehavior.opaque, - child: SizedBox( - width: 60, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - // Accent indicator above icon - AnimatedContainer( - duration: AppDurations.normal, - width: active ? 18 : 0, - height: 2, - margin: const EdgeInsets.only(bottom: 4), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(2), - color: AppColors.primary, - boxShadow: active - ? [ - BoxShadow( - color: AppColors.primary.withValues(alpha: 0.6), - blurRadius: 6, - ), - ] - : null, - ), - ), - Icon( - item.icon, - size: 19, - color: active ? AppColors.textPrimary : AppColors.textMuted, - ), - const SizedBox(height: 4), - Text( - item.label, - style: TextStyle(fontFamily: 'Geist', - fontSize: 10, - fontWeight: active ? FontWeight.w600 : FontWeight.w500, - color: active ? AppColors.textPrimary : AppColors.textMuted, - letterSpacing: 0.2, - ), - ), - ], - ), + return Container( + width: size, + height: size, + decoration: BoxDecoration( + shape: BoxShape.circle, + gradient: RadialGradient( + colors: [ + AppColors.primaryDeep.withValues(alpha: opacity), + Colors.transparent, + ], + stops: const [0, 0.6], ), ), ); } } +// ── Nav bar ────────────────────────────────────────────────────────────────── +// Moved to floating_nav_bar.dart (zero-dependency, drop-in portable widget). +// Import and use FloatingNavBar / FloatingNavBarScaffold / FloatingNavItem. + // ── GlowButton ────────────────────────────────────────────────────────────── // Full-width primary action button with glow shadow + haptic feedback. class GlowButton extends StatefulWidget { @@ -351,10 +523,8 @@ class _GlowButtonState extends State return AnimatedBuilder( animation: _scale, - builder: (context, child) => Transform.scale( - scale: _scale.value, - child: child, - ), + builder: (context, child) => + Transform.scale(scale: _scale.value, child: child), child: Semantics( button: true, label: widget.label, @@ -388,8 +558,9 @@ class _GlowButtonState extends State ], ), child: Row( - mainAxisSize: - widget.fullWidth ? MainAxisSize.max : MainAxisSize.min, + mainAxisSize: widget.fullWidth + ? MainAxisSize.max + : MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.center, children: [ if (widget.icon != null) ...[ @@ -400,13 +571,17 @@ class _GlowButtonState extends State ), const SizedBox(width: AppSpacing.sm), ], - Text( - widget.label, - style: TextStyle( - color: disabled ? AppColors.textMuted : Colors.white, - fontSize: widget.small ? 14 : 16, - fontWeight: FontWeight.w700, - letterSpacing: 0.5, + Flexible( + child: Text( + widget.label, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + color: disabled ? AppColors.textMuted : Colors.white, + fontSize: widget.small ? 14 : 16, + fontWeight: FontWeight.w700, + letterSpacing: 0.5, + ), ), ), ], @@ -530,18 +705,7 @@ class RFSectionHeader extends StatelessWidget { padding: EdgeInsets.only(bottom: bottomPad ? AppSpacing.sm : 0), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - title.toUpperCase(), - style: const TextStyle( - color: AppColors.textMuted, - fontSize: 11, - fontWeight: FontWeight.w700, - letterSpacing: 1.2, - ), - ), - ?trailing, - ], + children: [RFLabel(title), ?trailing], ), ); } @@ -637,7 +801,8 @@ class AnimatedCounter extends StatelessWidget { : v.toInt().toString(); return Text( '$display$suffix', - style: style ?? + style: + style ?? const TextStyle( color: AppColors.textPrimary, fontSize: 22, @@ -871,10 +1036,17 @@ class RFProgressBar extends StatelessWidget { curve: Curves.easeOutCubic, width: constraints.maxWidth * clamped, decoration: BoxDecoration( - gradient: LinearGradient(colors: [c, Color.lerp(c, Colors.white, 0.2)!]), + gradient: LinearGradient( + colors: [c, Color.lerp(c, Colors.white, 0.2)!], + ), borderRadius: BorderRadius.circular(AppRadius.full), boxShadow: showGlow - ? [BoxShadow(color: c.withValues(alpha: 0.5), blurRadius: 8)] + ? [ + BoxShadow( + color: c.withValues(alpha: 0.5), + blurRadius: 8, + ), + ] : null, ), ), @@ -905,8 +1077,9 @@ class RestTimerRing extends StatelessWidget { final progress = total > 0 ? (remaining / total).clamp(0.0, 1.0) : 0.0; final mins = remaining ~/ 60; final secs = remaining % 60; - final label = - mins > 0 ? '$mins:${secs.toString().padLeft(2, '0')}' : '$secs'; + final label = mins > 0 + ? '$mins:${secs.toString().padLeft(2, '0')}' + : '$secs'; return SizedBox( width: size, @@ -1037,3 +1210,112 @@ class _SkeletonBoxState extends State ); } } + +// ── RFTextField ───────────────────────────────────────────────────────────── +/// Standardized RepForge glassmorphic text input field. +class RFTextField extends StatefulWidget { + const RFTextField({ + super.key, + required this.controller, + required this.hint, + this.label, + this.keyboardType, + this.inputFormatters, + this.maxLines = 1, + this.onChanged, + this.prefixIcon, + this.suffixIcon, + }); + + final TextEditingController controller; + final String hint; + final String? label; + final TextInputType? keyboardType; + final List? inputFormatters; + final int maxLines; + final ValueChanged? onChanged; + final IconData? prefixIcon; + final Widget? suffixIcon; + + @override + State createState() => _RFTextFieldState(); +} + +class _RFTextFieldState extends State { + late final FocusNode _focusNode; + bool _isFocused = false; + + @override + void initState() { + super.initState(); + _focusNode = FocusNode(); + _focusNode.addListener(_onFocusChange); + } + + void _onFocusChange() { + setState(() => _isFocused = _focusNode.hasFocus); + } + + @override + void dispose() { + _focusNode.removeListener(_onFocusChange); + _focusNode.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (widget.label != null) ...[ + Text( + widget.label!, + style: const TextStyle( + fontFamily: 'GeistMono', + color: AppColors.textSoft, + fontSize: 12, + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(height: AppSpacing.xs), + ], + Container( + decoration: BoxDecoration( + color: AppColors.surface, + borderRadius: BorderRadius.circular(AppRadius.md), + border: Border.all( + color: _isFocused ? AppColors.primary : AppColors.glassBorder, + width: _isFocused ? 1.5 : 1.0, + ), + ), + child: TextField( + controller: widget.controller, + focusNode: _focusNode, + keyboardType: widget.keyboardType, + inputFormatters: widget.inputFormatters, + maxLines: widget.maxLines, + onChanged: widget.onChanged, + style: const TextStyle(color: AppColors.textPrimary, fontSize: 14), + decoration: InputDecoration( + hintText: widget.hint, + hintStyle: const TextStyle( + color: AppColors.textMuted, + fontSize: 14, + ), + prefixIcon: widget.prefixIcon != null + ? Icon(widget.prefixIcon, color: AppColors.textSoft, size: 20) + : null, + suffixIcon: widget.suffixIcon, + contentPadding: const EdgeInsets.symmetric( + horizontal: AppSpacing.md, + vertical: AppSpacing.sm, + ), + border: InputBorder.none, + ), + ), + ), + ], + ); + } +} diff --git a/workout-logger/lib/screens/widgets/routine_creator.dart b/workout-logger/lib/screens/widgets/routine_creator.dart index 97fc6b5..deaa717 100644 --- a/workout-logger/lib/screens/widgets/routine_creator.dart +++ b/workout-logger/lib/screens/widgets/routine_creator.dart @@ -10,6 +10,7 @@ import '../../data/exercise_database.dart'; import '../workout_flow_screen.dart'; import 'rf_widgets.dart'; import 'rf_cards.dart'; +import 'rf_dialogs.dart'; import 'workout_conflict_dialog.dart'; // ── Start routine workout (shared helper) ───────────────────────────────────── @@ -101,25 +102,10 @@ class _CreateRoutineScreenState extends State { children: [ Padding( padding: const EdgeInsets.all(AppSpacing.md), - child: Container( - decoration: BoxDecoration( - color: AppColors.card, - borderRadius: BorderRadius.circular(AppRadius.md), - border: Border.all(color: AppColors.glassBorder), - ), - child: TextField( - controller: _nameController, - style: const TextStyle(color: AppColors.textPrimary), - decoration: const InputDecoration( - hintText: 'Routine name (e.g. Push Day)', - hintStyle: TextStyle(color: AppColors.textMuted), - border: InputBorder.none, - contentPadding: EdgeInsets.symmetric( - horizontal: AppSpacing.md, - vertical: AppSpacing.md, - ), - ), - ), + child: RFTextField( + controller: _nameController, + hint: 'Routine name (e.g. Push Day)', + prefixIcon: Icons.fitness_center_rounded, ), ), Padding( @@ -159,15 +145,16 @@ class _CreateRoutineScreenState extends State { AppSpacing.md, ), itemCount: _selectedIds.length + 1, - onReorder: (old, next) { + onReorderItem: (old, next) { if (old >= _selectedIds.length || - next >= _selectedIds.length + 1) { + next > _selectedIds.length) { return; } setState(() { - if (next > old) next--; final item = _selectedIds.removeAt(old); - _selectedIds.insert(next, item); + final targetIndex = + next > _selectedIds.length ? _selectedIds.length : next; + _selectedIds.insert(targetIndex, item); }); }, itemBuilder: (_, i) { @@ -409,14 +396,16 @@ class _CreateRoutineScreenState extends State { Future _save() async { if (_nameController.text.trim().isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Please enter a routine name')), + context.showRFSnackBar( + 'Please enter a routine name', + type: RFSnackBarType.warning, ); return; } if (_selectedIds.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - const SnackBar(content: Text('Please add at least one exercise')), + context.showRFSnackBar( + 'Please add at least one exercise', + type: RFSnackBarType.warning, ); return; } @@ -440,8 +429,9 @@ class _CreateRoutineScreenState extends State { if (mounted) Navigator.of(context).pop(); } catch (e) { if (mounted) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text('Failed to save routine: $e')), + context.showRFSnackBar( + 'Failed to save routine: $e', + type: RFSnackBarType.error, ); } } diff --git a/workout-logger/lib/screens/widgets/workout_header.dart b/workout-logger/lib/screens/widgets/workout_header.dart index 729ae49..844802a 100644 --- a/workout-logger/lib/screens/widgets/workout_header.dart +++ b/workout-logger/lib/screens/widgets/workout_header.dart @@ -4,6 +4,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import '../../theme/app_theme.dart'; import 'rf_widgets.dart'; +import 'rf_shell.dart'; // ── WorkoutHeader ───────────────────────────────────────────────────────────── // Shows exercise name, set/exercise progress, elapsed timer, and nav actions. @@ -16,11 +17,7 @@ class WorkoutHeader extends StatefulWidget { required this.setNumber, required this.workoutStartTime, required this.progress, - required this.isFirst, - required this.isLast, required this.onClose, - required this.onPrevious, - required this.onNext, required this.onFinish, required this.onRemoveLastSet, required this.onSetRestTime, @@ -33,11 +30,7 @@ class WorkoutHeader extends StatefulWidget { final int setNumber; final DateTime? workoutStartTime; final double progress; - final bool isFirst; - final bool isLast; final VoidCallback onClose; - final VoidCallback onPrevious; - final VoidCallback onNext; final VoidCallback onFinish; final VoidCallback onRemoveLastSet; final void Function(int seconds) onSetRestTime; @@ -80,113 +73,70 @@ class _WorkoutHeaderState extends State { @override Widget build(BuildContext context) { - return Container( - decoration: BoxDecoration( - gradient: const LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [Color(0xFF0C0C12), Color(0x000C0C12)], + // Left-aligned title, matching every other screen header in the app. The + // title used to be centred while the leading and trailing clusters had + // very different widths, which pushed it visibly off the optical centre. + return RFScreenHeader( + title: widget.exerciseName, + subtitle: + 'Exercise ${widget.currentExerciseIndex + 1} of ${widget.totalExercises} · Set ${widget.setNumber}', + onBack: widget.onClose, + leadingIcon: Icons.close_rounded, + leadingTooltip: 'Cancel workout', + actions: [ + _ElapsedChip(label: _elapsedLabel), + _OptionsMenu( + restSeconds: widget.restSeconds, + onRemoveLastSet: widget.onRemoveLastSet, + onSetRestTime: widget.onSetRestTime, + onFinish: widget.onFinish, ), - border: Border(bottom: BorderSide(color: AppColors.glassBorder)), + ], + bottom: RFProgressBar( + value: widget.progress, + height: 3, + showGlow: false, ), - child: SafeArea( - bottom: false, - child: Column( + ); + } +} + +// ── Elapsed chip ────────────────────────────────────────────────────────────── +class _ElapsedChip extends StatelessWidget { + const _ElapsedChip({required this.label}); + + final String label; + + @override + Widget build(BuildContext context) { + return Semantics( + label: 'Elapsed time', + value: label, + child: Container( + // A floor, not a fixed height: a large text scale needs more than 38pt. + constraints: const BoxConstraints(minHeight: 38), + alignment: Alignment.center, + padding: const EdgeInsets.symmetric( + horizontal: AppSpacing.sm + 2, + vertical: 4, + ), + decoration: BoxDecoration( + color: AppColors.glass2, + borderRadius: BorderRadius.circular(AppRadius.md), + border: Border.all(color: AppColors.glassBorder), + ), + child: Row( mainAxisSize: MainAxisSize.min, children: [ - Padding( - padding: const EdgeInsets.fromLTRB(4, 4, 4, 0), - child: Row( - children: [ - // Close button - IconButton( - icon: const Icon(Icons.close_rounded, size: 22), - color: AppColors.textSoft, - onPressed: widget.onClose, - ), - // Exercise info - Expanded( - child: Column( - children: [ - Text( - widget.exerciseName, - style: TextStyle(fontFamily: 'Geist', - color: AppColors.textPrimary, - fontSize: 17, - fontWeight: FontWeight.w600, - letterSpacing: -0.3, - ), - textAlign: TextAlign.center, - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - const SizedBox(height: 2), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - 'Exercise ${widget.currentExerciseIndex + 1} of ${widget.totalExercises} · Set ${widget.setNumber}', - style: TextStyle(fontFamily: 'Geist', - color: AppColors.textMuted, - fontSize: 11, - ), - ), - ], - ), - ], - ), - ), - // Timer chip + menu - Row( - mainAxisSize: MainAxisSize.min, - children: [ - Container( - padding: const EdgeInsets.symmetric( - horizontal: 8, - vertical: 4, - ), - decoration: BoxDecoration( - color: AppColors.card, - borderRadius: BorderRadius.circular(AppRadius.full), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - const Icon(Icons.timer_outlined, size: 12, color: AppColors.textMuted), - const SizedBox(width: 4), - Text( - _elapsedLabel, - style: TextStyle(fontFamily: 'GeistMono', - color: AppColors.textSoft, - fontSize: 12, - ), - ), - ], - ), - ), - _OptionsMenu( - restSeconds: widget.restSeconds, - onRemoveLastSet: widget.onRemoveLastSet, - onSetRestTime: widget.onSetRestTime, - onFinish: widget.onFinish, - ), - ], - ), - ], - ), - ), - // Progress bar - Padding( - padding: const EdgeInsets.fromLTRB( - AppSpacing.md, - AppSpacing.sm, - AppSpacing.md, - AppSpacing.sm, - ), - child: RFProgressBar( - value: widget.progress, - height: 4, - showGlow: false, + const Icon(Icons.timer_outlined, size: 13, color: AppColors.textMuted), + const SizedBox(width: 5), + Text( + label, + style: const TextStyle( + fontFamily: 'GeistMono', + color: AppColors.textSoft, + fontSize: 12, + fontFeatures: [FontFeature.tabularFigures()], ), ), ], diff --git a/workout-logger/lib/screens/workout_flow_screen.dart b/workout-logger/lib/screens/workout_flow_screen.dart index 24bbd90..3e85ac3 100644 --- a/workout-logger/lib/screens/workout_flow_screen.dart +++ b/workout-logger/lib/screens/workout_flow_screen.dart @@ -10,10 +10,14 @@ import '../models/models.dart'; import '../services/workout_provider.dart'; import '../services/settings_provider.dart'; import '../services/managers/pr_manager.dart'; +import '../services/managers/readiness_manager.dart'; import '../theme/app_theme.dart'; import 'add_custom_exercise_screen.dart'; import 'exercise_library_screen.dart'; import 'workout_summary_screen.dart'; +import 'widgets/rf_widgets.dart'; +import 'widgets/rf_shell.dart'; +import 'widgets/rf_dialogs.dart'; import 'widgets/workout_header.dart'; import 'widgets/exercise_input_section.dart'; import 'widgets/rest_timer_view.dart'; @@ -168,7 +172,11 @@ class _WorkoutFlowScreenState extends State { final exercise = provider.currentExercise; if (exercise == null) return; - final last = provider.getLastSessionForExercise(exercise.id); + final currentHandle = provider.currentExerciseLog?.handle; + final last = provider.getLastSessionForExercise( + exercise.id, + handle: currentHandle, + ); if (last != null && last.sets.isNotEmpty) { final lastSet = last.sets.last; setState(() { @@ -265,12 +273,22 @@ class _WorkoutFlowScreenState extends State { final isFirst = idx == 0; final isLast = idx >= totalExercises - 1; + final selectedHandle = log?.handle; + // Nullable-typed lookup: resolves to null (no readiness signal) instead + // of throwing when no ReadinessManager is above this screen in the + // widget tree — keeps this screen usable without the full app's + // provider tree (e.g. in isolated widget tests). + final readinessBand = context.watch()?.snapshot?.band; final recommendations = exercise != null - ? provider.getRecommendations(exercise.id) + ? provider.getRecommendations( + exercise.id, + handle: selectedHandle, + readinessBand: readinessBand, + ) : []; final lastSession = exercise != null - ? provider.getLastSessionForExercise(exercise.id) + ? provider.getLastSessionForExercise(exercise.id, handle: selectedHandle) : null; return Column( @@ -282,27 +300,26 @@ class _WorkoutFlowScreenState extends State { setNumber: (log?.sets.length ?? 0) + 1, workoutStartTime: provider.workoutStartTime, progress: totalExercises > 0 ? (idx + 1) / totalExercises : 0, - isFirst: isFirst, - isLast: isLast, onClose: _showCancelDialog, - onPrevious: () { - provider.previousExercise(); - _loadLastSessionData(); - }, - onNext: () { - provider.nextExercise(); - _loadLastSessionData(); - }, onFinish: _finishWorkout, onRemoveLastSet: provider.removeLastSet, onSetRestTime: (s) => setState(() => _restSeconds = s), restSeconds: _restSeconds, ), Expanded( - child: SingleChildScrollView( - physics: const BouncingScrollPhysics(), - padding: const EdgeInsets.all(AppSpacing.md), - child: ExerciseInputSection( + // minHeight + IntrinsicHeight let the section's Spacer do its work. + child: LayoutBuilder( + builder: (context, constraints) => SingleChildScrollView( + physics: const BouncingScrollPhysics(), + padding: const EdgeInsets.all(AppSpacing.md), + child: ConstrainedBox( + constraints: BoxConstraints( + minHeight: constraints.maxHeight - AppSpacing.md * 2, + ), + child: IntrinsicHeight( + child: ExerciseInputSection( + // The section cannot measure itself under IntrinsicHeight. + contentWidth: constraints.maxWidth - AppSpacing.md * 2, currentWeight: _currentWeight, currentReps: _currentReps, isDropset: _isDropset, @@ -316,6 +333,12 @@ class _WorkoutFlowScreenState extends State { lastSession: lastSession, settings: settings, exerciseId: exercise?.id, + availableHandles: exercise?.availableHandles, + selectedHandle: selectedHandle, + onHandleChanged: (h) { + provider.setExerciseHandle(h); + _loadLastSessionData(); + }, programSlot: _slot(idx, p: provider), programWeek: _resolvedWeek(provider), onWeightChanged: (v) => setState(() => _currentWeight = v), @@ -337,7 +360,6 @@ class _WorkoutFlowScreenState extends State { _drops[i] = DropsetEntry(weight: _drops[i].weight, reps: r); } }, - onLogSet: _completeSet, onApplyRecommendation: () { if (recommendations.isEmpty) return; final setIdx = (log?.sets.length ?? 0) @@ -354,6 +376,9 @@ class _WorkoutFlowScreenState extends State { _mainRepsCtrl.text = rec.reps.toString(); }); }, + ), + ), + ), ), ), ), @@ -378,98 +403,44 @@ class _WorkoutFlowScreenState extends State { ); } + /// Log set is tapped twenty-odd times a session and exercise nav a handful, + /// so the log action owns the width and the thumb zone. It used to be inverted. Widget _buildBottomNav(WorkoutProvider provider, bool isFirst, bool isLast) { - final bottomPad = MediaQuery.of(context).padding.bottom; - return Container( - padding: EdgeInsets.fromLTRB(16, 12, 16, 12 + bottomPad), - decoration: BoxDecoration( - color: AppColors.surface.withValues(alpha: 0.95), - border: Border(top: BorderSide(color: AppColors.glassBorder)), - ), + return RFBottomBar( child: Row( children: [ - if (!isFirst) - Flexible( - child: GestureDetector( - onTap: () { - provider.previousExercise(); - _loadLastSessionData(); - }, - child: Container( - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14), - decoration: BoxDecoration( - color: AppColors.glass2, - borderRadius: BorderRadius.circular(AppRadius.button), - border: Border.all(color: AppColors.glassBorderStrong), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - const Icon(Icons.arrow_back_rounded, size: 16, color: AppColors.textMuted), - const SizedBox(width: 6), - Text( - 'Prev', - style: TextStyle(fontFamily: 'Geist', - fontSize: 13, - fontWeight: FontWeight.w600, - color: AppColors.textMuted, - ), - ), - ], - ), - ), - ), - ) - else - const SizedBox.shrink(), - const Spacer(), - Flexible( - child: GestureDetector( - onTap: isLast - ? _finishWorkout - : () { - provider.nextExercise(); - _loadLastSessionData(); - }, - child: Container( - padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 14), - decoration: BoxDecoration( - color: isLast ? AppColors.success : AppColors.primary, - borderRadius: BorderRadius.circular(AppRadius.button), - boxShadow: [ - BoxShadow( - color: (isLast ? AppColors.success : AppColors.primary) - .withValues(alpha: 0.35), - blurRadius: 16, - offset: const Offset(0, 4), - ), - ], - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Flexible( - child: Text( - isLast ? 'Finish' : 'Next exercise', - overflow: TextOverflow.ellipsis, - style: TextStyle(fontFamily: 'Geist', - fontSize: 13, - fontWeight: FontWeight.w600, - color: Colors.white, - ), - ), - ), - const SizedBox(width: 6), - Icon( - isLast ? Icons.check_rounded : Icons.arrow_forward_rounded, - size: 16, - color: Colors.white, - ), - ], - ), - ), + RFIconButton( + icon: Icons.arrow_back_rounded, + tooltip: 'Previous exercise', + onTap: isFirst + ? null + : () { + provider.previousExercise(); + _loadLastSessionData(); + }, + size: 46, + ), + const SizedBox(width: AppSpacing.sm), + Expanded( + child: GlowButton( + label: 'Log set', + icon: Icons.check_rounded, + onPressed: _completeSet, ), ), + const SizedBox(width: AppSpacing.sm), + RFIconButton( + icon: isLast ? Icons.flag_rounded : Icons.arrow_forward_rounded, + tooltip: isLast ? 'Finish workout' : 'Next exercise', + color: isLast ? AppColors.success : AppColors.textSoft, + onTap: isLast + ? _finishWorkout + : () { + provider.nextExercise(); + _loadLastSessionData(); + }, + size: 46, + ), ], ), ); @@ -534,15 +505,26 @@ class _WorkoutFlowScreenState extends State { void _completeSet() { final provider = context.read(); + final settings = context.read(); final idx = provider.currentExerciseIndex; final currentSlot = _slot(idx, p: provider); final nextSlot = _slot(idx + 1, p: provider); + // For bodyweight-assisted exercises (assisted dips/pull-ups/etc.) the + // weight input represents the assist load, not the lifted load. Snapshot + // the assist weight and the bodyweight it was computed against so + // historical volume stays correct even if the user's bodyweight later + // changes in settings. + final isAssistedBW = + isAssistedBodyweightExercise(provider.currentExercise?.id); + final set = WorkoutSet( weight: _currentWeight, reps: _currentReps, isDropset: _isDropset, drops: _isDropset ? List.from(_drops) : null, + assistWeight: isAssistedBW ? _currentWeight : null, + bodyWeightAtLog: isAssistedBW ? settings.userBodyWeight : null, ); provider.addSet(set); @@ -634,99 +616,69 @@ class _WorkoutFlowScreenState extends State { // ── Dialogs ───────────────────────────────────────────────────────────────── - void _showCancelDialog() { - showDialog( - context: context, - builder: (ctx) => AlertDialog( - backgroundColor: AppColors.cardHigh, - title: const Text('Cancel Workout?'), - content: const Text('Your progress will not be saved.'), - actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx), - child: const Text('Continue'), - ), - TextButton( - onPressed: () async { - final nav = Navigator.of(context); - final ctxNav = Navigator.of(ctx); - await context.read().cancelWorkout(); - if (!mounted) return; - ctxNav.pop(); - nav.pop(); - }, - style: TextButton.styleFrom(foregroundColor: AppColors.error), - child: const Text('Discard'), - ), - ], - ), + Future _showCancelDialog() async { + final discard = await showRFConfirmDialog( + context, + title: 'Discard this workout?', + content: 'Nothing from this session will be saved.', + cancelText: 'Keep going', + confirmText: 'Discard', + isDanger: true, ); + if (discard != true || !mounted) return; + final nav = Navigator.of(context); + await context.read().cancelWorkout(); + if (!mounted) return; + nav.pop(); } - void _finishWorkout() { - showDialog( - context: context, - builder: (ctx) => AlertDialog( - backgroundColor: AppColors.cardHigh, - title: const Text('Finish Workout?'), - content: const Text('Ready to save this session?'), - actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx), - child: const Text('Continue'), - ), - ElevatedButton( - onPressed: () async { - final nav = Navigator.of(context); - final prManager = context.read(); - Navigator.of(ctx).pop(); - final session = - await context.read().finishWorkout(); - final newPRs = await prManager.checkAndUpdatePRs(session); - if (!mounted) return; - nav.pop(); - nav.push(MaterialPageRoute( - builder: (_) => WorkoutSummaryScreen( - session: session, - newPRs: newPRs, - ), - )); - }, - style: ElevatedButton.styleFrom( - backgroundColor: AppColors.success, - ), - child: const Text('Save & Finish'), - ), - ], - ), + Future _finishWorkout() async { + final confirmed = await showRFConfirmDialog( + context, + title: 'Finish workout?', + content: 'This session will be saved to your history.', + cancelText: 'Keep going', + confirmText: 'Save & finish', ); + if (confirmed != true || !mounted) return; + + final nav = Navigator.of(context); + final prManager = context.read(); + final session = await context.read().finishWorkout(); + final newPRs = await prManager.checkAndUpdatePRs(session); + if (!mounted) return; + nav.pushReplacement(MaterialPageRoute( + builder: (_) => WorkoutSummaryScreen(session: session, newPRs: newPRs), + )); } Future _handleBack() async { - final action = await showDialog<_LeaveAction>( - context: context, - builder: (ctx) => AlertDialog( - backgroundColor: AppColors.cardHigh, - title: const Text('Leave workout?'), - content: const Text( - 'Progress is saved. You can resume next time.', + // A sheet, not a dialog: three dialog actions wrap into a ragged column. + final action = await showRFActionSheet<_LeaveAction>( + context, + title: 'Leave this workout?', + message: 'Your sets so far are already saved.', + actions: const [ + RFAction( + label: 'Keep & exit', + value: _LeaveAction.keep, + description: 'Resume where you left off next time', + icon: Icons.bookmark_outline_rounded, + isPrimary: true, ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(ctx, _LeaveAction.discard), - style: TextButton.styleFrom(foregroundColor: AppColors.error), - child: const Text('Discard'), - ), - TextButton( - onPressed: () => Navigator.pop(ctx, _LeaveAction.keep), - child: const Text('Keep & exit'), - ), - TextButton( - onPressed: () => Navigator.pop(ctx, _LeaveAction.cancel), - child: const Text('Cancel'), - ), - ], - ), + RFAction( + label: 'Stay here', + value: _LeaveAction.cancel, + icon: Icons.arrow_back_rounded, + ), + RFAction( + label: 'Discard workout', + value: _LeaveAction.discard, + description: 'Delete this session for good', + icon: Icons.delete_outline_rounded, + isDanger: true, + ), + ], ); if (!mounted) return; diff --git a/workout-logger/lib/screens/workout_summary_screen.dart b/workout-logger/lib/screens/workout_summary_screen.dart index 0bd87e4..8d9f640 100644 --- a/workout-logger/lib/screens/workout_summary_screen.dart +++ b/workout-logger/lib/screens/workout_summary_screen.dart @@ -11,6 +11,7 @@ import '../services/settings_provider.dart'; import '../theme/app_theme.dart'; import 'widgets/rf_widgets.dart'; import 'widgets/rf_cards.dart'; +import 'widgets/rf_shell.dart'; class WorkoutSummaryScreen extends StatelessWidget { const WorkoutSummaryScreen({ @@ -48,50 +49,70 @@ class WorkoutSummaryScreen extends StatelessWidget { return Scaffold( backgroundColor: AppColors.background, - body: SafeArea( - child: CustomScrollView( - physics: const BouncingScrollPhysics(), - slivers: [ - SliverToBoxAdapter( - child: Padding( - padding: const EdgeInsets.all(AppSpacing.md), - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - const SizedBox(height: AppSpacing.lg), - _buildTrophyHeader(context), - const SizedBox(height: AppSpacing.xl), - _buildStatGrid( - session.duration, - volStr, - totalSets, - session.exercises.length, - settings.unitLabel, - ), - if (newPRs.isNotEmpty) ...[ - const SizedBox(height: AppSpacing.lg), - _buildPRSection(newPRs, provider), - ], - if (muscles.isNotEmpty) ...[ - const SizedBox(height: AppSpacing.lg), - _buildMusclesSection(muscles, provider), + body: Stack( + children: [ + const AmbientGlow(), + Column( + children: [ + Expanded( + child: SafeArea( + bottom: false, + child: CustomScrollView( + physics: const BouncingScrollPhysics(), + slivers: [ + SliverToBoxAdapter( + child: Padding( + padding: const EdgeInsets.all(AppSpacing.md), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + const SizedBox(height: AppSpacing.lg), + _buildTrophyHeader(context), + const SizedBox(height: AppSpacing.xl), + _buildStatGrid( + session.duration, + volStr, + totalSets, + session.exercises.length, + settings.unitLabel, + ), + // The only ask on this screen, above the read-only sections. + const SizedBox(height: AppSpacing.lg), + _EffortChipRow(session: session), + if (newPRs.isNotEmpty) ...[ + const SizedBox(height: AppSpacing.lg), + _buildPRSection(newPRs, provider), + ], + if (muscles.isNotEmpty) ...[ + const SizedBox(height: AppSpacing.lg), + _buildMusclesSection(muscles, provider), + ], + const SizedBox(height: AppSpacing.lg), + _buildExerciseSummary( + session: session, + provider: provider, + settings: settings, + ), + const SizedBox(height: AppSpacing.md), + ], + ), + ), + ), ], - const SizedBox(height: AppSpacing.lg), - _buildExerciseSummary(session, provider), - const SizedBox(height: AppSpacing.xl), - GlowButton( - label: 'Done', - icon: Icons.check_rounded, - onPressed: () => Navigator.of(context) - .popUntil((r) => r.isFirst), - ), - const SizedBox(height: AppSpacing.lg), - ], + ), ), ), - ), - ], - ), + RFBottomBar( + child: GlowButton( + label: 'Done', + icon: Icons.check_rounded, + onPressed: () => + Navigator.of(context).popUntil((r) => r.isFirst), + ), + ), + ], + ), + ], ), ); } @@ -139,10 +160,7 @@ class WorkoutSummaryScreen extends StatelessWidget { const SizedBox(height: 4), Text( dateStr, - style: const TextStyle( - color: AppColors.textMuted, - fontSize: 13, - ), + style: const TextStyle(color: AppColors.textMuted, fontSize: 13), ), ], ); @@ -208,7 +226,7 @@ class WorkoutSummaryScreen extends StatelessWidget { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - const RFSectionHeader('New Personal Records'), + const RFSectionHeader('New personal records'), const SizedBox(height: AppSpacing.sm), ...prs.map((pr) { final name = provider.getExerciseName(pr.exerciseId); @@ -271,34 +289,36 @@ class WorkoutSummaryScreen extends StatelessWidget { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - const RFSectionHeader('Muscles Trained'), + const RFSectionHeader('Muscles trained'), const SizedBox(height: AppSpacing.sm), Wrap( spacing: 6, runSpacing: 6, children: muscles.map((m) { final name = provider.getMuscleGroupName(m); - return RFChip( - label: name, - color: AppColors.muscle(m), - ); + return RFChip(label: name, color: AppColors.muscle(m)); }).toList(), ), ], ); } - Widget _buildExerciseSummary( - WorkoutSession session, - WorkoutProvider provider, - ) { + Widget _buildExerciseSummary({ + required WorkoutSession session, + required WorkoutProvider provider, + required SettingsProvider settings, + }) { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - const RFSectionHeader('Exercise Breakdown'), + const RFSectionHeader('Exercise breakdown'), const SizedBox(height: AppSpacing.sm), ...session.exercises.map( - (log) => _ExerciseSummaryRow(log: log, provider: provider), + (log) => _ExerciseSummaryRow( + log: log, + provider: provider, + settings: settings, + ), ), ], ); @@ -309,15 +329,18 @@ class _ExerciseSummaryRow extends StatelessWidget { const _ExerciseSummaryRow({ required this.log, required this.provider, + required this.settings, }); final ExerciseLog log; final WorkoutProvider provider; + final SettingsProvider settings; @override Widget build(BuildContext context) { final name = provider.getExerciseName(log.exerciseId); - final volume = log.totalVolume; + // Converted like every other figure here; this row used to print raw kg. + final volume = settings.toDisplay(log.totalVolume); final volStr = volume >= 1000 ? '${(volume / 1000).toStringAsFixed(1)}k' : volume.toStringAsFixed(0); @@ -356,7 +379,7 @@ class _ExerciseSummaryRow extends StatelessWidget { ), ), Text( - '$volStr kg', + '$volStr ${settings.unitLabel}', style: const TextStyle( color: AppColors.success, fontSize: 13, @@ -368,3 +391,69 @@ class _ExerciseSummaryRow extends StatelessWidget { ); } } + +/// Optional once-per-workout effort chip — "how did that feel?" — used only +/// to calibrate [EffortEstimator]'s RPE anchor. Never required: skipping it +/// leaves the rolling calibration offset unchanged. +class _EffortChipRow extends StatefulWidget { + const _EffortChipRow({required this.session}); + + final WorkoutSession session; + + @override + State<_EffortChipRow> createState() => _EffortChipRowState(); +} + +class _EffortChipRowState extends State<_EffortChipRow> { + static const _options = [ + (value: 1, label: 'Easy', color: AppColors.success), + (value: 2, label: 'Solid', color: AppColors.secondary), + (value: 3, label: 'Brutal', color: AppColors.accent), + ]; + + late int? _selected = widget.session.sessionEffort; + + Future _select(int value) async { + final previous = _selected; + setState(() => _selected = value); + try { + await context.read().recordSessionEffort( + widget.session.id, + value, + ); + } catch (e, st) { + // Don't leave the chip showing a value that was never persisted. + debugPrint('Failed to record session effort: $e\n$st'); + if (mounted) setState(() => _selected = previous); + } + } + + @override + Widget build(BuildContext context) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const RFSectionHeader('How did that feel?'), + const SizedBox(height: AppSpacing.sm), + Row( + children: [ + for (final option in _options) ...[ + Expanded(child: _buildChip(option)), + if (option != _options.last) const SizedBox(width: AppSpacing.sm), + ], + ], + ), + ], + ); + } + + Widget _buildChip(({int value, String label, Color color}) option) { + return RFOptionChip( + label: option.label, + color: option.color, + selected: _selected == option.value, + inMutuallyExclusiveGroup: true, + onTap: () => _select(option.value), + ); + } +} diff --git a/workout-logger/lib/services/ai/coach_tool_service.dart b/workout-logger/lib/services/ai/coach_tool_service.dart index c43c384..3de98f9 100644 --- a/workout-logger/lib/services/ai/coach_tool_service.dart +++ b/workout-logger/lib/services/ai/coach_tool_service.dart @@ -5,11 +5,16 @@ // query methods on WorkoutProvider / PRManager — no new analytics logic lives // here, only the schema + arg parsing + JSON shaping. +import 'dart:math' as math; + import 'package:google_generative_ai/google_generative_ai.dart'; import '../../models/models.dart'; +import '../../models/sleep_hr_models.dart'; import '../workout_provider.dart'; import '../managers/pr_manager.dart'; +import '../managers/health_history_manager.dart'; +import 'sql_query_service.dart'; class AmbiguousMatchException implements Exception { const AmbiguousMatchException(this.candidates); @@ -19,8 +24,18 @@ class AmbiguousMatchException implements Exception { class CoachToolService { final WorkoutProvider _wp; final PRManager _pr; + final HealthHistoryManager? _hh; + final SqlQueryService? _sql; - CoachToolService(this._wp, this._pr); + CoachToolService({ + required WorkoutProvider workoutProvider, + required PRManager prManager, + HealthHistoryManager? healthHistory, + SqlQueryService? sqlQuery, + }) : _wp = workoutProvider, + _pr = prManager, + _hh = healthHistory, + _sql = sqlQuery; /// Tool declaration for the optimizer screen's `ask_user_questions` flow. /// NOT included in the coach's tool list — only the optimizer adds it. @@ -70,6 +85,30 @@ class CoachToolService { /// Tool declarations advertised to the model. List buildTools() => [ Tool(functionDeclarations: [ + FunctionDeclaration( + 'get_muscle_group_volume', + 'Get volume history over time for one or multiple muscle groups ' + '(e.g. ["Biceps", "Triceps"] or ["Chest", "Back"]). Returns dates, ' + 'per-muscle volume series over time, and totals. Use for muscle ' + 'comparisons (like "biceps vs triceps graph") or muscle volume ' + 'distribution breakdown.', + Schema.object( + properties: { + 'muscle_groups': Schema.array( + items: Schema.string(), + description: + 'List of muscle group names, e.g. ["Biceps", "Triceps"] or ' + '["Chest", "Back", "Legs"].', + ), + 'days': Schema.integer( + description: + 'Optional. Number of days to look back (defaults to 60).', + nullable: true, + ), + }, + requiredProperties: ['muscle_groups'], + ), + ), FunctionDeclaration( 'get_exercise_performance', 'Get how a specific exercise has progressed: per-session volume ' @@ -273,13 +312,127 @@ class CoachToolService { requiredProperties: ['name', 'category', 'primary_muscle'], ), ), + FunctionDeclaration( + 'get_health_metrics', + 'Fetch historical sleep sessions and sleep stage breakdown (deep, REM, ' + 'light, awake minutes) over the last N days. Use for sleep & ' + 'recovery queries.', + Schema.object( + properties: { + 'days': Schema.integer( + description: 'Optional. Number of days to look back (defaults to 30).', + nullable: true, + ), + }, + ), + ), + FunctionDeclaration( + 'analyze_health_workout_correlation', + 'Run an analytical statistical pipeline calculating Mean (µ), Standard Deviation (σ), ' + 'Pearson Correlation Coefficient (r), and linear regression (y = mx + b) between a health metric ' + '(sleep_hours, deep_sleep_min) and a workout metric ' + '(workout_volume, session_duration, exercise_max_weight). Returns analytical stats ' + 'and paired coordinates ready to visualize.', + Schema.object( + properties: { + 'x_metric': Schema.string( + description: 'Health metric, e.g. "sleep_hours", "deep_sleep_min".', + ), + 'y_metric': Schema.string( + description: 'Workout metric, e.g. "workout_volume", "session_duration", "exercise_max_weight".', + ), + 'exercise_name': Schema.string( + description: 'Optional. Specific exercise name if y_metric is "exercise_max_weight".', + nullable: true, + ), + 'days': Schema.integer( + description: 'Optional. Number of days to consider (defaults to 60).', + nullable: true, + ), + }, + requiredProperties: ['x_metric', 'y_metric'], + ), + ), + FunctionDeclaration( + 'get_sleeping_hr_analytics', + 'Fetch and compute sleeping heart rate statistics over the past N days (e.g. 14 days). ' + 'Returns overnight p5 (5th percentile sleeping HR floor), p25, median, p75, p95, mean, min, max, ' + 'standard deviation (stdev), variance, linear trend (slope/direction), and nightly ' + 'time-series data as labels + series ready to chart. ' + 'Use whenever the user asks to analyze sleeping HR, overnight HR variation, or recovery trends.', + Schema.object( + properties: { + 'days': Schema.integer( + description: 'Optional. Number of days to analyze (defaults to 14).', + nullable: true, + ), + }, + ), + ), + if (_sql != null) _runSqlQueryDeclaration, ]), ]; + /// Schema-aware declaration for run_sql_query — only included when a + /// SqlQueryService is wired (i.e. the app has cut over to SQLite). + FunctionDeclaration get _runSqlQueryDeclaration => FunctionDeclaration( + 'run_sql_query', + 'Run a read-only SQL SELECT query directly against the workout database ' + 'for questions the other tools cannot answer (custom joins, filters, ' + 'or aggregations). Tables:\n' + 'sessions(id, date, routine_id, duration_min, notes, hc_synced_at)\n' + 'exercise_logs(id, session_id, exercise_id, notes, handle)\n' + 'sets(id, exercise_log_id, weight, reps, is_dropset, drops_json, ' + 'time_taken, timestamp, assist_weight, extra_weight, handle)\n' + 'exercises(id, name, category, is_custom, available_handles) — custom ' + 'exercises only; built-ins are not stored here\n' + 'muscle_groups(id, name, growth_rate, last_updated)\n' + 'exercise_muscle_activations(exercise_id, muscle_group_id, activation_percentage)\n' + 'routines(id, name, created_at)\n' + 'routine_exercises(routine_id, exercise_id, position)\n' + 'targets(id, exercise_id, target_type, target_value, current_value, ' + 'estimated_completion_date, created_at, is_completed)\n' + 'personal_records(exercise_id, best_weight, best_reps, best_volume, achieved_at)\n' + 'health_samples(id, type, timestamp, utc_ts, value) — type is ' + 'heart_rate | resting_heart_rate | hrv_rmssd; one row per Health ' + 'Connect sample. Join on timestamp (local wall-clock, same clock as ' + 'workout_sessions.date); utc_ts is the UTC instant, for ordering ' + 'and de-duplication only\n' + 'sleep_sessions(id, start_ts, end_ts, light_min, deep_min, rem_min, ' + 'awake_min) — one row per night; start_ts/end_ts are local ' + 'wall-clock, id is the UTC start instant\n' + 'sleep_stage_intervals(sleep_session_id, start_ts, end_ts, stage) — ' + 'stage is deep | rem | light | awake\n' + 'When joining tables, select explicit columns with aliases (e.g. s.id AS ' + 'session_id, l.id AS log_id) instead of SELECT *, since duplicate column ' + 'names across joined tables will silently collide.\n' + 'Only SELECT/WITH statements are allowed, one statement per call.', + Schema.object( + properties: { + 'query': Schema.string( + description: 'A single read-only SQL SELECT statement.', + ), + 'limit': Schema.integer( + description: 'Optional. Max rows to return (default 200, max 500).', + nullable: true, + ), + }, + requiredProperties: ['query'], + ), + ); + /// Dispatch a model function call to the matching query and return a /// JSON-serializable result map. Future> handleCall(FunctionCall call) async { switch (call.name) { + case 'get_sleeping_hr_analytics': + return await _getSleepingHrAnalytics(call.args); + case 'get_health_metrics': + return await _getHealthMetrics(call.args); + case 'analyze_health_workout_correlation': + return await _analyzeHealthWorkoutCorrelation(call.args); + case 'get_muscle_group_volume': + return _muscleGroupVolume(call.args); case 'get_exercise_performance': return _exercisePerformance(call.args); case 'get_workouts_in_range': @@ -300,6 +453,13 @@ class CoachToolService { return await _updateRoutine(call.args); case 'add_custom_exercise': return await _addCustomExercise(call.args); + case 'run_sql_query': + final sql = _sql; + if (sql == null) return {'error': 'SQL query tool is not available.'}; + return await sql.runQuery( + (call.args['query'] as String?) ?? '', + limit: (call.args['limit'] as num?)?.toInt(), + ); default: return {'error': 'Unknown tool: ${call.name}'}; } @@ -307,14 +467,403 @@ class CoachToolService { // ── Tool implementations ─────────────────────────────────────────────────── + Future> _getSleepingHrAnalytics( + Map args) async { + final hh = _hh; + if (hh == null) { + return { + 'error': + 'Health Connect integration is not active or HealthHistoryManager unavailable.' + }; + } + + // Clamp before the per-day loop below — an unbounded model-supplied value + // (e.g. `days: 99999`) would otherwise fan out into a huge number of + // sequential hh.sleepNight() lookups. + final days = _limitArg(args, 14, key: 'days', max: 60); + final now = DateTime.now(); + final dailyStats = >[]; + final p5List = []; + final p25List = []; + final meanList = []; + final labels = []; + + for (var i = days - 1; i >= 0; i--) { + final morning = now.subtract(Duration(days: i)); + final dateStr = _d(morning); + final snap = await hh.sleepNight(morning); + + if (snap != null) { + final p5 = snap.p5Bpm.toDouble(); + final p95 = snap.p95Bpm.toDouble(); + + double meanBpm = 0; + double stdevBpm = 0; + double varianceBpm = 0; + double p25Bpm = p5; + + if (snap.segments.isNotEmpty) { + final avgs = snap.segments.map((s) => s.avgBpm).toList()..sort(); + meanBpm = avgs.reduce((a, b) => a + b) / avgs.length; + p25Bpm = avgs[(avgs.length * 0.25).floor().clamp(0, avgs.length - 1)]; + + final varSum = + avgs.fold(0.0, (sum, x) => sum + (x - meanBpm) * (x - meanBpm)); + varianceBpm = varSum / avgs.length; + stdevBpm = math.sqrt(varianceBpm); + } else { + meanBpm = (p5 + p95) / 2.0; + } + + p5List.add(p5); + p25List.add(_round(p25Bpm)); + meanList.add(_round(meanBpm)); + labels.add('${morning.month}/${morning.day}'); + + dailyStats.add({ + 'date': dateStr, + 'p5_bpm': snap.p5Bpm, + 'p25_bpm': _round(p25Bpm), + 'mean_bpm': _round(meanBpm), + 'p95_bpm': snap.p95Bpm, + 'stdev': _round(stdevBpm), + 'variance': _round(varianceBpm), + 'segment_count': snap.segments.length, + }); + } + } + + if (p5List.isEmpty) { + return { + 'error': 'No sleeping heart rate records found in the last $days days.' + }; + } + + final p5Mean = p5List.reduce((a, b) => a + b) / p5List.length; + final p5VarSum = + p5List.fold(0.0, (sum, x) => sum + (x - p5Mean) * (x - p5Mean)); + final p5Variance = p5VarSum / p5List.length; + final p5Stdev = math.sqrt(p5Variance); + + double slope = 0.0; + if (p5List.length > 1) { + final n = p5List.length; + double sumX = 0, sumY = 0, sumXY = 0, sumXX = 0; + for (var i = 0; i < n; i++) { + sumX += i; + sumY += p5List[i]; + sumXY += i * p5List[i]; + sumXX += i * i; + } + final denom = n * sumXX - sumX * sumX; + if (denom != 0) { + slope = (n * sumXY - sumX * sumY) / denom; + } + } + + final trendDirection = + slope < -0.1 ? 'improving' : (slope > 0.1 ? 'elevated' : 'stable'); + + return { + 'days_analyzed': days, + 'valid_nights_count': p5List.length, + 'overall_summary': { + 'mean_p5_sleeping_hr': _round(p5Mean), + 'stdev_p5_sleeping_hr': _round(p5Stdev), + 'variance_p5_sleeping_hr': _round(p5Variance), + 'min_p5_sleeping_hr': p5List.reduce(math.min), + 'max_p5_sleeping_hr': p5List.reduce(math.max), + 'linear_trend_slope': _round(slope), + 'trend_direction': trendDirection, + }, + 'daily_breakdown': dailyStats, + // Domain-neutral series the model can shape into any component. The tool + // layer deliberately does not name A2UI components: presentation is the + // prompt's decision, not the data layer's. + 'labels': labels, + 'series': [ + {'name': 'P5 Sleeping HR', 'values': p5List}, + {'name': 'P25 HR', 'values': p25List}, + {'name': 'Mean HR', 'values': meanList}, + ], + }; + } + + Future> _getHealthMetrics(Map args) async { + final hh = _hh; + if (hh == null) { + return {'error': 'Health Connect integration is not active or HealthHistoryManager unavailable.'}; + } + final days = _limitArg(args, 30, key: 'days', max: 31); + final now = DateTime.now(); + // Week granularity only covers the last 7 days; anything wider needs the + // month bucket. Both return per-night bars, so trim to the exact window. + final granularity = + days <= 7 ? HealthGranularity.week : HealthGranularity.month; + final allBars = await hh.sleepBars(now, granularity); + final bars = + allBars.length > days ? allBars.sublist(allBars.length - days) : allBars; + + return { + 'days': days, + 'sleep_records': [ + for (final b in bars) + { + 'date': _d(b.date), + 'total_hours': _round(b.totalMinutes / 60.0), + 'deep_min': b.deepMin, + 'rem_min': b.remMin, + 'light_min': b.lightMin, + 'awake_min': b.awakeMin, + } + ], + }; + } + + Future> _analyzeHealthWorkoutCorrelation( + Map args) async { + final xMetric = (args['x_metric'] as String?)?.trim() ?? 'sleep_hours'; + final yMetric = (args['y_metric'] as String?)?.trim() ?? 'workout_volume'; + final exName = (args['exercise_name'] as String?)?.trim(); + final days = _limitArg(args, 60, key: 'days', max: 365); + + final now = DateTime.now(); + final cutoff = now.subtract(Duration(days: days)); + final sessions = _wp.sessions.where((s) => !s.date.isBefore(cutoff)).toList(); + + if (sessions.isEmpty) { + return {'error': 'No workout sessions logged in the last $days days.'}; + } + + final dayData = >{}; + + for (final s in sessions) { + final key = _d(s.date); + final m = dayData.putIfAbsent(key, () => {}); + + if (yMetric == 'workout_volume') { + var vol = 0.0; + for (final exLog in s.exercises) { + for (final set in exLog.sets) { + vol += (set.weight * set.reps); + } + } + m['y'] = vol; + } else if (yMetric == 'session_duration') { + m['y'] = s.duration.toDouble(); + } else if (yMetric == 'exercise_max_weight' && exName != null) { + var maxW = 0.0; + final ex = _resolveExercise(exName); + if (ex != null) { + for (final exLog in s.exercises.where((e) => e.exerciseId == ex.id)) { + for (final set in exLog.sets) { + if (set.weight > maxW) maxW = set.weight; + } + } + } + if (maxW > 0) m['y'] = maxW; + } + } + + final hh = _hh; + if (hh != null) { + // sleepBars(anchor, month) covers only the anchor's calendar month, so a + // single call would drop every workout day before the 1st of this month + // — the default window is 60 days. Walk each month the window touches + // and merge the daily bars. Year granularity is not an option here: it + // returns 12 monthly averages, not one bar per night. + final lastMonth = DateTime(now.year, now.month, 1); + final bars = []; + for (var m = DateTime(cutoff.year, cutoff.month, 1); + !m.isAfter(lastMonth); + m = DateTime(m.year, m.month + 1, 1)) { + bars.addAll(await hh.sleepBars(m, HealthGranularity.month)); + } + for (final b in bars) { + final key = _d(b.date); + final m = dayData[key]; + if (m != null) { + if (xMetric == 'sleep_hours') { + m['x'] = _round(b.totalMinutes / 60.0); + } else if (xMetric == 'deep_sleep_min') { + m['x'] = b.deepMin.toDouble(); + } + } + } + } + + final points = >[]; + final xVals = []; + final yVals = []; + + for (final entry in dayData.entries) { + final x = entry.value['x']; + final y = entry.value['y']; + if (x != null && y != null && x > 0 && y > 0) { + xVals.add(x); + yVals.add(y); + points.add({'x': x, 'y': y, 'date': entry.key}); + } + } + + final n = xVals.length; + if (n < 2) { + return {'error': 'Insufficient paired data points for correlation analysis.'}; + } + + final xMean = xVals.reduce((a, b) => a + b) / n; + final yMean = yVals.reduce((a, b) => a + b) / n; + + var xVarSum = 0.0, yVarSum = 0.0, covSum = 0.0; + for (var i = 0; i < n; i++) { + final dx = xVals[i] - xMean; + final dy = yVals[i] - yMean; + xVarSum += dx * dx; + yVarSum += dy * dy; + covSum += dx * dy; + } + + final xStd = n > 1 ? math.sqrt(xVarSum / (n - 1)) : 0.0; + final yStd = n > 1 ? math.sqrt(yVarSum / (n - 1)) : 0.0; + final r = (xVarSum > 0 && yVarSum > 0) ? (covSum / math.sqrt(xVarSum * yVarSum)) : 0.0; + + final slope = xVarSum > 0 ? (covSum / xVarSum) : 0.0; + final intercept = yMean - (slope * xMean); + + String corrType; + if (r >= 0.7) { + corrType = 'strong_positive'; + } else if (r >= 0.3) { + corrType = 'moderate_positive'; + } else if (r <= -0.7) { + corrType = 'strong_negative'; + } else if (r <= -0.3) { + corrType = 'moderate_negative'; + } else { + corrType = 'neutral'; + } + + return { + 'pipeline': 'Health & Workout Statistical Correlation', + 'sample_count': n, + 'x_metric': xMetric, + 'x_mean': _round(xMean), + 'x_std_dev': _round(xStd), + 'y_metric': yMetric, + 'y_mean': _round(yMean), + 'y_std_dev': _round(yStd), + 'pearson_r': _round(r), + 'correlation_type': corrType, + 'trendline': { + 'slope': _round(slope), + 'intercept': _round(intercept), + }, + 'points': points, + }; + } + + Map _muscleGroupVolume(Map args) { + final rawGroups = (args['muscle_groups'] as List?)?.cast() ?? []; + final days = _limitArg(args, 60, key: 'days', max: 365); + final cutoff = DateTime.now().subtract(Duration(days: days)); + + final allExercises = _wp.allExercises; + final allSessions = _wp.sessions + .where((s) => !s.date.isBefore(cutoff)) + .toList() + ..sort((a, b) => a.date.compareTo(b.date)); + + final dateMap = >{}; + final muscleTotals = {}; + + for (final groupName in rawGroups) { + muscleTotals[groupName] = 0.0; + + // Resolve the requested display name to its muscle group ID first — + // `Exercise.primaryMuscle` is itself an ID (e.g. "quads"), not a + // display name, so comparing it against the raw group name via + // substring matching is unreliable (false misses for e.g. "Quadriceps" + // vs id "quads", false matches for unrelated short ids). Matching by + // resolved ID also lets us include secondary muscle activations, not + // just each exercise's primary one. + MuscleGroup? resolvedGroup; + try { + resolvedGroup = _resolveMuscleGroup(groupName); + } on AmbiguousMatchException { + resolvedGroup = null; + } + if (resolvedGroup == null) continue; + final targetId = resolvedGroup.id; + + final matchingExerciseIds = allExercises + .where((e) => e.muscleActivations.any((m) => m.muscleGroupId == targetId)) + .map((e) => e.id) + .toSet(); + + for (final session in allSessions) { + final dateKey = _d(session.date); + var groupVol = 0.0; + for (final exLog in session.exercises) { + if (matchingExerciseIds.contains(exLog.exerciseId)) { + for (final set in exLog.sets) { + groupVol += (set.weight * set.reps); + } + } + } + if (groupVol > 0) { + dateMap.putIfAbsent(dateKey, () => {})[groupName] = + (dateMap[dateKey]?[groupName] ?? 0.0) + groupVol; + muscleTotals[groupName] = (muscleTotals[groupName] ?? 0) + groupVol; + } + } + } + + final dates = dateMap.keys.toList()..sort(); + final series = >[]; + for (final groupName in rawGroups) { + final values = []; + for (final d in dates) { + values.add(_round(dateMap[d]?[groupName] ?? 0.0)); + } + series.add({ + 'name': groupName, + 'values': values, + }); + } + + return { + 'dates': dates, + 'labels': dates.map((d) => d.length > 5 ? d.substring(5) : d).toList(), + 'series': series, + 'totals': { + for (final entry in muscleTotals.entries) + entry.key: _round(entry.value), + }, + }; + } + Map _exercisePerformance(Map args) { final name = (args['exercise_name'] as String?)?.trim() ?? ''; + final days = (args['days'] as num?)?.toInt(); + final Exercise exercise; try { final resolved = _resolveExercise(name); if (resolved == null) { + // Fallback: check if the prompt queried a muscle group (e.g., "biceps", "triceps") + final muscleRes = _muscleGroupVolume({'muscle_groups': [name], 'days': days ?? 60}); + final series = (muscleRes['series'] as List?) ?? []; + if (series.isNotEmpty && (series[0]['values'] as List).isNotEmpty) { + return { + 'is_muscle_group': true, + 'muscle_group': name, + 'labels': muscleRes['labels'], + 'series': series, + 'totals': muscleRes['totals'], + }; + } return { - 'error': 'No exercise found matching "$name".', + 'error': 'No exercise or muscle group found matching "$name".', 'available_examples': _exampleExerciseNames(), }; } @@ -326,7 +875,6 @@ class CoachToolService { }; } - final days = (args['days'] as num?)?.toInt(); final cutoff = days != null ? DateTime.now().subtract(Duration(days: days)) : null; @@ -863,10 +1411,13 @@ class CoachToolService { double _round(double v) => (v * 10).round() / 10; double? _roundOrNull(double? v) => v == null ? null : _round(v); - /// Read an optional `limit` arg, clamped to [1, 40]; [fallback] when absent. - int _limitArg(Map args, int fallback) { - final n = (args['limit'] as num?)?.toInt(); + /// Read an optional numeric arg (defaults to the `limit` key), clamped to + /// [1, max]; [fallback] when absent. Reused by any tool that accepts a + /// model-supplied bound (e.g. `limit`, `days`) to prevent runaway loops. + int _limitArg(Map args, int fallback, + {String key = 'limit', int max = 40}) { + final n = (args[key] as num?)?.toInt(); if (n == null) return fallback; - return n.clamp(1, 40); + return n.clamp(1, max); } } diff --git a/workout-logger/lib/services/ai/gemini_ai_service.dart b/workout-logger/lib/services/ai/gemini_ai_service.dart index de8729c..b4acd65 100644 --- a/workout-logger/lib/services/ai/gemini_ai_service.dart +++ b/workout-logger/lib/services/ai/gemini_ai_service.dart @@ -24,19 +24,56 @@ import '../interfaces/storage_service_interface.dart'; // Ordered list of available Gemini models shown in the picker. const kGeminiModels = [ ('gemini-2.5-flash', 'Gemini 2.5 Flash'), - ('gemini-2.5-flash-lite', 'Gemini 2.5 Flash Lite'), ('gemini-3.1-flash-lite', 'Gemini 3.1 Flash Lite'), + ('gemini-3.5-flash-lite', 'Gemini 3.5 Flash Lite'), ('gemini-3.5-flash', 'Gemini 3.5 Flash'), + ('gemini-3.6-flash', 'Gemini 3.6 Flash'), + ('gemini-3.7-flash', 'Gemini 3.7 Flash'), ]; +// Ordered fastest/cheapest → most thorough. Matches the Gemini API's own +// thinkingLevel scale (gemini-2.x models don't use this — see +// supportedThinkingLevels). +const kThinkingLevels = ['minimal', 'low', 'medium', 'high']; + +// Fastest level available on the default model. +const kDefaultThinkingLevel = 'minimal'; + +/// Thinking levels [model] accepts, in kThinkingLevels order. Empty for +/// gemini-2.x models, which use the older thinkingBudget shape and don't +/// support thinkingLevel at all. gemini-3.7-flash is the first 3.x model +/// that doesn't support 'minimal' — sending it returns an API error. +List supportedThinkingLevels(String model) { + if (model.startsWith('gemini-2')) return const []; + if (model == 'gemini-3.7-flash') return const ['low', 'medium', 'high']; + return kThinkingLevels; +} + +/// Snaps [level] to a value [model] actually supports, falling back to the +/// model's fastest supported level if [level] isn't valid for it. Returns +/// [level] unchanged for models with no thinkingLevel support at all. +String clampThinkingLevel(String model, String level) { + final supported = supportedThinkingLevels(model); + if (supported.isEmpty || supported.contains(level)) return level; + return supported.first; +} + // Default to the latest GA model. -const kDefaultGeminiModel = 'gemini-3.5-flash'; +const kDefaultGeminiModel = 'gemini-3.6-flash'; -// Upper bound on tool-resolution rounds per user turn, to bound runaway loops. -const int _kMaxToolRounds = 5; +// Default/minimum/maximum upper bound on tool-resolution rounds per user +// turn, to bound runaway loops. User-configurable via Profile → AI Features. +const int kDefaultMaxToolRounds = 5; +const int kMinMaxToolRounds = 3; +const int kMaxMaxToolRounds = 25; // Retry policy for transient (5xx / 429) errors. Total attempts = 1 + retries. -const int _kMaxRetries = 2; +const int _kMaxRetries = 3; + +// When the server supplies an explicit retryDelay, honor it up to this many +// attempts even past _kMaxRetries — a server-specified delay is more likely +// to actually resolve the transient error than our own backoff schedule. +const int _kMaxRetriesWithServerDelay = 4; const String _apiBase = 'https://generativelanguage.googleapis.com/v1beta/models'; @@ -49,6 +86,68 @@ bool _isRetryableStatus(int code) => code == 429 || (code >= 500 && code < 600); Duration _retryBackoff(int attempt) => Duration(milliseconds: 500 * (1 << attempt)); +/// Extracts exact retryDelay provided by Google in 429/503 payloads. +/// Checks error.details (google.rpc.RetryInfo) or error.message ("Please retry in Xs"). +Duration? _extractRetryDelay(String body) { + try { + final decoded = jsonDecode(body); + if (decoded is Map && decoded['error'] is Map) { + final errMap = decoded['error'] as Map; + // 1. Check error.details for google.rpc.RetryInfo + final details = errMap['details']; + if (details is List) { + for (final item in details) { + if (item is Map && item['retryDelay'] is String) { + final delayStr = (item['retryDelay'] as String).replaceAll('s', '').trim(); + final seconds = double.tryParse(delayStr); + if (seconds != null && seconds > 0) { + final ms = (seconds * 1000).ceil() + 350; + return Duration(milliseconds: ms.clamp(500, 45000)); + } + } + } + } + // 2. Regex match in error.message (e.g. "Please retry in 23.690750876s.") + final message = errMap['message']; + if (message is String) { + final match = RegExp(r'retry in\s+([\d.]+)\s*s', caseSensitive: false).firstMatch(message); + if (match != null) { + final seconds = double.tryParse(match.group(1)!); + if (seconds != null && seconds > 0) { + final ms = (seconds * 1000).ceil() + 350; + return Duration(milliseconds: ms.clamp(500, 45000)); + } + } + } + } + } catch (_) {} + return null; +} + +// Deliberately narrow: only match identifiers Gemini uses for DAILY-scale +// quota metrics. Generic markers like "QuotaExceeded"/"RESOURCE_EXHAUSTED" +// also fire for per-minute rate limits, which should fall through to the +// normal retry-with-delay handling instead of triggering a model fallback. +bool _isDailyQuotaExhausted(String body) { + return body.contains('GenerateRequestsPerDay') || + body.contains('free_tier_requests'); +} + +String? getFallbackModel(String currentModel) { + switch (currentModel) { + case 'gemini-3.7-flash': + return 'gemini-3.6-flash'; + case 'gemini-3.6-flash': + return 'gemini-3.5-flash'; + case 'gemini-3.5-flash': + return 'gemini-3.5-flash-lite'; + case 'gemini-3.5-flash-lite': + return 'gemini-2.5-flash'; + default: + return null; + } +} + // Gemini error bodies look like {"error":{"code":503,"message":"…","status":"…"}}. // Surface just the human-readable message rather than the whole JSON blob. String _errorMessage(int code, String body) { @@ -74,6 +173,8 @@ class GeminiAiService extends ChangeNotifier implements IAiService { String _apiKey = ''; String _model = kDefaultGeminiModel; + int _maxToolRounds = kDefaultMaxToolRounds; + String _thinkingLevel = kDefaultThinkingLevel; // Cumulative token usage across all AI calls (persisted). int _promptTokens = 0; @@ -87,6 +188,13 @@ class GeminiAiService extends ChangeNotifier implements IAiService { @override String get currentModel => _model; + /// Upper bound on tool-resolution rounds per user turn. + int get maxToolRounds => _maxToolRounds; + + /// Current thinkingLevel sent with 3.x requests. Always valid for + /// [currentModel] — see [clampThinkingLevel]. + String get thinkingLevel => _thinkingLevel; + /// Cumulative input (prompt) tokens billed across all AI calls. int get promptTokensUsed => _promptTokens; @@ -99,9 +207,15 @@ class GeminiAiService extends ChangeNotifier implements IAiService { /// Number of AI requests recorded. int get aiRequestCount => _requestCount; - void init(String apiKey, {String model = kDefaultGeminiModel}) { + void init(String apiKey, { + String model = kDefaultGeminiModel, + int maxToolRounds = kDefaultMaxToolRounds, + String thinkingLevel = kDefaultThinkingLevel, + }) { _apiKey = apiKey.trim(); _model = model; + _maxToolRounds = maxToolRounds.clamp(kMinMaxToolRounds, kMaxMaxToolRounds); + _thinkingLevel = clampThinkingLevel(_model, thinkingLevel); } /// Load persisted cumulative token usage (call once at startup). @@ -175,6 +289,17 @@ class GeminiAiService extends ChangeNotifier implements IAiService { void updateModel(String model) { _model = model; + _thinkingLevel = clampThinkingLevel(_model, _thinkingLevel); + notifyListeners(); + } + + void updateThinkingLevel(String level) { + _thinkingLevel = clampThinkingLevel(_model, level); + notifyListeners(); + } + + void updateMaxToolRounds(int rounds) { + _maxToolRounds = rounds.clamp(kMinMaxToolRounds, kMaxMaxToolRounds); notifyListeners(); } @@ -196,13 +321,25 @@ class GeminiAiService extends ChangeNotifier implements IAiService { }, if (tools != null) 'tools': tools.map((t) => t.toJson()).toList(), 'generationConfig': { - // Disable thinking tokens so SDK-incompatible thoughtSignature parts - // are never returned by Gemini 3.x models. - 'thinkingConfig': {'thinkingBudget': 0}, + 'thinkingConfig': _thinkingConfig, if (jsonMode) 'responseMimeType': 'application/json', }, }; + // Every gemini-2.x model predates the Gemini 3.x thinking-level enum and + // only understands the older thinkingBudget (integer token budget) shape; + // 3.x models take thinkingLevel (see kThinkingLevels). Matched by family, + // not the single 'gemini-2.5-flash' id, so a persisted legacy model id + // that isn't in kGeminiModels (e.g. from a since-removed picker entry) + // still gets the right shape instead of failing with no fallback. Since + // the daily quota fallback chain can land on either family mid-conversation, + // the config shape must match whichever model is currently selected. + // _thinkingLevel is kept clamped to _model everywhere it's set, so it's + // always a value _model actually accepts by the time this is read. + Map get _thinkingConfig => _model.startsWith('gemini-2') + ? {'thinkingBudget': 0} + : {'thinkingLevel': _thinkingLevel}; + // Extracts non-thought text strings from a candidate object. Iterable _textFromCandidate(Map candidate) sync* { final content = candidate['content'] as Map?; @@ -219,16 +356,15 @@ class GeminiAiService extends ChangeNotifier implements IAiService { // Streams parsed SSE chunks from the streamGenerateContent endpoint. Stream> _streamSse(Map body) async* { - final uri = Uri.parse( - '$_apiBase/$_model:streamGenerateContent?alt=sse&key=$_apiKey', - ); - // Establish the connection with retries. Retrying is only safe here — // before any bytes are yielded — so a transient 503 never reaches the user, // but a mid-stream failure is not retried (it would duplicate output). http.Client client = http.Client(); http.StreamedResponse streamed; for (var attempt = 0;; attempt++) { + final uri = Uri.parse( + '$_apiBase/$_model:streamGenerateContent?alt=sse&key=$_apiKey', + ); final request = http.Request('POST', uri) ..headers['Content-Type'] = 'application/json' ..body = jsonEncode(body); @@ -238,9 +374,31 @@ class GeminiAiService extends ChangeNotifier implements IAiService { break; } final err = await resp.stream.bytesToString(); - if (_isRetryableStatus(resp.statusCode) && attempt < _kMaxRetries) { + + // Automatically fallback to next model when daily free quota limit is reached. + if (_isDailyQuotaExhausted(err)) { + final fallback = getFallbackModel(_model); + if (fallback != null) { + _model = fallback; + _thinkingLevel = clampThinkingLevel(_model, _thinkingLevel); + // gemini-2.5-flash and the 3.x family use different thinkingConfig + // shapes (see _thinkingConfig) — rebuild it for the new model so the + // retried request isn't rejected for the previous model's shape. + (body['generationConfig'] as Map)['thinkingConfig'] = + _thinkingConfig; + notifyListeners(); + client.close(); + client = http.Client(); + continue; + } + } + + final customDelay = _extractRetryDelay(err); + if (_isRetryableStatus(resp.statusCode) && + (attempt < _kMaxRetries || (customDelay != null && attempt < _kMaxRetriesWithServerDelay))) { client.close(); - await Future.delayed(_retryBackoff(attempt)); + final delay = customDelay ?? _retryBackoff(attempt); + await Future.delayed(delay); client = http.Client(); continue; } @@ -280,19 +438,36 @@ class GeminiAiService extends ChangeNotifier implements IAiService { // Single-shot (non-streaming) generateContent call, with retry on 5xx/429. Future> _generate(Map body) async { - final uri = Uri.parse('$_apiBase/$_model:generateContent?key=$_apiKey'); - final payload = jsonEncode(body); for (var attempt = 0;; attempt++) { + final uri = Uri.parse('$_apiBase/$_model:generateContent?key=$_apiKey'); final response = await http.post( uri, headers: {'Content-Type': 'application/json'}, - body: payload, + body: jsonEncode(body), ); if (response.statusCode == 200) { return jsonDecode(response.body) as Map; } - if (_isRetryableStatus(response.statusCode) && attempt < _kMaxRetries) { - await Future.delayed(_retryBackoff(attempt)); + + if (_isDailyQuotaExhausted(response.body)) { + final fallback = getFallbackModel(_model); + if (fallback != null) { + _model = fallback; + _thinkingLevel = clampThinkingLevel(_model, _thinkingLevel); + // See the matching comment in _streamSse — the thinkingConfig shape + // must match whichever model this attempt is about to hit. + (body['generationConfig'] as Map)['thinkingConfig'] = + _thinkingConfig; + notifyListeners(); + continue; + } + } + + final customDelay = _extractRetryDelay(response.body); + if (_isRetryableStatus(response.statusCode) && + (attempt < _kMaxRetries || (customDelay != null && attempt < _kMaxRetriesWithServerDelay))) { + final delay = customDelay ?? _retryBackoff(attempt); + await Future.delayed(delay); continue; } throw Exception(_errorMessage(response.statusCode, response.body)); @@ -305,10 +480,23 @@ class GeminiAiService extends ChangeNotifier implements IAiService { return _textFromCandidate(candidates[0] as Map).join(); } - // ── Coach chat (streaming + optional tool-call loop) ─────────────────────── - // [history] is the prior conversation as alternating user/model Content. - // When [tools] + [onToolCall] are supplied, function calls the model emits - // are dispatched and their results fed back until a text answer is produced. + // ── Generic & domain chat (streaming + optional tool-call loop) ─────────── + @override + Stream streamChatReply({ + required String userMessage, + required String systemPrompt, + required List history, + List? tools, + Future> Function(FunctionCall call)? onToolCall, + }) => + streamCoachReply( + userMessage: userMessage, + systemPrompt: systemPrompt, + history: history, + tools: tools, + onToolCall: onToolCall, + ); + @override Stream streamCoachReply({ required String userMessage, @@ -328,7 +516,7 @@ class GeminiAiService extends ChangeNotifier implements IAiService { Content.text(userMessage).toJson(), ]; - for (var round = 0; round < _kMaxToolRounds; round++) { + for (var round = 0; round < _maxToolRounds; round++) { final body = _makeBody( contents: contents, system: systemPrompt, @@ -340,6 +528,11 @@ class GeminiAiService extends ChangeNotifier implements IAiService { // we echo this turn back to the API in the next round. final rawModelParts = >[]; final calls = []; + // Parallel to `calls` — the SDK's FunctionCall type has no `id` + // field, so ids are tracked alongside it and matched back up when + // building functionResponse parts (needed to correlate responses in + // multi-tool-call turns). + final callIds = []; Map? lastUsage; await for (final chunk in _streamSse(body)) { @@ -362,6 +555,7 @@ class GeminiAiService extends ChangeNotifier implements IAiService { (fc['args'] as Map? ?? {}) .cast(), )); + callIds.add(fc['id'] as String?); } } } @@ -379,40 +573,74 @@ class GeminiAiService extends ChangeNotifier implements IAiService { // Resolve every call and feed the results back as one function turn. final responseParts = >[]; - for (final call in calls) { + for (var i = 0; i < calls.length; i++) { + final call = calls[i]; + final id = callIds[i]; try { final result = await onToolCall(call); responseParts.add({ - 'functionResponse': {'name': call.name, 'response': result} + 'functionResponse': { + 'name': call.name, + 'id': ?id, + 'response': result, + } }); } catch (e) { responseParts.add({ 'functionResponse': { 'name': call.name, + 'id': ?id, 'response': {'error': '$e'} } }); } } - contents.add({'role': 'function', 'parts': responseParts}); + contents.add({'role': 'user', 'parts': responseParts}); } // Exhausted the tool-round budget without a final text answer. - yield '\n\n_(Stopped after $_kMaxToolRounds tool steps — try rephrasing.)_'; + yield '\n\n_(Stopped after $_maxToolRounds tool steps — try rephrasing.)_'; } catch (e) { yield 'Error: $e'; } } - // ── Program generator (structured JSON output) ──────────────────────────── + // ── Generic domain-agnostic structured JSON generator ─────────────────── @override - Future generateProgram({ + Future generateStructuredJson({ + required String systemPrompt, required String userPrompt, - required List allExercises, + required T Function(Map json) fromJson, }) async { if (!isConfigured) { throw StateError('Gemini API key not configured.'); } + try { + final data = await _generate( + _makeBody( + contents: [Content.text(userPrompt).toJson()], + system: systemPrompt, + jsonMode: true, + ), + ); + _recordRawUsage(data['usageMetadata'] as Map?); + final raw = _textFromResponse(data); + if (raw.isEmpty) throw const FormatException('Empty response from Gemini.'); + final map = jsonDecode(raw) as Map; + return fromJson(map); + } on FormatException catch (e) { + throw Exception('Could not parse JSON output: $e'); + } catch (e) { + throw Exception('Gemini API error: $e'); + } + } + + // ── Program generator (structured JSON output) ──────────────────────────── + @override + Future generateProgram({ + required String userPrompt, + required List allExercises, + }) async { final exerciseList = allExercises .map((e) => ' "${e.id}": "${e.name} [${e.primaryMuscle}]"') .join('\n'); @@ -469,29 +697,17 @@ Required JSON schema (follow exactly): final prompt = 'Available exercises (ID: name [primary muscle]):\n$exerciseList\n\nUser request: $userPrompt'; - try { - final data = await _generate( - _makeBody( - contents: [Content.text(prompt).toJson()], - system: systemPrompt, - jsonMode: true, - ), - ); - _recordRawUsage(data['usageMetadata'] as Map?); - final raw = _textFromResponse(data); - if (raw.isEmpty) throw const FormatException('Empty response from Gemini.'); - - final map = jsonDecode(raw) as Map; - // Ensure a fresh UUID so it never collides with an existing program. - map['id'] = const Uuid().v4(); - map['isImported'] = true; - map['author'] = 'AI Coach'; - return TrainingProgram.fromJson(map); - } on FormatException catch (e) { - throw Exception('Could not parse program JSON: $e'); - } catch (e) { - throw Exception('Gemini API error: $e'); - } + return generateStructuredJson( + systemPrompt: systemPrompt, + userPrompt: prompt, + fromJson: (map) { + // Ensure a fresh UUID so it never collides with an existing program. + map['id'] = const Uuid().v4(); + map['isImported'] = true; + map['author'] = 'AI Coach'; + return TrainingProgram.fromJson(map); + }, + ); } // ── Weekly insights (single-shot text) ──────────────────────────────────── diff --git a/workout-logger/lib/services/ai/sql_query_service.dart b/workout-logger/lib/services/ai/sql_query_service.dart new file mode 100644 index 0000000..cf018e8 --- /dev/null +++ b/workout-logger/lib/services/ai/sql_query_service.dart @@ -0,0 +1,109 @@ +// Executes model-submitted read-only SQL against a dedicated read-only +// connection to the app's live SQLite database. Used only by the coach's +// run_sql_query tool — never the app's own read/write connection. See +// docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md §7. + +import 'package:sqflite/sqflite.dart'; + +class SqlValidationException implements Exception { + SqlValidationException(this.message); + final String message; + + @override + String toString() => message; +} + +class SqlQueryService { + SqlQueryService(this.databasePath); + + final String databasePath; + + static const _forbiddenKeywords = [ + 'INSERT', + 'UPDATE', + 'DELETE', + 'DROP', + 'ALTER', + 'CREATE', + 'ATTACH', + 'DETACH', + 'PRAGMA', + 'VACUUM', + 'REPLACE', + 'TRIGGER', + ]; + + static const _forbiddenIdentifiers = [ + 'SETTINGS', + 'SQLITE_MASTER', + 'SQLITE_TEMP_MASTER', + 'SQLITE_SCHEMA', + 'SQLITE_TEMP_SCHEMA', + 'SQLITE_DBPAGE', + 'SQLITE_STAT1', + 'SQLITE_STAT2', + 'SQLITE_STAT3', + 'SQLITE_STAT4', + ]; + + String _sanitize(String rawQuery) { + var q = rawQuery.trim(); + if (q.endsWith(';')) { + q = q.substring(0, q.length - 1).trim(); + } + if (q.contains(';')) { + throw SqlValidationException('Only a single SQL statement is allowed.'); + } + final upper = q.toUpperCase(); + if (!(upper.startsWith('SELECT') || upper.startsWith('WITH'))) { + throw SqlValidationException('Only SELECT queries are allowed.'); + } + for (final kw in _forbiddenKeywords) { + if (RegExp('\\b$kw\\b').hasMatch(upper)) { + throw SqlValidationException('Query contains a forbidden keyword: $kw'); + } + } + for (final id in _forbiddenIdentifiers) { + if (RegExp('\\b$id\\b').hasMatch(upper)) { + throw SqlValidationException('Query references a restricted table: $id'); + } + } + if (upper.contains('PRAGMA_')) { + throw SqlValidationException('Query references a restricted table: PRAGMA_*'); + } + return q; + } + + /// Runs [rawQuery] read-only and returns {'row_count', 'rows'} on success + /// or {'error': message} on any validation or execution failure. Never + /// throws — callers (the coach tool loop) always get a JSON-safe result. + Future> runQuery(String rawQuery, {int? limit}) async { + final cappedLimit = (limit ?? 200).clamp(1, 500); + + final String safeQuery; + try { + safeQuery = _sanitize(rawQuery); + } on SqlValidationException catch (e) { + return {'error': e.message}; + } + + Database? db; + try { + // singleInstance: false is required here: sqflite's default open + // helper is keyed only by path (ignoring the readOnly flag), so an + // ordinary openReadOnlyDatabase() call against the same path as the + // app's live connection just returns that shared instance. Closing + // it below would then close the app's only database connection. + db = await openReadOnlyDatabase(databasePath, singleInstance: false); + final rows = await db.rawQuery( + 'SELECT * FROM (\n$safeQuery\n) LIMIT ?', + [cappedLimit], + ); + return {'row_count': rows.length, 'rows': rows}; + } catch (e) { + return {'error': 'Query failed: $e'}; + } finally { + await db?.close(); + } + } +} diff --git a/workout-logger/lib/services/gemini_context_builder.dart b/workout-logger/lib/services/gemini_context_builder.dart index 083ce5d..f3c340b 100644 --- a/workout-logger/lib/services/gemini_context_builder.dart +++ b/workout-logger/lib/services/gemini_context_builder.dart @@ -1,5 +1,6 @@ // gemini_context_builder.dart — Builds rich context strings from app data for Gemini prompts. +import '../genui/a2ui.dart'; import '../models/models.dart'; class GeminiContextBuilder { @@ -46,8 +47,37 @@ class GeminiContextBuilder { 'with add_custom_exercise first, then reference it by name.', ) ..writeln( - 'Weights are in $unitLabel. Format replies with Markdown (lists, bold, ' - 'tables) where it aids clarity.', + 'Weights are in $unitLabel. Format normal replies with Markdown (lists, ' + 'bold, tables) where it aids clarity.', + ) + ..writeln() + ..writeln( + 'When the user asks for a dashboard, chart, visual summary, KPI view, ' + 'health & recovery analysis, sleeping HR variation, statistical ' + 'correlation, or analytics panel: first call the relevant query or ' + 'analytics tools, then answer with an A2UI payload.', + ) + ..writeln() + ..writeln(buildA2UiPromptSection(defaultA2UiRegistry)) + ..writeln( + 'WHICH COMPONENT TO REACH FOR, given this app is a workout tracker: ' + '1) Sleeping HR analytics (e.g. "how is my sleeping hr varying over 14 ' + 'days") — call get_sleeping_hr_analytics, then a DynamicChart line plot ' + 'of the P5/P25/mean series alongside StatCards for mean, stdev, ' + 'variance and trend. ' + '2) Statistical correlations (e.g. "does sleep affect my bench press") ' + '— call analyze_health_workout_correlation, then a ScatterPlot. ' + '3) Recovery and holistic summaries — RadarChart for multi-axis ' + 'balance, MetricGauge for a single readiness score. ' + '4) Comparisons (e.g. "biceps vs triceps") — DynamicChart with multiple ' + 'series. ' + '5) Distributions and breakdowns — DynamicChart with type "pie". ' + '6) Records, recent sessions, top-N lists — DataListGroup.', + ) + ..writeln( + 'Vary the layout to suit the question and keep it scannable. If the ' + 'tools returned no usable data, say so in prose rather than rendering ' + 'an empty dashboard.', ); if (userName != null && userName.isNotEmpty) { diff --git a/workout-logger/lib/services/health_connect_service.dart b/workout-logger/lib/services/health_connect_service.dart index b278b66..cac965d 100644 --- a/workout-logger/lib/services/health_connect_service.dart +++ b/workout-logger/lib/services/health_connect_service.dart @@ -58,10 +58,24 @@ class HealthConnectService implements IHealthConnectService { 'leg_raises': ExerciseSegmentType.legRaise, }; + static const _statusDeadline = Duration(seconds: 5); + static const _queryDeadline = Duration(seconds: 10); + static const _hrQueryDeadline = Duration(seconds: 20); + + Future _getConnector() async { + try { + _connector ??= await HealthConnector.create().timeout(_statusDeadline); + return _connector; + } catch (e) { + debugPrint('[HC] _getConnector failed: $e'); + return null; + } + } + @override Future isAvailable() async { try { - final status = await HealthConnector.getHealthPlatformStatus(); + final status = await HealthConnector.getHealthPlatformStatus().timeout(_statusDeadline); debugPrint('[HC] isAvailable: platform status = $status'); return status == HealthPlatformStatus.available; } catch (e) { @@ -73,8 +87,9 @@ class HealthConnectService implements IHealthConnectService { @override Future requestPermissions() async { try { - _connector ??= await HealthConnector.create(); - final results = await _connector!.requestPermissions([ + final connector = await _getConnector(); + if (connector == null) return false; + final results = await connector.requestPermissions([ HealthDataType.exerciseSession.writePermission, HealthDataType.exerciseSession.readPermission, ]); @@ -88,10 +103,11 @@ class HealthConnectService implements IHealthConnectService { @override Future hasPermissions() async { try { - _connector ??= await HealthConnector.create(); - final status = await _connector!.getPermissionStatus( + final connector = await _getConnector(); + if (connector == null) return false; + final status = await connector.getPermissionStatus( HealthDataType.exerciseSession.writePermission, - ); + ).timeout(_statusDeadline); return status == PermissionStatus.granted; } catch (_) { return false; @@ -111,11 +127,12 @@ class HealthConnectService implements IHealthConnectService { @override Future requestReadPermissions() async { debugPrint('[HC] requestReadPermissions: requesting ${_readPermissions.length} permissions individually'); - _connector ??= await HealthConnector.create(); + final connector = await _getConnector(); + if (connector == null) return false; var anyGranted = false; for (final entry in _readPermissions.entries) { try { - final results = await _connector!.requestPermissions([entry.value]); + final results = await connector.requestPermissions([entry.value]); final granted = results.any((r) => r.status == PermissionStatus.granted); debugPrint('[HC] requestReadPermissions: ${entry.key} → granted=$granted'); if (granted) anyGranted = true; @@ -129,11 +146,12 @@ class HealthConnectService implements IHealthConnectService { @override Future> grantedReadTypes() async { - _connector ??= await HealthConnector.create(); + final connector = await _getConnector(); + if (connector == null) return {}; final granted = {}; for (final entry in _readPermissions.entries) { try { - final status = await _connector!.getPermissionStatus(entry.value); + final status = await connector.getPermissionStatus(entry.value).timeout(_statusDeadline); debugPrint('[HC] grantedReadTypes: ${entry.key} → $status'); if (status == PermissionStatus.granted) granted.add(entry.key); } catch (e) { @@ -150,13 +168,14 @@ class HealthConnectService implements IHealthConnectService { DateTime end, ) async { try { - _connector ??= await HealthConnector.create(); - final response = await _connector!.readRecords( + final connector = await _getConnector(); + if (connector == null) return const []; + final response = await connector.readRecords( HealthDataType.sleepSession.readInTimeRange( startTime: start, endTime: end, ), - ); + ).timeout(_queryDeadline); final result = response.records.map((r) { // Tally stage durations from embedded SleepStageSamples and build // an ordered stage timeline for HR segment colouring. @@ -217,13 +236,14 @@ class HealthConnectService implements IHealthConnectService { DateTime end, ) async { try { - _connector ??= await HealthConnector.create(); - final response = await _connector!.readRecords( + final connector = await _getConnector(); + if (connector == null) return const []; + final response = await connector.readRecords( HealthDataType.restingHeartRate.readInTimeRange( startTime: start, endTime: end, ), - ); + ).timeout(_queryDeadline); final result = response.records .map((r) => HealthSample(time: r.time, value: r.rate.inPerMinute)) .toList(); @@ -238,13 +258,14 @@ class HealthConnectService implements IHealthConnectService { @override Future> readHrvRmssd(DateTime start, DateTime end) async { try { - _connector ??= await HealthConnector.create(); - final response = await _connector!.readRecords( + final connector = await _getConnector(); + if (connector == null) return const []; + final response = await connector.readRecords( HealthDataType.heartRateVariabilityRMSSD.readInTimeRange( startTime: start, endTime: end, ), - ); + ).timeout(_queryDeadline); final result = response.records .map((r) => HealthSample(time: r.time, value: r.rmssd.inMilliseconds)) .toList(); @@ -262,16 +283,17 @@ class HealthConnectService implements IHealthConnectService { DateTime end, ) async { try { - _connector ??= await HealthConnector.create(); + final connector = await _getConnector(); + if (connector == null) return const []; // heartRateSeries = Android HeartRateRecord (container with BPM samples). // heartRate is iOS-only and throws UNSUPPORTED_OPERATION on Health Connect. - final response = await _connector!.readRecords( + final response = await connector.readRecords( HealthDataType.heartRateSeries.readInTimeRange( startTime: start, endTime: end, pageSize: 5000, ), - ); + ).timeout(_hrQueryDeadline); final samples = response.records .expand( (r) => r.samples.map( @@ -291,7 +313,8 @@ class HealthConnectService implements IHealthConnectService { @override Future syncWorkoutSession(WorkoutSession session, {String? title}) async { try { - _connector ??= await HealthConnector.create(); + final connector = await _getConnector(); + if (connector == null) return false; final sessionStart = session.date; final durationMinutes = max(session.duration, 1); @@ -302,27 +325,13 @@ class HealthConnectService implements IHealthConnectService { startTime: sessionStart, endTime: sessionEnd, exerciseType: ExerciseType.strengthTraining, - metadata: Metadata.manualEntry(), + metadata: Metadata.manualEntry(clientRecordId: 'workout_${session.id}'), title: title?.isNotEmpty == true ? title : null, notes: session.notes?.isNotEmpty == true ? session.notes : null, events: segments, ); - await _connector!.writeRecords([record]); - - // DEBUG: read back to verify weight is stored — remove after confirming. - final response = await _connector!.readRecords( - HealthDataType.exerciseSession.readInTimeRange( - startTime: sessionStart, - endTime: sessionEnd, - ), - ); - for (final r in response.records.whereType()) { - for (final e in r.events.whereType()) { - debugPrint('[HC debug] segment=${e.segmentType} reps=${e.repetitions} weight=${e.weight}'); - } - } - + await connector.writeRecords([record]).timeout(_queryDeadline); return true; } catch (e) { debugPrint('Health Connect sync failed: $e'); diff --git a/workout-logger/lib/services/health_data_sync_service.dart b/workout-logger/lib/services/health_data_sync_service.dart new file mode 100644 index 0000000..2da95d2 --- /dev/null +++ b/workout-logger/lib/services/health_data_sync_service.dart @@ -0,0 +1,144 @@ +// health_data_sync_service.dart — pulls sleep + heart-rate data from Health +// Connect into SqliteStorageService's health_samples/sleep_sessions tables +// so the coach's run_sql_query tool can join them against workout data. +// See docs/superpowers/specs/2026-08-11-health-data-sync-and-coach-sql-design.md. + +import '../models/models.dart'; +import 'interfaces/health_connect_service_interface.dart'; +import 'sqlite_storage_service.dart'; + +typedef _SampleReader = Future> Function(DateTime, DateTime); + +class _SampleStream { + const _SampleStream({ + required this.watermarkKey, + required this.readType, + required this.reader, + }); + + final String watermarkKey; + final HealthReadType readType; + final _SampleReader reader; +} + +class HealthDataSyncService { + HealthDataSyncService({ + required IHealthConnectService healthConnectService, + required SqliteStorageService storage, + DateTime Function()? now, + }) : _hc = healthConnectService, + _storage = storage, + _now = now ?? DateTime.now { + _sampleStreams = { + 'heart_rate': _SampleStream( + watermarkKey: 'health_sync.heart_rate', + readType: HealthReadType.heartRate, + reader: _hc.readHeartRateSamples, + ), + 'resting_heart_rate': _SampleStream( + watermarkKey: 'health_sync.resting_heart_rate', + readType: HealthReadType.restingHeartRate, + reader: _hc.readRestingHeartRate, + ), + 'hrv_rmssd': _SampleStream( + watermarkKey: 'health_sync.hrv_rmssd', + readType: HealthReadType.hrv, + reader: _hc.readHrvRmssd, + ), + }; + } + + final IHealthConnectService _hc; + final SqliteStorageService _storage; + final DateTime Function() _now; + + // Adding a new sample stream only needs one entry here — the watermark key, + // the permission it depends on, and the reader all live together instead of + // being repeated across separate keyed maps that could drift apart. + late final Map _sampleStreams; + + static const Duration _backfillWindow = Duration(days: 90); + static const Duration _lookback = Duration(days: 3); + static const Duration _throttleWindow = Duration(minutes: 30); + + static const String _sleepWatermarkKey = 'health_sync.sleep'; + static const String _lastRunKey = 'health_sync.last_run'; + + Future? _inFlight; + + /// Pulls any new sleep/HR data since the last sync into SQLite. Skipped if + /// the last sync ran under 30 minutes ago, unless [force] is true. Each of + /// the 4 underlying data streams fails independently and best-effort — + /// one stream throwing never blocks the others or this call. Streams whose + /// permission hasn't been granted yet are skipped entirely — their + /// watermark is left untouched so the first sync after granting permission + /// still performs the full backfill instead of resuming from a watermark + /// that was silently advanced while unauthorized. + /// + /// Concurrent calls (e.g. the launch-time sync overlapping a manual + /// "sync now" tap) share a single in-flight run instead of racing. + Future sync({bool force = false}) { + return _inFlight ??= _sync(force: force).whenComplete(() => _inFlight = null); + } + + Future _sync({required bool force}) async { + final now = _now(); + if (!force) { + final lastRunRaw = await _storage.getSetting(_lastRunKey); + final lastRun = lastRunRaw == null ? null : DateTime.tryParse(lastRunRaw); + if (lastRun != null && now.difference(lastRun) < _throttleWindow) return; + } + + final Set granted; + try { + granted = await _hc.grantedReadTypes(); + } catch (_) { + // Best-effort; leave every watermark untouched so the next sync retries. + return; + } + + if (granted.contains(HealthReadType.sleep)) { + await _syncSleep(now); + } + for (final entry in _sampleStreams.entries) { + final stream = entry.value; + if (!granted.contains(stream.readType)) continue; + await _syncSamples(type: entry.key, now: now, stream: stream); + } + + await _storage.saveSetting(_lastRunKey, now.toIso8601String()); + } + + Future _windowStart(String watermarkKey, DateTime now) async { + final raw = await _storage.getSetting(watermarkKey); + final watermark = raw == null ? null : DateTime.tryParse(raw); + final base = watermark ?? now.subtract(_backfillWindow); + return base.subtract(_lookback); + } + + Future _syncSleep(DateTime now) async { + try { + final from = await _windowStart(_sleepWatermarkKey, now); + final periods = await _hc.readSleepSessions(from, now); + await _storage.upsertSleepSessions(periods); + await _storage.saveSetting(_sleepWatermarkKey, now.toIso8601String()); + } catch (_) { + // Best-effort; leave the watermark untouched so the next sync retries. + } + } + + Future _syncSamples({ + required String type, + required DateTime now, + required _SampleStream stream, + }) async { + try { + final from = await _windowStart(stream.watermarkKey, now); + final samples = await stream.reader(from, now); + await _storage.upsertHealthSamples(type, samples); + await _storage.saveSetting(stream.watermarkKey, now.toIso8601String()); + } catch (_) { + // Best-effort; leave the watermark untouched so the next sync retries. + } + } +} diff --git a/workout-logger/lib/services/interfaces/ai_service_interface.dart b/workout-logger/lib/services/interfaces/ai_service_interface.dart index 4a840ec..ca589e2 100644 --- a/workout-logger/lib/services/interfaces/ai_service_interface.dart +++ b/workout-logger/lib/services/interfaces/ai_service_interface.dart @@ -15,19 +15,32 @@ import '../../models/models.dart'; /// Contract for the AI backend used across RepForge (coach chat, program /// generation, insights). Implemented by [GeminiAiService] today. -abstract class IAiService { +abstract mixin class IAiService { /// True once an API key (or equivalent credential) has been supplied. bool get isConfigured; - /// The model identifier currently in use (e.g. `gemini-3.1-flash-lite`). + /// The model identifier currently in use (e.g. `gemini-3.6-flash`). String get currentModel; - /// Stream a coach reply token-by-token. + /// Stream a chat reply token-by-token across any domain. /// - /// When [tools] and [onToolCall] are provided, the implementation runs a - /// tool-call loop: any function calls the model emits are dispatched through - /// [onToolCall] and their results fed back, until the model produces a final - /// natural-language answer. Only text is yielded to the caller. + /// Defaults to calling [streamCoachReply] for backward compatibility. + Stream streamChatReply({ + required String userMessage, + required String systemPrompt, + required List history, + List? tools, + Future> Function(FunctionCall call)? onToolCall, + }) => + streamCoachReply( + userMessage: userMessage, + systemPrompt: systemPrompt, + history: history, + tools: tools, + onToolCall: onToolCall, + ); + + /// Stream a coach reply (alias for backward compatibility). Stream streamCoachReply({ required String userMessage, required String systemPrompt, @@ -36,6 +49,17 @@ abstract class IAiService { Future> Function(FunctionCall call)? onToolCall, }); + /// Generic domain-agnostic structured JSON generator. + /// Generates a structured object [T] by prompting the LLM for JSON and + /// decoding it via [fromJson]. + Future generateStructuredJson({ + required String systemPrompt, + required String userPrompt, + required T Function(Map json) fromJson, + }) async { + throw UnimplementedError('generateStructuredJson not implemented.'); + } + /// Generate a structured multi-week training program from a natural-language /// prompt, constrained to the provided exercise catalogue. Future generateProgram({ @@ -43,11 +67,10 @@ abstract class IAiService { required List allExercises, }); - /// One-shot weekly training summary in conversational prose. + /// One-shot weekly summary in conversational prose. Future generateWeeklyInsights(String contextText); /// Generic one-shot contextual insight given a [system] instruction and /// [context] payload. Future generateInsight(String system, String context); - } diff --git a/workout-logger/lib/services/interfaces/ml_service_interface.dart b/workout-logger/lib/services/interfaces/ml_service_interface.dart index dcc9530..b63220f 100644 --- a/workout-logger/lib/services/interfaces/ml_service_interface.dart +++ b/workout-logger/lib/services/interfaces/ml_service_interface.dart @@ -75,16 +75,48 @@ abstract class IMLService { DateTime? asOf, }); - /// Get recommended sets based on last session and growth model. + /// The history-dependent half of [computeMuscleRecoveryScores]: when each + /// muscle group was last trained. Sorts and walks all of [sessions], so + /// callers on a hot path cache this and pair it with + /// [recoveryScoresFrom] rather than recomputing per call. + Map lastTrainedPerMuscle( + List sessions, + Map exerciseMap, + ); + + /// The clock-dependent half: applies the recovery decay to a + /// [lastTrainedPerMuscle] result. O(muscle groups). + Map recoveryScoresFrom( + Map lastTrained, { + DateTime? asOf, + }); + + /// Get recommended sets based on last session, recent-session trend, and growth model. + /// [pastSessions], if provided, only has its first two entries read for + /// deload/recovery detection: index 0 is the latest prior session, index 1 + /// is the session immediately before that. Any further entries are ignored. /// [minReps]/[maxReps] define the double-progression rep range. /// Pass [recoveryScores] + [primaryMuscleIds] for recovery-aware advice. + /// Pass [readinessBand] (from the cached `ReadinessManager.snapshot` — this + /// method never fetches it itself, keeping this synchronous/offline) to + /// hold load on a low-readiness day. + /// Pass [sessionFatigueFactor] (a pre-computed 0.0–1.0 dampening factor — + /// see `SessionFatigueAccumulator`) for same-session fatigue awareness. + /// Deliberately exercise-agnostic, not muscle-specific: a backtest found no + /// statistically significant same-session order effect for this app's + /// hand-authored `muscleActivations` groupings, so this only tracks total + /// prior same-session training load, not which muscles it hit. List recommendSets({ required List lastSession, + List>? pastSessions, GrowthModel? growthModel, int minReps = 6, int maxReps = 12, Map? recoveryScores, List? primaryMuscleIds, + ReadinessBand? readinessBand, + double sessionFatigueFactor = 0.0, + DateTime? asOf, }); /// Get default recommendations when no history exists. diff --git a/workout-logger/lib/services/managers/analytics_manager.dart b/workout-logger/lib/services/managers/analytics_manager.dart index e234bba..151e9a3 100644 --- a/workout-logger/lib/services/managers/analytics_manager.dart +++ b/workout-logger/lib/services/managers/analytics_manager.dart @@ -33,6 +33,21 @@ class AnalyticsManager extends ChangeNotifier { // Rebuilt via [buildSessionIndex] whenever the session list changes. Map> _sessionIndex = {}; + // When each muscle was last trained, cached alongside _sessionIndex: the + // walk behind it sorts and scans all sessions, and it depends only on the + // history, not on the clock. Dropped by buildSessionIndex; _lastTrainedFor + // guards the case where a caller passes a different exerciseMap than the + // one this was built from. + Map? _lastTrained; + Map? _lastTrainedFor; + + // The map built from a caller's `exercises` list when it passes no + // exerciseMap. Held so repeated calls with the same list reuse one map + // instance — without this, the literal below is a fresh object every call + // and _lastTrainedFor's identity check never hits. + List? _fallbackLookupFor; + Map? _fallbackLookup; + // Callback to update targets with new growth models final void Function(String exerciseId, GrowthModel model)? onGrowthModelUpdated; @@ -66,6 +81,12 @@ class AnalyticsManager extends ChangeNotifier { } _sessionIndex = index; + // The recovery walk is keyed off the same "sessions changed" signal, so + // it's dropped here and rebuilt lazily on the next getRecommendations. + _lastTrained = null; + _lastTrainedFor = null; + _fallbackLookupFor = null; + _fallbackLookup = null; } /// Get growth model for a specific exercise @@ -130,14 +151,36 @@ class AnalyticsManager extends ChangeNotifier { /// Get set recommendations for an exercise. /// /// Uses the most-recently-dated session containing this exercise as the - /// basis for the recommendation. Reads from the pre-built session index - /// so no sort is required at call time — O(1). + /// basis for the recommendation, plus up to 2 sessions before that for + /// deload-recovery detection and (when [exercises]/[exerciseMap] are + /// supplied) the primary muscle's recovery status. + /// + /// Reads from the pre-built session index, so the log lookup is O(1) and + /// needs no sort at call time. The recovery walk behind the recovery + /// status is O(N sessions), but it is cached on the same + /// [buildSessionIndex] invalidation, so it costs that only on the first + /// call after a session change; subsequent calls pay O(muscle groups). + /// + /// [exerciseMap] is a pre-built id → Exercise map for O(1) lookups; falls + /// back to building one from [exercises] when omitted (see + /// [getWeeklyVolumeByMuscle] for the same convention). That fallback is + /// memoized on the [exercises] instance, because the last-trained cache + /// below keys off the map's identity. + /// + /// [readinessBand] and [sessionFatigueFactor] are forwarded straight to + /// [IMLService.recommendSets], matching what + /// `WorkoutProvider.getRecommendations` passes — the two entry points + /// have drifted apart before (see [recoveryRecommendationInputs]). List getRecommendations( String exerciseId, - List sessions, - ) { + List sessions, { + List exercises = const [], + Map? exerciseMap, + ReadinessBand? readinessBand, + double sessionFatigueFactor = 0.0, + }) { final isFresh = identical(_lastIndexedSessions, sessions); - + // Fast path: use pre-built index if available and fresh. final logs = isFresh ? _sessionIndex[exerciseId] : null; final lastLog = (logs != null && logs.isNotEmpty) @@ -148,12 +191,48 @@ class AnalyticsManager extends ChangeNotifier { return _mlService.getDefaultRecommendations(3); } + final pastSessions = (logs != null && logs.isNotEmpty) + ? logs.take(3).map((e) => e.log.sets).toList() + : [lastLog.sets]; + + final lookup = exerciseMap ?? _fallbackLookupFrom(exercises); + // Reuse the last-trained walk across calls — it's invalidated by + // buildSessionIndex, the same signal that invalidates _sessionIndex. + if (!isFresh || !identical(_lastTrainedFor, lookup)) { + _lastTrained = _mlService.lastTrainedPerMuscle(sessions, lookup); + _lastTrainedFor = lookup; + } + final recoveryInputs = recoveryRecommendationInputs( + exerciseId: exerciseId, + sessions: sessions, + exerciseMap: lookup, + mlService: _mlService, + lastTrained: _lastTrained, + ); + return _mlService.recommendSets( lastSession: lastLog.sets, + pastSessions: pastSessions, growthModel: _growthModels[exerciseId], + recoveryScores: recoveryInputs.recoveryScores, + primaryMuscleIds: recoveryInputs.primaryMuscleIds, + readinessBand: readinessBand, + sessionFatigueFactor: sessionFatigueFactor, ); } + /// id → Exercise map for [exercises], reusing the previously built one + /// while the caller keeps passing the same list instance. The identity + /// check in [getRecommendations] compares map instances, so rebuilding + /// this on every call would invalidate [_lastTrained] every time. + Map _fallbackLookupFrom(List exercises) { + if (!identical(_fallbackLookupFor, exercises) || _fallbackLookup == null) { + _fallbackLookup = {for (final e in exercises) e.id: e}; + _fallbackLookupFor = exercises; + } + return _fallbackLookup!; + } + /// Get volume progression for an exercise. /// /// Reads from the pre-built session index (sorted oldest-first by diff --git a/workout-logger/lib/services/managers/pr_manager.dart b/workout-logger/lib/services/managers/pr_manager.dart index 073c38b..b2e0248 100644 --- a/workout-logger/lib/services/managers/pr_manager.dart +++ b/workout-logger/lib/services/managers/pr_manager.dart @@ -44,7 +44,10 @@ class PRManager extends ChangeNotifier { } } - PersonalRecord? getRecord(String exerciseId) => _cache[exerciseId]; + PersonalRecord? getRecord(String exerciseId, {String? handle}) { + final key = (handle != null && handle.isNotEmpty) ? '$exerciseId:$handle' : exerciseId; + return _cache[key] ?? _cache[exerciseId]; + } /// Compare each exercise log in [session] against stored PRs. /// @@ -67,14 +70,19 @@ class PRManager extends ChangeNotifier { } Future> _checkExercise(ExerciseLog log, DateTime date) async { - final existing = _cache[log.exerciseId]; + final handle = log.handle ?? log.sets.where((s) => s.handle != null).firstOrNull?.handle; + final key = (handle != null && handle.isNotEmpty) ? '${log.exerciseId}:$handle' : log.exerciseId; + final existing = _cache[key]; double newBestWeight = existing?.bestWeight ?? 0; int newBestReps = existing?.bestReps ?? 0; double newBestVolume = existing?.bestVolume ?? 0; for (final set in log.sets) { - if (set.weight > newBestWeight) newBestWeight = set.weight; + // effectiveWeight, not raw weight: for assisted-bodyweight sets, weight + // stores the assist load, so a raw comparison would flag more assist + // (an easier set) as a new weight PR. + if (set.effectiveWeight > newBestWeight) newBestWeight = set.effectiveWeight; if (set.reps > newBestReps) newBestReps = set.reps; if (set.volume > newBestVolume) newBestVolume = set.volume; } @@ -91,13 +99,13 @@ class PRManager extends ChangeNotifier { if (broken.isEmpty) return broken; final updated = PersonalRecord( - exerciseId: log.exerciseId, + exerciseId: key, bestWeight: newBestWeight, bestReps: newBestReps, bestVolume: newBestVolume, achievedAt: date, ); - _cache[log.exerciseId] = updated; + _cache[key] = updated; await _storage.savePersonalRecord(updated); return broken; diff --git a/workout-logger/lib/services/ml_service.dart b/workout-logger/lib/services/ml_service.dart index ffae2a4..0d7da8c 100644 --- a/workout-logger/lib/services/ml_service.dart +++ b/workout-logger/lib/services/ml_service.dart @@ -1,219 +1,38 @@ import 'dart:math'; import '../models/models.dart'; import 'interfaces/ml_service_interface.dart'; +import 'strategies/growth_curve_fitter.dart'; +import 'strategies/progression_rules.dart'; +import 'utils/recovery_calculator.dart'; export 'interfaces/ml_service_interface.dart' show DataPoint, MuscleRecoveryStatus; +export 'strategies/growth_curve_fitter.dart' show IGrowthCurveFitter, GrowthCurveFitter; +export 'strategies/progression_rules.dart' + show ProgressionContext, ProgressionRule, ProgressionRuleFactory; +export 'utils/recovery_calculator.dart' show RecoveryCalculator; /// Growth modelling + double-progression recommendations + per-muscle /// recovery scoring. /// -/// Growth model: exponentially-weighted least squares fit of two candidate -/// curves — linear and logarithmic (saturating) — each refined with one -/// robust (Tukey bisquare) re-weighting pass so single outlier sessions -/// (deloads, cut-short workouts) don't tilt the trend. The better-fitting -/// curve wins; the logarithmic form captures the diminishing returns real -/// muscle growth follows, which a straight line systematically overshoots. +/// Growth-curve fitting and target-date projection are delegated to +/// [IGrowthCurveFitter] (see `strategies/growth_curve_fitter.dart`) and +/// recovery scoring to [RecoveryCalculator] (see `utils/recovery_calculator.dart`), +/// so this class only owns data extraction and the recommendation heuristics. class MLService implements IMLService { - // Decay constant for recency weights. At λ=0.15, a session 10 sessions ago - // carries exp(−1.5) ≈ 22 % of the weight of the most recent session. - static const _lambda = 0.15; - - // Logarithmic candidate is considered only with enough history for - // curvature to be identifiable; over short spans log ≈ linear. - static const _minPointsForLogCurve = 6; - static const _minSpanDaysForLogCurve = 14.0; - - // The log curve must beat linear by this fraction of weighted RSS to win, - // preventing flip-flopping between near-identical fits. - static const _logSelectionMargin = 0.02; - - // Robust pass: points beyond c·σ̂ get fully rejected by Tukey's bisquare. - static const _tukeyC = 4.685; - static const _minPointsForRobustPass = 5; - - // Recovery time constants τ (hours) per muscle group. - // Full recovery (~95 %) occurs at ≈ 3τ. - static const _tauHours = { - 'chest': 48.0, - 'back': 60.0, - 'lats': 60.0, - 'quads': 60.0, - 'hamstrings': 60.0, - 'glutes': 60.0, - 'legs': 60.0, - 'shoulders': 40.0, - 'traps': 40.0, - 'biceps': 36.0, - 'triceps': 36.0, - 'abs': 24.0, - 'core': 24.0, - 'calves': 24.0, - 'forearms': 24.0, - }; - static const _defaultTauHours = 48.0; + final IGrowthCurveFitter _curveFitter; + final RecoveryCalculator _recoveryCalculator; + + MLService({ + IGrowthCurveFitter? curveFitter, + RecoveryCalculator? recoveryCalculator, + }) : _curveFitter = curveFitter ?? GrowthCurveFitter(), + _recoveryCalculator = recoveryCalculator ?? const RecoveryCalculator(); // ==================== GROWTH MODEL ==================== @override - GrowthModel trainGrowthModel(List dataPoints) { - return MLService.trainGrowthModelStatic(dataPoints); - } - - /// Fits linear and logarithmic candidates with exponential recency weights - /// (weight for point i of n: exp(−λ·(n−1−i))) plus one robust re-weighting - /// pass each, then selects the better curve by weighted residual error. - static GrowthModel trainGrowthModelStatic(List dataPoints) { - if (dataPoints.isEmpty) { - return GrowthModel(slope: 0, intercept: 0, r2: 0, lastTrained: DateTime.now()); - } - if (dataPoints.length == 1) { - return GrowthModel( - slope: 0, - intercept: dataPoints.first.y, - r2: 1, - lastTrained: DateTime.now(), - lastX: dataPoints.first.x, - ); - } - - final n = dataPoints.length; - final recency = List.generate(n, (i) => exp(-_lambda * (n - 1 - i))); - final xs = dataPoints.map((p) => p.x).toList(); - final ys = dataPoints.map((p) => p.y).toList(); - final lastX = xs.reduce(max); - final spanDays = lastX - xs.reduce(min); - - final linear = _robustWeightedFit(xs, ys, recency); - - _Fit? logFit; - if (n >= _minPointsForLogCurve && spanDays >= _minSpanDaysForLogCurve) { - final logXs = xs.map((x) => log(1 + max(0.0, x))).toList(); - logFit = _robustWeightedFit(logXs, ys, recency); - } - - final useLog = logFit != null && - logFit.rss < linear.rss * (1 - _logSelectionMargin); - final fit = useLog ? logFit : linear; - final curve = useLog ? GrowthCurve.logarithmic : GrowthCurve.linear; - - // Instantaneous daily rate at the newest point: d/dx [a + b·ln(1+x)]. - final slope = useLog ? fit.slope / (1 + lastX) : fit.slope; - - return GrowthModel( - slope: slope, - intercept: fit.intercept, - r2: fit.r2.clamp(0.0, 1.0), - lastTrained: DateTime.now(), - curve: curve, - coefficient: fit.slope, - lastX: lastX, - stdError: fit.stdError, - ); - } - - /// Weighted least squares with one Tukey-bisquare re-weighting pass. - /// - /// The robust pass estimates residual scale via the weighted MAD, then - /// refits with outliers down-weighted by (1 − (r/cσ̂)²)², so a single - /// deload or cut-short session cannot tilt the trend. Skipped for tiny - /// samples or when residuals are too uniform to identify outliers. - static _Fit _robustWeightedFit( - List xs, - List ys, - List recency, - ) { - var fit = _weightedLeastSquares(xs, ys, recency); - - if (xs.length < _minPointsForRobustPass) return fit; - - final residuals = [ - for (var i = 0; i < xs.length; i++) - (ys[i] - (fit.intercept + fit.slope * xs[i])).abs(), - ]; - final mad = _median(residuals); - if (mad <= 0) return fit; - final scale = 1.4826 * mad; // MAD → σ̂ for normal residuals - - final robust = []; - for (var i = 0; i < xs.length; i++) { - final u = residuals[i] / (_tukeyC * scale); - final tukey = u >= 1 ? 0.0 : pow(1 - u * u, 2).toDouble(); - robust.add(recency[i] * tukey); - } - // Refit only if the pass actually rejected/damped something and enough - // effective weight survives to keep the fit identifiable. - final kept = robust.where((w) => w > 0).length; - if (kept < 3) return fit; - final refit = _weightedLeastSquares(xs, ys, robust); - return refit.degenerate ? fit : refit; - } - - static _Fit _weightedLeastSquares( - List xs, - List ys, - List weights, - ) { - final n = xs.length; - final wSum = weights.fold(0.0, (s, w) => s + w); - - double wSumX = 0, wSumY = 0, wSumXY = 0, wSumX2 = 0; - for (var i = 0; i < n; i++) { - final w = weights[i]; - wSumX += w * xs[i]; - wSumY += w * ys[i]; - wSumXY += w * xs[i] * ys[i]; - wSumX2 += w * xs[i] * xs[i]; - } - - final denom = wSum * wSumX2 - wSumX * wSumX; - if (denom.abs() < 1e-12 || wSum <= 0) { - final mean = wSum > 0 ? wSumY / wSum : 0.0; - return _Fit( - slope: 0, - intercept: mean, - r2: 0, - rss: double.infinity, - stdError: 0, - degenerate: true, - ); - } - - final slope = (wSum * wSumXY - wSumX * wSumY) / denom; - final intercept = (wSumY - slope * wSumX) / wSum; - - final yBar = wSumY / wSum; - double ssTotal = 0, ssResidual = 0, wSqSum = 0; - for (var i = 0; i < n; i++) { - final w = weights[i]; - final predicted = slope * xs[i] + intercept; - ssTotal += w * pow(ys[i] - yBar, 2); - ssResidual += w * pow(ys[i] - predicted, 2); - wSqSum += w * w; - } - - // Weighted mean squared residual, dof-corrected via the Kish effective - // sample size (recency weights make n optimistic). - final nEff = wSqSum > 0 ? (wSum * wSum) / wSqSum : 0.0; - final dof = max(1.0, nEff - 2); - final stdError = sqrt(max(0.0, ssResidual / wSum) * (nEff / dof)); - - return _Fit( - slope: slope, - intercept: intercept, - r2: ssTotal > 0 ? (1 - ssResidual / ssTotal).toDouble() : 0.0, - rss: ssResidual, - stdError: stdError, - degenerate: false, - ); - } - - static double _median(List values) { - final sorted = List.from(values)..sort(); - final mid = sorted.length ~/ 2; - return sorted.length.isOdd - ? sorted[mid] - : (sorted[mid - 1] + sorted[mid]) / 2; - } + GrowthModel trainGrowthModel(List dataPoints) => + _curveFitter.fit(dataPoints); // ==================== DATA EXTRACTION ==================== @@ -256,7 +75,7 @@ class MLService implements IMLService { DateTime? firstDate; for (final session in sorted) { - final volumes = _muscleVolumes(session, exerciseMap); + final volumes = _recoveryCalculator.muscleVolumes(session, exerciseMap); final vol = volumes[muscleGroupId]; if (vol == null || vol == 0) continue; firstDate ??= session.date; @@ -268,70 +87,31 @@ class MLService implements IMLService { // ==================== RECOVERY ==================== - /// Compute recovery scores for every muscle group trained in [sessions]. - /// - /// Model: recovery(t) = 1 − exp(−t / τ) - /// t = hours since last session that trained this muscle - /// τ = muscle-specific time constant (see [_tauHours]) - /// - /// Full recovery (≥ 95 %) occurs around t = 3τ. @override Map computeMuscleRecoveryScores( List sessions, Map exerciseMap, { DateTime? asOf, - }) { - final now = asOf ?? DateTime.now(); - final sorted = List.from(sessions) - ..sort((a, b) => a.date.compareTo(b.date)); - - // Walk sessions forward — each one updates the "last trained" record. - final lastTrained = {}; - for (final session in sorted) { - for (final muscleId in _muscleVolumes(session, exerciseMap).keys) { - lastTrained[muscleId] = session.date; - } - } - - final result = {}; - for (final entry in lastTrained.entries) { - final muscleId = entry.key; - final tau = _tauHours[muscleId] ?? _defaultTauHours; - final hours = now.difference(entry.value).inMinutes / 60.0; - final fraction = (1.0 - exp(-hours / tau)).clamp(0.0, 1.0); - // 95 % recovery ≈ 3τ; remaining = 3τ − elapsed. - final hoursRemaining = tau * 3 - hours; - - result[muscleId] = MuscleRecoveryStatus( - muscleGroupId: muscleId, - recoveryFraction: fraction, - timeSinceLastTrained: Duration(minutes: (hours * 60).round()), - estimatedTimeToFullRecovery: hoursRemaining > 0 - ? Duration(minutes: (hoursRemaining * 60).round()) - : null, + }) => + _recoveryCalculator.computeMuscleRecoveryScores( + sessions, + exerciseMap, + asOf: asOf, ); - } - return result; - } - /// Effective volume per muscle group for one session. - static Map _muscleVolumes( - WorkoutSession session, + @override + Map lastTrainedPerMuscle( + List sessions, Map exerciseMap, - ) { - final volumes = {}; - for (final log in session.exercises) { - final exercise = exerciseMap[log.exerciseId]; - if (exercise == null) continue; - final total = log.totalVolume; - for (final activation in exercise.muscleActivations) { - volumes[activation.muscleGroupId] = - (volumes[activation.muscleGroupId] ?? 0.0) + - total * activation.activationPercentage / 100.0; - } - } - return volumes; - } + ) => + _recoveryCalculator.lastTrainedPerMuscle(sessions, exerciseMap); + + @override + Map recoveryScoresFrom( + Map lastTrained, { + DateTime? asOf, + }) => + _recoveryCalculator.recoveryScoresFrom(lastTrained, asOf: asOf); // ==================== RECOMMENDATIONS ==================== @@ -342,28 +122,104 @@ class MLService implements IMLService { static const _declineWeeklyPct = -2.0; static const _minR2ForTrendSignal = 0.2; - /// Double-progression with trend- and recovery-aware modulation. + // Deload detection thresholds: the last session counts as a deload when its + // load drops below these fractions of the session before it. + static const _deloadWeightThreshold = 0.85; + static const _deloadVolumeThreshold = 0.70; + // How recent the last session must be for a detected deload to still count + // as "active" — see the isRecent comment below. + static const _deloadRecencyWindowDays = 21; + + /// Double-progression with trend-, recovery-, readiness-, and + /// same-session-fatigue-aware modulation. /// /// Priority order: /// 1. Under-recovered primary muscle → maintenance (hold weight & reps). - /// 2. Decline (weekly growth < −2 %, trustworthy fit) → 10 % deload. - /// 3. Plateau (weekly growth < 0.5 %, trustworthy fit) → maintenance. - /// 4. reps ≥ maxReps → bump weight, reset to minReps. - /// 5. Otherwise → add 1 rep, hold weight. + /// 2. Post-deload recovery → re-anchor on the pre-deload baseline. + /// 3. Low whole-day readiness → maintenance. + /// 4. Heavy same-session fatigue (`sessionFatigueFactor` ≥ 1.0) → maintenance; + /// partial fatigue instead scales the weight-progression increment. + /// 5. Decline (weekly growth < −2 %, trustworthy fit) → 10 % deload. + /// 6. Plateau (weekly growth < 0.5 %, trustworthy fit) → maintenance. + /// 7. reps ≥ maxReps → bump weight (fatigue-scaled), reset to minReps. + /// 8. Otherwise → add 1 rep, hold weight. /// /// Trend checks use [GrowthModel.weeklyGrowthPercent] — growth relative to /// the lifter's current volume — so the same thresholds work for a 60 kg /// novice bench and a 10 t weekly squat volume. + /// + /// [sessionFatigueFactor] is a pre-computed 0.0–1.0 dampening factor from + /// same-session earlier training (see `SessionFatigueAccumulator` — + /// deliberately *not* attributed to specific muscles here: an exercise's + /// hand-authored `muscleActivations` percentages proved untrustworthy for + /// this — e.g. Seated Cable Row's own top muscle is "back" while Lat + /// Pulldown/Pull-ups' is "lats", separate ids in this app's taxonomy, so + /// per-muscle attribution silently missed real overlap between them). @override List recommendSets({ required List lastSession, + List>? pastSessions, GrowthModel? growthModel, int minReps = 6, int maxReps = 12, Map? recoveryScores, List? primaryMuscleIds, + ReadinessBand? readinessBand, + double sessionFatigueFactor = 0.0, + DateTime? asOf, }) { - if (lastSession.isEmpty) return []; + final now = asOf ?? DateTime.now(); + if (lastSession.isEmpty && (pastSessions == null || pastSessions.isEmpty)) { + return []; + } + + // Determine target reference sets and deload status based on past 3 sessions trend + List refSets = lastSession.isNotEmpty + ? lastSession + : pastSessions?.firstWhere( + (session) => session.isNotEmpty, + orElse: () => const [], + ) ?? + const []; + bool isPostDeloadRecovery = false; + + if (pastSessions != null && pastSessions.length >= 2) { + final s0 = pastSessions[0]; + final s1 = pastSessions[1]; + + if (s0.isNotEmpty && s1.isNotEmpty) { + // Use effective load (bodyweight − assist + extra for assisted-BW + // sets), not raw set.weight, so assist changes on machines like + // assisted dips/pull-ups aren't misread as a deload/progression. + final w0 = s0.map((s) => s.effectiveWeight).reduce(max); + final w1 = s1.map((s) => s.effectiveWeight).reduce(max); + final v0 = s0.fold(0.0, (sum, s) => sum + s.volume); + final v1 = s1.fold(0.0, (sum, s) => sum + s.volume); + + // Only treat this as "recovering from a deload" if the most recent + // session (s0) is actually recent — otherwise an old, unrelated dip + // between two stale sessions after a long break would be + // misread as an active deload to recover from. + final mostRecentTimestamp = + s0.map((s) => s.timestamp).reduce((a, b) => a.isAfter(b) ? a : b); + // Compare the full duration, not Duration.inDays: inDays truncates, so + // a session 21 days and 23 hours old would still read as 21 and stay + // inside the window. + final isRecent = !now.isAfter(mostRecentTimestamp + .add(const Duration(days: _deloadRecencyWindowDays))); + + // If the last session (s0) was a deload relative to the one before it + if (isRecent && + ((w1 > 0 && w0 < w1 * _deloadWeightThreshold) || + (v1 > 0 && v0 < v1 * _deloadVolumeThreshold))) { + refSets = s1; + isPostDeloadRecovery = true; + } + } + } + + if (refSets.isEmpty) refSets = lastSession; + if (refSets.isEmpty) return []; final trendIsTrustworthy = growthModel != null && growthModel.r2 > _minR2ForTrendSignal; @@ -384,8 +240,10 @@ class MLService implements IMLService { .fold(100, (a, b) => a < b ? a : b) : null; - return lastSession - .map((set) => _doubleProgression( + final isLowReadiness = readinessBand == ReadinessBand.low; + + return refSets + .map((set) => ProgressionRuleFactory.apply(ProgressionContext( set: set, minReps: minReps, maxReps: maxReps, @@ -393,68 +251,13 @@ class MLService implements IMLService { isDeclining: isDeclining, isUnderRecovered: isUnderRecovered, recoveryPercent: worstRecovery, - )) + isPostDeloadRecovery: isPostDeloadRecovery, + isLowReadiness: isLowReadiness, + sessionFatigueFactor: sessionFatigueFactor, + ))) .toList(); } - static SetRecommendation _doubleProgression({ - required WorkoutSet set, - required int minReps, - required int maxReps, - required bool isPlateau, - required bool isDeclining, - required bool isUnderRecovered, - int? recoveryPercent, - }) { - if (isUnderRecovered) { - return SetRecommendation( - weight: set.weight, - reps: set.reps, - confidence: 'low', - reasoning: - 'Muscle only $recoveryPercent% recovered — maintain load, skip progression', - ); - } - - if (isDeclining) { - // Round the deload to the plate increment users can actually load. - final deloaded = max(0.0, ((set.weight * 0.9) / 2.5).round() * 2.5); - return SetRecommendation( - weight: deloaded, - reps: set.reps, - confidence: 'medium', - reasoning: - 'Volume trending down — deload ~10% for a session or two, then rebuild', - ); - } - - if (isPlateau) { - return SetRecommendation( - weight: set.weight, - reps: set.reps, - confidence: 'medium', - reasoning: 'Plateau detected — maintain load and focus on form quality', - ); - } - - if (set.reps >= maxReps) { - final increment = set.weight < 40 ? 2.5 : 5.0; - return SetRecommendation( - weight: set.weight + increment, - reps: minReps, - confidence: 'high', - reasoning: 'Rep target hit — add ${increment}kg and reset to $minReps reps', - ); - } - - return SetRecommendation( - weight: set.weight, - reps: set.reps + 1, - confidence: 'high', - reasoning: 'Add 1 rep (${set.reps + 1}/$maxReps) — progressive overload', - ); - } - /// Fill in default recommendations when no history exists. @override List getDefaultRecommendations(int setCount) { @@ -471,98 +274,15 @@ class MLService implements IMLService { // ==================== TARGET PREDICTIONS ==================== - // Predictions further out than this are noise, not information. - static const _maxPredictionDays = 365 * 2; - - /// Projects the fitted curve forward to the target (x = days). - /// - /// Linear fits extrapolate at the constant rate; logarithmic fits invert - /// the curve, so the flattening trajectory honestly pushes the date out - /// instead of promising linear gains forever. Predictions beyond two years - /// return null — too uncertain to show. @override DateTime? predictTargetCompletion({ required double currentValue, required double targetValue, required GrowthModel growthModel, - double sessionsPerWeek = 3.0, - }) { - if (currentValue >= targetValue) return DateTime.now(); - if (growthModel.slope <= 0) return null; - - final double daysFromNow; - switch (growthModel.curve) { - case GrowthCurve.linear: - daysFromNow = (targetValue - currentValue) / growthModel.slope; - case GrowthCurve.logarithmic: - // Map the live current value and the target through the curve's - // inverse x(y) = exp((y−a)/b) − 1 and take the day difference, so - // drift between the live value and the fitted curve cancels out. - final b = growthModel.coefficient; - if (b <= 0) return null; - final xTarget = exp((targetValue - growthModel.intercept) / b) - 1; - final xCurrent = exp((currentValue - growthModel.intercept) / b) - 1; - daysFromNow = xTarget - xCurrent; - } - - if (daysFromNow <= 0) return DateTime.now(); - if (!daysFromNow.isFinite || daysFromNow > _maxPredictionDays) return null; - return DateTime.now().add(Duration(days: daysFromNow.ceil())); - } - - /// Confidence interval around the predicted completion date. - /// - /// Width comes from the model's residual standard error converted to days - /// at the current growth rate (± how long the typical session-to-session - /// scatter could shift the crossing point), falling back to an R²-scaled - /// margin for legacy models without a stored error. - static ({DateTime optimistic, DateTime expected, DateTime pessimistic})? - predictTargetWithConfidence({ - required double currentValue, - required double targetValue, - required GrowthModel growthModel, - double sessionsPerWeek = 3.0, - }) { - final expected = MLService().predictTargetCompletion( - currentValue: currentValue, - targetValue: targetValue, - growthModel: growthModel, - sessionsPerWeek: sessionsPerWeek, - ); - if (expected == null) return null; - - final daysToTarget = expected.difference(DateTime.now()).inDays; - final int uncertainty; - if (growthModel.stdError > 0 && growthModel.slope > 0) { - uncertainty = (growthModel.stdError / growthModel.slope) - .ceil() - .clamp(0, max(1, daysToTarget)); - } else { - uncertainty = ((1 - growthModel.r2) * daysToTarget * 0.5).ceil(); - } - return ( - optimistic: expected.subtract(Duration(days: uncertainty)), - expected: expected, - pessimistic: expected.add(Duration(days: uncertainty)), - ); - } -} - -/// Internal weighted-least-squares result for one candidate curve. -class _Fit { - final double slope; - final double intercept; - final double r2; - final double rss; // weighted residual sum of squares (selection criterion) - final double stdError; - final bool degenerate; - - const _Fit({ - required this.slope, - required this.intercept, - required this.r2, - required this.rss, - required this.stdError, - required this.degenerate, - }); + }) => + _curveFitter.predictTargetCompletion( + currentValue: currentValue, + targetValue: targetValue, + growthModel: growthModel, + ); } diff --git a/workout-logger/lib/services/settings_provider.dart b/workout-logger/lib/services/settings_provider.dart index 164df92..a3ca124 100644 --- a/workout-logger/lib/services/settings_provider.dart +++ b/workout-logger/lib/services/settings_provider.dart @@ -2,6 +2,10 @@ import 'package:flutter/foundation.dart'; import 'package:package_info_plus/package_info_plus.dart'; +import 'ai/gemini_ai_service.dart' + show kDefaultMaxToolRounds, kMinMaxToolRounds, kMaxMaxToolRounds, + kDefaultThinkingLevel, kDefaultGeminiModel, kGeminiModels, + clampThinkingLevel; import 'interfaces/storage_service_interface.dart'; enum WeightUnit { kg, lbs } @@ -16,11 +20,15 @@ class SettingsProvider extends ChangeNotifier { String? _userName; String? _lastSeenVersion; String _geminiApiKey = ''; - String _geminiModel = 'gemini-2.5-flash'; + String _geminiModel = kDefaultGeminiModel; + int _geminiMaxToolRounds = kDefaultMaxToolRounds; + String _geminiThinkingLevel = kDefaultThinkingLevel; String _weeklyInsights = ''; DateTime? _weeklyInsightsDate; bool _showAdvancedMetrics = false; + double _userBodyWeight = 70.0; + WeightUnit get weightUnit => _weightUnit; double get weightIncrement => _weightIncrement; String get unitLabel => _weightUnit == WeightUnit.kg ? 'kg' : 'lbs'; @@ -30,9 +38,12 @@ class SettingsProvider extends ChangeNotifier { String? get lastSeenVersion => _lastSeenVersion; String get geminiApiKey => _geminiApiKey; String get geminiModel => _geminiModel; + int get geminiMaxToolRounds => _geminiMaxToolRounds; + String get geminiThinkingLevel => _geminiThinkingLevel; String get weeklyInsights => _weeklyInsights; DateTime? get weeklyInsightsDate => _weeklyInsightsDate; bool get showAdvancedMetrics => _showAdvancedMetrics; + double get userBodyWeight => _userBodyWeight; SettingsProvider(this._storage); @@ -45,6 +56,10 @@ class SettingsProvider extends ChangeNotifier { ? (double.tryParse(increment) ?? _defaultIncrement) : _defaultIncrement; + final bw = await _storage.getSetting('userBodyWeight'); + final parsedBw = bw != null ? double.tryParse(bw) : null; + _userBodyWeight = _isValidBodyWeight(parsedBw) ? parsedBw! : 70.0; + final hcEnabled = await _storage.getSetting('healthConnectEnabled'); _healthConnectEnabled = hcEnabled == 'true'; @@ -54,7 +69,24 @@ class SettingsProvider extends ChangeNotifier { _userName = await _storage.getSetting('userName'); _lastSeenVersion = await _storage.getSetting('lastSeenVersion'); _geminiApiKey = await _storage.getSetting('geminiApiKey') ?? ''; - _geminiModel = await _storage.getSetting('geminiModel') ?? 'gemini-2.5-flash'; + // Normalize on read: the picker only offers kGeminiModels, and a value + // left behind by an older build (the list has churned across releases) + // would match none of its items and trip DropdownButtonFormField's + // "exactly one item per value" assertion. + final storedModel = await _storage.getSetting('geminiModel'); + _geminiModel = _isKnownGeminiModel(storedModel) + ? storedModel! + : kDefaultGeminiModel; + final maxRounds = await _storage.getSetting('geminiMaxToolRounds'); + // Clamp on read as well as on write: a stored value from an older build or + // a hand-edited settings row would otherwise bypass the bounds that + // setGeminiMaxToolRounds enforces. + final parsedMaxRounds = maxRounds != null ? int.tryParse(maxRounds) : null; + _geminiMaxToolRounds = (parsedMaxRounds ?? kDefaultMaxToolRounds) + .clamp(kMinMaxToolRounds, kMaxMaxToolRounds); + final thinkingLevel = await _storage.getSetting('geminiThinkingLevel'); + _geminiThinkingLevel = + clampThinkingLevel(_geminiModel, thinkingLevel ?? kDefaultThinkingLevel); _weeklyInsights = await _storage.getSetting('weeklyInsights') ?? ''; final dateStr = await _storage.getSetting('weeklyInsightsDate'); _weeklyInsightsDate = dateStr != null ? DateTime.tryParse(dateStr) : null; @@ -62,6 +94,21 @@ class SettingsProvider extends ChangeNotifier { _showAdvancedMetrics = advMetrics == 'true'; } + /// Whether [model] is one the model picker actually offers. + static bool _isKnownGeminiModel(String? model) => + model != null && kGeminiModels.any((entry) => entry.$1 == model); + + /// A valid bodyweight must be finite (not NaN/Infinity) and strictly positive. + static bool _isValidBodyWeight(double? weight) => + weight != null && weight.isFinite && weight > 0; + + Future setUserBodyWeight(double weight) async { + if (!_isValidBodyWeight(weight)) return; + _userBodyWeight = weight; + await _storage.saveSetting('userBodyWeight', weight.toString()); + notifyListeners(); + } + Future setUserName(String name) async { _userName = name.trim(); await _storage.saveSetting('userName', _userName!); @@ -112,9 +159,52 @@ class SettingsProvider extends ChangeNotifier { notifyListeners(); } + /// Persists before committing in memory, for the same reason as + /// [setGeminiThinkingLevel]: the picker's onChanged drops this Future, so a + /// failed write must leave the previously saved model active rather than a + /// value that only exists in memory. Future setGeminiModel(String model) async { - _geminiModel = model; + final previousModel = _geminiModel; await _storage.saveSetting('geminiModel', model); + final clamped = clampThinkingLevel(model, _geminiThinkingLevel); + if (clamped != _geminiThinkingLevel) { + try { + await _storage.saveSetting('geminiThinkingLevel', clamped); + } catch (_) { + // The two writes are not a transaction. Without this the model write + // above survives, so a selection the UI reported as failed would come + // back as the active model on the next launch. + try { + await _storage.saveSetting('geminiModel', previousModel); + } catch (e, st) { + debugPrint('Failed to roll back Gemini model: $e\n$st'); + } + rethrow; + } + } + _geminiModel = model; + _geminiThinkingLevel = clamped; + notifyListeners(); + } + + /// Persists before committing in memory, for the same reason as + /// [setGeminiModel] and [setGeminiThinkingLevel]: the slider's onChangeEnd + /// drops this Future, so a failed write must not leave the provider holding + /// a limit that was never stored. + Future setGeminiMaxToolRounds(int rounds) async { + final clamped = rounds.clamp(kMinMaxToolRounds, kMaxMaxToolRounds); + await _storage.saveSetting('geminiMaxToolRounds', clamped.toString()); + _geminiMaxToolRounds = clamped; + notifyListeners(); + } + + /// Persists before committing in memory: the slider's onChangeEnd swallows + /// a throw from here, so assigning first would leave the provider showing a + /// level that was never written and never notified. + Future setGeminiThinkingLevel(String level) async { + final clamped = clampThinkingLevel(_geminiModel, level); + await _storage.saveSetting('geminiThinkingLevel', clamped); + _geminiThinkingLevel = clamped; notifyListeners(); } diff --git a/workout-logger/lib/services/sqlite_storage_service.dart b/workout-logger/lib/services/sqlite_storage_service.dart new file mode 100644 index 0000000..e012a3f --- /dev/null +++ b/workout-logger/lib/services/sqlite_storage_service.dart @@ -0,0 +1,1050 @@ +// SQLite-backed implementation of IStorageService — replaces Hive as the +// persistence backend. See docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md +// for the schema and migration design this implements. + +import 'dart:convert'; +import 'dart:io'; +import 'package:package_info_plus/package_info_plus.dart'; +import 'package:sqflite/sqflite.dart'; +import '../models/models.dart'; +import '../data/exercise_database.dart'; +import 'interfaces/storage_service_interface.dart'; + +class SqliteStorageService implements IStorageService { + SqliteStorageService({String? databasePathOverride}) + : _databasePathOverride = databasePathOverride, + _instanceId = _nextInstanceId++; + + static const String _dbName = 'repforge.db'; + static const int _dbVersion = 3; + + /// Dropped and rebuilt by the v2 → v3 upgrade. The health tables are a cache + /// of Health Connect, so rebuilding them costs one re-sync rather than user + /// data — and their old rows have no recoverable UTC instant to backfill + /// `utc_ts` from. + static const List _healthTables = [ + 'sleep_stage_intervals', + 'sleep_sessions', + 'health_samples', + ]; + static int _nextInstanceId = 0; + + /// Added in schema v2 (health sync), reshaped in v3. Kept separate from the + /// rest of [_schemaStatements] so `onUpgrade` can run exactly these + /// statements against older databases without re-running the full v1 DDL. + /// + /// Two clocks on purpose. `timestamp` / `start_ts` / `end_ts` are **local + /// wall-clock** with no offset, matching how every other table stores dates + /// (see `workout_sessions.date`), so the coach can join health data to + /// workouts on `date(...)` without timezone skew. `utc_ts` and + /// `sleep_sessions.id` are the **UTC instant**, and carry identity: a local + /// string is ambiguous across a DST fall-back, where the repeated hour maps + /// two distinct instants onto one string and the upserts below would discard + /// one of them. + static const List _healthSchemaStatements = [ + '''CREATE TABLE IF NOT EXISTS health_samples ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + type TEXT NOT NULL, + timestamp TEXT NOT NULL, + utc_ts TEXT NOT NULL, + value REAL NOT NULL + )''', + 'CREATE UNIQUE INDEX IF NOT EXISTS idx_health_samples_unique ON health_samples(type, utc_ts)', + '''CREATE TABLE IF NOT EXISTS sleep_sessions ( + id TEXT PRIMARY KEY, + start_ts TEXT NOT NULL, + end_ts TEXT NOT NULL, + light_min INTEGER, + deep_min INTEGER, + rem_min INTEGER, + awake_min INTEGER + )''', + 'CREATE INDEX IF NOT EXISTS idx_sleep_sessions_start ON sleep_sessions(start_ts)', + '''CREATE TABLE IF NOT EXISTS sleep_stage_intervals ( + sleep_session_id TEXT NOT NULL, + start_ts TEXT NOT NULL, + end_ts TEXT NOT NULL, + stage TEXT NOT NULL + )''', + 'CREATE INDEX IF NOT EXISTS idx_sleep_stage_session ON sleep_stage_intervals(sleep_session_id)', + ]; + + static const List _schemaStatements = [ + '''CREATE TABLE exercises ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + category TEXT NOT NULL, + is_custom INTEGER NOT NULL DEFAULT 0, + available_handles TEXT + )''', + '''CREATE TABLE muscle_groups ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + growth_rate REAL NOT NULL DEFAULT 0, + last_updated TEXT NOT NULL + )''', + '''CREATE TABLE exercise_muscle_activations ( + exercise_id TEXT NOT NULL, + muscle_group_id TEXT NOT NULL, + activation_percentage INTEGER NOT NULL + )''', + '''CREATE TABLE routines ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + created_at TEXT NOT NULL + )''', + '''CREATE TABLE routine_exercises ( + routine_id TEXT NOT NULL, + exercise_id TEXT NOT NULL, + position INTEGER NOT NULL + )''', + '''CREATE TABLE sessions ( + id TEXT PRIMARY KEY, + date TEXT NOT NULL, + routine_id TEXT, + duration_min INTEGER NOT NULL, + notes TEXT, + hc_synced_at TEXT + )''', + '''CREATE TABLE exercise_logs ( + id TEXT PRIMARY KEY, + session_id TEXT NOT NULL, + exercise_id TEXT NOT NULL, + notes TEXT, + handle TEXT + )''', + '''CREATE TABLE sets ( + id TEXT PRIMARY KEY, + exercise_log_id TEXT NOT NULL, + weight REAL NOT NULL, + reps INTEGER NOT NULL, + is_dropset INTEGER NOT NULL DEFAULT 0, + drops_json TEXT, + time_taken INTEGER, + timestamp TEXT NOT NULL, + assist_weight REAL, + extra_weight REAL, + body_weight_at_log REAL, + handle TEXT + )''', + '''CREATE TABLE targets ( + id TEXT PRIMARY KEY, + exercise_id TEXT NOT NULL, + target_type TEXT NOT NULL, + target_value REAL NOT NULL, + current_value REAL NOT NULL DEFAULT 0, + estimated_completion_date TEXT, + created_at TEXT NOT NULL, + is_completed INTEGER NOT NULL DEFAULT 0 + )''', + '''CREATE TABLE personal_records ( + exercise_id TEXT PRIMARY KEY, + best_weight REAL NOT NULL, + best_reps INTEGER NOT NULL, + best_volume REAL NOT NULL, + achieved_at TEXT NOT NULL + )''', + '''CREATE TABLE training_programs ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + description TEXT, + total_weeks INTEGER NOT NULL, + author TEXT, + is_imported INTEGER NOT NULL DEFAULT 0, + created_at TEXT NOT NULL, + phases_json TEXT NOT NULL, + weeks_json TEXT NOT NULL + )''', + '''CREATE TABLE conversations ( + id TEXT PRIMARY KEY, + title TEXT NOT NULL, + kind TEXT NOT NULL DEFAULT 'coach', + created_at TEXT NOT NULL, + updated_at TEXT NOT NULL, + messages_json TEXT NOT NULL + )''', + '''CREATE TABLE settings ( + key TEXT PRIMARY KEY, + value TEXT + )''', + 'CREATE INDEX idx_sets_exercise_log ON sets(exercise_log_id)', + 'CREATE INDEX idx_exercise_logs_session ON exercise_logs(session_id)', + 'CREATE INDEX idx_exercise_logs_exercise ON exercise_logs(exercise_id)', + 'CREATE INDEX idx_sessions_date ON sessions(date)', + ..._healthSchemaStatements, + ]; + + final String? _databasePathOverride; + final int _instanceId; + late Database _db; + bool _initialized = false; + + String _appVersion = const String.fromEnvironment( + 'APP_VERSION', + defaultValue: 'unknown', + ); + + /// File path of the open database — used by SqlQueryService to open a + /// separate read-only connection for the coach's SQL tool. + String get databasePath => _db.path; + + Future close() async { + if (!_initialized) return; + await _db.close(); + _initialized = false; + } + + @override + Future init() async { + if (_initialized) return; + + try { + final packageInfo = await PackageInfo.fromPlatform(); + final version = packageInfo.version; + final buildNumber = packageInfo.buildNumber; + _appVersion = buildNumber.isNotEmpty ? '$version+$buildNumber' : version; + } catch (_) { + // Keep build-time fallback in environments without platform metadata. + } + + var dbPath = _databasePathOverride ?? '${await getDatabasesPath()}/$_dbName'; + + // For in-memory databases in tests, create unique isolated databases per instance + // to support multiple concurrent test databases. Uses temp files because sqflite FFI's + // shared-cache memory URIs don't support read-only secondary connections. + if (dbPath == ':memory:') { + dbPath = '${Directory.systemTemp.path}${Platform.pathSeparator}repforge_test_${DateTime.now().microsecondsSinceEpoch}_$_instanceId.db'; + } + + _db = await openDatabase( + dbPath, + version: _dbVersion, + onCreate: (db, version) async { + for (final statement in _schemaStatements) { + await db.execute(statement); + } + }, + onUpgrade: (db, oldVersion, newVersion) async { + if (oldVersion < 2) { + for (final statement in _healthSchemaStatements) { + await db.execute(statement); + } + } else if (oldVersion < 3) { + // v2 keyed health rows by a local-time string, which collides across + // a DST fall-back. Rebuild the tables on the v3 shape and clear the + // sync watermarks so the next run re-pulls the window from Health + // Connect; nothing here is user-authored data. + for (final table in _healthTables) { + await db.execute('DROP TABLE IF EXISTS $table'); + } + for (final statement in _healthSchemaStatements) { + await db.execute(statement); + } + await db.delete( + 'settings', + where: 'key LIKE ?', + whereArgs: ['health_sync.%'], + ); + } + }, + ); + + final count = Sqflite.firstIntValue( + await _db.rawQuery('SELECT COUNT(*) FROM muscle_groups'), + ) ?? + 0; + if (count == 0) { + await _seedDefaultMuscleGroups(); + } + + _initialized = true; + } + + Future _seedDefaultMuscleGroups() async { + final batch = _db.batch(); + for (final mg in MuscleGroups.getAll()) { + batch.insert('muscle_groups', { + 'id': mg.id, + 'name': mg.name, + 'growth_rate': mg.growthRate, + 'last_updated': mg.lastUpdated.toIso8601String(), + }); + } + await batch.commit(noResult: true); + } + + // ==================== WORKOUT SESSIONS ==================== + + @override + Future saveWorkoutSession(WorkoutSession session) async { + await _db.transaction((txn) async { + final oldLogs = await txn.query( + 'exercise_logs', + columns: ['id'], + where: 'session_id = ?', + whereArgs: [session.id], + ); + for (final row in oldLogs) { + await txn.delete('sets', where: 'exercise_log_id = ?', whereArgs: [row['id']]); + } + await txn.delete('exercise_logs', where: 'session_id = ?', whereArgs: [session.id]); + await txn.delete('sessions', where: 'id = ?', whereArgs: [session.id]); + + await txn.insert('sessions', { + 'id': session.id, + 'date': session.date.toIso8601String(), + 'routine_id': session.routineId, + 'duration_min': session.duration, + 'notes': session.notes, + 'hc_synced_at': session.hcSyncedAt?.toIso8601String(), + }); + + for (var i = 0; i < session.exercises.length; i++) { + final log = session.exercises[i]; + final logId = '${session.id}_$i'; + await txn.insert('exercise_logs', { + 'id': logId, + 'session_id': session.id, + 'exercise_id': log.exerciseId, + 'notes': log.notes, + 'handle': log.handle, + }); + for (var j = 0; j < log.sets.length; j++) { + final set = log.sets[j]; + await txn.insert('sets', { + 'id': '${logId}_$j', + 'exercise_log_id': logId, + 'weight': set.weight, + 'reps': set.reps, + 'is_dropset': set.isDropset ? 1 : 0, + 'drops_json': set.drops == null + ? null + : jsonEncode(set.drops!.map((d) => d.toJson()).toList()), + 'time_taken': set.timeTaken, + 'timestamp': set.timestamp.toIso8601String(), + 'assist_weight': set.assistWeight, + 'extra_weight': set.extraWeight, + 'body_weight_at_log': set.bodyWeightAtLog, + 'handle': set.handle, + }); + } + } + }); + } + + Future> _loadSessions({String? where, List? whereArgs}) async { + final sessionRows = await _db.query('sessions', where: where, whereArgs: whereArgs); + final sessions = []; + for (final row in sessionRows) { + final sessionId = row['id'] as String; + final logRows = await _db.query( + 'exercise_logs', + where: 'session_id = ?', + whereArgs: [sessionId], + // rowid, not id: ids are synthetic strings like "sess1_10", and + // string ordering would sort "_10" before "_2" once a session has 10+ + // exercises. rowid preserves actual insertion order regardless of id. + orderBy: 'rowid ASC', + ); + final exerciseLogs = []; + for (final logRow in logRows) { + final logId = logRow['id'] as String; + final setRows = await _db.query( + 'sets', + where: 'exercise_log_id = ?', + whereArgs: [logId], + // Same reasoning as above — an exercise log with 10+ sets would + // otherwise be misordered by lexicographic id comparison. + orderBy: 'rowid ASC', + ); + final sets = setRows + .map((s) => WorkoutSet( + weight: (s['weight'] as num).toDouble(), + reps: s['reps'] as int, + isDropset: (s['is_dropset'] as int) == 1, + drops: s['drops_json'] == null + ? null + : (jsonDecode(s['drops_json'] as String) as List) + .map((d) => DropsetEntry.fromJson(d as Map)) + .toList(), + timeTaken: s['time_taken'] as int?, + timestamp: DateTime.parse(s['timestamp'] as String), + assistWeight: (s['assist_weight'] as num?)?.toDouble(), + extraWeight: (s['extra_weight'] as num?)?.toDouble(), + bodyWeightAtLog: (s['body_weight_at_log'] as num?)?.toDouble(), + handle: s['handle'] as String?, + )) + .toList(); + exerciseLogs.add(ExerciseLog( + exerciseId: logRow['exercise_id'] as String, + sets: sets, + notes: logRow['notes'] as String?, + handle: logRow['handle'] as String?, + )); + } + sessions.add(WorkoutSession( + id: sessionId, + date: DateTime.parse(row['date'] as String), + routineId: row['routine_id'] as String?, + exercises: exerciseLogs, + duration: row['duration_min'] as int, + notes: row['notes'] as String?, + hcSyncedAt: row['hc_synced_at'] == null + ? null + : DateTime.parse(row['hc_synced_at'] as String), + )); + } + sessions.sort((a, b) => b.date.compareTo(a.date)); + return sessions; + } + + @override + Future> getAllWorkoutSessions() => _loadSessions(); + + @override + Future getWorkoutSession(String id) async { + final result = await _loadSessions(where: 'id = ?', whereArgs: [id]); + return result.isEmpty ? null : result.first; + } + + @override + Future deleteWorkoutSession(String id) async { + await _db.transaction((txn) async { + final logRows = await txn.query( + 'exercise_logs', + columns: ['id'], + where: 'session_id = ?', + whereArgs: [id], + ); + for (final row in logRows) { + await txn.delete('sets', where: 'exercise_log_id = ?', whereArgs: [row['id']]); + } + await txn.delete('exercise_logs', where: 'session_id = ?', whereArgs: [id]); + await txn.delete('sessions', where: 'id = ?', whereArgs: [id]); + }); + } + + @override + Future> getSessionsForExercise(String exerciseId) async { + final all = await getAllWorkoutSessions(); + return all.where((s) => s.exercises.any((e) => e.exerciseId == exerciseId)).toList(); + } + + @override + Future> getSessionsInDateRange(DateTime start, DateTime end) async { + final all = await getAllWorkoutSessions(); + final lo = start.isAfter(end) ? end : start; + final hi = start.isAfter(end) ? start : end; + return all.where((s) => !s.date.isBefore(lo) && !s.date.isAfter(hi)).toList(); + } + + // ==================== ROUTINES ==================== + + @override + Future saveRoutine(Routine routine) async { + await _db.transaction((txn) async { + await txn.delete('routine_exercises', where: 'routine_id = ?', whereArgs: [routine.id]); + await txn.insert( + 'routines', + { + 'id': routine.id, + 'name': routine.name, + 'created_at': routine.createdAt.toIso8601String(), + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + for (var i = 0; i < routine.exerciseIds.length; i++) { + await txn.insert('routine_exercises', { + 'routine_id': routine.id, + 'exercise_id': routine.exerciseIds[i], + 'position': i, + }); + } + }); + } + + Future _loadRoutineRow(Map row) async { + final exRows = await _db.query( + 'routine_exercises', + where: 'routine_id = ?', + whereArgs: [row['id']], + orderBy: 'position ASC', + ); + return Routine( + id: row['id'] as String, + name: row['name'] as String, + exerciseIds: exRows.map((r) => r['exercise_id'] as String).toList(), + createdAt: DateTime.parse(row['created_at'] as String), + ); + } + + @override + Future> getAllRoutines() async { + final rows = await _db.query('routines'); + final result = []; + for (final row in rows) { + result.add(await _loadRoutineRow(row)); + } + return result; + } + + @override + Future getRoutine(String id) async { + final rows = await _db.query('routines', where: 'id = ?', whereArgs: [id]); + if (rows.isEmpty) return null; + return _loadRoutineRow(rows.first); + } + + @override + Future deleteRoutine(String id) async { + await _db.transaction((txn) async { + await txn.delete('routine_exercises', where: 'routine_id = ?', whereArgs: [id]); + await txn.delete('routines', where: 'id = ?', whereArgs: [id]); + }); + } + + // ==================== TARGETS ==================== + + @override + Future saveTarget(Target target) async { + await _db.insert( + 'targets', + { + 'id': target.id, + 'exercise_id': target.exerciseId, + 'target_type': target.targetType, + 'target_value': target.targetValue, + 'current_value': target.currentValue, + 'estimated_completion_date': target.estimatedCompletionDate?.toIso8601String(), + 'created_at': target.createdAt.toIso8601String(), + 'is_completed': target.isCompleted ? 1 : 0, + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + } + + Target _targetFromRow(Map row) => Target( + id: row['id'] as String, + exerciseId: row['exercise_id'] as String, + targetType: row['target_type'] as String, + targetValue: (row['target_value'] as num).toDouble(), + currentValue: (row['current_value'] as num).toDouble(), + estimatedCompletionDate: row['estimated_completion_date'] == null + ? null + : DateTime.parse(row['estimated_completion_date'] as String), + createdAt: DateTime.parse(row['created_at'] as String), + isCompleted: (row['is_completed'] as int) == 1, + ); + + @override + Future> getAllTargets() async { + final rows = await _db.query('targets'); + return rows.map(_targetFromRow).toList(); + } + + @override + Future getTarget(String id) async { + final rows = await _db.query('targets', where: 'id = ?', whereArgs: [id]); + return rows.isEmpty ? null : _targetFromRow(rows.first); + } + + @override + Future deleteTarget(String id) async { + await _db.delete('targets', where: 'id = ?', whereArgs: [id]); + } + + @override + Future> getTargetsForExercise(String exerciseId) async { + final rows = await _db.query('targets', where: 'exercise_id = ?', whereArgs: [exerciseId]); + return rows.map(_targetFromRow).toList(); + } + + // ==================== MUSCLE GROUPS ==================== + + @override + Future updateMuscleGroupGrowthRate(String muscleGroupId, double rate) async { + await _db.update( + 'muscle_groups', + {'growth_rate': rate, 'last_updated': DateTime.now().toIso8601String()}, + where: 'id = ?', + whereArgs: [muscleGroupId], + ); + } + + MuscleGroup _muscleGroupFromRow(Map row) => MuscleGroup( + id: row['id'] as String, + name: row['name'] as String, + growthRate: (row['growth_rate'] as num).toDouble(), + lastUpdated: DateTime.parse(row['last_updated'] as String), + ); + + @override + Future> getAllMuscleGroups() async { + final rows = await _db.query('muscle_groups'); + return rows.map(_muscleGroupFromRow).toList(); + } + + @override + Future getMuscleGroup(String id) async { + final rows = await _db.query('muscle_groups', where: 'id = ?', whereArgs: [id]); + return rows.isEmpty ? null : _muscleGroupFromRow(rows.first); + } + + // ==================== CUSTOM EXERCISES ==================== + + @override + Future saveCustomExercise(Exercise exercise) async { + await _db.transaction((txn) async { + await txn.delete('exercise_muscle_activations', where: 'exercise_id = ?', whereArgs: [exercise.id]); + await txn.insert( + 'exercises', + { + 'id': exercise.id, + 'name': exercise.name, + 'category': exercise.category, + 'is_custom': 1, + 'available_handles': + exercise.availableHandles == null ? null : jsonEncode(exercise.availableHandles), + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + for (final ma in exercise.muscleActivations) { + await txn.insert('exercise_muscle_activations', { + 'exercise_id': exercise.id, + 'muscle_group_id': ma.muscleGroupId, + 'activation_percentage': ma.activationPercentage, + }); + } + }); + } + + Future _loadCustomExerciseRow(Map row) async { + final activations = await _db.query( + 'exercise_muscle_activations', + where: 'exercise_id = ?', + whereArgs: [row['id']], + ); + return Exercise( + id: row['id'] as String, + name: row['name'] as String, + category: row['category'] as String, + isCustom: true, + availableHandles: row['available_handles'] == null + ? null + : (jsonDecode(row['available_handles'] as String) as List).cast(), + muscleActivations: activations + .map((a) => MuscleActivation( + muscleGroupId: a['muscle_group_id'] as String, + activationPercentage: a['activation_percentage'] as int, + )) + .toList(), + ); + } + + @override + Future> getCustomExercises() async { + final rows = await _db.query('exercises', where: 'is_custom = 1'); + final result = []; + for (final row in rows) { + result.add(await _loadCustomExerciseRow(row)); + } + return result; + } + + @override + Future deleteCustomExercise(String id) async { + await _db.transaction((txn) async { + await txn.delete('exercise_muscle_activations', where: 'exercise_id = ?', whereArgs: [id]); + await txn.delete('exercises', where: 'id = ?', whereArgs: [id]); + }); + } + + @override + Future> getAllExercises() async { + final builtIn = ExerciseDatabase.getAll(); + final custom = await getCustomExercises(); + return [...builtIn, ...custom]; + } + + @override + Future getExercise(String id) async { + final builtIn = ExerciseDatabase.getById(id); + if (builtIn != null) return builtIn; + final rows = await _db.query('exercises', where: 'id = ?', whereArgs: [id]); + if (rows.isEmpty) return null; + return _loadCustomExerciseRow(rows.first); + } + + // ==================== SETTINGS ==================== + + @override + Future saveSetting(String key, String value) async { + await _db.insert('settings', {'key': key, 'value': value}, + conflictAlgorithm: ConflictAlgorithm.replace); + } + + @override + Future getSetting(String key) async { + final rows = await _db.query('settings', where: 'key = ?', whereArgs: [key]); + return rows.isEmpty ? null : rows.first['value'] as String?; + } + + // ==================== TRAINING PROGRAMS ==================== + + @override + Future saveTrainingProgram(TrainingProgram program) async { + await _db.insert( + 'training_programs', + { + 'id': program.id, + 'name': program.name, + 'description': program.description, + 'total_weeks': program.totalWeeks, + 'author': program.author, + 'is_imported': program.isImported ? 1 : 0, + 'created_at': program.createdAt.toIso8601String(), + 'phases_json': jsonEncode(program.phases.map((p) => p.toJson()).toList()), + 'weeks_json': jsonEncode(program.weeks.map((w) => w.toJson()).toList()), + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + } + + TrainingProgram _programFromRow(Map row) => TrainingProgram( + id: row['id'] as String, + name: row['name'] as String, + description: row['description'] as String?, + totalWeeks: row['total_weeks'] as int, + phases: (jsonDecode(row['phases_json'] as String) as List) + .map((p) => TrainingPhase.fromJson(p as Map)) + .toList(), + weeks: (jsonDecode(row['weeks_json'] as String) as List) + .map((w) => ProgramWeek.fromJson(w as Map)) + .toList(), + author: row['author'] as String?, + isImported: (row['is_imported'] as int) == 1, + createdAt: DateTime.parse(row['created_at'] as String), + ); + + @override + Future> getAllTrainingPrograms() async { + final rows = await _db.query('training_programs', orderBy: 'created_at DESC'); + return rows.map(_programFromRow).toList(); + } + + @override + Future getTrainingProgram(String id) async { + final rows = await _db.query('training_programs', where: 'id = ?', whereArgs: [id]); + return rows.isEmpty ? null : _programFromRow(rows.first); + } + + @override + Future deleteTrainingProgram(String id) async { + await _db.delete('training_programs', where: 'id = ?', whereArgs: [id]); + } + + // ==================== PERSONAL RECORDS ==================== + + @override + Future savePersonalRecord(PersonalRecord record) async { + await _db.insert( + 'personal_records', + { + 'exercise_id': record.exerciseId, + 'best_weight': record.bestWeight, + 'best_reps': record.bestReps, + 'best_volume': record.bestVolume, + 'achieved_at': record.achievedAt.toIso8601String(), + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + } + + PersonalRecord _prFromRow(Map row) => PersonalRecord( + exerciseId: row['exercise_id'] as String, + bestWeight: (row['best_weight'] as num).toDouble(), + bestReps: row['best_reps'] as int, + bestVolume: (row['best_volume'] as num).toDouble(), + achievedAt: DateTime.parse(row['achieved_at'] as String), + ); + + @override + Future getPersonalRecord(String exerciseId) async { + final rows = await _db.query('personal_records', where: 'exercise_id = ?', whereArgs: [exerciseId]); + return rows.isEmpty ? null : _prFromRow(rows.first); + } + + @override + Future> getAllPersonalRecords() async { + final rows = await _db.query('personal_records'); + return rows.map(_prFromRow).toList(); + } + + // ==================== AI CONVERSATIONS ==================== + + @override + Future saveConversation(Conversation conversation) async { + await _db.insert( + 'conversations', + { + 'id': conversation.id, + 'title': conversation.title, + 'kind': conversation.kind, + 'created_at': conversation.createdAt.toIso8601String(), + 'updated_at': conversation.updatedAt.toIso8601String(), + 'messages_json': jsonEncode(conversation.messages.map((m) => m.toJson()).toList()), + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + } + + Conversation _conversationFromRow(Map row) => Conversation( + id: row['id'] as String, + title: row['title'] as String, + kind: row['kind'] as String, + createdAt: DateTime.parse(row['created_at'] as String), + updatedAt: DateTime.parse(row['updated_at'] as String), + messages: (jsonDecode(row['messages_json'] as String) as List) + .map((m) => ChatMessage.fromJson(m as Map)) + .toList(), + ); + + @override + Future> getAllConversations() async { + final rows = await _db.query('conversations', orderBy: 'updated_at DESC'); + return rows.map(_conversationFromRow).toList(); + } + + @override + Future getConversation(String id) async { + final rows = await _db.query('conversations', where: 'id = ?', whereArgs: [id]); + return rows.isEmpty ? null : _conversationFromRow(rows.first); + } + + @override + Future deleteConversation(String id) async { + await _db.delete('conversations', where: 'id = ?', whereArgs: [id]); + } + + // ==================== STATS ==================== + + @override + Future> getQuickStats() async { + final sessions = await getAllWorkoutSessions(); + final now = DateTime.now(); + final weekAgo = now.subtract(const Duration(days: 7)); + final weekSessions = sessions.where((s) => s.date.isAfter(weekAgo)).toList(); + + double weeklyVolume = 0; + int exercisesCompleted = 0; + for (final session in weekSessions) { + weeklyVolume += session.totalVolume; + exercisesCompleted += session.exercises.length; + } + + return { + 'totalWorkouts': sessions.length, + 'weeklyWorkouts': weekSessions.length, + 'weeklyVolume': weeklyVolume, + 'exercisesThisWeek': exercisesCompleted, + }; + } + + // ==================== HEALTH DATA (coach SQL joins only) ==================== + // Written by HealthDataSyncService; never read through IStorageService — + // consumed only via the coach's run_sql_query tool. See + // docs/superpowers/specs/2026-08-11-health-data-sync-and-coach-sql-design.md. + + Future upsertHealthSamples(String type, List samples) async { + if (samples.isEmpty) return; + final batch = _db.batch(); + for (final s in samples) { + batch.insert( + 'health_samples', + { + 'type': type, + // Local for date joins, UTC for identity — see + // [_healthSchemaStatements]. + 'timestamp': s.time.toLocal().toIso8601String(), + 'utc_ts': s.time.toUtc().toIso8601String(), + 'value': s.value, + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + } + await batch.commit(noResult: true); + } + + Future upsertSleepSessions(List periods) async { + if (periods.isEmpty) return; + await _db.transaction((txn) async { + for (final p in periods) { + // UTC instant, not local: two sessions starting in the repeated hour of + // a DST fall-back share a local string and would collide on this key. + final id = p.start.toUtc().toIso8601String(); + await txn.delete( + 'sleep_stage_intervals', + where: 'sleep_session_id = ?', + whereArgs: [id], + ); + await txn.insert( + 'sleep_sessions', + { + 'id': id, + 'start_ts': p.start.toLocal().toIso8601String(), + 'end_ts': p.end.toLocal().toIso8601String(), + 'light_min': p.lightMinutes, + 'deep_min': p.deepMinutes, + 'rem_min': p.remMinutes, + 'awake_min': p.awakeMinutes, + }, + conflictAlgorithm: ConflictAlgorithm.replace, + ); + for (final seg in p.stageTimeline) { + await txn.insert('sleep_stage_intervals', { + 'sleep_session_id': id, + 'start_ts': seg.start.toLocal().toIso8601String(), + 'end_ts': seg.end.toLocal().toIso8601String(), + 'stage': seg.stage, + }); + } + } + }); + } + + // ==================== EXPORT / IMPORT ==================== + + Map? _normalizeImportItem(dynamic item) { + if (item is Map) return item; + if (item is Map) return Map.from(item); + if (item is String) { + try { + final decoded = jsonDecode(item); + if (decoded is Map) return Map.from(decoded); + } catch (_) { + return null; + } + } + return null; + } + + @override + Future exportAllData() async { + final sessions = await getAllWorkoutSessions(); + final routines = await getAllRoutines(); + final targets = await getAllTargets(); + final muscleGroups = await getAllMuscleGroups(); + final customExercises = await getCustomExercises(); + final conversations = await getAllConversations(); + final settingsRows = await _db.query('settings'); + final settingsMap = { + for (final row in settingsRows) + if (row['value'] != null) row['key'] as String: row['value'] as String, + }; + + final data = { + 'sessions': sessions.map((s) => s.toJson()).toList(), + 'routines': routines.map((r) => r.toJson()).toList(), + 'targets': targets.map((t) => t.toJson()).toList(), + 'muscleGroups': muscleGroups.map((m) => m.toJson()).toList(), + 'customExercises': customExercises.map((e) => e.toJson()).toList(), + 'conversations': conversations.map((c) => c.toJson()).toList(), + 'settings': settingsMap, + 'exportDate': DateTime.now().toIso8601String(), + 'appVersion': _appVersion, + }; + return jsonEncode(data); + } + + @override + Future importData(String jsonData) async { + final data = jsonDecode(jsonData) as Map; + + final sessions = data['sessions']; + if (sessions is List) { + for (final item in sessions) { + final map = _normalizeImportItem(item); + if (map == null) continue; + final session = WorkoutSession.fromJson(map); + if (await getWorkoutSession(session.id) == null) { + await saveWorkoutSession(session); + } + } + } + + final routines = data['routines']; + if (routines is List) { + for (final item in routines) { + final map = _normalizeImportItem(item); + if (map == null) continue; + final routine = Routine.fromJson(map); + if (await getRoutine(routine.id) == null) { + await saveRoutine(routine); + } + } + } + + final targets = data['targets']; + if (targets is List) { + for (final item in targets) { + final map = _normalizeImportItem(item); + if (map == null) continue; + final target = Target.fromJson(map); + if (await getTarget(target.id) == null) { + await saveTarget(target); + } + } + } + + final muscleGroups = data['muscleGroups']; + if (muscleGroups is List) { + for (final item in muscleGroups) { + final map = _normalizeImportItem(item); + if (map == null) continue; + final mg = MuscleGroup.fromJson(map); + if (await getMuscleGroup(mg.id) == null) { + await _db.insert('muscle_groups', { + 'id': mg.id, + 'name': mg.name, + 'growth_rate': mg.growthRate, + 'last_updated': mg.lastUpdated.toIso8601String(), + }); + } + } + } + + final customExercises = data['customExercises']; + if (customExercises is List) { + for (final item in customExercises) { + final map = _normalizeImportItem(item); + if (map == null) continue; + final exercise = Exercise.fromJson(map); + final rows = await _db.query('exercises', where: 'id = ?', whereArgs: [exercise.id]); + if (rows.isEmpty) { + await saveCustomExercise(exercise); + } + } + } + + if (data['settings'] is Map) { + final settings = data['settings'] as Map; + for (final entry in settings.entries) { + if (await getSetting(entry.key) == null) { + await saveSetting(entry.key, entry.value.toString()); + } + } + } + + final conversations = data['conversations']; + if (conversations is List) { + for (final item in conversations) { + final map = _normalizeImportItem(item); + if (map == null) continue; + final conversation = Conversation.fromJson(map); + if (await getConversation(conversation.id) == null) { + await saveConversation(conversation); + } + } + } + } +} diff --git a/workout-logger/lib/services/storage_backend_resolver.dart b/workout-logger/lib/services/storage_backend_resolver.dart new file mode 100644 index 0000000..2af4e47 --- /dev/null +++ b/workout-logger/lib/services/storage_backend_resolver.dart @@ -0,0 +1,37 @@ +// Decides which storage backend the app should use: SQLite if already +// migrated, otherwise runs the one-time migration and falls back to Hive +// on any failure. Pure decision logic, factored out of main.dart's +// _resolveStorageBackend so it's directly testable without booting Flutter. + +import 'package:flutter/foundation.dart'; + +import 'interfaces/storage_service_interface.dart'; +import 'storage_service.dart'; +import 'sqlite_storage_service.dart'; +import 'storage_migration_service.dart'; + +const storageMigratedFlagKey = 'storage_migrated_v1'; + +/// Given the already-initialized Hive and SQLite storage instances and +/// whether the migration flag was already set, decides which backend to +/// use — running the one-time migration and writing the flag on success, +/// or falling back to Hive on any failure. Does not call init() on either +/// argument; the caller is responsible for that. +Future resolveStorageBackend({ + required StorageService hiveStorage, + required SqliteStorageService sqliteStorage, + required bool alreadyMigrated, +}) async { + if (alreadyMigrated) { + return sqliteStorage; + } + + try { + await StorageMigrationService(hiveStorage, sqliteStorage).migrate(); + await hiveStorage.saveSetting(storageMigratedFlagKey, 'true'); + return sqliteStorage; + } catch (e, st) { + debugPrint('Storage migration to SQLite failed, staying on Hive: $e\n$st'); + return hiveStorage; + } +} diff --git a/workout-logger/lib/services/storage_migration_service.dart b/workout-logger/lib/services/storage_migration_service.dart new file mode 100644 index 0000000..695d251 --- /dev/null +++ b/workout-logger/lib/services/storage_migration_service.dart @@ -0,0 +1,47 @@ +// One-time migration from the Hive-backed StorageService to +// SqliteStorageService. Reads exclusively through StorageService's existing, +// already-correct read methods; writes exclusively through +// SqliteStorageService's write methods. Throws on any failure — the caller +// (main.dart) decides whether to fall back to Hive. See +// docs/superpowers/specs/2026-08-08-sqlite-migration-and-coach-sql-tool-design.md §6. + +import 'storage_service.dart'; +import 'sqlite_storage_service.dart'; + +class StorageMigrationService { + StorageMigrationService(this._source, this._target); + + final StorageService _source; + final SqliteStorageService _target; + + Future migrate() async { + for (final session in await _source.getAllWorkoutSessions()) { + await _target.saveWorkoutSession(session); + } + for (final routine in await _source.getAllRoutines()) { + await _target.saveRoutine(routine); + } + for (final target in await _source.getAllTargets()) { + await _target.saveTarget(target); + } + for (final mg in await _source.getAllMuscleGroups()) { + await _target.updateMuscleGroupGrowthRate(mg.id, mg.growthRate); + } + for (final exercise in await _source.getCustomExercises()) { + await _target.saveCustomExercise(exercise); + } + for (final record in await _source.getAllPersonalRecords()) { + await _target.savePersonalRecord(record); + } + for (final program in await _source.getAllTrainingPrograms()) { + await _target.saveTrainingProgram(program); + } + for (final conversation in await _source.getAllConversations()) { + await _target.saveConversation(conversation); + } + final settings = await _source.getAllSettingsForMigration(); + for (final entry in settings.entries) { + await _target.saveSetting(entry.key, entry.value); + } + } +} diff --git a/workout-logger/lib/services/storage_service.dart b/workout-logger/lib/services/storage_service.dart index 873de63..ac5c284 100644 --- a/workout-logger/lib/services/storage_service.dart +++ b/workout-logger/lib/services/storage_service.dart @@ -308,6 +308,18 @@ class StorageService implements IStorageService { return _settingsBoxInstance.get(key); } + /// Every stored setting key/value. Used only by [StorageMigrationService] + /// to migrate the settings box to the SQLite backend — not part of + /// [IStorageService] since no other consumer needs to enumerate all keys. + Future> getAllSettingsForMigration() async { + final map = {}; + for (final key in _settingsBoxInstance.keys) { + final value = _settingsBoxInstance.get(key); + if (value != null) map[key as String] = value; + } + return map; + } + // ==================== EXPORT / IMPORT ==================== dynamic _normalizeExportValue(dynamic value) { @@ -344,14 +356,7 @@ class StorageService implements IStorageService { @override Future exportAllData() async { - // Collect settings as a map - final settingsMap = {}; - for (final key in _settingsBoxInstance.keys) { - final value = _settingsBoxInstance.get(key); - if (value != null) { - settingsMap[key as String] = value; - } - } + final settingsMap = await getAllSettingsForMigration(); final data = { 'sessions': _sessionsBox.values diff --git a/workout-logger/lib/services/strategies/growth_curve_fitter.dart b/workout-logger/lib/services/strategies/growth_curve_fitter.dart new file mode 100644 index 0000000..dece3d0 --- /dev/null +++ b/workout-logger/lib/services/strategies/growth_curve_fitter.dart @@ -0,0 +1,298 @@ +// Growth Curve Fitter (Single Responsibility Principle) +// +// Owns the growth-modelling math extracted from MLService: exponentially- +// weighted least squares fit of two candidate curves — linear and +// logarithmic (saturating) — each refined with one robust (Tukey bisquare) +// re-weighting pass so single outlier sessions (deloads, cut-short workouts) +// don't tilt the trend. The better-fitting curve wins; the logarithmic form +// captures the diminishing returns real muscle growth follows, which a +// straight line systematically overshoots. Also owns projecting the fitted +// curve forward to a target value/date. + +import 'dart:math'; + +import '../../models/models.dart'; +import '../interfaces/ml_service_interface.dart'; + +/// Abstract strategy for fitting a growth curve and projecting it forward. +/// +/// Extracted so `MLService` can depend on the abstraction (Dependency +/// Inversion) and a test double can be substituted without pulling in the +/// real WLS/Tukey math. +abstract class IGrowthCurveFitter { + /// Fits linear and logarithmic candidates with exponential recency weights + /// (weight for point i of n: exp(−λ·(n−1−i))) plus one robust re-weighting + /// pass each, then selects the better curve by weighted residual error. + GrowthModel fit(List dataPoints); + + /// Projects the fitted curve forward to the target (x = days). + /// + /// Linear fits extrapolate at the constant rate; logarithmic fits invert + /// the curve, so the flattening trajectory honestly pushes the date out + /// instead of promising linear gains forever. Predictions beyond two years + /// return null — too uncertain to show. + DateTime? predictTargetCompletion({ + required double currentValue, + required double targetValue, + required GrowthModel growthModel, + }); +} + +class GrowthCurveFitter implements IGrowthCurveFitter { + // Decay constant for recency weights. At λ=0.15, a session 10 sessions ago + // carries exp(−1.5) ≈ 22 % of the weight of the most recent session. + static const _lambda = 0.15; + + // Logarithmic candidate is considered only with enough history for + // curvature to be identifiable; over short spans log ≈ linear. + static const _minPointsForLogCurve = 6; + static const _minSpanDaysForLogCurve = 14.0; + + // The log curve must beat linear by this fraction of weighted RSS to win, + // preventing flip-flopping between near-identical fits. + static const _logSelectionMargin = 0.02; + + // Robust pass: points beyond c·σ̂ get fully rejected by Tukey's bisquare. + static const _tukeyC = 4.685; + static const _minPointsForRobustPass = 5; + + // Predictions further out than this are noise, not information. + static const _maxPredictionDays = 365 * 2; + + @override + GrowthModel fit(List dataPoints) { + if (dataPoints.isEmpty) { + return GrowthModel(slope: 0, intercept: 0, r2: 0, lastTrained: DateTime.now()); + } + if (dataPoints.length == 1) { + return GrowthModel( + slope: 0, + intercept: dataPoints.first.y, + r2: 1, + lastTrained: DateTime.now(), + lastX: dataPoints.first.x, + ); + } + + final n = dataPoints.length; + final recency = List.generate(n, (i) => exp(-_lambda * (n - 1 - i))); + final xs = dataPoints.map((p) => p.x).toList(); + final ys = dataPoints.map((p) => p.y).toList(); + final lastX = xs.reduce(max); + final spanDays = lastX - xs.reduce(min); + + final linear = _robustWeightedFit(xs, ys, recency); + + _Fit? logFit; + if (n >= _minPointsForLogCurve && spanDays >= _minSpanDaysForLogCurve) { + final logXs = xs.map((x) => log(1 + max(0.0, x))).toList(); + logFit = _robustWeightedFit(logXs, ys, recency); + } + + final useLog = logFit != null && + logFit.rss < linear.rss * (1 - _logSelectionMargin); + final fit = useLog ? logFit : linear; + final curve = useLog ? GrowthCurve.logarithmic : GrowthCurve.linear; + + // Instantaneous daily rate at the newest point: d/dx [a + b·ln(1+x)]. + final slope = useLog ? fit.slope / (1 + lastX) : fit.slope; + + return GrowthModel( + slope: slope, + intercept: fit.intercept, + r2: fit.r2.clamp(0.0, 1.0), + lastTrained: DateTime.now(), + curve: curve, + coefficient: fit.slope, + lastX: lastX, + stdError: fit.stdError, + ); + } + + /// Weighted least squares with one Tukey-bisquare re-weighting pass. + /// + /// The robust pass estimates residual scale via the weighted MAD, then + /// refits with outliers down-weighted by (1 − (r/cσ̂)²)², so a single + /// deload or cut-short session cannot tilt the trend. Skipped for tiny + /// samples or when residuals are too uniform to identify outliers. + static _Fit _robustWeightedFit( + List xs, + List ys, + List recency, + ) { + var fit = _weightedLeastSquares(xs, ys, recency); + + if (xs.length < _minPointsForRobustPass) return fit; + + final residuals = [ + for (var i = 0; i < xs.length; i++) + (ys[i] - (fit.intercept + fit.slope * xs[i])).abs(), + ]; + final mad = _median(residuals); + if (mad <= 0) return fit; + final scale = 1.4826 * mad; // MAD → σ̂ for normal residuals + + final robust = []; + for (var i = 0; i < xs.length; i++) { + final u = residuals[i] / (_tukeyC * scale); + final tukey = u >= 1 ? 0.0 : pow(1 - u * u, 2).toDouble(); + robust.add(recency[i] * tukey); + } + // Refit only if the pass actually rejected/damped something and enough + // effective weight survives to keep the fit identifiable. + final kept = robust.where((w) => w > 0).length; + if (kept < 3) return fit; + final refit = _weightedLeastSquares(xs, ys, robust); + return refit.degenerate ? fit : refit; + } + + static _Fit _weightedLeastSquares( + List xs, + List ys, + List weights, + ) { + final n = xs.length; + final wSum = weights.fold(0.0, (s, w) => s + w); + + double wSumX = 0, wSumY = 0, wSumXY = 0, wSumX2 = 0; + for (var i = 0; i < n; i++) { + final w = weights[i]; + wSumX += w * xs[i]; + wSumY += w * ys[i]; + wSumXY += w * xs[i] * ys[i]; + wSumX2 += w * xs[i] * xs[i]; + } + + final denom = wSum * wSumX2 - wSumX * wSumX; + if (denom.abs() < 1e-12 || wSum <= 0) { + final mean = wSum > 0 ? wSumY / wSum : 0.0; + return _Fit( + slope: 0, + intercept: mean, + r2: 0, + rss: double.infinity, + stdError: 0, + degenerate: true, + ); + } + + final slope = (wSum * wSumXY - wSumX * wSumY) / denom; + final intercept = (wSumY - slope * wSumX) / wSum; + + final yBar = wSumY / wSum; + double ssTotal = 0, ssResidual = 0, wSqSum = 0; + for (var i = 0; i < n; i++) { + final w = weights[i]; + final predicted = slope * xs[i] + intercept; + ssTotal += w * pow(ys[i] - yBar, 2); + ssResidual += w * pow(ys[i] - predicted, 2); + wSqSum += w * w; + } + + // Weighted mean squared residual, dof-corrected via the Kish effective + // sample size (recency weights make n optimistic). + final nEff = wSqSum > 0 ? (wSum * wSum) / wSqSum : 0.0; + final dof = max(1.0, nEff - 2); + final stdError = sqrt(max(0.0, ssResidual / wSum) * (nEff / dof)); + + return _Fit( + slope: slope, + intercept: intercept, + r2: ssTotal > 0 ? (1 - ssResidual / ssTotal).toDouble() : 0.0, + rss: ssResidual, + stdError: stdError, + degenerate: false, + ); + } + + static double _median(List values) { + final sorted = List.from(values)..sort(); + final mid = sorted.length ~/ 2; + return sorted.length.isOdd + ? sorted[mid] + : (sorted[mid - 1] + sorted[mid]) / 2; + } + + @override + DateTime? predictTargetCompletion({ + required double currentValue, + required double targetValue, + required GrowthModel growthModel, + }) { + if (currentValue >= targetValue) return DateTime.now(); + if (growthModel.slope <= 0) return null; + + final double daysFromNow; + switch (growthModel.curve) { + case GrowthCurve.linear: + daysFromNow = (targetValue - currentValue) / growthModel.slope; + case GrowthCurve.logarithmic: + // Map the live current value and the target through the curve's + // inverse x(y) = exp((y−a)/b) − 1 and take the day difference, so + // drift between the live value and the fitted curve cancels out. + final b = growthModel.coefficient; + if (b <= 0) return null; + final xTarget = exp((targetValue - growthModel.intercept) / b) - 1; + final xCurrent = exp((currentValue - growthModel.intercept) / b) - 1; + daysFromNow = xTarget - xCurrent; + } + + if (daysFromNow <= 0) return DateTime.now(); + if (!daysFromNow.isFinite || daysFromNow > _maxPredictionDays) return null; + return DateTime.now().add(Duration(days: daysFromNow.ceil())); + } + + /// Confidence interval around the predicted completion date. + /// + /// Width comes from the model's residual standard error converted to days + /// at the current growth rate (± how long the typical session-to-session + /// scatter could shift the crossing point), falling back to an R²-scaled + /// margin for legacy models without a stored error. + static ({DateTime optimistic, DateTime expected, DateTime pessimistic})? + predictTargetWithConfidence({ + required double currentValue, + required double targetValue, + required GrowthModel growthModel, + }) { + final expected = GrowthCurveFitter().predictTargetCompletion( + currentValue: currentValue, + targetValue: targetValue, + growthModel: growthModel, + ); + if (expected == null) return null; + + final daysToTarget = expected.difference(DateTime.now()).inDays; + final int uncertainty; + if (growthModel.stdError > 0 && growthModel.slope > 0) { + uncertainty = (growthModel.stdError / growthModel.slope) + .ceil() + .clamp(0, max(1, daysToTarget)); + } else { + uncertainty = ((1 - growthModel.r2) * daysToTarget * 0.5).ceil(); + } + return ( + optimistic: expected.subtract(Duration(days: uncertainty)), + expected: expected, + pessimistic: expected.add(Duration(days: uncertainty)), + ); + } +} + +/// Internal weighted-least-squares result for one candidate curve. +class _Fit { + final double slope; + final double intercept; + final double r2; + final double rss; // weighted residual sum of squares (selection criterion) + final double stdError; + final bool degenerate; + + const _Fit({ + required this.slope, + required this.intercept, + required this.r2, + required this.rss, + required this.stdError, + required this.degenerate, + }); +} diff --git a/workout-logger/lib/services/strategies/progression_rules.dart b/workout-logger/lib/services/strategies/progression_rules.dart new file mode 100644 index 0000000..a8511f7 --- /dev/null +++ b/workout-logger/lib/services/strategies/progression_rules.dart @@ -0,0 +1,281 @@ +// Progression Rule Chain (Open/Closed Principle) +// +// Each tier of MLService's double-progression heuristic (recovery gate, +// deload protocol, decline/plateau detection, weight/rep progression) is its +// own [ProgressionRule]. Rules are tried in order; the first to return a +// non-null [SetRecommendation] wins. New signals (readiness, same-session +// fatigue — see the recommendation-engine-upgrade plan) become new rules +// inserted at the appropriate point in the chain instead of edits to a +// growing if/else. Mirrors the registry shape of +// `strategies/target_calculator.dart`'s TargetCalculatorFactory, adapted +// from a type→strategy map to an ordered chain. + +import 'dart:math'; + +import '../../models/models.dart'; + +/// Everything a [ProgressionRule] needs to decide (or defer) a +/// recommendation for one set. +class ProgressionContext { + final WorkoutSet set; + final int minReps; + final int maxReps; + final bool isPlateau; + final bool isDeclining; + final bool isUnderRecovered; + final int? recoveryPercent; + final bool isPostDeloadRecovery; + + /// True when today's readiness (sleep/RHR/HRV) is in the low band. + /// Defaulted so existing call sites that don't pass it are unaffected. + final bool isLowReadiness; + + /// 0.0 (untouched) to 1.0+ (fully fatigued) — how much of today's + /// earlier training already loaded this set's primary muscle. 0.0 is the + /// default so existing call sites are unaffected. [SessionFatigueRule] + /// hard-holds at ≥1.0; values in between scale [DoubleProgressionRule]'s + /// weight increment instead of blocking it outright. + final double sessionFatigueFactor; + + const ProgressionContext({ + required this.set, + required this.minReps, + required this.maxReps, + required this.isPlateau, + required this.isDeclining, + required this.isUnderRecovered, + this.recoveryPercent, + required this.isPostDeloadRecovery, + this.isLowReadiness = false, + this.sessionFatigueFactor = 0.0, + }); +} + +/// One tier in the progression priority chain. +/// +/// Return `null` to defer to the next rule ("this signal doesn't apply — +/// try the next one"); return a [SetRecommendation] to win and stop the +/// chain. +abstract class ProgressionRule { + SetRecommendation? apply(ProgressionContext context); +} + +/// Priority 1: a still-fatigued primary muscle holds instead of progressing. +class UnderRecoveredRule implements ProgressionRule { + const UnderRecoveredRule(); + + @override + SetRecommendation? apply(ProgressionContext c) { + if (!c.isUnderRecovered) return null; + return SetRecommendation( + weight: c.set.weight, + reps: c.set.reps, + confidence: 'low', + reasoning: 'Muscle only ${c.recoveryPercent}% recovered — maintain ' + 'load, skip progression', + ); + } +} + +/// Priority 2: the session right after a detected deload re-anchors on the +/// pre-deload baseline rather than progressing off the deload itself. +class PostDeloadRecoveryRule implements ProgressionRule { + const PostDeloadRecoveryRule(); + + @override + SetRecommendation? apply(ProgressionContext c) { + if (!c.isPostDeloadRecovery) return null; + return SetRecommendation( + weight: c.set.weight, + reps: c.set.reps, + confidence: 'high', + // No raw weight value embedded here — the recommended weight/unit + // is already surfaced via SetRecommendation.weight and formatted by + // the presentation layer according to the user's unit preference. + reasoning: 'Resuming training after deload — anchored on pre-deload ' + 'baseline (${c.set.reps} reps)', + ); + } +} + +/// Priority 3: low whole-day readiness (sleep/RHR/HRV) holds instead of +/// progressing — a day-level physiological signal, so it outranks the +/// session-local fatigue check below. +class ReadinessRule implements ProgressionRule { + const ReadinessRule(); + + @override + SetRecommendation? apply(ProgressionContext c) { + if (!c.isLowReadiness) return null; + return SetRecommendation( + weight: c.set.weight, + reps: c.set.reps, + confidence: 'low', + reasoning: 'Low readiness today (sleep/recovery signals) — hold load ' + 'and reassess next session', + ); + } +} + +/// Priority 4: heavy same-session fatigue for this muscle hard-holds once +/// [ProgressionContext.sessionFatigueFactor] reaches 1.0. Values between 0 +/// and 1 don't stop here — they defer to [DoubleProgressionRule], which +/// scales its weight increment down instead of blocking it outright. +class SessionFatigueRule implements ProgressionRule { + const SessionFatigueRule(); + + @override + SetRecommendation? apply(ProgressionContext c) { + if (c.sessionFatigueFactor < 1.0) return null; + return SetRecommendation( + weight: c.set.weight, + reps: c.set.reps, + confidence: 'medium', + reasoning: "Already trained hard for this muscle earlier in today's " + 'session — hold and finish strong', + ); + } +} + +/// Priority 5: a trustworthy declining trend triggers a ~10% deload. +class DeclineDeloadRule implements ProgressionRule { + const DeclineDeloadRule(); + + @override + SetRecommendation? apply(ProgressionContext c) { + if (!c.isDeclining) return null; + // Round the deload to the plate increment users can actually load. + final deloaded = max(0.0, ((c.set.weight * 0.9) / 2.5).round() * 2.5); + return SetRecommendation( + weight: deloaded, + reps: c.set.reps, + confidence: 'medium', + reasoning: 'Volume trending down — deload ~10% for a session or two, ' + 'then rebuild', + ); + } +} + +/// Priority 6: a trustworthy flat trend holds load and reps. +class PlateauRule implements ProgressionRule { + const PlateauRule(); + + @override + SetRecommendation? apply(ProgressionContext c) { + if (!c.isPlateau) return null; + return SetRecommendation( + weight: c.set.weight, + reps: c.set.reps, + confidence: 'medium', + reasoning: 'Plateau detected — maintain load and focus on form quality', + ); + } +} + +/// Priority 7 (terminal): plain double progression — add a rep, or bump +/// weight and reset reps once the rep ceiling is hit. Always produces a +/// recommendation, so this must stay last in the chain. +/// +/// When [ProgressionContext.sessionFatigueFactor] is partial (0 < f < 1, +/// not enough to trigger [SessionFatigueRule]'s hard hold), the weight +/// increment scales down by (1 − f) instead of blocking progression +/// outright, snapped to the nearest 2.5kg plate. At f = 0 (the default) this +/// reduces to exactly the original unscaled behavior. +class DoubleProgressionRule implements ProgressionRule { + const DoubleProgressionRule(); + + @override + SetRecommendation apply(ProgressionContext c) { + if (c.set.reps >= c.maxReps) { + final baseIncrement = c.set.weight < 40 ? 2.5 : 5.0; + final increment = c.sessionFatigueFactor > 0 + ? max( + 0.0, + ((baseIncrement * (1 - c.sessionFatigueFactor)) / 2.5).round() * + 2.5, + ) + : baseIncrement; + + if (increment <= 0) { + return SetRecommendation( + weight: c.set.weight, + reps: c.set.reps, + confidence: 'medium', + reasoning: 'Rep target hit, but earlier sets today already ' + 'fatigued this muscle — hold weight for now', + ); + } + + return SetRecommendation( + weight: c.set.weight + increment, + reps: c.minReps, + confidence: increment < baseIncrement ? 'medium' : 'high', + // No raw weight or unit embedded, for the same reason as + // PostDeloadRecoveryRule above: the recommended load rides on + // SetRecommendation.weight and the presentation layer formats it in + // the user's chosen unit. Hardcoding "kg" here read as "add 5.0kg" + // to someone with pounds selected. + reasoning: increment < baseIncrement + ? 'Rep target hit — step the weight up a little (reduced — ' + 'already fatigued this muscle today) and reset to ' + '${c.minReps} reps' + : 'Rep target hit — step the weight up and reset to ' + '${c.minReps} reps', + ); + } + + return SetRecommendation( + weight: c.set.weight, + reps: c.set.reps + 1, + confidence: 'high', + reasoning: 'Add 1 rep (${c.set.reps + 1}/${c.maxReps}) — progressive overload', + ); + } +} + +/// Ordered registry of [ProgressionRule]s, mirroring +/// [TargetCalculatorFactory]'s registration/reset pattern. +class ProgressionRuleFactory { + static List _rules = _defaults(); + + static List _defaults() => const [ + UnderRecoveredRule(), + PostDeloadRecoveryRule(), + ReadinessRule(), + SessionFatigueRule(), + DeclineDeloadRule(), + PlateauRule(), + DoubleProgressionRule(), + ]; + + /// Reset the chain to defaults. + /// + /// This is primarily used in tests to restore isolation after + /// registering a custom rule. + static void reset() { + _rules = _defaults(); + } + + /// The current chain, in priority order (highest priority first). + static List get rules => List.unmodifiable(_rules); + + /// Registers [rule] at the head of the chain, so it is tried before every + /// existing rule (highest priority). + static void registerRuleAtHead(ProgressionRule rule) { + _rules = [rule, ..._rules]; + } + + /// Runs [context] through the chain and returns the first rule's + /// non-null result. [DoubleProgressionRule] is the terminal rule and + /// always matches, so a well-formed chain never falls through. + static SetRecommendation apply(ProgressionContext context) { + for (final rule in _rules) { + final result = rule.apply(context); + if (result != null) return result; + } + throw StateError( + 'No progression rule produced a recommendation — the chain is ' + 'missing a terminal rule.', + ); + } +} diff --git a/workout-logger/lib/services/utils/effort_calibration.dart b/workout-logger/lib/services/utils/effort_calibration.dart new file mode 100644 index 0000000..458068b --- /dev/null +++ b/workout-logger/lib/services/utils/effort_calibration.dart @@ -0,0 +1,30 @@ +// Effort Calibration (rolling, from the once-per-workout chip only) +// +// EffortEstimator anchors every estimate at RPE 8. This is the only real +// calibration signal available for that anchor: a post-workout "how did +// that feel" chip (Easy/Solid/Brutal), answered once per session, not once +// per set. An exponential moving average (alpha ~= 1/10) approximates a +// rolling mean over the last ~10 answered sessions without needing to +// persist per-session history — skipping the chip just means the offset +// stays wherever it last was (0.0 if never answered). + +import 'effort_estimator.dart'; + +class EffortCalibration { + const EffortCalibration(); + + static const double _alpha = 0.1; + static const double maxOffset = 1.0; + + /// Chip value → the RPE it represents. 1 = Easy, 2 = Solid, 3 = Brutal. + static const Map chipRpe = {1: 6.5, 2: 8.0, 3: 9.5}; + + /// Folds one session-effort chip answer into [previousOffset], returning + /// the new rolling offset to apply to [EffortEstimator.anchorRpe]. + double updateOffset(double previousOffset, int chipValue) { + final target = chipRpe[chipValue] ?? EffortEstimator.anchorRpe; + final delta = target - EffortEstimator.anchorRpe; + return (previousOffset * (1 - _alpha) + delta * _alpha) + .clamp(-maxOffset, maxOffset); + } +} diff --git a/workout-logger/lib/services/utils/effort_estimator.dart b/workout-logger/lib/services/utils/effort_estimator.dart new file mode 100644 index 0000000..3149a7a --- /dev/null +++ b/workout-logger/lib/services/utils/effort_estimator.dart @@ -0,0 +1,211 @@ +// Effort Estimator (no per-set user input) +// +// Estimates a 0-10 RPE (rate of perceived exertion) for a set from data +// already logged, so the recommendation engine can distinguish an easy top +// set from a grinder without ever asking the user mid-set. Four additive +// terms on top of an RPE-8 anchor (double progression already assumes +// near-failure working sets): +// +// 1. Trend deviation — actual volume vs. the growth model's prediction. +// 2. Session decline — volume dropping across sets of the same exercise +// today (dropset/fatigue signal). +// 3. Rest/tempo drift — longer-than-usual rest or slower reps vs. this +// exercise's own sets earlier today. +// 4. Heart rate (opt.) — only when pre-resolved HR data is supplied by the +// caller; purely additive, never required. This +// class does no I/O itself — see [HrEffortSignal]. +// +// Every estimate carries a confidence score capped below what a real +// user-reported RPE would get, so low-confidence estimates should only +// annotate reasoning text, never flip a recommendation branch on their own. + +import '../../models/models.dart'; + +/// Pre-resolved heart-rate signal for one set, already read from Health +/// Connect by the caller. [EffortEstimator] never fetches HR itself — the +/// in-workout recommendation path must stay synchronous/offline, so live HR +/// wiring (if added) has to happen upstream of this pure function. +class HrEffortSignal { + /// Peak bpm observed during this set's window. + final double setPeakBpm; + + /// Number of samples that window contained (gates how much to trust it). + final int setSampleCount; + + /// Lowest bpm observed anywhere in today's session so far. + final double sessionFloorBpm; + + /// Highest bpm observed anywhere in today's session so far. + final double sessionPeakBpm; + + const HrEffortSignal({ + required this.setPeakBpm, + required this.setSampleCount, + required this.sessionFloorBpm, + required this.sessionPeakBpm, + }); +} + +class EffortEstimator { + const EffortEstimator(); + + static const double anchorRpe = 8.0; + static const double minRpe = 5.0; + static const double maxRpe = 10.0; + + // Term 1: trend deviation. Reuses the same trustworthy-fit gate as the + // growth-trend recommendation rules (see progression_rules.dart). + static const double _minR2ForTrendSignal = 0.2; + static const double _trendDeviationWeight = 0.8; + + // Term 2: intra-session decline. Deadband absorbs normal set-to-set + // variance; only a real drop-off counts. + static const double _declineDeadband = 0.05; + static const double _declineWeight = 3.0; + static const double _maxDeclineFraction = 0.5; + + // Term 3: rest/tempo drift vs. this exercise's own sets earlier today. + static const double _restGapWeight = 0.6; + static const double _tempoWeight = 0.5; + + // Term 4: heart rate (optional). + static const double _hrWeight = 1.0; + static const double _hrBaselineFraction = 0.8; + static const double _hrSpanFraction = 0.2; + static const int minHrSamplesForSignal = 3; + + // Confidence ladder — base plus bonuses, capped below a real user-reported + // value's confidence of 1.0. + static const double _baseConfidence = 0.35; + static const double _trendGateConfidenceBonus = 0.20; + static const double _sufficientSetsConfidenceBonus = 0.20; + static const double _hrConfidenceBonus = 0.15; + static const double _historyConfidenceBonus = 0.10; + static const double maxEstimatedConfidence = 0.85; + static const int _minSetsForConfidenceBonus = 3; + static const int _minSessionsForConfidenceBonus = 6; + + /// Estimates RPE for [set]. + /// + /// [priorSetsThisExerciseToday] must be this exercise's other sets already + /// logged earlier in today's in-progress session, oldest-first, excluding + /// [set] itself — used for the decline and rest/tempo terms. + /// [growthModel]/[growthModelX] back the trend-deviation term (skipped + /// when either is absent or the fit isn't trustworthy). + /// [calibrationOffset] is the rolling once-per-workout-chip adjustment to + /// the RPE-8 anchor (see [WorkoutSession.sessionEffort]). + /// [sessionHistoryCount] is how many past sessions exist for this exercise + /// (confidence only — more history makes the trend term more trustworthy). + /// [hrSignal] is optional and purely additive; omit when HR data isn't + /// available. + EffortEstimate estimate({ + required WorkoutSet set, + List priorSetsThisExerciseToday = const [], + GrowthModel? growthModel, + double? growthModelX, + double calibrationOffset = 0.0, + int sessionHistoryCount = 0, + HrEffortSignal? hrSignal, + }) { + var rpe = anchorRpe + calibrationOffset; + var confidence = _baseConfidence; + var source = EffortSource.estimatedHrless; + + // Term 1: trend deviation. + if (growthModel != null && + growthModel.r2 > _minR2ForTrendSignal && + growthModelX != null) { + final actualVolume = priorSetsThisExerciseToday.fold( + 0.0, + (sum, s) => sum + s.volume, + ) + + set.volume; + final predicted = growthModel.predict(growthModelX); + final scale = + growthModel.stdError > 0 ? growthModel.stdError : (predicted * 0.05).abs(); + if (scale > 0) { + final z = ((actualVolume - predicted) / scale).clamp(-2.0, 2.0); + rpe += _trendDeviationWeight * -z; + confidence += _trendGateConfidenceBonus; + } + } + + // Term 2: intra-session decline (needs a baseline set today). + if (priorSetsThisExerciseToday.isNotEmpty) { + final firstVolume = priorSetsThisExerciseToday.first.volume; + if (firstVolume > 0) { + final declineFrac = 1 - (set.volume / firstVolume); + rpe += _declineWeight * + (declineFrac - _declineDeadband).clamp(0.0, _maxDeclineFraction); + } + } + + // Term 3: rest/tempo drift vs. the median of this exercise's earlier + // sets today (needs ≥2 prior sets to establish a median baseline). + if (priorSetsThisExerciseToday.length >= 2) { + final gaps = [ + for (var i = 1; i < priorSetsThisExerciseToday.length; i++) + priorSetsThisExerciseToday[i] + .timestamp + .difference(priorSetsThisExerciseToday[i - 1].timestamp) + .inSeconds + .toDouble(), + ]; + final medianGap = _median(gaps); + final currentGap = set.timestamp + .difference(priorSetsThisExerciseToday.last.timestamp) + .inSeconds + .toDouble(); + if (medianGap > 0 && currentGap > 0) { + rpe += _restGapWeight * (currentGap / medianGap - 1).clamp(0.0, 1.0); + } + + final tempos = [ + for (final s in priorSetsThisExerciseToday) + if (s.timeTaken != null && s.reps > 0) s.timeTaken! / s.reps, + ]; + if (tempos.isNotEmpty && set.timeTaken != null && set.reps > 0) { + final medianTempo = _median(tempos); + final currentTempo = set.timeTaken! / set.reps; + if (medianTempo > 0) { + rpe += _tempoWeight * + (currentTempo / medianTempo - 1).clamp(0.0, 1.0); + } + } + } + + // Term 4: heart rate (optional, purely additive). + if (hrSignal != null && + hrSignal.setSampleCount >= minHrSamplesForSignal && + hrSignal.sessionPeakBpm > hrSignal.sessionFloorBpm) { + final hrFrac = (hrSignal.setPeakBpm - hrSignal.sessionFloorBpm) / + (hrSignal.sessionPeakBpm - hrSignal.sessionFloorBpm); + final term = + ((hrFrac - _hrBaselineFraction) / _hrSpanFraction).clamp(-1.0, 1.0); + rpe += _hrWeight * term; + confidence += _hrConfidenceBonus; + source = EffortSource.estimatedWithHr; + } + + if (priorSetsThisExerciseToday.length + 1 >= _minSetsForConfidenceBonus) { + confidence += _sufficientSetsConfidenceBonus; + } + if (sessionHistoryCount >= _minSessionsForConfidenceBonus) { + confidence += _historyConfidenceBonus; + } + + return EffortEstimate( + rpe: rpe.clamp(minRpe, maxRpe), + source: source, + confidence: confidence.clamp(0.0, maxEstimatedConfidence), + ); + } + + static double _median(List values) { + final sorted = List.from(values)..sort(); + final mid = sorted.length ~/ 2; + return sorted.length.isOdd + ? sorted[mid] + : (sorted[mid - 1] + sorted[mid]) / 2; + } +} diff --git a/workout-logger/lib/services/utils/exercise_history.dart b/workout-logger/lib/services/utils/exercise_history.dart index 319a051..a1c19f1 100644 --- a/workout-logger/lib/services/utils/exercise_history.dart +++ b/workout-logger/lib/services/utils/exercise_history.dart @@ -1,4 +1,5 @@ import '../../models/models.dart'; +import '../interfaces/ml_service_interface.dart'; /// Returns the [ExerciseLog] for [exerciseId] from the most-recently-dated /// [WorkoutSession] in [sessions], or `null` if the exercise has never been @@ -27,3 +28,37 @@ ExerciseLog? findMostRecentExerciseLog( } return null; } + +/// Recovery-related inputs for [IMLService.recommendSets]: per-muscle +/// recovery scores across [sessions], and [exerciseId]'s primary muscle. +/// +/// Centralizes what both `WorkoutProvider.getRecommendations` and +/// `AnalyticsManager.getRecommendations` need to assemble so the two call +/// sites can't drift out of sync with each other again (they previously did +/// — see the recommendation-engine-upgrade plan's audit item 6). Returns +/// nulls when [exerciseMap] doesn't resolve [exerciseId], so callers that +/// don't have exercise data on hand degrade to the pre-recovery-aware +/// behavior instead of erroring. +/// Pass [lastTrained] (from [IMLService.lastTrainedPerMuscle]) when the +/// caller already holds a cached one — callers on a per-frame path do, and +/// it skips re-sorting and re-walking every session here. Omitting it +/// computes the same thing from [sessions]. +({Map? recoveryScores, List? primaryMuscleIds}) + recoveryRecommendationInputs({ + required String exerciseId, + required List sessions, + required Map exerciseMap, + required IMLService mlService, + Map? lastTrained, +}) { + final exercise = exerciseMap[exerciseId]; + if (exercise == null) { + return (recoveryScores: null, primaryMuscleIds: null); + } + return ( + recoveryScores: lastTrained != null + ? mlService.recoveryScoresFrom(lastTrained) + : mlService.computeMuscleRecoveryScores(sessions, exerciseMap), + primaryMuscleIds: [exercise.primaryMuscle], + ); +} diff --git a/workout-logger/lib/services/utils/recovery_calculator.dart b/workout-logger/lib/services/utils/recovery_calculator.dart new file mode 100644 index 0000000..9168742 --- /dev/null +++ b/workout-logger/lib/services/utils/recovery_calculator.dart @@ -0,0 +1,133 @@ +// Muscle Recovery Calculator (Single Responsibility Principle) +// +// Pure, stateless per-muscle recovery scoring extracted from MLService. +// Model: recovery(t) = 1 − exp(−t / τ), where t is hours since the last +// session that trained the muscle and τ is a muscle-specific time constant. +// Full recovery (~95%) occurs at ≈ 3τ. Same "pure, no I/O" shape as +// ReadinessCalculator — this is why it lives in utils/, not managers/ +// (managers in this codebase are ChangeNotifier state owners). + +import 'dart:math'; + +import '../../models/models.dart'; +import '../interfaces/ml_service_interface.dart'; + +class RecoveryCalculator { + const RecoveryCalculator(); + + // Recovery time constants τ (hours) per muscle group. + // Full recovery (~95 %) occurs at ≈ 3τ. + static const _tauHours = { + 'chest': 48.0, + 'back': 60.0, + 'lats': 60.0, + 'quads': 60.0, + 'hamstrings': 60.0, + 'glutes': 60.0, + 'legs': 60.0, + 'shoulders': 40.0, + 'traps': 40.0, + 'biceps': 36.0, + 'triceps': 36.0, + 'abs': 24.0, + 'core': 24.0, + 'calves': 24.0, + 'forearms': 24.0, + }; + static const _defaultTauHours = 48.0; + + /// Compute recovery scores for every muscle group trained in [sessions]. + /// + /// Model: recovery(t) = 1 − exp(−t / τ) + /// t = hours since last session that trained this muscle + /// τ = muscle-specific time constant (see [_tauHours]) + /// + /// Full recovery (≥ 95 %) occurs around t = 3τ. + Map computeMuscleRecoveryScores( + List sessions, + Map exerciseMap, { + DateTime? asOf, + }) => + recoveryScoresFrom( + lastTrainedPerMuscle(sessions, exerciseMap), + asOf: asOf, + ); + + /// When each muscle group was last trained across [sessions]. + /// + /// Split out from [computeMuscleRecoveryScores] because this half is the + /// expensive one — it copies and sorts the whole session list and walks + /// every session's exercises — and it depends only on the history, not on + /// the clock. Callers on a hot path (see `WorkoutProvider`) cache this and + /// re-run only the cheap [recoveryScoresFrom] decay per call. + Map lastTrainedPerMuscle( + List sessions, + Map exerciseMap, + ) { + final sorted = List.from(sessions) + ..sort((a, b) => a.date.compareTo(b.date)); + + // Walk sessions forward — each one updates the "last trained" record. + final lastTrained = {}; + for (final session in sorted) { + for (final muscleId in muscleVolumes(session, exerciseMap).keys) { + lastTrained[muscleId] = session.date; + } + } + return lastTrained; + } + + /// Applies the recovery decay to a [lastTrainedPerMuscle] result. + /// + /// O(muscle groups) and clock-dependent — cheap enough to re-run on every + /// call even when the [lastTrained] map behind it is cached. + Map recoveryScoresFrom( + Map lastTrained, { + DateTime? asOf, + }) { + final now = asOf ?? DateTime.now(); + final result = {}; + for (final entry in lastTrained.entries) { + final muscleId = entry.key; + final tau = _tauHours[muscleId] ?? _defaultTauHours; + final hours = now.difference(entry.value).inMinutes / 60.0; + final fraction = (1.0 - exp(-hours / tau)).clamp(0.0, 1.0); + // 95 % recovery ≈ 3τ; remaining = 3τ − elapsed. + final hoursRemaining = tau * 3 - hours; + + result[muscleId] = MuscleRecoveryStatus( + muscleGroupId: muscleId, + recoveryFraction: fraction, + timeSinceLastTrained: Duration(minutes: (hours * 60).round()), + estimatedTimeToFullRecovery: hoursRemaining > 0 + ? Duration(minutes: (hoursRemaining * 60).round()) + : null, + ); + } + return result; + } + + /// Effective volume per muscle group for one session: + /// sum(exerciseVolume × activationPercentage / 100). + /// + /// Public (not `_`-prefixed) so other collaborators — e.g. a same-session + /// fatigue accumulator — can reuse the same activation-weighting instead + /// of duplicating this loop. + Map muscleVolumes( + WorkoutSession session, + Map exerciseMap, + ) { + final volumes = {}; + for (final log in session.exercises) { + final exercise = exerciseMap[log.exerciseId]; + if (exercise == null) continue; + final total = log.totalVolume; + for (final activation in exercise.muscleActivations) { + volumes[activation.muscleGroupId] = + (volumes[activation.muscleGroupId] ?? 0.0) + + total * activation.activationPercentage / 100.0; + } + } + return volumes; + } +} diff --git a/workout-logger/lib/services/utils/session_fatigue.dart b/workout-logger/lib/services/utils/session_fatigue.dart new file mode 100644 index 0000000..71e80e8 --- /dev/null +++ b/workout-logger/lib/services/utils/session_fatigue.dart @@ -0,0 +1,88 @@ +// Session Fatigue Accumulator (intra-session, cross-exercise awareness) +// +// The recommendation engine previously had zero awareness of what the user +// already did earlier in TODAY's session — deload/plateau detection only +// looks at day-to-day history of the SAME exercise. +// +// An earlier version of this accumulator attributed fatigue per muscle group +// using each exercise's hand-authored `Exercise.muscleActivations` table. +// That table proved untrustworthy: Seated Cable Row's own top-activation +// muscle is "back" while Lat Pulldown's and Pull-ups' is "lats" — separate +// ids in this app's taxonomy, not aliased — so a real user's actual +// back/bicep routine (rows, pulldowns, pull-ups back to back — genuinely the +// same movement pattern) could silently miss its own overlap depending on +// which exercise happened to be authored with which label as "primary". +// +// A backtest against 74 real logged sessions (see the recommendation-engine +// plan doc's Phase 6+ notes) then tested whether a same-session order effect +// is statistically detectable AT ALL, independent of the muscle-activation +// table — pooled regression of same-session exercise performance against +// prior same-session hard-set count, session-demeaned: r = 0.005, t = 0.09, +// n = 309. No effect survived a split-half check for any individual +// exercise either. With this user's routine order essentially fixed +// session-to-session (73 of 85 logged exercise pairs never appear in both +// possible orders), there isn't yet enough contrastive data for ANY model — +// simple or complex — to learn a reliable relationship. +// +// So this accumulator now tracks a single, exercise-agnostic scalar — total +// RPE-weighted hard-set-equivalents already logged elsewhere in today's +// session — with NO muscle attribution at all, and the cap that converts it +// to a dampening factor is calibrated to stay at 0.0 for every one of 254 +// real historical set-recommendation contexts (max observed: 11.87; caps set +// well above that). This is an intentionally inert, honest placeholder: the +// mechanism is real and ready, but the current calibration should not change +// any recommendation until genuine order-variation data exists to fit it +// against (see the plan doc's suggested "occasionally swap exercise order" +// data-collection nudge). + +import '../../models/models.dart'; +import 'effort_estimator.dart'; + +class SessionFatigueAccumulator { + const SessionFatigueAccumulator({ + EffortEstimator effortEstimator = const EffortEstimator(), + }) : _effortEstimator = effortEstimator; + + final EffortEstimator _effortEstimator; + + // A set's contribution ramps from 0 at RPE 6 (light/warm-up) to 1.0 at + // RPE 9+ (near failure) — not every logged set counts equally. + static const double _rpeFloor = 6.0; + static const double _rpeSpan = 3.0; + + // Calibrated (2026-08) against 254 real historical set-recommendation + // contexts from a 74-session export: max observed total was 11.87. Both + // caps sit comfortably above that, so this factor evaluates to 0.0 on + // every real case seen so far — see the file-level comment for why. + static const double _softCap = 16.0; + static const double _hardCap = 24.0; + + /// A 0.0–1.0 same-session fatigue dampening factor from [exerciseLogs] + /// (the in-progress session's logs so far, across all exercises), + /// summing each set's estimated-RPE-derived hardness with no per-muscle + /// weighting. + /// + /// [excludeExerciseId], when given, skips that exercise's own sets — the + /// fatigue an exercise contributes to itself is already covered by the + /// deload/decline rules; this accumulator is specifically for carryover + /// from *other* exercises trained earlier today. + double factorFor({ + required List exerciseLogs, + String? excludeExerciseId, + }) { + var total = 0.0; + for (final log in exerciseLogs) { + if (log.exerciseId == excludeExerciseId) continue; + + for (var i = 0; i < log.sets.length; i++) { + final set = log.sets[i]; + final estimate = _effortEstimator.estimate( + set: set, + priorSetsThisExerciseToday: log.sets.sublist(0, i), + ); + total += ((estimate.rpe - _rpeFloor) / _rpeSpan).clamp(0.0, 1.0); + } + } + return ((total - _softCap) / (_hardCap - _softCap)).clamp(0.0, 1.0); + } +} diff --git a/workout-logger/lib/services/workout_provider.dart b/workout-logger/lib/services/workout_provider.dart index 5fd1b48..64c20fe 100644 --- a/workout-logger/lib/services/workout_provider.dart +++ b/workout-logger/lib/services/workout_provider.dart @@ -26,7 +26,9 @@ import 'ml_service.dart'; import 'strategies/target_calculator.dart'; import 'managers/program_manager.dart'; import 'managers/history_manager.dart'; +import 'utils/effort_calibration.dart'; import 'utils/exercise_history.dart'; +import 'utils/session_fatigue.dart'; enum StartWorkoutConflictAction { resume, discardAndStart, cancel } @@ -39,16 +41,50 @@ class WorkoutProvider extends ChangeNotifier { final IMLService _mlService; final HistoryManager? _historyManager; final Uuid _uuid = const Uuid(); + final EffortCalibration _effortCalibration = const EffortCalibration(); + final SessionFatigueAccumulator _sessionFatigueAccumulator = + const SessionFatigueAccumulator(); + + static const String _effortCalibrationOffsetKey = 'effort.calibrationOffset'; // State List _sessions = []; List _routines = []; + double _effortCalibrationOffset = 0.0; List _targets = []; List _muscleGroups = []; List _allExercises = []; final Map _growthModels = {}; // exerciseId -> GrowthModel + // getRecommendations runs from WorkoutFlowScreen's build, so it must not + // rebuild the exercise map and re-walk all of _sessions on every frame. + // Both derived values below depend only on history, so they're cached and + // invalidated by an explicit revision rather than by list identity — + // _sessions is mutated in place in places (insert/sort), so identity would + // go stale silently. + int _historyRevision = 0; + int? _recoveryCacheRevision; + Map? _cachedExerciseMap; + Map? _cachedLastTrained; + + /// Call after any change to [_sessions] or [_allExercises]. + void _invalidateHistoryCache() => _historyRevision++; + + ({Map exerciseMap, Map lastTrained}) + _historyDerived() { + if (_recoveryCacheRevision != _historyRevision) { + final map = {for (final e in _allExercises) e.id: e}; + _cachedExerciseMap = map; + _cachedLastTrained = _mlService.lastTrainedPerMuscle(_sessions, map); + _recoveryCacheRevision = _historyRevision; + } + return ( + exerciseMap: _cachedExerciseMap!, + lastTrained: _cachedLastTrained!, + ); + } + final ProgramManager programManager; // Active workout state @@ -80,6 +116,11 @@ class WorkoutProvider extends ChangeNotifier { List get currentExerciseLogs => _currentExerciseLogs; DateTime? get workoutStartTime => _workoutStartTime; + /// Rolling calibration offset for [EffortEstimator]'s RPE-8 anchor, + /// derived only from the once-per-workout effort chip (see + /// [recordSessionEffort]) — 0.0 until the user has ever answered it. + double get effortCalibrationOffset => _effortCalibrationOffset; + /// Create WorkoutProvider with dependency injection. /// /// Following Dependency Inversion Principle: accepts abstractions @@ -106,10 +147,14 @@ class WorkoutProvider extends ChangeNotifier { Future loadAllData() async { _sessions = await _storage.getAllWorkoutSessions(); + _invalidateHistoryCache(); _routines = await _storage.getAllRoutines(); _targets = await _storage.getAllTargets(); _muscleGroups = await _storage.getAllMuscleGroups(); + final storedOffset = await _storage.getSetting(_effortCalibrationOffsetKey); + _effortCalibrationOffset = double.tryParse(storedOffset ?? '') ?? 0.0; _allExercises = await _storage.getAllExercises(); + _invalidateHistoryCache(); await programManager.loadPrograms(); notifyListeners(); } @@ -355,6 +400,7 @@ class WorkoutProvider extends ChangeNotifier { // Add to local list (use List.from for immutability) _allExercises = List.from(_allExercises)..add(exercise); + _invalidateHistoryCache(); notifyListeners(); } @@ -415,6 +461,7 @@ class WorkoutProvider extends ChangeNotifier { // Remove from local list _allExercises = List.from(_allExercises) ..removeWhere((e) => e.id == exerciseId); + _invalidateHistoryCache(); // Also remove any growth model _growthModels.remove(exerciseId); @@ -504,14 +551,36 @@ class WorkoutProvider extends ChangeNotifier { return _currentExerciseLogs[_currentExerciseIndex]; } + /// Set handle variation for current exercise. + /// + /// Locked once a set has been logged for this exercise instance — changing + /// the selector afterward must not retroactively relabel already-recorded + /// sets, so the handle is a no-op past that point. + void setExerciseHandle(String? handle) { + if (_currentExerciseIndex < _currentExerciseLogs.length) { + final currentLog = _currentExerciseLogs[_currentExerciseIndex]; + if (currentLog.sets.isNotEmpty) return; + _currentExerciseLogs[_currentExerciseIndex] = ExerciseLog( + exerciseId: currentLog.exerciseId, + sets: currentLog.sets, + notes: currentLog.notes, + handle: handle, + ); + notifyListeners(); + unawaited(_persistDraft()); + } + } + /// Add a set to current exercise void addSet(WorkoutSet set) { if (_currentExerciseIndex < _currentExerciseLogs.length) { final currentLog = _currentExerciseLogs[_currentExerciseIndex]; + final setWithHandle = set.copyWith(handle: set.handle ?? currentLog.handle); _currentExerciseLogs[_currentExerciseIndex] = ExerciseLog( exerciseId: currentLog.exerciseId, - sets: [...currentLog.sets, set], + sets: [...currentLog.sets, setWithHandle], notes: currentLog.notes, + handle: currentLog.handle, ); notifyListeners(); unawaited(_persistDraft()); @@ -528,6 +597,7 @@ class WorkoutProvider extends ChangeNotifier { exerciseId: currentLog.exerciseId, sets: newSets, notes: currentLog.notes, + handle: currentLog.handle, ); notifyListeners(); unawaited(_persistDraft()); @@ -600,6 +670,7 @@ class WorkoutProvider extends ChangeNotifier { } await _clearDraft(); _sessions.insert(0, session); + _invalidateHistoryCache(); // Update growth models for performed exercises for (var log in completedExercises) { @@ -637,26 +708,117 @@ class WorkoutProvider extends ChangeNotifier { // ==================== RECOMMENDATIONS ==================== - /// Get set recommendations for an exercise. + /// Get set recommendations for an exercise, optionally scoped by [handle]. /// - /// Uses the most-recently-dated session that contains this exercise as the - /// basis for the recommendation. Order in `_sessions` is not assumed. - List getRecommendations(String exerciseId) { - final lastLog = findMostRecentExerciseLog(exerciseId, _sessions); + /// Uses up to 3 past sessions for this exercise (and handle variation) as the + /// basis for trend analysis and deload recovery, plus the exercise's primary + /// muscle's recovery status so a still-fatigued muscle holds instead of + /// progressing. + /// [readinessBand] should come from the already-cached + /// `ReadinessManager.snapshot?.band` — this method never fetches it + /// itself, keeping recommendation generation synchronous/offline for the + /// in-workout hot path. + List getRecommendations( + String exerciseId, { + String? handle, + ReadinessBand? readinessBand, + }) { + final recent = getRecentSessionsForExercise(exerciseId, handle: handle, limit: 3); - if (lastLog == null || lastLog.sets.isEmpty) { + if (recent.isEmpty) { return _mlService.getDefaultRecommendations(3); } + // _growthModels is trained per-exerciseId across every handle variation, + // so it must not back a handle-scoped recommendation — that would mix + // e.g. "Rope pushdown" trend data into a "Bar pushdown" recommendation. + final useHandle = handle != null && handle.isNotEmpty; + // Cached: this runs from WorkoutFlowScreen's build, so the exercise map + // and the walk over every session are reused until history changes. Only + // the decay is recomputed per call, and that's O(muscle groups). + final derived = _historyDerived(); + final recoveryInputs = recoveryRecommendationInputs( + exerciseId: exerciseId, + sessions: _sessions, + exerciseMap: derived.exerciseMap, + mlService: _mlService, + lastTrained: derived.lastTrained, + ); + final sessionFatigueFactor = _sessionFatigueAccumulator.factorFor( + exerciseLogs: _currentExerciseLogs, + excludeExerciseId: exerciseId, + ); return _mlService.recommendSets( - lastSession: lastLog.sets, - growthModel: _growthModels[exerciseId], + lastSession: recent.first, + pastSessions: recent, + growthModel: useHandle ? null : _growthModels[exerciseId], + recoveryScores: recoveryInputs.recoveryScores, + primaryMuscleIds: recoveryInputs.primaryMuscleIds, + sessionFatigueFactor: sessionFatigueFactor, + readinessBand: readinessBand, ); } + /// Get up to [limit] recent sessions for [exerciseId], optionally matching [handle]. + /// + /// When [handle] is given, requires an EXACT handle match (excluding logs + /// with a null or different handle) so a "Cable curl" lookup never + /// surfaces "Barbell curl" history. Falls back to legacy (handle-less) + /// matching only when no exact match exists at all. + List> getRecentSessionsForExercise( + String exerciseId, { + String? handle, + int limit = 3, + }) { + if (limit <= 0) return const >[]; + final sortedSessions = [..._sessions]..sort((a, b) => b.date.compareTo(a.date)); + final useHandle = handle != null && handle.isNotEmpty; + + List> collect(bool Function(ExerciseLog) matches) { + final results = >[]; + for (final s in sortedSessions) { + for (final exLog in s.exercises.where((e) => e.exerciseId == exerciseId)) { + if (!matches(exLog)) continue; + if (exLog.sets.isNotEmpty) { + results.add(exLog.sets); + if (results.length >= limit) return results; + } + } + } + return results; + } + + if (useHandle) { + final exact = collect((exLog) => exLog.handle == handle); + if (exact.isNotEmpty) return exact; + return collect((exLog) => exLog.handle == null || exLog.handle!.isEmpty); + } + return collect((_) => true); + } + /// Get the most recent exercise log for [exerciseId], or null if never logged. - ExerciseLog? getLastSessionForExercise(String exerciseId) { - return findMostRecentExerciseLog(exerciseId, _sessions); + /// + /// Same exact-match-first, legacy-fallback semantics as + /// [getRecentSessionsForExercise] — see its doc for details. + ExerciseLog? getLastSessionForExercise(String exerciseId, {String? handle}) { + final sortedSessions = [..._sessions]..sort((a, b) => b.date.compareTo(a.date)); + final useHandle = handle != null && handle.isNotEmpty; + + ExerciseLog? find(bool Function(ExerciseLog) matches) { + for (final s in sortedSessions) { + for (final exLog in s.exercises.where((e) => e.exerciseId == exerciseId)) { + if (matches(exLog)) return exLog; + } + } + return null; + } + + if (useHandle) { + final exact = find((exLog) => exLog.handle == handle); + if (exact != null) return exact; + return find((exLog) => exLog.handle == null || exLog.handle!.isEmpty); + } + return find((_) => true); } // ==================== SESSION MANAGEMENT ==================== @@ -683,6 +845,7 @@ class WorkoutProvider extends ChangeNotifier { // Remove from local list _sessions = List.from(_sessions)..removeWhere((s) => s.id == sessionId); + _invalidateHistoryCache(); // Keep HistoryManager's cache in sync so HistoryScreen rebuilds. _historyManager?.evictSession(sessionId); @@ -726,10 +889,12 @@ class WorkoutProvider extends ChangeNotifier { final index = _sessions.indexWhere((s) => s.id == updatedSession.id); if (index != -1) { _sessions = List.from(_sessions)..[index] = updatedSession; + _invalidateHistoryCache(); } // Sort sessions by date (most recent first) _sessions.sort((a, b) => b.date.compareTo(a.date)); + _invalidateHistoryCache(); // Keep HistoryManager's cache in sync so HistoryScreen rebuilds. _historyManager?.patchSession(updatedSession); @@ -746,6 +911,103 @@ class WorkoutProvider extends ChangeNotifier { notifyListeners(); } + /// Tail of the in-flight effort writes, so overlapping chip taps run one + /// after another. See [recordSessionEffort]. + Future _effortWriteQueue = Future.value(); + + /// Records the once-per-workout effort chip (1 = Easy, 2 = Solid, + /// 3 = Brutal) for [sessionId] and folds it into the rolling + /// [effortCalibrationOffset]. Answering is optional — this is only ever + /// called from a user tap on the post-workout summary screen, never + /// required to finish a workout. + /// + /// Lighter than [updateWorkoutSession]: this only annotates metadata, so + /// it skips the growth-model/target retraining that method does for + /// exercise-data changes. + /// + /// The chip is re-answerable — the summary screen leaves it tappable — so + /// the offset is recomputed from every stored answer in date order rather + /// than folded in incrementally. Folding would count a changed answer + /// twice (tapping Brutal then Easy would apply both). + /// + /// Calls are serialised. Because the chips stay tappable while a write is + /// in flight and [_recordSessionEffort] captures the pre-call session and + /// offset for its rollback, two overlapping taps would otherwise let a + /// failing first call restore that stale snapshot over a second call that + /// had already committed — leaving storage behind provider state. Queuing + /// is enough: each call re-reads `_sessions` when its turn comes. + Future recordSessionEffort(String sessionId, int chipValue) { + final result = _effortWriteQueue.then( + (_) => _recordSessionEffort(sessionId, chipValue), + ); + // The queue must survive a failed write, or every later tap would inherit + // that error. The caller still sees it through [result]. + _effortWriteQueue = result.then((_) {}, onError: (_) {}); + return result; + } + + Future _recordSessionEffort(String sessionId, int chipValue) async { + final index = _sessions.indexWhere((s) => s.id == sessionId); + if (index == -1) return; + + final previousSession = _sessions[index]; + final previousOffset = _effortCalibrationOffset; + final updated = previousSession.copyWith(sessionEffort: chipValue); + + final nextSessions = List.from(_sessions)..[index] = updated; + final nextOffset = _recomputeEffortCalibrationOffset(nextSessions); + + // No transaction across boxes here, so on a partial failure put both the + // session and the offset back the way they were and rethrow — the caller + // (the summary screen's chip) restores its selection on the throw. + await _storage.saveWorkoutSession(updated); + try { + await _storage.saveSetting( + _effortCalibrationOffsetKey, + nextOffset.toString(), + ); + } catch (_) { + await _restoreSessionEffort(previousSession, previousOffset); + rethrow; + } + + _sessions = nextSessions; + _effortCalibrationOffset = nextOffset; + _invalidateHistoryCache(); + _historyManager?.patchSession(updated); + + notifyListeners(); + } + + /// Rebuilds the rolling offset from scratch over every answered session, + /// oldest first, so the result depends only on the stored answers and not + /// on how many times the user tapped to get there. + double _recomputeEffortCalibrationOffset(List sessions) { + final answered = sessions.where((s) => s.sessionEffort != null).toList() + ..sort((a, b) => a.date.compareTo(b.date)); + var offset = 0.0; + for (final session in answered) { + offset = _effortCalibration.updateOffset(offset, session.sessionEffort!); + } + return offset; + } + + /// Best-effort undo of a half-applied [recordSessionEffort]. A failure here + /// leaves the session row ahead of the stored offset, which the next + /// answered chip recomputes away; swallowing it keeps the original error + /// as the one the caller sees. + Future _restoreSessionEffort( + WorkoutSession previousSession, + double previousOffset, + ) async { + try { + await _storage.saveWorkoutSession(previousSession); + } catch (e, st) { + debugPrint('Failed to roll back session effort: $e\n$st'); + } + _effortCalibrationOffset = previousOffset; + } + // ==================== ROUTINES ==================== Future createRoutine(String name, List exerciseIds) async { diff --git a/workout-logger/lib/theme/a2ui_app_theme.dart b/workout-logger/lib/theme/a2ui_app_theme.dart new file mode 100644 index 0000000..4e6d46c --- /dev/null +++ b/workout-logger/lib/theme/a2ui_app_theme.dart @@ -0,0 +1,28 @@ +import 'package:repforge/genui/a2ui.dart'; + +import 'app_theme.dart'; + +/// Maps RepForge design tokens onto the domain-free [A2UiTheme] the GenUI +/// renderer consumes. This adapter is the only place the two systems meet. +const A2UiTheme repforgeA2UiTheme = A2UiTheme( + surface: AppColors.card, + border: AppColors.glassBorder, + divider: AppColors.divider, + textPrimary: AppColors.textPrimary, + textSoft: AppColors.textSoft, + textMuted: AppColors.textMuted, + textFaint: AppColors.textFaint, + accent: AppColors.primary, + positive: AppColors.success, + negative: AppColors.error, + seriesPalette: [ + AppColors.primary, + AppColors.secondary, + AppColors.success, + AppColors.warning, + AppColors.error, + ], + spacing: AppSpacing.md, + radius: AppRadius.lg, + pillRadius: AppRadius.full, +); diff --git a/workout-logger/lib/theme/app_theme.dart b/workout-logger/lib/theme/app_theme.dart index 1b27eb2..3c57bbb 100644 --- a/workout-logger/lib/theme/app_theme.dart +++ b/workout-logger/lib/theme/app_theme.dart @@ -20,11 +20,36 @@ class AppColors { static const glassBorderStrong = Color(0x21FFFFFF); // --border-strong 13% static const divider = Color(0x0FFFFFFF); // 6% white + // GlassCard material. The fill grades top-to-bottom and the edge grades with + // it, so a panel reads as a surface catching light from above rather than as + // an outline. The old fill (3.5% -> 1.6%) resolved to +9/255 and +4/255 over + // the canvas, which left the border twice as bright as the face it wrapped. + static const glassFillTop = Color(0x12FFFFFF); // 7% -> +17.5/255 + static const glassFillBottom = Color(0x05FFFFFF); // 2% -> +4.9/255 + static const glassEdgeTop = Color(0x24FFFFFF); // 14% -> +34.9/255 + static const glassEdgeBottom = Color(0x0AFFFFFF); // 4% -> +9.7/255 + + // Ambient wash floor. A radial pool's reach is finite and a scrolling column + // is not, so this full-height grade is the only layer that can guarantee a + // non-zero floor everywhere. Without it the canvas below the key pool is + // literally flat and glass has nothing to sit on. + static const washFloorTop = Color(0x065B21B6); // 2.4% violet + static const washFloorMid = Color(0x045B21B6); // 1.6% + static const washFloorBottom = Color(0x055B21B6); // 2.0% + // Brand — electric violet primary, cyan data static const primary = Color(0xFF7C3AED); // --accent oklch(0.68 0.18 285) + static const primaryDeep = Color(0xFF5B21B6); // gradient end / ambient wash static const secondary = Color(0xFF00C2D4); // --data oklch(0.78 0.14 200) static const accent = Color(0xFF7C3AED); // alias for primary + /// The one brand gradient, so every violet surface catches the same light. + static const primaryGradient = LinearGradient( + colors: [primary, primaryDeep], + begin: Alignment.topLeft, + end: Alignment.bottomRight, + ); + // Semantic static const success = Color(0xFF00C89B); // --success oklch(0.78 0.16 155) static const warning = Color(0xFFDBA520); // --warn oklch(0.78 0.14 60) diff --git a/workout-logger/lib/viewmodels/ai_coach_view_model.dart b/workout-logger/lib/viewmodels/ai_coach_view_model.dart index 036154c..bf449b8 100644 --- a/workout-logger/lib/viewmodels/ai_coach_view_model.dart +++ b/workout-logger/lib/viewmodels/ai_coach_view_model.dart @@ -5,7 +5,8 @@ // persists each turn through ConversationManager. Exposes immutable state. import 'package:flutter/foundation.dart'; -import 'package:google_generative_ai/google_generative_ai.dart' show Content, TextPart; +import 'package:google_generative_ai/google_generative_ai.dart' + show Content, TextPart, FunctionCall; import '../models/models.dart'; import '../services/interfaces/ai_service_interface.dart'; @@ -22,6 +23,7 @@ class AiCoachViewModel extends ChangeNotifier { bool _loading = false; String _streamingText = ''; + final List _streamingToolCalls = []; AiCoachViewModel({ required IAiService ai, @@ -47,6 +49,8 @@ class AiCoachViewModel extends ChangeNotifier { bool get isConfigured => _ai.isConfigured; bool get isLoading => _loading; String get streamingText => _streamingText; + // Tool names invoked so far for the in-flight reply, in call order. + List get streamingToolCalls => List.unmodifiable(_streamingToolCalls); List get messages => _conversations.activeMessages; List get conversations => _conversations.conversations; String? get activeConversationId => _conversations.active?.id; @@ -80,6 +84,7 @@ class AiCoachViewModel extends ChangeNotifier { _loading = true; _streamingText = ''; + _streamingToolCalls.clear(); notifyListeners(); // Persist the user message first; history is derived from the store. @@ -97,7 +102,7 @@ class AiCoachViewModel extends ChangeNotifier { systemPrompt: systemPrompt, history: history, tools: _coachTools.buildTools(), - onToolCall: _coachTools.handleCall, + onToolCall: _recordAndDispatch, )) { buffer.write(chunk); _streamingText = buffer.toString(); @@ -106,7 +111,13 @@ class AiCoachViewModel extends ChangeNotifier { final reply = buffer.toString().trim(); if (reply.isNotEmpty) { await _conversations.appendMessage( - ChatMessage(role: 'model', text: reply), + ChatMessage( + role: 'model', + text: reply, + toolCalls: _streamingToolCalls.isEmpty + ? null + : List.of(_streamingToolCalls), + ), ); } } catch (e) { @@ -119,11 +130,19 @@ class AiCoachViewModel extends ChangeNotifier { } } finally { _streamingText = ''; + _streamingToolCalls.clear(); _loading = false; notifyListeners(); } } + // Records the tool name for UI display, then delegates to the real handler. + Future> _recordAndDispatch(FunctionCall call) async { + _streamingToolCalls.add(call.name); + notifyListeners(); + return _coachTools.handleCall(call); + } + // ── Internals ────────────────────────────────────────────────────────────── // Static prompt — live data is fetched by the model via the coach tools, diff --git a/workout-logger/pubspec.lock b/workout-logger/pubspec.lock index a22582b..1feada5 100644 --- a/workout-logger/pubspec.lock +++ b/workout-logger/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d" + sha256: cd6add6f846f35fb79f3c315296703c1a24f3cfd7f4739d91a74961c1c7e9f1b url: "https://pub.dev" source: hosted - version: "93.0.0" + version: "100.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b + sha256: "6ba98576948803398b69e3a444df24eacdbe12ed699c7014e120ea38552debbf" url: "https://pub.dev" source: hosted - version: "10.0.1" + version: "13.0.0" archive: dependency: transitive description: @@ -53,34 +53,34 @@ packages: dependency: transitive description: name: build - sha256: a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10 + sha256: "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae" url: "https://pub.dev" source: hosted - version: "4.0.6" + version: "4.0.7" build_config: dependency: transitive description: name: build_config - sha256: "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71" + sha256: f2c223156a26eea323e6244b85141d76413a80aeee9fe0b380773789fabaf8ae url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" build_daemon: dependency: transitive description: name: build_daemon - sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957 + sha256: fd754058c342243718d5171a95f352cfc9fcf0cba8cfa26df67cb13a5836db78 url: "https://pub.dev" source: hosted - version: "4.1.1" + version: "4.1.2" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "1523ce62448ebac2c15a8ba5fbad8acac169788658a7dd2a1c2d9c2a9318b9a6" + sha256: "5367e521935b102bdf1e735d2aab461e36b2edca6517662d088dd04cc39f8d16" url: "https://pub.dev" source: hosted - version: "2.15.0" + version: "2.15.1" built_collection: dependency: transitive description: @@ -133,10 +133,10 @@ packages: dependency: transitive description: name: code_assets - sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687" + sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8 url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.2.1" code_builder: dependency: transitive description: @@ -165,10 +165,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937" + sha256: "92c9c43c383bfa1c32079d3bc492d55d6d4318044b7b47edaff8971cbb555c51" url: "https://pub.dev" source: hosted - version: "0.3.5+2" + version: "0.3.5+4" crypto: dependency: transitive description: @@ -189,26 +189,26 @@ packages: dependency: transitive description: name: dart_style - sha256: "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2" + sha256: "59d53ef8eaed9d288ed9767618e2b31c4fa0383a127db59d5eb2e737a7638a60" url: "https://pub.dev" source: hosted - version: "3.1.7" + version: "3.1.9" dbus: dependency: transitive description: name: dbus - sha256: d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270 + sha256: "0ce9b0a839e6dee59a37a623d2fc26a35bbbe6404213e419b0d6411023d62645" url: "https://pub.dev" source: hosted - version: "0.7.12" + version: "0.7.14" equatable: dependency: transitive description: name: equatable - sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b" + sha256: "3bce007a596ff8b3119c45d68aaef631272537c03d30e5d4534dd24bf4c5eaa2" url: "https://pub.dev" source: hosted - version: "2.0.8" + version: "2.1.0" fake_async: dependency: transitive description: @@ -225,6 +225,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.0" + ffi_leak_tracker: + dependency: transitive + description: + name: ffi_leak_tracker + sha256: "4093d4ef9ca06ffe2786e73bfb25e22aa92112b9bb4ec941f11e3e6b61489a97" + url: "https://pub.dev" + source: hosted + version: "0.1.2" file: dependency: transitive description: @@ -237,10 +245,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: f13a03000d942e476bc1ff0a736d2e9de711d2f89a95cd4c1d88f861c3348387 + sha256: fdc6a37f715d19f35b131decf1ce39242eeed5ddae18c0818c3eccb731ab76be url: "https://pub.dev" source: hosted - version: "11.0.2" + version: "12.0.0-beta.7" fixnum: dependency: transitive description: @@ -266,10 +274,10 @@ packages: dependency: "direct dev" description: name: flutter_launcher_icons - sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7" url: "https://pub.dev" source: hosted - version: "0.13.1" + version: "0.14.4" flutter_lints: dependency: "direct dev" description: @@ -290,10 +298,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "38d1c268de9097ff59cf0e844ac38759fc78f76836d37edad06fa21e182055a0" + sha256: "3854fe5e3bff0b113c658f260b90c95dea17c92db0f2addeac2e343dd9969785" url: "https://pub.dev" source: hosted - version: "2.0.34" + version: "2.0.35" flutter_svg: dependency: transitive description: @@ -332,10 +340,10 @@ packages: dependency: "direct main" description: name: gpt_markdown - sha256: c14c2a4599a67df5b6a984808cbb7631b8d15c91984ffdd7998597b93a6ff136 + sha256: ab6fe339f500104816139a034b8a23a125dadbc1988eda1641c6616562a4962b url: "https://pub.dev" source: hosted - version: "1.1.7" + version: "1.1.8" graphs: dependency: transitive description: @@ -348,34 +356,34 @@ packages: dependency: "direct main" description: name: health_connector - sha256: "5d2d785077e1004457808ee568efc1264e5e090258fac507c00542066fe12064" + sha256: "3caec088ae94023117b30e804a2bc19c369121a0618a5baa0849472e17d7b6c8" url: "https://pub.dev" source: hosted - version: "3.9.1" + version: "3.9.3" health_connector_core: dependency: transitive description: name: health_connector_core - sha256: "452823baeb89c8e63e6bf775b1eda86cfc42e50ad777addde899c77bea710136" + sha256: "8a2aa99574dcd8868447af7ab16dc9a26caba48a194e8141e6f6e54f7848f82d" url: "https://pub.dev" source: hosted - version: "3.9.0" + version: "3.9.2" health_connector_hc_android: dependency: transitive description: name: health_connector_hc_android - sha256: "21834d80e8d0c65f5263c3da7076c2933cf98b61e28547d2603f0b7f66caf8c7" + sha256: "063023a7ee4ec2acb4e2d4166de68df145ddaaa58e67d251926f22eed28a306c" url: "https://pub.dev" source: hosted - version: "3.6.0" + version: "3.6.2" health_connector_hk_ios: dependency: transitive description: name: health_connector_hk_ios - sha256: "617bc9d52c7a57b15d4a01663a1484f86b7d7460f93fdbf24e4ea4b54c7f0974" + sha256: "12e958e5481c493319a1972460be369f38ac494d103359fc09ba121b46f5d6eb" url: "https://pub.dev" source: hosted - version: "3.9.0" + version: "3.9.2" health_connector_logger: dependency: transitive description: @@ -404,10 +412,10 @@ packages: dependency: transitive description: name: hooks - sha256: "025f060e86d2d4c3c47b56e33caf7f93bf9283340f26d23424ebcfccf34f621e" + sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba" url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "2.0.2" http: dependency: "direct main" description: @@ -444,10 +452,10 @@ packages: dependency: "direct main" description: name: intl - sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867" url: "https://pub.dev" source: hosted - version: "0.19.0" + version: "0.20.3" io: dependency: transitive description: @@ -540,10 +548,10 @@ packages: dependency: transitive description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" mime: dependency: transitive description: @@ -556,18 +564,18 @@ packages: dependency: "direct dev" description: name: mockito - sha256: eff30d002f0c8bf073b6f929df4483b543133fcafce056870163587b03f1d422 + sha256: c8d040d754367108fbe482dcb79dd72b8fe60ac6727abd15b4783c5560297ee6 url: "https://pub.dev" source: hosted - version: "5.6.4" + version: "5.7.0" native_toolchain_c: dependency: transitive description: name: native_toolchain_c - sha256: "6ba77bb18063eebe9de401f5e6437e95e1438af0a87a3a39084fbd37c90df572" + sha256: f9c168717100ae6d9fee9ffb0be379bf1f8b26b0f6bcbd4fdddcd931993a6a72 url: "https://pub.dev" source: hosted - version: "0.17.6" + version: "0.19.2" nested: dependency: transitive description: @@ -580,10 +588,10 @@ packages: dependency: transitive description: name: objective_c - sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52" + sha256: "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed" url: "https://pub.dev" source: hosted - version: "9.3.0" + version: "9.4.1" package_config: dependency: transitive description: @@ -596,18 +604,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968" + sha256: "127e1751e37ffb2ff4658beeaca77bad0c27bf5f932bd3a501c2296926d4b481" url: "https://pub.dev" source: hosted - version: "8.3.1" + version: "10.2.1" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086" + sha256: db762cb2f4f25ee60fb6359773861b0f199e00b90d237bd85a76a1e806b46ef4 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "4.1.0" path: dependency: transitive description: @@ -628,10 +636,10 @@ packages: dependency: "direct main" description: name: path_provider - sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" + sha256: a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825 url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.1.6" path_provider_android: dependency: transitive description: @@ -652,18 +660,18 @@ packages: dependency: transitive description: name: path_provider_linux - sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + sha256: "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + sha256: "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" path_provider_windows: dependency: transitive description: @@ -708,10 +716,10 @@ packages: dependency: transitive description: name: posix - sha256: "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07" + sha256: bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.5.2" provider: dependency: "direct main" description: @@ -748,18 +756,18 @@ packages: dependency: "direct main" description: name: share_plus - sha256: "223873d106614442ea6f20db5a038685cc5b32a2fba81cdecaefbbae0523f7fa" + sha256: "34f00f9becd2743c1fb05363d624f9f70d37f7ccdcdda47450bc0b8c9d327b8c" url: "https://pub.dev" source: hosted - version: "12.0.2" + version: "13.3.0" share_plus_platform_interface: dependency: transitive description: name: share_plus_platform_interface - sha256: "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a" + sha256: "365ef7379fc22507256adda3385152942ffce08935452bc972c2e52a0bebae41" url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "7.2.0" shelf: dependency: transitive description: @@ -785,10 +793,10 @@ packages: dependency: transitive description: name: source_gen - sha256: ec37cc0e6694374cbef59ed79685572c870a54ede6fa30a3e420feb3adffea02 + sha256: a603f1fb984a7391ae5978d1b92bfaaa08b350dca5c825256f925818f7943bf5 url: "https://pub.dev" source: hosted - version: "4.2.3" + version: "4.2.4" source_span: dependency: transitive description: @@ -797,6 +805,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.2" + sqflite: + dependency: "direct main" + description: + name: sqflite + sha256: "58a799e6ac17dd32fbab93813d39ed835a75ccc0f8f85b8955fe318c6712b082" + url: "https://pub.dev" + source: hosted + version: "2.4.3" + sqflite_android: + dependency: transitive + description: + name: sqflite_android + sha256: d0548f9d7422a2dae99ec6f8b0a3074463b132d216fa5ba0d230eeefc901983b + url: "https://pub.dev" + source: hosted + version: "2.4.3" + sqflite_common: + dependency: transitive + description: + name: sqflite_common + sha256: "5bf6a55c166e73bf651ba7ec3ed486e577620e3dc8f3a9c6a258a8031b624590" + url: "https://pub.dev" + source: hosted + version: "2.5.11" + sqflite_common_ffi: + dependency: "direct dev" + description: + name: sqflite_common_ffi + sha256: "5ccd38136edb9beb3213f6927775d52db70dfdadcdb28dad1f625ca9f2b9824f" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + sqflite_darwin: + dependency: transitive + description: + name: sqflite_darwin + sha256: c86ca18b8f666bbf903924687fe21cc16fc385d086005067e26619ca530bef9f + url: "https://pub.dev" + source: hosted + version: "2.4.3+1" + sqflite_platform_interface: + dependency: transitive + description: + name: sqflite_platform_interface + sha256: f84939f84350d92d04416f8bc4dc52d3896aec7716cc9e80cf0146342139dc50 + url: "https://pub.dev" + source: hosted + version: "2.4.1" + sqlite3: + dependency: transitive + description: + name: sqlite3 + sha256: "64b2c63c8232dd20d14b34105a81ebfd74320442e8451f836179ec89986aa478" + url: "https://pub.dev" + source: hosted + version: "3.5.1" stack_trace: dependency: transitive description: @@ -829,6 +893,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.1" + synchronized: + dependency: transitive + description: + name: synchronized + sha256: "61894a1956de6b4fc1aefd0892e109514a1a706cbece3ac59decd90ff5a7a423" + url: "https://pub.dev" + source: hosted + version: "3.4.1+1" term_glyph: dependency: transitive description: @@ -841,10 +913,10 @@ packages: dependency: transitive description: name: test_api - sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.11" tuple: dependency: transitive description: @@ -897,10 +969,10 @@ packages: dependency: "direct main" description: name: uuid - sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489" + sha256: "9b129329f58692f6e6578329498a8fe9fbe98f090beb764ffbb8ee2eadd01dcd" url: "https://pub.dev" source: hosted - version: "4.5.3" + version: "4.6.0" vector_graphics: dependency: transitive description: @@ -921,10 +993,10 @@ packages: dependency: transitive description: name: vector_graphics_compiler - sha256: "09854c7633b215e6f7bb2a9adb607bc525bae8655c7fc29db880c33e62f72230" + sha256: "142a9146f447d15b10bdc00e21d5f4d83e5b32bb5f8f8f5a04c75311344923a3" url: "https://pub.dev" source: hosted - version: "1.2.4" + version: "1.2.6" vector_math: dependency: transitive description: @@ -977,10 +1049,10 @@ packages: dependency: transitive description: name: win32 - sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e + sha256: ba6f4bba816c8d7e3c1580e170f3786d216951cc6b94babc3b814c08d2cb2738 url: "https://pub.dev" source: hosted - version: "5.15.0" + version: "6.3.0" xdg_directories: dependency: transitive description: @@ -1006,5 +1078,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.11.4 <4.0.0" - flutter: "3.41.6" + dart: ">=3.12.0 <4.0.0" + flutter: "3.44.8" diff --git a/workout-logger/pubspec.yaml b/workout-logger/pubspec.yaml index 8e00c08..ca76f77 100644 --- a/workout-logger/pubspec.yaml +++ b/workout-logger/pubspec.yaml @@ -16,11 +16,11 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 2.0.12+33 +version: 2.1.0+34 environment: sdk: ^3.11.4 - flutter: 3.41.6 + flutter: 3.44.8 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -39,7 +39,10 @@ dependencies: # Local storage hive: ^2.2.3 hive_flutter: ^1.1.0 - + + # SQLite persistence (replacing Hive) + sqflite: ^2.4.2 + # State management provider: ^6.1.1 @@ -48,9 +51,9 @@ dependencies: # Utilities uuid: ^4.5.1 - intl: ^0.19.0 + intl: ^0.20.3 http: ^1.2.1 - package_info_plus: ^8.3.1 + package_info_plus: ^10.2.1 # Health Connect integration health_connector: ^3.9.1 @@ -59,9 +62,9 @@ dependencies: google_generative_ai: ^0.4.3 # Backup export/import - file_picker: ^11.0.2 + file_picker: ^12.0.0-beta.7 path_provider: ^2.1.5 - share_plus: ^12.0.1 + share_plus: ^13.2.1 gpt_markdown: ^1.1.7 dev_dependencies: @@ -74,12 +77,15 @@ dev_dependencies: # package. See that file for information about deactivating specific lint # rules and activating additional ones. flutter_lints: ^6.0.0 - flutter_launcher_icons: ^0.13.1 + flutter_launcher_icons: ^0.14.4 # Testing mockito: ^5.4.4 build_runner: ^2.4.8 + # sqflite testing on the Dart VM (flutter test has no platform binding) + sqflite_common_ffi: ^2.3.4+4 + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/workout-logger/scripts/build_release.py b/workout-logger/scripts/build_release.py new file mode 100644 index 0000000..619b442 --- /dev/null +++ b/workout-logger/scripts/build_release.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python3 +import os +import subprocess +import sys +from pathlib import Path + +def load_env_file(env_path: Path): + """Loads key-value pairs from a .env file into os.environ.""" + if not env_path.exists(): + return + with open(env_path, "r", encoding="utf-8") as f: + for line in f: + line = line.strip() + if not line or line.startswith("#") or "=" not in line: + continue + key, val = line.split("=", 1) + # Remove whitespace and wrapping quotes if present + val = val.strip().strip("'\"") + os.environ[key.strip()] = val + +def main(): + script_dir = Path(__file__).resolve().parent + project_dir = script_dir.parent if script_dir.name == "scripts" else script_dir + os.chdir(project_dir) + + env_file = project_dir / ".env" + if env_file.exists(): + print(f"Loading environment from {env_file}") + load_env_file(env_file) + else: + print("No .env file found. Using existing environment variables.") + + cmd = "flutter build apk --release --target-platform android-arm64 --obfuscate --split-debug-info=build/app/outputs/symbols" + + print(f"Executing: {cmd}") + result = subprocess.run(cmd, env=os.environ, shell=True) + sys.exit(result.returncode) + +if __name__ == "__main__": + main() diff --git a/workout-logger/scripts/test_gemini_api.py b/workout-logger/scripts/test_gemini_api.py new file mode 100644 index 0000000..8dabc41 --- /dev/null +++ b/workout-logger/scripts/test_gemini_api.py @@ -0,0 +1,366 @@ +#!/usr/bin/env python3 +""" +test_gemini_api.py - Standalone Python script testing Gemini 3.6 Flash tool calling & GenUI dashboard response. + +Executes a live 2-turn conversation flow: + 1. Sends initial user prompt ("Generate a volume graph for my triceps vs biceps"). + 2. Parses the model's returned function call & thinking/thought_signature. + 3. Echoes back the model's turn verbatim, followed by the tool response under `role: "user"`. + 4. Prints the final model output (e.g. A2UI dashboard JSON). +""" + +import json +import os +import re +import sys +import time +import socket +import urllib.error +import urllib.request + +# Without this urlopen can block indefinitely on a hung socket. +_REQUEST_TIMEOUT_SEC = 60 + + +def load_env_file(filepath: str) -> None: + if not os.path.exists(filepath): + return + with open(filepath, "r", encoding="utf-8") as f: + for line in f: + line = line.strip() + if not line or line.startswith("#") or "=" not in line: + continue + key, val = line.split("=", 1) + key = key.strip().strip("'\"") + if key and not os.environ.get(key): + os.environ[key] = val + + +def extract_retry_delay(body_str: str) -> float | None: + """Mirrors Dart _extractRetryDelay implementation in gemini_ai_service.dart.""" + try: + data = json.loads(body_str) + if isinstance(data, dict) and "error" in data: + err = data["error"] + # 1. Check google.rpc.RetryInfo in error.details + details = err.get("details", []) + if isinstance(details, list): + for item in details: + if isinstance(item, dict) and "retryDelay" in item: + delay_str = str(item["retryDelay"]).replace("s", "").strip() + val = float(delay_str) + if val > 0: + return min(max(val + 0.35, 0.5), 45.0) + # 2. Regex search in error.message (e.g. "Please retry in 23.690750876s.") + msg = err.get("message", "") + if isinstance(msg, str): + match = re.search(r"retry in\s+([\d.]+)\s*s", msg, re.IGNORECASE) + if match: + val = float(match.group(1)) + if val > 0: + return min(max(val + 0.35, 0.5), 45.0) + except Exception: + pass + return None + + +def is_daily_quota_exhausted(body: str) -> bool: + # Mirrors Dart _isDailyQuotaExhausted: only daily-limit-specific + # identifiers. Generic "QuotaExceeded"/"RESOURCE_EXHAUSTED" markers also + # fire for per-minute rate limits, which should retry-with-delay instead + # of triggering a model fallback. + return "GenerateRequestsPerDay" in body or "free_tier_requests" in body + + +def get_fallback_model(current_model: str) -> str | None: + fallbacks = { + "gemini-3.6-flash": "gemini-3.5-flash", + "gemini-3.5-flash": "gemini-3.5-flash-lite", + "gemini-3.5-flash-lite": "gemini-2.5-flash", + } + return fallbacks.get(current_model) + + +def thinking_config_for(model: str) -> dict: + """Mirrors Dart _thinkingConfig: every gemini-2.x model predates the Gemini + 3.x thinkingLevel enum and only understands the older thinkingBudget shape. + Matched by family, like the Dart side, so a 2.x id the quota fallback lands + on still gets the right shape.""" + if model.startswith("gemini-2"): + return {"thinkingBudget": 0} + return {"thinkingLevel": "minimal"} + + +def post_generate_content_with_retry(model: str, api_key: str, payload: dict, max_attempts: int = 4) -> dict: + current_model = model + attempt = 0 + + while True: + # Rebuild the request body for whichever model is currently selected — + # a daily-quota fallback mid-retry can switch to a model needing a + # different thinkingConfig shape (see thinking_config_for()), so the + # previous model's config must not be reused verbatim. + body = dict(payload) + gen_cfg = dict(body.get("generationConfig", {})) + gen_cfg["thinkingConfig"] = thinking_config_for(current_model) + body["generationConfig"] = gen_cfg + data_bytes = json.dumps(body).encode("utf-8") + + url = f"https://generativelanguage.googleapis.com/v1beta/models/{current_model}:generateContent?key={api_key}" + req = urllib.request.Request( + url, + data=data_bytes, + headers={"Content-Type": "application/json"}, + method="POST", + ) + try: + with urllib.request.urlopen(req, timeout=_REQUEST_TIMEOUT_SEC) as resp: + return json.loads(resp.read().decode("utf-8")) + except (TimeoutError, socket.timeout) as e: + # A hung socket is transient in the same way a 503 is; apply the + # same backoff rather than blocking the script forever. + if attempt < max_attempts - 1: + wait = 0.5 * (2**attempt) + print(f" [TIMEOUT] No response in {_REQUEST_TIMEOUT_SEC}s. Retrying in {wait:.2f}s (Attempt {attempt+1}/{max_attempts})...") + time.sleep(wait) + attempt += 1 + continue + raise e + except urllib.error.HTTPError as e: + body = e.read().decode("utf-8") + # The stream is consumed now, so cache it for callers that need to + # classify the failure after this re-raises. + e.error_body = body + if is_daily_quota_exhausted(body): + fallback = get_fallback_model(current_model) + if fallback: + print(f" [QUOTA EXHAUSTED] {current_model} daily free quota reached! Automatically falling back to {fallback}...") + current_model = fallback + continue + + if e.code in (429, 500, 502, 503, 504): + retry_sec = extract_retry_delay(body) or (0.5 * (2**attempt)) + print(f" [HTTP {e.code}] Rate limit/server error detected. Google retryDelay: {retry_sec:.2f}s (Attempt {attempt+1}/{max_attempts})") + if attempt < max_attempts - 1: + print(f" --> Waiting {retry_sec:.2f}s before retry...") + time.sleep(retry_sec) + attempt += 1 + continue + print(f"\n[!] HTTP {e.code} Error Body:\n{body}") + raise e + + +def is_invalid_api_key(body: str) -> bool: + """True only for a 400 that names the key itself, not a malformed request.""" + lowered = body.lower() + return "api_key_invalid" in lowered or "api key not valid" in lowered + + +def parse_genui_component(text: str) -> dict | None: + """Mirrors Dart A2UiComponent.tryParse + property normalization.""" + trimmed = text.strip() + if not trimmed or not trimmed.startswith("{"): + return None + try: + data = json.loads(trimmed) + if not isinstance(data, dict): + return None + comp = data.get("component") + if not comp or not isinstance(comp, str): + return None + # Extract props (supporting both wrapped 'props' and flat properties) + if isinstance(data.get("props"), dict): + props = data["props"] + else: + props = {k: v for k, v in data.items() if k != "component"} + return {"component": comp, "props": props} + except Exception: + return None + + +def main() -> None: + script_dir = os.path.dirname(os.path.abspath(__file__)) + root_dir = os.path.abspath(os.path.join(script_dir, "..")) + load_env_file(os.path.join(root_dir, ".env")) + load_env_file(os.path.join(os.getcwd(), ".env")) + + api_key = os.environ.get("GEMINI_API_KEY", "").strip() + if not api_key: + print("[!] GEMINI_API_KEY not found in environment or .env file.") + sys.exit(1) + + model = "gemini-3.6-flash" + + tools = [ + { + "functionDeclarations": [ + { + "name": "get_muscle_group_volume", + "description": "Fetch volume history for muscle groups.", + "parameters": { + "type": "OBJECT", + "properties": { + "muscle_groups": { + "type": "ARRAY", + "items": {"type": "STRING"}, + }, + # Optional, mirroring the production declaration in + # CoachToolService. + "days": { + "type": "INTEGER", + "description": "Optional. Number of days to look back (defaults to 60).", + "nullable": True, + }, + }, + "required": ["muscle_groups"], + }, + } + ] + } + ] + + system_instruction = { + "parts": [ + { + "text": ( + "You are an expert personal trainer embedded in RepForge. " + 'When asked for dashboards or comparison charts, return ONLY valid A2UI JSON: ' + '{"component":"GridContainer","props":{"columns":1,"children":[...]}}' + ) + } + ] + } + + print("=" * 70) + print("VERIFYING GEMINI API RETRY & COMPONENT PARSING IN A LOOP") + print("=" * 70) + + # Unit Test: Retry parsing regex & RetryInfo extraction + sample_error = json.dumps({ + "error": { + "code": 429, + "message": "Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 20, model: gemini-3.6-flash. Please retry in 23.690750876s.", + "status": "RESOURCE_EXHAUSTED", + "details": [{"@type": "type.googleapis.com/google.rpc.RetryInfo", "retryDelay": "23.690750876s"}] + } + }) + parsed_delay = extract_retry_delay(sample_error) + print(f"[TEST 1] Testing retryDelay parser on sample 429 payload:") + print(f" Extracted Retry Delay: {parsed_delay:.3f} seconds (Expected ~24.04s)") + assert parsed_delay is not None and 23.0 <= parsed_delay <= 25.0, "Parser failed!" + print(" --> PASSED!\n") + + # Unit Test: Flat vs Wrapped GenUI Component Parser + print("[TEST 2] Testing GenUI Flat & Wrapped Property Normalization:") + flat_json = '{"component":"DynamicChart","type":"line","title":"Biceps vs Triceps","labels":["W1"],"series":[{"name":"Biceps","values":[100]}]}' + parsed_flat = parse_genui_component(flat_json) + print(" Parsed Flat JSON:", json.dumps(parsed_flat, indent=2)) + assert parsed_flat is not None and "props" in parsed_flat and parsed_flat["props"]["type"] == "line" + print(" --> PASSED!\n") + + # Live Executions Loop + num_runs = 2 + for run in range(1, num_runs + 1): + print("=" * 70) + print(f"RUN {run}/{num_runs}: Executing Live Multi-Turn Query against {model}...") + print("=" * 70) + + contents = [ + {"role": "user", "parts": [{"text": "Generate a volume graph for my triceps vs biceps"}]} + ] + + payload1 = { + "contents": contents, + "systemInstruction": system_instruction, + "tools": tools, + "generationConfig": {"thinkingConfig": {"thinkingLevel": "minimal"}}, + } + + try: + res1 = post_generate_content_with_retry(model, api_key, payload1) + except urllib.error.HTTPError as e: + # Only an invalid key is a legitimate skip. Any other 400 is a real + # failure — a malformed request is exactly what this script exists + # to catch, so it must not exit 0. The body was already read (and + # printed) by the retry helper, which caches it here. + err_body = getattr(e, "error_body", "") + if e.code == 400 and is_invalid_api_key(err_body): + print("[NOTE] Live call skipped: API key in .env is invalid or unconfigured.") + print("[SUCCESS] Local retryDelay & component normalization tests verified.") + sys.exit(0) + raise e + candidates = res1.get("candidates", []) + if not candidates: + print(f"[!] No candidates returned. Raw response:\n{json.dumps(res1)[:500]}") + sys.exit(1) + first_cand = candidates[0] + model_content = first_cand.get("content", {}) + raw_parts = model_content.get("parts", []) + + function_calls = [p["functionCall"] for p in raw_parts if "functionCall" in p] + print(f" Turn 1 Model Response: {len(function_calls)} function call(s) received.") + + # A run that produced no tool call proved nothing, so it is a failure + # rather than a quietly skipped turn 2. + volume_calls = [ + fc for fc in function_calls if fc.get("name") == "get_muscle_group_volume" + ] + if not volume_calls: + print(f"[!] Expected a get_muscle_group_volume call, got {[fc.get('name') for fc in function_calls]}.") + print(json.dumps(raw_parts)[:500]) + sys.exit(1) + if not any( + isinstance(fc.get("args"), dict) and fc["args"].get("muscle_groups") + for fc in volume_calls + ): + print("[!] get_muscle_group_volume called without a muscle_groups argument.") + print(json.dumps(volume_calls)[:500]) + sys.exit(1) + + if function_calls: + contents.append(model_content) + func_response_parts = [{ + "functionResponse": { + "name": fc["name"], + **({"id": fc["id"]} if "id" in fc else {}), + "response": { + "dates": ["2026-07-06", "2026-07-09", "2026-07-16"], + "series": [ + {"name": "Biceps", "values": [600, 750, 900]}, + {"name": "Triceps", "values": [1200, 1400, 1600]} + ] + } + } + } for fc in function_calls] + + contents.append({"role": "user", "parts": func_response_parts}) + + payload2 = { + "contents": contents, + "systemInstruction": system_instruction, + "tools": tools, + "generationConfig": {"thinkingConfig": {"thinkingLevel": "minimal"}}, + } + + res2 = post_generate_content_with_retry(model, api_key, payload2) + cands2 = res2.get("candidates", []) + final_text = "" + for part in cands2[0].get("content", {}).get("parts", []): + if "text" in part: + final_text += part["text"] + + print(f" Turn 2 Final Model Output (Length: {len(final_text)} chars):") + parsed_comp = parse_genui_component(final_text) + if parsed_comp is None: + print("[!] Final output did not parse as a GenUI component.") + print(" Output Text:\n", final_text[:300]) + sys.exit(1) + print(" [SUCCESS] Successfully parsed GenUI Component structure!") + print(f" Root Component: {parsed_comp['component']}") + + print(f"\n[SUCCESS] Run {run} completed successfully.\n") + + +if __name__ == "__main__": + main() + diff --git a/workout-logger/test/ai_coach_view_model_test.dart b/workout-logger/test/ai_coach_view_model_test.dart index 13bebbe..213b254 100644 --- a/workout-logger/test/ai_coach_view_model_test.dart +++ b/workout-logger/test/ai_coach_view_model_test.dart @@ -59,6 +59,29 @@ class _FakeAiService implements IAiService { @override Future generateInsight(String system, String context) async => ''; + @override + Stream streamChatReply({ + required String userMessage, + required String systemPrompt, + required List history, + List? tools, + Future> Function(FunctionCall call)? onToolCall, + }) => + streamCoachReply( + userMessage: userMessage, + systemPrompt: systemPrompt, + history: history, + tools: tools, + onToolCall: onToolCall, + ); + + @override + Future generateStructuredJson({ + required String systemPrompt, + required String userPrompt, + required T Function(Map json) fromJson, + }) => + throw UnimplementedError(); } void main() { @@ -80,7 +103,7 @@ void main() { conversations = ConversationManager(storage); return AiCoachViewModel( ai: ai, - coachTools: CoachToolService(provider, pr), + coachTools: CoachToolService(workoutProvider: provider, prManager: pr), conversations: conversations, settings: settings, ); diff --git a/workout-logger/test/analytics_manager_test.dart b/workout-logger/test/analytics_manager_test.dart index e954c94..9b1009f 100644 --- a/workout-logger/test/analytics_manager_test.dart +++ b/workout-logger/test/analytics_manager_test.dart @@ -219,6 +219,40 @@ void main() { expect(recs, isNotEmpty); }); + + test('passes pastSessions, recoveryScores, and primaryMuscleIds when ' + 'exercise data is supplied', () { + final exercise = _exercise(id: 'ex1', muscleGroupId: 'chest'); + final sessions = [ + _session(id: 's1', exerciseId: 'ex1', weight: 80, date: DateTime(2024, 1, 1)), + _session(id: 's2', exerciseId: 'ex1', weight: 90, date: DateTime(2024, 1, 8)), + ]; + manager.buildSessionIndex(sessions); + + manager.getRecommendations( + 'ex1', + sessions, + exerciseMap: {'ex1': exercise}, + ); + + expect(mockML.lastPastSessions, isNotNull); + expect(mockML.lastPastSessions!.length, 2); + expect(mockML.lastRecoveryScores, isNotNull); + expect(mockML.lastPrimaryMuscleIds, ['chest']); + }); + + test('omits recoveryScores/primaryMuscleIds when no exercise data is ' + 'supplied (backward-compatible call)', () { + final sessions = [ + _session(id: 's1', exerciseId: 'ex1', weight: 80, date: DateTime(2024, 1, 1)), + ]; + manager.buildSessionIndex(sessions); + + manager.getRecommendations('ex1', sessions); + + expect(mockML.lastRecoveryScores, isNull); + expect(mockML.lastPrimaryMuscleIds, isNull); + }); }); group('AnalyticsManager - getVolumeProgression', () { diff --git a/workout-logger/test/coach_tool_service_schema_test.dart b/workout-logger/test/coach_tool_service_schema_test.dart new file mode 100644 index 0000000..1256dd5 --- /dev/null +++ b/workout-logger/test/coach_tool_service_schema_test.dart @@ -0,0 +1,36 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/services/ai/coach_tool_service.dart'; +import 'package:repforge/services/ai/sql_query_service.dart'; +import 'package:repforge/services/managers/pr_manager.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/workout_provider.dart'; + +import 'test_utils/mock_ml_service.dart'; +import 'test_utils/mock_storage_service.dart'; + +void main() { + test('run_sql_query schema description includes the new health tables', () { + final storage = MockStorageService(); + final wp = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + ); + final prm = PRManager(storage); + final tools = CoachToolService( + workoutProvider: wp, + prManager: prm, + sqlQuery: SqlQueryService('unused.db'), + ); + + final decl = tools + .buildTools() + .single + .functionDeclarations! + .firstWhere((d) => d.name == 'run_sql_query'); + + expect(decl.description, contains('health_samples')); + expect(decl.description, contains('sleep_sessions')); + expect(decl.description, contains('sleep_stage_intervals')); + }); +} diff --git a/workout-logger/test/coach_tool_service_test.dart b/workout-logger/test/coach_tool_service_test.dart index 4cecf55..b76b86d 100644 --- a/workout-logger/test/coach_tool_service_test.dart +++ b/workout-logger/test/coach_tool_service_test.dart @@ -1,13 +1,18 @@ // Unit tests for CoachToolService — each tool returns expected JSON shapes, // backed by a seeded WorkoutProvider + PRManager. +import 'dart:io'; + import 'package:flutter_test/flutter_test.dart'; import 'package:google_generative_ai/google_generative_ai.dart' show FunctionCall; +import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:repforge/models/models.dart'; import 'package:repforge/services/workout_provider.dart'; import 'package:repforge/services/managers/program_manager.dart'; import 'package:repforge/services/managers/pr_manager.dart'; import 'package:repforge/services/ai/coach_tool_service.dart'; +import 'package:repforge/services/sqlite_storage_service.dart'; +import 'package:repforge/services/ai/sql_query_service.dart'; import 'test_utils/mock_storage_service.dart'; void main() { @@ -59,7 +64,62 @@ void main() { pr = PRManager(storage); await pr.backfillFromSessions(provider.sessions); - tools = CoachToolService(provider, pr); + tools = CoachToolService(workoutProvider: provider, prManager: pr); + }); + + group('run_sql_query', () { + late String dbPath; + late SqliteStorageService sqliteStorage; + + setUpAll(() { + sqfliteFfiInit(); + databaseFactory = databaseFactoryFfi; + }); + + setUp(() async { + dbPath = '${Directory.systemTemp.path}/coach_sql_test_${DateTime.now().microsecondsSinceEpoch}.db'; + sqliteStorage = SqliteStorageService(databasePathOverride: dbPath); + await sqliteStorage.init(); + await sqliteStorage.saveWorkoutSession(WorkoutSession( + id: 'sess1', date: DateTime(2026, 5, 1), duration: 40, + exercises: [ExerciseLog(exerciseId: 'bench_press', sets: [WorkoutSet(weight: 70, reps: 8)])], + )); + }); + + tearDown(() async { + await sqliteStorage.close(); + // Best-effort cleanup: the sqflite ffi connection may still hold the + // file handle open on some platforms (e.g. Windows), which would + // otherwise turn cleanup noise into a spurious test failure. + try { + final f = File(dbPath); + if (await f.exists()) await f.delete(); + } catch (_) {} + }); + + test('is not advertised when no SqlQueryService is provided', () { + final declared = + tools.buildTools().expand((t) => t.functionDeclarations ?? []).map((f) => f.name); + expect(declared, isNot(contains('run_sql_query'))); + }); + + test('is advertised and runs a live SELECT when wired', () async { + final withSql = CoachToolService( + workoutProvider: provider, + prManager: pr, + sqlQuery: SqlQueryService(dbPath), + ); + + final declared = + withSql.buildTools().expand((t) => t.functionDeclarations ?? []).map((f) => f.name); + expect(declared, contains('run_sql_query')); + + final result = await withSql.handleCall( + FunctionCall('run_sql_query', {'query': 'SELECT id, duration_min FROM sessions'}), + ); + expect(result['row_count'], 1); + expect((result['rows'] as List).first, {'id': 'sess1', 'duration_min': 40}); + }); }); test('exposes the expected tool declarations', () { diff --git a/workout-logger/test/debug_log_buffer_test.dart b/workout-logger/test/debug_log_buffer_test.dart new file mode 100644 index 0000000..3fbcfca --- /dev/null +++ b/workout-logger/test/debug_log_buffer_test.dart @@ -0,0 +1,62 @@ +import 'package:flutter/foundation.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/services/debug_log_buffer.dart'; + +void main() { + group('DebugLogBuffer', () { + late DebugLogBuffer buffer; + late DebugPrintCallback originalDebugPrint; + + setUp(() { + originalDebugPrint = debugPrint; + buffer = DebugLogBuffer.instance; + buffer.clear(); + }); + + tearDown(() { + debugPrint = originalDebugPrint; + buffer.clear(); + }); + + test('initial lines list is empty', () { + expect(buffer.lines, isEmpty); + }); + + test('attach intercepts debugPrint and appends timestamped message', () { + DebugLogBuffer.attach(); + + bool notified = false; + buffer.addListener(() { + notified = true; + }); + + debugPrint('Test log message'); + + expect(buffer.lines, hasLength(1)); + expect(buffer.lines.first, contains('Test log message')); + expect(buffer.lines.first, matches(RegExp(r'^\[\d{2}:\d{2}:\d{2}\] Test log message$'))); + expect(notified, isTrue); + }); + + test('clear wipes all logs and notifies listeners', () { + DebugLogBuffer.attach(); + debugPrint('Message 1'); + debugPrint('Message 2'); + expect(buffer.lines, hasLength(2)); + + bool notified = false; + buffer.addListener(() { + notified = true; + }); + + buffer.clear(); + + expect(buffer.lines, isEmpty); + expect(notified, isTrue); + }); + + test('lines is unmodifiable', () { + expect(() => buffer.lines.add('direct add'), throwsUnsupportedError); + }); + }); +} diff --git a/workout-logger/test/effort_calibration_test.dart b/workout-logger/test/effort_calibration_test.dart new file mode 100644 index 0000000..aeec021 --- /dev/null +++ b/workout-logger/test/effort_calibration_test.dart @@ -0,0 +1,55 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/services/utils/effort_calibration.dart'; + +void main() { + const calibration = EffortCalibration(); + + test('chipRpe maps every effort chip to an RPE anchor', () { + // The chip values are what WorkoutSummaryScreen sends to + // recordSessionEffort; a gap here would make a chip silently inert. + expect(EffortCalibration.chipRpe.keys, containsAll([1, 2, 3])); + for (final entry in EffortCalibration.chipRpe.entries) { + expect(entry.value, inInclusiveRange(1.0, 10.0), reason: '${entry.key}'); + } + }); + + test('an Easy answer nudges the offset negative', () { + final result = calibration.updateOffset(0.0, 1); + expect(result, lessThan(0.0)); + }); + + test('a Solid answer (matches the anchor) leaves the offset unchanged', () { + final result = calibration.updateOffset(0.0, 2); + expect(result, closeTo(0.0, 0.0001)); + }); + + test('a Brutal answer nudges the offset positive', () { + final result = calibration.updateOffset(0.0, 3); + expect(result, greaterThan(0.0)); + }); + + test('repeated Brutal answers converge toward +1.0 but never exceed it', () { + var offset = 0.0; + for (var i = 0; i < 200; i++) { + offset = calibration.updateOffset(offset, 3); + } + expect(offset, closeTo(EffortCalibration.maxOffset, 0.01)); + expect(offset, lessThanOrEqualTo(EffortCalibration.maxOffset)); + }); + + test('repeated Easy answers converge toward -1.0 but never exceed it', () { + var offset = 0.0; + for (var i = 0; i < 200; i++) { + offset = calibration.updateOffset(offset, 1); + } + expect(offset, closeTo(-EffortCalibration.maxOffset, 0.01)); + expect(offset, greaterThanOrEqualTo(-EffortCalibration.maxOffset)); + }); + + test('an unrecognized chip value is treated as neutral (matches the anchor)', + () { + final result = calibration.updateOffset(0.5, 99); + // delta = anchorRpe - anchorRpe = 0 → offset decays toward 0. + expect(result, closeTo(0.45, 0.0001)); + }); +} diff --git a/workout-logger/test/effort_estimator_test.dart b/workout-logger/test/effort_estimator_test.dart new file mode 100644 index 0000000..f67cd30 --- /dev/null +++ b/workout-logger/test/effort_estimator_test.dart @@ -0,0 +1,278 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/utils/effort_estimator.dart'; + +WorkoutSet _set({ + double weight = 60.0, + int reps = 10, + DateTime? timestamp, + int? timeTaken, +}) => + WorkoutSet( + weight: weight, + reps: reps, + timestamp: timestamp ?? DateTime(2026, 1, 1, 10, 0), + timeTaken: timeTaken, + ); + +void main() { + const estimator = EffortEstimator(); + + group('EffortEstimator - no signals available', () { + test('returns the RPE-8 anchor with base confidence', () { + final result = estimator.estimate(set: _set()); + expect(result.rpe, closeTo(EffortEstimator.anchorRpe, 0.001)); + expect(result.source, EffortSource.estimatedHrless); + expect(result.confidence, closeTo(0.35, 0.001)); + }); + + test('calibrationOffset shifts the anchor', () { + final result = estimator.estimate(set: _set(), calibrationOffset: 0.5); + expect(result.rpe, closeTo(EffortEstimator.anchorRpe + 0.5, 0.001)); + }); + }); + + group('EffortEstimator - term 1: trend deviation', () { + test('actual volume above trend lowers RPE (easier than expected)', () { + final model = GrowthModel( + slope: 5.0, + intercept: 500.0, // predicted volume at x=0 is 500 + r2: 0.9, + lastTrained: DateTime.now(), + stdError: 50.0, + ); + // set volume = 60*10 = 600, well above the 500 prediction. + final result = estimator.estimate( + set: _set(weight: 60, reps: 10), + growthModel: model, + growthModelX: 0, + ); + expect(result.rpe, lessThan(EffortEstimator.anchorRpe)); + expect(result.confidence, greaterThan(0.35)); + }); + + test('actual volume below trend raises RPE (harder than expected)', () { + final model = GrowthModel( + slope: 5.0, + intercept: 900.0, + r2: 0.9, + lastTrained: DateTime.now(), + stdError: 50.0, + ); + final result = estimator.estimate( + set: _set(weight: 60, reps: 10), // volume 600, well below 900 + growthModel: model, + growthModelX: 0, + ); + expect(result.rpe, greaterThan(EffortEstimator.anchorRpe)); + }); + + test('untrustworthy fit (low r2) is ignored', () { + final model = GrowthModel( + slope: 5.0, + intercept: 900.0, + r2: 0.05, // below the 0.2 trust threshold + lastTrained: DateTime.now(), + stdError: 50.0, + ); + final result = estimator.estimate( + set: _set(weight: 60, reps: 10), + growthModel: model, + growthModelX: 0, + ); + expect(result.rpe, closeTo(EffortEstimator.anchorRpe, 0.001)); + }); + + test('missing growthModelX skips the term even with a trustworthy model', + () { + final model = GrowthModel( + slope: 5.0, + intercept: 900.0, + r2: 0.9, + lastTrained: DateTime.now(), + ); + final result = estimator.estimate(set: _set(), growthModel: model); + expect(result.rpe, closeTo(EffortEstimator.anchorRpe, 0.001)); + }); + }); + + group('EffortEstimator - term 2: intra-session decline', () { + test('flat volume across sets contributes nothing', () { + final prior = [_set(weight: 60, reps: 10)]; + final result = estimator.estimate( + set: _set(weight: 60, reps: 10), + priorSetsThisExerciseToday: prior, + ); + expect(result.rpe, closeTo(EffortEstimator.anchorRpe, 0.001)); + }); + + test('a small dip within the deadband contributes nothing', () { + final prior = [_set(weight: 100, reps: 10)]; // volume 1000 + final result = estimator.estimate( + set: _set(weight: 97, reps: 10), // volume 970, 3% drop — within the 5% deadband + priorSetsThisExerciseToday: prior, + ); + expect(result.rpe, closeTo(EffortEstimator.anchorRpe, 0.001)); + }); + + test('a drop just past the deadband raises RPE', () { + final prior = [_set(weight: 100, reps: 10)]; // volume 1000 + final result = estimator.estimate( + set: _set(weight: 90, reps: 10), // volume 900, 10% drop + priorSetsThisExerciseToday: prior, + ); + expect(result.rpe, greaterThan(EffortEstimator.anchorRpe)); + }); + + test('a real volume drop across sets raises RPE', () { + final prior = [_set(weight: 100, reps: 10)]; // volume 1000 + final result = estimator.estimate( + set: _set(weight: 100, reps: 6), // volume 600, 40% drop + priorSetsThisExerciseToday: prior, + ); + expect(result.rpe, greaterThan(EffortEstimator.anchorRpe + 1)); + }); + }); + + group('EffortEstimator - term 3: rest/tempo drift', () { + test('needs at least 2 prior sets to establish a baseline', () { + final prior = [ + _set(timestamp: DateTime(2026, 1, 1, 10, 0), timeTaken: 30), + ]; + final result = estimator.estimate( + set: _set(timestamp: DateTime(2026, 1, 1, 10, 5), timeTaken: 90), + priorSetsThisExerciseToday: prior, + ); + // Only decline term (n/a here, flat volume) applies; rest/tempo is + // skipped with a single prior set. + expect(result.rpe, closeTo(EffortEstimator.anchorRpe, 0.001)); + }); + + test('a much longer rest gap than usual raises RPE', () { + final prior = [ + _set(timestamp: DateTime(2026, 1, 1, 10, 0)), + _set(timestamp: DateTime(2026, 1, 1, 10, 2)), // 120s gap + ]; + final result = estimator.estimate( + // 600s gap vs a 120s median — well over double. + set: _set(timestamp: DateTime(2026, 1, 1, 10, 12)), + priorSetsThisExerciseToday: prior, + ); + expect(result.rpe, greaterThan(EffortEstimator.anchorRpe)); + }); + + test('a much slower tempo than usual raises RPE', () { + final prior = [ + _set(timestamp: DateTime(2026, 1, 1, 10, 0), reps: 10, timeTaken: 20), + _set(timestamp: DateTime(2026, 1, 1, 10, 2), reps: 10, timeTaken: 20), + ]; + final result = estimator.estimate( + set: _set(timestamp: DateTime(2026, 1, 1, 10, 4), reps: 10, timeTaken: 60), + priorSetsThisExerciseToday: prior, + ); + expect(result.rpe, greaterThan(EffortEstimator.anchorRpe)); + }); + }); + + group('EffortEstimator - term 4: heart rate (optional)', () { + test('is skipped entirely when hrSignal is null', () { + final result = estimator.estimate(set: _set()); + expect(result.source, EffortSource.estimatedHrless); + }); + + test('too few samples in the set window is ignored', () { + final result = estimator.estimate( + set: _set(), + hrSignal: const HrEffortSignal( + setPeakBpm: 170, + setSampleCount: 2, // below minHrSamplesForSignal + sessionFloorBpm: 90, + sessionPeakBpm: 175, + ), + ); + expect(result.source, EffortSource.estimatedHrless); + expect(result.rpe, closeTo(EffortEstimator.anchorRpe, 0.001)); + }); + + test('a set peak near the session ceiling raises RPE and confidence', () { + final withoutHr = estimator.estimate(set: _set()); + final withHr = estimator.estimate( + set: _set(), + hrSignal: const HrEffortSignal( + setPeakBpm: 174, + setSampleCount: 5, + sessionFloorBpm: 90, + sessionPeakBpm: 175, + ), + ); + expect(withHr.source, EffortSource.estimatedWithHr); + expect(withHr.rpe, greaterThan(withoutHr.rpe)); + expect(withHr.confidence, greaterThan(withoutHr.confidence)); + }); + + test('a set peak well below the session ceiling lowers RPE', () { + final result = estimator.estimate( + set: _set(), + hrSignal: const HrEffortSignal( + setPeakBpm: 100, + setSampleCount: 5, + sessionFloorBpm: 90, + sessionPeakBpm: 175, + ), + ); + expect(result.rpe, lessThan(EffortEstimator.anchorRpe)); + }); + }); + + group('EffortEstimator - confidence ladder', () { + test('never exceeds maxEstimatedConfidence even with every bonus', () { + final model = GrowthModel( + slope: 5.0, + intercept: 500.0, + r2: 0.9, + lastTrained: DateTime.now(), + stdError: 50.0, + ); + final prior = [ + _set(timestamp: DateTime(2026, 1, 1, 10, 0)), + _set(timestamp: DateTime(2026, 1, 1, 10, 2)), + ]; + final result = estimator.estimate( + set: _set(timestamp: DateTime(2026, 1, 1, 10, 4)), + priorSetsThisExerciseToday: prior, + growthModel: model, + growthModelX: 0, + sessionHistoryCount: 10, + hrSignal: const HrEffortSignal( + setPeakBpm: 174, + setSampleCount: 5, + sessionFloorBpm: 90, + sessionPeakBpm: 175, + ), + ); + expect(result.confidence, lessThanOrEqualTo(EffortEstimator.maxEstimatedConfidence)); + }); + + // The trend term alone cannot reach the outer clamp: z is already + // clamped to ±2, so it contributes at most ±1.6 around the 8.0 anchor. + // Driving calibrationOffset past the bound is what actually exercises + // rpe.clamp — without it these assertions pass with the clamp removed. + test('rpe is clamped to minRpe when the calibration offset drives it under', + () { + final result = estimator.estimate( + set: _set(weight: 1, reps: 1), + calibrationOffset: -50.0, + ); + expect(result.rpe, EffortEstimator.minRpe); + }); + + test('rpe is clamped to maxRpe when the calibration offset drives it over', + () { + final result = estimator.estimate( + set: _set(weight: 1, reps: 1), + calibrationOffset: 50.0, + ); + expect(result.rpe, EffortEstimator.maxRpe); + }); + }); +} diff --git a/workout-logger/test/flutter_test_config.dart b/workout-logger/test/flutter_test_config.dart new file mode 100644 index 0000000..f398996 --- /dev/null +++ b/workout-logger/test/flutter_test_config.dart @@ -0,0 +1,12 @@ +// Wraps every test in this suite. See dart.dev/go/flutter-test-config. + +import 'dart:async'; + +import 'package:repforge/screens/widgets/rf_widgets.dart'; + +Future testExecutable(FutureOr Function() testMain) async { + // AmbientGlow drifts on a loop that never completes, which would keep + // pumpAndSettle waiting for a frame that never stops coming. + AmbientGlow.motionEnabled = false; + await testMain(); +} diff --git a/workout-logger/test/gemini_ai_service_thinking_test.dart b/workout-logger/test/gemini_ai_service_thinking_test.dart new file mode 100644 index 0000000..a41f507 --- /dev/null +++ b/workout-logger/test/gemini_ai_service_thinking_test.dart @@ -0,0 +1,76 @@ +// Unit tests for Gemini thinking-level support and clamping. + +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/services/ai/gemini_ai_service.dart'; + +void main() { + group('supportedThinkingLevels', () { + test('gemini-3.7-flash does not support minimal', () { + expect(supportedThinkingLevels('gemini-3.7-flash'), ['low', 'medium', 'high']); + }); + + test('other gemini-3.x models support all four levels', () { + expect(supportedThinkingLevels('gemini-3.6-flash'), kThinkingLevels); + expect(supportedThinkingLevels('gemini-3.5-flash'), kThinkingLevels); + expect(supportedThinkingLevels('gemini-3.5-flash-lite'), kThinkingLevels); + expect(supportedThinkingLevels('gemini-3.1-flash-lite'), kThinkingLevels); + }); + + test('gemini-2.x models support no thinking levels', () { + expect(supportedThinkingLevels('gemini-2.5-flash'), isEmpty); + }); + }); + + group('clampThinkingLevel', () { + test('leaves a supported level unchanged', () { + expect(clampThinkingLevel('gemini-3.6-flash', 'high'), 'high'); + }); + + test('snaps minimal to low for gemini-3.7-flash', () { + expect(clampThinkingLevel('gemini-3.7-flash', 'minimal'), 'low'); + }); + + test('leaves the level unchanged for a model with no thinking levels', () { + expect(clampThinkingLevel('gemini-2.5-flash', 'minimal'), 'minimal'); + }); + }); + + group('GeminiAiService thinking level', () { + test('defaults to kDefaultThinkingLevel', () { + final service = GeminiAiService(); + expect(service.thinkingLevel, kDefaultThinkingLevel); + }); + + test('updateThinkingLevel changes the level', () { + final service = GeminiAiService(); + service.updateThinkingLevel('high'); + expect(service.thinkingLevel, 'high'); + }); + + test('updateThinkingLevel clamps against the current model', () { + final service = GeminiAiService(); + service.updateModel('gemini-3.7-flash'); + service.updateThinkingLevel('minimal'); + expect(service.thinkingLevel, 'low'); + }); + + test('updateModel re-clamps an already-set thinking level', () { + final service = GeminiAiService(); + service.updateThinkingLevel('minimal'); + service.updateModel('gemini-3.7-flash'); + expect(service.thinkingLevel, 'low'); + }); + + test('init clamps the supplied thinking level against the supplied model', () { + final service = GeminiAiService(); + service.init('key', model: 'gemini-3.7-flash', thinkingLevel: 'minimal'); + expect(service.thinkingLevel, 'low'); + }); + }); + + group('getFallbackModel', () { + test('gemini-3.7-flash falls back to gemini-3.6-flash', () { + expect(getFallbackModel('gemini-3.7-flash'), 'gemini-3.6-flash'); + }); + }); +} diff --git a/workout-logger/test/gemini_ai_service_usage_test.dart b/workout-logger/test/gemini_ai_service_usage_test.dart index 046bdae..0e6ab8c 100644 --- a/workout-logger/test/gemini_ai_service_usage_test.dart +++ b/workout-logger/test/gemini_ai_service_usage_test.dart @@ -56,4 +56,35 @@ void main() { expect(reloaded.aiRequestCount, 0); }); }); + + group('GeminiAiService model picker', () { + test('offers Gemini 3.7 Flash', () { + expect( + kGeminiModels, + contains(('gemini-3.7-flash', 'Gemini 3.7 Flash')), + ); + }); + + test('model ids are unique and the default is one of them', () { + final ids = kGeminiModels.map((e) => e.$1).toList(); + expect(ids.toSet().length, ids.length); + expect(ids, contains(kDefaultGeminiModel)); + }); + + test('every offered model has a defined fallback shape', () { + // A model either falls back to another offered model or terminates the + // chain; it must never point at an id the picker doesn't know. + final ids = kGeminiModels.map((e) => e.$1).toSet(); + for (final id in ids) { + final next = getFallbackModel(id); + if (next != null) expect(ids, contains(next), reason: id); + } + }); + + test('a selected model can be initialised and reported back', () { + final service = GeminiAiService(storage: MockStorageService()); + service.init('fake_test_api_key', model: 'gemini-3.7-flash'); + expect(service.currentModel, 'gemini-3.7-flash'); + }); + }); } diff --git a/workout-logger/test/gemini_context_builder_test.dart b/workout-logger/test/gemini_context_builder_test.dart new file mode 100644 index 0000000..6eeb7b6 --- /dev/null +++ b/workout-logger/test/gemini_context_builder_test.dart @@ -0,0 +1,165 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/a2ui.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/gemini_context_builder.dart'; + +void main() { + group('GeminiContextBuilder', () { + test('buildCoachSystemPrompt includes today date, unit label, and username', () { + final now = DateTime(2026, 7, 23); + final prompt = GeminiContextBuilder.buildCoachSystemPrompt( + userName: 'Devasy', + unitLabel: 'lbs', + now: now, + ); + + expect(prompt, contains('Today is 2026-07-23')); + expect(prompt, contains('Weights are in lbs')); + expect(prompt, contains("The user's name is Devasy")); + expect(prompt, contains('RepForge')); + }); + + test('buildOptimizerSystemPrompt builds routine optimizer system prompt', () { + final now = DateTime(2026, 7, 23); + final prompt = GeminiContextBuilder.buildOptimizerSystemPrompt( + userName: 'Devasy', + unitLabel: 'kg', + now: now, + ); + + expect(prompt, contains('specialized routine optimizer')); + expect(prompt, contains('Today is 2026-07-23')); + expect(prompt, contains('Weights are in kg')); + expect(prompt, contains("The user's name is Devasy")); + }); + + test('buildWeeklyInsightsContext formats sessions and volumes for this and last week', () { + final exerciseMap = { + 'ex1': Exercise( + id: 'ex1', + name: 'Bench Press', + category: 'compound', + muscleActivations: [ + MuscleActivation(muscleGroupId: 'chest', activationPercentage: 100), + ], + ), + }; + + final thisWeekSession = WorkoutSession( + id: 's1', + date: DateTime(2026, 7, 20), // Monday + duration: 45, + exercises: [ + ExerciseLog( + exerciseId: 'ex1', + sets: [ + WorkoutSet(weight: 100, reps: 10), + ], + ), + ], + ); + + final lastWeekSession = WorkoutSession( + id: 's2', + date: DateTime(2026, 7, 13), // Monday + duration: 45, + exercises: [ + ExerciseLog( + exerciseId: 'ex1', + sets: [ + WorkoutSet(weight: 95, reps: 10), + ], + ), + ], + ); + + final result = GeminiContextBuilder.buildWeeklyInsightsContext( + thisWeek: [thisWeekSession], + lastWeek: [lastWeekSession], + exerciseMap: exerciseMap, + unitLabel: 'kg', + ); + + expect(result, contains('THIS WEEK — 1 sessions')); + expect(result, contains('Bench Press 1×sets (1000kg vol)')); + expect(result, contains('LAST WEEK — 1 sessions')); + expect(result, contains('Mon: Bench Press')); + }); + }); + + group('coach prompt A2UI section', () { + final prompt = GeminiContextBuilder.buildCoachSystemPrompt( + now: DateTime(2026, 8, 5), + ); + + test('embeds the generated A2UI section', () { + expect(prompt, contains(buildA2UiPromptSection(defaultA2UiRegistry))); + }); + + test('no longer hand-writes component schemas', () { + // The old prose listed props inline; the generated section owns that now. + expect(prompt, isNot(contains('StatCard {title,value,subtitle?,trend}'))); + expect(prompt, isNot(contains('RadarChart {title,axes:[string]'))); + }); + + test('domain playbook survives and names components only', () { + expect(prompt, contains('biceps vs triceps')); + expect(prompt, contains('get_sleeping_hr_analytics')); + }); + + test('is stable for a fixed date so the cache prefix stays byte-identical', + () { + expect( + GeminiContextBuilder.buildCoachSystemPrompt(now: DateTime(2026, 8, 5)), + prompt, + ); + }); + + // Pins the hand-written "WHICH COMPONENT TO REACH FOR" playbook against + // drift: this prose can't be generated from the registry (it's + // domain-specific routing guidance a domain-free lib/genui/ package can't + // know about), so if a component named here is ever renamed or removed + // from the registry, this test must fail loudly rather than the mismatch + // going silent the way it did before the registry refactor. + test( + 'every component named in the WHICH COMPONENT TO REACH FOR playbook ' + 'resolves in the default registry', () { + // Names as semantically referenced by the prose (e.g. the prose says + // "StatCards" — the plural reads naturally in a sentence but the + // canonical component is "StatCard"; `contains` below tolerates the + // trailing "s"). + const mentionedComponents = [ + 'DynamicChart', + 'StatCard', + 'ScatterPlot', + 'RadarChart', + 'MetricGauge', + 'DataListGroup', + ]; + + for (final name in mentionedComponents) { + expect( + prompt, + contains(name), + reason: '"$name" is expected in the component-routing playbook ' + 'but was not found — did the prose get edited?', + ); + expect( + defaultA2UiRegistry.specFor(name), + isNotNull, + reason: '"$name" is named in the component-routing playbook but ' + 'does not resolve in defaultA2UiRegistry — it was likely ' + 'renamed or removed without updating the prose.', + ); + } + }); + + test('default registry has exactly the expected number of components', + () { + // A deliberate, visible tripwire: if a component is ever added or + // removed, this assertion should force a conscious update rather than + // the count silently drifting. + expect(defaultA2UiRegistry.specs.length, 8); + }); + }); +} diff --git a/workout-logger/test/genui/a2ui_custom_registry_test.dart b/workout-logger/test/genui/a2ui_custom_registry_test.dart new file mode 100644 index 0000000..3b91ce6 --- /dev/null +++ b/workout-logger/test/genui/a2ui_custom_registry_test.dart @@ -0,0 +1,117 @@ +// Regression coverage for the registry-propagation fix to A2UiRenderer. +// +// `A2UiRenderer`'s `registry` constructor override used to only apply to the +// top-level node: `GridContainerSpec.buildWidget` recurses via bare +// `A2UiRenderer(node: children[i])` with no registry forwarded, so nested +// children silently fell back to `defaultA2UiRegistry` even when the caller +// passed a custom registry at the root. If the custom registry's components +// weren't in the default one, those children silently rendered +// `SizedBox.shrink()` — blank, with no error. +// +// The fix mirrors the existing theme-injection pattern: `A2UiRenderer` now +// wraps its own subtree in an `A2UiRegistryProvider` carrying the resolved +// registry (explicit override, or whatever was already ambient), so nested +// bare `A2UiRenderer` calls made without an explicit override pick up the +// ambient registry via `A2UiRegistryProvider.of(context)` instead of +// reverting to the default. +// +// This file replaces the old `a2ui_parser_stub_test.dart`, which was +// temporary Task 3 scaffolding (a hand-rolled fake registry, needed only +// because `default_registry.dart` didn't exist yet at that point in the +// refactor) and had become redundant with `a2ui_parser_test.dart`, which +// covers the same parsing behaviors against the real registry. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_node.dart'; +import 'package:repforge/genui/src/a2ui_props.dart'; +import 'package:repforge/genui/src/a2ui_registry.dart'; +import 'package:repforge/genui/src/a2ui_renderer.dart'; +import 'package:repforge/genui/src/a2ui_spec.dart'; +import 'package:repforge/genui/src/a2ui_theme.dart'; +import 'package:repforge/genui/src/components/grid_container.dart'; + +/// A minimal spec not present in `defaultA2UiRegistry`, so successfully +/// rendering it proves a custom registry was actually consulted. +class _CustomWidgetSpec extends A2UiSpec { + const _CustomWidgetSpec(); + + @override + String get name => 'CustomWidget'; + + @override + A2UiDoc get doc => const A2UiDoc( + schema: 'CustomWidget {label}', + purpose: 'test-only stub component', + example: {'component': 'CustomWidget', 'props': {'label': 'x'}}, + ); + + @override + String parseProps(A2UiNode node) => node.props.text('label'); + + @override + Widget buildWidget(BuildContext context, String props, A2UiTheme theme) => + Text('custom:$props'); +} + +void main() { + final customRegistry = A2UiRegistry(const [ + GridContainerSpec(), + _CustomWidgetSpec(), + ]); + + testWidgets( + 'a custom registry propagates through GridContainer to nested children', + (tester) async { + final node = A2UiNode( + name: 'GridContainer', + props: const A2UiProps({'columns': 1}), + children: const [ + A2UiNode( + name: 'CustomWidget', + props: A2UiProps({'label': 'first'}), + ), + A2UiNode( + name: 'CustomWidget', + props: A2UiProps({'label': 'second'}), + ), + ], + ); + + await tester.pumpWidget(MaterialApp( + home: Scaffold( + body: A2UiRenderer(node: node, registry: customRegistry), + ), + )); + + // Before the fix, nested children resolved against `defaultA2UiRegistry` + // (which does not know `CustomWidget`) and silently rendered + // `SizedBox.shrink()` instead of this text. + expect(find.text('custom:first'), findsOneWidget); + expect(find.text('custom:second'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets( + 'without a custom registry, an unknown component silently renders ' + 'nothing rather than crashing', (tester) async { + final node = A2UiNode( + name: 'GridContainer', + props: const A2UiProps({'columns': 1}), + children: const [ + A2UiNode(name: 'CustomWidget', props: A2UiProps({'label': 'x'})), + ], + ); + + await tester.pumpWidget(MaterialApp( + home: Scaffold( + // No `registry:` override — falls back to `defaultA2UiRegistry`, + // which does not know `CustomWidget`. + body: A2UiRenderer(node: node), + ), + )); + + expect(find.text('custom:x'), findsNothing); + expect(tester.takeException(), isNull); + }); +} diff --git a/workout-logger/test/genui/a2ui_parser_test.dart b/workout-logger/test/genui/a2ui_parser_test.dart new file mode 100644 index 0000000..9cc9950 --- /dev/null +++ b/workout-logger/test/genui/a2ui_parser_test.dart @@ -0,0 +1,156 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_parser.dart'; +import 'package:repforge/genui/src/default_registry.dart'; + +void main() { + final parser = A2UiParser(defaultA2UiRegistry); + + group('payload gate', () { + test('returns null for ordinary prose', () { + expect(parser.parse('**Nice work.** Keep going.'), isNull); + expect(parser.parse(''), isNull); + expect(parser.parse('Your bench went up 5kg { nice }.'), isNull); + }); + + test('returns null for valid JSON with no known component', () { + expect(parser.parse('{"component":"HeroBanner","props":{}}'), isNull); + expect(parser.parse('{"foo":1}'), isNull); + }); + + test('returns null rather than throwing on malformed JSON', () { + expect(parser.parse('{"component":"StatCard", "props":'), isNull); + expect(parser.parse('{{{{'), isNull); + }); + }); + + group('extraction', () { + test('parses a bare object', () { + final node = parser.parse( + '{"component":"StatCard","props":{"title":"Volume","value":"12k"}}', + ); + expect(node?.name, 'StatCard'); + expect(node?.props.text('title'), 'Volume'); + }); + + test('strips a fenced code block with a language tag', () { + final node = parser.parse( + '```json\n{"component":"StatCard","props":{"title":"V","value":"1"}}\n```', + ); + expect(node?.name, 'StatCard'); + }); + + test('strips a fenced code block without a language tag', () { + final node = parser.parse( + '```\n{"component":"StatCard","props":{"title":"V","value":"1"}}\n```', + ); + expect(node?.name, 'StatCard'); + }); + + test('extracts the object from surrounding prose', () { + final node = parser.parse( + 'Here you go:\n{"component":"StatCard","props":{"title":"V","value":"1"}}\nHope that helps!', + ); + expect(node?.name, 'StatCard'); + }); + }); + + group('shape tolerance', () { + test('accepts the flat form without a props wrapper', () { + final node = parser.parse( + '{"component":"StatCard","title":"Volume","value":"12k"}', + ); + expect(node?.name, 'StatCard'); + expect(node?.props.text('value'), '12k'); + }); + + test('canonicalises a misspelled component name', () { + expect(parser.parse('{"component":"stat_card","title":"V"}')?.name, + 'StatCard'); + expect(parser.parse('{"component":"Stat Card","title":"V"}')?.name, + 'StatCard'); + }); + + test('auto-wraps a bare array of components in a GridContainer', () { + final node = parser.parse( + '[{"component":"StatCard","title":"A","value":"1"},' + '{"component":"StatCard","title":"B","value":"2"}]', + ); + expect(node?.name, 'GridContainer'); + expect(node?.children, hasLength(2)); + }); + + test('auto-wraps a {"components":[...]} envelope', () { + final node = parser.parse( + '{"components":[{"component":"StatCard","title":"A","value":"1"}]}', + ); + expect(node?.name, 'GridContainer'); + expect(node?.children, hasLength(1)); + }); + }); + + group('recursion', () { + test('parses nested children', () { + final node = parser.parse(''' +{"component":"GridContainer","props":{"columns":2,"children":[ + {"component":"StatCard","props":{"title":"A","value":"1"}}, + {"component":"DynamicChart","props":{"type":"bar","title":"C", + "labels":["Mon"],"values":[1]}} +]}} +'''); + expect(node?.name, 'GridContainer'); + expect(node?.children.map((c) => c.name), ['StatCard', 'DynamicChart']); + }); + + test('drops unrecognised children but keeps the rest', () { + final node = parser.parse(''' +{"component":"GridContainer","children":[ + {"component":"StatCard","title":"A","value":"1"}, + {"component":"HeroBanner","title":"nope"}, + "garbage" +]} +'''); + expect(node?.children, hasLength(1)); + expect(node?.children.single.name, 'StatCard'); + }); + + test('returns null when a container loses every child', () { + expect( + parser.parse('{"component":"GridContainer","children":[' + '{"component":"HeroBanner"}]}'), + isNull, + ); + }); + }); + + group('looksLikeUi', () { + test('is true for a partial payload that has started a JSON object', () { + expect(parser.looksLikeUi('{"component":"Stat'), isTrue); + expect(parser.looksLikeUi('```json\n{"comp'), isTrue); + expect(parser.looksLikeUi(' \n{'), isTrue); + }); + + test('is false for prose and for empty text', () { + expect(parser.looksLikeUi('Your bench is'), isFalse); + expect(parser.looksLikeUi(''), isFalse); + expect(parser.looksLikeUi('**Great** work'), isFalse); + }); + + test('is true for a prose sentence followed by an unclosed fence', () { + // A model that narrates before opening a fenced payload: the fence + // isn't at position 0, so a naive "starts with ``` " check misses it. + expect( + parser.looksLikeUi( + 'Here is your data:\n```json\n{"component":"Stat', + ), + isTrue, + ); + }); + + test('is false for plain prose containing no fence or JSON at all', () { + expect( + parser.looksLikeUi('Your bench is trending nicely, keep going!'), + isFalse, + ); + }); + }); +} diff --git a/workout-logger/test/genui/a2ui_prompt_test.dart b/workout-logger/test/genui/a2ui_prompt_test.dart new file mode 100644 index 0000000..d81441a --- /dev/null +++ b/workout-logger/test/genui/a2ui_prompt_test.dart @@ -0,0 +1,77 @@ +import 'dart:convert'; + +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/a2ui.dart'; + +void main() { + final section = buildA2UiPromptSection(defaultA2UiRegistry); + + test('names every registered component', () { + for (final spec in defaultA2UiRegistry.specs) { + expect(section, contains(spec.name), reason: spec.name); + } + }); + + test('includes every schema line verbatim', () { + for (final spec in defaultA2UiRegistry.specs) { + expect(section, contains(spec.doc.schema), reason: spec.name); + } + }); + + test('includes every purpose line', () { + for (final spec in defaultA2UiRegistry.specs) { + expect(section, contains(spec.doc.purpose), reason: spec.name); + } + }); + + test('mentions no component the registry does not have', () { + expect(section, isNot(contains('HeroCard'))); + expect(section, isNot(contains('axes:'))); + }); + + test('contains a worked example that the parser accepts', () { + // The prompt's "Envelope: {...}" description line uses placeholder + // braces (, ...) that aren't valid JSON, so the real example must + // be located after the "WORKED EXAMPLE:" marker rather than by the + // section's first '{' overall. + final markerIndex = section.indexOf('WORKED EXAMPLE:'); + expect(markerIndex, greaterThan(-1)); + final start = section.indexOf('{', markerIndex); + expect(start, greaterThan(-1)); + // Walk forward counting brace depth so the extracted region is exactly + // the balanced JSON object starting at `start`, regardless of whether + // prompt content appended after the worked example also contains '}'. + var depth = 0; + var end = -1; + for (var i = start; i < section.length; i++) { + if (section[i] == '{') depth++; + if (section[i] == '}') { + depth--; + if (depth == 0) { + end = i; + break; + } + } + } + expect(end, greaterThan(-1)); + final example = section.substring(start, end + 1); + + final decoded = jsonDecode(example); + expect(decoded, isA>()); + + final node = A2UiParser(defaultA2UiRegistry) + .parseJson(decoded as Map); + expect(node, isNotNull); + expect(node!.name, 'GridContainer'); + expect(node.children, isNotEmpty); + }); + + test('states the tolerance rules so the model is not over-constrained', () { + expect(section.toLowerCase(), contains('number')); + expect(section.toLowerCase(), contains('ignored')); + }); + + test('is deterministic across calls so prompt caching can engage', () { + expect(buildA2UiPromptSection(defaultA2UiRegistry), section); + }); +} diff --git a/workout-logger/test/genui/a2ui_props_test.dart b/workout-logger/test/genui/a2ui_props_test.dart new file mode 100644 index 0000000..1682987 --- /dev/null +++ b/workout-logger/test/genui/a2ui_props_test.dart @@ -0,0 +1,84 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_props.dart'; + +void main() { + group('A2UiProps key resolution', () { + test('finds a key by exact match', () { + const p = A2UiProps({'title': 'Volume'}); + expect(p.text('title'), 'Volume'); + }); + + test('finds a key ignoring case, underscores, spaces and hyphens', () { + expect(const A2UiProps({'x_label': 'Sleep'}).text('xLabel'), 'Sleep'); + expect(const A2UiProps({'X Label': 'Sleep'}).text('xLabel'), 'Sleep'); + expect(const A2UiProps({'XLABEL': 'Sleep'}).text('xLabel'), 'Sleep'); + expect(const A2UiProps({'x-label': 'Sleep'}).text('xLabel'), 'Sleep'); + }); + + test('finds a key through a semantic alias', () { + expect(const A2UiProps({'axes': ['A', 'B']}).stringList('labels'), + ['A', 'B']); + expect(const A2UiProps({'name': 'Bench'}).text('title'), 'Bench'); + expect(const A2UiProps({'val': 5}).number('value'), 5); + }); + + test('prefers an exact match over an alias', () { + const p = A2UiProps({'title': 'Real', 'name': 'Alias'}); + expect(p.text('title'), 'Real'); + }); + }); + + group('A2UiProps coercion', () { + test('text() stringifies numbers and returns fallback for null', () { + expect(const A2UiProps({'value': 12.5}).text('value'), '12.5'); + expect(const A2UiProps({}).text('value', or: '—'), '—'); + }); + + test('number() parses numeric strings and returns fallback otherwise', () { + expect(const A2UiProps({'value': '12.5'}).number('value'), 12.5); + expect(const A2UiProps({'value': 'n/a'}).number('value', or: -1), -1); + expect(const A2UiProps({'value': 7}).number('value'), 7); + }); + + test('numberOrNull() distinguishes absent from zero', () { + expect(const A2UiProps({}).numberOrNull('min'), isNull); + expect(const A2UiProps({'min': 0}).numberOrNull('min'), 0); + }); + + test('stringList() stringifies mixed element types', () { + expect(const A2UiProps({'labels': [1, 'B', 2.5]}).stringList('labels'), + ['1', 'B', '2.5']); + }); + + test('numberList() coerces string elements and drops unparseable ones', () { + expect(const A2UiProps({'values': ['1', 2, 'x']}).numberList('values'), + [1.0, 2.0]); + }); + + test('list accessors return empty for a wrong-typed or missing key', () { + expect(const A2UiProps({'labels': 'not a list'}).stringList('labels'), + isEmpty); + expect(const A2UiProps({}).numberList('values'), isEmpty); + expect(const A2UiProps({'items': 5}).objectList('items'), isEmpty); + }); + + test('objectList() wraps maps and skips non-maps', () { + final rows = const A2UiProps({ + 'items': [ + {'primaryText': 'Bench'}, + 'garbage', + {'primaryText': 'Squat'}, + ], + }).objectList('items'); + expect(rows, hasLength(2)); + expect(rows[0].text('primaryText'), 'Bench'); + expect(rows[1].text('primaryText'), 'Squat'); + }); + + test('integer() truncates and falls back', () { + expect(const A2UiProps({'columns': 2.9}).integer('columns'), 2); + expect(const A2UiProps({'columns': '2'}).integer('columns'), 2); + expect(const A2UiProps({}).integer('columns', or: 1), 1); + }); + }); +} diff --git a/workout-logger/test/genui/a2ui_purity_test.dart b/workout-logger/test/genui/a2ui_purity_test.dart new file mode 100644 index 0000000..c7932e2 --- /dev/null +++ b/workout-logger/test/genui/a2ui_purity_test.dart @@ -0,0 +1,118 @@ +import 'dart:io'; + +import 'package:flutter_test/flutter_test.dart'; + +/// Matches an `import`/`export` path that reaches into one of RepForge's +/// app-specific top-level directories, regardless of how many `../` hops +/// precede it (e.g. `'../theme/...'`, `'../../../theme/...'`) or whether it +/// is written as a `package:repforge/...` path. +final RegExp _forbiddenPathPattern = RegExp( + r"""['"](?:(?:\.\./)+|package:repforge/)(theme|models|services|screens|data)/""", +); + +/// Matches an `import` or `export` directive line, so we only flag genuine +/// dependency declarations and not, say, doc comments that happen to mention +/// a forbidden directory name. +final RegExp _directiveLine = RegExp(r'^(import|export)\s'); + +/// Matches an explicit cast to a common type, used to flag unchecked casts on +/// model-supplied data in component renderers. +final RegExp _castPattern = + RegExp(r'\bas (String|num|int|double|List|Map|bool|Object|dynamic)\b'); + +void main() { + test('lib/genui imports nothing app-specific', () { + // The whole point of the refactor: this package must be liftable into + // another app without dragging RepForge's models, theme or services along. + final violations = []; + var scannedFileCount = 0; + final dir = Directory('lib/genui'); + for (final entity in dir.listSync(recursive: true)) { + if (entity is! File || !entity.path.endsWith('.dart')) continue; + scannedFileCount++; + final lines = entity.readAsStringSync().split('\n'); + for (var i = 0; i < lines.length; i++) { + final trimmed = lines[i].trimLeft(); + if (!_directiveLine.hasMatch(trimmed)) continue; + if (_forbiddenPathPattern.hasMatch(trimmed)) { + violations.add('${entity.path}:${i + 1}: ${lines[i].trim()}'); + } + } + } + + // Guards against a vacuous pass: if `lib/genui` were ever empty or + // unreachable (wrong CWD, a path typo), the loop above would scan zero + // files and `violations` would be trivially empty. The package has 20+ + // Dart files at time of writing; a sane floor below that still catches a + // broken scan without being brittle to file-count churn. + expect(scannedFileCount, greaterThan(15), + reason: 'expected to scan a substantial number of lib/genui files, ' + 'but only found $scannedFileCount — is the CWD wrong?'); + + expect(violations, isEmpty, + reason: 'genui must stay domain-free:\n${violations.join('\n')}'); + }); + + test('forbidden-path regex catches the violation shapes it must', () { + // Regression test for the guard itself: a depth-blind, literal + // needle-list version of this check silently passed a real + // `'../../../theme/app_theme.dart'` import from + // lib/genui/src/components/ (three `../` hops) because only one- and + // two-hop needles were listed. Pin down that every realistic depth and + // form of a forbidden import is actually matched, using in-memory + // strings rather than mutating real source files. + const mustMatch = [ + "import '../theme/app_theme.dart';", + "import '../../theme/app_theme.dart';", + "import '../../../theme/app_theme.dart';", + "import '../../../../models/models.dart';", + "import 'package:repforge/theme/app_theme.dart';", + "import 'package:repforge/models/models.dart';", + "export 'package:repforge/services/workout_provider.dart';", + "import '../screens/home_screen.dart';", + "import '../../data/exercise_database.dart';", + "import 'package:repforge/data/exercise_database.dart';", + ]; + for (final line in mustMatch) { + expect(_forbiddenPathPattern.hasMatch(line), isTrue, + reason: 'expected forbidden-path regex to match: $line'); + } + + const mustNotMatch = [ + "import 'package:flutter/material.dart';", + "import 'a2ui_registry.dart';", + "import '../src/a2ui_parser.dart';", + "import 'package:repforge/genui/a2ui.dart';", + ]; + for (final line in mustNotMatch) { + expect(_forbiddenPathPattern.hasMatch(line), isFalse, + reason: 'expected forbidden-path regex NOT to match: $line'); + } + }); + + test('component renderers contain no casts on model-supplied data', () { + final violations = []; + var scannedFileCount = 0; + final dir = Directory('lib/genui/src/components'); + for (final entity in dir.listSync(recursive: true)) { + if (entity is! File || !entity.path.endsWith('.dart')) continue; + scannedFileCount++; + final lines = entity.readAsStringSync().split('\n'); + for (var i = 0; i < lines.length; i++) { + if (_castPattern.hasMatch(lines[i])) { + violations.add('${entity.path}:${i + 1}: ${lines[i].trim()}'); + } + } + } + + // Same vacuous-pass guard as above: there are 8 component files at time + // of writing, so a floor comfortably below that still catches a broken + // scan (wrong CWD, empty/unreachable directory) without being brittle. + expect(scannedFileCount, greaterThan(5), + reason: 'expected to scan several component files, but only found ' + '$scannedFileCount — is the CWD wrong?'); + + expect(violations, isEmpty, + reason: 'use A2UiProps accessors, not casts:\n${violations.join('\n')}'); + }); +} diff --git a/workout-logger/test/genui/a2ui_registry_test.dart b/workout-logger/test/genui/a2ui_registry_test.dart new file mode 100644 index 0000000..c5e0e87 --- /dev/null +++ b/workout-logger/test/genui/a2ui_registry_test.dart @@ -0,0 +1,153 @@ +import 'package:flutter/widgets.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_node.dart'; +import 'package:repforge/genui/src/a2ui_props.dart'; +import 'package:repforge/genui/src/a2ui_registry.dart'; +import 'package:repforge/genui/src/a2ui_spec.dart'; +import 'package:repforge/genui/src/a2ui_theme.dart'; + +class _FakeProps { + const _FakeProps(this.title); + final String title; +} + +class _FakeSpec extends A2UiSpec<_FakeProps> { + const _FakeSpec(); + + @override + String get name => 'StatCard'; + + @override + List get aliases => const ['Stat', 'KpiCard']; + + @override + A2UiDoc get doc => const A2UiDoc( + schema: 'StatCard {title, value}', + purpose: 'A single headline number.', + example: { + 'component': 'StatCard', + 'props': {'title': 'Volume', 'value': '12000 kg'}, + }, + ); + + @override + _FakeProps parseProps(A2UiNode node) => _FakeProps(node.props.text('title')); + + @override + Widget buildWidget(BuildContext context, _FakeProps props, A2UiTheme theme) => + Text(props.title, textDirection: TextDirection.ltr); +} + +/// A minimal fake spec with a configurable name/aliases, for exercising +/// registry collision detection. +class _NamedFakeSpec extends A2UiSpec<_FakeProps> { + const _NamedFakeSpec(this.name, {this.aliases = const []}); + + @override + final String name; + + @override + final List aliases; + + @override + A2UiDoc get doc => const A2UiDoc( + schema: 'Fake {}', + purpose: 'A fake component for tests.', + example: {'component': 'Fake', 'props': {}}, + ); + + @override + _FakeProps parseProps(A2UiNode node) => _FakeProps(node.props.text('title')); + + @override + Widget buildWidget(BuildContext context, _FakeProps props, A2UiTheme theme) => + Text(props.title, textDirection: TextDirection.ltr); +} + +void main() { + final registry = A2UiRegistry(const [_FakeSpec()]); + + group('A2UiRegistry lookup', () { + test('resolves the canonical name', () { + expect(registry.specFor('StatCard'), isNotNull); + }); + + test('resolves case, underscore and space variants', () { + for (final variant in ['statcard', 'STAT_CARD', 'Stat Card', 'stat-card']) { + expect(registry.specFor(variant), isNotNull, reason: variant); + } + }); + + test('resolves declared aliases', () { + expect(registry.specFor('KpiCard')?.name, 'StatCard'); + expect(registry.specFor('stat')?.name, 'StatCard'); + }); + + test('returns null for an unknown name', () { + expect(registry.specFor('HeroBanner'), isNull); + }); + + test('canonicalName maps any accepted variant to the canonical name', () { + expect(registry.canonicalName('kpi_card'), 'StatCard'); + expect(registry.canonicalName('nope'), isNull); + }); + + test('exposes specs in registration order', () { + expect(registry.specs.map((s) => s.name), ['StatCard']); + }); + + test('throws when two specs share a canonical name', () { + expect( + () => A2UiRegistry(const [ + _NamedFakeSpec('LineChart'), + _NamedFakeSpec('LineChart'), + ]), + throwsStateError, + ); + }); + + test("throws when a spec's alias matches another spec's canonical name", + () { + expect( + () => A2UiRegistry(const [ + _NamedFakeSpec('LineChart'), + _NamedFakeSpec('BarChart', aliases: ['LineChart']), + ]), + throwsStateError, + ); + }); + + test('throws when two specs share an alias', () { + expect( + () => A2UiRegistry(const [ + _NamedFakeSpec('LineChart', aliases: ['Chart']), + _NamedFakeSpec('BarChart', aliases: ['Chart']), + ]), + throwsStateError, + ); + }); + }); + + group('A2UiSpec', () { + testWidgets('render() parses then builds', (tester) async { + const node = A2UiNode( + name: 'StatCard', + props: A2UiProps({'title': 'Weekly Volume'}), + ); + await tester.pumpWidget( + Builder( + builder: (context) => + registry.specFor('StatCard')!.render(context, node, A2UiTheme.dark), + ), + ); + expect(find.text('Weekly Volume'), findsOneWidget); + }); + }); + + group('A2UiNode', () { + test('defaults to no children', () { + const node = A2UiNode(name: 'StatCard', props: A2UiProps.empty); + expect(node.children, isEmpty); + }); + }); +} diff --git a/workout-logger/test/genui/a2ui_renderer_test.dart b/workout-logger/test/genui/a2ui_renderer_test.dart new file mode 100644 index 0000000..520175c --- /dev/null +++ b/workout-logger/test/genui/a2ui_renderer_test.dart @@ -0,0 +1,271 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/a2ui.dart'; + +Future pumpText(WidgetTester tester, String text, + {Size size = const Size(800, 600)}) async { + tester.view.physicalSize = size; + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.reset); + + final node = A2UiParser(defaultA2UiRegistry).parse(text); + await tester.pumpWidget(MaterialApp( + home: Scaffold( + body: SingleChildScrollView( + child: node == null + ? const Text('PROSE') + : A2UiRenderer(node: node), + ), + ), + )); +} + +void main() { + group('registry completeness', () { + test('registers all eight components', () { + expect( + defaultA2UiRegistry.specs.map((s) => s.name).toList()..sort(), + [ + 'DataListGroup', + 'DynamicChart', + 'FilterChips', + 'GridContainer', + 'MetricGauge', + 'RadarChart', + 'ScatterPlot', + 'StatCard', + ], + ); + }); + + test('every spec example parses back to its own component', () { + final parser = A2UiParser(defaultA2UiRegistry); + for (final spec in defaultA2UiRegistry.specs) { + if (spec.name == 'GridContainer') continue; + final node = parser.parseJson(spec.doc.example); + expect(node?.name, spec.name, reason: '${spec.name} example'); + } + }); + }); + + // Regression coverage for a Task 13 fix to a2ui_parser.dart (a Task 3 + // file), discovered during registry integration: `_parseChildren` and + // `_declaresChildren` used to resolve `children` through A2UiProps' + // alias-aware `lookup()`, which treats `items` as an alias for `children`. + // That collided with DataListGroup, whose own canonical data-row key is + // also `items` — so a DataListGroup node's `items` list of + // `{primaryText, ...}` maps was mistaken for a list of child *components*, + // none of them parsed as one, and the node was then discarded outright as + // "declared children, ended up with none." + // + // First fix pass restricted per-node structural recursion to the literal + // `children` key only. That was too narrow: it silently dropped + // `components`/`elements`/`content` tolerance at the per-node level even + // though those keys never collided with anything — only `items` did. A + // payload like `{"component":"GridContainer","props":{"components":[...]}}` + // resolved fine before the original bug and regressed to zero children + // after the first fix, with `_declaresChildren` no longer even recognizing + // it as "declared children" — so instead of falling back to `null` (which + // at least lets the caller show the raw text as prose), it silently + // rendered as an empty, blank `GridContainer`. Fixed by widening the + // per-node lookup to the same literal key set `_envelopeKeys` already + // tolerates (`children`/`components`/`elements`/`content`), still + // excluding `items`, still without going through the alias-aware + // `A2UiProps.lookup()`. + group('children vs items key collision (a2ui_parser.dart fix)', () { + test('DataListGroup example parses instead of being swallowed', () { + // Before the fix this returned null: `items` resolved as an alias for + // `children`, none of the rows parsed as components, and the node was + // discarded as an emptied-out container. + final parser = A2UiParser(defaultA2UiRegistry); + final spec = defaultA2UiRegistry.specFor('DataListGroup')!; + final node = parser.parseJson(spec.doc.example); + expect(node?.name, 'DataListGroup'); + }); + + testWidgets('DataListGroup items render end to end through the parser', + (tester) async { + await pumpText(tester, ''' +{"component":"DataListGroup","props":{"items":[ + {"primaryText":"Bench Press","trailingValue":"102.5 kg"} +]}} +'''); + expect(find.text('Bench Press'), findsOneWidget); + expect(find.text('102.5 kg'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets("GridContainer's literal children key still resolves", + (tester) async { + await pumpText(tester, ''' +{"component":"GridContainer","props":{"columns":1,"children":[ + {"component":"StatCard","props":{"title":"Still Works","value":"1"}} +]}} +'''); + expect(find.text('Still Works'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + test('per-node components/elements/content keys resolve to real children', + () { + // Regression for the too-narrow first fix pass: these are literal + // (non-`items`) child-list keys at the *per-node* level, not the + // top-level envelope path — a different code path (`_parseChildren` + // via `parseJson`, not `parse`'s top-level envelope scan). + final parser = A2UiParser(defaultA2UiRegistry); + for (final key in ['components', 'elements', 'content']) { + final node = parser.parseJson({ + 'component': 'GridContainer', + 'props': { + 'columns': 1, + key: [ + { + 'component': 'StatCard', + 'props': {'title': 'Via $key', 'value': '1'}, + }, + ], + }, + }); + expect(node?.name, 'GridContainer', reason: 'per-node key "$key"'); + expect(node?.children, hasLength(1), reason: 'per-node key "$key"'); + expect(node?.children.single.name, 'StatCard', + reason: 'per-node key "$key"'); + } + }); + + test('per-node items key stays excluded from child resolution', () { + // Confirms the widened fix did not accidentally let `items` back in + // as a per-node child-list key — it must still be treated as + // DataListGroup's own data, not a list of child components. + final parser = A2UiParser(defaultA2UiRegistry); + final node = parser.parseJson({ + 'component': 'GridContainer', + 'props': { + 'columns': 1, + 'items': [ + { + 'component': 'StatCard', + 'props': {'title': 'Should not be a child', 'value': '1'}, + }, + ], + }, + }); + // `_declaresChildren` does not fire for `items`, so the node is not + // rejected: it parses into a real GridContainer with zero children. + // That is the expected non-crashing behavior — `items` stays + // DataListGroup's own data key and is never read as child components. + expect(node?.name, 'GridContainer'); + expect(node?.children, isEmpty); + }); + + test('top-level envelope aliases (components/elements/ui) are unaffected', + () { + // A single-item envelope still wraps in a GridContainer rather than + // collapsing to the bare child — naming an envelope key is an explicit + // "this is a container" signal (see A2UiParser._wrap's + // collapseSingle doc). That behavior predates this fix and must be + // unaffected by it. + final parser = A2UiParser(defaultA2UiRegistry); + for (final key in ['components', 'elements', 'ui']) { + final node = parser.parse( + '{"$key":[{"component":"StatCard","props":{"title":"E","value":"1"}}]}', + ); + expect(node?.name, 'GridContainer', reason: 'envelope key "$key"'); + expect(node?.children.single.name, 'StatCard', + reason: 'envelope key "$key"'); + } + }); + }); + + group('GridContainer', () { + testWidgets('renders children side by side at two columns', + (tester) async { + await pumpText(tester, ''' +{"component":"GridContainer","props":{"columns":2,"children":[ + {"component":"StatCard","props":{"title":"A","value":"1"}}, + {"component":"StatCard","props":{"title":"B","value":"2"}} +]}} +'''); + expect(find.text('A'), findsOneWidget); + expect(find.text('B'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('collapses to one column on a narrow viewport', + (tester) async { + await pumpText(tester, ''' +{"component":"GridContainer","props":{"columns":2,"children":[ + {"component":"StatCard","props":{"title":"A","value":"1"}}, + {"component":"StatCard","props":{"title":"B","value":"2"}} +]}} +''', size: const Size(360, 800)); + expect(find.text('A'), findsOneWidget); + expect(find.text('B'), findsOneWidget); + expect(find.byType(IntrinsicHeight), findsNothing); + expect(tester.takeException(), isNull); + }); + + testWidgets('handles an odd child count', (tester) async { + await pumpText(tester, ''' +{"component":"GridContainer","props":{"columns":2,"children":[ + {"component":"StatCard","props":{"title":"A","value":"1"}}, + {"component":"StatCard","props":{"title":"B","value":"2"}}, + {"component":"StatCard","props":{"title":"C","value":"3"}} +]}} +'''); + expect(find.text('C'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('renders a mixed dashboard end to end', (tester) async { + await pumpText(tester, ''' +{"component":"GridContainer","props":{"columns":1,"children":[ + {"component":"StatCard","props":{"title":"Volume","value":12400,"unit":"kg","trend":"improving"}}, + {"component":"DynamicChart","props":{"type":"bar","title":"Sets","labels":["Mon","Wed"],"values":[12,15]}}, + {"component":"MetricGauge","props":{"title":"Readiness","value":"82"}}, + {"component":"DataListGroup","props":{"items":[{"primaryText":"Bench","trailingValue":102.5}]}}, + {"component":"FilterChips","props":{"options":["7d","30d"]}} +]}} +'''); + expect(find.text('Volume'), findsOneWidget); + expect(find.text('12400 kg'), findsOneWidget); + expect(find.text('Sets'), findsOneWidget); + expect(find.text('Readiness'), findsOneWidget); + expect(find.text('Bench'), findsOneWidget); + expect(find.text('7d'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + }); + + group('A2UiRenderer', () { + testWidgets('renders nothing for a node the registry does not know', + (tester) async { + await tester.pumpWidget(const MaterialApp( + home: Scaffold( + body: A2UiRenderer( + node: A2UiNode(name: 'Unregistered', props: A2UiProps.empty), + ), + ), + )); + expect(tester.takeException(), isNull); + }); + + testWidgets('picks up an injected theme', (tester) async { + const custom = A2UiTheme.dark; + await tester.pumpWidget(const MaterialApp( + home: A2UiThemeProvider( + theme: custom, + child: Scaffold( + body: A2UiRenderer( + node: A2UiNode( + name: 'StatCard', + props: A2UiProps({'title': 'Themed', 'value': '1'}), + ), + ), + ), + ), + )); + expect(find.text('Themed'), findsOneWidget); + }); + }); +} diff --git a/workout-logger/test/genui/a2ui_robustness_test.dart b/workout-logger/test/genui/a2ui_robustness_test.dart new file mode 100644 index 0000000..a453ce9 --- /dev/null +++ b/workout-logger/test/genui/a2ui_robustness_test.dart @@ -0,0 +1,171 @@ +import 'package:fl_chart/fl_chart.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/a2ui.dart'; + +final _parser = A2UiParser(defaultA2UiRegistry); + +/// Every payload here is something a weak model plausibly emits. None may +/// throw; each either renders or is cleanly rejected as prose. +const _payloads = [ + // Well-formed. + '{"component":"StatCard","props":{"title":"Volume","value":12000,"unit":"kg","trend":"improving"}}', + // Flat, no props wrapper. + '{"component":"StatCard","title":"Volume","value":"12k"}', + // Snake-case component and props. + '{"component":"stat_card","props":{"title":"V","value":1}}', + // Fenced. + '```json\n{"component":"MetricGauge","props":{"title":"R","value":"82"}}\n```', + // Prose wrapper. + 'Sure!\n{"component":"FilterChips","props":{"options":["7d","30d"]}}\nHope that helps.', + // Bare array. + '[{"component":"StatCard","title":"A","value":1},{"component":"StatCard","title":"B","value":2}]', + // Envelope key. + '{"components":[{"component":"StatCard","title":"A","value":1}]}', + // Legacy radar with axes. + '{"component":"RadarChart","props":{"title":"R","axes":["A","B","C"],"series":[{"name":"S","values":[1,2,3]}]}}', + // Radar with mismatched series length. + '{"component":"RadarChart","props":{"labels":["A","B","C","D"],"series":[{"name":"S","values":[1,2]}]}}', + // Numbers as strings throughout. + '{"component":"DynamicChart","props":{"type":"bar","title":"T","labels":[1,2],"values":["10","20"]}}', + // More values than labels. + '{"component":"DynamicChart","props":{"labels":["A"],"series":[{"name":"S","values":[1,2,3,4]}]}}', + // Missing every optional prop. + '{"component":"DynamicChart","props":{"values":[1,2,3]}}', + // Gauge with a degenerate range. + '{"component":"MetricGauge","props":{"title":"G","value":5,"min":5,"max":5}}', + // Gauge with a non-numeric value. + '{"component":"MetricGauge","props":{"title":"G","value":"optimal"}}', + // List with a missing title and numeric trailing values. + '{"component":"DataListGroup","props":{"items":[{"primaryText":"Bench","trailingValue":102.5}]}}', + // List of bare strings. + '{"component":"DataListGroup","props":{"title":"T","items":["Bench","Squat"]}}', + // Chips with no active option. + '{"component":"FilterChips","props":{"options":["7d","30d"]}}', + // Scatter with broken points mixed in. + '{"component":"ScatterPlot","props":{"points":[{"x":1,"y":2},{"x":"a","y":3},{"y":4}]}}', + // Scatter with a single point. + '{"component":"ScatterPlot","props":{"points":[{"x":5,"y":5}]}}', + // Grid with a mix of good and unknown children. + '{"component":"GridContainer","props":{"columns":2,"children":[' + '{"component":"StatCard","title":"A","value":1},' + '{"component":"HeroBanner","title":"nope"}]}}', + // Deeply nested grids. + '{"component":"GridContainer","children":[{"component":"GridContainer","children":[' + '{"component":"StatCard","title":"A","value":1}]}]}', + // Grid using "components" as an alias for "children" (regression: Task 13 + // widened the parser's per-node child-key lookup to accept + // components/elements/content, not just children). + '{"component":"GridContainer","props":{"components":[' + '{"component":"StatCard","title":"A","value":1}]}}', + // All-negative DynamicChart values (regression: Task 8 fixed the axis + // bounds — via A2UiSeries.minValue/_yBounds — so an all-negative series + // is bracketed instead of silently clamped to a 0-start axis that + // excludes every real data point). + '{"component":"DynamicChart","props":{"title":"T","labels":["A","B","C"],"values":[-50,-30,-10]}}', + // Empty data everywhere. + '{"component":"DynamicChart","props":{"title":"T","labels":[],"series":[]}}', + // Hostile types. + '{"component":"StatCard","props":{"title":[],"value":{},"trend":7}}', + // Prose only. + 'Great session — your bench is up 5kg since June.', + // Broken JSON. + '{"component":"StatCard","props":', + // Empty. + '', +]; + +/// Truncated payload text used as a stable test name, so a failure identifies +/// the payload directly instead of an index that shifts whenever `_payloads` +/// gains or loses an entry. +String _label(String payload) => + payload.isEmpty ? '' : payload.substring(0, payload.length.clamp(0, 60)); + +void main() { + group('parser never throws', () { + for (final payload in _payloads) { + test(_label(payload), () { + expect(() => _parser.parse(payload), returnsNormally); + }); + } + }); + + group('renderer never throws', () { + for (final payload in _payloads) { + testWidgets(_label(payload), (tester) async { + final node = _parser.parse(payload); + if (node == null) return; + + tester.view.physicalSize = const Size(400, 900); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.reset); + + await tester.pumpWidget(MaterialApp( + home: Scaffold( + body: SingleChildScrollView(child: A2UiRenderer(node: node)), + ), + )); + expect(tester.takeException(), isNull); + }); + } + }); + + group('no silent blanks', () { + testWidgets('a component with no data shows a visible empty panel', + (tester) async { + final node = _parser + .parse('{"component":"DynamicChart","props":{"title":"Volume"}}'); + await tester.pumpWidget(MaterialApp( + home: Scaffold(body: A2UiRenderer(node: node!)), + )); + expect(find.textContaining('No chart data'), findsOneWidget); + }); + }); + + // These two regressions were both SILENT-VISUAL, not throwing — a + // no-exception check structurally can't catch either, so each gets a + // positive assertion pinning the actual fixed behavior, not just + // "didn't crash". + group('silent-visual regressions stay fixed', () { + testWidgets( + 'all-negative DynamicChart values render an axis that brackets ' + 'the data instead of clamping to a 0-start range (Task 8)', + (tester) async { + final node = _parser.parse( + '{"component":"DynamicChart","props":{"title":"T",' + '"labels":["A","B","C"],"values":[-50,-30,-10]}}', + )!; + + tester.view.physicalSize = const Size(400, 900); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.reset); + + await tester.pumpWidget(MaterialApp( + home: Scaffold(body: A2UiRenderer(node: node)), + )); + + final chart = tester.widget(find.byType(LineChart)); + // The true minimum is -50; a broken axis that clamps at 0 would give + // minY == 0 and silently drop every point off the visible chart. The + // axis must actually bracket the real minimum, not just dip below + // some weak threshold that a partially-broken bound could still clear. + expect(chart.data.minY, lessThanOrEqualTo(-50)); + expect(chart.data.maxY, greaterThanOrEqualTo(-10)); + }); + + test( + 'GridContainer accepts "components" as an alias for "children" ' + 'and actually populates the node tree (Task 13)', () { + final node = _parser.parse( + '{"component":"GridContainer","props":{"components":[' + '{"component":"StatCard","title":"A","value":1}]}}', + ); + + expect(node, isNotNull); + // A broken alias lookup would still parse without throwing but leave + // children empty, silently rendering an empty grid. + expect(node!.children, isNotEmpty); + expect(node.children.single.name, 'StatCard'); + }); + }); +} diff --git a/workout-logger/test/genui/a2ui_series_test.dart b/workout-logger/test/genui/a2ui_series_test.dart new file mode 100644 index 0000000..f77ee8a --- /dev/null +++ b/workout-logger/test/genui/a2ui_series_test.dart @@ -0,0 +1,150 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_props.dart'; +import 'package:repforge/genui/src/a2ui_series.dart'; + +void main() { + group('A2UiSeries.extract', () { + test('reads an explicit series array', () { + final series = A2UiSeries.extract(const A2UiProps({ + 'series': [ + {'name': 'Biceps', 'values': [1, 2, 3]}, + {'name': 'Triceps', 'values': [4, 5, 6]}, + ], + })); + expect(series.map((s) => s.name), ['Biceps', 'Triceps']); + expect(series[1].values, [4.0, 5.0, 6.0]); + }); + + test('treats a bare values array as one unnamed series', () { + final series = A2UiSeries.extract( + const A2UiProps({'title': 'Weekly Sets', 'values': [10, 12]}), + fallbackName: 'Weekly Sets', + ); + expect(series, hasLength(1)); + expect(series.single.name, 'Weekly Sets'); + expect(series.single.values, [10.0, 12.0]); + }); + + test('prefers series over values when both are present', () { + final series = A2UiSeries.extract(const A2UiProps({ + 'values': [1], + 'series': [ + {'name': 'A', 'values': [7, 8]} + ], + })); + expect(series, hasLength(1)); + expect(series.single.name, 'A'); + expect(series.single.values, [7.0, 8.0]); + }); + + test("coerces a stringified number inside a series entry's values", () { + final series = A2UiSeries.extract(const A2UiProps({ + 'series': [ + {'name': 'Current', 'values': ['85', 90]} + ], + })); + expect(series.single.values, [85.0, 90.0]); + }); + + test('names an unnamed series entry positionally', () { + final series = A2UiSeries.extract(const A2UiProps({ + 'series': [ + {'values': [1, 2]}, + {'values': [3, 4]}, + ], + })); + expect(series.map((s) => s.name), ['Series 1', 'Series 2']); + }); + + test('drops series entries that carry no numeric values', () { + final series = A2UiSeries.extract(const A2UiProps({ + 'series': [ + {'name': 'Good', 'values': [1]}, + {'name': 'Empty', 'values': []}, + {'name': 'Junk', 'values': ['x', 'y']}, + ], + })); + expect(series.map((s) => s.name), ['Good']); + }); + + test('returns empty when there is no usable data', () { + expect(A2UiSeries.extract(const A2UiProps({})), isEmpty); + expect(A2UiSeries.extract(const A2UiProps({'values': 'nope'})), isEmpty); + }); + + test('falls back to values: when every series entry drops to empty values', () { + final series = A2UiSeries.extract( + const A2UiProps({ + 'series': [ + {'name': 'A', 'values': []}, + {'name': 'B', 'values': ['x', 'y']}, // unparseable, also drops + ], + 'values': [10, 20], + }), + fallbackName: 'Fallback', + ); + expect(series, hasLength(1)); + expect(series.single.name, 'Fallback'); + expect(series.single.values, [10.0, 20.0]); + }); + + test('falls back to values: when series is an empty list', () { + final series = A2UiSeries.extract( + const A2UiProps({'series': [], 'values': [5, 6]}), + fallbackName: 'Fallback', + ); + expect(series, hasLength(1)); + expect(series.single.values, [5.0, 6.0]); + }); + }); + + group('A2UiSeries.maxValue', () { + test('returns the largest value across all series', () { + expect( + A2UiSeries.maxValue(const [ + A2UiSeries(name: 'a', values: [1, 9]), + A2UiSeries(name: 'b', values: [4, 2]), + ]), + 9, + ); + }); + + test('returns 0 for empty input', () { + expect(A2UiSeries.maxValue(const []), 0); + }); + + test('returns the true max when all values are negative', () { + expect( + A2UiSeries.maxValue(const [ + A2UiSeries(name: 'a', values: [-5, -2]), + ]), + -2.0, + ); + }); + }); + + group('A2UiSeries.minValue', () { + test('returns the smallest value across all series', () { + expect( + A2UiSeries.minValue(const [ + A2UiSeries(name: 'a', values: [1, 9]), + A2UiSeries(name: 'b', values: [4, 2]), + ]), + 1, + ); + }); + + test('returns 0 for empty input', () { + expect(A2UiSeries.minValue(const []), 0); + }); + + test('returns the true min when all values are negative', () { + expect( + A2UiSeries.minValue(const [ + A2UiSeries(name: 'a', values: [-5, -2]), + ]), + -5.0, + ); + }); + }); +} diff --git a/workout-logger/test/genui/a2ui_theme_test.dart b/workout-logger/test/genui/a2ui_theme_test.dart new file mode 100644 index 0000000..f24b445 --- /dev/null +++ b/workout-logger/test/genui/a2ui_theme_test.dart @@ -0,0 +1,169 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_panels.dart'; +import 'package:repforge/genui/src/a2ui_theme.dart'; + +/// A theme deliberately distinct from [A2UiTheme.dark] in every field the +/// injection tests check, so those tests can only pass if +/// [A2UiThemeProvider.of] genuinely performed the InheritedWidget lookup +/// rather than falling through to the default. +const _injectedTestTheme = A2UiTheme( + surface: Color(0xFF000001), + border: Color(0xFF000002), + divider: Color(0xFF000003), + textPrimary: Color(0xFF000004), + textSoft: Color(0xFF000005), + textMuted: Color(0xFF000006), + textFaint: Color(0xFF000007), + accent: Color(0xFF00FF00), + positive: Color(0xFF000008), + negative: Color(0xFF000009), + seriesPalette: [Color(0xFF00000A)], + spacing: 99, + radius: 98, + pillRadius: 97, +); + +void main() { + group('A2UiThemeProvider', () { + testWidgets('falls back to A2UiTheme.dark when no provider is present', + (tester) async { + late A2UiTheme resolved; + await tester.pumpWidget( + Builder(builder: (context) { + resolved = A2UiThemeProvider.of(context); + return const SizedBox.shrink(); + }), + ); + expect(resolved.accent, A2UiTheme.dark.accent); + }); + + testWidgets( + 'supplies the injected theme to descendants and falls back for ' + 'non-descendants', (tester) async { + late A2UiTheme resolvedInside; + late A2UiTheme resolvedOutside; + await tester.pumpWidget( + Directionality( + textDirection: TextDirection.ltr, + child: Column( + children: [ + A2UiThemeProvider( + theme: _injectedTestTheme, + child: Builder(builder: (context) { + resolvedInside = A2UiThemeProvider.of(context); + return const SizedBox.shrink(); + }), + ), + // Sibling of the provider, not a descendant of it: must still + // fall back to A2UiTheme.dark. + Builder(builder: (context) { + resolvedOutside = A2UiThemeProvider.of(context); + return const SizedBox.shrink(); + }), + ], + ), + ), + ); + + expect(resolvedInside.accent, _injectedTestTheme.accent); + expect(resolvedInside.surface, _injectedTestTheme.surface); + expect(resolvedInside.spacing, _injectedTestTheme.spacing); + + expect(resolvedOutside.accent, A2UiTheme.dark.accent); + expect(resolvedOutside.surface, A2UiTheme.dark.surface); + }); + }); + + group('A2UiTheme', () { + test('seriesColor cycles through the palette', () { + const t = A2UiTheme.dark; + expect(t.seriesColor(0), t.seriesPalette[0]); + expect(t.seriesColor(5), t.seriesPalette[0]); + expect(t.seriesColor(6), t.seriesPalette[1]); + }); + }); + + group('shared chrome', () { + testWidgets('A2UiEmptyPanel shows its message', (tester) async { + await tester.pumpWidget(const MaterialApp( + home: Scaffold( + body: A2UiEmptyPanel(message: 'No chart data', theme: A2UiTheme.dark), + ), + )); + expect(find.text('No chart data'), findsOneWidget); + }); + + testWidgets('A2UiPanelTitle renders title and trailing text', + (tester) async { + await tester.pumpWidget(const MaterialApp( + home: Scaffold( + body: A2UiPanelTitle( + title: 'Volume', + trailing: 'r = +0.82', + theme: A2UiTheme.dark, + ), + ), + )); + expect(find.text('Volume'), findsOneWidget); + expect(find.text('r = +0.82'), findsOneWidget); + }); + + testWidgets('A2UiLegend renders one entry per name', (tester) async { + await tester.pumpWidget(const MaterialApp( + home: Scaffold( + body: A2UiLegend(names: ['Biceps', 'Triceps'], theme: A2UiTheme.dark), + ), + )); + expect(find.text('Biceps'), findsOneWidget); + expect(find.text('Triceps'), findsOneWidget); + }); + }); + + group('A2UiPanel', () { + testWidgets( + 'pads with theme.spacing, decorates with theme colors, and renders ' + 'its child by default', (tester) async { + await tester.pumpWidget(const MaterialApp( + home: Scaffold( + body: A2UiPanel( + theme: A2UiTheme.dark, + child: Text('probe'), + ), + ), + )); + + expect(find.text('probe'), findsOneWidget); + + final container = tester.widget(find.descendant( + of: find.byType(A2UiPanel), + matching: find.byType(Container), + )); + expect(container.padding, EdgeInsets.all(A2UiTheme.dark.spacing)); + + final decoration = container.decoration as BoxDecoration; + expect(decoration.color, A2UiTheme.dark.surface); + expect(decoration.border, Border.all(color: A2UiTheme.dark.border)); + }); + + testWidgets('uses zero padding when padded is false', (tester) async { + await tester.pumpWidget(const MaterialApp( + home: Scaffold( + body: A2UiPanel( + theme: A2UiTheme.dark, + padded: false, + child: Text('probe'), + ), + ), + )); + + expect(find.text('probe'), findsOneWidget); + + final container = tester.widget(find.descendant( + of: find.byType(A2UiPanel), + matching: find.byType(Container), + )); + expect(container.padding, EdgeInsets.zero); + }); + }); +} diff --git a/workout-logger/test/genui/components/data_list_group_test.dart b/workout-logger/test/genui/components/data_list_group_test.dart new file mode 100644 index 0000000..bd2b03c --- /dev/null +++ b/workout-logger/test/genui/components/data_list_group_test.dart @@ -0,0 +1,142 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_node.dart'; +import 'package:repforge/genui/src/a2ui_props.dart'; +import 'package:repforge/genui/src/a2ui_theme.dart'; +import 'package:repforge/genui/src/components/data_list_group.dart'; + +DataListGroupProps parse(Map props) => + const DataListGroupSpec() + .parseProps(A2UiNode(name: 'DataListGroup', props: A2UiProps(props))); + +Future pump(WidgetTester tester, Map props) => + tester.pumpWidget(MaterialApp( + home: Scaffold( + body: Builder( + builder: (context) => const DataListGroupSpec().render( + context, + A2UiNode(name: 'DataListGroup', props: A2UiProps(props)), + A2UiTheme.dark, + ), + ), + ), + )); + +void main() { + group('DataListGroupProps parsing', () { + test('reads the happy path', () { + final p = parse({ + 'title': 'Recent PRs', + 'items': [ + { + 'primaryText': 'Bench Press', + 'secondaryText': '2026-07-04', + 'trailingValue': '102.5 kg', + }, + ], + }); + expect(p.title, 'Recent PRs'); + expect(p.rows.single.primaryText, 'Bench Press'); + expect(p.rows.single.trailingValue, '102.5 kg'); + }); + + test('treats a missing title as no header, not a crash', () { + final p = parse({ + 'items': [ + {'primaryText': 'Bench'} + ] + }); + expect(p.title, isNull); + expect(p.rows, hasLength(1)); + }); + + test('stringifies a numeric trailing value', () { + final p = parse({ + 'items': [ + {'primaryText': 'Bench', 'trailingValue': 102.5} + ] + }); + expect(p.rows.single.trailingValue, '102.5'); + }); + + test('accepts plain-string items', () { + final p = parse({'items': ['Bench Press', 'Squat']}); + expect(p.rows.map((r) => r.primaryText), ['Bench Press', 'Squat']); + expect(p.rows.first.secondaryText, isNull); + }); + + test('falls back to the first stringifiable value when primaryText is absent', + () { + final p = parse({ + 'items': [ + {'exercise': 'Deadlift', 'volume': 4200} + ] + }); + expect(p.rows.single.primaryText, 'Deadlift'); + }); + + test('drops items with nothing renderable', () { + final p = parse({ + 'items': [ + {'primaryText': 'Bench'}, + {}, + {'nested': {}}, + ], + }); + expect(p.rows, hasLength(1)); + }); + + test('resolves row key aliases', () { + final p = parse({ + 'rows': [ + {'primary': 'Bench', 'detail': 'Mon', 'right': '100 kg'} + ] + }); + expect(p.rows.single.primaryText, 'Bench'); + expect(p.rows.single.secondaryText, 'Mon'); + expect(p.rows.single.trailingValue, '100 kg'); + }); + + test('never throws on hostile input', () { + expect(() => parse({'items': 5, 'title': []}), returnsNormally); + }); + }); + + group('DataListGroup rendering', () { + testWidgets('renders title and all rows', (tester) async { + await pump(tester, { + 'title': 'Recent PRs', + 'items': [ + {'primaryText': 'Bench', 'secondaryText': 'Mon', 'trailingValue': '100'}, + {'primaryText': 'Squat', 'secondaryText': 'Wed', 'trailingValue': '140'}, + ], + }); + expect(find.text('Recent PRs'), findsOneWidget); + expect(find.text('Bench'), findsOneWidget); + expect(find.text('Squat'), findsOneWidget); + expect(find.text('140'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('renders rows with only a primary text', (tester) async { + await pump(tester, {'items': ['Bench Press']}); + expect(find.text('Bench Press'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('renders an empty panel when there are no rows', + (tester) async { + await pump(tester, {'title': 'Recent PRs', 'items': []}); + expect(find.textContaining('No items'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + }); + + group('DataListGroupSpec doc', () { + test('example payload is renderable', () { + final props = const DataListGroupSpec().doc.example['props']! + as Map; + expect(parse(props).hasData, isTrue); + }); + }); +} diff --git a/workout-logger/test/genui/components/dynamic_chart_test.dart b/workout-logger/test/genui/components/dynamic_chart_test.dart new file mode 100644 index 0000000..49707c1 --- /dev/null +++ b/workout-logger/test/genui/components/dynamic_chart_test.dart @@ -0,0 +1,286 @@ +import 'package:fl_chart/fl_chart.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_node.dart'; +import 'package:repforge/genui/src/a2ui_panels.dart'; +import 'package:repforge/genui/src/a2ui_props.dart'; +import 'package:repforge/genui/src/a2ui_theme.dart'; +import 'package:repforge/genui/src/components/dynamic_chart.dart'; + +DynamicChartProps parse(Map props) => const DynamicChartSpec() + .parseProps(A2UiNode(name: 'DynamicChart', props: A2UiProps(props))); + +Future pump(WidgetTester tester, Map props) => + tester.pumpWidget(MaterialApp( + home: Scaffold( + body: SizedBox( + width: 400, + height: 400, + child: Builder( + builder: (context) => const DynamicChartSpec().render( + context, + A2UiNode(name: 'DynamicChart', props: A2UiProps(props)), + A2UiTheme.dark, + ), + ), + ), + ), + )); + +void main() { + group('chart type', () { + test('defaults to line and normalizes spellings', () { + expect(parse({}).type, A2UiChartType.line); + expect(parse({'type': 'bar'}).type, A2UiChartType.bar); + expect(parse({'type': 'PIE'}).type, A2UiChartType.pie); + expect(parse({'type': 'bar_chart'}).type, A2UiChartType.bar); + expect(parse({'type': 'LineChart'}).type, A2UiChartType.line); + expect(parse({'type': 'donut'}).type, A2UiChartType.pie); + expect(parse({'type': 'nonsense'}).type, A2UiChartType.line); + }); + }); + + group('DynamicChartProps parsing', () { + test('reads multi-series payloads', () { + final p = parse({ + 'type': 'bar', + 'title': 'Biceps vs Triceps', + 'labels': ['07-06', '07-09'], + 'series': [ + {'name': 'Biceps', 'values': [0, 645]}, + {'name': 'Triceps', 'values': [2390, 0]}, + ], + }); + expect(p.title, 'Biceps vs Triceps'); + expect(p.series, hasLength(2)); + expect(p.labels, ['07-06', '07-09']); + expect(p.hasData, isTrue); + }); + + test('reads the single-values shorthand', () { + final p = parse({ + 'title': 'Weekly Sets', + 'labels': ['Mon', 'Wed'], + 'values': [12, 15], + }); + expect(p.series, hasLength(1)); + expect(p.series.single.name, 'Weekly Sets'); + }); + + test('stringifies numeric labels instead of throwing', () { + expect(parse({'labels': [1, 2, 3], 'values': [1, 2, 3]}).labels, + ['1', '2', '3']); + }); + + test('stringifies a numeric title', () { + expect(parse({'title': 2024, 'values': [1]}).title, '2024'); + }); + + test('coerces stringified series values', () { + final p = parse({ + 'labels': ['a'], + 'series': [ + {'name': 'S', 'values': ['1.5']} + ], + }); + expect(p.series.single.values, [1.5]); + }); + + test('pads labels up to the longest series length', () { + final p = parse({ + 'labels': ['Mon'], + 'series': [ + {'name': 'S', 'values': [1, 2, 3]} + ], + }); + expect(p.labels, ['Mon', '', '']); + }); + + test('pads labels using the longest of multiple series, not just the first', + () { + final p = parse({ + 'labels': ['Mon'], + 'series': [ + {'name': 'Short', 'values': [1, 2]}, + {'name': 'Long', 'values': [1, 2, 3, 4]}, + ], + }); + expect(p.labels, ['Mon', '', '', '']); + }); + + test('hasData is false when there is nothing to plot', () { + expect(parse({}).hasData, isFalse); + expect(parse({'labels': ['a', 'b']}).hasData, isFalse); + expect(parse({'values': [1, 2]}).hasData, isTrue); + }); + + test('never throws on hostile input', () { + expect( + () => parse({ + 'labels': 'nope', + 'series': [42, null], + 'values': {}, + 'title': [], + }), + returnsNormally, + ); + }); + }); + + group('DynamicChart rendering', () { + testWidgets('renders a line chart', (tester) async { + await pump(tester, { + 'type': 'line', + 'title': 'Volume', + 'labels': ['A', 'B'], + 'values': [1, 2], + }); + expect(find.byType(LineChart), findsOneWidget); + expect(find.text('Volume'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('renders a bar chart', (tester) async { + await pump(tester, { + 'type': 'bar', + 'labels': ['A', 'B'], + 'values': [1, 2], + }); + expect(find.byType(BarChart), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('renders a pie chart with a label list', (tester) async { + await pump(tester, { + 'type': 'pie', + 'labels': ['Chest', 'Back'], + 'values': [60, 40], + }); + expect(find.byType(PieChart), findsOneWidget); + expect(find.textContaining('Chest'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets( + 'pie chart with mixed-sign values renders only the positive slice', + (tester) async { + // Regression test for the fix in DynamicChart._pie: negative/zero + // values have no geometric meaning in a pie and must be filtered out + // before building sections, rather than crashing or silently + // corrupting the percentage math. + await pump(tester, { + 'type': 'pie', + 'labels': ['Chest', 'Back'], + 'values': [60, -40], + }); + expect(tester.takeException(), isNull); + final pieChart = tester.widget(find.byType(PieChart)); + expect(pieChart.data.sections, hasLength(1)); + expect(pieChart.data.sections.single.title, '100%'); + }); + + testWidgets('pie chart with all-negative values falls back to the ' + 'empty panel instead of throwing', (tester) async { + await pump(tester, { + 'type': 'pie', + 'labels': ['Chest', 'Back'], + 'values': [-60, -40], + }); + expect(tester.takeException(), isNull); + expect(find.byType(PieChart), findsNothing); + expect(find.textContaining('No positive values to chart'), + findsOneWidget); + }); + + testWidgets('renders a legend only for multi-series non-pie charts', + (tester) async { + await pump(tester, { + 'type': 'line', + 'labels': ['A'], + 'series': [ + {'name': 'Biceps', 'values': [1]}, + {'name': 'Triceps', 'values': [2]}, + ], + }); + expect(find.text('Biceps'), findsOneWidget); + expect(find.text('Triceps'), findsOneWidget); + expect(find.byType(A2UiLegend), findsOneWidget); + + await pump(tester, { + 'type': 'line', + 'labels': ['A'], + 'values': [1], + }); + expect(find.byType(A2UiLegend), findsNothing); + + await pump(tester, { + 'type': 'pie', + 'labels': ['A', 'B'], + 'series': [ + {'name': 'Biceps', 'values': [1]}, + {'name': 'Triceps', 'values': [2]}, + ], + }); + expect(find.byType(A2UiLegend), findsNothing); + }); + + testWidgets('renders an empty panel with no data', (tester) async { + await pump(tester, {'title': 'Volume'}); + expect(find.textContaining('No chart data'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('survives more series values than labels', (tester) async { + await pump(tester, { + 'type': 'bar', + 'labels': ['A'], + 'series': [ + {'name': 'S', 'values': [1, 2, 3, 4]} + ], + }); + expect(tester.takeException(), isNull); + }); + + testWidgets('survives all-zero values without a zero-height axis', + (tester) async { + await pump(tester, {'labels': ['A', 'B'], 'values': [0, 0]}); + expect(tester.takeException(), isNull); + }); + + testWidgets('all-negative line chart brackets its data within minY/maxY', + (tester) async { + await pump(tester, { + 'type': 'line', + 'labels': ['A', 'B', 'C'], + 'values': [-10, -5, -3], + }); + expect(tester.takeException(), isNull); + final data = tester.widget(find.byType(LineChart)).data; + expect(data.minY, lessThanOrEqualTo(-10)); + expect(data.maxY, greaterThanOrEqualTo(-3)); + expect(data.minY, lessThan(data.maxY)); + }); + + testWidgets('all-negative bar chart brackets its data within minY/maxY', + (tester) async { + await pump(tester, { + 'type': 'bar', + 'labels': ['A', 'B', 'C'], + 'values': [-10, -5, -3], + }); + expect(tester.takeException(), isNull); + final data = tester.widget(find.byType(BarChart)).data; + expect(data.minY, lessThanOrEqualTo(-10)); + expect(data.maxY, greaterThanOrEqualTo(-3)); + expect(data.minY, lessThan(data.maxY)); + }); + }); + + group('DynamicChartSpec doc', () { + test('example payload is renderable', () { + final props = const DynamicChartSpec().doc.example['props']! + as Map; + expect(parse(props).hasData, isTrue); + }); + }); +} diff --git a/workout-logger/test/genui/components/filter_chips_test.dart b/workout-logger/test/genui/components/filter_chips_test.dart new file mode 100644 index 0000000..976c639 --- /dev/null +++ b/workout-logger/test/genui/components/filter_chips_test.dart @@ -0,0 +1,93 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_node.dart'; +import 'package:repforge/genui/src/a2ui_props.dart'; +import 'package:repforge/genui/src/a2ui_theme.dart'; +import 'package:repforge/genui/src/components/filter_chips.dart'; + +FilterChipsProps parse(Map props) => const FilterChipsSpec() + .parseProps(A2UiNode(name: 'FilterChips', props: A2UiProps(props))); + +Future pump(WidgetTester tester, Map props) => + tester.pumpWidget(MaterialApp( + home: Scaffold( + body: Builder( + builder: (context) => const FilterChipsSpec().render( + context, + A2UiNode(name: 'FilterChips', props: A2UiProps(props)), + A2UiTheme.dark, + ), + ), + ), + )); + +void main() { + group('FilterChipsProps parsing', () { + test('reads options and the active option', () { + final p = parse({ + 'options': ['7d', '30d', '90d'], + 'activeOption': '30d', + }); + expect(p.options, ['7d', '30d', '90d']); + expect(p.activeOption, '30d'); + }); + + test('nulls a missing active option instead of crashing', () { + expect(parse({'options': ['7d', '30d']}).activeOption, isNull); + }); + + test('matches the active option case-insensitively', () { + expect(parse({'options': ['Week', 'Month'], 'active': 'MONTH'}) + .activeOption, 'Month'); + }); + + test('nulls an active option that is not in the list', () { + expect( + parse({'options': ['7d'], 'activeOption': '365d'}).activeOption, + isNull, + ); + }); + + test('stringifies non-string options', () { + expect(parse({'options': [7, 30, 90]}).options, ['7', '30', '90']); + }); + + test('hasData is false without options', () { + expect(parse({}).hasData, isFalse); + expect(parse({'options': []}).hasData, isFalse); + expect(parse({'options': ['a']}).hasData, isTrue); + }); + + test('never throws on hostile input', () { + expect( + () => parse({'options': 5, 'activeOption': {}}), + returnsNormally, + ); + }); + }); + + group('FilterChips rendering', () { + testWidgets('renders every option', (tester) async { + await pump(tester, { + 'options': ['7d', '30d', '90d'], + 'activeOption': '30d', + }); + expect(find.text('7d'), findsOneWidget); + expect(find.text('30d'), findsOneWidget); + expect(find.text('90d'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('renders with no active option', (tester) async { + await pump(tester, {'options': ['7d', '30d']}); + expect(find.text('7d'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('renders nothing when there are no options', (tester) async { + await pump(tester, {'options': []}); + expect(find.byType(Wrap), findsNothing); + expect(tester.takeException(), isNull); + }); + }); +} diff --git a/workout-logger/test/genui/components/metric_gauge_test.dart b/workout-logger/test/genui/components/metric_gauge_test.dart new file mode 100644 index 0000000..bb090d4 --- /dev/null +++ b/workout-logger/test/genui/components/metric_gauge_test.dart @@ -0,0 +1,117 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_node.dart'; +import 'package:repforge/genui/src/a2ui_props.dart'; +import 'package:repforge/genui/src/a2ui_theme.dart'; +import 'package:repforge/genui/src/components/metric_gauge.dart'; + +MetricGaugeProps parse(Map props) => const MetricGaugeSpec() + .parseProps(A2UiNode(name: 'MetricGauge', props: A2UiProps(props))); + +Future pump(WidgetTester tester, Map props) => + tester.pumpWidget(MaterialApp( + home: Scaffold( + body: Builder( + builder: (context) => const MetricGaugeSpec().render( + context, + A2UiNode(name: 'MetricGauge', props: A2UiProps(props)), + A2UiTheme.dark, + ), + ), + ), + )); + +void main() { + group('MetricGaugeProps parsing', () { + test('reads the happy path', () { + final p = parse({ + 'title': 'Readiness', + 'value': 88, + 'min': 0, + 'max': 100, + 'unit': '/ 100', + 'status': 'Optimal', + }); + expect(p.title, 'Readiness'); + expect(p.value, 88); + expect(p.progress, closeTo(0.88, 0.001)); + expect(p.status, 'Optimal'); + }); + + test('accepts a numeric string value — the old validator/renderer mismatch', + () { + expect(parse({'value': '88'}).value, 88); + expect(parse({'value': '88.5'}).value, 88.5); + }); + + test('yields a null value for missing or unparseable input', () { + expect(parse({}).value, isNull); + expect(parse({'value': 'optimal'}).value, isNull); + expect(parse({'value': []}).value, isNull); + }); + + test('defaults min to 0 and max to 100', () { + final p = parse({'value': 50}); + expect(p.min, 0); + expect(p.max, 100); + expect(p.progress, closeTo(0.5, 0.001)); + }); + + test('returns 0 progress when max <= min instead of NaN', () { + final same = parse({'value': 5, 'min': 5, 'max': 5}); + expect(same.progress, 0); + expect(same.progress.isNaN, isFalse); + + final inverted = parse({'value': 5, 'min': 10, 'max': 2}); + expect(inverted.progress, 0); + }); + + test('clamps progress into [0, 1]', () { + expect(parse({'value': 500, 'max': 100}).progress, 1); + expect(parse({'value': -20, 'min': 0, 'max': 100}).progress, 0); + }); + + test('never throws on hostile input', () { + expect( + () => parse({'value': {}, 'min': [], 'max': 'x', 'unit': 5}), + returnsNormally, + ); + }); + }); + + group('MetricGauge rendering', () { + testWidgets('renders the value, unit and status', (tester) async { + await pump(tester, { + 'title': 'Readiness', + 'value': 88, + 'unit': 'pts', + 'status': 'Optimal', + }); + expect(find.text('Readiness'), findsOneWidget); + expect(find.text('88'), findsOneWidget); + expect(find.text('pts'), findsOneWidget); + expect(find.text('Optimal'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('renders an empty panel when the value is unusable', + (tester) async { + await pump(tester, {'title': 'Readiness', 'value': 'unknown'}); + expect(find.textContaining('No value'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('renders a whole number without a trailing .0', (tester) async { + await pump(tester, {'value': 88.0}); + expect(find.text('88'), findsOneWidget); + }); + }); + + group('MetricGaugeSpec doc', () { + test('example payload produces a renderable value', () { + final props = + const MetricGaugeSpec().doc.example['props']! as Map; + expect(parse(props).value, isNotNull); + }); + }); +} diff --git a/workout-logger/test/genui/components/radar_chart_test.dart b/workout-logger/test/genui/components/radar_chart_test.dart new file mode 100644 index 0000000..881dbe1 --- /dev/null +++ b/workout-logger/test/genui/components/radar_chart_test.dart @@ -0,0 +1,156 @@ +import 'package:fl_chart/fl_chart.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_node.dart'; +import 'package:repforge/genui/src/a2ui_props.dart'; +import 'package:repforge/genui/src/a2ui_theme.dart'; +import 'package:repforge/genui/src/components/radar_chart.dart'; + +RadarChartProps parse(Map props) => const RadarChartSpec() + .parseProps(A2UiNode(name: 'RadarChart', props: A2UiProps(props))); + +Future pump(WidgetTester tester, Map props) => + tester.pumpWidget(MaterialApp( + home: Scaffold( + body: SizedBox( + width: 400, + height: 400, + child: Builder( + builder: (context) => const RadarChartSpec().render( + context, + A2UiNode(name: 'RadarChart', props: A2UiProps(props)), + A2UiTheme.dark, + ), + ), + ), + ), + )); + +const _fourAxes = ['Readiness', 'Sleep', 'Volume', 'Intensity']; + +void main() { + group('RadarChartProps parsing', () { + test('reads the legacy axes key', () { + final p = parse({ + 'title': 'Recovery', + 'axes': _fourAxes, + 'series': [ + {'name': 'Current', 'values': [85, 90, 75, 80]} + ], + }); + expect(p.labels, _fourAxes); + expect(p.series.single.values, [85.0, 90.0, 75.0, 80.0]); + expect(p.hasData, isTrue); + }); + + test('reads the labels key identically', () { + expect( + parse({ + 'labels': _fourAxes, + 'series': [ + {'name': 'Current', 'values': [1, 2, 3, 4]} + ], + }).labels, + _fourAxes, + ); + }); + + test('zero-pads a series shorter than the axis count', () { + final p = parse({ + 'axes': _fourAxes, + 'series': [ + {'name': 'Short', 'values': [1, 2]} + ], + }); + expect(p.series.single.values, [1.0, 2.0, 0.0, 0.0]); + }); + + test('truncates a series longer than the axis count', () { + final p = parse({ + 'axes': _fourAxes, + 'series': [ + {'name': 'Long', 'values': [1, 2, 3, 4, 5, 6]} + ], + }); + expect(p.series.single.values, [1.0, 2.0, 3.0, 4.0]); + }); + + test('coerces stringified values', () { + final p = parse({ + 'axes': _fourAxes, + 'series': [ + {'name': 'S', 'values': ['85', 90, '75', 80]} + ], + }); + expect(p.series.single.values, [85.0, 90.0, 75.0, 80.0]); + }); + + test('names an unnamed series positionally', () { + final p = parse({ + 'axes': _fourAxes, + 'series': [ + {'values': [1, 2, 3, 4]} + ], + }); + expect(p.series.single.name, 'Series 1'); + }); + + test('hasData is false with fewer than three axes or no series', () { + expect(parse({'axes': ['A', 'B'], 'series': [ + {'name': 'S', 'values': [1, 2]} + ]}).hasData, isFalse); + expect(parse({'axes': _fourAxes}).hasData, isFalse); + expect(parse({}).hasData, isFalse); + }); + + test('never throws on hostile input', () { + expect( + () => parse({'axes': 5, 'series': ['junk', 7], 'title': []}), + returnsNormally, + ); + }); + }); + + group('RadarChart rendering', () { + testWidgets('renders the chart and a multi-series legend', (tester) async { + await pump(tester, { + 'title': 'Recovery', + 'axes': _fourAxes, + 'series': [ + {'name': 'Current', 'values': [85, 90, 75, 80]}, + {'name': 'Baseline', 'values': [70, 70, 70, 70]}, + ], + }); + expect(find.byType(RadarChart), findsOneWidget); + expect(find.text('Recovery'), findsOneWidget); + expect(find.text('Current'), findsOneWidget); + expect(find.text('Baseline'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('hides the legend for a single series', (tester) async { + await pump(tester, { + 'axes': _fourAxes, + 'series': [ + {'name': 'Current', 'values': [1, 2, 3, 4]} + ], + }); + expect(find.text('Current'), findsNothing); + }); + + testWidgets('renders an empty panel when there is nothing to plot', + (tester) async { + await pump(tester, {'title': 'Recovery', 'axes': ['A', 'B']}); + expect(find.textContaining('No radar data'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + }); + + group('RadarChartSpec doc', () { + test('example payload is renderable', () { + final props = + const RadarChartSpec().doc.example['props']! as Map; + expect(parse(props).hasData, isTrue); + }); + }); +} diff --git a/workout-logger/test/genui/components/scatter_plot_test.dart b/workout-logger/test/genui/components/scatter_plot_test.dart new file mode 100644 index 0000000..150668c --- /dev/null +++ b/workout-logger/test/genui/components/scatter_plot_test.dart @@ -0,0 +1,213 @@ +import 'package:fl_chart/fl_chart.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_node.dart'; +import 'package:repforge/genui/src/a2ui_props.dart'; +import 'package:repforge/genui/src/a2ui_theme.dart'; +import 'package:repforge/genui/src/components/scatter_plot.dart'; + +ScatterPlotProps parse(Map props) => const ScatterPlotSpec() + .parseProps(A2UiNode(name: 'ScatterPlot', props: A2UiProps(props))); + +Future pump(WidgetTester tester, Map props) => + tester.pumpWidget(MaterialApp( + home: Scaffold( + body: SizedBox( + width: 400, + height: 400, + child: Builder( + builder: (context) => const ScatterPlotSpec().render( + context, + A2UiNode(name: 'ScatterPlot', props: A2UiProps(props)), + A2UiTheme.dark, + ), + ), + ), + ), + )); + +void main() { + group('ScatterPlotProps parsing', () { + test('reads the happy path', () { + final p = parse({ + 'title': 'Sleep vs Volume', + 'xLabel': 'Sleep Hours', + 'yLabel': 'Volume', + 'correlation': 0.82, + 'points': [ + {'x': 7.5, 'y': 1600}, + {'x': 6.0, 'y': 1200}, + ], + }); + expect(p.title, 'Sleep vs Volume'); + expect(p.xLabel, 'Sleep Hours'); + expect(p.points, hasLength(2)); + expect(p.correlation, 0.82); + }); + + test('coerces stringified coordinates', () { + final p = parse({ + 'points': [ + {'x': '7.5', 'y': '1600'} + ] + }); + expect(p.points.single.x, 7.5); + expect(p.points.single.y, 1600); + }); + + test('drops points missing a coordinate instead of throwing', () { + final p = parse({ + 'points': [ + {'x': 1, 'y': 2}, + {'x': 3}, + {'y': 4}, + {'x': 'abc', 'y': 5}, + 'garbage', + ], + }); + expect(p.points, hasLength(1)); + }); + + test('resolves the x_label snake_case alias', () { + expect(parse({'x_label': 'Sleep'}).xLabel, 'Sleep'); + expect(parse({'y_label': 'Volume'}).yLabel, 'Volume'); + }); + + test('falls back to X and Y axis labels', () { + final p = parse({}); + expect(p.xLabel, 'X'); + expect(p.yLabel, 'Y'); + expect(p.title, 'Scatter Plot'); + }); + + test('nulls an unparseable correlation', () { + expect(parse({'correlation': 'strong'}).correlation, isNull); + expect(parse({}).correlation, isNull); + expect(parse({'r': -0.4}).correlation, -0.4); + }); + + test('never throws on hostile input', () { + expect(() => parse({'points': 5, 'correlation': []}), returnsNormally); + }); + + test('drops structurally invalid point entries (nested objects, list entries)', + () { + final p = parse({ + 'points': [ + {'x': 1, 'y': 2}, + { + 'x': {'nested': true}, + 'y': 5, + }, + [3, 4], + 'garbage', + ], + }); + expect(p.points, hasLength(1)); + expect(p.points.single.x, 1); + }); + + test('drops points with non-finite "NaN"/"Infinity" string coordinates', + () { + final p = parse({ + 'points': [ + {'x': 1, 'y': 2}, + {'x': 'NaN', 'y': 3}, + {'x': 4, 'y': 'Infinity'}, + {'x': '-Infinity', 'y': 5}, + ], + }); + expect(p.points, hasLength(1)); + expect(p.points.single.x, 1); + final b = p.bounds; + expect(b.minX.isFinite, isTrue); + expect(b.maxX.isFinite, isTrue); + expect(b.minY.isFinite, isTrue); + expect(b.maxY.isFinite, isTrue); + }); + }); + + group('ScatterPlotProps bounds', () { + test('widens a degenerate axis so the span is never zero', () { + final b = parse({ + 'points': [ + {'x': 5, 'y': 5} + ] + }).bounds; + expect(b.maxX - b.minX, greaterThan(0)); + expect(b.maxY - b.minY, greaterThan(0)); + }); + + test('adds a margin around a real spread', () { + final b = parse({ + 'points': [ + {'x': 0, 'y': 0}, + {'x': 10, 'y': 100}, + ], + }).bounds; + expect(b.minX, lessThanOrEqualTo(0)); + expect(b.maxX, greaterThanOrEqualTo(10)); + expect(b.minY, lessThanOrEqualTo(0)); + expect(b.maxY, greaterThanOrEqualTo(100)); + }); + + test('brackets an all-negative coordinate spread', () { + final b = parse({ + 'points': [ + {'x': -20, 'y': -10}, + {'x': -5, 'y': -3}, + ], + }).bounds; + expect(b.minX, lessThanOrEqualTo(-20)); + expect(b.maxX, greaterThanOrEqualTo(-5)); + expect(b.minY, lessThanOrEqualTo(-10)); + expect(b.maxY, greaterThanOrEqualTo(-3)); + }); + }); + + group('ScatterPlot rendering', () { + testWidgets('renders the chart, axis caption and correlation badge', + (tester) async { + await pump(tester, { + 'title': 'Sleep vs Volume', + 'xLabel': 'Sleep', + 'yLabel': 'Volume', + 'correlation': 0.82, + 'points': [ + {'x': 1, 'y': 2}, + {'x': 3, 'y': 4}, + ], + }); + expect(find.byType(ScatterChart), findsOneWidget); + expect(find.text('Sleep vs Volume'), findsOneWidget); + expect(find.text('Volume vs. Sleep'), findsOneWidget); + expect(find.text('r = +0.82'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('formats a negative correlation without a plus sign', + (tester) async { + await pump(tester, { + 'correlation': -0.35, + 'points': [ + {'x': 1, 'y': 2} + ], + }); + expect(find.text('r = -0.35'), findsOneWidget); + }); + + testWidgets('renders an empty panel with no usable points', (tester) async { + await pump(tester, {'title': 'Sleep vs Volume', 'points': []}); + expect(find.textContaining('No paired data'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + }); + + group('ScatterPlotSpec doc', () { + test('example payload is renderable', () { + final props = const ScatterPlotSpec().doc.example['props']! + as Map; + expect(parse(props).points, isNotEmpty); + }); + }); +} diff --git a/workout-logger/test/genui/components/stat_card_test.dart b/workout-logger/test/genui/components/stat_card_test.dart new file mode 100644 index 0000000..24b9d95 --- /dev/null +++ b/workout-logger/test/genui/components/stat_card_test.dart @@ -0,0 +1,123 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/src/a2ui_node.dart'; +import 'package:repforge/genui/src/a2ui_props.dart'; +import 'package:repforge/genui/src/a2ui_theme.dart'; +import 'package:repforge/genui/src/components/stat_card.dart'; + +StatCardProps parse(Map props) => const StatCardSpec() + .parseProps(A2UiNode(name: 'StatCard', props: A2UiProps(props))); + +Future pump(WidgetTester tester, Map props) async { + await tester.pumpWidget(MaterialApp( + home: Scaffold( + body: Builder( + builder: (context) => const StatCardSpec().render( + context, + A2UiNode(name: 'StatCard', props: A2UiProps(props)), + A2UiTheme.dark, + ), + ), + ), + )); +} + +void main() { + group('StatCardProps parsing', () { + test('reads the happy path', () { + final p = parse({ + 'title': 'Weekly Volume', + 'value': '12,400 kg', + 'subtitle': 'Last 7 days', + 'trend': 'up', + }); + expect(p.title, 'Weekly Volume'); + expect(p.value, '12,400 kg'); + expect(p.subtitle, 'Last 7 days'); + expect(p.trend, A2UiTrend.up); + }); + + test('falls back when title and value are missing', () { + final p = parse({}); + expect(p.title, 'Metric'); + expect(p.value, '—'); + expect(p.subtitle, isNull); + expect(p.trend, A2UiTrend.neutral); + }); + + test('stringifies a numeric value', () { + expect(parse({'value': 88}).value, '88'); + expect(parse({'value': 88.5}).value, '88.5'); + }); + + test('appends a unit that is not already present', () { + expect(parse({'value': 88, 'unit': 'kg'}).value, '88 kg'); + expect(parse({'value': '88 kg', 'unit': 'kg'}).value, '88 kg'); + }); + + test('appends the unit when it only appears as a substring elsewhere in ' + 'the value, not as the actual trailing unit', () { + // Regression test: a naive `.contains(unit)` check is a false positive + // here — 'reps' contains the letter 's' — even though the value does + // NOT actually end with the unit 's' (it ends with "total"). The fix + // checks the trimmed value's actual suffix instead of a raw substring + // `contains`, so the unit must still be appended. + expect(parse({'value': '12 reps total', 'unit': 's'}).value, + '12 reps total s'); + }); + + test('accepts loose trend synonyms', () { + for (final up in ['up', 'improving', 'positive', 'RISING']) { + expect(parse({'trend': up}).trend, A2UiTrend.up, reason: up); + } + for (final down in ['down', 'declining', 'negative', 'falling']) { + expect(parse({'trend': down}).trend, A2UiTrend.down, reason: down); + } + expect(parse({'trend': 'sideways'}).trend, A2UiTrend.neutral); + expect(parse({'trend': 42}).trend, A2UiTrend.neutral); + }); + + test('resolves aliased keys', () { + final p = parse({'name': 'Bench', 'val': 100}); + expect(p.title, 'Bench'); + expect(p.value, '100'); + }); + + test('never throws on hostile input', () { + expect(() => parse({'title': [], 'value': {}, 'trend': []}), returnsNormally); + }); + }); + + group('StatCard rendering', () { + testWidgets('renders title, value and subtitle', (tester) async { + await pump(tester, { + 'title': 'Volume', + 'value': '12k', + 'subtitle': 'week', + 'trend': 'up', + }); + expect(find.text('Volume'), findsOneWidget); + expect(find.text('12k'), findsOneWidget); + expect(find.text('week'), findsOneWidget); + expect(find.byIcon(Icons.trending_up_rounded), findsOneWidget); + }); + + testWidgets('renders without crashing on empty props', (tester) async { + await pump(tester, {}); + expect(find.text('Metric'), findsOneWidget); + expect(find.text('—'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + }); + + group('StatCardSpec doc', () { + test('example payload round-trips through the spec', () { + final example = const StatCardSpec().doc.example; + expect(example['component'], 'StatCard'); + final props = example['props']! as Map; + final p = parse(props); + expect(p.title, isNotEmpty); + expect(p.value, isNot('—')); + }); + }); +} diff --git a/workout-logger/test/health_data_sync_service_test.dart b/workout-logger/test/health_data_sync_service_test.dart new file mode 100644 index 0000000..39a1933 --- /dev/null +++ b/workout-logger/test/health_data_sync_service_test.dart @@ -0,0 +1,198 @@ +import 'dart:io'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:sqflite_common_ffi/sqflite_ffi.dart'; + +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/health_data_sync_service.dart'; +import 'package:repforge/services/interfaces/health_connect_service_interface.dart'; +import 'package:repforge/services/sqlite_storage_service.dart'; + +class _RecordingHcService implements IHealthConnectService { + final List<({String method, DateTime from, DateTime to})> calls = []; + List heartRateSamples = const []; + List restingHrSamples = const []; + bool throwOnHeartRate = false; + Set grantedTypes = HealthReadType.values.toSet(); + + @override + Future> readSleepSessions(DateTime start, DateTime end) async { + calls.add((method: 'sleep', from: start, to: end)); + return const []; + } + + @override + Future> readHeartRateSamples(DateTime start, DateTime end) async { + calls.add((method: 'heart_rate', from: start, to: end)); + if (throwOnHeartRate) throw Exception('boom'); + return heartRateSamples; + } + + @override + Future> readRestingHeartRate(DateTime start, DateTime end) async { + calls.add((method: 'resting_heart_rate', from: start, to: end)); + return restingHrSamples; + } + + @override + Future> readHrvRmssd(DateTime start, DateTime end) async { + calls.add((method: 'hrv_rmssd', from: start, to: end)); + return const []; + } + + @override + Future> grantedReadTypes() async => grantedTypes; + @override + Future isAvailable() async => true; + @override + Future requestPermissions() async => true; + @override + Future hasPermissions() async => true; + @override + Future requestReadPermissions() async => true; + @override + Future syncWorkoutSession(WorkoutSession session, {String? title}) async => true; +} + +Future>> _rawQuery( + SqliteStorageService s, + String sql, [ + List? args, +]) async { + final db = await openReadOnlyDatabase(s.databasePath, singleInstance: false); + final rows = await db.rawQuery(sql, args); + await db.close(); + return rows; +} + +void main() { + late SqliteStorageService storage; + late _RecordingHcService hc; + + setUpAll(() { + sqfliteFfiInit(); + databaseFactory = databaseFactoryFfi; + }); + + setUp(() async { + storage = SqliteStorageService(databasePathOverride: inMemoryDatabasePath); + await storage.init(); + hc = _RecordingHcService(); + }); + + tearDown(() async { + final path = storage.databasePath; + await storage.close(); + final file = File(path); + if (await file.exists()) { + await file.delete(); + } + }); + + test('first sync backfills 90 days plus the 3-day lookback', () async { + final now = DateTime(2026, 8, 11, 9); + final service = HealthDataSyncService(healthConnectService: hc, storage: storage, now: () => now); + + await service.sync(); + + final sleepCall = hc.calls.firstWhere((c) => c.method == 'sleep'); + expect(sleepCall.to, now); + expect(sleepCall.from, now.subtract(const Duration(days: 93))); + }); + + test('second sync only re-fetches from watermark minus the 3-day lookback', () async { + final firstRun = DateTime(2026, 8, 1, 9); + final secondRun = DateTime(2026, 8, 11, 9); + var current = firstRun; + final service = HealthDataSyncService(healthConnectService: hc, storage: storage, now: () => current); + + await service.sync(force: true); + hc.calls.clear(); + current = secondRun; + await service.sync(force: true); + + final sleepCall = hc.calls.firstWhere((c) => c.method == 'sleep'); + expect(sleepCall.from, firstRun.subtract(const Duration(days: 3))); + expect(sleepCall.to, secondRun); + }); + + test('a sync within the 30-minute throttle window is skipped unless forced', () async { + final firstRun = DateTime(2026, 8, 11, 9, 0); + final soonAfter = DateTime(2026, 8, 11, 9, 10); + var current = firstRun; + final service = HealthDataSyncService(healthConnectService: hc, storage: storage, now: () => current); + + await service.sync(); + hc.calls.clear(); + current = soonAfter; + await service.sync(); + + expect(hc.calls, isEmpty); + }); + + test('force:true bypasses the throttle', () async { + final firstRun = DateTime(2026, 8, 11, 9, 0); + final soonAfter = DateTime(2026, 8, 11, 9, 10); + var current = firstRun; + final service = HealthDataSyncService(healthConnectService: hc, storage: storage, now: () => current); + + await service.sync(); + hc.calls.clear(); + current = soonAfter; + await service.sync(force: true); + + expect(hc.calls, isNotEmpty); + }); + + test('re-syncing the same sample does not duplicate rows', () async { + final now = DateTime(2026, 8, 11, 9); + hc.heartRateSamples = [HealthSample(time: DateTime(2026, 8, 10, 22), value: 62)]; + final service = HealthDataSyncService(healthConnectService: hc, storage: storage, now: () => now); + + await service.sync(force: true); + await service.sync(force: true); + + final rows = await _rawQuery( + storage, + "SELECT COUNT(*) AS c FROM health_samples WHERE type = 'heart_rate'", + ); + expect(rows.first['c'], 1); + }); + + test('a stream that throws does not block the others and leaves its watermark untouched', () async { + final now = DateTime(2026, 8, 11, 9); + hc.throwOnHeartRate = true; + hc.restingHrSamples = [HealthSample(time: now, value: 55)]; + final service = HealthDataSyncService(healthConnectService: hc, storage: storage, now: () => now); + + await service.sync(force: true); + + expect(await storage.getSetting('health_sync.heart_rate'), isNull); + expect(await storage.getSetting('health_sync.resting_heart_rate'), now.toIso8601String()); + + final rows = await _rawQuery( + storage, + "SELECT COUNT(*) AS c FROM health_samples WHERE type = 'resting_heart_rate'", + ); + expect(rows.first['c'], 1); + }); + + test('an ungranted stream is skipped entirely and its watermark never advances', () async { + final now = DateTime(2026, 8, 11, 9); + // Permission not yet granted for heart rate — simulates first launch + // before the user has opened Health Connect settings. + hc.grantedTypes = { + HealthReadType.sleep, + HealthReadType.restingHeartRate, + HealthReadType.hrv, + }; + final service = HealthDataSyncService(healthConnectService: hc, storage: storage, now: () => now); + + await service.sync(force: true); + + // The reader for the ungranted stream must never even be called. + expect(hc.calls.any((c) => c.method == 'heart_rate'), isFalse); + // And critically, its watermark must stay unset so a later grant still + // triggers the full 90-day backfill instead of resuming from `now`. + expect(await storage.getSetting('health_sync.heart_rate'), isNull); + }); +} diff --git a/workout-logger/test/ml_service_test.dart b/workout-logger/test/ml_service_test.dart index ff68406..8a2fc3f 100644 --- a/workout-logger/test/ml_service_test.dart +++ b/workout-logger/test/ml_service_test.dart @@ -422,7 +422,7 @@ void main() { lastTrained: DateTime.now(), stdError: 25.0, // → ±5 days at 5 volume/day ); - final result = MLService.predictTargetWithConfidence( + final result = GrowthCurveFitter.predictTargetWithConfidence( currentValue: 100.0, targetValue: 200.0, growthModel: model, diff --git a/workout-logger/test/model_serialization_test.dart b/workout-logger/test/model_serialization_test.dart index 13f922f..2cb2d45 100644 --- a/workout-logger/test/model_serialization_test.dart +++ b/workout-logger/test/model_serialization_test.dart @@ -173,6 +173,22 @@ void main() { final restored = WorkoutSession.fromJson(original.toJson()); expect(restored.hcSyncedAt, syncTime); }); + + test('sessionEffort is null by default and round-trips when set', () { + final withoutEffort = WorkoutSession( + id: 'session-5', + date: date, + exercises: [], + duration: 30, + ); + expect(withoutEffort.sessionEffort, isNull); + expect(WorkoutSession.fromJson(withoutEffort.toJson()).sessionEffort, isNull); + + final withEffort = withoutEffort.copyWith(sessionEffort: 2); + expect(withEffort.sessionEffort, 2); + final restored = WorkoutSession.fromJson(withEffort.toJson()); + expect(restored.sessionEffort, 2); + }); }); // ── Exercise ────────────────────────────────────────────────────────────── diff --git a/workout-logger/test/new_features_test.dart b/workout-logger/test/new_features_test.dart new file mode 100644 index 0000000..30f1a31 --- /dev/null +++ b/workout-logger/test/new_features_test.dart @@ -0,0 +1,402 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/data/exercise_database.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/models/sleep_hr_models.dart'; +import 'package:repforge/services/ai/coach_tool_service.dart'; +import 'package:repforge/services/interfaces/health_connect_service_interface.dart'; +import 'package:repforge/services/interfaces/storage_service_interface.dart'; +import 'package:repforge/services/managers/health_history_manager.dart'; +import 'package:repforge/services/managers/pr_manager.dart'; +import 'package:repforge/services/ml_service.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:google_generative_ai/google_generative_ai.dart'; + +class FakeStorageService implements IStorageService { + final Map _settings = {}; + final Map _prs = {}; + + // Populated by tests that need WorkoutProvider.load() to actually see + // data (e.g. muscle-group resolution needs real MuscleGroup/Exercise + // rows). Left empty for tests that never call load(). + List sessions = []; + List exercises = []; + + @override + Future getSetting(String key) async => _settings[key]; + + @override + Future saveSetting(String key, String value) async { + _settings[key] = value; + } + + @override + Future> getAllPersonalRecords() async => _prs.values.toList(); + + @override + Future getPersonalRecord(String exerciseId) async => _prs[exerciseId]; + + @override + Future savePersonalRecord(PersonalRecord record) async { + _prs[record.exerciseId] = record; + } + + @override + Future> getAllWorkoutSessions() async => List.from(sessions); + + @override + Future> getAllRoutines() async => []; + + @override + Future> getAllTargets() async => []; + + @override + Future> getAllMuscleGroups() async => MuscleGroups.getAll(); + + @override + Future> getAllExercises() async => List.from(exercises); + + @override + Future> getAllTrainingPrograms() async => []; + + @override + dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation); +} + +class FakeHealthConnectService implements IHealthConnectService { + @override + Future> grantedReadTypes() async => { + HealthReadType.sleep, + HealthReadType.heartRate, + HealthReadType.restingHeartRate, + }; + + @override + dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation); +} + +class FakeHealthHistoryManager extends HealthHistoryManager { + FakeHealthHistoryManager(super.hc, super.storage); + + @override + Future sleepNight(DateTime morning) async { + return SleepHrSnapshot( + sleepStart: morning.subtract(const Duration(hours: 8)), + sleepEnd: morning, + p5Bpm: 52 + (morning.day % 4), + p95Bpm: 70, + segments: [ + SleepHrSegment( + windowStart: morning.subtract(const Duration(hours: 7)), + minBpm: 50, + maxBpm: 65, + avgBpm: 55.0, + stage: 'deep', + ), + SleepHrSegment( + windowStart: morning.subtract(const Duration(hours: 5)), + minBpm: 52, + maxBpm: 68, + avgBpm: 58.0, + stage: 'light', + ), + ], + stageStats: [], + ); + } +} + +class FakeWorkoutProvider extends WorkoutProvider { + FakeWorkoutProvider(super.storage) + : super( + mlService: MLService(), + programManager: ProgramManager(storage), + ); +} + +void main() { + group('Pullups Volume Calculation', () { + test('standard exercise volume defaults to weight * reps', () { + final set = WorkoutSet(weight: 80.0, reps: 8); + expect(set.calculateVolume(userBodyWeight: 75.0, isAssistedBW: false), 640.0); + }); + + test('assisted pullups volume uses (BW - assist + extra) * reps', () { + // weight and assistWeight are deliberately DIFFERENT here: weight is + // set to a value (99 kg) that would never plausibly be used as the + // assist amount, so this test can only pass if calculateVolume + // actually reads assistWeight (15 kg) rather than weight. + // 75 kg bodyweight, 15 kg assist weight, 8 reps + // Effective load = 75 - 15 = 60 kg -> 60 * 8 = 480 kg volume + // (Using `weight` instead of `assistWeight` would instead give + // max(0, 75 - 99) * 8 = 0 kg volume.) + final set = WorkoutSet(weight: 99.0, reps: 8, assistWeight: 15.0); + expect(set.calculateVolume(userBodyWeight: 75.0, isAssistedBW: true), 480.0); + }); + + test('weighted pullups with assist=0 and extraWeight', () { + // 75 kg bodyweight, 0 kg assist, +10 kg extra, 5 reps + // Effective load = 75 - 0 + 10 = 85 kg -> 85 * 5 = 425 kg volume + final set = WorkoutSet(weight: 0.0, reps: 5, assistWeight: 0.0, extraWeight: 10.0); + expect(set.calculateVolume(userBodyWeight: 75.0, isAssistedBW: true), 425.0); + }); + }); + + group('MLService - Past 3 Sessions Trend & Deload Protection', () { + final mlService = MLService(); + + test('recommends double progression based on last session when normal', () { + final s0 = [WorkoutSet(weight: 50.0, reps: 10)]; + final recs = mlService.recommendSets(lastSession: s0, maxReps: 12); + expect(recs.first.weight, 50.0); + expect(recs.first.reps, 11); + }); + + test('recovers correctly from deload week using pre-deload baseline', () { + // Session 1 (pre-deload): 60kg x 10 + final s1 = [WorkoutSet(weight: 60.0, reps: 10)]; + // Session 0 (deload week): 40kg x 8 (significant drop in load) + final s0 = [WorkoutSet(weight: 40.0, reps: 8)]; + + final recs = mlService.recommendSets( + lastSession: s0, + pastSessions: [s0, s1], + maxReps: 12, + ); + + // Should anchor on pre-deload 60kg baseline instead of 40kg deload + expect(recs.first.weight, 60.0); + expect(recs.first.reps, 10); + expect(recs.first.reasoning, contains('Resuming training after deload')); + }); + + // The recency window is 21 days. Duration.inDays truncates, so comparing + // it would keep a deload 21 days and 23 hours old inside the window. + group('deload recency window boundary', () { + final asOf = DateTime(2026, 8, 1, 12); + + List recsAged(Duration age) { + final deloadAt = asOf.subtract(age); + final s1 = [ + WorkoutSet( + weight: 60.0, + reps: 10, + timestamp: deloadAt.subtract(const Duration(days: 3)), + ) + ]; + final s0 = [WorkoutSet(weight: 40.0, reps: 8, timestamp: deloadAt)]; + return mlService.recommendSets( + lastSession: s0, + pastSessions: [s0, s1], + maxReps: 12, + asOf: asOf, + ); + } + + test('exactly 21 days old still counts as recent', () { + expect( + recsAged(const Duration(days: 21)).first.reasoning, + contains('Resuming training after deload'), + ); + }); + + test('21 days and 23 hours old is outside the window', () { + expect( + recsAged(const Duration(days: 21, hours: 23)).first.reasoning, + isNot(contains('Resuming training after deload')), + ); + }); + }); + }); + + group('PRManager - Handle Variations Scoping', () { + late FakeStorageService fakeStorage; + late PRManager prManager; + + setUp(() { + fakeStorage = FakeStorageService(); + prManager = PRManager(fakeStorage); + }); + + test('tracks PRs separately for Rope vs Bar handles', () async { + await prManager.load(); + + final ropeSession = WorkoutSession( + id: 's1', + date: DateTime.now(), + exercises: [ + ExerciseLog( + exerciseId: 'tricep_pushdown', + handle: 'Rope', + sets: [WorkoutSet(weight: 30.0, reps: 10, handle: 'Rope')], + ), + ], + duration: 30, + ); + + final barSession = WorkoutSession( + id: 's2', + date: DateTime.now(), + exercises: [ + ExerciseLog( + exerciseId: 'tricep_pushdown', + handle: 'Bar', + sets: [WorkoutSet(weight: 40.0, reps: 10, handle: 'Bar')], + ), + ], + duration: 30, + ); + + await prManager.checkAndUpdatePRs(ropeSession); + await prManager.checkAndUpdatePRs(barSession); + + final ropePR = prManager.getRecord('tricep_pushdown', handle: 'Rope'); + final barPR = prManager.getRecord('tricep_pushdown', handle: 'Bar'); + + expect(ropePR?.bestWeight, 30.0); + expect(barPR?.bestWeight, 40.0); + }); + }); + + group('CoachToolService - Sleeping HR Analytics Tool', () { + late FakeStorageService storage; + late FakeWorkoutProvider wp; + late FakeHealthConnectService hc; + late FakeHealthHistoryManager hh; + late PRManager pr; + late CoachToolService coachToolService; + + setUp(() { + storage = FakeStorageService(); + wp = FakeWorkoutProvider(storage); + hc = FakeHealthConnectService(); + hh = FakeHealthHistoryManager(hc, storage); + pr = PRManager(storage); + coachToolService = CoachToolService(workoutProvider: wp, prManager: pr, healthHistory: hh); + }); + + test('get_sleeping_hr_analytics computes p5, p25, mean, stdev, variance and chart series', + () async { + final call = FunctionCall('get_sleeping_hr_analytics', {'days': 14}); + final res = await coachToolService.handleCall(call); + + expect(res.containsKey('error'), isFalse); + expect(res['days_analyzed'], 14); + expect(res['valid_nights_count'], 14); + + final summary = res['overall_summary'] as Map; + expect(summary.containsKey('mean_p5_sleeping_hr'), isTrue); + expect(summary.containsKey('stdev_p5_sleeping_hr'), isTrue); + expect(summary.containsKey('variance_p5_sleeping_hr'), isTrue); + expect(summary.containsKey('trend_direction'), isTrue); + + expect(res['labels'], isA>()); + final series = res['series']! as List; + expect(series, hasLength(3)); // P5, P25, Mean + expect((series[0] as Map)['name'], 'P5 Sleeping HR'); + expect((series[0] as Map)['values'], hasLength(14)); + expect(res.containsKey('genui_chart_props'), isFalse); + }); + }); + + group('CoachToolService - health/muscle-group tool correctness fixes', () { + late FakeStorageService storage; + late FakeWorkoutProvider wp; + late PRManager pr; + + setUp(() { + storage = FakeStorageService(); + wp = FakeWorkoutProvider(storage); + pr = PRManager(storage); + }); + + test('get_health_metrics returns an error when no HealthHistoryManager ' + 'is wired up (_hh == null), instead of throwing', () async { + final coachToolService = CoachToolService(workoutProvider: wp, prManager: pr); // no healthHistory + final call = FunctionCall('get_health_metrics', {'days': 14}); + final res = await coachToolService.handleCall(call); + + expect(res.containsKey('error'), isTrue); + expect(res['error'], contains('Health Connect')); + }); + + test('analyze_health_workout_correlation returns an error for ' + 'insufficient paired data instead of fabricating a result', () async { + // Regression test: this tool used to fall back to synthetic data when + // there weren't enough real (sleep, workout) pairs on the same day. + // With no HealthHistoryManager wired up, no x (sleep) values are ever + // collected, so even a real logged workout session yields zero valid + // (x, y) pairs — the tool must report that honestly rather than + // inventing a correlation. + storage.sessions = [ + WorkoutSession( + id: 's1', + date: DateTime.now(), + exercises: [ + ExerciseLog( + exerciseId: 'squat', + sets: [WorkoutSet(weight: 100.0, reps: 5)], + ), + ], + duration: 30, + ), + ]; + await wp.loadAllData(); + + final coachToolService = CoachToolService(workoutProvider: wp, prManager: pr); // no healthHistory + final call = FunctionCall( + 'analyze_health_workout_correlation', + {'days': 60}, + ); + final res = await coachToolService.handleCall(call); + + expect(res.containsKey('error'), isTrue); + expect(res['error'], contains('Insufficient paired data')); + }); + + test('get_muscle_group_volume resolves a multi-word display name ' + '("Quadriceps") to its muscle-group id and aggregates real volume', + () async { + // Regression test: resolution used to compare the raw group name + // against Exercise.primaryMuscle (an id like "quads") via substring + // matching, which false-missed "Quadriceps". With ID-based resolution + // via _resolveMuscleGroup, a squat session's volume must actually show + // up under the "Quadriceps" total, not silently stay at zero. + storage.exercises = [ + Exercise( + id: 'squat', + name: 'Squat', + category: 'compound', + muscleActivations: [ + MuscleActivation(muscleGroupId: 'quads', activationPercentage: 100), + ], + ), + ]; + storage.sessions = [ + WorkoutSession( + id: 's1', + date: DateTime.now(), + exercises: [ + ExerciseLog( + exerciseId: 'squat', + sets: [WorkoutSet(weight: 100.0, reps: 5)], + ), + ], + duration: 30, + ), + ]; + await wp.loadAllData(); + + final coachToolService = CoachToolService(workoutProvider: wp, prManager: pr); // no healthHistory + final call = FunctionCall( + 'get_muscle_group_volume', + {'muscle_groups': ['Quadriceps'], 'days': 60}, + ); + final res = await coachToolService.handleCall(call); + + expect(res.containsKey('error'), isFalse); + final totals = res['totals'] as Map; + expect(totals['Quadriceps'], 500.0); // 100kg * 5 reps + }); + }); +} diff --git a/workout-logger/test/progression_rules_test.dart b/workout-logger/test/progression_rules_test.dart new file mode 100644 index 0000000..bc20d89 --- /dev/null +++ b/workout-logger/test/progression_rules_test.dart @@ -0,0 +1,275 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/strategies/progression_rules.dart'; + +WorkoutSet _set({double weight = 60.0, int reps = 10}) => + WorkoutSet(weight: weight, reps: reps); + +ProgressionContext _context({ + WorkoutSet? set, + int minReps = 6, + int maxReps = 12, + bool isPlateau = false, + bool isDeclining = false, + bool isUnderRecovered = false, + int? recoveryPercent, + bool isPostDeloadRecovery = false, + bool isLowReadiness = false, + double sessionFatigueFactor = 0.0, +}) { + return ProgressionContext( + set: set ?? _set(), + minReps: minReps, + maxReps: maxReps, + isPlateau: isPlateau, + isDeclining: isDeclining, + isUnderRecovered: isUnderRecovered, + recoveryPercent: recoveryPercent, + isPostDeloadRecovery: isPostDeloadRecovery, + isLowReadiness: isLowReadiness, + sessionFatigueFactor: sessionFatigueFactor, + ); +} + +void main() { + tearDown(() => ProgressionRuleFactory.reset()); + + group('UnderRecoveredRule', () { + final rule = UnderRecoveredRule(); + + test('defers when not under-recovered', () { + expect(rule.apply(_context(isUnderRecovered: false)), isNull); + }); + + test('holds weight/reps with low confidence when under-recovered', () { + final result = rule.apply(_context( + set: _set(weight: 80, reps: 8), + isUnderRecovered: true, + recoveryPercent: 40, + )); + expect(result, isNotNull); + expect(result!.weight, 80); + expect(result.reps, 8); + expect(result.confidence, 'low'); + expect(result.reasoning, contains('40%')); + }); + }); + + group('PostDeloadRecoveryRule', () { + final rule = PostDeloadRecoveryRule(); + + test('defers when not post-deload', () { + expect(rule.apply(_context()), isNull); + }); + + test('holds weight/reps with high confidence when post-deload', () { + final result = rule.apply(_context( + set: _set(weight: 100, reps: 6), + isPostDeloadRecovery: true, + )); + expect(result, isNotNull); + expect(result!.weight, 100); + expect(result.reps, 6); + expect(result.confidence, 'high'); + expect(result.reasoning, contains('deload')); + }); + }); + + group('ReadinessRule', () { + final rule = ReadinessRule(); + + test('defers when readiness is not low', () { + expect(rule.apply(_context(isLowReadiness: false)), isNull); + }); + + test('holds weight/reps with low confidence when readiness is low', () { + final result = rule.apply(_context( + set: _set(weight: 70, reps: 9), + isLowReadiness: true, + )); + expect(result, isNotNull); + expect(result!.weight, 70); + expect(result.reps, 9); + expect(result.confidence, 'low'); + expect(result.reasoning, contains('readiness')); + }); + }); + + group('SessionFatigueRule', () { + final rule = SessionFatigueRule(); + + test('defers when fatigue factor is below 1.0', () { + expect(rule.apply(_context(sessionFatigueFactor: 0.6)), isNull); + }); + + test('hard-holds once fatigue factor reaches 1.0', () { + final result = rule.apply(_context( + set: _set(weight: 60, reps: 10), + sessionFatigueFactor: 1.0, + )); + expect(result, isNotNull); + expect(result!.weight, 60); + expect(result.reps, 10); + expect(result.confidence, 'medium'); + }); + }); + + group('DeclineDeloadRule', () { + final rule = DeclineDeloadRule(); + + test('defers when not declining', () { + expect(rule.apply(_context()), isNull); + }); + + test('deloads ~10% rounded to the nearest 2.5kg plate', () { + final result = rule.apply(_context( + set: _set(weight: 100, reps: 8), + isDeclining: true, + )); + expect(result, isNotNull); + expect(result!.weight, closeTo(90.0, 0.001)); + expect(result.reps, 8); + expect(result.confidence, 'medium'); + }); + }); + + group('PlateauRule', () { + final rule = PlateauRule(); + + test('defers when not plateaued', () { + expect(rule.apply(_context()), isNull); + }); + + test('holds weight/reps with medium confidence on plateau', () { + final result = rule.apply(_context( + set: _set(weight: 60, reps: 10), + isPlateau: true, + )); + expect(result, isNotNull); + expect(result!.weight, 60); + expect(result.reps, 10); + expect(result.confidence, 'medium'); + }); + }); + + group('DoubleProgressionRule', () { + final rule = DoubleProgressionRule(); + + test('never defers (terminal rule)', () { + expect(rule.apply(_context()), isNotNull); + }); + + test('adds one rep below the rep ceiling', () { + final result = rule.apply(_context(set: _set(weight: 60, reps: 10), maxReps: 12)); + expect(result.weight, closeTo(60.0, 0.001)); + expect(result.reps, 11); + expect(result.confidence, 'high'); + }); + + test('bumps weight and resets reps at the rep ceiling', () { + final result = rule.apply( + _context(set: _set(weight: 80, reps: 12), minReps: 6, maxReps: 12), + ); + expect(result.weight, closeTo(85.0, 0.001)); + expect(result.reps, 6); + }); + + test('partial session fatigue scales down the weight increment', () { + // weight >= 40 → base increment 5.0; factor 0.5 → scaled to 2.5. + final result = rule.apply(_context( + set: _set(weight: 80, reps: 12), + minReps: 6, + maxReps: 12, + sessionFatigueFactor: 0.5, + )); + expect(result.weight, closeTo(82.5, 0.001)); + expect(result.reps, 6); + expect(result.confidence, 'medium'); + expect(result.reasoning, contains('reduced')); + }); + + test('heavy partial fatigue that rounds the increment to zero holds weight', + () { + // scaled = 5.0*(1-0.9) = 0.5 → rounds to 0 at the 2.5kg plate. + final result = rule.apply(_context( + set: _set(weight: 80, reps: 12), + minReps: 6, + maxReps: 12, + sessionFatigueFactor: 0.9, + )); + expect(result.weight, closeTo(80.0, 0.001)); + expect(result.reps, 12); // not reset — no progression happened + expect(result.confidence, 'medium'); + }); + + test('zero fatigue factor (the default) is byte-identical to unscaled behavior', + () { + final unscaled = rule.apply( + _context(set: _set(weight: 80, reps: 12), minReps: 6, maxReps: 12), + ); + final explicitZero = rule.apply(_context( + set: _set(weight: 80, reps: 12), + minReps: 6, + maxReps: 12, + sessionFatigueFactor: 0.0, + )); + expect(explicitZero.weight, unscaled.weight); + expect(explicitZero.reps, unscaled.reps); + expect(explicitZero.confidence, unscaled.confidence); + expect(explicitZero.reasoning, unscaled.reasoning); + }); + }); + + group('ProgressionRuleFactory', () { + test('default chain order matches the documented priority', () { + final rules = ProgressionRuleFactory.rules; + expect(rules[0], isA()); + expect(rules[1], isA()); + expect(rules[2], isA()); + expect(rules[3], isA()); + expect(rules[4], isA()); + expect(rules[5], isA()); + expect(rules[6], isA()); + expect(rules.length, 7); + }); + + test('apply falls through to the first matching rule', () { + final result = ProgressionRuleFactory.apply(_context( + set: _set(weight: 80, reps: 8), + isUnderRecovered: true, + recoveryPercent: 50, + // Even though decline is also true, under-recovered has priority. + isDeclining: true, + )); + expect(result.reasoning, contains('recovered')); + }); + + test('registerRuleAtHead overrides the entire chain', () { + ProgressionRuleFactory.registerRuleAtHead(_AlwaysHolds()); + + final result = ProgressionRuleFactory.apply(_context(set: _set(weight: 60, reps: 10))); + + expect(result.reasoning, 'always holds'); + expect(result.weight, 60); + expect(result.reps, 10); + }); + + test('reset restores the default chain', () { + ProgressionRuleFactory.registerRuleAtHead(_AlwaysHolds()); + ProgressionRuleFactory.reset(); + + expect(ProgressionRuleFactory.rules.length, 7); + expect(ProgressionRuleFactory.rules.first, isA()); + }); + }); +} + +class _AlwaysHolds implements ProgressionRule { + @override + SetRecommendation apply(ProgressionContext c) => SetRecommendation( + weight: c.set.weight, + reps: c.set.reps, + confidence: 'low', + reasoning: 'always holds', + ); +} diff --git a/workout-logger/test/routine_optimizer_screen_test.dart b/workout-logger/test/routine_optimizer_screen_test.dart index 1be665d..b0d0924 100644 --- a/workout-logger/test/routine_optimizer_screen_test.dart +++ b/workout-logger/test/routine_optimizer_screen_test.dart @@ -59,6 +59,30 @@ class _ImmediateAi implements IAiService { @override Future generateInsight(String system, String context) async => ''; + + @override + Stream streamChatReply({ + required String userMessage, + required String systemPrompt, + required List history, + List? tools, + Future> Function(FunctionCall call)? onToolCall, + }) => + streamCoachReply( + userMessage: userMessage, + systemPrompt: systemPrompt, + history: history, + tools: tools, + onToolCall: onToolCall, + ); + + @override + Future generateStructuredJson({ + required String systemPrompt, + required String userPrompt, + required T Function(Map json) fromJson, + }) => + throw UnimplementedError(); } /// AI that hangs indefinitely — keeps `isLoading` true for the entire test. @@ -94,6 +118,30 @@ class _HangingAi implements IAiService { @override Future generateInsight(String system, String context) async => ''; + + @override + Stream streamChatReply({ + required String userMessage, + required String systemPrompt, + required List history, + List? tools, + Future> Function(FunctionCall call)? onToolCall, + }) => + streamCoachReply( + userMessage: userMessage, + systemPrompt: systemPrompt, + history: history, + tools: tools, + onToolCall: onToolCall, + ); + + @override + Future generateStructuredJson({ + required String systemPrompt, + required String userPrompt, + required T Function(Map json) fromJson, + }) => + throw UnimplementedError(); } /// AI that fires an `ask_user_questions` tool call before yielding a reply. @@ -138,6 +186,30 @@ class _QuestionAi implements IAiService { @override Future generateInsight(String system, String context) async => ''; + + @override + Stream streamChatReply({ + required String userMessage, + required String systemPrompt, + required List history, + List? tools, + Future> Function(FunctionCall call)? onToolCall, + }) => + streamCoachReply( + userMessage: userMessage, + systemPrompt: systemPrompt, + history: history, + tools: tools, + onToolCall: onToolCall, + ); + + @override + Future generateStructuredJson({ + required String systemPrompt, + required String userPrompt, + required T Function(Map json) fromJson, + }) => + throw UnimplementedError(); } // ── Test helpers ─────────────────────────────────────────────────────────── @@ -150,7 +222,7 @@ RoutineOptimizerViewModel _buildVm(IAiService ai) { final pr = PRManager(storage); final conversations = ConversationManager(storage, kind: 'optimizer'); final settings = SettingsProvider(storage); - final coachTools = CoachToolService(wp, pr); + final coachTools = CoachToolService(workoutProvider: wp, prManager: pr); return RoutineOptimizerViewModel( ai: ai, coachTools: coachTools, diff --git a/workout-logger/test/routine_optimizer_view_model_test.dart b/workout-logger/test/routine_optimizer_view_model_test.dart index 4338cd0..c78b5a0 100644 --- a/workout-logger/test/routine_optimizer_view_model_test.dart +++ b/workout-logger/test/routine_optimizer_view_model_test.dart @@ -60,6 +60,30 @@ class _SimpleAi implements IAiService { @override Future generateInsight(String system, String context) async => ''; + + @override + Stream streamChatReply({ + required String userMessage, + required String systemPrompt, + required List history, + List? tools, + Future> Function(FunctionCall call)? onToolCall, + }) => + streamCoachReply( + userMessage: userMessage, + systemPrompt: systemPrompt, + history: history, + tools: tools, + onToolCall: onToolCall, + ); + + @override + Future generateStructuredJson({ + required String systemPrompt, + required String userPrompt, + required T Function(Map json) fromJson, + }) => + throw UnimplementedError(); } class _ThrowingAi implements IAiService { @@ -93,6 +117,30 @@ class _ThrowingAi implements IAiService { @override Future generateInsight(String system, String context) => throw UnimplementedError(); + + @override + Stream streamChatReply({ + required String userMessage, + required String systemPrompt, + required List history, + List? tools, + Future> Function(FunctionCall call)? onToolCall, + }) => + streamCoachReply( + userMessage: userMessage, + systemPrompt: systemPrompt, + history: history, + tools: tools, + onToolCall: onToolCall, + ); + + @override + Future generateStructuredJson({ + required String systemPrompt, + required String userPrompt, + required T Function(Map json) fromJson, + }) => + throw UnimplementedError(); } // ── Helper ──────────────────────────────────────────────────────────────── @@ -105,7 +153,7 @@ RoutineOptimizerViewModel _buildVm({ final pr = PRManager(storage); final conversations = ConversationManager(storage, kind: 'optimizer'); final settings = SettingsProvider(storage); - final coachTools = CoachToolService(wp, pr); + final coachTools = CoachToolService(workoutProvider: wp, prManager: pr); return RoutineOptimizerViewModel( ai: ai, coachTools: coachTools, diff --git a/workout-logger/test/screens/ai_coach_genui_test.dart b/workout-logger/test/screens/ai_coach_genui_test.dart new file mode 100644 index 0000000..94e98ab --- /dev/null +++ b/workout-logger/test/screens/ai_coach_genui_test.dart @@ -0,0 +1,95 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/genui/a2ui.dart'; +import 'package:repforge/screens/ai_coach_screen.dart'; + +Future pump( + WidgetTester tester, + String text, { + bool streaming = false, +}) => + tester.pumpWidget(MaterialApp( + home: Scaffold( + body: SingleChildScrollView( + child: CoachMessageContent(text: text, streaming: streaming), + ), + ), + )); + +void main() { + const dashboard = + '{"component":"StatCard","props":{"title":"Volume","value":"12k"}}'; + + group('completed messages', () { + testWidgets('renders a dashboard payload as widgets', (tester) async { + await pump(tester, dashboard); + expect(find.byType(A2UiRenderer), findsOneWidget); + expect(find.text('Volume'), findsOneWidget); + expect(find.textContaining('component'), findsNothing); + }); + + testWidgets('renders prose as markdown', (tester) async { + await pump(tester, '**Nice work.** Keep going.'); + expect(find.byType(A2UiRenderer), findsNothing); + expect(tester.takeException(), isNull); + }); + + testWidgets('renders a fenced payload as widgets', (tester) async { + await pump(tester, '```json\n$dashboard\n```'); + expect(find.byType(A2UiRenderer), findsOneWidget); + }); + }); + + group('streaming messages', () { + testWidgets('shows a building indicator instead of partial JSON', + (tester) async { + await pump(tester, '{"component":"Stat', streaming: true); + expect(find.textContaining('Building'), findsOneWidget); + expect(find.textContaining('"component"'), findsNothing); + expect(find.byType(A2UiRenderer), findsNothing); + }); + + testWidgets('still shows a complete payload as widgets mid-stream', + (tester) async { + await pump(tester, dashboard, streaming: true); + expect(find.byType(A2UiRenderer), findsOneWidget); + }); + + testWidgets('streams prose live', (tester) async { + await pump(tester, 'Your bench is trend', streaming: true); + expect(find.textContaining('Building'), findsNothing); + expect(tester.takeException(), isNull); + }); + + testWidgets( + 'shows a building indicator for a prose sentence before an unclosed fence', + (tester) async { + await pump( + tester, + 'Here is your data:\n```json\n{"component":"Stat', + streaming: true, + ); + expect(find.textContaining('Building'), findsOneWidget); + expect(find.textContaining('"component"'), findsNothing); + expect(find.byType(A2UiRenderer), findsNothing); + }); + }); + + group('memoization', () { + testWidgets('does not reparse when rebuilt with the same text', + (tester) async { + await pump(tester, dashboard); + final first = tester.widget(find.byType(A2UiRenderer)).node; + + // Pump a fresh CoachMessageContent instance with the SAME text at the + // same tree location: no key change means the existing State is + // reused and didUpdateWidget genuinely fires, forcing a real build() + // — unlike a bare `tester.pump()`, which doesn't mark anything dirty + // and so can't distinguish "memoized" from "never rebuilds at all". + await pump(tester, dashboard); + final second = tester.widget(find.byType(A2UiRenderer)).node; + + expect(identical(first, second), isTrue); + }); + }); +} diff --git a/workout-logger/test/screens/ai_coach_screen_full_test.dart b/workout-logger/test/screens/ai_coach_screen_full_test.dart new file mode 100644 index 0000000..775e1e7 --- /dev/null +++ b/workout-logger/test/screens/ai_coach_screen_full_test.dart @@ -0,0 +1,81 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/ai_coach_screen.dart'; +import 'package:repforge/services/ai/gemini_ai_service.dart'; + +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/managers/pr_manager.dart'; + +import '../test_utils/mock_storage_service.dart'; +import '../test_utils/mock_ml_service.dart'; +import '../test_utils/test_robot.dart'; + +void main() { + late MockStorageService storage; + late GeminiAiService aiService; + late WorkoutProvider workoutProvider; + late PRManager prManager; + + late SettingsProvider settingsProvider; + + setUp(() async { + storage = MockStorageService(); + aiService = GeminiAiService(storage: storage); + workoutProvider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + ); + prManager = PRManager(storage); + + settingsProvider = SettingsProvider(storage); + + await workoutProvider.init(); + await prManager.load(); + await settingsProvider.init(); + }); + + group('AiCoachScreen Full Suite', () { + testWidgets('Renders unconfigured no-key state when API key missing', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const AiCoachScreen(), + storage: storage, + workoutProvider: workoutProvider, + geminiAiService: aiService, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(AiCoachScreen); + expect(find.text('API Key Required'), findsOneWidget); + }); + + testWidgets('Renders configured state and prompt suggestions when API key present', (tester) async { + final robot = TestRobot(tester); + + aiService.init('valid_mock_api_key'); + + await robot.pumpScreen( + const AiCoachScreen(seedPrompt: 'How can I improve my Bench Press?'), + storage: storage, + workoutProvider: workoutProvider, + geminiAiService: aiService, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(AiCoachScreen); + expect(find.byType(TextField), findsOneWidget); + + final sendIcon = find.byIcon(Icons.arrow_upward_rounded); + if (sendIcon.evaluate().isNotEmpty) { + await tester.tap(sendIcon); + await tester.pump(); + } + + expect(tester.takeException(), isNull); + }); + }); +} diff --git a/workout-logger/test/screens/ai_coach_screen_test.dart b/workout-logger/test/screens/ai_coach_screen_test.dart new file mode 100644 index 0000000..0b30e59 --- /dev/null +++ b/workout-logger/test/screens/ai_coach_screen_test.dart @@ -0,0 +1,35 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/ai_coach_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import '../test_utils/mock_storage_service.dart'; +import '../test_utils/mock_ml_service.dart'; +import '../test_utils/test_harness.dart'; + +void main() { + testWidgets('Renders AiCoachScreen with prompt banner when API key missing', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final storage = MockStorageService(); + final settings = SettingsProvider(storage); + await settings.init(); + + final workout = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await workout.init(); + + await tester.pumpWidget(TestHarness.wrap( + const AiCoachScreen(), + storage: storage, + settingsProvider: settings, + workoutProvider: workout, + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.text('AI Coach'), findsOneWidget); + // When no API key is configured, the screen renders _buildNoKeyState + // which contains an RFEmptyState with title 'API Key Required'. + expect(find.text('API Key Required'), findsOneWidget); + }); +} diff --git a/workout-logger/test/screens/ai_program_generator_screen_test.dart b/workout-logger/test/screens/ai_program_generator_screen_test.dart new file mode 100644 index 0000000..77aaec2 --- /dev/null +++ b/workout-logger/test/screens/ai_program_generator_screen_test.dart @@ -0,0 +1,34 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/ai_program_generator_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import '../test_utils/mock_storage_service.dart'; +import '../test_utils/mock_ml_service.dart'; +import '../test_utils/test_harness.dart'; + +void main() { + testWidgets('Renders AiProgramGeneratorScreen title and suggestion chips', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final storage = MockStorageService(); + final workout = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await workout.init(); + + await tester.pumpWidget(TestHarness.wrap( + const AiProgramGeneratorScreen(), + storage: storage, + workoutProvider: workout, + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.text('AI Program Generator'), findsOneWidget); + + final suggestionChip = find.text('12-week hypertrophy, 4 days/week, push-pull-legs-upper'); + expect(suggestionChip, findsWidgets); + + await tester.tap(suggestionChip.first); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + }); +} diff --git a/workout-logger/test/screens/ai_settings_section_test.dart b/workout-logger/test/screens/ai_settings_section_test.dart new file mode 100644 index 0000000..cac7f87 --- /dev/null +++ b/workout-logger/test/screens/ai_settings_section_test.dart @@ -0,0 +1,62 @@ +// Widget tests for the Gemini model dropdown + thinking-level slider in +// AiSettingsSection. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:provider/provider.dart'; +import 'package:repforge/screens/widgets/profile_sections.dart'; +import 'package:repforge/services/ai/gemini_ai_service.dart'; +import 'package:repforge/services/settings_provider.dart'; +import '../test_utils/mock_storage_service.dart'; + +Widget _wrap(SettingsProvider settings, GeminiAiService gemini) { + return MultiProvider( + providers: [ + ChangeNotifierProvider.value(value: settings), + ChangeNotifierProvider.value(value: gemini), + ], + child: const MaterialApp( + home: Scaffold(body: SingleChildScrollView(child: AiSettingsSection())), + ), + ); +} + +void main() { + late SettingsProvider settings; + late GeminiAiService gemini; + + setUp(() async { + settings = SettingsProvider(MockStorageService()); + await settings.init(); + gemini = GeminiAiService(); + }); + + testWidgets('model picker is a dropdown showing the current model', (tester) async { + await tester.pumpWidget(_wrap(settings, gemini)); + await tester.pumpAndSettle(); + + expect(find.byType(DropdownButtonFormField), findsOneWidget); + expect(find.text('Gemini 3.6 Flash'), findsOneWidget); + }); + + testWidgets('selecting gemini-3.7-flash from the dropdown clamps the thinking-level slider off minimal', (tester) async { + await settings.setGeminiThinkingLevel('minimal'); + await tester.pumpWidget(_wrap(settings, gemini)); + await tester.pumpAndSettle(); + + await tester.tap(find.byType(DropdownButtonFormField)); + await tester.pumpAndSettle(); + await tester.tap(find.text('Gemini 3.7 Flash').last); + await tester.pumpAndSettle(); + + expect(settings.geminiThinkingLevel, 'low'); + }); + + testWidgets('thinking-level slider is hidden for gemini-2.5-flash', (tester) async { + await settings.setGeminiModel('gemini-2.5-flash'); + await tester.pumpWidget(_wrap(settings, gemini)); + await tester.pumpAndSettle(); + + expect(find.text('THINKING LEVEL'), findsNothing); + }); +} diff --git a/workout-logger/test/screens/edit_workout_session_screen_test.dart b/workout-logger/test/screens/edit_workout_session_screen_test.dart new file mode 100644 index 0000000..d585541 --- /dev/null +++ b/workout-logger/test/screens/edit_workout_session_screen_test.dart @@ -0,0 +1,135 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/edit_workout_session_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import '../test_utils/mock_storage_service.dart'; +import '../test_utils/mock_ml_service.dart'; +import '../test_utils/test_fixtures.dart'; +import '../test_utils/test_robot.dart'; + +Future _createProvider(MockStorageService storage, {List sessions = const []}) async { + for (final s in sessions) { + await storage.saveWorkoutSession(s); + } + final provider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + ); + await provider.init(); + return provider; +} + +void main() { + testWidgets('Renders EditWorkoutSessionScreen with session details', (WidgetTester tester) async { + final robot = TestRobot(tester); + final storage = MockStorageService(); + final session = TestFixtures.sampleSession(notes: 'Feeling strong today'); + final provider = await _createProvider(storage, sessions: [session]); + + await robot.pumpScreen( + EditWorkoutSessionScreen(session: session), + storage: storage, + workoutProvider: provider, + ); + + robot.expectVisible('Edit Workout'); + robot.expectVisible('Feeling strong today'); + }); + + testWidgets('Adds a set to an existing exercise', (WidgetTester tester) async { + final robot = TestRobot(tester); + final storage = MockStorageService(); + final session = TestFixtures.sampleSession(); + final provider = await _createProvider(storage, sessions: [session]); + + await robot.pumpScreen( + EditWorkoutSessionScreen(session: session), + storage: storage, + workoutProvider: provider, + ); + + // Count set-delete icons before adding (fixture has 3 sets total = 3 close icons). + final initialCount = find.byIcon(Icons.close_rounded).evaluate().length; + + await robot.tap(find.text('Add Set').first); + + // After adding a set, there should be one more close icon. + final updatedCount = find.byIcon(Icons.close_rounded).evaluate().length; + expect(updatedCount, greaterThan(initialCount)); + robot.expectVisible(EditWorkoutSessionScreen); + }); + + testWidgets('Deletes a set from an exercise log', (WidgetTester tester) async { + final robot = TestRobot(tester); + final storage = MockStorageService(); + final session = TestFixtures.sampleSession(); + final provider = await _createProvider(storage, sessions: [session]); + + await robot.pumpScreen( + EditWorkoutSessionScreen(session: session), + storage: storage, + workoutProvider: provider, + ); + + // Count set-delete icons before deletion (fixture has 3 sets total = 3 close icons). + final initialCount = find.byIcon(Icons.close_rounded).evaluate().length; + expect(initialCount, greaterThan(0)); + + await robot.tap(find.byIcon(Icons.close_rounded).first); + + // After deletion, one fewer close icon should be visible. + final updatedCount = find.byIcon(Icons.close_rounded).evaluate().length; + expect(updatedCount, lessThan(initialCount)); + }); + + testWidgets('Edits session notes and saves session', (WidgetTester tester) async { + final robot = TestRobot(tester); + final storage = MockStorageService(); + final session = TestFixtures.sampleSession(); + final provider = await _createProvider(storage, sessions: [session]); + + await robot.pumpScreen( + EditWorkoutSessionScreen(session: session), + storage: storage, + workoutProvider: provider, + ); + + await robot.fill('Sample session notes', 'Updated workout session note'); + await robot.tap('Save'); + + // Verify in-memory provider update. + final updated = provider.sessions.firstWhere((s) => s.id == session.id); + expect(updated.notes, equals('Updated workout session note')); + + // Verify persistence through storage. + final persisted = await storage.getWorkoutSession(session.id); + expect(persisted, isNotNull); + expect(persisted!.notes, equals('Updated workout session note')); + }); + + testWidgets('Shows discard dialog on back navigation when modified', (WidgetTester tester) async { + final robot = TestRobot(tester); + final storage = MockStorageService(); + final session = TestFixtures.sampleSession(); + final provider = await _createProvider(storage, sessions: [session]); + + await robot.pumpScreen( + EditWorkoutSessionScreen(session: session), + storage: storage, + workoutProvider: provider, + ); + + await robot.fill('45', '90'); + await robot.handlePop(); + + robot.expectVisible('Discard Changes?'); + await robot.tap('Discard'); + + // After confirming discard, the dialog and the edit screen should both be gone. + robot.expectNotVisible('Discard Changes?'); + robot.expectNotVisible(EditWorkoutSessionScreen); + }); +} diff --git a/workout-logger/test/screens/exercise_input_section_text_scale_test.dart b/workout-logger/test/screens/exercise_input_section_text_scale_test.dart new file mode 100644 index 0000000..d739b34 --- /dev/null +++ b/workout-logger/test/screens/exercise_input_section_text_scale_test.dart @@ -0,0 +1,165 @@ +// Guards the set-entry UI against large system font sizes. A reader running +// Android's bigger-font settings was seeing the weight value clipped inside +// its own field and the assisted-load line run off the edge of its pill. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/widgets/exercise_input_section.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/theme/app_theme.dart'; + +import '../test_utils/mock_storage_service.dart'; + +/// Screen widths worth covering: a small phone, the common ~411dp phone, and a +/// tablet-ish width. +const _widths = [360, 411, 720]; + +/// 1.0 is the default; 1.35 is roughly the reported device; 2.0 is the largest +/// font size Android's accessibility settings offer. +const _textScales = [1.0, 1.35, 2.0]; + +void main() { + late SettingsProvider settings; + + setUp(() async { + settings = SettingsProvider(MockStorageService()); + await settings.init(); + }); + + Widget harness({ + required double width, + required double textScale, + required double weight, + String? exerciseId, + }) { + return MediaQuery( + data: MediaQueryData( + size: Size(width, 900), + textScaler: TextScaler.linear(textScale), + ), + child: MaterialApp( + theme: AppTheme.darkTheme, + home: Scaffold( + body: SizedBox( + width: width, + height: 900, + // Mirrors WorkoutFlowScreen: a scroll view tall enough for the + // section's Spacer to have something to absorb. + child: LayoutBuilder( + builder: (context, constraints) => SingleChildScrollView( + padding: const EdgeInsets.all(AppSpacing.md), + child: ConstrainedBox( + constraints: BoxConstraints( + minHeight: constraints.maxHeight - AppSpacing.md * 2, + ), + child: IntrinsicHeight( + child: ExerciseInputSection( + contentWidth: + constraints.maxWidth - AppSpacing.md * 2, + currentWeight: weight, + currentReps: 12, + isDropset: false, + drops: const [], + mainWeightController: TextEditingController(), + mainRepsController: TextEditingController(), + dropWeightControllers: const [], + dropRepsControllers: const [], + recommendations: [ + SetRecommendation( + weight: 19, + reps: 14, + confidence: 'high', + reasoning: 'test', + ), + ], + previousSets: const [], + lastSession: null, + settings: settings, + exerciseId: exerciseId, + onWeightChanged: (_) {}, + onRepsChanged: (_) {}, + onDropsetToggled: (_) {}, + onDropAdded: () {}, + onDropRemoved: (_) {}, + onDropWeightChanged: (_, _) {}, + onDropRepsChanged: (_, _) {}, + onApplyRecommendation: () {}, + ), + ), + ), + ), + ), + ), + ), + ), + ); + } + + group('ExerciseInputSection lays out without overflow', () { + for (final width in _widths) { + for (final scale in _textScales) { + testWidgets('${width.toInt()}dp at ${scale}x text scale', + (tester) async { + tester.view.physicalSize = Size(width, 900); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.reset); + + // A three-digit weight is the widest the field ever has to show. + await tester.pumpWidget(harness( + width: width, + textScale: scale, + weight: 102.5, + exerciseId: 'pull_ups', + )); + await tester.pump(); + + expect(tester.takeException(), isNull); + }); + } + } + }); + + group('value text is fitted rather than clipped', () { + testWidgets('a three-digit weight paints inside its field', (tester) async { + tester.view.physicalSize = const Size(411, 900); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.reset); + + await tester.pumpWidget(harness( + width: 411, + textScale: 1.35, + weight: 102.5, + )); + await tester.pump(); + + final field = find.widgetWithText(TextField, '102.5'); + expect(field, findsOneWidget); + + final fieldWidth = tester.getSize(field).width; + final style = tester.widget(field).style!; + final painter = TextPainter( + text: TextSpan(text: '102.5', style: style), + textDirection: TextDirection.ltr, + textScaler: const TextScaler.linear(1.35), + )..layout(); + + expect(painter.width, lessThanOrEqualTo(fieldWidth)); + // Still shrunk only as far as it had to be. + expect(style.fontSize, greaterThanOrEqualTo(18.0)); + }); + + testWidgets('a short value keeps the full display size', (tester) async { + tester.view.physicalSize = const Size(411, 900); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.reset); + + await tester.pumpWidget(harness(width: 411, textScale: 1.0, weight: 20)); + await tester.pump(); + + final field = find.widgetWithText(TextField, '20.0'); + expect(field, findsOneWidget); + expect(tester.widget(field).style!.fontSize, 36.0); + }); + }); +} diff --git a/workout-logger/test/screens/heart_rate_detail_screen_test.dart b/workout-logger/test/screens/heart_rate_detail_screen_test.dart new file mode 100644 index 0000000..cb79353 --- /dev/null +++ b/workout-logger/test/screens/heart_rate_detail_screen_test.dart @@ -0,0 +1,25 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/heart_rate_detail_screen.dart'; +import '../test_utils/test_harness.dart'; + +void main() { + testWidgets('Renders HeartRateDetailScreen title and granularities', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + await tester.pumpWidget(TestHarness.wrap( + HeartRateDetailScreen(initialDate: DateTime(2026, 5, 10)), + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.byType(HeartRateDetailScreen), findsOneWidget); + // The screen renders its title and granularity tab controls via HealthDetailShell. + expect(find.text('Heart rate'), findsOneWidget); + expect( + find.text('Day').evaluate().isNotEmpty || + find.text('Week').evaluate().isNotEmpty, + isTrue, + reason: 'HealthDetailShell should render granularity controls', + ); + }); +} diff --git a/workout-logger/test/screens/history_screen_test.dart b/workout-logger/test/screens/history_screen_test.dart new file mode 100644 index 0000000..208dcaa --- /dev/null +++ b/workout-logger/test/screens/history_screen_test.dart @@ -0,0 +1,73 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/history_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/managers/history_manager.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import '../test_utils/mock_storage_service.dart'; +import '../test_utils/mock_ml_service.dart'; +import '../test_utils/test_fixtures.dart'; +import '../test_utils/test_harness.dart'; + +void main() { + testWidgets('Renders HistoryScreen title and empty history state', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final storage = MockStorageService(); + final workout = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await workout.init(); + + final historyManager = HistoryManager(storage); + await historyManager.loadSessions(); + + await tester.pumpWidget(TestHarness.wrap( + const HistoryScreen(), + storage: storage, + workoutProvider: workout, + historyManager: historyManager, + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.byType(HistoryScreen), findsOneWidget); + // With no sessions, the empty-history state is shown. + expect( + find.textContaining('No').evaluate().isNotEmpty || + find.textContaining('empty').evaluate().isNotEmpty || + find.textContaining('history').evaluate().isNotEmpty, + isTrue, + reason: 'Empty history state should be visible', + ); + }); + + testWidgets('Displays session item in history list', (WidgetTester tester) async { + const viewportSize = Size(800, 1800); + tester.view.physicalSize = viewportSize; + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.resetPhysicalSize); + + await TestHarness.prepareTester(tester, size: viewportSize); + + final storage = MockStorageService(); + final session = TestFixtures.sampleSession(date: DateTime.now(), notes: 'Morning Leg Workout'); + await storage.saveWorkoutSession(session); + + final workout = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await workout.init(); + + final historyManager = HistoryManager(storage); + await historyManager.loadSessions(); + + await tester.pumpWidget(TestHarness.wrap( + const HistoryScreen(), + storage: storage, + workoutProvider: workout, + historyManager: historyManager, + viewportSize: viewportSize, + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.text('Quick Workout'), findsOneWidget); + }); +} diff --git a/workout-logger/test/screens/home_screen_test.dart b/workout-logger/test/screens/home_screen_test.dart new file mode 100644 index 0000000..6aa7ace --- /dev/null +++ b/workout-logger/test/screens/home_screen_test.dart @@ -0,0 +1,65 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/home_screen.dart'; +import 'package:repforge/screens/routines_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import '../test_utils/mock_storage_service.dart'; +import '../test_utils/mock_ml_service.dart'; +import '../test_utils/test_harness.dart'; + +void main() { + testWidgets('Renders HomeScreen with navigation bar items', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final storage = MockStorageService(); + final settings = SettingsProvider(storage); + await settings.init(); + + final workout = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await workout.init(); + + await tester.pumpWidget(TestHarness.wrap( + const HomeScreen(), + storage: storage, + workoutProvider: workout, + settingsProvider: settings, + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.text('Home'), findsOneWidget); + expect(find.byIcon(Icons.layers_rounded), findsOneWidget); + expect(find.byIcon(Icons.history_rounded), findsOneWidget); + expect(find.byIcon(Icons.bar_chart_rounded), findsOneWidget); + }); + + testWidgets('Switches tabs when floating nav bar item is tapped', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final storage = MockStorageService(); + final settings = SettingsProvider(storage); + await settings.init(); + + final workout = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await workout.init(); + + await tester.pumpWidget(TestHarness.wrap( + const HomeScreen(), + storage: storage, + workoutProvider: workout, + settingsProvider: settings, + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + // Tap Routines tab (Icons.layers_rounded) + await tester.tap(find.byIcon(Icons.layers_rounded)); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + // RoutinesScreen should be displayed in IndexedStack + expect(find.byType(RoutinesScreen), findsOneWidget); + }); +} diff --git a/workout-logger/test/screens/onboarding_screen_test.dart b/workout-logger/test/screens/onboarding_screen_test.dart new file mode 100644 index 0000000..aad5b44 --- /dev/null +++ b/workout-logger/test/screens/onboarding_screen_test.dart @@ -0,0 +1,30 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/onboarding_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import '../test_utils/mock_storage_service.dart'; +import '../test_utils/mock_ml_service.dart'; +import '../test_utils/test_robot.dart'; + +void main() { + testWidgets('Renders WelcomePage welcome page', (WidgetTester tester) async { + final robot = TestRobot(tester); + final storage = MockStorageService(); + final settings = SettingsProvider(storage); + await settings.init(); + + final workout = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await workout.init(); + + await robot.pumpScreen( + WelcomePage(onComplete: () {}), + storage: storage, + settingsProvider: settings, + workoutProvider: workout, + ); + + robot.expectVisible(WelcomePage); + expect(find.textContaining('RepForge'), findsWidgets); + }); +} diff --git a/workout-logger/test/screens/profile_screen_full_test.dart b/workout-logger/test/screens/profile_screen_full_test.dart new file mode 100644 index 0000000..0de1a63 --- /dev/null +++ b/workout-logger/test/screens/profile_screen_full_test.dart @@ -0,0 +1,60 @@ + +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/profile_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; + +import '../test_utils/mock_storage_service.dart'; +import '../test_utils/mock_ml_service.dart'; + +import '../test_utils/test_robot.dart'; + +void main() { + late MockStorageService storage; + late WorkoutProvider workoutProvider; + late SettingsProvider settingsProvider; + + setUp(() async { + storage = MockStorageService(); + settingsProvider = SettingsProvider(storage); + workoutProvider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + ); + + await workoutProvider.init(); + await settingsProvider.init(); + }); + + group('ProfileScreen Full Test Suite', () { + testWidgets('Renders ProfileScreen, toggles weight units, and opens clear data confirmation dialog', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const ProfileScreen(), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(ProfileScreen); + + // Toggle weight unit chips + final kgBtn = find.text('kg'); + if (kgBtn.evaluate().isNotEmpty) { + await tester.tap(kgBtn); + await tester.pumpAndSettle(); + } + + final lbsBtn = find.text('lbs'); + if (lbsBtn.evaluate().isNotEmpty) { + await tester.tap(lbsBtn); + await tester.pumpAndSettle(); + } + + expect(tester.takeException(), isNull); + }); + }); +} diff --git a/workout-logger/test/screens/profile_screen_test.dart b/workout-logger/test/screens/profile_screen_test.dart new file mode 100644 index 0000000..f8569e9 --- /dev/null +++ b/workout-logger/test/screens/profile_screen_test.dart @@ -0,0 +1,57 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/profile_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import '../test_utils/mock_storage_service.dart'; +import '../test_utils/mock_ml_service.dart'; +import '../test_utils/test_robot.dart'; + +void main() { + testWidgets('Renders ProfileScreen with sections', (WidgetTester tester) async { + final robot = TestRobot(tester); + final storage = MockStorageService(); + final settings = SettingsProvider(storage); + await settings.init(); + + final workout = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await workout.init(); + + await robot.pumpScreen( + const ProfileScreen(), + storage: storage, + settingsProvider: settings, + workoutProvider: workout, + ); + + robot.expectVisible('Preferences'); + robot.expectVisible('Data Management'); + + await tester.drag(find.byType(CustomScrollView), const Offset(0, -800)); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + robot.expectVisible('About'); + }); + + testWidgets('Toggles weight unit preference', (WidgetTester tester) async { + final robot = TestRobot(tester); + final storage = MockStorageService(); + final settings = SettingsProvider(storage); + await settings.init(); + + final workout = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await workout.init(); + + await robot.pumpScreen( + const ProfileScreen(), + storage: storage, + settingsProvider: settings, + workoutProvider: workout, + ); + + await robot.tap('lbs'); + expect(settings.weightUnit, equals(WeightUnit.lbs)); + }); +} diff --git a/workout-logger/test/screens/programs/program_designer_screen_test.dart b/workout-logger/test/screens/programs/program_designer_screen_test.dart new file mode 100644 index 0000000..45c44d9 --- /dev/null +++ b/workout-logger/test/screens/programs/program_designer_screen_test.dart @@ -0,0 +1,88 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/programs/program_designer_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import '../../test_utils/mock_storage_service.dart'; +import '../../test_utils/mock_ml_service.dart'; +import '../../test_utils/test_harness.dart'; + +Future _createProvider() async { + final storage = MockStorageService(); + final provider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + ); + await provider.init(); + return provider; +} + +void main() { + testWidgets('Renders Step 1 metadata controls in ProgramDesignerScreen', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final provider = await _createProvider(); + + await tester.pumpWidget(TestHarness.wrap( + const ProgramDesignerScreen(), + workoutProvider: provider, + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.text('New Program'), findsOneWidget); + expect(find.text('PROGRAM DETAILS'), findsOneWidget); + expect(find.text('Step 1 of 3'), findsOneWidget); + expect(find.text('Next'), findsOneWidget); + }); + + testWidgets('Shows validation error if program name is empty on Next', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final provider = await _createProvider(); + + await tester.pumpWidget(TestHarness.wrap( + const ProgramDesignerScreen(), + workoutProvider: provider, + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + // Tap Next without filling program name + await tester.tap(find.text('Next')); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + // Step 1 stays active because name is empty + expect(find.text('Step 1 of 3'), findsOneWidget); + // The validation SnackBar is shown + expect(find.text('Enter a program name to continue'), findsOneWidget); + }); + + testWidgets('Enters program name and navigates to Step 2', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final provider = await _createProvider(); + + await tester.pumpWidget(TestHarness.wrap( + const ProgramDesignerScreen(), + workoutProvider: provider, + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + // Enter Program Name + final nameField = find.widgetWithText(TextField, 'Program Name *'); + await tester.enterText(nameField, 'Hypertrophy 101'); + await tester.pump(); + + // Tap Next + await tester.tap(find.text('Next')); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.text('Step 2 of 3'), findsOneWidget); + expect(find.text('WEEKS & DAYS'), findsOneWidget); + }); +} diff --git a/workout-logger/test/screens/programs/programs_screens_test.dart b/workout-logger/test/screens/programs/programs_screens_test.dart new file mode 100644 index 0000000..227092b --- /dev/null +++ b/workout-logger/test/screens/programs/programs_screens_test.dart @@ -0,0 +1,78 @@ +import 'dart:convert'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/programs/import_program_screen.dart'; +import 'package:repforge/screens/programs/programs_screen.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/workout_provider.dart'; +import '../../test_utils/mock_storage_service.dart'; +import '../../test_utils/mock_ml_service.dart'; +import '../../test_utils/test_robot.dart'; + +void main() { + testWidgets('Renders ProgramsScreen list and empty state', (WidgetTester tester) async { + final robot = TestRobot(tester); + final storage = MockStorageService(); + final workout = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await workout.init(); + + await robot.pumpScreen( + const ProgramsScreen(), + storage: storage, + workoutProvider: workout, + ); + + robot.expectVisible(ProgramsScreen); + + final fab = find.byType(FloatingActionButton); + expect(fab, findsWidgets); + await robot.tap(fab.first); + }); + + testWidgets('Renders ImportProgramScreen, validates valid program JSON', (WidgetTester tester) async { + final robot = TestRobot(tester); + final storage = MockStorageService(); + final workout = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await workout.init(); + + await robot.pumpScreen( + const ImportProgramScreen(), + storage: storage, + workoutProvider: workout, + ); + + robot.expectVisible(ImportProgramScreen); + + final validJson = jsonEncode({ + 'id': 'prog_custom_1', + 'name': 'Custom Powerlifting 4-Week', + 'description': 'Heavy compound lifting', + 'totalWeeks': 4, + 'phases': [], + 'daysPerWeek': 4, + 'weeks': [ + { + 'weekNumber': 1, + 'days': [ + { + 'dayNumber': 1, + 'name': 'Bench Day', + 'exercises': [ + {'exerciseId': 'bench_press', 'targetSets': 4, 'targetReps': 5} + ] + } + ] + } + ] + }); + + final textField = find.byType(TextField); + expect(textField, findsOneWidget); + await robot.fill(textField.first, validJson); + + final validateBtn = find.text('Validate'); + expect(validateBtn, findsOneWidget); + await robot.tap(validateBtn); + await tester.pumpAndSettle(); + }); +} diff --git a/workout-logger/test/screens/rf_action_sheet_text_scale_test.dart b/workout-logger/test/screens/rf_action_sheet_text_scale_test.dart new file mode 100644 index 0000000..4d6c90b --- /dev/null +++ b/workout-logger/test/screens/rf_action_sheet_text_scale_test.dart @@ -0,0 +1,112 @@ +// Guards showRFActionSheet against large system font sizes and short +// viewports. showModalBottomSheet defaults to isScrollControlled: false, which +// caps the sheet at 9/16 of the viewport — enough that a three-action sheet +// with descriptions clipped its last action, with no way to scroll to it. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/widgets/rf_dialogs.dart'; +import 'package:repforge/theme/app_theme.dart'; + +/// 1.0 is the default; 2.0 is the largest Android's accessibility settings +/// offer. 400x640 is a short viewport, where the 9/16 cap bites hardest. +const _textScales = [1.0, 1.35, 2.0]; +const _viewport = Size(400, 640); + +enum _Choice { save, discard, cancel } + +void main() { + Future openSheet(WidgetTester tester, double textScale) async { + await tester.pumpWidget( + MediaQuery( + data: MediaQueryData( + size: _viewport, + textScaler: TextScaler.linear(textScale), + ), + child: MaterialApp( + theme: AppTheme.darkTheme, + home: Scaffold( + body: Builder( + builder: (context) => Center( + child: ElevatedButton( + onPressed: () => showRFActionSheet<_Choice>( + context, + title: 'Leave this workout?', + message: + 'You have unsaved sets in this session. Choose what ' + 'to do with them before you go.', + actions: const [ + RFAction( + label: 'Save and leave', + value: _Choice.save, + description: + 'Finish the workout here and keep every set you ' + 'have logged so far.', + isPrimary: true, + ), + RFAction( + label: 'Discard workout', + value: _Choice.discard, + description: + 'Throw away this session and everything logged ' + 'in it. This cannot be undone.', + isDanger: true, + ), + RFAction(label: 'Keep going', value: _Choice.cancel), + ], + ), + child: const Text('open'), + ), + ), + ), + ), + ), + ), + ); + + await tester.tap(find.text('open')); + await tester.pumpAndSettle(); + } + + for (final scale in _textScales) { + testWidgets('action sheet lays out without overflow at ${scale}x text', + (tester) async { + tester.view.physicalSize = _viewport; + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.reset); + + await openSheet(tester, scale); + + // A RenderFlex overflow is reported as a FlutterError during layout, so + // reaching this point with a clean exception state is the assertion. + expect(tester.takeException(), isNull); + expect(find.text('Leave this workout?'), findsOneWidget); + }); + + testWidgets('every action stays reachable at ${scale}x text', + (tester) async { + tester.view.physicalSize = _viewport; + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.reset); + + await openSheet(tester, scale); + + // The last action is the one the 9/16 cap used to cut off. Scroll it + // into view rather than asserting it is already visible: the sheet is + // legitimately taller than the viewport at 2.0x. + final lastAction = find.text('Keep going'); + await tester.scrollUntilVisible( + lastAction, + 80, + scrollable: find.byType(Scrollable).last, + ); + expect(lastAction, findsOneWidget); + + await tester.tap(lastAction); + await tester.pumpAndSettle(); + + // Tapping it dismissed the sheet, so it was genuinely hittable. + expect(find.text('Leave this workout?'), findsNothing); + }); + } +} diff --git a/workout-logger/test/screens/sleep_detail_screen_test.dart b/workout-logger/test/screens/sleep_detail_screen_test.dart new file mode 100644 index 0000000..9126f4d --- /dev/null +++ b/workout-logger/test/screens/sleep_detail_screen_test.dart @@ -0,0 +1,17 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/sleep_detail_screen.dart'; +import '../test_utils/test_harness.dart'; + +void main() { + testWidgets('Renders SleepDetailScreen title and granularities', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + await tester.pumpWidget(TestHarness.wrap( + SleepDetailScreen(initialDate: DateTime(2026, 5, 10)), + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.text('Sleep'), findsOneWidget); + }); +} diff --git a/workout-logger/test/screens/widgets/editable_exercise_card_full_test.dart b/workout-logger/test/screens/widgets/editable_exercise_card_full_test.dart new file mode 100644 index 0000000..a1e5b00 --- /dev/null +++ b/workout-logger/test/screens/widgets/editable_exercise_card_full_test.dart @@ -0,0 +1,73 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/widgets/editable_exercise_card.dart'; + +import '../../test_utils/mock_storage_service.dart'; +import '../../test_utils/test_harness.dart'; + +void main() { + late MockStorageService storage; + + setUp(() { + storage = MockStorageService(); + }); + + group('EditableExerciseCard Widget Tests', () { + testWidgets('Renders exercise name, set rows, dropsets, and handles actions', (tester) async { + final log = EditableExerciseLog( + exerciseId: 'bench_press', + sets: [ + EditableSet( + weight: 100, + reps: 10, + timestamp: DateTime.now(), + ), + EditableSet( + weight: 90, + reps: 8, + isDropset: true, + drops: [DropsetEntry(weight: 70, reps: 6)], + timestamp: DateTime.now(), + ), + ], + ); + + bool setAdded = false; + + final widget = TestHarness.wrap( + Scaffold( + body: EditableExerciseCard( + exerciseName: 'Bench Press', + editableLog: log, + onSetChanged: ({ + required int setIndex, + required double weight, + required int reps, + required bool isDropset, + List? drops, + }) {}, + onAddSet: () => setAdded = true, + onDeleteSet: (idx) {}, + onDeleteExercise: () {}, + ), + ), + storage: storage, + ); + + await tester.pumpWidget(widget); + await tester.pumpAndSettle(); + + expect(find.text('Bench Press'), findsOneWidget); + + // Tap + Add Set + final addSetBtn = find.text('+ Add Set'); + if (addSetBtn.evaluate().isNotEmpty) { + await tester.tap(addSetBtn); + expect(setAdded, isTrue); + } + + expect(tester.takeException(), isNull); + }); + }); +} diff --git a/workout-logger/test/screens/widgets/health_bar_chart_test.dart b/workout-logger/test/screens/widgets/health_bar_chart_test.dart new file mode 100644 index 0000000..9a98723 --- /dev/null +++ b/workout-logger/test/screens/widgets/health_bar_chart_test.dart @@ -0,0 +1,106 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/sleep_hr_models.dart'; +import 'package:repforge/screens/widgets/health_bar_chart.dart'; +import '../../test_utils/test_harness.dart'; + +void main() { + testWidgets('Renders SleepBarsChart with daily sleep stage data', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final now = DateTime(2026, 5, 10); + final List bars = [ + SleepDayBar( + date: now.subtract(const Duration(days: 2)), + totalMinutes: 480, + deepMin: 90, + remMin: 120, + lightMin: 240, + awakeMin: 30, + ), + SleepDayBar( + date: now.subtract(const Duration(days: 1)), + totalMinutes: 395, + deepMin: 60, + remMin: 90, + lightMin: 200, + awakeMin: 45, + ), + SleepDayBar( + date: now, + totalMinutes: 0, + deepMin: 0, + remMin: 0, + lightMin: 0, + awakeMin: 0, + ), + ]; + + final workoutDays = {'2026-05-08', '2026-05-10'}; + + await tester.pumpWidget(TestHarness.wrap( + SleepBarsChart( + bars: bars, + workoutDays: workoutDays, + ), + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.byType(SleepBarsChart), findsOneWidget); + + // Tap on a bar area to trigger tooltip interaction + await tester.tap(find.byType(SleepBarsChart)); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + }); + + testWidgets('Renders HrRangeChart with heart rate min-max range data', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final now = DateTime(2026, 5, 10); + final List bars = [ + HrRangeBar( + date: now.subtract(const Duration(days: 2)), + label: 'Fri', + minBpm: 55, + maxBpm: 145, + avgBpm: 75.0, + restingBpm: 58, + ), + HrRangeBar( + date: now.subtract(const Duration(days: 1)), + label: 'Sat', + minBpm: 60, + maxBpm: 165, + avgBpm: 82.0, + restingBpm: 62, + ), + HrRangeBar( + date: now, + label: 'Sun', + minBpm: 0, + maxBpm: 0, + avgBpm: 0.0, + restingBpm: null, + ), + ]; + + final workoutDays = {'2026-05-09'}; + + await tester.pumpWidget(TestHarness.wrap( + HrRangeChart( + bars: bars, + workoutDays: workoutDays, + ), + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.byType(HrRangeChart), findsOneWidget); + + // Tap on HrRangeChart to test tap gestures + await tester.tap(find.byType(HrRangeChart)); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + }); +} diff --git a/workout-logger/test/screens/widgets/health_cards_test.dart b/workout-logger/test/screens/widgets/health_cards_test.dart new file mode 100644 index 0000000..b15ab16 --- /dev/null +++ b/workout-logger/test/screens/widgets/health_cards_test.dart @@ -0,0 +1,174 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/models/sleep_hr_models.dart'; +import 'package:repforge/screens/widgets/heart_rate_card.dart'; +import 'package:repforge/screens/widgets/readiness_card.dart'; +import 'package:repforge/screens/widgets/sleep_hr_card.dart'; +import 'package:repforge/services/interfaces/readiness_manager_interface.dart'; +import 'package:repforge/services/managers/readiness_manager.dart'; +import '../../test_utils/mock_storage_service.dart'; +import '../../test_utils/stub_health_connect_service.dart'; +import '../../test_utils/test_harness.dart'; +import 'package:repforge/services/settings_provider.dart'; + +class FakeReadinessManager extends ReadinessManager { + FakeReadinessManager(SettingsProvider settings) + : super(const StubHcService(), MockStorageService(), settings); + + ReadinessStatus _mockStatus = ReadinessStatus.ready; + ReadinessSnapshot? _mockSnapshot; + SleepHrSnapshot? _mockSleepHrSnapshot; + HrDaySnapshot? _mockHrDaySnapshot; + + void setMockData({ + ReadinessStatus status = ReadinessStatus.ready, + ReadinessSnapshot? snapshot, + SleepHrSnapshot? sleepHrSnapshot, + HrDaySnapshot? hrDaySnapshot, + }) { + _mockStatus = status; + _mockSnapshot = snapshot; + _mockSleepHrSnapshot = sleepHrSnapshot; + _mockHrDaySnapshot = hrDaySnapshot; + notifyListeners(); + } + + @override + ReadinessStatus get status => _mockStatus; + + @override + ReadinessSnapshot? get snapshot => _mockSnapshot; + + @override + SleepHrSnapshot? get sleepHrSnapshot => _mockSleepHrSnapshot; + + @override + HrDaySnapshot? get hrDaySnapshot => _mockHrDaySnapshot; +} + +void main() { + late MockStorageService storage; + late SettingsProvider settings; + late FakeReadinessManager readinessManager; + + setUp(() async { + storage = MockStorageService(); + settings = SettingsProvider(storage); + await settings.init(); + readinessManager = FakeReadinessManager(settings); + }); + + Widget wrapWithReadiness(Widget child) { + return TestHarness.wrap( + child, + storage: storage, + settingsProvider: settings, + readinessManager: readinessManager, + ); + } + + testWidgets('Renders ReadinessCard when snapshot score is present', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + readinessManager.setMockData( + status: ReadinessStatus.ready, + snapshot: ReadinessSnapshot( + dateKey: '2026-05-10', + score: 85, + band: ReadinessBand.high, + ), + ); + + await tester.pumpWidget(wrapWithReadiness(const ReadinessCard())); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.byType(ReadinessCard), findsOneWidget); + }); + + testWidgets('Renders SleepHrCard when sleepHrSnapshot is present', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final now = DateTime(2026, 5, 10); + final snapshot = SleepHrSnapshot( + sleepStart: now.subtract(const Duration(hours: 8)), + sleepEnd: now, + p5Bpm: 52, + p95Bpm: 82, + segments: [ + SleepHrSegment( + windowStart: now.subtract(const Duration(hours: 4)), + minBpm: 55, + maxBpm: 65, + avgBpm: 60, + stage: 'deep', + ), + ], + stageStats: [ + const SleepStageStats( + stage: 'deep', + minBpm: 52, + p25Bpm: 55, + avgBpm: 58, + p75Bpm: 62, + maxBpm: 70, + sampleCount: 20, + ), + ], + ); + + readinessManager.setMockData( + status: ReadinessStatus.ready, + sleepHrSnapshot: snapshot, + ); + + await tester.pumpWidget(wrapWithReadiness(const SleepHrCard())); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.byType(SleepHrCard), findsOneWidget); + + // Tap SleepHrCard to trigger sheet opening + await tester.tap(find.byType(SleepHrCard)); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + }); + + testWidgets('Renders HeartRateCard when hrDaySnapshot is present', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final now = DateTime(2026, 5, 10); + final snapshot = HrDaySnapshot( + day: now, + minBpm: 50, + maxBpm: 155, + avgBpm: 72, + restingBpm: 54, + buckets: [ + HrBucket( + windowStart: now.subtract(const Duration(hours: 2)), + minBpm: 60, + maxBpm: 80, + avgBpm: 70, + ), + ], + ); + + readinessManager.setMockData( + status: ReadinessStatus.ready, + hrDaySnapshot: snapshot, + ); + + await tester.pumpWidget(wrapWithReadiness(const HeartRateCard())); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.byType(HeartRateCard), findsOneWidget); + + // Tap HeartRateCard to test navigation + await tester.tap(find.byType(HeartRateCard)); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + }); +} diff --git a/workout-logger/test/screens/widgets/health_widgets_test.dart b/workout-logger/test/screens/widgets/health_widgets_test.dart new file mode 100644 index 0000000..c664276 --- /dev/null +++ b/workout-logger/test/screens/widgets/health_widgets_test.dart @@ -0,0 +1,127 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/sleep_hr_models.dart'; +import 'package:repforge/screens/widgets/sleep_hr_charts.dart'; +import 'package:repforge/screens/widgets/muscle_detail_sheet.dart'; +import 'package:repforge/screens/widgets/health_detail_shell.dart'; +import 'package:repforge/screens/widgets/sparkline_painter.dart'; +import 'package:repforge/screens/widgets/activity_heatmap.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import '../../test_utils/mock_storage_service.dart'; +import '../../test_utils/mock_ml_service.dart'; +import '../../test_utils/test_harness.dart'; + +void main() { + testWidgets('Renders SleepHrDayView overnight chart widget', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final snapshot = SleepHrSnapshot( + sleepStart: DateTime(2026, 5, 10, 0, 0), + sleepEnd: DateTime(2026, 5, 10, 8, 0), + p5Bpm: 54, + p95Bpm: 75, + segments: [ + SleepHrSegment( + windowStart: DateTime(2026, 5, 10, 1, 0), + minBpm: 52, + maxBpm: 65, + avgBpm: 58.0, + stage: 'deep', + ), + SleepHrSegment( + windowStart: DateTime(2026, 5, 10, 3, 0), + minBpm: 55, + maxBpm: 70, + avgBpm: 62.0, + stage: 'rem', + ), + ], + stageStats: const [ + SleepStageStats(stage: 'deep', minBpm: 52, p25Bpm: 55, avgBpm: 58.0, p75Bpm: 62, maxBpm: 65, sampleCount: 12), + SleepStageStats(stage: 'rem', minBpm: 55, p25Bpm: 58, avgBpm: 62.0, p75Bpm: 66, maxBpm: 70, sampleCount: 12), + ], + ); + + await tester.pumpWidget(TestHarness.wrap( + SleepHrDayView(snapshot: snapshot), + )); + await tester.pumpAndSettle(); + + expect(find.textContaining('54 bpm'), findsOneWidget); + }); + + testWidgets('Renders MuscleDetailSheet with muscle breakdown', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final storage = MockStorageService(); + final provider = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await provider.init(); + + await tester.pumpWidget(TestHarness.wrap( + MuscleDetailSheet(muscleId: 'chest', provider: provider), + storage: storage, + workoutProvider: provider, + )); + await tester.pumpAndSettle(); + + expect(find.text('Chest'), findsOneWidget); + }); + + testWidgets('Renders HealthDetailShell container with granularity selection', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + HealthGranularity currentG = HealthGranularity.day; + + await tester.pumpWidget(TestHarness.wrap( + HealthDetailShell( + title: 'Sleep History', + icon: Icons.nightlight_round, + iconColor: Colors.purple, + dateLabel: 'May 10, 2026', + granularity: currentG, + onGranularityChanged: (g) => currentG = g, + onPrev: () {}, + onNext: () {}, + canGoNext: false, + child: const SizedBox(height: 100, child: Text('Child Content')), + ), + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.text('Sleep History'), findsOneWidget); + expect(find.text('May 10, 2026'), findsOneWidget); + expect(find.text('Child Content'), findsOneWidget); + }); + + testWidgets('Renders SparklinePainter canvas', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + await tester.pumpWidget(TestHarness.wrap( + const CustomPaint( + size: Size(100, 30), + painter: SparklinePainter( + data: [10.0, 15.0, 8.0, 20.0, 25.0], + color: Colors.blue, + ), + ), + )); + await tester.pumpAndSettle(); + + expect(find.byType(CustomPaint), findsWidgets); + }); + + testWidgets('Renders ActivityHeatmap canvas', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final activityData = List.filled(98, 2); + + await tester.pumpWidget(TestHarness.wrap( + ActivityHeatmap(data: activityData), + )); + await tester.pumpAndSettle(); + + expect(find.byType(ActivityHeatmap), findsOneWidget); + }); +} diff --git a/workout-logger/test/screens/widgets/profile_sections_health_sync_test.dart b/workout-logger/test/screens/widgets/profile_sections_health_sync_test.dart new file mode 100644 index 0000000..3774852 --- /dev/null +++ b/workout-logger/test/screens/widgets/profile_sections_health_sync_test.dart @@ -0,0 +1,60 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:repforge/screens/widgets/profile_sections.dart'; +import 'package:repforge/services/settings_provider.dart'; + +import '../../test_utils/mock_storage_service.dart'; + +void main() { + testWidgets('Sync now tile appears when readiness is enabled and invokes callback on tap', + (tester) async { + final settings = SettingsProvider(MockStorageService()); + await settings.init(); + await settings.setReadinessEnabled(true); + + var tapped = false; + await tester.pumpWidget(MaterialApp( + home: Scaffold( + body: HealthConnectSection( + settings: settings, + isLoading: false, + onToggle: (_) async {}, + isReadinessLoading: false, + onReadinessToggle: (_) async {}, + isHealthSyncLoading: false, + onHealthSyncNow: () => tapped = true, + ), + ), + )); + await tester.pumpAndSettle(); + + expect(find.text('Sync coach data now'), findsOneWidget); + await tester.tap(find.text('Sync coach data now')); + await tester.pump(); + + expect(tapped, isTrue); + }); + + testWidgets('Sync now tile is hidden when readiness is disabled', (tester) async { + final settings = SettingsProvider(MockStorageService()); + await settings.init(); + + await tester.pumpWidget(MaterialApp( + home: Scaffold( + body: HealthConnectSection( + settings: settings, + isLoading: false, + onToggle: (_) async {}, + isReadinessLoading: false, + onReadinessToggle: (_) async {}, + isHealthSyncLoading: false, + onHealthSyncNow: () {}, + ), + ), + )); + await tester.pumpAndSettle(); + + expect(find.text('Sync coach data now'), findsNothing); + }); +} diff --git a/workout-logger/test/screens/widgets/rf_cards_test.dart b/workout-logger/test/screens/widgets/rf_cards_test.dart new file mode 100644 index 0000000..8677a7a --- /dev/null +++ b/workout-logger/test/screens/widgets/rf_cards_test.dart @@ -0,0 +1,80 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/widgets/rf_cards.dart'; +import '../../test_utils/test_fixtures.dart'; +import '../../test_utils/test_harness.dart'; + +void main() { + testWidgets('Renders SessionCard with exercise details', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final session = TestFixtures.sampleSession(); + + await tester.pumpWidget(TestHarness.wrap( + SessionCard( + session: session, + getExerciseName: (id) => id == 'bench_press' ? 'Bench Press' : 'Squats', + synced: true, + ), + )); + await tester.pumpAndSettle(); + + expect(find.text('Bench Press'), findsOneWidget); + }); + + testWidgets('Renders StatGridCard with counter label', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + await tester.pumpWidget(TestHarness.wrap( + const StatGridCard( + icon: Icons.fitness_center, + value: '125 kg', + label: 'Max Bench', + animate: false, + ), + )); + await tester.pumpAndSettle(); + + expect(find.text('Max Bench'), findsOneWidget); + }); + + testWidgets('Renders RecentSessionTile item', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final session = TestFixtures.sampleSession(); + + await tester.pumpWidget(TestHarness.wrap( + RecentSessionTile( + session: session, + getExerciseName: (id) => 'Bench Press', + ), + )); + await tester.pumpAndSettle(); + + expect(find.textContaining('exercises'), findsOneWidget); + }); + + testWidgets('Renders RoutineCard with action triggers', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final routine = TestFixtures.sampleRoutine(); + bool started = false; + + await tester.pumpWidget(TestHarness.wrap( + RoutineCard( + routine: routine, + getExerciseName: (id) => id, + onStart: () => started = true, + onEdit: () {}, + onDelete: () {}, + ), + )); + await tester.pumpAndSettle(); + + expect(find.text('Upper Body Power'), findsOneWidget); + await tester.tap(find.byIcon(Icons.play_arrow_rounded)); + await tester.pumpAndSettle(); + + expect(started, isTrue); + }); +} diff --git a/workout-logger/test/screens/widgets/rf_dialogs_test.dart b/workout-logger/test/screens/widgets/rf_dialogs_test.dart new file mode 100644 index 0000000..b7e9c72 --- /dev/null +++ b/workout-logger/test/screens/widgets/rf_dialogs_test.dart @@ -0,0 +1,116 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/widgets/rf_dialogs.dart'; + +void main() { + testWidgets('showRFSnackBar displays all snackbar types correctly', (tester) async { + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: Builder( + builder: (context) => Column( + children: [ + ElevatedButton( + onPressed: () => context.showRFSnackBar('Success Toast', type: RFSnackBarType.success), + child: const Text('Success'), + ), + ElevatedButton( + onPressed: () => context.showRFSnackBar('Warning Toast', type: RFSnackBarType.warning), + child: const Text('Warning'), + ), + ElevatedButton( + onPressed: () => context.showRFSnackBar('Error Toast', type: RFSnackBarType.error), + child: const Text('Error'), + ), + ElevatedButton( + onPressed: () => context.showRFSnackBar('Info Toast', type: RFSnackBarType.info), + child: const Text('Info'), + ), + ], + ), + ), + ), + ), + ); + + await tester.tap(find.text('Success')); + await tester.pumpAndSettle(); + expect(find.text('Success Toast'), findsOneWidget); + + await tester.tap(find.text('Warning')); + await tester.pumpAndSettle(); + expect(find.text('Warning Toast'), findsOneWidget); + + await tester.tap(find.text('Error')); + await tester.pumpAndSettle(); + expect(find.text('Error Toast'), findsOneWidget); + + await tester.tap(find.text('Info')); + await tester.pumpAndSettle(); + expect(find.text('Info Toast'), findsOneWidget); + }); + + testWidgets('showRFConfirmDialog renders normal and danger confirmation dialogs', (tester) async { + bool? dangerResult; + bool? cancelResult; + + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: Builder( + builder: (context) => Column( + children: [ + ElevatedButton( + onPressed: () async { + dangerResult = await showRFConfirmDialog( + context, + title: 'Delete Item', + content: 'Are you sure you want to delete?', + isDanger: true, + confirmText: 'Delete', + ); + }, + child: const Text('Open Danger Dialog'), + ), + ElevatedButton( + onPressed: () async { + cancelResult = await showRFConfirmDialog( + context, + title: 'Confirm Action', + content: 'Do you want to proceed?', + isDanger: false, + confirmText: 'Proceed', + ); + }, + child: const Text('Open Normal Dialog'), + ), + ], + ), + ), + ), + ), + ); + + // Test danger confirmation path + await tester.tap(find.text('Open Danger Dialog')); + await tester.pumpAndSettle(); + + expect(find.text('Delete Item'), findsOneWidget); + expect(find.text('Are you sure you want to delete?'), findsOneWidget); + + await tester.tap(find.text('Delete')); + await tester.pumpAndSettle(); + expect(dangerResult, isTrue); + + // Test default non-danger styling path and cancellation behavior + await tester.tap(find.text('Open Normal Dialog')); + await tester.pumpAndSettle(); + + expect(find.text('Confirm Action'), findsOneWidget); + expect(find.text('Do you want to proceed?'), findsOneWidget); + + await tester.tap(find.text('Cancel')); + await tester.pumpAndSettle(); + expect(cancelResult, isFalse); + }); +} diff --git a/workout-logger/test/screens/widgets/rf_shell_test.dart b/workout-logger/test/screens/widgets/rf_shell_test.dart new file mode 100644 index 0000000..368d9ff --- /dev/null +++ b/workout-logger/test/screens/widgets/rf_shell_test.dart @@ -0,0 +1,76 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/widgets/rf_shell.dart'; + +void main() { + // The header cannot measure its children before layout, so a centred title + // is balanced by a counterweight computed from the leading/trailing widths. + // Every widget that sits in the leading run has to be counted, or the title + // drifts by half of whatever was missed. + group('RFScreenHeader centred title', () { + Future pumpHeader( + WidgetTester tester, { + IconData? badgeIcon, + VoidCallback? onBack, + List actions = const [], + }) { + return tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: RFScreenHeader( + title: 'Coach', + badgeIcon: badgeIcon, + onBack: onBack, + actions: actions, + centreTitle: true, + ), + ), + ), + ); + } + + void expectTitleCentred(WidgetTester tester) { + final title = tester.getRect(find.text('Coach')); + final screenWidth = tester.view.physicalSize.width / tester.view.devicePixelRatio; + expect(title.center.dx, moreOrLessEquals(screenWidth / 2, epsilon: 0.5)); + } + + testWidgets('lands on true centre with a badge and one action', ( + tester, + ) async { + await pumpHeader( + tester, + badgeIcon: Icons.auto_awesome_rounded, + actions: [ + RFIconButton(icon: Icons.more_vert_rounded, tooltip: 'More', onTap: () {}), + ], + ); + expectTitleCentred(tester); + }); + + testWidgets('lands on true centre with a back button, badge and action', ( + tester, + ) async { + await pumpHeader( + tester, + badgeIcon: Icons.auto_awesome_rounded, + onBack: () {}, + actions: [ + RFIconButton(icon: Icons.more_vert_rounded, tooltip: 'More', onTap: () {}), + ], + ); + expectTitleCentred(tester); + }); + + testWidgets('lands on true centre with no badge', (tester) async { + await pumpHeader( + tester, + onBack: () {}, + actions: [ + RFIconButton(icon: Icons.more_vert_rounded, tooltip: 'More', onTap: () {}), + ], + ); + expectTitleCentred(tester); + }); + }); +} diff --git a/workout-logger/test/screens/widgets/rf_widgets_test.dart b/workout-logger/test/screens/widgets/rf_widgets_test.dart new file mode 100644 index 0000000..9f8541c --- /dev/null +++ b/workout-logger/test/screens/widgets/rf_widgets_test.dart @@ -0,0 +1,195 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/widgets/rf_widgets.dart'; +import 'package:repforge/theme/app_theme.dart'; + +void main() { + testWidgets('slideRoute creates valid PageRouteBuilder', (tester) async { + final route = slideRoute(const Text('Slide Page')); + expect(route, isA()); + }); + + testWidgets('GlassCard renders child with options', (tester) async { + var tapped = false; + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: GlassCard( + accentBorder: true, + glowColor: Colors.purple, + onTap: () => tapped = true, + semanticsLabel: 'GlassCardButton', + child: const Text('Glass Content'), + ), + ), + ), + ); + + expect(find.text('Glass Content'), findsOneWidget); + await tester.tap(find.text('Glass Content')); + expect(tapped, isTrue); + }); + + testWidgets('AmbientGlow renders glow effect', (tester) async { + await tester.pumpWidget( + const MaterialApp( + home: Scaffold( + body: Stack( + children: [AmbientGlow()], + ), + ), + ), + ); + + expect(find.byType(AmbientGlow), findsOneWidget); + }); + + testWidgets('GlowButton handles tap and disabled state', (tester) async { + var tapped = false; + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: Column( + children: [ + GlowButton( + label: 'Active Button', + icon: Icons.add, + small: true, + onPressed: () => tapped = true, + ), + const GlowButton( + label: 'Disabled Button', + onPressed: null, + ), + ], + ), + ), + ), + ); + + expect(find.text('Active Button'), findsOneWidget); + expect(find.text('Disabled Button'), findsOneWidget); + + await tester.tap(find.text('Active Button')); + await tester.pumpAndSettle(); + expect(tapped, isTrue); + }); + + testWidgets('OutlineGlowButton renders correctly', (tester) async { + var tapped = false; + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: OutlineGlowButton( + label: 'Outline', + icon: Icons.check, + small: true, + fullWidth: true, + onPressed: () => tapped = true, + ), + ), + ), + ); + + expect(find.text('Outline'), findsOneWidget); + await tester.tap(find.text('Outline')); + expect(tapped, isTrue); + }); + + testWidgets('RFChip, RFSectionHeader, RFStatBox render correctly', (tester) async { + await tester.pumpWidget( + const MaterialApp( + home: Scaffold( + body: Column( + children: [ + RFChip(label: 'Chest', small: true), + RFSectionHeader('Workouts', trailing: Text('View all')), + RFStatBox(value: '100', label: 'Volume', delta: 5.0), + RFStatBox(value: '50', label: 'Reps', delta: -2.0), + ], + ), + ), + ), + ); + + expect(find.text('Chest'), findsOneWidget); + expect(find.text('WORKOUTS'), findsOneWidget); + expect(find.text('100'), findsOneWidget); + expect(find.text('50'), findsOneWidget); + }); + + testWidgets('AnimatedCounter, MetricHero, RFDivider, RFEmptyState render correctly', (tester) async { + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: Column( + children: [ + const AnimatedCounter(value: 42.5, decimals: 1, suffix: 'kg'), + const MetricHero(value: '100', unit: 'kg'), + const RFDivider(indent: 16), + RFEmptyState( + icon: Icons.fitness_center, + title: 'No Workouts', + subtitle: 'Add a workout to get started', + action: ElevatedButton(onPressed: () {}, child: const Text('Add')), + ), + ], + ), + ), + ), + ); + + await tester.pumpAndSettle(); + expect(find.text('100'), findsOneWidget); + expect(find.text('No Workouts'), findsOneWidget); + }); + + testWidgets('RFLoadingDots, RFProgressBar, RestTimerRing, SkeletonBox, RFTextField render correctly', (tester) async { + final controller = TextEditingController(); + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: Column( + children: [ + const RFLoadingDots(color: Colors.blue), + const RFProgressBar(value: 0.75, height: 8), + const RestTimerRing(remaining: 90, total: 120), + const SkeletonBox(width: 100, height: 20), + RFTextField( + controller: controller, + hint: 'Enter text', + label: 'Field Label', + prefixIcon: Icons.search, + ), + ], + ), + ), + ), + ); + + expect(find.byType(RFLoadingDots), findsOneWidget); + expect(find.byType(RFProgressBar), findsOneWidget); + expect(find.byType(RestTimerRing), findsOneWidget); + expect(find.text('Field Label'), findsOneWidget); + + final containerBefore = tester.widget( + find.descendant(of: find.byType(RFTextField), matching: find.byType(Container)).first, + ); + final boxDecBefore = containerBefore.decoration as BoxDecoration; + final borderBefore = boxDecBefore.border as Border; + expect(borderBefore.top.color, AppColors.glassBorder); + + await tester.tap(find.byType(TextField)); + await tester.pump(); + + final containerAfter = tester.widget( + find.descendant(of: find.byType(RFTextField), matching: find.byType(Container)).first, + ); + final boxDecAfter = containerAfter.decoration as BoxDecoration; + final borderAfter = boxDecAfter.border as Border; + expect(borderAfter.top.color, AppColors.primary); + + await tester.enterText(find.byType(TextField), 'Test input'); + expect(controller.text, 'Test input'); + }); +} diff --git a/workout-logger/test/screens/widgets/routine_creator_test.dart b/workout-logger/test/screens/widgets/routine_creator_test.dart new file mode 100644 index 0000000..5347851 --- /dev/null +++ b/workout-logger/test/screens/widgets/routine_creator_test.dart @@ -0,0 +1,61 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/widgets/routine_creator.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/workout_provider.dart'; +import '../../test_utils/mock_storage_service.dart'; +import '../../test_utils/mock_ml_service.dart'; +import '../../test_utils/test_robot.dart'; + +void main() { + testWidgets('Renders CreateRoutineScreen and creates new routine', (WidgetTester tester) async { + final robot = TestRobot(tester); + final storage = MockStorageService(); + final provider = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await provider.init(); + + await robot.pumpScreen( + const CreateRoutineScreen(), + storage: storage, + workoutProvider: provider, + ); + + robot.expectVisible(CreateRoutineScreen); + + // Enter routine name via RFTextField + await robot.fill(find.byType(TextField).first, 'Upper Body Push'); + + // Tap Add Exercises button + await robot.tap('Add Exercises'); + + // Select exercise in sheet + final checks = find.byType(CheckboxListTile); + if (checks.evaluate().isNotEmpty) { + await robot.tap(checks.first); + } + }); + + testWidgets('Renders RoutineDetailScreen and displays exercise list', (WidgetTester tester) async { + final robot = TestRobot(tester); + final storage = MockStorageService(); + final provider = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await provider.init(); + + final routine = Routine( + id: 'routine_push_1', + name: 'Push Hypertrophy', + exerciseIds: ['bench_press', 'overhead_press'], + createdAt: DateTime.now(), + ); + + await robot.pumpScreen( + RoutineDetailScreen(routine: routine), + storage: storage, + workoutProvider: provider, + ); + + robot.expectVisible(RoutineDetailScreen); + robot.expectVisible('Push Hypertrophy'); + }); +} diff --git a/workout-logger/test/screens/widgets/targets_tab_test.dart b/workout-logger/test/screens/widgets/targets_tab_test.dart new file mode 100644 index 0000000..bbb6db5 --- /dev/null +++ b/workout-logger/test/screens/widgets/targets_tab_test.dart @@ -0,0 +1,62 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/widgets/targets_tab.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import '../../test_utils/mock_storage_service.dart'; +import '../../test_utils/mock_ml_service.dart'; +import '../../test_utils/test_harness.dart'; + +void main() { + testWidgets('Renders TargetsTab with empty targets state', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final storage = MockStorageService(); + final provider = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await provider.init(); + + await tester.pumpWidget(TestHarness.wrap( + const TargetsTab(), + storage: storage, + workoutProvider: provider, + )); + await tester.pumpAndSettle(); + + expect(find.text('No Targets Set'), findsOneWidget); + }); + + testWidgets('Renders TargetsTab with active targets list', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final storage = MockStorageService(); + final target = Target( + id: 'target_1', + exerciseId: 'bench_press', + targetType: 'weight', + targetValue: 100.0, + currentValue: 80.0, + ); + await storage.saveTarget(target); + + final provider = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await provider.init(); + + await tester.pumpWidget(TestHarness.wrap( + const TargetsTab(), + storage: storage, + workoutProvider: provider, + )); + await tester.pumpAndSettle(); + + expect(find.text('No Targets Set'), findsNothing); + // The target for bench_press should render its exercise name or value. + expect( + find.textContaining('Bench Press').evaluate().isNotEmpty || + find.textContaining('bench').evaluate().isNotEmpty || + find.textContaining('80').evaluate().isNotEmpty || + find.textContaining('100').evaluate().isNotEmpty, + isTrue, + reason: 'Active target item should display the exercise name or target value', + ); + }); +} diff --git a/workout-logger/test/screens/widgets/workout_hr_section_test.dart b/workout-logger/test/screens/widgets/workout_hr_section_test.dart new file mode 100644 index 0000000..edfff30 --- /dev/null +++ b/workout-logger/test/screens/widgets/workout_hr_section_test.dart @@ -0,0 +1,80 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/models/workout_hr_models.dart'; +import 'package:repforge/screens/widgets/workout_hr_section.dart'; +import 'package:repforge/services/managers/health_history_manager.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/workout_provider.dart'; +import '../../test_utils/mock_storage_service.dart'; +import '../../test_utils/mock_ml_service.dart'; +import '../../test_utils/stub_health_connect_service.dart'; +import '../../test_utils/test_fixtures.dart'; +import '../../test_utils/test_harness.dart'; + +class StubHealthHistoryManager extends HealthHistoryManager { + StubHealthHistoryManager(this.stubAnalysis) + : super(const StubHcService(), MockStorageService()); + + final WorkoutHrAnalysis? stubAnalysis; + + @override + Future workoutHr(WorkoutSession session) async { + return stubAnalysis; + } +} + +void main() { + testWidgets('Renders WorkoutHrSection with heart rate analysis stats', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final storage = MockStorageService(); + final session = TestFixtures.sampleSession(); + final provider = WorkoutProvider(storage, mlService: MockMLService(), programManager: ProgramManager(storage)); + await provider.init(); + + final now = DateTime(2026, 5, 10, 14, 30); + final analysis = WorkoutHrAnalysis( + start: now, + end: now.add(const Duration(minutes: 45)), + avgBpm: 110, + peakBpm: 150, + minBpm: 60, + curve: [ + HrCurvePoint(time: now, bpm: 70.0), + HrCurvePoint(time: now.add(const Duration(minutes: 15)), bpm: 140.0), + ], + rests: [ + RestRecovery( + afterSet: 1, + restStart: now.add(const Duration(minutes: 5)), + durationSec: 90, + peakBpm: 135, + troughBpm: 110, + recoveryBpm: 25, + recovered: true, + ), + ], + exercises: [ + ExerciseHrSpan( + exerciseId: 'bench_press', + start: now.add(const Duration(minutes: 2)), + end: now.add(const Duration(minutes: 10)), + setCount: 3, + ), + ], + hasRestAnalysis: true, + ); + + final customManager = StubHealthHistoryManager(analysis); + + await tester.pumpWidget(TestHarness.wrap( + WorkoutHrSection(session: session, provider: provider), + storage: storage, + healthHistoryManager: customManager, + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.byType(WorkoutHrSection), findsOneWidget); + }); +} diff --git a/workout-logger/test/screens/workout_flow_screen_full_test.dart b/workout-logger/test/screens/workout_flow_screen_full_test.dart new file mode 100644 index 0000000..c71a443 --- /dev/null +++ b/workout-logger/test/screens/workout_flow_screen_full_test.dart @@ -0,0 +1,121 @@ + +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/workout_flow_screen.dart'; + +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; + +import '../test_utils/mock_storage_service.dart'; +import '../test_utils/mock_ml_service.dart'; + +import '../test_utils/test_robot.dart'; + +void main() { + late MockStorageService storage; + late WorkoutProvider workoutProvider; + late SettingsProvider settingsProvider; + + setUp(() async { + storage = MockStorageService(); + settingsProvider = SettingsProvider(storage); + workoutProvider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + ); + + await workoutProvider.init(); + await settingsProvider.init(); + }); + + group('WorkoutFlowScreen Comprehensive Test Suite', () { + testWidgets('QuickStart workout flow: starts, adds exercises, logs sets, finishes', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const WorkoutFlowScreen(isQuickStart: true), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(WorkoutFlowScreen); + + // Tap Log Set button if present + final logBtn = find.text('Log set'); + if (logBtn.evaluate().isNotEmpty) { + await tester.tap(logBtn); + await tester.pumpAndSettle(); + } + + expect(tester.takeException(), isNull); + }); + + testWidgets('Routine-backed workout flow: loads exercises, toggles dropsets, logs sets', (tester) async { + final robot = TestRobot(tester); + + final routine = Routine( + id: 'rout_flow_1', + name: 'Upper Hypertrophy', + exerciseIds: ['bench_press', 'incline_dumbbell_press'], + ); + await storage.saveRoutine(routine); + + await robot.pumpScreen( + WorkoutFlowScreen(routine: routine), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(WorkoutFlowScreen); + + // Log set + final logBtn = find.text('Log set'); + if (logBtn.evaluate().isNotEmpty) { + await tester.tap(logBtn); + await tester.pumpAndSettle(); + } + + expect(tester.takeException(), isNull); + }); + + testWidgets('ProgramDay-backed workout flow with deload week', (tester) async { + final robot = TestRobot(tester); + + final day = ProgramDay( + id: 'day_flow_1', + name: 'Leg Day A', + exercises: [ + ProgramExerciseSlot( + exerciseId: 'squat', + sets: 3, + minReps: 5, + maxReps: 5, + restSeconds: 120, + ), + ], + ); + + final week = ProgramWeek( + weekNumber: 4, + isDeload: true, + deloadIntensityFactor: 0.85, + deloadSetReduction: 1, + days: [day], + ); + + await robot.pumpScreen( + WorkoutFlowScreen(programDay: day, programWeek: week), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(WorkoutFlowScreen); + expect(tester.takeException(), isNull); + }); + }); +} diff --git a/workout-logger/test/screens/workout_flow_screen_test.dart b/workout-logger/test/screens/workout_flow_screen_test.dart new file mode 100644 index 0000000..8326b73 --- /dev/null +++ b/workout-logger/test/screens/workout_flow_screen_test.dart @@ -0,0 +1,45 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/workout_flow_screen.dart'; +import '../test_utils/test_harness.dart'; + +void main() { + testWidgets('Renders WorkoutFlowScreen with active exercise details', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + final routine = Routine( + id: 'chest_day', + name: 'Chest & Triceps', + exerciseIds: ['bench_press', 'incline_dumbbells'], + ); + + await tester.pumpWidget(TestHarness.wrap( + WorkoutFlowScreen(routine: routine), + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.byType(WorkoutFlowScreen), findsOneWidget); + expect(find.text('Bench Press'), findsOneWidget); + }); + + testWidgets('Renders WorkoutFlowScreen quick start mode', (WidgetTester tester) async { + await TestHarness.prepareTester(tester); + + await tester.pumpWidget(TestHarness.wrap( + const WorkoutFlowScreen(isQuickStart: true), + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + + expect(find.byType(WorkoutFlowScreen), findsOneWidget); + // Quick-start mode has no pre-set routine: the Add Exercise control is shown. + expect( + find.byIcon(Icons.add_rounded).evaluate().isNotEmpty || + find.textContaining('Exercise').evaluate().isNotEmpty, + isTrue, + reason: 'Quick-start mode should show an add-exercise control or empty exercise area', + ); + }); +} diff --git a/workout-logger/test/services/health_connect_service_test.dart b/workout-logger/test/services/health_connect_service_test.dart new file mode 100644 index 0000000..c3ff314 --- /dev/null +++ b/workout-logger/test/services/health_connect_service_test.dart @@ -0,0 +1,158 @@ +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/health_connect_service.dart'; +import '../test_utils/test_fixtures.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + const pigeonChannels = [ + 'dev.flutter.pigeon.health_connector_hc_android.HealthConnectorHCAndroidApi.getHealthPlatformStatus', + 'dev.flutter.pigeon.health_connector_hc_android.HealthConnectorHCAndroidApi.initialize', + 'dev.flutter.pigeon.health_connector_hc_android.HealthConnectorHCAndroidApi.requestPermissions', + 'dev.flutter.pigeon.health_connector_hc_android.HealthConnectorHCAndroidApi.getPermissionStatus', + 'dev.flutter.pigeon.health_connector_hc_android.HealthConnectorHCAndroidApi.readRecords', + 'dev.flutter.pigeon.health_connector_hc_android.HealthConnectorHCAndroidApi.readRecord', + 'dev.flutter.pigeon.health_connector_hc_android.HealthConnectorHCAndroidApi.writeRecords', + 'dev.flutter.pigeon.health_connector_hc_android.HealthConnectorHCAndroidApi.writeRecord', + 'dev.flutter.pigeon.health_connector_hk_ios.HealthConnectorHKIOSApi.getHealthPlatformStatus', + 'dev.flutter.pigeon.health_connector_hk_ios.HealthConnectorHKIOSApi.initialize', + ]; + + setUp(() { + for (final channel in pigeonChannels) { + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMessageHandler(channel, (ByteData? message) async => null); + } + }); + + tearDown(() { + for (final channel in pigeonChannels) { + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMessageHandler(channel, null); + } + }); + + testWidgets('HealthConnectService reports unavailable gracefully in unit tests', (WidgetTester tester) async { + final service = HealthConnectService(); + final available = await service.isAvailable(); + expect(available, isFalse); + }); + + testWidgets('HealthConnectService returns false for permissions check on unsupported desktop test environment', (WidgetTester tester) async { + final service = HealthConnectService(); + final hasPerms = await service.hasPermissions(); + expect(hasPerms, isFalse); + + final reqPerms = await service.requestPermissions(); + expect(reqPerms, isFalse); + + final reqReadPerms = await service.requestReadPermissions(); + expect(reqReadPerms, isFalse); + + final grantedTypes = await service.grantedReadTypes(); + expect(grantedTypes, isEmpty); + }); + + testWidgets('HealthConnectService syncWorkoutSession returns false gracefully on missing platform channel', (WidgetTester tester) async { + final service = HealthConnectService(); + final session = TestFixtures.sampleSession(); + final success = await service.syncWorkoutSession(session, title: 'Custom Title'); + expect(success, isFalse); + }); + + testWidgets('HealthConnectService handles sessions with zero reps and custom exercises', (WidgetTester tester) async { + final service = HealthConnectService(); + final session = WorkoutSession( + id: 'sess_custom', + date: DateTime.now(), + duration: 30, + notes: 'Custom notes', + exercises: [ + ExerciseLog( + exerciseId: 'custom_exercise_999', + sets: [ + WorkoutSet(weight: 0.0, reps: 0, timestamp: DateTime.now()), + WorkoutSet(weight: 50.0, reps: 10, timestamp: DateTime.now().add(const Duration(minutes: 5))), + ], + ), + ], + ); + + final success = await service.syncWorkoutSession(session); + expect(success, isFalse); + }); + + testWidgets('HealthConnectService handles sessions with identical timestamps (fallback spacing)', (WidgetTester tester) async { + final service = HealthConnectService(); + final now = DateTime.now(); + final session = WorkoutSession( + id: 'sess_identical_ts', + date: now, + duration: 45, + exercises: [ + ExerciseLog( + exerciseId: 'bench_press', + sets: [ + WorkoutSet(weight: 60.0, reps: 10, timestamp: now), + WorkoutSet(weight: 70.0, reps: 8, timestamp: now), + ], + ), + ], + ); + + final success = await service.syncWorkoutSession(session, title: ''); + expect(success, isFalse); + }); + + testWidgets('HealthConnectService handles empty sessions without exercises', (WidgetTester tester) async { + final service = HealthConnectService(); + final session = WorkoutSession( + id: 'sess_empty', + date: DateTime.now(), + duration: 20, + exercises: [], + ); + + final success = await service.syncWorkoutSession(session); + expect(success, isFalse); + }); + + testWidgets('HealthConnectService read methods return empty lists when plugin unavailable', (WidgetTester tester) async { + final service = HealthConnectService(); + final now = DateTime.now(); + final start = now.subtract(const Duration(days: 1)); + + final sleep = await service.readSleepSessions(start, now); + expect(sleep, isEmpty); + + final rhr = await service.readRestingHeartRate(start, now); + expect(rhr, isEmpty); + + final hrv = await service.readHrvRmssd(start, now); + expect(hrv, isEmpty); + + final hr = await service.readHeartRateSamples(start, now); + expect(hr, isEmpty); + }); + + test('HealthConnectService succeeds when platform response takes > 100ms within deadline', () async { + const channel = 'dev.flutter.pigeon.health_connector_hc_android.HealthConnectorHCAndroidApi.getHealthPlatformStatus'; + addTearDown(() { + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMessageHandler(channel, null); + }); + + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMessageHandler( + channel, + (ByteData? message) async { + await Future.delayed(const Duration(milliseconds: 200)); + return null; + }, + ); + + final service = HealthConnectService(); + final available = await service.isAvailable(); + expect(available, isFalse); + }); +} diff --git a/workout-logger/test/session_fatigue_test.dart b/workout-logger/test/session_fatigue_test.dart new file mode 100644 index 0000000..933d439 --- /dev/null +++ b/workout-logger/test/session_fatigue_test.dart @@ -0,0 +1,113 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/utils/session_fatigue.dart'; + +WorkoutSet _hardSet({ + double weight = 100, + int reps = 5, + DateTime? timestamp, +}) => + WorkoutSet( + weight: weight, + reps: reps, + timestamp: timestamp ?? DateTime(2026, 1, 1, 10, 0), + ); + +void main() { + const accumulator = SessionFatigueAccumulator(); + + test('empty session logs produce zero factor', () { + expect(accumulator.factorFor(exerciseLogs: []), 0.0); + }); + + test('logs with no sets yet (pre-selected exercises) contribute nothing', () { + final factor = accumulator.factorFor( + exerciseLogs: [const ExerciseLog(exerciseId: 'squat', sets: [])], + ); + expect(factor, 0.0); + }); + + test('excludeExerciseId skips that exercise but keeps others', () { + // Each hard set contributes (8.0 − 6.0) / 3.0 ≈ 0.667, and the factor is + // 0.0 until the raw total passes _softCap (16.0). With one set per + // exercise both branches sit at 0.0 and the comparison holds even if the + // exclusion were ignored — so load each exercise past the cap, where + // dropping one is actually observable. + const setsPerExercise = 30; // ≈20.0 raw, comfortably past _softCap + List hardSets() => [ + for (var i = 0; i < setsPerExercise; i++) + _hardSet(timestamp: DateTime(2026, 1, 1, 10, i)), + ]; + + final logs = [ + ExerciseLog(exerciseId: 'squat', sets: hardSets()), + ExerciseLog(exerciseId: 'leg_press', sets: hardSets()), + ]; + + final withSquatExcluded = accumulator.factorFor( + exerciseLogs: logs, + excludeExerciseId: 'squat', + ); + final legPressOnly = accumulator.factorFor(exerciseLogs: [logs[1]]); + + expect(withSquatExcluded, closeTo(legPressOnly, 0.0001)); + // Strictly inside (0, 1): at 0.0 or 1.0 the assertion above would pass + // whether or not the exclusion happened. + expect(withSquatExcluded, greaterThan(0.0)); + expect(withSquatExcluded, lessThan(1.0)); + // And keeping both exercises must land somewhere different. + expect( + accumulator.factorFor(exerciseLogs: logs), + greaterThan(withSquatExcluded), + ); + }); + + test('a realistic session (a handful of sets across a few exercises) ' + 'stays at zero — this is the calibrated-inert case', () { + // 4 exercises, 3 sets each = 12 sets, well within what a real session + // looks like (backtest max across 254 real contexts was 11.87 raw, + // caps start at 16.0). + final logs = [ + for (var ex = 0; ex < 4; ex++) + ExerciseLog( + exerciseId: 'ex$ex', + sets: [ + for (var s = 0; s < 3; s++) + _hardSet(timestamp: DateTime(2026, 1, 1, 10, ex * 10 + s * 2)), + ], + ), + ]; + final factor = accumulator.factorFor(exerciseLogs: logs); + expect(factor, 0.0); + }); + + test('an extreme, unrealistic session eventually saturates the factor ' + 'toward 1.0 — proves the mechanism works end-to-end even though ' + 'real sessions never reach it', () { + final logs = [ + for (var ex = 0; ex < 10; ex++) + ExerciseLog( + exerciseId: 'ex$ex', + sets: [ + for (var s = 0; s < 5; s++) + _hardSet(timestamp: DateTime(2026, 1, 1, 10, ex * 10 + s * 2)), + ], + ), + ]; + final factor = accumulator.factorFor(exerciseLogs: logs); + expect(factor, greaterThan(0.0)); + }); + + test('factor is always clamped to [0.0, 1.0]', () { + final logs = [ + for (var ex = 0; ex < 30; ex++) + ExerciseLog( + exerciseId: 'ex$ex', + sets: [_hardSet(timestamp: DateTime(2026, 1, 1, 10, ex * 5))], + ), + ]; + final factor = accumulator.factorFor(exerciseLogs: logs); + expect(factor, greaterThanOrEqualTo(0.0)); + expect(factor, lessThanOrEqualTo(1.0)); + }); +} diff --git a/workout-logger/test/settings_provider_test.dart b/workout-logger/test/settings_provider_test.dart new file mode 100644 index 0000000..f3c9a81 --- /dev/null +++ b/workout-logger/test/settings_provider_test.dart @@ -0,0 +1,207 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'test_utils/mock_storage_service.dart'; + +void main() { + group('SettingsProvider', () { + late MockStorageService mockStorage; + late SettingsProvider provider; + + setUp(() { + mockStorage = MockStorageService(); + provider = SettingsProvider(mockStorage); + }); + + test('initial values and fallback defaults before init', () { + expect(provider.weightUnit, equals(WeightUnit.kg)); + expect(provider.unitLabel, equals('kg')); + expect(provider.weightIncrement, equals(2.5)); + expect(provider.healthConnectEnabled, isFalse); + expect(provider.readinessEnabled, isFalse); + expect(provider.userName, isNull); + expect(provider.geminiApiKey, isEmpty); + expect(provider.geminiModel, equals('gemini-3.6-flash')); + expect(provider.geminiThinkingLevel, equals('minimal')); + expect(provider.showAdvancedMetrics, isFalse); + }); + + test('init loads saved settings from storage', () async { + await mockStorage.saveSetting('weightUnit', 'lbs'); + await mockStorage.saveSetting('weightIncrement', '5.0'); + await mockStorage.saveSetting('healthConnectEnabled', 'true'); + await mockStorage.saveSetting('readinessEnabled', 'true'); + await mockStorage.saveSetting('userName', 'Devasy'); + await mockStorage.saveSetting('geminiApiKey', 'secret_key'); + await mockStorage.saveSetting('geminiModel', 'gemini-3.5-flash'); + await mockStorage.saveSetting('geminiThinkingLevel', 'high'); + await mockStorage.saveSetting('showAdvancedMetrics', 'true'); + + await provider.init(); + + expect(provider.weightUnit, equals(WeightUnit.lbs)); + expect(provider.unitLabel, equals('lbs')); + expect(provider.weightIncrement, equals(5.0)); + expect(provider.healthConnectEnabled, isTrue); + expect(provider.readinessEnabled, isTrue); + expect(provider.userName, equals('Devasy')); + expect(provider.geminiApiKey, equals('secret_key')); + expect(provider.geminiModel, equals('gemini-3.5-flash')); + expect(provider.geminiThinkingLevel, equals('high')); + expect(provider.showAdvancedMetrics, isTrue); + }); + + test('init falls back to the default model when the stored one is no ' + 'longer offered', () async { + // A model id left behind by an older build. The picker only has items + // for kGeminiModels, so surfacing this one would assert. + await mockStorage.saveSetting('geminiModel', 'gemini-1.5-pro'); + + await provider.init(); + + expect(provider.geminiModel, equals('gemini-3.6-flash')); + }); + + test('init clamps a stored thinking level that the stored model no longer supports', () async { + await mockStorage.saveSetting('geminiModel', 'gemini-3.7-flash'); + await mockStorage.saveSetting('geminiThinkingLevel', 'minimal'); + + await provider.init(); + + expect(provider.geminiThinkingLevel, equals('low')); + }); + + test('setUserName updates state and notifies listeners', () async { + bool notified = false; + provider.addListener(() => notified = true); + + await provider.setUserName(' John Doe '); + + expect(provider.userName, equals('John Doe')); + expect(mockStorage.settings['userName'], equals('John Doe')); + expect(notified, isTrue); + }); + + test('setWeightUnit updates weightUnit, default increment, and saves settings', () async { + await provider.setWeightUnit(WeightUnit.lbs); + + expect(provider.weightUnit, equals(WeightUnit.lbs)); + expect(provider.unitLabel, equals('lbs')); + expect(provider.weightIncrement, equals(5.0)); + expect(mockStorage.settings['weightUnit'], equals('lbs')); + expect(mockStorage.settings['weightIncrement'], equals('5.0')); + + await provider.setWeightUnit(WeightUnit.kg); + + expect(provider.weightUnit, equals(WeightUnit.kg)); + expect(provider.unitLabel, equals('kg')); + expect(provider.weightIncrement, equals(2.5)); + }); + + test('weight conversions and formatting for kg and lbs', () async { + // In kg mode + expect(provider.toDisplay(100.0), equals(100.0)); + expect(provider.toStorage(100.0), equals(100.0)); + expect(provider.formatWeight(100.0), equals('100 kg')); + expect(provider.formatWeight(102.5), equals('102.5 kg')); + + // Switch to lbs mode + await provider.setWeightUnit(WeightUnit.lbs); + + expect(provider.toDisplay(100.0), closeTo(220.462, 0.01)); + expect(provider.toStorage(220.462), closeTo(100.0, 0.01)); + expect(provider.formatWeight(100.0), equals('220.5 lbs')); + }); + + test('setters for healthConnect, readiness, gemini, and advanced metrics', () async { + await provider.setHealthConnectEnabled(true); + expect(provider.healthConnectEnabled, isTrue); + expect(mockStorage.settings['healthConnectEnabled'], equals('true')); + + await provider.setReadinessEnabled(true); + expect(provider.readinessEnabled, isTrue); + expect(mockStorage.settings['readinessEnabled'], equals('true')); + + await provider.setGeminiApiKey('key123'); + expect(provider.geminiApiKey, equals('key123')); + + await provider.setGeminiModel('custom-model'); + expect(provider.geminiModel, equals('custom-model')); + + await provider.setGeminiThinkingLevel('high'); + expect(provider.geminiThinkingLevel, equals('high')); + expect(mockStorage.settings['geminiThinkingLevel'], equals('high')); + + await provider.setShowAdvancedMetrics(true); + expect(provider.showAdvancedMetrics, isTrue); + }); + + test('setGeminiModel clamps an already-set thinking level the new model does not support', () async { + await provider.setGeminiThinkingLevel('minimal'); + await provider.setGeminiModel('gemini-3.7-flash'); + + expect(provider.geminiThinkingLevel, equals('low')); + expect(mockStorage.settings['geminiThinkingLevel'], equals('low')); + }); + + test('saveWeeklyInsights updates insights string and date', () async { + await provider.saveWeeklyInsights('Great progress this week!'); + + expect(provider.weeklyInsights, equals('Great progress this week!')); + expect(provider.weeklyInsightsDate, isNotNull); + expect(mockStorage.settings['weeklyInsights'], equals('Great progress this week!')); + }); + + test( + 'setGeminiModel rolls the model write back when the thinking-level write fails', + () async { + // The two writes are not a transaction. Without the rollback, storage + // keeps the new model while the provider keeps the old one, so a + // selection the UI reported as failed becomes active on next launch. + await provider.setGeminiThinkingLevel('minimal'); + expect(provider.geminiModel, equals('gemini-3.6-flash')); + + // gemini-3.7-flash doesn't support 'minimal', so the clamp forces the + // second write — which is the one we make fail. + mockStorage.saveSettingErrorResolver = (key, value) => + key == 'geminiThinkingLevel' ? Exception('disk full') : null; + + await expectLater( + provider.setGeminiModel('gemini-3.7-flash'), + throwsA(isA()), + ); + mockStorage.saveSettingErrorResolver = null; + + expect(provider.geminiModel, equals('gemini-3.6-flash')); + expect( + mockStorage.settings['geminiModel'], + equals('gemini-3.6-flash'), + reason: 'the model write must not survive the failed clamp write', + ); + expect(provider.geminiThinkingLevel, equals('minimal')); + }, + ); + + test( + 'setGeminiMaxToolRounds does not commit in memory when the write fails', + () async { + final before = provider.geminiMaxToolRounds; + mockStorage.saveSettingErrorResolver = (key, value) => + key == 'geminiMaxToolRounds' ? Exception('disk full') : null; + + await expectLater( + provider.setGeminiMaxToolRounds(before + 3), + throwsA(isA()), + ); + + expect(provider.geminiMaxToolRounds, equals(before)); + }, + ); + + test('availableIncrements returns correct values for unit', () async { + expect(provider.availableIncrements, equals([1.25, 2.5, 5.0, 10.0])); + + await provider.setWeightUnit(WeightUnit.lbs); + expect(provider.availableIncrements, equals([2.5, 5.0, 10.0, 25.0])); + }); + }); +} diff --git a/workout-logger/test/sleep_hr_builder_test.dart b/workout-logger/test/sleep_hr_builder_test.dart new file mode 100644 index 0000000..29975b1 --- /dev/null +++ b/workout-logger/test/sleep_hr_builder_test.dart @@ -0,0 +1,102 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/interfaces/health_connect_service_interface.dart'; +import 'package:repforge/services/utils/sleep_hr_builder.dart'; +import 'test_utils/stub_health_connect_service.dart'; + +void main() { + final granted = { + HealthReadType.heartRate, + HealthReadType.sleep, + HealthReadType.restingHeartRate, + }; + + group('Sleep & HR Builder Utils', () { + test('buildHrDaySnapshot returns null when no HR samples or resting HR present', () async { + const stubHc = StubHcService(); + final snapshot = await buildHrDaySnapshot(stubHc, DateTime(2026, 7, 23), granted); + + expect(snapshot, isNull); + }); + + test('buildHrDaySnapshot builds buckets and resting HR for day', () async { + final day = DateTime(2026, 7, 23); + final sample1 = HealthSample( + time: DateTime(2026, 7, 23, 10, 0), + value: 70.0, + ); + final sample2 = HealthSample( + time: DateTime(2026, 7, 23, 10, 15), + value: 120.0, + ); + final resting = HealthSample( + time: DateTime(2026, 7, 23, 8, 0), + value: 58.0, + ); + + final stubHc = StubHcService( + hrSamples: [sample1, sample2], + restingHrSamples: [resting], + ); + + final snapshot = await buildHrDaySnapshot(stubHc, day, granted); + + expect(snapshot, isNotNull); + expect(snapshot!.minBpm, equals(70)); + expect(snapshot.maxBpm, equals(120)); + expect(snapshot.restingBpm, equals(58)); + expect(snapshot.buckets, isNotEmpty); + }); + + test('buildSleepHrSnapshot calculates sleep stage stats correctly', () async { + final sleepStart = DateTime(2026, 7, 23, 1, 0); + final sleepEnd = DateTime(2026, 7, 23, 7, 0); + + final sleepPeriod = SleepPeriod( + start: sleepStart, + end: sleepEnd, + stageTimeline: [ + SleepStageInterval(start: sleepStart, end: sleepStart.add(const Duration(hours: 2)), stage: 'deep'), + SleepStageInterval(start: sleepStart.add(const Duration(hours: 2)), end: sleepEnd, stage: 'light'), + ], + ); + + final hrSample1 = HealthSample( + time: DateTime(2026, 7, 23, 2, 0), + value: 55.0, + ); + final hrSample2 = HealthSample( + time: DateTime(2026, 7, 23, 2, 3), + value: 57.0, + ); + final hrSample3 = HealthSample( + time: DateTime(2026, 7, 23, 2, 8), + value: 58.0, + ); + + final stubHc = StubHcService( + sleepPeriods: [sleepPeriod], + hrSamples: [hrSample1, hrSample2, hrSample3], + ); + + final snapshot = await buildSleepHrSnapshot(stubHc, DateTime(2026, 7, 23), granted); + + expect(snapshot, isNotNull); + expect(snapshot!.segments, isNotEmpty); + expect(snapshot.stageStats, isNotEmpty); + + // Verify representative calculated values in snapshot.segments and snapshot.stageStats + final deepStats = snapshot.statsFor('deep'); + expect(deepStats, isNotNull); + expect(deepStats!.stage, equals('deep')); + expect(deepStats.minBpm, equals(55)); + expect(deepStats.maxBpm, equals(58)); + expect(deepStats.sampleCount, equals(3)); + + final firstSegment = snapshot.segments.first; + expect(firstSegment.stage, equals('deep')); + expect(firstSegment.minBpm, equals(55)); + expect(firstSegment.maxBpm, equals(58)); + }); + }); +} diff --git a/workout-logger/test/sleep_hr_models_test.dart b/workout-logger/test/sleep_hr_models_test.dart new file mode 100644 index 0000000..13b8f87 --- /dev/null +++ b/workout-logger/test/sleep_hr_models_test.dart @@ -0,0 +1,149 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/sleep_hr_models.dart'; + +void main() { + group('Sleep HR Models Test', () { + test('SleepHrSegment properties', () { + final now = DateTime.now(); + final segment = SleepHrSegment( + windowStart: now, + minBpm: 50, + maxBpm: 70, + avgBpm: 60.0, + stage: 'deep', + ); + + expect(segment.windowStart, equals(now)); + expect(segment.minBpm, equals(50)); + expect(segment.maxBpm, equals(70)); + expect(segment.avgBpm, equals(60.0)); + expect(segment.stage, equals('deep')); + }); + + test('SleepStageStats properties', () { + const stats = SleepStageStats( + stage: 'rem', + minBpm: 55, + p25Bpm: 60, + avgBpm: 65.5, + p75Bpm: 70, + maxBpm: 80, + sampleCount: 20, + ); + + expect(stats.stage, equals('rem')); + expect(stats.minBpm, equals(55)); + expect(stats.p25Bpm, equals(60)); + expect(stats.avgBpm, equals(65.5)); + expect(stats.p75Bpm, equals(70)); + expect(stats.maxBpm, equals(80)); + expect(stats.sampleCount, equals(20)); + }); + + test('SleepHrSnapshot statsFor helper method', () { + final start = DateTime(2026, 1, 1, 23, 0); + final end = DateTime(2026, 1, 2, 7, 0); + + const deepStats = SleepStageStats( + stage: 'deep', + minBpm: 45, + p25Bpm: 50, + avgBpm: 52.0, + p75Bpm: 55, + maxBpm: 60, + sampleCount: 15, + ); + + final snapshot = SleepHrSnapshot( + sleepStart: start, + sleepEnd: end, + p5Bpm: 48, + p95Bpm: 72, + segments: [], + stageStats: [deepStats], + ); + + expect(snapshot.statsFor('deep'), equals(deepStats)); + expect(snapshot.statsFor('rem'), isNull); + }); + + test('HealthGranularity extensions', () { + expect(HealthGranularity.day.label, equals('Day')); + expect(HealthGranularity.week.label, equals('Week')); + expect(HealthGranularity.month.label, equals('Month')); + expect(HealthGranularity.year.label, equals('Year')); + }); + + test('HrBucket JSON roundtrip', () { + final bucket = HrBucket( + windowStart: DateTime(2026, 5, 10, 14, 30), + minBpm: 60, + maxBpm: 120, + avgBpm: 85.5, + ); + + final json = bucket.toJson(); + final restored = HrBucket.fromJson(json); + + expect(restored.windowStart, equals(bucket.windowStart)); + expect(restored.minBpm, equals(bucket.minBpm)); + expect(restored.maxBpm, equals(bucket.maxBpm)); + expect(restored.avgBpm, equals(bucket.avgBpm)); + }); + + test('HrDaySnapshot JSON roundtrip', () { + final bucket = HrBucket( + windowStart: DateTime(2026, 5, 10, 14, 30), + minBpm: 60, + maxBpm: 120, + avgBpm: 85.5, + ); + + final daySnapshot = HrDaySnapshot( + day: DateTime(2026, 5, 10), + restingBpm: 58, + minBpm: 55, + maxBpm: 145, + avgBpm: 78.2, + buckets: [bucket], + ); + + final json = daySnapshot.toJson(); + final restored = HrDaySnapshot.fromJson(json); + + expect(restored.day, equals(daySnapshot.day)); + expect(restored.restingBpm, equals(58)); + expect(restored.minBpm, equals(55)); + expect(restored.maxBpm, equals(145)); + expect(restored.avgBpm, equals(78.2)); + expect(restored.buckets.length, equals(1)); + expect(restored.buckets.first.minBpm, equals(60)); + }); + + test('SleepDayBar & HrRangeBar construction', () { + final bar = SleepDayBar( + date: DateTime(2026, 6, 1), + totalMinutes: 480, + deepMin: 90, + remMin: 110, + lightMin: 250, + awakeMin: 30, + ); + + expect(bar.totalMinutes, equals(480)); + expect(bar.deepMin, equals(90)); + + final hrRange = HrRangeBar( + date: DateTime(2026, 6, 1), + label: 'Mon', + minBpm: 50, + maxBpm: 130, + avgBpm: 72.0, + restingBpm: 54, + ); + + expect(hrRange.label, equals('Mon')); + expect(hrRange.restingBpm, equals(54)); + }); + }); +} diff --git a/workout-logger/test/sql_query_service_test.dart b/workout-logger/test/sql_query_service_test.dart new file mode 100644 index 0000000..f9fcaf6 --- /dev/null +++ b/workout-logger/test/sql_query_service_test.dart @@ -0,0 +1,181 @@ +import 'dart:io'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:sqflite_common_ffi/sqflite_ffi.dart'; +import 'package:repforge/services/ai/sql_query_service.dart'; + +void main() { + late String dbPath; + late Database seedDb; + + setUpAll(() { + sqfliteFfiInit(); + databaseFactory = databaseFactoryFfi; + }); + + setUp(() async { + dbPath = '${Directory.systemTemp.path}/sql_query_test_${DateTime.now().microsecondsSinceEpoch}.db'; + seedDb = await openDatabase(dbPath, version: 1, onCreate: (db, _) async { + await db.execute('CREATE TABLE widgets (id INTEGER PRIMARY KEY, name TEXT)'); + await db.insert('widgets', {'id': 1, 'name': 'foo'}); + await db.insert('widgets', {'id': 2, 'name': 'bar'}); + await db.execute('CREATE TABLE settings (key TEXT PRIMARY KEY, value TEXT)'); + await db.insert('settings', {'key': 'geminiApiKey', 'value': 'super-secret-key'}); + }); + }); + + tearDown(() async { + await seedDb.close(); + final f = File(dbPath); + if (await f.exists()) await f.delete(); + }); + + test('valid SELECT returns rows', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM widgets ORDER BY id'); + expect(result['row_count'], 2); + expect((result['rows'] as List).first, {'id': 1, 'name': 'foo'}); + }); + + test('rejects non-SELECT statements', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('DELETE FROM widgets'); + expect(result['error'], contains('Only SELECT')); + }); + + test('rejects multi-statement input', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM widgets; DROP TABLE widgets;'); + expect(result['error'], contains('single SQL statement')); + }); + + test('caps row count via limit', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM widgets', limit: 1); + expect(result['row_count'], 1); + }); + + test('returns error map instead of throwing on invalid SQL', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM does_not_exist'); + expect(result['error'], isNotNull); + }); + + test('rejects queries reading the settings table', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM settings'); + expect(result['error'], contains('restricted table')); + }); + + test('rejects queries reading sqlite_master', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM sqlite_master'); + expect(result['error'], contains('restricted table')); + }); + + test('rejects queries reading sqlite_temp_schema', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM sqlite_temp_schema'); + expect(result['error'], contains('restricted table')); + }); + + test('rejects queries reading sqlite_dbpage', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM sqlite_dbpage'); + expect(result['error'], contains('restricted table')); + }); + + test('rejects queries reading pragma_table_list', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM pragma_table_list'); + expect(result['error'], contains('restricted table')); + }); + + // The query planner's stat tables are on the denylist but were not otherwise + // exercised, so a typo there could silently reopen SQLite metadata access. + for (final table in const [ + 'sqlite_stat1', + 'sqlite_stat2', + 'sqlite_stat3', + 'sqlite_stat4', + ]) { + test('rejects queries reading $table', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM $table'); + expect(result['error'], contains('restricted table')); + }); + } + + test('trailing line comment does not break the LIMIT wrapper', () async { + final service = SqlQueryService(dbPath); + final result = await service.runQuery('SELECT * FROM widgets -- get all'); + expect(result['error'], isNull); + expect(result['row_count'], 2); + }); + + test('does not close the app\'s shared connection to the same path', () async { + final service = SqlQueryService(dbPath); + + final first = await service.runQuery('SELECT * FROM widgets ORDER BY id'); + expect(first['error'], isNull); + + // Regression: opening a read-only connection at the same path as an + // already-open shared connection returns that shared instance unless + // singleInstance: false is passed. Closing it after the first query + // would then break every later access to the app's real connection — + // including seedDb here, standing in for the app's live database. + final rows = await seedDb.rawQuery('SELECT * FROM widgets ORDER BY id'); + expect(rows.length, 2); + + final second = await service.runQuery('SELECT * FROM widgets ORDER BY id'); + expect(second['error'], isNull); + expect(second['row_count'], 2); + }); + + test('can join workouts against sleep and HR data', () async { + await seedDb.execute('''CREATE TABLE health_samples ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + type TEXT NOT NULL, + timestamp TEXT NOT NULL, + value REAL NOT NULL + )'''); + await seedDb.execute('''CREATE TABLE sleep_sessions ( + id TEXT PRIMARY KEY, + start_ts TEXT NOT NULL, + end_ts TEXT NOT NULL, + light_min INTEGER, + deep_min INTEGER, + rem_min INTEGER, + awake_min INTEGER + )'''); + await seedDb.insert('health_samples', { + 'type': 'resting_heart_rate', + 'timestamp': '2026-08-10T07:00:00.000', + 'value': 58.0, + }); + await seedDb.insert('sleep_sessions', { + 'id': '2026-08-09T23:00:00.000', + 'start_ts': '2026-08-09T23:00:00.000', + 'end_ts': '2026-08-10T07:00:00.000', + 'light_min': 200, + 'deep_min': 70, + 'rem_min': 90, + 'awake_min': 5, + }); + + final service = SqlQueryService(dbPath); + final result = await service.runQuery(''' + SELECT w.name AS widget_name, s.deep_min AS deep_min, h.value AS resting_hr + FROM widgets w, sleep_sessions s + JOIN health_samples h ON h.type = 'resting_heart_rate' + WHERE w.id = 1 + '''); + + expect(result['error'], isNull); + expect(result['row_count'], 1); + expect((result['rows'] as List).first, { + 'widget_name': 'foo', + 'deep_min': 70, + 'resting_hr': 58.0, + }); + }); +} diff --git a/workout-logger/test/sqlite_storage_service_test.dart b/workout-logger/test/sqlite_storage_service_test.dart new file mode 100644 index 0000000..48b0067 --- /dev/null +++ b/workout-logger/test/sqlite_storage_service_test.dart @@ -0,0 +1,742 @@ +import 'dart:convert'; +import 'dart:io'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:sqflite_common_ffi/sqflite_ffi.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/sqlite_storage_service.dart'; +import 'package:repforge/data/exercise_database.dart'; + +void main() { + late SqliteStorageService storage; + + setUpAll(() { + sqfliteFfiInit(); + databaseFactory = databaseFactoryFfi; + }); + + setUp(() async { + storage = SqliteStorageService(databasePathOverride: inMemoryDatabasePath); + await storage.init(); + }); + + tearDown(() async { + final path = storage.databasePath; + await storage.close(); + final file = File(path); + if (await file.exists()) { + await file.delete(); + } + }); + + group('SqliteStorageService — init', () { + test('seeds default muscle groups', () async { + final groups = await storage.getAllMuscleGroups(); + expect(groups, isNotEmpty); + expect(groups.any((g) => g.name == 'Chest'), isTrue); + }); + }); + + Future>> rawQuery( + SqliteStorageService s, + String sql, [ + List? args, + ]) async { + final db = await openReadOnlyDatabase(s.databasePath, singleInstance: false); + final rows = await db.rawQuery(sql, args); + await db.close(); + return rows; + } + + group('SqliteStorageService — health data', () { + // A DST fall-back maps two distinct UTC instants onto the same local + // wall-clock string. Identity therefore lives on utc_ts, not on the local + // timestamp column — asserted here without depending on the machine's + // timezone actually observing DST. + test('two instants sharing a local wall-clock string both survive', () async { + final db = await openDatabase(storage.databasePath, singleInstance: false); + const localString = '2026-11-01T01:30:00.000'; + await db.insert('health_samples', { + 'type': 'heart_rate', + 'timestamp': localString, + 'utc_ts': '2026-11-01T05:30:00.000Z', + 'value': 60.0, + }); + await db.insert('health_samples', { + 'type': 'heart_rate', + 'timestamp': localString, + 'utc_ts': '2026-11-01T06:30:00.000Z', + 'value': 65.0, + }); + await db.close(); + + final rows = await rawQuery( + storage, + "SELECT value FROM health_samples WHERE type = 'heart_rate' ORDER BY utc_ts", + ); + expect(rows.length, 2); + expect(rows.map((r) => r['value']), [60.0, 65.0]); + }); + + test('upsertHealthSamples records the exact UTC instant in utc_ts', () async { + final utcTime = DateTime.utc(2026, 8, 10, 21, 0); + await storage.upsertHealthSamples('heart_rate', [HealthSample(time: utcTime, value: 60)]); + + final rows = await rawQuery( + storage, + "SELECT utc_ts FROM health_samples WHERE type = 'heart_rate'", + ); + final stored = rows.first['utc_ts'] as String; + expect(stored.endsWith('Z'), isTrue); + expect(DateTime.parse(stored).toUtc(), utcTime); + }); + + test('sleep session id is the UTC start instant, not the local one', () async { + final start = DateTime.utc(2026, 11, 1, 5, 30); + await storage.upsertSleepSessions([ + SleepPeriod( + start: start, + end: start.add(const Duration(hours: 8)), + lightMinutes: 200, + deepMinutes: 60, + remMinutes: 100, + awakeMinutes: 10, + stageTimeline: const [], + ), + ]); + + final rows = await rawQuery(storage, 'SELECT id, start_ts FROM sleep_sessions'); + expect(rows.length, 1); + final id = rows.first['id'] as String; + expect(id, start.toIso8601String()); + expect(DateTime.parse(id).toUtc(), start); + // start_ts stays local so it joins cleanly against workout_sessions.date. + expect((rows.first['start_ts'] as String).endsWith('Z'), isFalse); + }); + + test('upsertHealthSamples replaces duplicates on (type, timestamp)', () async { + final t = DateTime(2026, 8, 10, 22, 30); + await storage.upsertHealthSamples('heart_rate', [HealthSample(time: t, value: 60)]); + await storage.upsertHealthSamples('heart_rate', [HealthSample(time: t, value: 65)]); + + final rows = await rawQuery( + storage, + "SELECT value FROM health_samples WHERE type = 'heart_rate'", + ); + expect(rows.length, 1); + expect(rows.first['value'], 65.0); + }); + + test('upsertHealthSamples stores timestamps converted to local, not UTC', () async { + final utcTime = DateTime.utc(2026, 8, 10, 21, 0); + await storage.upsertHealthSamples('heart_rate', [HealthSample(time: utcTime, value: 60)]); + + final rows = await rawQuery( + storage, + "SELECT timestamp FROM health_samples WHERE type = 'heart_rate'", + ); + final stored = rows.first['timestamp'] as String; + expect(stored.contains('Z'), isFalse); + expect(stored, utcTime.toLocal().toIso8601String()); + }); + + test('upsertSleepSessions replaces stage intervals for a re-synced session', () async { + final start = DateTime(2026, 8, 10, 23); + final end = DateTime(2026, 8, 11, 7); + + await storage.upsertSleepSessions([ + SleepPeriod( + start: start, + end: end, + lightMinutes: 200, + deepMinutes: 60, + remMinutes: 100, + awakeMinutes: 10, + stageTimeline: [ + SleepStageInterval(start: start, end: start.add(const Duration(hours: 1)), stage: 'light'), + ], + ), + ]); + + await storage.upsertSleepSessions([ + SleepPeriod( + start: start, + end: end, + lightMinutes: 190, + deepMinutes: 70, + remMinutes: 100, + awakeMinutes: 10, + stageTimeline: [ + SleepStageInterval(start: start, end: start.add(const Duration(hours: 2)), stage: 'deep'), + ], + ), + ]); + + final sessions = await rawQuery(storage, 'SELECT id, deep_min FROM sleep_sessions'); + expect(sessions.length, 1); + expect(sessions.first['deep_min'], 70); + + final intervals = await rawQuery( + storage, + 'SELECT stage FROM sleep_stage_intervals WHERE sleep_session_id = ?', + [sessions.first['id']], + ); + expect(intervals.length, 1); + expect(intervals.first['stage'], 'deep'); + }); + }); + + group('SqliteStorageService — schema upgrade', () { + test('onUpgrade adds health tables to a pre-existing v1 database', () async { + final path = + '${Directory.systemTemp.path}/sqlite_v1_upgrade_${DateTime.now().microsecondsSinceEpoch}.db'; + final v1 = await openDatabase( + path, + version: 1, + onCreate: (db, v) async { + await db.execute('''CREATE TABLE muscle_groups ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + growth_rate REAL NOT NULL DEFAULT 0, + last_updated TEXT NOT NULL + )'''); + }, + ); + await v1.close(); + + final upgraded = SqliteStorageService(databasePathOverride: path); + await upgraded.init(); + + final tableRows = await rawQuery( + upgraded, + "SELECT name FROM sqlite_master WHERE type = 'table'", + ); + final names = tableRows.map((r) => r['name'] as String).toSet(); + expect(names, containsAll(['health_samples', 'sleep_sessions', 'sleep_stage_intervals'])); + + await upgraded.close(); + await File(path).delete(); + }); + + test('onUpgrade rebuilds v2 health tables on the utc_ts shape', () async { + final path = + '${Directory.systemTemp.path}/sqlite_v2_upgrade_${DateTime.now().microsecondsSinceEpoch}.db'; + final v2 = await openDatabase( + path, + version: 2, + onCreate: (db, v) async { + await db.execute('''CREATE TABLE muscle_groups ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + growth_rate REAL NOT NULL DEFAULT 0, + last_updated TEXT NOT NULL + )'''); + await db.execute('''CREATE TABLE settings ( + key TEXT PRIMARY KEY, + value TEXT + )'''); + // The v2 shape: no utc_ts, unique on the ambiguous local string. + await db.execute('''CREATE TABLE health_samples ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + type TEXT NOT NULL, + timestamp TEXT NOT NULL, + value REAL NOT NULL + )'''); + await db.execute( + 'CREATE UNIQUE INDEX idx_health_samples_unique ON health_samples(type, timestamp)'); + await db.execute('''CREATE TABLE sleep_sessions ( + id TEXT PRIMARY KEY, + start_ts TEXT NOT NULL, + end_ts TEXT NOT NULL, + light_min INTEGER, + deep_min INTEGER, + rem_min INTEGER, + awake_min INTEGER + )'''); + await db.execute('''CREATE TABLE sleep_stage_intervals ( + sleep_session_id TEXT NOT NULL, + start_ts TEXT NOT NULL, + end_ts TEXT NOT NULL, + stage TEXT NOT NULL + )'''); + await db.insert('health_samples', { + 'type': 'heart_rate', + 'timestamp': '2026-08-10T22:30:00.000', + 'value': 60.0, + }); + await db.insert('settings', + {'key': 'health_sync.heart_rate', 'value': '2026-08-10T22:30:00.000Z'}); + await db.insert('settings', {'key': 'userName', 'value': 'Devasy'}); + }, + ); + await v2.close(); + + final upgraded = SqliteStorageService(databasePathOverride: path); + await upgraded.init(); + + // The cache is rebuilt on the new shape... + final cols = await rawQuery(upgraded, 'PRAGMA table_info(health_samples)'); + expect(cols.map((c) => c['name']), contains('utc_ts')); + final samples = await rawQuery(upgraded, 'SELECT COUNT(*) AS n FROM health_samples'); + expect(samples.first['n'], 0); + + // ...the watermarks are cleared so the next sync re-pulls the window... + final watermarks = await rawQuery( + upgraded, + "SELECT COUNT(*) AS n FROM settings WHERE key LIKE 'health_sync.%'", + ); + expect(watermarks.first['n'], 0); + + // ...and unrelated settings are left alone. + expect(await upgraded.getSetting('userName'), 'Devasy'); + + await upgraded.close(); + await File(path).delete(); + }); + }); + + group('SqliteStorageService — workout sessions', () { + test('saveWorkoutSession + getWorkoutSession round-trips nested sets', () async { + final session = WorkoutSession( + id: 's1', + date: DateTime(2026, 7, 10), + duration: 45, + exercises: [ + ExerciseLog( + exerciseId: 'bench_press', + sets: [ + WorkoutSet(weight: 60, reps: 8), + WorkoutSet(weight: 65, reps: 6, isDropset: true, drops: [ + DropsetEntry(weight: 50, reps: 10), + ]), + ], + ), + ], + ); + + await storage.saveWorkoutSession(session); + final fetched = await storage.getWorkoutSession('s1'); + + expect(fetched, isNotNull); + expect(fetched!.duration, 45); + expect(fetched.exercises.single.sets.length, 2); + expect(fetched.exercises.single.sets.first.weight, 60); + expect(fetched.exercises.single.sets[1].isDropset, isTrue); + expect(fetched.exercises.single.sets[1].drops!.single.weight, 50); + }); + + test('preserves set order with 11+ sets (regression: synthetic ids like ' + '"_10" sort before "_2" lexicographically, so ordering must use ' + 'rowid, not id)', () async { + final weights = [for (var i = 0; i < 11; i++) 40.0 + i]; + final session = WorkoutSession( + id: 's_order', + date: DateTime(2026, 7, 15), + duration: 60, + exercises: [ + ExerciseLog( + exerciseId: 'bench_press', + sets: [for (final w in weights) WorkoutSet(weight: w, reps: 5)], + ), + ], + ); + + await storage.saveWorkoutSession(session); + final fetched = await storage.getWorkoutSession('s_order'); + + expect( + fetched!.exercises.single.sets.map((s) => s.weight).toList(), + weights, + ); + }); + + test('preserves exercise-log order with 11+ exercises in one session', + () async { + final session = WorkoutSession( + id: 's_order_logs', + date: DateTime(2026, 7, 16), + duration: 90, + exercises: [ + for (var i = 0; i < 11; i++) + ExerciseLog( + exerciseId: 'exercise_$i', + sets: [WorkoutSet(weight: 10.0 + i, reps: 5)], + ), + ], + ); + + await storage.saveWorkoutSession(session); + final fetched = await storage.getWorkoutSession('s_order_logs'); + + expect( + fetched!.exercises.map((e) => e.exerciseId).toList(), + [for (var i = 0; i < 11; i++) 'exercise_$i'], + ); + }); + + test('saveWorkoutSession overwrites previous sets on re-save', () async { + final session = WorkoutSession( + id: 's2', + date: DateTime(2026, 7, 1), + duration: 30, + exercises: [ + ExerciseLog(exerciseId: 'squat', sets: [WorkoutSet(weight: 100, reps: 5)]), + ], + ); + await storage.saveWorkoutSession(session); + + final updated = session.copyWith( + exercises: [ + ExerciseLog(exerciseId: 'squat', sets: [WorkoutSet(weight: 110, reps: 3)]), + ], + ); + await storage.saveWorkoutSession(updated); + + final fetched = await storage.getWorkoutSession('s2'); + expect(fetched!.exercises.single.sets.length, 1); + expect(fetched.exercises.single.sets.first.weight, 110); + }); + + test('deleteWorkoutSession removes the session', () async { + final session = WorkoutSession( + id: 's3', + date: DateTime.now(), + duration: 20, + exercises: [ExerciseLog(exerciseId: 'row', sets: [WorkoutSet(weight: 40, reps: 10)])], + ); + await storage.saveWorkoutSession(session); + await storage.deleteWorkoutSession('s3'); + expect(await storage.getWorkoutSession('s3'), isNull); + }); + + test('getAllWorkoutSessions returns most-recent first', () async { + await storage.saveWorkoutSession( + WorkoutSession(id: 'old', date: DateTime(2026, 1, 1), duration: 10, exercises: []), + ); + await storage.saveWorkoutSession( + WorkoutSession(id: 'new', date: DateTime(2026, 6, 1), duration: 10, exercises: []), + ); + final all = await storage.getAllWorkoutSessions(); + expect(all.first.id, 'new'); + }); + + test('getSessionsInDateRange filters by date', () async { + await storage.saveWorkoutSession( + WorkoutSession(id: 'a', date: DateTime(2026, 1, 1), duration: 10, exercises: []), + ); + await storage.saveWorkoutSession( + WorkoutSession(id: 'b', date: DateTime(2026, 6, 1), duration: 10, exercises: []), + ); + final result = await storage.getSessionsInDateRange(DateTime(2026, 5, 1), DateTime(2026, 7, 1)); + expect(result.map((s) => s.id), ['b']); + }); + + test('getSessionsForExercise filters by exercise id', () async { + await storage.saveWorkoutSession(WorkoutSession( + id: 'c1', date: DateTime.now(), duration: 10, + exercises: [ExerciseLog(exerciseId: 'deadlift', sets: [WorkoutSet(weight: 120, reps: 5)])], + )); + await storage.saveWorkoutSession(WorkoutSession( + id: 'c2', date: DateTime.now(), duration: 10, + exercises: [ExerciseLog(exerciseId: 'squat', sets: [WorkoutSet(weight: 100, reps: 5)])], + )); + final result = await storage.getSessionsForExercise('deadlift'); + expect(result.map((s) => s.id), ['c1']); + }); + + test('saveWorkoutSession + getWorkoutSession round-trips bodyWeightAtLog', () async { + final session = WorkoutSession( + id: 's4', + date: DateTime(2026, 7, 5), + duration: 25, + exercises: [ + ExerciseLog( + exerciseId: 'assisted_pullup', + sets: [WorkoutSet(weight: 20, reps: 8, bodyWeightAtLog: 75.5)], + ), + ], + ); + await storage.saveWorkoutSession(session); + final fetched = await storage.getWorkoutSession('s4'); + expect(fetched!.exercises.single.sets.single.bodyWeightAtLog, 75.5); + }); + }); + + group('SqliteStorageService — routines', () { + test('saveRoutine + getRoutine round-trips ordered exercise ids', () async { + await storage.saveRoutine(Routine( + id: 'r1', + name: 'Push Day', + exerciseIds: ['bench_press', 'shoulder_press', 'triceps_pushdown'], + )); + final fetched = await storage.getRoutine('r1'); + expect(fetched!.name, 'Push Day'); + expect(fetched.exerciseIds, ['bench_press', 'shoulder_press', 'triceps_pushdown']); + }); + + test('saveRoutine overwrites exercise order on re-save', () async { + await storage.saveRoutine(Routine(id: 'r2', name: 'Pull Day', exerciseIds: ['a', 'b'])); + await storage.saveRoutine(Routine(id: 'r2', name: 'Pull Day', exerciseIds: ['b', 'a', 'c'])); + final fetched = await storage.getRoutine('r2'); + expect(fetched!.exerciseIds, ['b', 'a', 'c']); + }); + + test('deleteRoutine removes it', () async { + await storage.saveRoutine(Routine(id: 'r3', name: 'Legs', exerciseIds: ['squat'])); + await storage.deleteRoutine('r3'); + expect(await storage.getRoutine('r3'), isNull); + }); + + test('getAllRoutines returns all saved routines', () async { + await storage.saveRoutine(Routine(id: 'r4', name: 'A', exerciseIds: [])); + await storage.saveRoutine(Routine(id: 'r5', name: 'B', exerciseIds: [])); + final all = await storage.getAllRoutines(); + expect(all.map((r) => r.id), containsAll(['r4', 'r5'])); + }); + }); + + group('SqliteStorageService — targets', () { + test('saveTarget + getTarget round-trips', () async { + await storage.saveTarget(Target( + id: 't1', + exerciseId: 'bench_press', + targetType: 'weight', + targetValue: 100, + currentValue: 70, + )); + final fetched = await storage.getTarget('t1'); + expect(fetched!.targetValue, 100); + expect(fetched.currentValue, 70); + }); + + test('deleteTarget removes it', () async { + await storage.saveTarget(Target(id: 't2', exerciseId: 'squat', targetType: 'weight', targetValue: 150)); + await storage.deleteTarget('t2'); + expect(await storage.getTarget('t2'), isNull); + }); + + test('getTargetsForExercise filters by exercise id', () async { + await storage.saveTarget(Target(id: 't3', exerciseId: 'squat', targetType: 'weight', targetValue: 150)); + await storage.saveTarget(Target(id: 't4', exerciseId: 'deadlift', targetType: 'weight', targetValue: 180)); + final result = await storage.getTargetsForExercise('squat'); + expect(result.map((t) => t.id), ['t3']); + }); + }); + + group('SqliteStorageService — muscle groups', () { + test('updateMuscleGroupGrowthRate updates an existing group', () async { + final groups = await storage.getAllMuscleGroups(); + final chest = groups.firstWhere((g) => g.name == 'Chest'); + await storage.updateMuscleGroupGrowthRate(chest.id, 2.5); + final updated = await storage.getMuscleGroup(chest.id); + expect(updated!.growthRate, 2.5); + }); + }); + + group('SqliteStorageService — custom exercises', () { + test('saveCustomExercise + getExercise round-trips muscle activations', () async { + final exercise = Exercise( + id: 'custom1', + name: 'Cable Crossover', + category: 'isolation', + isCustom: true, + muscleActivations: [ + MuscleActivation(muscleGroupId: 'chest', activationPercentage: 80), + MuscleActivation(muscleGroupId: 'triceps', activationPercentage: 20), + ], + ); + await storage.saveCustomExercise(exercise); + + final fetched = await storage.getExercise('custom1'); + expect(fetched, isNotNull); + expect(fetched!.name, 'Cable Crossover'); + expect(fetched.muscleActivations.length, 2); + expect(fetched.primaryMuscle, 'chest'); + }); + + test('getExercise falls back to built-in exercises', () async { + final builtIns = ExerciseDatabase.getAll(); + final known = builtIns.first; + final fetched = await storage.getExercise(known.id); + expect(fetched!.name, known.name); + }); + + test('getAllExercises merges built-in and custom', () async { + await storage.saveCustomExercise(Exercise( + id: 'custom2', + name: 'My Exercise', + category: 'compound', + isCustom: true, + muscleActivations: [MuscleActivation(muscleGroupId: 'back', activationPercentage: 100)], + )); + final all = await storage.getAllExercises(); + expect(all.any((e) => e.id == 'custom2'), isTrue); + expect(all.length, greaterThan(1)); + }); + + test('deleteCustomExercise removes it and its activations', () async { + await storage.saveCustomExercise(Exercise( + id: 'custom3', + name: 'Temp', + category: 'isolation', + isCustom: true, + muscleActivations: [MuscleActivation(muscleGroupId: 'biceps', activationPercentage: 100)], + )); + await storage.deleteCustomExercise('custom3'); + expect(await storage.getExercise('custom3'), isNull); + final custom = await storage.getCustomExercises(); + expect(custom.any((e) => e.id == 'custom3'), isFalse); + }); + }); + + group('SqliteStorageService — settings', () { + test('saveSetting + getSetting round-trips, overwrite replaces value', () async { + await storage.saveSetting('user_name', 'Alex'); + expect(await storage.getSetting('user_name'), 'Alex'); + await storage.saveSetting('user_name', 'Sam'); + expect(await storage.getSetting('user_name'), 'Sam'); + }); + + test('getSetting returns null for unknown key', () async { + expect(await storage.getSetting('does_not_exist'), isNull); + }); + }); + + group('SqliteStorageService — personal records', () { + test('savePersonalRecord + getPersonalRecord round-trips', () async { + await storage.savePersonalRecord(PersonalRecord( + exerciseId: 'bench_press', + bestWeight: 90, + bestReps: 5, + bestVolume: 450, + achievedAt: DateTime(2026, 4, 1), + )); + final pr = await storage.getPersonalRecord('bench_press'); + expect(pr!.bestWeight, 90); + }); + + test('getAllPersonalRecords returns everything saved', () async { + await storage.savePersonalRecord(PersonalRecord( + exerciseId: 'squat', bestWeight: 150, bestReps: 3, bestVolume: 450, achievedAt: DateTime(2026, 3, 1), + )); + final all = await storage.getAllPersonalRecords(); + expect(all.any((r) => r.exerciseId == 'squat'), isTrue); + }); + }); + + group('SqliteStorageService — training programs', () { + test('saveTrainingProgram + getTrainingProgram round-trips phases/weeks', () async { + final program = TrainingProgram( + id: 'p1', + name: '12-Week Strength', + totalWeeks: 12, + phases: [], + weeks: [], + ); + await storage.saveTrainingProgram(program); + final fetched = await storage.getTrainingProgram('p1'); + expect(fetched!.name, '12-Week Strength'); + expect(fetched.totalWeeks, 12); + }); + + test('deleteTrainingProgram removes it', () async { + await storage.saveTrainingProgram(TrainingProgram(id: 'p2', name: 'X', totalWeeks: 4, phases: [], weeks: [])); + await storage.deleteTrainingProgram('p2'); + expect(await storage.getTrainingProgram('p2'), isNull); + }); + }); + + group('SqliteStorageService — conversations', () { + test('saveConversation + getConversation round-trips messages', () async { + final conversation = Conversation( + id: 'c1', + title: 'Progress check', + messages: [ChatMessage(role: 'user', text: 'How is my bench doing?')], + ); + await storage.saveConversation(conversation); + final fetched = await storage.getConversation('c1'); + expect(fetched!.messages.single.text, 'How is my bench doing?'); + }); + + test('getAllConversations returns most-recently-updated first', () async { + await storage.saveConversation(Conversation( + id: 'c2', title: 'Old', updatedAt: DateTime(2026, 1, 1), messages: [], + )); + await storage.saveConversation(Conversation( + id: 'c3', title: 'New', updatedAt: DateTime(2026, 6, 1), messages: [], + )); + final all = await storage.getAllConversations(); + expect(all.first.id, 'c3'); + }); + + test('deleteConversation removes it', () async { + await storage.saveConversation(Conversation(id: 'c4', title: 'Temp', messages: [])); + await storage.deleteConversation('c4'); + expect(await storage.getConversation('c4'), isNull); + }); + }); + + group('SqliteStorageService — quick stats', () { + test('getQuickStats aggregates the last 7 days', () async { + await storage.saveWorkoutSession(WorkoutSession( + id: 'stat1', + date: DateTime.now(), + duration: 30, + exercises: [ExerciseLog(exerciseId: 'bench_press', sets: [WorkoutSet(weight: 60, reps: 10)])], + )); + final stats = await storage.getQuickStats(); + expect(stats['totalWorkouts'], greaterThanOrEqualTo(1)); + expect(stats['weeklyWorkouts'], greaterThanOrEqualTo(1)); + }); + }); + + group('SqliteStorageService — export/import', () { + test('exportAllData includes sessions, routines, settings', () async { + await storage.saveWorkoutSession(WorkoutSession( + id: 'exp1', date: DateTime(2026, 5, 1), duration: 20, + exercises: [ExerciseLog(exerciseId: 'row', sets: [WorkoutSet(weight: 40, reps: 10)])], + )); + await storage.saveRoutine(Routine(id: 'exp_r1', name: 'Export Routine', exerciseIds: ['row'])); + await storage.saveSetting('unit', 'kg'); + + final json = await storage.exportAllData(); + final data = jsonDecode(json) as Map; + + expect((data['sessions'] as List).any((s) => s['id'] == 'exp1'), isTrue); + expect((data['routines'] as List).any((r) => r['id'] == 'exp_r1'), isTrue); + expect((data['settings'] as Map)['unit'], 'kg'); + }); + + test('importData merges without overwriting existing ids', () async { + await storage.saveWorkoutSession(WorkoutSession( + id: 'imp1', date: DateTime(2026, 1, 1), duration: 15, + exercises: [ExerciseLog(exerciseId: 'row', sets: [WorkoutSet(weight: 30, reps: 12)])], + )); + + final payload = jsonEncode({ + 'sessions': [ + { + 'id': 'imp1', // already exists — must be skipped + 'date': DateTime(2099, 1, 1).toIso8601String(), + 'duration': 999, + 'exercises': [], + }, + { + 'id': 'imp2', // new — must be imported + 'date': DateTime(2026, 2, 1).toIso8601String(), + 'duration': 25, + 'exercises': [], + }, + ], + 'settings': {'imported_key': 'imported_value'}, + }); + + await storage.importData(payload); + + final existing = await storage.getWorkoutSession('imp1'); + expect(existing!.duration, 15); // untouched + final imported = await storage.getWorkoutSession('imp2'); + expect(imported!.duration, 25); + expect(await storage.getSetting('imported_key'), 'imported_value'); + }); + }); +} diff --git a/workout-logger/test/storage_backend_resolver_test.dart b/workout-logger/test/storage_backend_resolver_test.dart new file mode 100644 index 0000000..e6995ca --- /dev/null +++ b/workout-logger/test/storage_backend_resolver_test.dart @@ -0,0 +1,99 @@ +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:hive/hive.dart'; +import 'package:sqflite_common_ffi/sqflite_ffi.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/storage_service.dart'; +import 'package:repforge/services/sqlite_storage_service.dart'; +import 'package:repforge/services/storage_backend_resolver.dart'; + +/// Forces the migration to fail without adding new production API surface — +/// [SqliteStorageService.saveWorkoutSession] is the first write +/// [StorageMigrationService.migrate] performs against a seeded hiveStorage. +class _FailingSqliteStorage extends SqliteStorageService { + _FailingSqliteStorage() : super(databasePathOverride: inMemoryDatabasePath); + + @override + Future saveWorkoutSession(WorkoutSession session) async => + throw StateError('forced migration failure'); +} + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + late StorageService hiveStorage; + late SqliteStorageService sqliteStorage; + + setUpAll(() async { + const channel = MethodChannel('plugins.flutter.io/path_provider'); + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler( + channel, + (call) async => + call.method == 'getApplicationDocumentsDirectory' ? './test/tmp_hive_backend_resolver' : null, + ); + Hive.init('./test/tmp_hive_backend_resolver'); + sqfliteFfiInit(); + databaseFactory = databaseFactoryFfi; + }); + + setUp(() async { + hiveStorage = StorageService(); + await hiveStorage.init(); + sqliteStorage = SqliteStorageService(databasePathOverride: inMemoryDatabasePath); + await sqliteStorage.init(); + addTearDown(sqliteStorage.close); + }); + + // hiveStorage reuses the same on-disk box across every test in this file + // (only Hive.init() runs once, in setUpAll) — reset the flag it wrote so + // each test starts from a clean, order-independent state instead of + // relying on test declaration order. + tearDown(() async { + await Hive.box('settings').delete(storageMigratedFlagKey); + }); + + tearDownAll(() async { + await Hive.close(); + await Hive.deleteFromDisk(); + }); + + test('alreadyMigrated false, migration fails, falls back to hive and writes no flag', + () async { + // migrate() only reaches saveWorkoutSession if there's a session to + // migrate — seed one so the forced failure actually triggers. + await hiveStorage.saveWorkoutSession(WorkoutSession( + id: 'fail1', date: DateTime(2026, 5, 1), duration: 10, exercises: const [], + )); + final failing = _FailingSqliteStorage(); + await failing.init(); + addTearDown(failing.close); + + final result = await resolveStorageBackend( + hiveStorage: hiveStorage, + sqliteStorage: failing, + alreadyMigrated: false, + ); + + expect(result, same(hiveStorage)); + expect(await hiveStorage.getSetting(storageMigratedFlagKey), isNull); + }); + + test('alreadyMigrated true returns sqlite without touching migration', () async { + final result = await resolveStorageBackend( + hiveStorage: hiveStorage, + sqliteStorage: sqliteStorage, + alreadyMigrated: true, + ); + expect(result, same(sqliteStorage)); + }); + + test('alreadyMigrated false, migration succeeds, returns sqlite and writes flag', () async { + final result = await resolveStorageBackend( + hiveStorage: hiveStorage, + sqliteStorage: sqliteStorage, + alreadyMigrated: false, + ); + expect(result, same(sqliteStorage)); + expect(await hiveStorage.getSetting(storageMigratedFlagKey), 'true'); + }); +} diff --git a/workout-logger/test/storage_migration_service_test.dart b/workout-logger/test/storage_migration_service_test.dart new file mode 100644 index 0000000..6847049 --- /dev/null +++ b/workout-logger/test/storage_migration_service_test.dart @@ -0,0 +1,75 @@ +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:hive/hive.dart'; +import 'package:sqflite_common_ffi/sqflite_ffi.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/storage_service.dart'; +import 'package:repforge/services/sqlite_storage_service.dart'; +import 'package:repforge/services/storage_migration_service.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + late StorageService hiveStorage; + late SqliteStorageService sqliteStorage; + + setUpAll(() async { + const channel = MethodChannel('plugins.flutter.io/path_provider'); + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler( + channel, + (call) async => + call.method == 'getApplicationDocumentsDirectory' ? './test/tmp_hive_migration_service' : null, + ); + Hive.init('./test/tmp_hive_migration_service'); + sqfliteFfiInit(); + databaseFactory = databaseFactoryFfi; + }); + + setUp(() async { + hiveStorage = StorageService(); + await hiveStorage.init(); + sqliteStorage = SqliteStorageService(databasePathOverride: inMemoryDatabasePath); + await sqliteStorage.init(); + }); + + tearDownAll(() async { + await Hive.close(); + await Hive.deleteFromDisk(); + }); + + test('migrate copies every entity type from Hive to SQLite', () async { + await hiveStorage.saveWorkoutSession(WorkoutSession( + id: 'sess1', date: DateTime(2026, 5, 1), duration: 40, + exercises: [ExerciseLog(exerciseId: 'bench_press', sets: [WorkoutSet(weight: 70, reps: 8)])], + )); + await hiveStorage.saveRoutine(Routine(id: 'r1', name: 'Push Day', exerciseIds: ['bench_press'])); + await hiveStorage.saveTarget(Target(id: 't1', exerciseId: 'bench_press', targetType: 'weight', targetValue: 100)); + await hiveStorage.savePersonalRecord(PersonalRecord( + exerciseId: 'bench_press', bestWeight: 90, bestReps: 5, bestVolume: 450, achievedAt: DateTime(2026, 4, 1), + )); + await hiveStorage.saveCustomExercise(Exercise( + id: 'custom_mig', name: 'Migrated Exercise', category: 'isolation', isCustom: true, + muscleActivations: [MuscleActivation(muscleGroupId: 'chest', activationPercentage: 100)], + )); + await hiveStorage.saveConversation(Conversation(id: 'conv1', title: 'Chat', messages: [])); + await hiveStorage.saveSetting('user_name', 'Alex'); + await hiveStorage.saveTrainingProgram(TrainingProgram( + id: 'prog1', name: 'Push Pull Legs', totalWeeks: 6, phases: const [], weeks: const [], + )); + // Growth rate starts at the seeded default (0); modify it on the Hive + // side so the migrated value can be distinguished from an unmigrated one. + await hiveStorage.updateMuscleGroupGrowthRate('chest', 0.42); + + await StorageMigrationService(hiveStorage, sqliteStorage).migrate(); + + expect((await sqliteStorage.getWorkoutSession('sess1'))?.duration, 40); + expect((await sqliteStorage.getRoutine('r1'))?.name, 'Push Day'); + expect((await sqliteStorage.getTarget('t1'))?.targetValue, 100); + expect((await sqliteStorage.getPersonalRecord('bench_press'))?.bestWeight, 90); + expect((await sqliteStorage.getExercise('custom_mig'))?.name, 'Migrated Exercise'); + expect((await sqliteStorage.getConversation('conv1'))?.title, 'Chat'); + expect(await sqliteStorage.getSetting('user_name'), 'Alex'); + expect((await sqliteStorage.getTrainingProgram('prog1'))?.name, 'Push Pull Legs'); + expect((await sqliteStorage.getMuscleGroup('chest'))?.growthRate, 0.42); + }); +} diff --git a/workout-logger/test/storage_service_test.dart b/workout-logger/test/storage_service_test.dart new file mode 100644 index 0000000..3e38129 --- /dev/null +++ b/workout-logger/test/storage_service_test.dart @@ -0,0 +1,191 @@ +import 'dart:convert'; +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:hive/hive.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/storage_service.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + late StorageService storage; + + setUpAll(() async { + const MethodChannel channel = MethodChannel('plugins.flutter.io/path_provider'); + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler( + channel, + (MethodCall methodCall) async { + if (methodCall.method == 'getApplicationDocumentsDirectory') { + return './test/tmp_hive_storage_service'; + } + return null; + }, + ); + Hive.init('./test/tmp_hive_storage_service'); + }); + + setUp(() async { + storage = StorageService(); + await storage.init(); + }); + + tearDownAll(() async { + await Hive.close(); + await Hive.deleteFromDisk(); + }); + + group('StorageService CRUD & Operations', () { + test('init initializes default muscle groups', () async { + final groups = await storage.getAllMuscleGroups(); + expect(groups, isNotEmpty); + expect(groups.any((g) => g.name == 'Chest'), isTrue); + }); + + test('WorkoutSession save, get, getAll, getSessionsInDateRange, and delete', () async { + final session1 = WorkoutSession( + id: 's_101', + date: DateTime(2026, 7, 10), + duration: 45, + exercises: [ + ExerciseLog( + exerciseId: 'squat_id', + sets: [WorkoutSet(weight: 100, reps: 5)], + ), + ], + ); + + final session2 = WorkoutSession( + id: 's_102', + date: DateTime(2026, 7, 15), + duration: 60, + exercises: [ + ExerciseLog( + exerciseId: 'bench_id', + sets: [WorkoutSet(weight: 80, reps: 8)], + ), + ], + ); + + await storage.saveWorkoutSession(session1); + await storage.saveWorkoutSession(session2); + + final fetched1 = await storage.getWorkoutSession('s_101'); + expect(fetched1, isNotNull); + expect(fetched1!.duration, equals(45)); + + final allSessions = await storage.getAllWorkoutSessions(); + expect(allSessions.length, greaterThanOrEqualTo(2)); + // Verify most recent session first sorting + expect(allSessions.first.date.isAfter(allSessions[1].date), isTrue); + + final forSquat = await storage.getSessionsForExercise('squat_id'); + expect(forSquat.length, equals(1)); + expect(forSquat.first.id, equals('s_101')); + + final rangeSessions = await storage.getSessionsInDateRange( + DateTime(2026, 7, 12), + DateTime(2026, 7, 20), + ); + expect(rangeSessions.length, equals(1)); + expect(rangeSessions.first.id, equals('s_102')); + + await storage.deleteWorkoutSession('s_101'); + expect(await storage.getWorkoutSession('s_101'), isNull); + }); + + test('Routine CRUD', () async { + final routine = Routine( + id: 'r_101', + name: 'Push Pull Legs - Push', + exerciseIds: ['ex_bench', 'ex_ohp'], + ); + + await storage.saveRoutine(routine); + + final fetched = await storage.getRoutine('r_101'); + expect(fetched, isNotNull); + expect(fetched!.name, equals('Push Pull Legs - Push')); + + final allRoutines = await storage.getAllRoutines(); + expect(allRoutines.any((r) => r.id == 'r_101'), isTrue); + + await storage.deleteRoutine('r_101'); + expect(await storage.getRoutine('r_101'), isNull); + }); + + test('Target CRUD and getTargetsForExercise', () async { + final target = Target( + id: 't_101', + exerciseId: 'ex_bench', + targetValue: 100.0, + targetType: 'weight', + ); + + await storage.saveTarget(target); + + final fetched = await storage.getTarget('t_101'); + expect(fetched, isNotNull); + expect(fetched!.targetValue, equals(100.0)); + + final targetsForBench = await storage.getTargetsForExercise('ex_bench'); + expect(targetsForBench.length, equals(1)); + expect(targetsForBench.first.id, equals('t_101')); + + await storage.deleteTarget('t_101'); + expect(await storage.getTarget('t_101'), isNull); + }); + + test('Custom Exercise save, getAllExercises, getExercise, delete', () async { + final customEx = Exercise( + id: 'custom_ex_999', + name: 'Bulgarian Split Squat Special', + category: 'compound', + muscleActivations: [ + MuscleActivation(muscleGroupId: 'quadriceps', activationPercentage: 100), + ], + isCustom: true, + ); + + await storage.saveCustomExercise(customEx); + + final customList = await storage.getCustomExercises(); + expect(customList.any((e) => e.id == 'custom_ex_999'), isTrue); + + final allExercises = await storage.getAllExercises(); + expect(allExercises.any((e) => e.id == 'custom_ex_999'), isTrue); + + final fetched = await storage.getExercise('custom_ex_999'); + expect(fetched, isNotNull); + expect(fetched!.name, equals('Bulgarian Split Squat Special')); + + await storage.deleteCustomExercise('custom_ex_999'); + expect(await storage.getCustomExercises().then((l) => l.any((e) => e.id == 'custom_ex_999')), isFalse); + }); + + test('Export and import data payload', () async { + await storage.saveSetting('test_setting_key', 'test_val'); + + final exportJsonStr = await storage.exportAllData(); + expect(exportJsonStr, isNotEmpty); + + final exportedMap = jsonDecode(exportJsonStr) as Map; + expect(exportedMap.containsKey('settings'), isTrue); + expect(exportedMap.containsKey('exportDate'), isTrue); + + // Re-import payload + await storage.importData(exportJsonStr); + final val = await storage.getSetting('test_setting_key'); + expect(val, equals('test_val')); + }); + + test('getAllSettingsForMigration returns every saved key/value', () async { + await storage.saveSetting('mig_key_1', 'value_1'); + await storage.saveSetting('mig_key_2', 'value_2'); + + final all = await storage.getAllSettingsForMigration(); + + expect(all['mig_key_1'], 'value_1'); + expect(all['mig_key_2'], 'value_2'); + }); + }); +} diff --git a/workout-logger/test/test_utils/mock_ml_service.dart b/workout-logger/test/test_utils/mock_ml_service.dart index 100d089..4d6b7bf 100644 --- a/workout-logger/test/test_utils/mock_ml_service.dart +++ b/workout-logger/test/test_utils/mock_ml_service.dart @@ -26,6 +26,11 @@ class MockMLService implements IMLService { // Last parameters received String? lastExtractedExerciseId; List? lastRecommendedLastSession; + List>? lastPastSessions; + Map? lastRecoveryScores; + List? lastPrimaryMuscleIds; + ReadinessBand? lastReadinessBand; + double? lastSessionFatigueFactor; @override GrowthModel trainGrowthModel(List dataPoints) { @@ -84,17 +89,42 @@ class MockMLService implements IMLService { return {}; } + @override + Map lastTrainedPerMuscle( + List sessions, + Map exerciseMap, + ) { + return {}; + } + + @override + Map recoveryScoresFrom( + Map lastTrained, { + DateTime? asOf, + }) { + return {}; + } + @override List recommendSets({ required List lastSession, + List>? pastSessions, GrowthModel? growthModel, int minReps = 6, int maxReps = 12, Map? recoveryScores, List? primaryMuscleIds, + ReadinessBand? readinessBand, + double sessionFatigueFactor = 0.0, + DateTime? asOf, }) { recommendSetsCallCount++; lastRecommendedLastSession = lastSession; + lastPastSessions = pastSessions; + lastRecoveryScores = recoveryScores; + lastPrimaryMuscleIds = primaryMuscleIds; + lastReadinessBand = readinessBand; + lastSessionFatigueFactor = sessionFatigueFactor; return mockRecommendations ?? [ @@ -148,6 +178,11 @@ class MockMLService implements IMLService { predictTargetCompletionCallCount = 0; lastExtractedExerciseId = null; lastRecommendedLastSession = null; + lastPastSessions = null; + lastRecoveryScores = null; + lastPrimaryMuscleIds = null; + lastReadinessBand = null; + lastSessionFatigueFactor = null; mockGrowthModel = null; mockRecommendations = null; mockPrediction = null; diff --git a/workout-logger/test/test_utils/mock_storage_service.dart b/workout-logger/test/test_utils/mock_storage_service.dart index 2f0a9c3..47531ef 100644 --- a/workout-logger/test/test_utils/mock_storage_service.dart +++ b/workout-logger/test/test_utils/mock_storage_service.dart @@ -29,6 +29,13 @@ class MockStorageService implements IStorageService { Duration saveSettingDelay = Duration.zero; Duration Function(String key, String value)? saveSettingDelayResolver; + /// Return non-null to make [saveSetting] throw for that key/value instead + /// of storing it, for exercising partial-write rollback paths. + Object? Function(String key, String value)? saveSettingErrorResolver; + + /// Return non-null to make [saveWorkoutSession] throw for that session. + Object? Function(WorkoutSession session)? saveWorkoutSessionErrorResolver; + // Public getters for test assertions List get customExercises => _customExercises; List get sessions => _sessions; @@ -85,6 +92,8 @@ class MockStorageService implements IStorageService { @override Future saveWorkoutSession(WorkoutSession session) async { + final error = saveWorkoutSessionErrorResolver?.call(session); + if (error != null) throw error; final index = _sessions.indexWhere((s) => s.id == session.id); if (index >= 0) { _sessions[index] = session; @@ -232,6 +241,8 @@ class MockStorageService implements IStorageService { if (delay > Duration.zero) { await Future.delayed(delay); } + final error = saveSettingErrorResolver?.call(key, value); + if (error != null) throw error; saveSettingCallCount++; _settings[key] = value; } diff --git a/workout-logger/test/test_utils/stub_health_connect_service.dart b/workout-logger/test/test_utils/stub_health_connect_service.dart new file mode 100644 index 0000000..c6196f6 --- /dev/null +++ b/workout-logger/test/test_utils/stub_health_connect_service.dart @@ -0,0 +1,35 @@ +import 'package:repforge/models/models.dart'; +import 'package:repforge/services/interfaces/health_connect_service_interface.dart'; + +class StubHcService implements IHealthConnectService { + final List sleepPeriods; + final List hrSamples; + final List restingHrSamples; + + const StubHcService({ + this.sleepPeriods = const [], + this.hrSamples = const [], + this.restingHrSamples = const [], + }); + + @override + Future> readSleepSessions(DateTime start, DateTime end) async => List.from(sleepPeriods); + @override + Future> readHeartRateSamples(DateTime start, DateTime end) async => List.from(hrSamples); + @override + Future> readRestingHeartRate(DateTime start, DateTime end) async => List.from(restingHrSamples); + @override + Future> grantedReadTypes() async => {HealthReadType.heartRate, HealthReadType.sleep, HealthReadType.restingHeartRate}; + @override + Future> readHrvRmssd(DateTime start, DateTime end) async => const []; + @override + Future isAvailable() async => true; + @override + Future requestPermissions() async => true; + @override + Future hasPermissions() async => true; + @override + Future requestReadPermissions() async => true; + @override + Future syncWorkoutSession(WorkoutSession session, {String? title}) async => true; +} diff --git a/workout-logger/test/test_utils/test_fixtures.dart b/workout-logger/test/test_utils/test_fixtures.dart new file mode 100644 index 0000000..9c3e443 --- /dev/null +++ b/workout-logger/test/test_utils/test_fixtures.dart @@ -0,0 +1,94 @@ +// test_fixtures.dart — Reusable mock data generators for unit and widget tests. + +import 'package:repforge/models/models.dart'; + +class TestFixtures { + /// Generates a sample [WorkoutSession] with customizable parameters. + static WorkoutSession sampleSession({ + String id = 'session_fixture_1', + DateTime? date, + int duration = 45, + String? notes = 'Sample session notes', + List? exercises, + }) { + final sessionDate = date ?? DateTime(2026, 5, 10, 10, 0); + return WorkoutSession( + id: id, + date: sessionDate, + duration: duration, + notes: notes, + exercises: exercises ?? + [ + ExerciseLog( + exerciseId: 'bench_press', + sets: [ + WorkoutSet(weight: 80.0, reps: 10, timestamp: sessionDate.add(const Duration(minutes: 5))), + WorkoutSet(weight: 85.0, reps: 8, timestamp: sessionDate.add(const Duration(minutes: 10))), + ], + notes: 'Pushed hard on last set', + ), + ExerciseLog( + exerciseId: 'squats', + sets: [ + WorkoutSet(weight: 120.0, reps: 5, timestamp: sessionDate.add(const Duration(minutes: 20))), + ], + ), + ], + ); + } + + /// Generates a sample [Routine] with customizable parameters. + static Routine sampleRoutine({ + String id = 'routine_fixture_1', + String name = 'Upper Body Power', + List? exerciseIds, + }) { + return Routine( + id: id, + name: name, + exerciseIds: exerciseIds ?? ['bench_press', 'barbell_row', 'overhead_press'], + ); + } + + /// Generates a sample [TrainingProgram] with customizable parameters. + static TrainingProgram sampleProgram({ + String id = 'program_fixture_1', + String name = 'Hypertrophy 12-Week', + int totalWeeks = 12, + }) { + return TrainingProgram( + id: id, + name: name, + totalWeeks: totalWeeks, + weeks: const [], + phases: const [], + ); + } + + /// Generates sample [SleepPeriod] records for health charts. + static List sampleSleepPeriods({DateTime? anchorDate}) { + final anchor = anchorDate ?? DateTime(2026, 5, 10); + return [ + SleepPeriod( + start: anchor.subtract(const Duration(hours: 8)), + end: anchor, + deepMinutes: 120, + remMinutes: 90, + lightMinutes: 240, + awakeMinutes: 30, + ), + ]; + } + + /// Generates sample heart rate [HealthSample] records. + static List sampleHeartRateSamples({DateTime? anchorDate}) { + final anchor = anchorDate ?? DateTime(2026, 5, 10); + return List.generate( + 12, + (i) => HealthSample( + time: anchor.subtract(Duration(hours: 12 - i)), + value: 60.0 + (i * 3 % 25), + ), + ); + } +} diff --git a/workout-logger/test/test_utils/test_harness.dart b/workout-logger/test/test_utils/test_harness.dart new file mode 100644 index 0000000..d992980 --- /dev/null +++ b/workout-logger/test/test_utils/test_harness.dart @@ -0,0 +1,88 @@ +// test_harness.dart — Unified MultiProvider wrapper and viewport manager for widget tests. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:provider/provider.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/ai/gemini_ai_service.dart'; +import 'package:repforge/services/ai/coach_tool_service.dart'; +import 'package:repforge/services/managers/conversation_manager.dart'; +import 'package:repforge/services/managers/history_manager.dart'; +import 'package:repforge/services/managers/health_history_manager.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/managers/pr_manager.dart'; +import 'package:repforge/services/managers/readiness_manager.dart'; +import 'package:repforge/services/interfaces/health_connect_service_interface.dart'; +import 'package:repforge/services/interfaces/ml_service_interface.dart'; +import 'package:repforge/services/health_data_sync_service.dart'; +import 'mock_storage_service.dart'; +import 'mock_ml_service.dart'; +import 'stub_health_connect_service.dart'; + +class TestHarness { + /// Builds a fully-loaded MultiProvider widget tree for testing any Flutter screen or widget. + static Widget wrap( + Widget child, { + MockStorageService? storage, + WorkoutProvider? workoutProvider, + SettingsProvider? settingsProvider, + HistoryManager? historyManager, + HealthHistoryManager? healthHistoryManager, + ReadinessManager? readinessManager, + GeminiAiService? geminiAiService, + Size viewportSize = const Size(1080, 2400), + }) { + final mockStorage = storage ?? MockStorageService(); + final wp = workoutProvider ?? + WorkoutProvider( + mockStorage, + mlService: MockMLService(), + programManager: ProgramManager(mockStorage), + ); + final sp = settingsProvider ?? SettingsProvider(mockStorage); + final hm = historyManager ?? HistoryManager(mockStorage); + final hhm = healthHistoryManager ?? HealthHistoryManager(const StubHcService(), mockStorage); + final rm = readinessManager ?? ReadinessManager(const StubHcService(), mockStorage, sp); + final ai = geminiAiService ?? GeminiAiService(); + final prm = PRManager(mockStorage); + final conv = ConversationManager(mockStorage); + final tools = CoachToolService(workoutProvider: wp, prManager: prm); + + return MultiProvider( + providers: [ + ChangeNotifierProvider.value(value: wp), + ChangeNotifierProvider.value(value: sp), + ChangeNotifierProvider.value(value: hm), + ChangeNotifierProvider.value(value: prm), + ChangeNotifierProvider.value(value: ai), + ChangeNotifierProvider.value(value: conv), + ChangeNotifierProvider.value(value: rm), + Provider.value(value: hhm), + Provider.value(value: const StubHcService()), + Provider.value(value: null), + Provider.value(value: tools), + Provider.value(value: MockMLService()), + ], + child: MaterialApp( + home: MediaQuery( + data: MediaQueryData(size: viewportSize), + child: child, + ), + ), + ); + } + + /// Sets device physical dimensions for widget tests. + static Future prepareTester(WidgetTester tester, {Size size = const Size(1080, 2400)}) async { + await tester.binding.setSurfaceSize(size); + tester.view.physicalSize = size; + tester.view.devicePixelRatio = 1.0; + + addTearDown(() { + tester.view.resetPhysicalSize(); + tester.view.resetDevicePixelRatio(); + tester.binding.setSurfaceSize(null); + }); + } +} diff --git a/workout-logger/test/test_utils/test_robot.dart b/workout-logger/test/test_utils/test_robot.dart new file mode 100644 index 0000000..2bdb696 --- /dev/null +++ b/workout-logger/test/test_utils/test_robot.dart @@ -0,0 +1,93 @@ +// test_robot.dart — Fluent Page Object test automation robot for RepForge widget tests + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/managers/history_manager.dart'; +import 'package:repforge/services/ai/gemini_ai_service.dart'; +import 'mock_storage_service.dart'; +import 'test_harness.dart'; + +/// High-level expressive testing robot wrapping [WidgetTester]. +class TestRobot { + final WidgetTester tester; + + TestRobot(this.tester); + + /// Prepares viewport size and initializes screen widget under test. + Future pumpScreen( + Widget widget, { + MockStorageService? storage, + WorkoutProvider? workoutProvider, + SettingsProvider? settingsProvider, + HistoryManager? historyManager, + GeminiAiService? geminiAiService, + }) async { + await TestHarness.prepareTester(tester); + await tester.pumpWidget(TestHarness.wrap( + widget, + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + historyManager: historyManager, + geminiAiService: geminiAiService, + )); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + } + + /// Taps on a target matching text, icon, key, or Finder. + Future tap(dynamic target) async { + final finder = _resolveFinder(target); + expect(finder, findsOneWidget); + await tester.tap(finder); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + } + + /// Enters text into an input field matching a label, hint, or Finder. + Future fill(dynamic target, String text) async { + final finder = _resolveFinder(target); + expect(finder, findsOneWidget); + await tester.enterText(finder, text); + await tester.pump(); + expect(tester.takeException(), isNull); + } + + /// Triggers a back navigation event on active Navigator. + Future handlePop() async { + await tester.binding.handlePopRoute(); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + } + + /// Asserts that a target matching text, type, or Finder is visible. + void expectVisible(dynamic target, {int count = 1}) { + final finder = _resolveFinder(target); + if (count == 1) { + expect(finder, findsOneWidget); + } else { + expect(finder, findsNWidgets(count)); + } + } + + /// Asserts that a target matching text, type, or Finder is NOT visible. + void expectNotVisible(dynamic target) { + final finder = _resolveFinder(target); + expect(finder, findsNothing); + } + + Finder _resolveFinder(dynamic target) { + if (target is Finder) return target; + if (target is String) { + final textFinder = find.text(target); + if (textFinder.evaluate().isNotEmpty) return textFinder; + return find.widgetWithText(TextField, target); + } + if (target is IconData) return find.byIcon(target); + if (target is Key) return find.byKey(target); + if (target is Type) return find.byType(target); + throw ArgumentError('Cannot resolve finder for target: $target'); + } +} diff --git a/workout-logger/test/test_utils/test_sweep.dart b/workout-logger/test/test_utils/test_sweep.dart new file mode 100644 index 0000000..c99bc72 --- /dev/null +++ b/workout-logger/test/test_utils/test_sweep.dart @@ -0,0 +1,37 @@ +// test_sweep.dart — Parametric loop helpers to sweep through UI states efficiently. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +class TestSweep { + /// Iterates over a list of texts or icons, tapping each item and triggering pumpAndSettle. + static Future tapAll(WidgetTester tester, List targets) async { + for (final target in targets) { + final Finder? finder = target is String + ? find.text(target) + : target is IconData + ? find.byIcon(target) + : target is Key + ? find.byKey(target) + : null; + if (finder == null) continue; + + if (finder.evaluate().isNotEmpty) { + await tester.tap(finder.first); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + } + } + } + + /// Populates a series of text fields with values and pumps frame. + static Future fillFields(WidgetTester tester, Map fieldValues) async { + for (final entry in fieldValues.entries) { + if (entry.key.evaluate().isNotEmpty) { + await tester.enterText(entry.key, entry.value); + await tester.pump(); + } + } + await tester.pumpAndSettle(); + } +} diff --git a/workout-logger/test/userflow_ai_coach_and_gemini_service_test.dart b/workout-logger/test/userflow_ai_coach_and_gemini_service_test.dart new file mode 100644 index 0000000..4706d5a --- /dev/null +++ b/workout-logger/test/userflow_ai_coach_and_gemini_service_test.dart @@ -0,0 +1,74 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/ai_coach_screen.dart'; +import 'package:repforge/services/ai/gemini_ai_service.dart'; +import 'package:repforge/services/ai/coach_tool_service.dart'; +import 'package:repforge/services/managers/conversation_manager.dart'; +import 'package:repforge/services/managers/pr_manager.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/viewmodels/ai_coach_view_model.dart'; + +import 'test_utils/mock_storage_service.dart'; +import 'test_utils/mock_ml_service.dart'; +import 'test_utils/test_robot.dart'; + +void main() { + late MockStorageService storage; + late WorkoutProvider workoutProvider; + late SettingsProvider settingsProvider; + late ConversationManager conversationManager; + late PRManager prManager; + late GeminiAiService geminiService; + late CoachToolService coachToolService; + + setUp(() async { + storage = MockStorageService(); + workoutProvider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + ); + settingsProvider = SettingsProvider(storage); + conversationManager = ConversationManager(storage); + prManager = PRManager(storage); + geminiService = GeminiAiService(); + coachToolService = CoachToolService(workoutProvider: workoutProvider, prManager: prManager); + + await workoutProvider.init(); + await settingsProvider.init(); + await prManager.load(); + await conversationManager.loadConversations(); + }); + + group('Userflow: AI Coach Screen and Gemini Service Integration', () { + testWidgets('Renders AiCoachScreen and displays initial empty state', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const AiCoachScreen(), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(AiCoachScreen); + }); + + testWidgets('AiCoachViewModel loads conversation and manages state changes cleanly', (tester) async { + final vm = AiCoachViewModel( + ai: geminiService, + coachTools: coachToolService, + conversations: conversationManager, + settings: settingsProvider, + ); + + await vm.loadConversations(); + expect(vm.messages, isEmpty); + expect(vm.isLoading, isFalse); + + vm.newConversation(); + expect(vm.messages, isEmpty); + }); + }); +} diff --git a/workout-logger/test/userflow_health_and_profile_screen_test.dart b/workout-logger/test/userflow_health_and_profile_screen_test.dart new file mode 100644 index 0000000..7013d30 --- /dev/null +++ b/workout-logger/test/userflow_health_and_profile_screen_test.dart @@ -0,0 +1,74 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/screens/heart_rate_detail_screen.dart'; +import 'package:repforge/screens/sleep_detail_screen.dart'; +import 'package:repforge/screens/profile_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; + +import 'test_utils/mock_storage_service.dart'; +import 'test_utils/mock_ml_service.dart'; +import 'test_utils/test_robot.dart'; + +void main() { + late MockStorageService storage; + late WorkoutProvider workoutProvider; + late SettingsProvider settingsProvider; + + setUp(() async { + storage = MockStorageService(); + workoutProvider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + ); + settingsProvider = SettingsProvider(storage); + + await workoutProvider.init(); + await settingsProvider.init(); + }); + + group('Userflow: Heart Rate Detail, Sleep Detail, and Profile Screens', () { + testWidgets('HeartRateDetailScreen renders correctly with date anchor', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + HeartRateDetailScreen(initialDate: DateTime.now()), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(HeartRateDetailScreen); + expect(tester.takeException(), isNull); + }); + + testWidgets('SleepDetailScreen renders correctly with date anchor', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + SleepDetailScreen(initialDate: DateTime.now()), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(SleepDetailScreen); + expect(tester.takeException(), isNull); + }); + + testWidgets('ProfileScreen renders settings options and user metrics', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const ProfileScreen(), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(ProfileScreen); + expect(tester.takeException(), isNull); + }); + }); +} diff --git a/workout-logger/test/userflow_history_and_session_details_test.dart b/workout-logger/test/userflow_history_and_session_details_test.dart new file mode 100644 index 0000000..8294459 --- /dev/null +++ b/workout-logger/test/userflow_history_and_session_details_test.dart @@ -0,0 +1,116 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:provider/provider.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/history_screen.dart'; +import 'package:repforge/services/managers/health_history_manager.dart'; +import 'package:repforge/services/managers/history_manager.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'test_utils/mock_storage_service.dart'; +import 'test_utils/stub_health_connect_service.dart'; + +Widget _buildTestApp({ + required WorkoutProvider workoutProvider, + required SettingsProvider settingsProvider, + required HistoryManager historyManager, + required HealthHistoryManager healthHistoryManager, + required Widget child, +}) { + return MultiProvider( + providers: [ + Provider.value(value: healthHistoryManager), + ChangeNotifierProvider.value(value: workoutProvider), + ChangeNotifierProvider.value(value: settingsProvider), + ChangeNotifierProvider.value(value: historyManager), + ], + child: MaterialApp( + home: child, + ), + ); +} + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + late MockStorageService mockStorage; + late WorkoutProvider workoutProvider; + late SettingsProvider settingsProvider; + late HistoryManager historyManager; + late HealthHistoryManager healthHistoryManager; + + setUp(() async { + mockStorage = MockStorageService(); + historyManager = HistoryManager(mockStorage); + healthHistoryManager = HealthHistoryManager(StubHcService(), mockStorage); + workoutProvider = WorkoutProvider( + mockStorage, + programManager: ProgramManager(mockStorage), + historyManager: historyManager, + ); + settingsProvider = SettingsProvider(mockStorage); + + await workoutProvider.init(); + await settingsProvider.init(); + }); + + group('Userflow 2: History & Session Details Sheet Flow', () { + testWidgets('HistoryScreen renders title when no sessions recorded', (tester) async { + await tester.pumpWidget(_buildTestApp( + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + historyManager: historyManager, + healthHistoryManager: healthHistoryManager, + child: const HistoryScreen(), + )); + await tester.pumpAndSettle(); + + expect(find.text('History'), findsOneWidget); + }); + + testWidgets('HistoryScreen lists sessions and opens SessionDetailsSheet on tap', (tester) async { + tester.view.physicalSize = const Size(800, 1800); + tester.view.devicePixelRatio = 1.0; + addTearDown(tester.view.resetPhysicalSize); + + final session = WorkoutSession( + id: 'hist_s1', + date: DateTime.now(), + duration: 60, + exercises: [ + ExerciseLog( + exerciseId: 'squat_id', + sets: [ + WorkoutSet(weight: 140, reps: 5), + WorkoutSet(weight: 140, reps: 5), + ], + ), + ], + ); + + await mockStorage.saveWorkoutSession(session); + await historyManager.loadSessions(); + await workoutProvider.init(); // Reload sessions from storage + + await tester.pumpWidget(_buildTestApp( + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + historyManager: historyManager, + healthHistoryManager: healthHistoryManager, + child: const HistoryScreen(), + )); + await tester.pumpAndSettle(); + + // Tap session item in HistoryScreen to open SessionDetailsSheet + final sessionCard = find.text('Quick Workout'); + expect(sessionCard, findsOneWidget); + await tester.tap(sessionCard); + await tester.pumpAndSettle(); + + // Verify SessionDetailsSheet displays details + expect(find.textContaining('60 min'), findsOneWidget); + expect(find.text('Exercises'), findsOneWidget); + }); + }); +} diff --git a/workout-logger/test/userflow_program_design_and_generator_test.dart b/workout-logger/test/userflow_program_design_and_generator_test.dart new file mode 100644 index 0000000..12f98d9 --- /dev/null +++ b/workout-logger/test/userflow_program_design_and_generator_test.dart @@ -0,0 +1,138 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/programs/programs_screen.dart'; +import 'package:repforge/screens/programs/program_designer_screen.dart'; +import 'package:repforge/screens/programs/program_detail_screen.dart'; +import 'package:repforge/screens/ai_program_generator_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; + +import 'test_utils/mock_storage_service.dart'; +import 'test_utils/mock_ml_service.dart'; +import 'test_utils/test_robot.dart'; + +void main() { + late MockStorageService storage; + late WorkoutProvider workoutProvider; + late ProgramManager programManager; + + setUp(() async { + storage = MockStorageService(); + programManager = ProgramManager(storage); + workoutProvider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: programManager, + ); + await workoutProvider.init(); + }); + + group('Userflow: Programs, Designer, and AI Generator', () { + testWidgets('Full flow: Empty Programs -> New Designer Program -> Save & View Program Detail', (tester) async { + final robot = TestRobot(tester); + + // 1. Render empty ProgramsScreen + await robot.pumpScreen( + const ProgramsScreen(), + storage: storage, + workoutProvider: workoutProvider, + ); + + robot.expectVisible(ProgramsScreen); + robot.expectVisible('New Program'); + + // 2. Render ProgramDesignerScreen for new program + await robot.pumpScreen( + const ProgramDesignerScreen(), + storage: storage, + workoutProvider: workoutProvider, + ); + + robot.expectVisible(ProgramDesignerScreen); + + // Fill Title and Description + final textFields = find.byType(TextField); + if (textFields.evaluate().length >= 2) { + await tester.enterText(textFields.at(0), 'Strength Block 1'); + await tester.enterText(textFields.at(1), '4-week progressive overload'); + await tester.pumpAndSettle(); + } + + // Tap Save Program button + final saveBtn = find.text('Save Program'); + if (saveBtn.evaluate().isNotEmpty) { + await tester.tap(saveBtn); + await tester.pumpAndSettle(); + } + + // 3. Save a sample program into manager and view ProgramDetailScreen + final sampleProgram = TrainingProgram( + id: 'prog_test_1', + name: 'Hypertrophy Phase 1', + description: 'Targeted hypertrophy program', + totalWeeks: 4, + phases: [ + TrainingPhase( + id: 'phase_1', + name: 'Volume Phase', + startWeek: 1, + endWeek: 4, + ), + ], + weeks: [ + ProgramWeek( + weekNumber: 1, + days: [ + ProgramDay( + id: 'day_1', + name: 'Push Day A', + dayOfWeek: 1, + exercises: [], + ), + ], + ), + ], + ); + await programManager.saveProgram(sampleProgram); + + await robot.pumpScreen( + ProgramDetailScreen(program: sampleProgram), + storage: storage, + workoutProvider: workoutProvider, + ); + + robot.expectVisible('Hypertrophy Phase 1'); + expect(tester.takeException(), isNull); + }); + + testWidgets('AiProgramGeneratorScreen shows prompt suggestions and validates API configuration', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const AiProgramGeneratorScreen(), + storage: storage, + workoutProvider: workoutProvider, + ); + + robot.expectVisible(AiProgramGeneratorScreen); + + // Verify prompt suggestion chips render + final chipFinder = find.text('12-week hypertrophy, 4 days/week, push-pull-legs-upper'); + if (chipFinder.evaluate().isNotEmpty) { + await tester.tap(chipFinder); + await tester.pumpAndSettle(); + } + + // Tap Generate Program button + final genBtn = find.text('Generate Program'); + if (genBtn.evaluate().isNotEmpty) { + await tester.tap(genBtn); + await tester.pumpAndSettle(); + } + + // Verify prompt check/error prompt is raised gracefully + expect(tester.takeException(), isNull); + }); + }); +} diff --git a/workout-logger/test/userflow_programs_screen_deep_test.dart b/workout-logger/test/userflow_programs_screen_deep_test.dart new file mode 100644 index 0000000..2149ee4 --- /dev/null +++ b/workout-logger/test/userflow_programs_screen_deep_test.dart @@ -0,0 +1,103 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/programs/programs_screen.dart'; +import 'package:repforge/screens/programs/program_detail_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; + +import 'test_utils/mock_storage_service.dart'; +import 'test_utils/mock_ml_service.dart'; +import 'test_utils/test_robot.dart'; + +void main() { + late MockStorageService storage; + late ProgramManager programManager; + late WorkoutProvider workoutProvider; + + setUp(() async { + storage = MockStorageService(); + programManager = ProgramManager(storage); + workoutProvider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: programManager, + ); + + await workoutProvider.init(); + + // Create a sample program in storage + final program = TrainingProgram( + id: 'prog_deep_1', + name: 'Powerbuilding V1', + description: 'Strength and hypertrophy', + author: 'User', + totalWeeks: 4, + phases: [ + TrainingPhase( + id: 'phase_1', + name: 'Hypertrophy Phase', + startWeek: 1, + endWeek: 4, + ), + ], + weeks: [ + ProgramWeek( + weekNumber: 1, + phaseId: 'phase_1', + days: [ + ProgramDay( + id: 'day_1', + name: 'Push Day A', + exercises: [ + ProgramExerciseSlot( + exerciseId: 'bench_press', + sets: 4, + minReps: 8, + maxReps: 10, + restSeconds: 90, + ), + ], + ), + ], + ), + ], + ); + + await programManager.saveProgram(program); + }); + + group('ProgramsScreen Deep Coverage Suite', () { + testWidgets('Populated ProgramsScreen interactions: activate, view, and popups', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const ProgramsScreen(), + storage: storage, + workoutProvider: workoutProvider, + ); + + robot.expectVisible(ProgramsScreen); + robot.expectVisible('Powerbuilding V1'); + + // Tap program card to open detail screen + await robot.tap('Powerbuilding V1'); + robot.expectVisible(ProgramDetailScreen); + + // Pop detail screen back to ProgramsScreen + await tester.pageBack(); + await tester.pumpAndSettle(); + + // Tap FABs + final fabs = find.byType(FloatingActionButton); + expect(fabs, findsWidgets); + + for (int i = 0; i < fabs.evaluate().length; i++) { + await tester.tap(fabs.at(i)); + await tester.pumpAndSettle(); + } + + expect(tester.takeException(), isNull); + }); + }); +} diff --git a/workout-logger/test/userflow_routine_creation_test.dart b/workout-logger/test/userflow_routine_creation_test.dart new file mode 100644 index 0000000..c9bc7ee --- /dev/null +++ b/workout-logger/test/userflow_routine_creation_test.dart @@ -0,0 +1,169 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:provider/provider.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/routines_screen.dart'; +import 'package:repforge/screens/widgets/routine_creator.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'test_utils/mock_storage_service.dart'; + +Widget _buildTestApp({ + required WorkoutProvider workoutProvider, + required SettingsProvider settingsProvider, + required Widget child, +}) { + return MultiProvider( + providers: [ + ChangeNotifierProvider.value(value: workoutProvider), + ChangeNotifierProvider.value(value: settingsProvider), + ], + child: MaterialApp( + home: child, + ), + ); +} + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + late MockStorageService mockStorage; + late WorkoutProvider workoutProvider; + late SettingsProvider settingsProvider; + + setUp(() async { + mockStorage = MockStorageService(); + workoutProvider = WorkoutProvider( + mockStorage, + programManager: ProgramManager(mockStorage), + ); + settingsProvider = SettingsProvider(mockStorage); + + await workoutProvider.init(); + await settingsProvider.init(); + }); + + group('Userflow 3: Routine Creation & Management Flow', () { + testWidgets('RoutinesScreen renders title, empty state, and new routine button', (tester) async { + await tester.pumpWidget(_buildTestApp( + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + child: const RoutinesScreen(), + )); + await tester.pumpAndSettle(); + + expect(find.text('Routines'), findsWidgets); + }); + + testWidgets('CreateRoutineScreen renders input fields, selects exercise, and saves new routine', (tester) async { + final exercise = Exercise( + id: 'ex_bench', + name: 'Bench Press', + category: 'compound', + muscleActivations: [ + MuscleActivation(muscleGroupId: 'chest', activationPercentage: 100), + ], + ); + await mockStorage.saveCustomExercise(exercise); + await workoutProvider.init(); + + await tester.pumpWidget(_buildTestApp( + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + child: const CreateRoutineScreen(), + )); + await tester.pumpAndSettle(); + + expect(find.text('New Routine'), findsOneWidget); + expect(find.text('Save'), findsOneWidget); + + // Enter routine name into TextField + final textField = find.byType(TextField).first; + await tester.enterText(textField, 'Upper Body Hypertrophy'); + await tester.pump(); + + // Tap 'Add Exercises' button to open exercise picker modal + final addBtn = find.text('Add Exercises'); + expect(addBtn, findsOneWidget); + await tester.tap(addBtn); + await tester.pumpAndSettle(); + + // Select 'Bench Press' from picker modal + final benchPressFinder = find.text('Bench Press'); + expect(benchPressFinder, findsWidgets); + await tester.tap(benchPressFinder.first); + await tester.pump(); + + // Tap 'Add 1' button in picker header + await tester.tap(find.text('Add 1')); + await tester.pumpAndSettle(); + + // Tap Save + await tester.tap(find.text('Save')); + await tester.pumpAndSettle(); + + // Verify routine saved in provider + expect(workoutProvider.routines.any((r) => r.name == 'Upper Body Hypertrophy'), isTrue); + }); + + testWidgets('RoutinesScreen renders saved routines list', (tester) async { + await workoutProvider.createRoutine('Legs & Core Routine', ['ex_squat']); + + await tester.pumpWidget(_buildTestApp( + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + child: const RoutinesScreen(), + )); + await tester.pumpAndSettle(); + + expect(find.text('Legs & Core Routine'), findsWidgets); + }); + + testWidgets('startRoutineWorkoutFlow starts routine workout without conflict', (tester) async { + final routine = Routine(id: 'r1', name: 'Push Day', exerciseIds: ['bench_press']); + await tester.pumpWidget(_buildTestApp( + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + child: Builder( + builder: (context) => ElevatedButton( + onPressed: () => startRoutineWorkoutFlow(context, routine), + child: const Text('Start Routine'), + ), + ), + )); + + await tester.tap(find.text('Start Routine')); + await tester.pumpAndSettle(); + + expect(workoutProvider.hasActiveWorkout, isTrue); + }); + + testWidgets('RoutineDetailScreen renders routine details', (tester) async { + final routine = Routine(id: 'r2', name: 'Pull Day', exerciseIds: ['barbell_row']); + + await tester.pumpWidget(_buildTestApp( + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + child: RoutineDetailScreen(routine: routine), + )); + await tester.pumpAndSettle(); + + expect(find.text('Pull Day'), findsWidgets); + }); + + testWidgets('CreateRoutineScreen supports reordering exercise into final position before Add Exercises', (tester) async { + await tester.pumpWidget(_buildTestApp( + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + child: const CreateRoutineScreen(), + )); + await tester.pumpAndSettle(); + + final reorderableList = tester.widget(find.byType(ReorderableListView)); + reorderableList.onReorderItem!(0, 1); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + }); + }); +} diff --git a/workout-logger/test/userflow_screens_sweep_test.dart b/workout-logger/test/userflow_screens_sweep_test.dart new file mode 100644 index 0000000..7070ecd --- /dev/null +++ b/workout-logger/test/userflow_screens_sweep_test.dart @@ -0,0 +1,214 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/home_screen.dart'; +import 'package:repforge/screens/profile_screen.dart'; +import 'package:repforge/screens/heart_rate_detail_screen.dart'; +import 'package:repforge/screens/sleep_detail_screen.dart'; +import 'package:repforge/screens/programs/program_designer_screen.dart'; +import 'package:repforge/screens/workout_flow_screen.dart'; +import 'package:repforge/screens/workout_summary_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/managers/history_manager.dart'; +import 'package:repforge/services/managers/pr_manager.dart'; + +import 'test_utils/mock_storage_service.dart'; +import 'test_utils/mock_ml_service.dart'; +import 'test_utils/test_robot.dart'; +import 'test_utils/test_sweep.dart'; + +void main() { + late MockStorageService storage; + late WorkoutProvider workoutProvider; + late SettingsProvider settingsProvider; + late HistoryManager historyManager; + late PRManager prManager; + + setUp(() async { + storage = MockStorageService(); + settingsProvider = SettingsProvider(storage); + historyManager = HistoryManager(storage); + prManager = PRManager(storage); + + workoutProvider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + historyManager: historyManager, + ); + + await workoutProvider.init(); + await settingsProvider.init(); + await historyManager.loadSessions(); + await prManager.load(); + + // Save a custom session for history/home widgets + final session = WorkoutSession( + id: 'sess_sweep_1', + date: DateTime.now(), + duration: 50, + exercises: [ + ExerciseLog( + exerciseId: 'bench_press', + sets: [WorkoutSet(weight: 100, reps: 10)], + ), + ], + ); + await storage.saveWorkoutSession(session); + await historyManager.loadSessions(); + }); + + group('Comprehensive User Flow Sweeps across Screens', () { + testWidgets('HomeScreen navigation bar tab sweep and dashboard actions', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const HomeScreen(), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + historyManager: historyManager, + ); + + robot.expectVisible(HomeScreen); + + // Sweep through navigation bar tabs + final navIcons = [ + Icons.layers_rounded, + Icons.history_rounded, + Icons.bar_chart_rounded, + Icons.home_rounded, + ]; + await TestSweep.tapAll(tester, navIcons); + + expect(tester.takeException(), isNull); + }); + + testWidgets('ProfileScreen settings & data management sweep', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const ProfileScreen(), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(ProfileScreen); + + // Sweep unit preference chips + final profileTargets = [ + 'kg', + 'lbs', + ]; + await TestSweep.tapAll(tester, profileTargets); + + expect(tester.takeException(), isNull); + }); + + testWidgets('HeartRateDetailScreen & SleepDetailScreen granularity chip sweep', (tester) async { + final robot = TestRobot(tester); + + // 1. HeartRateDetailScreen + await robot.pumpScreen( + HeartRateDetailScreen(initialDate: DateTime.now()), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + await TestSweep.tapAll(tester, ['Day', 'Week', 'Month', 'Year']); + + // 2. SleepDetailScreen + await robot.pumpScreen( + SleepDetailScreen(initialDate: DateTime.now()), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + await TestSweep.tapAll(tester, ['Day', 'Week', 'Month', 'Year']); + + expect(tester.takeException(), isNull); + }); + + testWidgets('ProgramDesignerScreen comprehensive creation flow sweep', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const ProgramDesignerScreen(), + storage: storage, + workoutProvider: workoutProvider, + ); + + robot.expectVisible(ProgramDesignerScreen); + + // Enter form parameters + final fields = find.byType(TextField); + if (fields.evaluate().isNotEmpty) { + await tester.enterText(fields.first, 'Custom Power Program'); + await tester.pump(); + } + + // Tap action buttons (Add Phase, Add Week, Save Program) + final actionButtons = [ + 'Add Phase', + 'Add Week', + 'Save Program', + ]; + await TestSweep.tapAll(tester, actionButtons); + + expect(tester.takeException(), isNull); + }); + + testWidgets('WorkoutFlowScreen & WorkoutSummaryScreen user logging sweep', (tester) async { + final robot = TestRobot(tester); + + workoutProvider.startWorkout(exerciseIds: ['bench_press', 'squat']); + + await robot.pumpScreen( + const WorkoutFlowScreen(), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(WorkoutFlowScreen); + + // Interact with set logging and rest timer + final logSetBtn = find.text('Log set'); + if (logSetBtn.evaluate().isNotEmpty) { + await tester.tap(logSetBtn); + await tester.pumpAndSettle(); + + final restTargets = ['+30s', 'Skip rest']; + await TestSweep.tapAll(tester, restTargets); + } + + // Complete active workout and render summary screen + final session = WorkoutSession( + id: 'completed_summary_1', + date: DateTime.now(), + duration: 40, + exercises: [ + ExerciseLog( + exerciseId: 'bench_press', + sets: [WorkoutSet(weight: 100, reps: 8)], + ), + ], + ); + + await robot.pumpScreen( + WorkoutSummaryScreen(session: session), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(WorkoutSummaryScreen); + expect(find.text('Workout Complete!'), findsOneWidget); + }); + }); +} diff --git a/workout-logger/test/userflow_services_and_ai_sweep_test.dart b/workout-logger/test/userflow_services_and_ai_sweep_test.dart new file mode 100644 index 0000000..2457ecd --- /dev/null +++ b/workout-logger/test/userflow_services_and_ai_sweep_test.dart @@ -0,0 +1,103 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:google_generative_ai/google_generative_ai.dart'; +import 'package:repforge/services/ai/gemini_ai_service.dart'; +import 'package:repforge/services/ai/coach_tool_service.dart'; +import 'package:repforge/services/gemini_context_builder.dart'; +import 'package:repforge/services/health_connect_service.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/managers/pr_manager.dart'; + +import 'test_utils/mock_storage_service.dart'; +import 'test_utils/mock_ml_service.dart'; + +void main() { + late MockStorageService storage; + late WorkoutProvider workoutProvider; + late SettingsProvider settingsProvider; + late PRManager prManager; + late GeminiAiService geminiService; + late CoachToolService coachToolService; + late HealthConnectService healthConnectService; + + setUp(() async { + storage = MockStorageService(); + settingsProvider = SettingsProvider(storage); + prManager = PRManager(storage); + workoutProvider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + ); + geminiService = GeminiAiService(storage: storage); + coachToolService = CoachToolService(workoutProvider: workoutProvider, prManager: prManager); + healthConnectService = HealthConnectService(); + + await workoutProvider.init(); + await settingsProvider.init(); + await prManager.load(); + }); + + group('Deep Service & AI Engine Unit/Integration Sweeps', () { + test('GeminiAiService lifecycle, token usage, and model selection sweep', () async { + expect(geminiService.isConfigured, isFalse); + expect(geminiService.currentModel, equals(kDefaultGeminiModel)); + expect(geminiService.promptTokensUsed, equals(0)); + expect(geminiService.responseTokensUsed, equals(0)); + + geminiService.init('fake_test_api_key', model: 'gemini-3.5-flash'); + expect(geminiService.isConfigured, isTrue); + expect(geminiService.currentModel, equals('gemini-3.5-flash')); + + await geminiService.loadUsage(); + expect(geminiService.totalTokensUsed, equals(0)); + }); + + test('CoachToolService tool declaration and tool call execution sweep', () async { + final prRes = await coachToolService.handleCall( + FunctionCall('get_personal_records', {}), + ); + expect(prRes, isNotNull); + + final goalRes = await coachToolService.handleCall( + FunctionCall('get_goal_progress', {}), + ); + expect(goalRes, isNotNull); + + final routinesRes = await coachToolService.handleCall( + FunctionCall('get_all_routines', {}), + ); + expect(routinesRes, isNotNull); + }); + + test('GeminiContextBuilder prompt context formatting sweep', () { + final contextText = GeminiContextBuilder.buildCoachSystemPrompt( + unitLabel: 'kg', + ); + + expect(contextText, isNotEmpty); + expect(contextText, contains('RepForge')); + }); + + test('HealthConnectService safe stub invocation sweep', () async { + final isAvailable = await healthConnectService.isAvailable(); + expect(isAvailable, isFalse); + + final hasPermission = await healthConnectService.hasPermissions(); + expect(hasPermission, isFalse); + + final now = DateTime.now(); + final start = now.subtract(const Duration(days: 1)); + + final rhr = await healthConnectService.readRestingHeartRate(start, now); + expect(rhr, isEmpty); + + final hrv = await healthConnectService.readHrvRmssd(start, now); + expect(hrv, isEmpty); + + final sleep = await healthConnectService.readSleepSessions(start, now); + expect(sleep, isEmpty); + }); + }); +} diff --git a/workout-logger/test/userflow_targets_and_muscle_sheets_full_test.dart b/workout-logger/test/userflow_targets_and_muscle_sheets_full_test.dart new file mode 100644 index 0000000..f2e2710 --- /dev/null +++ b/workout-logger/test/userflow_targets_and_muscle_sheets_full_test.dart @@ -0,0 +1,157 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/widgets/targets_tab.dart'; +import 'package:repforge/screens/widgets/muscle_detail_sheet.dart'; +import 'package:repforge/screens/programs/program_designer_screen.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; + +import 'test_utils/mock_storage_service.dart'; +import 'test_utils/mock_ml_service.dart'; +import 'test_utils/test_robot.dart'; + +void main() { + late MockStorageService storage; + late WorkoutProvider workoutProvider; + late SettingsProvider settingsProvider; + + setUp(() async { + storage = MockStorageService(); + settingsProvider = SettingsProvider(storage); + workoutProvider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + ); + + await workoutProvider.init(); + await settingsProvider.init(); + + // Save a custom session with bench press & squat to generate muscle volume data + final session = WorkoutSession( + id: 'targets_sess_1', + date: DateTime.now(), + duration: 45, + exercises: [ + ExerciseLog( + exerciseId: 'bench_press', + sets: [ + WorkoutSet(weight: 100, reps: 10), + WorkoutSet(weight: 100, reps: 8), + ], + ), + ExerciseLog( + exerciseId: 'squat', + sets: [ + WorkoutSet(weight: 140, reps: 5), + ], + ), + ], + ); + await storage.saveWorkoutSession(session); + await workoutProvider.init(); + + // Save sample targets + final target1 = Target( + id: 'target_1', + exerciseId: 'bench_press', + targetType: 'weight', + targetValue: 120, + currentValue: 100, + createdAt: DateTime.now(), + ); + final target2 = Target( + id: 'target_2', + exerciseId: 'squat', + targetType: 'weight', + targetValue: 160, + currentValue: 160, + isCompleted: true, + createdAt: DateTime.now(), + ); + await storage.saveTarget(target1); + await storage.saveTarget(target2); + await workoutProvider.init(); + }); + + group('TargetsTab and MuscleDetailSheet Full Test Suite', () { + testWidgets('Renders TargetsTab with active & completed target cards and triggers add dialog', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const TargetsTab(), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(TargetsTab); + + // Verify section headers + expect(find.text('ACTIVE'), findsOneWidget); + expect(find.text('COMPLETED'), findsOneWidget); + + // Tap FAB to add new target + final fab = find.byType(FloatingActionButton); + if (fab.evaluate().isNotEmpty) { + await tester.tap(fab.first); + await tester.pumpAndSettle(); + } + + expect(tester.takeException(), isNull); + }); + + testWidgets('Renders MuscleDetailSheet for chest, back, and legs muscle groups', (tester) async { + final robot = TestRobot(tester); + + for (final muscleId in ['chest', 'back', 'quadriceps']) { + await robot.pumpScreen( + MuscleDetailSheet( + muscleId: muscleId, + provider: workoutProvider, + ), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(MuscleDetailSheet); + } + + expect(tester.takeException(), isNull); + }); + + testWidgets('ProgramDesignerScreen full phase and week builder interaction', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const ProgramDesignerScreen(), + storage: storage, + workoutProvider: workoutProvider, + ); + + robot.expectVisible(ProgramDesignerScreen); + + // Enter program name + final fields = find.byType(TextField); + if (fields.evaluate().isNotEmpty) { + await tester.enterText(fields.first, 'Strength Program 2026'); + await tester.pump(); + } + + // Tap buttons to build phases & weeks + final buttons = ['Add Phase', 'Add Week', 'Save Program']; + for (final label in buttons) { + final btn = find.text(label); + if (btn.evaluate().isNotEmpty) { + await tester.tap(btn.first); + await tester.pump(); + } + } + + expect(tester.takeException(), isNull); + }); + }); +} diff --git a/workout-logger/test/userflow_targets_and_muscle_sheets_test.dart b/workout-logger/test/userflow_targets_and_muscle_sheets_test.dart new file mode 100644 index 0000000..01b6fbb --- /dev/null +++ b/workout-logger/test/userflow_targets_and_muscle_sheets_test.dart @@ -0,0 +1,130 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/widgets/targets_tab.dart'; +import 'package:repforge/screens/widgets/muscle_detail_sheet.dart'; +import 'package:repforge/screens/widgets/editable_exercise_card.dart'; +import 'package:repforge/screens/widgets/readiness_card.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/managers/program_manager.dart'; + +import 'test_utils/mock_storage_service.dart'; +import 'test_utils/mock_ml_service.dart'; +import 'test_utils/test_robot.dart'; + +void main() { + late MockStorageService storage; + late WorkoutProvider workoutProvider; + late SettingsProvider settingsProvider; + + setUp(() async { + storage = MockStorageService(); + workoutProvider = WorkoutProvider( + storage, + mlService: MockMLService(), + programManager: ProgramManager(storage), + ); + settingsProvider = SettingsProvider(storage); + + await workoutProvider.init(); + await settingsProvider.init(); + }); + + group('Userflow: Targets Tab, Muscle Detail Sheet, and Target Cards', () { + testWidgets('Renders TargetsTab in empty and populated target state', (tester) async { + final robot = TestRobot(tester); + + // 1. Empty state + await robot.pumpScreen( + const TargetsTab(), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible('No Targets Set'); + + // 2. Add target to storage and re-pump + final target = Target( + id: 'tgt_bench_100', + exerciseId: 'bench_press', + targetType: 'weight', + targetValue: 100.0, + currentValue: 80.0, + ); + await storage.saveTarget(target); + await workoutProvider.init(); + + await robot.pumpScreen( + const TargetsTab(), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(TargetsTab); + }); + + testWidgets('MuscleDetailSheet renders volume progression and muscle metrics', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + MuscleDetailSheet( + muscleId: 'chest', + provider: workoutProvider, + ), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + robot.expectVisible(MuscleDetailSheet); + expect(tester.takeException(), isNull); + }); + + testWidgets('EditableExerciseCard renders exercise parameters and handles user interactions', (tester) async { + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: SingleChildScrollView( + child: EditableExerciseCard( + exerciseName: 'Barbell Squat', + editableLog: EditableExerciseLog( + exerciseId: 'ex_squat', + sets: [], + ), + onSetChanged: ({ + required int setIndex, + required double weight, + required int reps, + required bool isDropset, + List? drops, + }) {}, + onAddSet: () {}, + onDeleteSet: (_) {}, + onDeleteExercise: () {}, + ), + ), + ), + ), + ); + await tester.pumpAndSettle(); + + expect(find.text('Barbell Squat'), findsOneWidget); + }); + + testWidgets('ReadinessCard renders recovery scores drill-down', (tester) async { + final robot = TestRobot(tester); + + await robot.pumpScreen( + const ReadinessCard(), + storage: storage, + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + ); + + expect(tester.takeException(), isNull); + }); + }); +} diff --git a/workout-logger/test/userflow_workout_logging_test.dart b/workout-logger/test/userflow_workout_logging_test.dart new file mode 100644 index 0000000..72e432f --- /dev/null +++ b/workout-logger/test/userflow_workout_logging_test.dart @@ -0,0 +1,133 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:provider/provider.dart'; +import 'package:repforge/models/models.dart'; +import 'package:repforge/screens/workout_flow_screen.dart'; +import 'package:repforge/screens/workout_summary_screen.dart'; +import 'package:repforge/services/managers/pr_manager.dart'; +import 'package:repforge/services/managers/program_manager.dart'; +import 'package:repforge/services/settings_provider.dart'; +import 'package:repforge/services/workout_provider.dart'; +import 'test_utils/mock_storage_service.dart'; + +Widget _buildTestApp({ + required WorkoutProvider workoutProvider, + required SettingsProvider settingsProvider, + required PRManager prManager, + required Widget child, +}) { + return MultiProvider( + providers: [ + ChangeNotifierProvider.value(value: workoutProvider), + ChangeNotifierProvider.value(value: settingsProvider), + ChangeNotifierProvider.value(value: prManager), + ], + child: MaterialApp( + home: child, + ), + ); +} + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + late MockStorageService mockStorage; + late WorkoutProvider workoutProvider; + late SettingsProvider settingsProvider; + late PRManager prManager; + + setUp(() async { + mockStorage = MockStorageService(); + prManager = PRManager(mockStorage); + workoutProvider = WorkoutProvider( + mockStorage, + programManager: ProgramManager(mockStorage), + ); + settingsProvider = SettingsProvider(mockStorage); + + await workoutProvider.init(); + await settingsProvider.init(); + await prManager.load(); + }); + + group('Userflow 1: Workout Logging & Rest Timer & Summary Screen Flow', () { + testWidgets('User completes sets, interacts with RestTimerView, and views WorkoutSummaryScreen through production flow', (tester) async { + // 1. Save custom exercise and start active workout + final exercise = Exercise( + id: 'ex_bench', + name: 'Barbell Bench Press', + category: 'compound', + muscleActivations: [ + MuscleActivation(muscleGroupId: 'chest', activationPercentage: 100), + ], + ); + await mockStorage.saveCustomExercise(exercise); + await workoutProvider.init(); + + workoutProvider.startWorkout(exerciseIds: ['ex_bench']); + + // Render WorkoutFlowScreen + await tester.pumpWidget(_buildTestApp( + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + prManager: prManager, + child: const WorkoutFlowScreen(), + )); + await tester.pumpAndSettle(); + + // Verify WorkoutFlowScreen renders exercise name + expect(find.text('Barbell Bench Press'), findsWidgets); + + // 2. Drive production flow: Tap 'Log set' to trigger RestTimerView overlay in WorkoutFlowScreen + final logSetBtn = find.text('Log set'); + expect(logSetBtn, findsOneWidget); + await tester.tap(logSetBtn); + await tester.pumpAndSettle(); + + // Verify RestTimerView overlay appears via WorkoutFlowScreen production state + expect(find.text('REST'), findsWidgets); + expect(find.text('Skip rest'), findsOneWidget); + + // Tap '+30s' button during rest + final addTimeBtn = find.text('+30s'); + expect(addTimeBtn, findsOneWidget); + await tester.tap(addTimeBtn); + await tester.pump(); + + // Tap 'Skip rest' to return to active workout view + final skipBtn = find.text('Skip rest'); + await tester.tap(skipBtn); + await tester.pumpAndSettle(); + + // 3. Complete workout session and render WorkoutSummaryScreen + final summarySession = WorkoutSession( + id: 'completed_s1', + date: DateTime.now(), + duration: 45, + exercises: [ + ExerciseLog( + exerciseId: 'ex_bench', + sets: [ + WorkoutSet(weight: 100, reps: 10), + WorkoutSet(weight: 100, reps: 8), + ], + ), + ], + ); + + await tester.pumpWidget(_buildTestApp( + workoutProvider: workoutProvider, + settingsProvider: settingsProvider, + prManager: prManager, + child: WorkoutSummaryScreen(session: summarySession), + )); + await tester.pumpAndSettle(); + + // Verify Summary Screen metrics: trophy, stat grid, volume, sets count + expect(find.byType(WorkoutSummaryScreen), findsOneWidget); + expect(find.text('Workout Complete!'), findsOneWidget); + expect(find.text('Done'), findsOneWidget); + expect(find.text('45m'), findsOneWidget); + }); + }); +} diff --git a/workout-logger/test/workout_provider_test.dart b/workout-logger/test/workout_provider_test.dart index e6088c2..fde0d29 100644 --- a/workout-logger/test/workout_provider_test.dart +++ b/workout-logger/test/workout_provider_test.dart @@ -247,6 +247,290 @@ void main() { expect(recs, isNotEmpty); expect(recs.first.weight, greaterThanOrEqualTo(120)); }); + + test('getRecommendations holds load when the primary muscle is still ' + 'under-recovered from a session a couple hours ago', () async { + // bench_press's primary muscle is chest (tau=48h); a session this + // recent leaves chest well under the 70% recovery threshold. + final recentTimestamp = DateTime.now().subtract(const Duration(hours: 2)); + mockStorage.addMockSession( + session('recent', recentTimestamp, [ + log('bench_press', sets: [WorkoutSet(weight: 80, reps: 8)]), + ]), + ); + + await provider.init(); + + final recs = provider.getRecommendations('bench_press'); + + expect(recs, isNotEmpty); + expect(recs.first.confidence, 'low'); + expect(recs.first.reasoning, contains('recovered')); + expect(recs.first.weight, 80); + expect(recs.first.reps, 8); + }); + + test('getRecommendations holds load when readinessBand is low, even ' + 'when reps are otherwise ready to progress', () async { + mockStorage.addMockSession( + session('old', DateTime(2025, 1, 1), [ + log('bench_press', sets: [WorkoutSet(weight: 60, reps: 12)]), + ]), + ); + await provider.init(); + + final normal = provider.getRecommendations('bench_press'); + // Baseline: with reps at the ceiling and no readiness signal, this + // progresses (weight bump), confirming the low-readiness case below + // is actually suppressing something. + expect(normal.first.weight, greaterThan(60)); + + final lowReadiness = provider.getRecommendations( + 'bench_press', + readinessBand: ReadinessBand.low, + ); + expect(lowReadiness.first.weight, 60); + expect(lowReadiness.first.reps, 12); + expect(lowReadiness.first.confidence, 'low'); + expect(lowReadiness.first.reasoning, contains('readiness')); + }); + + test('getRecommendations ignores a moderate/high readinessBand', () async { + mockStorage.addMockSession( + session('old', DateTime(2025, 1, 1), [ + log('bench_press', sets: [WorkoutSet(weight: 60, reps: 12)]), + ]), + ); + await provider.init(); + + final recs = provider.getRecommendations( + 'bench_press', + readinessBand: ReadinessBand.moderate, + ); + expect(recs.first.weight, greaterThan(60)); + }); + + test('getRecommendations is unaffected by a realistic amount of prior ' + 'same-session training — the fatigue calibration is deliberately ' + 'inert at real-world session sizes (see session_fatigue.dart)', + () async { + await provider.addCustomExercise( + name: 'Ex One', + category: 'compound', + primaryMuscleGroupId: 'chest', + ); + await provider.addCustomExercise( + name: 'Ex Two', + category: 'compound', + primaryMuscleGroupId: 'chest', + ); + final ex1 = provider.allExercises.firstWhere((e) => e.name == 'Ex One'); + final ex2 = provider.allExercises.firstWhere((e) => e.name == 'Ex Two'); + + // History for ex2 so its recommendation is a real weight-bump + // scenario (reps at the ceiling), not the no-history default. + mockStorage.addMockSession( + session('old', DateTime(2025, 1, 1), [ + log(ex2.id, sets: [WorkoutSet(weight: 60, reps: 12)]), + ]), + ); + await provider.init(); + + // Start a live session covering both exercises; log a realistic + // number of sets of ex1 first (12 — more than a real working + // exercise would have), then ask for ex2's recommendation. + provider.startWorkout(exerciseIds: [ex1.id, ex2.id]); + for (var i = 0; i < 12; i++) { + provider.addSet(WorkoutSet(weight: 100, reps: 8)); + } + provider.nextExercise(); + + final withPriorSets = provider.getRecommendations(ex2.id); + + // Compare against a fresh provider with no in-progress session at + // all (only ex2's history) to isolate the same-session effect. + final freshMock = MockStorageService(); + freshMock.addMockSession( + session('old', DateTime(2025, 1, 1), [ + log(ex2.id, sets: [WorkoutSet(weight: 60, reps: 12)]), + ]), + ); + final freshProvider = WorkoutProvider( + freshMock, + programManager: ProgramManager(freshMock), + ); + freshMock.addMockCustomExercise(ex1); + freshMock.addMockCustomExercise(ex2); + await freshProvider.init(); + final withoutPriorSets = freshProvider.getRecommendations(ex2.id); + + expect(withoutPriorSets.first.weight, greaterThan(60)); // baseline progresses + expect(withPriorSets.first.weight, withoutPriorSets.first.weight); + }); + + test('getRecommendations dampens after an extreme, unrealistic amount ' + 'of same-session prior training — proves the fatigue mechanism is ' + 'wired end-to-end even though realistic sessions never reach it', + () async { + await provider.addCustomExercise( + name: 'Warmup Ex', + category: 'isolation', + primaryMuscleGroupId: 'chest', + ); + await provider.addCustomExercise( + name: 'Target Ex', + category: 'compound', + primaryMuscleGroupId: 'chest', + ); + final warmupEx = + provider.allExercises.firstWhere((e) => e.name == 'Warmup Ex'); + final targetEx = + provider.allExercises.firstWhere((e) => e.name == 'Target Ex'); + + mockStorage.addMockSession( + session('old', DateTime(2025, 1, 1), [ + log(targetEx.id, sets: [WorkoutSet(weight: 60, reps: 12)]), + ]), + ); + await provider.init(); + + provider.startWorkout(exerciseIds: [warmupEx.id, targetEx.id]); + // Far beyond any real single-exercise set count — well past the + // point (raw total > softCap = 16.0) where the factor engages. + for (var i = 0; i < 40; i++) { + provider.addSet(WorkoutSet( + weight: 100, + reps: 8, + timestamp: DateTime(2026, 1, 1, 10, i * 3), + )); + } + provider.nextExercise(); + + final recs = provider.getRecommendations(targetEx.id); + // 40 hard sets push the raw accumulation to ~26.7, past _hardCap, so + // the factor clamps to 1.0 and SessionFatigueRule hard-holds. Naming + // the exact weight and reasoning distinguishes that from + // DoubleProgressionRule's partial-increment scaling — `lessThan(65)` + // alone was true of both outcomes. + expect(recs.first.weight, 60.0); + expect(recs.first.reasoning, contains('earlier in today')); + }); + + group('recordSessionEffort / effortCalibrationOffset', () { + test('effortCalibrationOffset defaults to 0.0 when never answered', () { + expect(provider.effortCalibrationOffset, 0.0); + }); + + test( + 'records sessionEffort on the session and updates the rolling offset', + () async { + mockStorage.addMockSession( + session('s1', DateTime(2025, 1, 1), [log('bench_press')]), + ); + await provider.init(); + final sessionId = + provider.sessions.firstWhere((s) => s.id == 's1').id; + + await provider.recordSessionEffort(sessionId, 3); // Brutal + + final updated = provider.sessions.firstWhere((s) => s.id == sessionId); + expect(updated.sessionEffort, 3); + expect(provider.effortCalibrationOffset, greaterThan(0.0)); + }); + + test('persists the offset across a reload', () async { + mockStorage.addMockSession( + session('s1', DateTime(2025, 1, 1), [log('bench_press')]), + ); + await provider.init(); + await provider.recordSessionEffort('s1', 1); // Easy + final offsetAfterRecording = provider.effortCalibrationOffset; + expect(offsetAfterRecording, lessThan(0.0)); + + // A second init() on the same instance would pass even if the + // offset were only ever held in memory. Build a fresh provider over + // the same storage, as the draft-restore test does, so this can + // only pass if the value actually round-tripped through storage. + final reloaded = WorkoutProvider( + mockStorage, + programManager: ProgramManager(mockStorage), + ); + await reloaded.init(); + + expect(reloaded.effortCalibrationOffset, + closeTo(offsetAfterRecording, 0.0001)); + }); + + test('does nothing for an unknown session id', () async { + await provider.recordSessionEffort('does-not-exist', 3); + expect(provider.effortCalibrationOffset, 0.0); + }); + + test('re-answering the chip replaces the previous answer rather than ' + 'folding both in', () async { + mockStorage.addMockSession( + session('s1', DateTime(2025, 1, 1), [log('bench_press')]), + ); + await provider.init(); + + // The summary screen leaves the chip tappable, so changing your + // mind must land on the same offset as answering Easy once. + await provider.recordSessionEffort('s1', 3); // Brutal + await provider.recordSessionEffort('s1', 1); // ...actually, Easy + final afterChange = provider.effortCalibrationOffset; + + final fresh = WorkoutProvider( + mockStorage, + programManager: ProgramManager(mockStorage), + ); + mockStorage.settings.remove('effort.calibrationOffset'); + await fresh.init(); + await fresh.recordSessionEffort('s1', 1); // Easy, first time + + expect(afterChange, closeTo(fresh.effortCalibrationOffset, 0.0001)); + }); + + test('overlapping taps do not let a failed write clobber a later one', + () async { + mockStorage.addMockSession( + session('s1', DateTime(2025, 1, 1), [log('bench_press')]), + ); + await provider.init(); + + // The chips stay tappable while a write is in flight. Delay the + // offset write so a second tap can be issued mid-flight, and fail + // the first one so it takes its rollback path. + mockStorage.saveSettingDelayResolver = (key, value) => + key == 'effort.calibrationOffset' + ? const Duration(milliseconds: 20) + : Duration.zero; + var offsetWrites = 0; + mockStorage.saveSettingErrorResolver = (key, value) { + if (key != 'effort.calibrationOffset') return null; + offsetWrites++; + return offsetWrites == 1 ? Exception('disk full') : null; + }; + + final first = provider.recordSessionEffort('s1', 3); // Brutal + final second = provider.recordSessionEffort('s1', 1); // Easy + + await expectLater(first, throwsA(isA())); + await second; + + mockStorage.saveSettingErrorResolver = null; + mockStorage.saveSettingDelayResolver = null; + + // Serialised, the second call runs after the first has rolled back + // and re-reads state, so provider and storage agree on Easy. + expect(provider.sessions.firstWhere((s) => s.id == 's1').sessionEffort, + 1); + expect( + mockStorage.sessions.firstWhere((s) => s.id == 's1').sessionEffort, + 1, + reason: 'the failed first write must not roll back over the second', + ); + }); + }); }); group('deleteCustomExercise', () {