[thomasluizon]

Carries the four ordered main commits into redesign/main with source trailers. Keeps the redesign's deliberate wording, notification behavior, OAuth rendering assertions, and reminder cache while bringing over the dependency updates, remaining reviewed API copy, reminder singular form, and staging access changes. No commits were skipped in full; before each carry, its trailer was absent and its patch did not reverse-apply to the branch.

Refs thomasluizon/orbit-tickets#746

Carried commits

Main source	Carry	Resolution
b23a35de (#707)	41aa162c	Clean carry in .github/workflows/pullfrog.yml and .github/workflows/test.yml; retains the redesign workflow around the updated action pins.
53338bc5 (#708)	c414c089	Clean carry in src/Orbit.Api/Orbit.Api.csproj and src/Orbit.Infrastructure/Orbit.Infrastructure.csproj; updates all six packages and retains redesign dependencies.
d69b1347 (#709)	8537e83b	Carries copy and corresponding tests in Api, Application, and Infrastructure. The conflicts below retain deliberate redesign changes.
f4c2ce95 (#710)	bcc3cbdb	Clean carry in both staging access scripts, both staging access workflows, infra/README.md, infra/example.tfvars, and the staging database root's main.tf and variables.tf.

Conflicted paths by prior change

All twelve conflicts came from d69b1347. Paths resolved to existing content remain documented here even when they produce no final diff.

Transactional email and notification redesign, 23396af4 (#532)

• src/Orbit.Infrastructure/Email/EmailCopy.cs: retains the redesign welcome intro and heading, account deletion warning, API key explanation, and waitlist intro. The welcome subjects already match main's new values. No final diff.
• src/Orbit.Infrastructure/Services/AiSlipAlertMessageService.cs: retains the redesign prompt, shared voice rules, and separate early/day-only fallback copy; main's old title examples and usual-time fallback are absent from this design. No final diff.
• tests/Orbit.Infrastructure.Tests/Services/AiSlipAlertMessageServiceGenerationTests.cs: retains all early/day-only fallback assertions and extra cases. No final diff.
• tests/Orbit.Infrastructure.Tests/Services/AiSlipAlertMessageServiceTests.cs: retains the Portuguese assertion for the redesign fallback. No final diff.
• tests/Orbit.Infrastructure.Tests/Email/EmailMessageComposerTests.cs: carries exact welcome subject assertions while retaining the redesign palette assertion introduced through 180e9dc7 (Carry release, SES, S3 and database name fixes into redesign main (#746) #635).

Proactive notification length and count, 912cf6e7 (#693), following #532

• src/Orbit.Infrastructure/Services/AiProactiveCheckinMessageService.cs: retains counted fallbacks, the 60 text-element limit, and the string-returning title helper. No final diff.
• tests/Orbit.Infrastructure.Tests/Services/AiProactiveCheckinMessageServiceGenerationTests.cs: retains counted fallbacks, single-habit tests, and the tests preventing promises of automatic logging. No final diff.

Gamification notifications, e8309fda (#654)

• src/Orbit.Application/Gamification/Services/GamificationService.cs: carries all five achievement translation changes while retaining the deliberate level name sentence and Progress notification/push URLs.

Notification punctuation carry, 16d2de9a (#680)

• src/Orbit.Application/Referrals/Commands/CheckReferralCompletionCommand.cs: carries the reviewed invoice and welcome bodies; retains the already matching coupon titles, coupon bodies, and sentence case.
• src/Orbit.Application/Social/Commands/SendCheerCommand.cs: carries main's reviewed Portuguese wording. The earlier redesign carry only removed punctuation from the old phrase; English already matches.
• tests/Orbit.Application.Tests/Social/SendCheerCommandTests.cs was not a merge conflict, but required follow-up commit 7a47130f to align its redesign-only Portuguese expectation with the carried phrase. All persistence and push assertions remain.

Reminder cache and probe carries, 77c168fe (#607) and 13507b96 (#610)

• src/Orbit.Infrastructure/Services/ReminderSchedulerService.cs: retains the cached schedule reads and probe; omits the obsolete projection declarations that main only reformatted. Carries the singular English minute fix. The corresponding reminder theory applies cleanly.

OAuth page redesign, f039e1a6 (#665)

• tests/Orbit.Infrastructure.Tests/Controllers/OAuthControllerTests.cs: retains ReadRenderedError and the redesigned alert script assertion, updating the expected Portuguese wording. The controller copy and remaining localized cases apply cleanly.

Assumptions

• Retained Redesign the transactional emails, AI push copy and error messages (R20) #532's deliberate transactional email wording; rejected overwriting it with main's alternative welcome, deletion warning, API key, and waitlist strings, as directed by this carry order.
• Retained Redesign the transactional emails, AI push copy and error messages (R20) #532/Cap proactive check-in bodies at 60 text elements #693's truthful early/day-only and counted AI fallbacks plus their tests; rejected replacing them with main's generic fallback wording or restoring its obsolete prompt.
• Retained Fix achievement and level-up notification links #654's deliberate level name sentence and notification destinations; rejected replacing the sentence with main's encouragement. Carried the achievement translations independently.
• Treated Carry notification sentence case into redesign main (#746) #680's cheer and referral differences as punctuation cleanup, not a deliberate alternative wording; rejected keeping the old Portuguese cheer phrase and old invoice/welcome bodies.
• Kept the reminder cache and probe instead of restoring unused projections; rejected carrying main's formatting-only declarations into a scheduler that no longer uses them.
• Adapted OAuth wording assertions to the redesigned rendered-error reader and retained the email palette assertion; rejected replacing either test with main's older rendering assumptions.

Test evidence

• Final solution verification with LANG unset: env -u LANG dotnet build Orbit.slnx exited 0 with zero errors; env -u LANG dotnet test Orbit.slnx exited 0 with 9,428 passed, zero failed or skipped.
• Final solution verification with LC_ALL=en_US.UTF-8: LC_ALL=en_US.UTF-8 dotnet build Orbit.slnx exited 0 with zero errors; LC_ALL=en_US.UTF-8 dotnet test Orbit.slnx exited 0 with 9,428 passed, zero failed or skipped. Existing package compatibility and deprecated API warnings remain.
• Before the copy carry, env -u LANG dotnet test Orbit.slnx --no-build --filter 'FullyQualifiedName~ReminderSchedulerServiceTests|FullyQualifiedName~EmailMessageComposerTests|FullyQualifiedName~OAuthControllerTests|FullyQualifiedName~ProcessUserChatCommandHandlerTests|FullyQualifiedName~CalendarSyncServiceTests' exited 0: 306 tests passed, including the unchanged reminder test that only exercised 15 minutes.
• Applied only main's strengthened ReminderSchedulerServiceTests before carrying production code. env -u LANG dotnet test tests/Orbit.Infrastructure.Tests --no-restore --filter FullyQualifiedName~FormatReminderText_Minutes_English exited 1: the one-minute case expected Due in 1 minute and received Due in 1 minutes; the 15-minute case passed. Restored the temporary test edit and carried the source commit with its test.
• After the copy carry, the focused solution run covering reminder, email, OAuth, chat, calendar auto-sync, push, AI fallback, period close, and gamification tests exited 0: 523 passed, including both minute cases.
• Before the staging access carry, bash .github/scripts/test-staging-postgres-access.sh exited 0 with the defect present; the old assertions expected operator drift to fail. Saved the old helper with git show HEAD:.github/scripts/staging-postgres-access.sh and the carried test with git show f4c2ce95:.github/scripts/test-staging-postgres-access.sh. running the carried test against the old helper (SCRIPT_UNDER_TEST=<old helper copy> bash <carried test copy>) exited 1 on reconciliation with Staging database operator allow list differs from the configured addresses.
• After the staging access carry, bash .github/scripts/test-staging-postgres-access.sh exited 0, covering live operators, runner cleanup, partial opens, and operator refresh. The four carried infrastructure Node test files passed all 34 tests.
• The first full LANG-unset test run exited 1: only SendCheerCommandTests.CleanNote_PersistsCheerAndPushesRecipient failed because its redesign-only Portuguese expectation still used the old phrase. Updated that expected phrase to main's carried copy while retaining all persistence and delivery assertions. env -u LANG dotnet test tests/Orbit.Application.Tests --no-build --filter FullyQualifiedName~SendCheerCommandTests then exited 0 with all 11 tests passing.
• Shell syntax, ShellCheck with SC2016 excluded for intentional literal GitHub expressions, recursive Terraform format, and git diff --check passed. Actionlint passed with its existing queue schema limitation excluded. Commit hooks ran normally.

Model and contract

No entity, migration, DTO, route, or response shape changes. No migration ordering question. dotnet ef migrations has-pending-model-changes --project src/Orbit.Infrastructure --startup-project src/Orbit.Api --no-build exited 0 and reported no model changes. The solution build ran the OpenAPI generator; src/Orbit.Api/openapi.json has no diff.

External interface evidence

PR #636 records live Render GET/PATCH probes proving GET /v1/postgres/{id} returns ipAllowList entries with cidrBlock and description, verifies fresh GETs after updates, and proves ipify's plain IPv4 response. This carry reads those same fields, sends {ipAllowList: [...]}, ignores the PATCH response body, and uses synthetic addresses with the verified names in tests. PR #710 records additional Render schema introspection and installed provider schema evidence for render_postgres.ip_allow_list. No live infrastructure mutation was performed for this carry.

Manual steps

• When local staging access is needed after a public address change or database replacement, obtain RENDER_API_KEY from Render > Account Settings > API Keys and set STAGING_POSTGRES_ID from the staging Terraform output. Between staging workflows, run the README's operator-mac command. Verify the current /32 in Render > staging Postgres > Networking and a successful local psql connection with its Connections screen details. The workflow variable cleanup and main reconciliation dispatch belong to source PR Preserve live staging Postgres operator access #710; this redesign carry does not dispatch them.

[pullfrog]

✅ No new issues found.

Reviewed changes Compared all 33 changed files against redesign/main, including the carry conflict resolutions and their effects on the existing redesign behavior.

• Dependencies and tooling: Updates two GitHub Action pins and six NuGet packages while retaining the redesign configuration.
• Copy and reminders: Carries notification, OAuth, chat, and achievement wording, fixes singular English reminder minutes, and updates corresponding assertions without changing DTOs or routes.
• Staging access: Preserves live operator allow-list entries, removes tagged runner entries even without a marker, adds verified operator-mac access refresh, and makes Terraform manage the staging allow list only at creation.
• Verification: The staging-access regression suite, 34 infrastructure Node tests, and 533 focused .NET tests passed; CI Build, Unit Tests, and OpenAPI checks are green. Render interface evidence was checked in the cited source PRs; no live infrastructure mutation was performed.

  ^{｜ View workflow run ｜ Using gpt-6.1-sol ｜ 𝕏}

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
95.5% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud