diff --git a/.planning/phases/18.1-payment-gateway-subscriptions/18.1-UAT.md b/.planning/phases/18.1-payment-gateway-subscriptions/18.1-UAT.md
index f7e05f4..e1ef89b 100644
--- a/.planning/phases/18.1-payment-gateway-subscriptions/18.1-UAT.md
+++ b/.planning/phases/18.1-payment-gateway-subscriptions/18.1-UAT.md
@@ -1,9 +1,9 @@
 ---
-status: diagnosed
+status: complete
 phase: 18.1-payment-gateway-subscriptions
 source: [18.1-VERIFICATION.md]
 started: 2026-10-14T19:30:26.848Z
-updated: 2026-10-16T15:20:00Z
+updated: 2026-10-16T17:00:00Z
 ---
 
 ## Current Test
@@ -29,7 +29,9 @@ reason: duplicate of test 7 (re-seeded after gap closure)
 
 ### 4. Browser pass through the admin screens and the layer components
 expected: Taglist chips (Enter, comma, remove, suggestions, read-only) on the plan form; flat drag reorder of plans writes sort_order; bulk sync_to_stripe and toolbar sync_all_to_stripe toasts with per-plan failures; Subscriptions list filters and the preview subscriber partial; the layer's plans table, subscribe redirect, my-subscription cancel through PgConfirm, portal redirect; press Back from Stripe Checkout and check whether the subscribe button is stuck on 'Subscribing...' (review WR-07, unfixed in app/utils/subscribe.ts)
-result: issue
+result: pass
+retest: "retested 2026-10-16 after quick 261016-nqk: subscriber e-mail column, title "Subscription #1 (Pro)", Gateway/Status shown; all pass"
+first_result: issue
 reported: "Taglist pass; reorder pass; sync actions pass; playground subscribe, Back from Checkout and 409 pass. Subscriptions list: shows subscriber ID, expected some sort of field: type: relation select: email so we could easily identify subscriber. Otherwise works. Cancel through PgConfirm not run (blocked by test 7)."
 severity: minor
 note: "Part E re-run 2026-10-16 after un-cancel in the portal: E: Pass, everything works. Shows it will end 16.11 and Stripe portal says it will cancel at 16.11. Stripe reports cancel_at_period_end=true plus cancel_at for the API cancel; only the portal cancel sends cancel_at alone (G-18.1-7)."
@@ -46,21 +48,25 @@ note: source=stripe logged, activated fired once, second subscribe refused
 
 ### 7. Billing-portal cancellation (D-21 cancel_at question): open the portal through PgManageSubscriptionButton, cancel the subscription, inspect the delivered customer.subscription.updated and the retrieved subscription
 expected: If Stripe reports cancel_at_period_end true, the row gets it and PgMySubscription shows the will-cancel notice. If it reports only cancel_at, the row keeps cancel_at_period_end false and the cancellation is invisible; that needs a follow-up mapping
-result: issue
+result: pass
+retest: "retested 2026-10-16 after quick 261016-nqk: portal un-cancel then cancel shows will end 16.11; pass"
+first_result: issue
 reported: "Fail. Subscription canceled on Stripe, playground still showing 'Days until renewal 30'"
 severity: major
 
 ### 8. pgsub boots in an application built with `summer build`
 expected: A summer-built app with pgsub and pgstripe runs migrate, serve and admin:create
-result: issue
+result: pass
+retest: "demo app rebuilt without the boot overlay after quick 261016-myi boots, migrates and serves; UAT 4, 6, 7 ran on it"
+first_result: issue
 reported: "Found while setting up the UAT demo app: every command fails with 'party: boot golem15.paymentgatewaysubscriptions: ... boot service: database is not published' (boot.go bootService looks up *gorm.DB during Boot; generated main.go activates plugins before the database is published)"
 severity: blocker
 
 ## Summary
 
 total: 8
-passed: 3
-issues: 3
+passed: 6
+issues: 0
 pending: 0
 skipped: 2
 blocked: 0
@@ -85,7 +91,9 @@ blocked: 0
 
 - gap_id: G-18.1-4
   truth: "The admin subscriptions list and form identify the subscriber by a readable value (e-mail / display name), not only type and id"
-  status: failed
+  status: resolved
+  resolved_by: quick 261016-nqk (user retest pass 2026-10-16)
+  resolved_at: 2026-10-16
   reason: "User reported: Shows subscriber ID, expected some sort of field: type: relation select: email so we could easily identify subscriber"
   severity: minor
   test: 4
@@ -101,7 +109,9 @@ blocked: 0
 
 - gap_id: G-18.1-7
   truth: "A cancellation in the Stripe billing portal shows as will-cancel (cancel_at_period_end true) on the row and in PgMySubscription"
-  status: failed
+  status: resolved
+  resolved_by: quick 261016-nqk (user retest pass 2026-10-16)
+  resolved_at: 2026-10-16
   reason: "User reported: Subscription canceled on Stripe, playground still showing 'Days until renewal 30'"
   severity: major
   test: 7