diff --git a/docs/adr/0132-multi-organization-runtime-is-open-core.md b/docs/adr/0132-multi-organization-runtime-is-open-core.md index f4d4a206f52..75ea12e0a8f 100644 --- a/docs/adr/0132-multi-organization-runtime-is-open-core.md +++ b/docs/adr/0132-multi-organization-runtime-is-open-core.md @@ -1,8 +1,8 @@ # ADR-0132: The multi-organization runtime is open core — single-database organization isolation ships open; only the entitlement stays commercial -- **Status**: Proposed (2026-09-06) — awaiting the maintainer's hand-merge, which is itself the - acceptance act for a governed surface (Prime Directive #14). ⛔ Nothing below is settled until - this record merges. +- **Status**: Accepted (2026-09-07) — accepted by the merge that landed it on `main` + ([#16215](https://github.com/objectstack-ai/objectstack/pull/16215), commit `c677cda816`), which + is itself the acceptance act for a governed surface (Prime Directive #14). - **Deciders**: ObjectStack maintainer, 2026-09-06, live chat, verbatim and untranslated: the question that opened it 「感觉 单库多组织隔离是开源基本需求,如果迁移回开源项目成本有多大」, the instruction that chartered the work 「直接立专题卡派发处理吧」, and the statement of the effect diff --git a/docs/adr/0133-org-management-open-basics.md b/docs/adr/0133-org-management-open-basics.md index e085c37a9f3..79c8c3a4310 100644 --- a/docs/adr/0133-org-management-open-basics.md +++ b/docs/adr/0133-org-management-open-basics.md @@ -1,6 +1,6 @@ # ADR-0133: Organization management — the open basics; a mirror of cloud ADR-0081 D1/D3/D4 in the repository whose code enforces them -- **Status**: Proposed (2026-09-06) — awaiting the maintainer's hand-merge, which is the acceptance act for a governed surface (Prime Directive #14). ⛔ Nothing in this file is a new decision; see [Provenance](#provenance--read-this-before-citing-this-file). +- **Status**: Accepted (2026-09-07) — accepted by the merge that landed it on `main` ([#16267](https://github.com/objectstack-ai/objectstack/pull/16267), commit `13c08356ab`), which is the acceptance act for a governed surface (Prime Directive #14). ⛔ Nothing in this file is a new decision; see [Provenance](#provenance--read-this-before-citing-this-file). - **Mirrors**: `objectstack-ai/cloud` **ADR-0081** (Status: Accepted, founder-decided in session, 2026-07-09) — **D1, D3 and D4 only**, the half whose mechanism is open code in this repository. - **Deliberately not mirrored**: cloud ADR-0081 **D2**, its non-goals, and its commercial consequences — cited as `cloud ADR-0081`, never restated here. ⚠️ D2 is absent for a stronger reason than the other two: it has been **reversed** by [ADR-0132](./0132-multi-organization-runtime-is-open-core.md), and the multi-organization machinery it packaged now ships in this repository (`packages/plugins/organizations`). What stays in cloud is that *record* — together with the non-goals and the commercial consequences, which the reversal leaves untouched. See [Relationship to the D2 reversal](#relationship-to-the-d2-reversal-adr-0132). - **Cross-checked against** (cite, do not duplicate): [ADR-0093](./0093-tenancy-mode-and-membership-lifecycle.md) (tenancy mode; the membership lifecycle; D9 already anchors the active-organization resolution), [ADR-0105](./0105-group-tenancy-posture-and-first-class-org-scope.md) (group tenancy posture; D12 anchors the multi-org entitlement), [ADR-0131](./0131-total-organization-ownership-no-null-organization-id.md) (total organization ownership; D1/D7/D9)