chore: adopt pre-existing working-tree state before trunk merge

Uncommitted machine/session edits (live config, models, docs drift) were
blocking the merge of origin/main. Committed as-is to preserve them; the
merge that follows resolves overlapping prose files toward upstream
canonical, with local variants recoverable from this commit. Pre-merge
copies also in .AGENTTRASH/pre-merge-2026-10-18/.

AGENTS.md

@@ -13,26 +13,32 @@ with YAML frontmatter, spec at `omp-docs/references/okf-spec.md`).
   (`dank/command-center` on the Dankclaw instance). There is no staging copy:
   **the checkout is the deployment.** Branch switches swap live config files out
   from under the running agent — keep feature branches short-lived, and never end
-  a work session checked out on anything but `develop` or `main`.
+  a work session checked out on anything but `main`.
 - Contents that belong here: `AGENTS.md`, `omp-docs/` (knowledge base),
   `scripts/` (small system utilities), `agent/` + `plugins/` (harness config and
   plugin manifests). Everything else under this directory is runtime state and is
   gitignored on principle — see `.gitignore`. History must mean "the configuration
   changed", not "the agent breathed".
 
-## Git-flow SDLC (full flow, from day one)
+## Trunk-based SDLC (since 2026-10-18; replaces the old git-flow regime)
 
+- `main` is the only long-lived branch. Frank is the only dev; `develop` and the
+  release-branch ceremony are retired — no `develop`, no back-merges, no
+  `release/X.Y.Z` branches.
+- **Before every work item: fetch and branch off the freshest `origin/main`.**
+  If main moves under you, merge it into your branch (never rebase — Frank
+  dislikes the history rewrite).
 - Work item = Gitea issue on `dank/command-center` (Gitea at 192.168.0.143:3000,
   owner `dank`). Small fixes may go straight to a branch; anything with more than
   one moving part gets an issue first.
 - Branch naming: `<type>/<issue#>-<slug>`, type ∈ feat|fix|docs|chore.
-  Release cuts: `release/X.Y.Z` from `develop`; hotfixes: `hotfix/<slug>` from `main`.
-- **Merge, never rebase**, when updating a branch against a moved main — Frank
-  dislikes the history rewrite. **Never merge a PR without an explicit OK from Frank.**
-- Merge into `develop` with `--no-ff` so feature arcs stay visible in history.
-- Releases: cut `release/X.Y.Z` from `develop`, verify, merge to `main`, tag
-  `vX.Y.Z`, back-merge `main` into `develop`. Tags are the deploy markers every
-  other machine pulls to.
+- **Pull requests target `main` directly.** Merge with `--no-ff` so feature arcs
+  stay visible in history. **Never merge a PR without an explicit OK from Frank.**
+- **The moment a PR is open, open it in Frank's browser** — `xdg-open <PR-URL>`
+  lands a tab in his Firefox; never make him hunt for it in Gitea.
+- Releases: tag `vX.Y.Z` straight on `main` after verifying; tags are the deploy
+  markers every other machine pulls to. Hotfixes are ordinary branches off the
+  tag you are fixing forward from.
 - Trash convention: never `rm` anything user-authored — move it to `.AGENTTRASH/`
   (gitignored). Deletion is a pruning session with Frank present.
 
@@ -71,8 +77,8 @@ secret in every agent's context window on every machine that pulls this repo.
 | box | role | GPU | notes |
 |-----|------|-----|-------|
 | Dev workstation | client box, never runs inference | laptop iGPU + dGPU (non-unified) | mainline llama.cpp at `~/GitPackages/llama.cpp/build/bin/`; this repo lives here at `~/.omp` |
-| Dankclaw | bench target, runs the large serving model | Strix Halo APU — **unified memory** | ROCmFPX fork at `~/GitPackages/ROCmFPX/build-qwen38/bin/`; prod service `frank-default-large`, port 7770; ssh: `ssh dankclaw` |
-| Dankserver | FreeToken box | RTX 3090 dGPU — non-unified | runs `frank-default-small`; ssh: `ssh dankserver` |
+| Dankclaw | bench target, secondary models + service stack | Strix Halo APU (**unified memory**) + RTX 3090 (moved over from Dankserver 2026-09) | prod services `frank-dragoon` (halogen-flash-server, :7770, iGPU) and `frank-zealot` (llama.cpp PrismML fork, :7771, 3090); runbooks in the serverAppConfigs vault (`~/Projects/serverAppConfig/serverAppConfigs-docs/LLM/`); ssh: `ssh dankclaw` |
+| Dankserver | main-model box | 2× Radeon AI PRO R9700 — non-unified (was RTX 3090 until 2026-09) | runs `frank-archon` (radiance, TP=2, :7770) — **this repo's operator session runs on it**; ssh: `ssh dankserver` |
 
 ## Environment gotchas
 
@@ -84,9 +90,10 @@ secret in every agent's context window on every machine that pulls this repo.
 - SSH into both servers is BatchMode-capable from here:
   `ssh -o BatchMode=yes dankclaw '<read-only command>'` — read-only probes are
   always allowed; state changes on remote boxes are not, without a per-run OK.
-- `frank-default-large` on Dankclaw is a **production service** shared with this
-  repo's operator: never stop, mask, or restart it (or any production service on
-  any box) without an explicit, current, per-run OK from Frank.
+- `frank-archon` (Dankserver), `frank-dragoon`, and `frank-zealot` (Dankclaw)
+  are **production services** shared with this repo's operator: never stop,
+  mask, or restart them (or any production service on any box) without an
+  explicit, current, per-run OK from Frank.
 
 ## File-organization doctrine (why this repo stays readable)