Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
7fda8d5
Adds tests for screens
Devasy Jul 23, 2026
a3d61b9
Adds tests
Devasy Jul 23, 2026
71659af
Adds comprehensive tests
Devasy Jul 23, 2026
9732b9a
Adds new tests
Devasy Jul 23, 2026
87ce588
Updates test.yml to run on release branches
Devasy Jul 23, 2026
bb98883
Adds test and resolved the warnings and issues
Devasy Jul 23, 2026
8e745cc
Updates tests and minor bug fixes
Devasy Jul 23, 2026
f0fc3c2
Adds fixes for failing testsm and adds connection timeout safety for …
Devasy Jul 24, 2026
43e4dd3
Adds missing lines patch
Devasy Jul 24, 2026
3abd451
Updates the tests with analyse failures
Devasy Jul 24, 2026
9a55007
Updates tests and routine creator to use the common component
Devasy Jul 24, 2026
3b787a0
Updates flutter version and adds tests
Devasy Jul 24, 2026
4b85588
Adds major genui Feature and renderer
Devasy Jul 27, 2026
2a17656
chore: remove patch_so script
Devasy Jul 28, 2026
a790d6e
build: add --build-id=none for jni package in F-Droid metadata
Devasy Jul 28, 2026
e89e2ca
ci: add jni build-id sed step for future reproducible releases
Devasy Jul 28, 2026
85a48fd
feat: assisted pullups, deload-aware ML, handle-scoped PRs, sleeping …
Devasy Aug 5, 2026
62beb92
feat(genui): add A2UiProps alias-aware coercing property reader
Devasy Aug 5, 2026
36253fb
feat(genui): add A2UiSpec contract, A2UiNode and A2UiRegistry
Devasy Aug 5, 2026
85b472d
fix(genui): make A2UiRegistry throw on name/alias collisions
Devasy Aug 5, 2026
6a67623
feat(genui): add A2UiParser with fence, envelope and alias repair
Devasy Aug 5, 2026
116ef77
fix(genui): balanced-bracket JSON extraction and envelope singleton fix
Devasy Aug 5, 2026
c846369
feat(genui): inject A2UiTheme and extract shared panel chrome
Devasy Aug 6, 2026
ffa451e
test(genui): strengthen theme-injection and add A2UiPanel coverage
Devasy Aug 6, 2026
cb60d5f
feat(genui): add A2UiSeries as the shared categorical data shape
Devasy Aug 6, 2026
a426fa2
fix(genui): cover fallback path in A2UiSeries.extract, fix negative-m…
Devasy Aug 6, 2026
a0c3ffc
feat(genui): add StatCardSpec with typed props and trend synonyms
Devasy Aug 6, 2026
1ce4ae1
feat(genui): add MetricGaugeSpec with safe progress and null value
Devasy Aug 6, 2026
58a77f2
feat(genui): add DynamicChartSpec for line, bar and pie
Devasy Aug 6, 2026
243d907
feat(genui): add ScatterPlotSpec with point repair and safe bounds
Devasy Aug 6, 2026
43cae7f
feat(genui): add RadarChartSpec sharing the labels/series shape
Devasy Aug 6, 2026
d3c18b3
feat(genui): add DataListGroupSpec with row repair and optional title
Devasy Aug 6, 2026
5e2e2f1
feat(genui): add FilterChipsSpec with nullable active option
Devasy Aug 6, 2026
359ffd3
feat(genui): add GridContainerSpec, default registry and renderer
Devasy Aug 6, 2026
8d32d0d
feat(genui): generate the A2UI prompt section from the registry
Devasy Aug 6, 2026
fc7e843
refactor(genui): wire coach screen to the A2UI package, drop legacy r…
Devasy Aug 7, 2026
1b0b8cc
fix(genui): bracket negative-value ranges in DynamicChart line/bar axes
Devasy Aug 7, 2026
2287ff0
test(genui): cover all-negative bounds and malformed point entries
Devasy Aug 7, 2026
939349a
fix(genui): widen per-node children lookup back to components/element…
Devasy Aug 7, 2026
298126e
fix(genui): widen looksLikeUi to catch prose-prefixed fences, fix vac…
Devasy Aug 7, 2026
6561e95
refactor(genui): drop presentation payload from tools, add purity and…
Devasy Aug 7, 2026
5735d98
fix(genui): depth-agnostic purity regex, pin two silent-visual regres…
Devasy Aug 7, 2026
c0913bb
fix(genui): propagate registry through recursion, pin prompt drift, c…
Devasy Aug 7, 2026
8024efa
Merge branch 'r2.1.0' of https://github.com/Devasy/RepForge into feat…
Devasy Aug 7, 2026
1f327a5
docs: add design spec for Hive->SQLite migration + coach SQL query tool
Devasy Aug 7, 2026
7a0c18c
fix: persist assisted-load volume correctly, tighten exercise-handle …
Devasy Aug 7, 2026
f363a21
fix: bound sleep-analytics window, drop fabricated data, resolve musc…
Devasy Aug 7, 2026
8862e9d
fix(genui): pie negative-value filtering, overflow guard, stat-card u…
Devasy Aug 7, 2026
0ff6c2d
test: close vacuous-test gaps and pin already-fixed regressions
Devasy Aug 7, 2026
fad5b8d
fix: address CodeRabbit review findings on PR #64 (feat/genui)
Devasy Aug 15, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .github/workflows/release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,19 @@ jobs:

- name: Install dependencies
working-directory: ./workout-logger
run: flutter pub get
run: |
flutter pub get
: "${PUB_CACHE:?PUB_CACHE is not set}"
mapfile -t targets < <(find "$PUB_CACHE" -type f -path '*/jni-*/src/CMakeLists.txt')
if [ "${#targets[@]}" -eq 0 ]; then
echo "Error: no jni-*/src/CMakeLists.txt files found under \$PUB_CACHE" >&2
exit 1
fi
for f in "${targets[@]}"; do
if ! grep -q -- '-Wl,--build-id=none' "$f"; then
sed -i -e 's/-Wl,/-Wl,--build-id=none,/' "$f"
fi
done

- name: Bump version
if: github.event_name == 'push'
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,3 +94,6 @@ repforge_backup_*.json
tmp_hive_*/
**/tmp_hive_*/


# Subagent-driven-development scratch workspace
.superpowers/
Original file line numberDiff line numberDiff line change
@@ -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
);
Comment thread
Devasy marked this conversation as resolved.

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
Comment thread
Devasy marked this conversation as resolved.
);

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<TrainingPhase>.toJson()
weeks_json TEXT NOT NULL -- List<ProgramWeek>.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<ChatMessage>.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.
Comment thread
Devasy marked this conversation as resolved.

---

## 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`.
Comment thread
Devasy marked this conversation as resolved.
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.
Comment thread
Devasy marked this conversation as resolved.
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.

Comment thread
Devasy marked this conversation as resolved.
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 (<query>) LIMIT ?` with a default of 200, model-adjustable up to 500 — never trusts a `LIMIT` the model wrote itself.
Comment thread
Devasy marked this conversation as resolved.
- **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.
Comment thread
Devasy marked this conversation as resolved.
- **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.
6 changes: 6 additions & 0 deletions fdroid/metadata/com.devasy.repforge.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand All@@ -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
Expand Down
Loading
Loading