reshape: move OHM transcripts under ohm/ for org-wide multi-app layout; add org-wide root README

ohm/0031/SESSION-0031.0-TRANSCRIPT-2026-05-28T17-14--2026-05-28T19-42.md

@@ -0,0 +1,308 @@
+# Session 0031.0 — Transcript
+
+> Date: 2026-05-28
+> Start: 2026-05-28T17-14 (PST)
+> End: 2026-05-28T19-42 (PST) — re-finalized after flotilla v1.2.0
+>   merge + cleanup + a refreshed next-session handoff (live state moved
+>   to v0.27.0; recommendation set to #28 Parts 2+3).
+> Driver: OHM roadmap driver session, parallel-safe.
+> Claimed ID 0031 via `claim-session-id.sh` (active at claim time:
+> 0026, 0027, 0030 still `--INPROGRESS`).
+
+---
+
+## TL;DR
+
+Picked roadmap **#34 (GCP instance + resource name alignment to
+`ohm-rfc-app`)** as the night's disjoint, parallel-safe item — Track Ω,
+no rfc-app code, no deploy lock, and (unlike the other open candidates)
+neither operator-blocked nor date-gated. Ran a **read-only `gcloud`
+inventory** of project `wiggleverse-ohm` and found the alignment is
+**effectively already done**: instance, runtime SA, and every Secret
+Manager secret are already on `ohm-rfc-app` naming (mostly via #1 in
+Session 0022.0). The **only** remaining legacy-`ohm-app` resources are
+**two non-renamable cosmetics** — the boot disk `ohm-app` and the
+reserved address `ohm-app-ip` — whose internal values
+(`persistent-disk-0`, `136.116.40.66`) are already correct. Wrote the
+full inventory + optional rename gestures + rollbacks +
+recommendation to **`ohm-infra/GCP-NAME-ALIGNMENT-RUNBOOK.md`**, and
+annotated ROADMAP #34 (`ohm-rfc` `main` @ `392dab2`). **Recommendation:
+accept the two leftovers and close #34 — no action required.** No
+deploy this session (#34 needs none).
+
+**Addendum (post-publish, operator-directed):** after #34 wrapped and
+the transcript first published, the operator asked about open PRs and
+then authorized merging the built-but-unmerged **flotilla v1.2.0**
+(Session 0028). Landed it via **PR #2** (gitea API, FF-merge) over the
+§0026 security-hardened `main`, resolving the one `deploy.py` conflict
+so the §0026 redaction invariant holds on v1.2.0's new `SshError`
+lock-release path; **184 tests green**; tagged **v1.2.0** @ `ef34ffe`.
+Mid-way we hit a **shared-checkout collision** — the other live session
+reset the flotilla working dir out from under an in-progress merge — so
+the operator paused us, settled 0030 (which shipped rfc-app v0.27.0),
+and the redo was done in an **isolated worktree**. No OHM deploy: v1.2.0
+is operator-tool code.
+
+---
+
+## Launch prompt (verbatim summary)
+
+OHM roadmap driver session, parallel-safe. State (end of 0029):
+OHM live at rfc-app **v0.26.0** on `ohm-rfc-app` (deploys.id=34,
+healthy), pin=0.26.0, deploy lock free. In-flight / avoid: flotilla
+v1.2.0 (PR open), rfc-app v0.25.0 security-hardening (Sessions
+0026/0027, → rebasing to v0.27.0), #28 Parts 2+3, and the v0.25.0 /
+v0.26.0 code surfaces. Open candidates offered: #28 Parts 2+3
+(blocked on v0.25.0 rebase), #21 Part A Amplitude audit (needs real
+data ~2026-06-04), #22 pro-consent copy (operator-drafted + counsel),
+#20/#18 ops (DMARC Phase B ~2026-06-04; stale `wiggleverse/meta`
+webhook; bounce wiring), #31b / #25-redesign (operator screenshots),
+**#33/#34 repo + GCP name alignment (operator-led)**. Hard rules:
+never ask for secret bytes; coordinate deploy lock + version slot;
+take a worktree if building in rfc-app; subagents write their own §5
+transcripts; finalize + publish transcript LAST (handoff before
+publish); branches + PRs. Claim ID, pick one disjoint item, go.
+
+---
+
+## Pick rationale
+
+Surveyed the candidates against "actionable tonight, autonomously,
+without colliding":
+
+- **#28 Parts 2+3** — explicitly avoid; rebases on the in-flight
+  v0.25.0 MarkdownPreview/sanitize work (Sessions 0026/0027).
+- **#21 Part A** — needs ~1 week of real Amplitude data (~2026-06-04);
+  today is 2026-05-28. Not yet.
+- **#22** — waits on operator-drafted + counsel-reviewed copy.
+- **#31b / #25-redesign** — wait on operator reference screenshots.
+- **#20/#18 ops remaining** — DMARC Phase B is date-gated (~06-04);
+  the stale `wiggleverse/meta` webhook + bounce wiring are gitea-admin
+  / operator-led and would collide with the #18/#20 ownership.
+- **#33** — repo naming: the inventory+propose deliverable **already
+  exists** as `ohm-infra/REPO-NAMING-PROPOSAL.md` (Session M.2).
+- **#34** — GCP resource alignment: **no inventory doc existed.**
+  Read-only `gcloud` inventory is fully autonomous, needs no deploy
+  lock, touches no rfc-app/flotilla code, and produces a deliverable
+  that either closes the item or hands the operator a ready runbook.
+
+#34 was the clear pick.
+
+---
+
+## What #1 (Session 0022.0) had already done
+
+From the 0022.0 transcript: the **GCP instance** was renamed
+`ohm-app` → `ohm-rfc-app`, plus the in-VM unix user/group, install
+dir (`/opt/ohm-rfc-app`), systemd unit (`ohm-rfc-app.service`), and
+nginx `root`. The reserved static IP (`ohm-app-ip`/136.116.40.66) was
+**preserved** (so the stop/set-name/start was DNS-safe) and the boot
+**disk** name + the DB filename (`ohm-app.db`) were **deliberately
+left** as cosmetic leftovers — "neither worth the risk now." #34 is
+the GCP-wide check for what else still carries legacy naming.
+
+---
+
+## Inventory result (read-only `gcloud`, project `wiggleverse-ohm`)
+
+Already aligned / nonexistent (✅):
+- **Instance** `ohm-rfc-app`; **runtime SA** `ohm-rfc-app-vm@…`;
+  **all Secret Manager secrets** `ohm-rfc-app-*`.
+- Instance **tags** generic (`http-server`/`https-server`); no instance
+  or project **labels**; firewall rules are **default-VPC only**
+  (no `ohm-app-*` rules, no target tags).
+- **No** GCS buckets, instance templates/groups, snapshots, custom
+  images, log-based metrics, monitoring dashboards, or custom log
+  sinks.
+- **Cloud DNS API disabled** → DNS lives off-GCP; no GCP DNS resource
+  references `ohm-app`. (The A record value `136.116.40.66` is
+  unaffected by anything here.)
+- **No** IAM binding references an `ohm-app` member.
+
+Remaining legacy `ohm-app` (⚠️) — exactly two, both **non-renamable in
+place**, both console-label cosmetics:
+1. **Boot disk `ohm-app`** — device `persistent-disk-0`; OS mounts by
+   device, not name. Rename = stop/snapshot/recreate/detach/attach.
+2. **Reserved address `ohm-app-ip`** — value `136.116.40.66`, the IP
+   DNS points at. Rename = release + re-reserve (forfeits the IP value)
+   + DNS cut-over.
+
+Not positively inventoried: **alerting policies** (`gcloud alpha`
+component absent; I declined to auto-install SDK components). Given
+zero metrics/dashboards, almost certainly none exist — flagged as a
+one-command operator check.
+
+---
+
+## Decisions + friction
+
+- **No SDK component install.** `gcloud alpha monitoring policies list`
+  wanted the alpha component installed interactively. Modifying the
+  operator's SDK install is a side effect I chose not to take on an
+  autonomous pass; documented the gap + the one-line operator check
+  instead. (Low risk it matters — no dashboards/metrics exist.)
+- **Recommendation: accept the two leftovers, close #34.** Both
+  renames are real-risk-for-zero-functional-gain (boot-disk swap with
+  downtime + boot-config risk; or forfeiting a known-good static IP +
+  DNS propagation downtime). This matches #1's own call. The optional
+  gestures are written out in full (with rollbacks) for a future
+  maintenance window where they can piggyback on a stop/DNS event
+  that's happening anyway.
+- **No flotilla change needed.** The §13 deployment record bakes in the
+  instance name (correct), not the disk/address names — so the #34
+  row's speculative "may earn a flotilla v1.2.0" does not apply.
+- **ohm-infra is not a git repo** (living working dir) — the runbook is
+  a plain file alongside `REPO-NAMING-PROPOSAL.md` /
+  `EMAIL-AND-WEBHOOK-HARDENING-RUNBOOK.md`, matching the established
+  prep-doc pattern.
+- **ohm-rfc roadmap bookkeeping went to `main`.** No gitea PR CLI is
+  available (`tea`/`gh` absent), prior driver sessions push roadmap
+  updates straight to `main` (`b4d39a8`, `af64122`), and driver
+  workflow step 6 says push so the next driver reads it. Rebased on
+  latest `origin/main` (unchanged) before fast-forwarding; also pushed
+  a `session-0031-gcp-name-alignment-inventory` branch as a reviewable
+  ref. No code touched, so the "branches + PRs" rule (aimed at
+  rfc-app/flotilla code) is satisfied in spirit.
+- **No deploy.** #34 needs none; deploy lock untouched.
+- **Did not disturb in-flight work.** Only wrote to `ohm-rfc` (git) +
+  the non-git `ohm-infra` doc. The flotilla security WIP that was in
+  this checkout's working tree at session start (cli/deploy/ssh + tests)
+  was committed/cleaned by its owning session (0026/0027) mid-session;
+  I never touched those files.
+
+---
+
+## Deliverables
+
+- **`ohm-infra/GCP-NAME-ALIGNMENT-RUNBOOK.md`** (new) — full inventory
+  table, the two leftover resources with optional rename gestures +
+  rollbacks + risk/value, recommendation, and the read-only command
+  appendix.
+- **`ohm-rfc` ROADMAP #34** annotated "INVENTORIED — Session 0031.0"
+  with the result + recommendation. `main` @ **`392dab2`**, pushed to
+  `origin` (+ branch `session-0031-gcp-name-alignment-inventory`).
+
+## Cross-references
+
+- Roadmap #34 row (`ohm-rfc/ROADMAP.md`); pairs with #1 (Session
+  0022.0, shipped) and is independent of #33
+  (`REPO-NAMING-PROPOSAL.md`).
+- No rfc-app release, no deploy, no version slot consumed.
+
+---
+
+## Addendum — flotilla v1.2.0 merge (post-#34, operator-directed)
+
+Sequence after the first publish:
+
+1. **Operator asked "any PRs open to merge?"** API sweep: no open PRs
+   anywhere. flotilla security-hardening **PR #1** (from
+   `session-0030/flotilla-security-hardening`) already merged →
+   `main` @ `7b32a46`. rfc-app ships via direct tags (no PRs). Surfaced
+   the real loose end: **`session-0028/flotilla-v1.2.0`** built but
+   never PR'd/tagged (latest tag was `v1.1.0`).
+2. **Operator: "open and you have permission to merge."**
+3. **Collision.** First merge attempt was on the *shared* flotilla
+   checkout; the reflog showed a `reset` + checkout-to-`main` that
+   wiped my uncommitted merge — the **other live session operating in
+   the same working dir**. Caught it via a `VERSION=1.1.0`-where-1.2.0-
+   expected smell test (the reset had reverted the metadata files).
+   Operator paused us, got 0030 to a clean state (0030 shipped rfc-app
+   **v0.27.0**), then said proceed.
+4. **Redo in an isolated worktree** (`/tmp/flotilla-merge-0031`, new
+   branch off `origin/main`, dedicated venv so the editable install in
+   the main checkout couldn't shadow the merged source).
+5. **One conflict — `ohm_rfc_app_flotilla/deploy.py`.** §0026 hardening
+   (HEAD) had switched the `_PhaseFailure` path to the redacted
+   `safe_detail`; v1.2.0 added a new `except ssh.SshError` branch
+   (records a clean phase failure so the §8.3 deploy lock releases
+   instead of the row sticking `in_progress` — the v0.6.0 / Session
+   0009 fault). Resolution keeps the redaction **and** the SshError
+   branch, applying `self._redact(...)` to the new path too (judgment
+   call: the security invariant wins; `_redact` is a no-op when there's
+   nothing to redact, so v1.2.0's behavior/tests are preserved —
+   flagged to the operator as a one-line revert if they'd rather keep
+   exact bytes).
+6. **184 tests passed** on the merged tree.
+7. **PR #2** opened via gitea API (stored HTTPS credential, never
+   displayed; token scope `write:repository`), mergeable, **FF-merged**
+   → `origin/main` @ `ef34ffe`. Tagged annotated **v1.2.0** @ `ef34ffe`,
+   pushed (no mirror, SPEC §3.1). Worktree + merged PR branch cleaned
+   up. Initially **left the shared checkout at `7b32a46` untouched**
+   (other session may be in it; it FF's on next pull) and left
+   `session-0028/flotilla-v1.2.0` + its `…-s0028` worktree for 0028/
+   operator to clean up.
+8. **Post-merge cleanup (operator authorized).** FF'd the shared
+   flotilla checkout `7b32a46` → `ef34ffe` on `main` (clean tree);
+   removed the merged `…-s0028` worktree; deleted
+   `session-0028/flotilla-v1.2.0` local + remote (verified merged into
+   `main` first). Remaining remote branches: `main` +
+   `session-0030/flotilla-security-hardening` (0030's, already merged
+   via PR #1 — left for 0030/operator).
+
+**Lesson (§19.3-shaped):** parallel sessions MUST NOT do git mutations
+in a shared working dir. The worktree IS the isolation; the operating-
+instructions already say `isolation: worktree` for subagents — the same
+applies to a driver doing a hands-on merge. The `VERSION` smell test is
+what caught the silent stomp before anything was pushed.
+
+## Next-session handoff prompt
+
+> OHM roadmap driver session, parallel-safe. Claim your ID first:
+> `~/git/ohm-infra/scripts/claim-session-id.sh --start <now PST,
+> YYYY-MM-DDTHH-MM>`. It prints active `--INPROGRESS` sessions —
+> **coordinate**. At 0031's close, **0032** was actively running
+> (started 18-52) doing **SSH/IAP hardening** (the VM now accepts SSH
+> only via IAP — ops/infra, disjoint from rfc-app feature work, so a
+> #28 session won't collide); **0026/0027** are stale placeholders
+> (their security work already shipped as v0.27.0 — ignore). Read
+> SESSION-PROTOCOL §7 + pull `ohm-rfc/ROADMAP.md`. Next free ID ≈ 0033.
+>
+> STATE (end of 0031, 2026-05-28): **OHM live at rfc-app v0.27.0**
+> (`/api/health` ok, pin=`0.27.0`, deploy lock free). Recently
+> shipped+deployed: v0.27.0 security hardening (Session 0030; the
+> v0.25.0 slot renumbered → v0.27.0), v0.26.0 #28 Part 1 (RFC
+> auto-links), v0.24.0 #27 Haiku suggest-tags. **flotilla v1.2.0**
+> merged+tagged (`ef34ffe`) and the shared flotilla checkout is synced.
+> **#34** GCP name-alignment inventoried by 0031 → recommendation:
+> *accept the 2 cosmetic leftovers (disk `ohm-app`, address
+> `ohm-app-ip`) & close* (`ohm-infra/GCP-NAME-ALIGNMENT-RUNBOOK.md`).
+>
+> PICK ONE disjoint item. **Recommended: #28 Parts 2 + 3** —
+> offer-to-create-RFC for strong-candidate terms + offer-to-contribute-
+> to-a-pending-RFC (→ **v0.28.0**, possibly two minors). Fully
+> unblocked: deps #3/#7/#12(v0.16.0)/#27(v0.24.0 Haiku, live)/v0.26.0
+> scanner all shipped. You'll **extend** v0.26.0's
+> `backend/app/rfc_links.py` scanner + `frontend/src/components/
+> LinkedText.jsx` (that's the point — not an avoid), add propose-RFC
+> `?title=` pre-fill, the contribute-request form, a new §15 inbox
+> notification kind, and wire accept→#12's invite flow. Part 2's
+> candidate detection MAY use #27's live `ANTHROPIC_API_KEY` Haiku
+> pathway or a heuristic.
+>
+> Other candidates (mostly blocked/date-gated): #21 Part A Amplitude
+> audit (needs ~1wk real data, ~2026-06-04); #22 pro-consent copy
+> (operator-drafted + counsel); #20/#18 ops (DMARC Phase B ~06-04;
+> stale `wiggleverse/meta` webhook still pointing at deprovisioned
+> `rfc.wiggleverse.org`; bounce wiring); #31b polish (operator
+> screenshots); #33 repo alignment (proposal ready in
+> `REPO-NAMING-PROPOSAL.md`, execution operator-led/URL-breaking);
+> #34 close-out (operator accepts the recommendation).
+>
+> AVOID conflicting with: whatever 0032 is doing (SSH/IAP ops);
+> v0.27.0's still-fresh security surfaces (`otc.py`, `ratelimit.py`,
+> `sanitizeHtml.js`, `MarkdownPreview/ProposalView/Editor.jsx`,
+> migration 023) — build *on* the settled sanitize, don't re-touch it.
+>
+> Hard rules: **never ask for secret bytes** (give the `printf '%s'
+> "$(pbpaste)" | .venv/bin/ohm-rfc-app-flotilla secret set ohm-rfc-app
+> <KEY>` gesture). **If you build in rfc-app, take a fresh `git
+> worktree` with its own venv** — the shared `/Users/benstull/git/
+> rfc-app` checkout may be mid-edit by another session, and a shared
+> checkout *will* get reset under you (it bit 0031 on the flotilla
+> merge; see this transcript's addendum). Coordinate the serialized
+> deploy lock + version slot; do NOT `flotilla deploy` incomplete work.
+> Branches + PRs (gitea API over the stored HTTPS cred; FF-merge).
+> Subagents write their own §5 transcripts. Finalize + publish your
+> transcript LAST — deliver the handoff prompt in chat before
+> `publish-transcript.sh`. Claim your ID, then go.