diff --git a/DECISIONS.md b/DECISIONS.md index 8a4feca..6b609a2 100644 --- a/DECISIONS.md +++ b/DECISIONS.md @@ -154,6 +154,22 @@ governs advancement. Reversible: if demand appears, a new ADR opens the Future C --- +## ADR-009 — Trunk-Based Development + +**Status:** Accepted (2026-06-02) + +**Context.** Platform-wide convention (homelab architecture review invariant; gitea-mcp #27): +commit directly to `main`, one logical change per commit, every commit deployable. + +**Decision.** Tapir follows TBD. Commit directly to `main`. No feature branches or PRs for +solo/agent work; short-lived `agent/` branches only when parallel agents are active on +the repo simultaneously. CI is the quality gate, not branch protection. + +**Consequences.** Consistent with the rest of the estate. Depends on the direct-to-main write +path tracked in gitea-mcp #35 (item #1). + +--- + ## ADR-010 — Third-party caption acquisition via the timedtext/player baseUrl **Status:** Accepted (2026-06-02) @@ -203,22 +219,6 @@ player/timedtext baseUrl) only. ADR-007's captions-first stance and the STT defe --- -## ADR-009 — Trunk-Based Development - -**Status:** Accepted (2026-06-02) - -**Context.** Platform-wide convention (homelab architecture review invariant; gitea-mcp #27): -commit directly to `main`, one logical change per commit, every commit deployable. - -**Decision.** Tapir follows TBD. Commit directly to `main`. No feature branches or PRs for -solo/agent work; short-lived `agent/` branches only when parallel agents are active on -the repo simultaneously. CI is the quality gate, not branch protection. - -**Consequences.** Consistent with the rest of the estate. Depends on the direct-to-main write -path tracked in gitea-mcp #35 (item #1). - ---- - ## ADR-011 — Web read-surface at Stage 0: Dex authn (single-user authz), action signal, public ingress + GitOps **Status:** Accepted (2026-06-02)