diff --git a/.planning/ROADMAP.md b/.planning/ROADMAP.md
index 7d03683..a0e21ae 100644
--- a/.planning/ROADMAP.md
+++ b/.planning/ROADMAP.md
@@ -1156,12 +1156,12 @@ Plans:
   4. A host test proves checkout, activation, `invoice.paid`, `past_due` with its grace period, cancel and duplicate-event idempotency against a Stripe fake.
   5. The new code has unit tests, delivered in the phase's last plan.
 
-**Plans:** 1/6 plans executed
+**Plans:** 2/6 plans executed
 
 Plans:
 **Wave 1**
 - [x] 18.1-01-PLAN.md — Framework (summercms.go): core cabana `taglist` field and flat (Sortable) reorder (D-17), OpenAPI, dist, docs; framework tag with go-ahead
-- [ ] 18.1-02-PLAN.md — sm-paymentgatewaysubscriptions-plugin core tracer (new repo): baseline gate (D-04/D-16), models and checks, contracts and build-time registries, six events, gateway-neutral Apply and claim, `user` subscribable, service API; remote and push with go-ahead
+- [x] 18.1-02-PLAN.md — sm-paymentgatewaysubscriptions-plugin core tracer (new repo): baseline gate (D-04/D-16), models and checks, contracts and build-time registries, six events, gateway-neutral Apply and claim, `user` subscribable, service API; remote and push with go-ahead
 
 **Wave 2** *(blocked on Wave 1 completion)*
 - [ ] 18.1-03-PLAN.md — sm-pgstripe-plugin: subscription secret columns and import target (D-18), plugin `golem15.pgstripesubscriptions` (webhook contract gate, gateway with plan sync from `d00f850`, both webhook URLs, claim-first River job, app-tag config), `TestHostSubscriptionFlow`
@@ -1364,7 +1364,7 @@ Phases execute in numeric order: 1 → 2 → 3 → 4 → 5 → 6 → 7 → 8 →
 | 16.3. Backend admin personal API tokens with scopes (INSERTED) | 4/4 | Complete   | 2026-10-12 |
 | 17. Blog companions | 6/6 | Complete   | 2026-10-13 |
 | 18. Payment Gateway | 8/8 | Complete   | 2026-10-14 |
-| 18.1. Payment Gateway Subscriptions | 1/6 | In Progress|  |
+| 18.1. Payment Gateway Subscriptions | 2/6 | In Progress|  |
 | 19. Chat and ChatChannels | 0/TBD | Not started | - |
 | 19.1. Chat satellites | 0/TBD | Not started | - |
 | 19.2. Chat polish against WavePath clients | 0/TBD | Not started | - |
diff --git a/.planning/STATE.md b/.planning/STATE.md
index 2922274..343d045 100644
--- a/.planning/STATE.md
+++ b/.planning/STATE.md
@@ -4,16 +4,16 @@ milestone: v1.0
 current_phase: "18.1"
 current_phase_name: Payment Gateway Subscriptions (INSERTED)
 status: executing
-stopped_at: Completed 18.1-01-PLAN.md
-last_updated: "2026-10-14T14:38:44.555Z"
+stopped_at: Completed 18.1-02-PLAN.md
+last_updated: "2026-10-14T15:28:01.931Z"
 last_activity: 2026-10-14
 last_activity_desc: Phase 18.1 execution started
-state_head: 1e18143ef3cf5f7e00d322aee8cdcffdd7bc119a
+state_head: 577f712b0a53892675919ae7225b5059d37d0d0e
 progress:
   total_phases: 40
   completed_phases: 31
   total_plans: 182
-  completed_plans: 177
+  completed_plans: 178
 gsd_state_version: "1.0"
 milestone_name: milestone
 ---
@@ -30,7 +30,7 @@ See: .planning/PROJECT.md (updated 2026-10-12)
 ## Current Position
 
 Phase: 18.1 (Payment Gateway Subscriptions (INSERTED)) — EXECUTING
-Plan: 2 of 6
+Plan: 3 of 6
 Status: Ready to execute
 Last activity: 2026-10-14 — Phase 18.1 execution started
 
@@ -234,6 +234,7 @@ Progress: [████░░░░░░] 44%
 | Phase 18 P07 | 75 min | 5 tasks | 62 files |
 | Phase 18 P08 | 20min | 4 tasks | 7 files |
 | Phase 18.1 P01 | 31min | 5 tasks | 37 files |
+| Phase 18.1 P02 | 45min | 5 tasks | 30 files |
 
 ## Accumulated Context
 
@@ -783,6 +784,9 @@ Recent decisions affecting current work:
 - [Phase 18.1]: 18.1-01 release gate: human replied "hold"; framework tag v0.1.26 held until plan 06, nothing pushed (22 commits origin/master..master local)
 - [Phase 18.1]: 18.1-01: flat reorder inferred WinterCMS-Sortable style (no parentColumn key, no parent_id column); flat flag omitempty keeps tree payloads byte-identical
 - [Phase 18.1]: 18.1-01: required taglist is checked on its normalised tags; generic required rule skipped for taglist as for repeater
+- [Phase 18.1]: 18.1-02: baseline JSON columns (stripe_prices, currency_prices, features) are JSONB (human: baseline-jsonb); lagoon.Jsonable works unchanged
+- [Phase 18.1]: 18.1-02: pgsub gateways never write the DB; the service stores the customer id in its own short transaction and writes cancel_at_period_end after a successful cancel at period end
+- [Phase 18.1]: 18.1-02: sm-paymentgatewaysubscriptions-plugin created with tea and main pushed at aad4647 (human: create-and-push)
 
 ### Pending Todos
 
@@ -861,6 +865,6 @@ Items acknowledged and carried forward from previous milestone close:
 
 ## Session Continuity
 
-Last session: 2026-10-14T14:38:43.710Z
-Stopped at: Completed 18.1-01-PLAN.md
+Last session: 2026-10-14T15:28:01.166Z
+Stopped at: Completed 18.1-02-PLAN.md
 Resume file: None