From 2237a902b6fc264daa61ffacb516dc5f92c69e2d Mon Sep 17 00:00:00 2001 From: Eric Rakestraw Date: Sat, 26 Sep 2026 22:01:37 +0000 Subject: [PATCH] Adopt ConfigKit licensing update and clarify policy sources --- docs/roadmap/policy.md | 37 +++++++++++++++++++++++-------------- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/docs/roadmap/policy.md b/docs/roadmap/policy.md index 43559b9..004544c 100644 --- a/docs/roadmap/policy.md +++ b/docs/roadmap/policy.md @@ -4,7 +4,7 @@ Status: Accepted; implementation pending. ## Goal -Adopt the upstream licensing-documentation conventions without changing +Adopt the agreed licensing-documentation conventions without changing Narratio's license, runtime behavior, or release responsibility boundary. Make project licensing and upstream attribution easy to find and maintain through ordinary development and release preparation. @@ -13,16 +13,18 @@ This roadmap defines the target and scope, not implementation sequencing. ## Current Baseline -The standard policy checkout at `../policy`, reviewed on 2026-09-26, provides -OSS policy v1.2 and licensing additions in documentation policy v1.5 and release -policy v1.2. Its standard license reference collection supplies reusable texts; -it is not a bundle that every consumer must copy in full. +The agreed house conventions cover project licensing, component attribution, +and README/release navigation. Policy templates are internal administrative +material, not an attribution source. Do not cite or link their repository, +filesystem location, or contents in Narratio documentation. Adopted policies +must be self-contained; license texts and component notices must trace to their +actual public publishers and upstream projects. Narratio currently has: - A root `COPYRIGHT` identifying Narratio, its copyright holder, and the `GPL-3.0-or-later` grant, warranty disclaimer, and third-party-material caveat. -- A complete root `LICENSE` matching the upstream GPLv3 reference text except +- A complete root `LICENSE` matching the standard GPLv3 text except for a missing final newline. No substantive licensing correction is needed. - Documentation policy based on v1.1, without the new licensing ownership map, and no `docs/policy/oss.md` or `docs/oss/` attribution collection. @@ -38,6 +40,13 @@ is asynchronous. The current dependency graph includes ConfigKit, AWS modules, Go extension packages, YAML libraries, and test dependencies. This roadmap does not claim that their individual terms or attribution coverage have been audited. +ConfigKit is now selected at v0.4.1, whose patch contains licensing/documentation +changes only. Its project grant is LGPL-3.0-or-later and its LICENSE includes +both LGPLv3 and GPLv3. PromptKit v0.11.1 likewise updates licensing documentation +and selects MIT-licensed catalog releases, but is not in Narratio's Go module +graph. Its use by separately installed downstream applications does not make it +a Narratio dependency or justify adding it to this inventory by itself. + ## Targeted End State The existing project grant remains unchanged. A tailored OSS policy governs @@ -56,7 +65,7 @@ approval system. ### Adopt a Tailored OSS Policy -Add `docs/policy/oss.md` from upstream v1.2, retaining its actual base version +Add `docs/policy/oss.md` using the agreed OSS conventions, retaining its base version and recording the adoption date. Remove template instructions and adapt links that point to template-only examples or reference collections. Do not introduce placeholder documents merely to satisfy those links. @@ -67,7 +76,7 @@ channels, and publication mechanism. Preserve the author's license choice; adoption is not relicensing. Leave COPYRIGHT and LICENSE substantively intact; normalizing the final newline is optional formatting only. -Retain upstream's House Format and settled interpretation of notice links: +Retain the agreed House Format and settled interpretation of notice links: project-specific license and attribution material is linked at its imported commit rather than copied locally solely because its terms use reproduction, inclusion, or copy language. This convention does not establish license @@ -79,8 +88,8 @@ common ownership or require repeated approval of the settled convention. ### Establish Canonical Ownership and Contributor Routing -Incorporate the licensing-related additions from upstream documentation policy -v1.5 into `docs/policy/documentation.md`, preserving Narratio-specific ownership +Incorporate the agreed licensing ownership additions into +`docs/policy/documentation.md`, preserving Narratio-specific ownership and existing unrelated decisions. Clearly assign: - Project identity, copyright, and grant to `COPYRIGHT`. @@ -91,8 +100,8 @@ and existing unrelated decisions. Clearly assign: - Navigation to README and release notes; concrete release URL construction and publication mechanics to `docs/release.md`. -Record the selective upstream adoption accurately; do not imply the entire -upstream policy set has been adopted by merely changing version metadata. +Record the selective policy update accurately; do not imply unrelated policy +changes have been adopted by merely changing version metadata. Add a task-specific reading route in `docs/development.md` for licensing, dependency, attribution, and release-document changes. Avoid repeating the OSS rules in the agent, architecture, or testing policies. @@ -107,7 +116,7 @@ nor every separately installed subprocess application automatically belongs in the inventory. Review any such component if Narratio actually incorporates or distributes it. -Create `docs/oss/attribution.md` with the upstream five-field format: project +Create `docs/oss/attribution.md` with the agreed five-field format: project name, faithful upstream copyright statements, applicable SPDX expression, license/notice links, and a source repository link. Preserve multiple statements, licensing alternatives, versions, and exceptions where applicable. Do not infer @@ -167,7 +176,7 @@ and existing release correction policy, not silent rewriting of a release. - No changes to application behavior, dependency versions, platform support, or successful-tag-push release completion. - No wholesale replacement of Narratio-specific policy with generic templates. -- No adoption in this scope of upstream release v1.2's broader changes to +- No adoption in this scope of broader release-process changes to validation, repeated checks, fixed note sections, or release preparation. Those changes warrant a separate deliberate review of policy, scripts, and tests. The licensing additions must not silently enact them. diff --git a/go.mod b/go.mod index 3d110e2..69dbb23 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module gitea.maximumdirect.net/eric/narratio go 1.26.0 require ( - gitea.maximumdirect.net/eric/ConfigKit v0.4.0 + gitea.maximumdirect.net/eric/ConfigKit v0.4.1 github.com/aws/aws-sdk-go-v2/config v1.32.17 github.com/aws/aws-sdk-go-v2/credentials v1.19.16 github.com/aws/aws-sdk-go-v2/service/s3 v1.101.0 diff --git a/go.sum b/go.sum index bd02458..56f90f3 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -gitea.maximumdirect.net/eric/ConfigKit v0.4.0 h1:fo+vKff3zTGeWqJIA38NtT84b6OUP//9ZmBH3lFuKgk= -gitea.maximumdirect.net/eric/ConfigKit v0.4.0/go.mod h1:tYWpsrbLyu05r8+1MapWp5fN6ZrX9I8hU2xEPedYmYk= +gitea.maximumdirect.net/eric/ConfigKit v0.4.1 h1:Rl2eaP5NgDgUQt8QZe0DYxF8GFc/6cnkUTLRSf5dcCU= +gitea.maximumdirect.net/eric/ConfigKit v0.4.1/go.mod h1:tYWpsrbLyu05r8+1MapWp5fN6ZrX9I8hU2xEPedYmYk= github.com/aws/aws-sdk-go-v2 v1.41.7 h1:DWpAJt66FmnnaRIOT/8ASTucrvuDPZASqhhLey6tLY8= github.com/aws/aws-sdk-go-v2 v1.41.7/go.mod h1:4LAfZOPHNVNQEckOACQx60Y8pSRjIkNZQz1w92xpMJc= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.10 h1:gx1AwW1Iyk9Z9dD9F4akX5gnN3QZwUB20GGKH/I+Rho=