diff --git a/0060/SESSION-0060.0-TRANSCRIPT-2026-06-01T06-30--2026-06-01T09-00.md b/0060/SESSION-0060.0-TRANSCRIPT-2026-06-01T06-30--2026-06-01T10-03.md similarity index 81% rename from 0060/SESSION-0060.0-TRANSCRIPT-2026-06-01T06-30--2026-06-01T09-00.md rename to 0060/SESSION-0060.0-TRANSCRIPT-2026-06-01T06-30--2026-06-01T10-03.md index 8bfaf86..0e9e31d 100644 --- a/0060/SESSION-0060.0-TRANSCRIPT-2026-06-01T06-30--2026-06-01T09-00.md +++ b/0060/SESSION-0060.0-TRANSCRIPT-2026-06-01T06-30--2026-06-01T10-03.md @@ -15,6 +15,10 @@ > Dogfood produced + validated `wiggle-snip/deployment.toml`. The session > also **created the `wiggleverse/flotilla-core` Gitea repo** (operator) and > **integrated a live collision** with a parallel preview-environments line. +> **Post-publish addendum:** also merged the Slice-1 OHM shim +> (`ohm-rfc-app-flotilla` → thin shim over flotilla-core, PR #4 → `1319fd7`) +> and pinned its dependency to the released **flotilla-core v0.3.0** (tagged) — +> this transcript was re-finalized for that OHM-material work. > > Highlights: > - Spec-leads-code done literally: the SPEC correction landed as its **own @@ -214,7 +218,24 @@ parallel session has uncommitted work there; its next pull picks up the merge). Operator asked to publish a transcript. Claimed **0060** via `claim-session-id.sh`, finalized this file, gave the next-session handoff in -chat, and published. +chat, and published (`4b324e4`; `sessions.json` title set). + +### Arc 12 — Post-publish: merge the OHM shim + pin its dep (re-finalize) + +Operator asked how to do follow-up #2 (merge `slice1-extract-flotilla-core`) and +chose "merge + pin the dep." Findings: there was **no open PR** (launch prompt +stale), the branch was a clean 1-commit FF onto `main`, and the local +`ohm-rfc-app-flotilla` checkout was on `feat/preview-environments` with the +**parallel session's uncommitted work** — so all git went through an **isolated +worktree** + the **API** (no local-checkout disruption). The honest catch on +"pin the dep": flotilla-core is a **private, index-less** repo, so a hard +git-URL pin would break the shim's CI runner (no auth) — so the pin was the safe, +faithful form: **tagged flotilla-core `v0.3.0`**, bumped the shim's floor +`>=0.1.0 → >=0.3.0`, and documented the published git source (laptop deploys have +it installed; CI installability of the private dep is a tracked follow-up). +Opened + merged **PR #4** (`ohm-rfc-app-flotilla` → thin shim, `1319fd7`). This +is OHM-material, so the transcript was **re-finalized** (this arc) and +republished. --- @@ -227,10 +248,17 @@ chat, and published. `4841361`. Now **v0.3.0** (`9b15b2a` rebased atop the preview line `333e0ff`). Worktree at `~/projects/wiggleverse/flotilla-core-slice2` (branch deleted on remote post-merge; safe to remove). **371 tests green.** + Tagged **`v0.3.0`** (`a602112`/`4841361`) for the shim to pin against. +- **`wiggleverse/ohm-rfc-app-flotilla`** — PR #4 MERGED `1319fd7`: the Slice-1 + thin-shim (`8c03538`, v1.8.0) + the dep pin to flotilla-core `>=0.3.0` + (`90a613b`). Done via an isolated worktree + the API (the local checkout was + mid-parallel-work on `feat/preview-environments`). - **wiggle-snip** — `deployment.toml` generated + validated (not a git repo). - **Parallel line** — preview-environments (`feat/preview-environments` + the - WIP that became `333e0ff` on main) is a separate, still-active effort; no OHM - deploy, no `ohm-rfc` / §13 edit happened this session. + WIP that became `333e0ff` on flotilla-core main) is a separate, still-active + effort. No OHM **deploy**, no `ohm-rfc` / §13 edit happened this session — the + only OHM-material change was the shim merge (Arc 12), which alters how OHM's + operator CLI is packaged, not the live deployment. --- @@ -240,20 +268,24 @@ chat, and published. > `define-deployment` (§6.6) + `scaffold-gcp-project` (§6.5) skills exist; > `flotilla-core` is **v0.3.0** on `wiggleverse/flotilla-core` `main` > (private repo now created) with `deployment scaffold|validate|import` + -> `gcloud.describe_config`, sitting atop the merged preview-environments line. -> wiggle-snip has a validated `deployment.toml`. +> `gcloud.describe_config`, tagged **`v0.3.0`**, sitting atop the merged +> preview-environments line. `ohm-rfc-app-flotilla` `main` is now the **thin +> shim** (v1.8.0) pinned to `flotilla-core>=0.3.0`. wiggle-snip has a validated +> `deployment.toml`. > > **Next: Slice 3 — `provision-vm` + `scaffold-gitea-repos`** (SPEC §2, §6.7, > §6.8). `provision-vm` gates on `deployment validate` (§4.2) — built + proven. > wiggle-snip needs its GCP foundation first (`scaffold-gcp-project`), which > clears the one dogfood WARN. > -> **Open follow-ups (not Slice 2):** (a) the launch-app suite skills should be -> installed/symlinked for invocation; (b) pin `ohm-rfc-app-flotilla`'s -> dependency to the now-published `flotilla-core` + add it to the Patchwatch -> runner build context; (c) merge `slice1-extract-flotilla-core` (OHM-shim, -> driver-session territory); (d) Slice-5 backlog: `scaffold` emits an unused -> `APP_URL` overlay key by default. +> **Open follow-ups:** (a) install/symlink the launch-app suite skills for +> invocation; (b) **CI installability of the private `flotilla-core`** — the +> shim's `pip install -e .[test]` can't fetch a private, index-less dep without +> SSH/token wiring (deploys run from the laptop, so this is a CI gap, not a +> deploy blocker); (b2) add `flotilla-core` to the Patchwatch runner build +> context before its next rebuild; (c) Slice-5 backlog: `scaffold` emits an +> unused `APP_URL` overlay key by default. **Done this session:** the shim merge +> (former #c) and the dep pin to v0.3.0 (part of former #b). > > **Coordination:** a parallel preview-environments line shares `flotilla-core`. > Work each line in its own **worktree**; never run mutating git in the shared