Repository navigation
Merge Fix-issue sensor repairs into main with DevSecOps gates - #1
Merged
Merged
Conversation
…ams, and update AGENTS.md specs
Order and acknowledge Watch session commands, retry current-peer delivery and pause sensors when controller heartbeats expire. Preserve release ownership and invalidate callbacks across pause/resume. Own pending and active Polar ECG subscriptions, close canceled startup connections and bound transient recovery. Add BDD regressions and update feature contracts, gates and v1.3.1 APK history. Verified 140 unit tests, 4 phone tests, both APKs and Android lint (0 errors). Physical Watch/H10 acquisition remains unverified without the devices. Co-Authored-By: Codex (GPT-6) <noreply@openai.com>
Complete the software/delivery checklist with exact CI, tag, APK checksum and HTTP 200 receipts. Keep physical Watch/H10 acceptance explicitly unchecked. Co-Authored-By: Codex (GPT-6) <noreply@openai.com>
Keep Watch continuous acquisition, ordered controls and Polar ECG ownership while retaining main backup, permission, log privacy and SDK 34 protections. Resolve lifecycle/build conflicts, retain existing unit suites and validate 293 JVM tests, 5 publication-policy tests, 4 phone tests and both lint/APK gates. Add pinned/read-only CI on main/Fix-issue/PRs with tracked and incoming-history artifact rejection plus redacted Gitleaks. Existing release tags are unchanged; the historic Polar AAR is already in main and no new SDK bundle is introduced. Co-Authored-By: Codex (GPT-6) <noreply@openai.com>
Scan first-parent merge diffs alongside full reachable history so secrets introduced by conflict resolution are checked on main and pull requests. Co-Authored-By: Codex (GPT-6) <noreply@openai.com>
Use the PR base or main pre-push commit for incoming-history checks; feature pushes compare against origin/main. Already-published main cleanup commits must not be reclassified as new feature artifacts. Current tracked-file and full-history secret checks remain unchanged. Co-Authored-By: Codex (GPT-6) <noreply@openai.com>
Adrian463588
added a commit
that referenced
this pull request
Oct 12, 2026
Record PR #1 merge parents, exact passing CI runs, main branch protection and current/incoming artifact and redacted secret-scan results. Preserve the explicit pre-existing Polar AAR and unavailable hardware boundaries. Co-Authored-By: Codex (GPT-6) <noreply@openai.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bring the Watch/Polar recording fixes from Fix-issue into the fork's main while retaining main's backup, permission and logging protections. Pause/End now use ordered commands, sensor-state acknowledgement/retry and a Watch controller timeout; Polar startup is owned/cancelable with bounded recovery and per-sample timing. Millisecond elapsed display uses monotonic duration and keeps the session's Unix identity unchanged.
Prepared by merging main into Fix-issue with two parents and resolving overlapping sensor/build changes. This PR must use merge commit, without squash/rebase or branch deletion. Both original branch histories and existing release tags/APKs are retained.
Validation: 293 JVM tests (shared 113, mobile 142, Wear 38), 5 publication-policy tests and 4 phone instrumented tests passed. Both APKs built; Android lint has 0 errors (53 phone / 34 Wear warnings). Private Samsung SDK was used locally and is not included in the source/CI.
DevSecOps: tracked and every incoming commit's artifact/data/key paths are checked; staged tree and full history (including merge diffs) scanned with checksum-verified, redacted Gitleaks. No secrets were found. CI runs on main/Fix-issue/PRs with pinned actions and binary/distribution checksums, read-only permissions and no persisted checkout credentials. GitHub secret scanning/push protection and vulnerability alerts are enabled; no open alerts were returned at inspection.
Historical boundary: no AAR is tracked or newly introduced. The legacy Polar AAR object 3526ed159b8c210662b0cc8bd904167f772eda3c already exists in main and remains in pre-existing history; this PR does not rewrite history or claim erasure. Real Watch/H10 sensor acquisition and LEDs-off/BLE recovery remain unverified because hardware is unavailable. This is not a comprehensive dependency/SAST certification.
Detailed comparison, gates and receipts: MAIN_MERGE_AUDIT.md.