Adopt ConfigKit v0.5.0 inheritance

This commit is contained in:
2026-10-03 17:33:35 +00:00
parent e1ce526114
commit bbb473a3d9
7 changed files with 42 additions and 13 deletions

View File

@@ -26,7 +26,7 @@ The maintained [minimal configuration](../examples/config.yml),
## Application Configuration File ## Application Configuration File
Configuration is decoded by ConfigKit v0.4.2 as strict YAML. Unknown fields, Configuration is decoded by ConfigKit v0.5.0 as strict YAML. Unknown fields,
empty files, multiple YAML documents, and YAML aliases/anchors are rejected. empty files, multiple YAML documents, and YAML aliases/anchors are rejected.
An explicit empty string is a value: it clears a file-provided optional path An explicit empty string is a value: it clears a file-provided optional path
or, for required `prompt_dir`, fails the command's prerequisite. A scalar or, for required `prompt_dir`, fails the command's prerequisite. A scalar
@@ -111,6 +111,27 @@ History includes replaced and removed values; `show` presents the final
resolved snapshot. Neither renderer looks up credential bytes, and neither resolved snapshot. Neither renderer looks up credential bytes, and neither
claims to identify arbitrary secrets in unclassified parameter values. claims to identify arbitrary secrets in unclassified parameter values.
### Application mapping inheritance
Application input mappings may use ConfigKit's `extends: sibling-name`
directive to inherit settings from a sibling mapping. Inheritance is resolved
after imports, a selected overlay, and explicit CLI overrides have been
assembled, and before typed decoding. Explicit child values replace inherited
values, and `extends: null` cancels inheritance. Parents remain ordinary
configured entries; for example, a parent backend is still registered and
validated with its child. See the pinned [ConfigKit v0.5.0 inheritance
contract](https://gitea.maximumdirect.net/eric/ConfigKit/src/commit/dc09959cca4e105f49ec316c6d4ba585bd2340bd/docs/config.md#sibling-inheritance)
for detailed semantics.
`extends` is reserved across application input mappings, not only under
`backends`; quoting the key does not make it ordinary data. This can affect a
mapping entry named `extends` or a literal provider parameter with that name.
Rename an application-owned name where appropriate. A provider-required literal
key cannot generally be renamed without provider support, and this ConfigKit
version has no escape or opt-out; a concrete need must be addressed upstream.
The directive does not apply to separately parsed Promptkit definitions or
HTTP request payloads.
## Custom Backends ## Custom Backends
Use `backends` when a profile selects an application-defined backend ID: Use `backends` when a profile selects an application-defined backend ID:

View File

@@ -4,7 +4,7 @@ This is the contributor entry point for Scriptorium. Scriptorium is an
application that consumes the public application that consumes the public
[Promptkit v0.11.2 package](https://gitea.maximumdirect.net/eric/promptkit/src/tag/v0.11.2/docs/consumers/pkg-promptkit.md); [Promptkit v0.11.2 package](https://gitea.maximumdirect.net/eric/promptkit/src/tag/v0.11.2/docs/consumers/pkg-promptkit.md);
framework implementation work belongs in Promptkit. Application configuration framework implementation work belongs in Promptkit. Application configuration
uses ConfigKit v0.4.2; keep Scriptorium's schema and source selection local. uses ConfigKit v0.5.0; keep Scriptorium's schema and source selection local.
## Initial Orientation ## Initial Orientation

View File

@@ -36,7 +36,7 @@ License and notices: [LGPL 3.0](licenses/LGPL-3.0.txt) |
## ConfigKit ## ConfigKit
Selected module: `gitea.maximumdirect.net/eric/ConfigKit` at `v0.4.2`. Selected module: `gitea.maximumdirect.net/eric/ConfigKit` at `v0.5.0`.
Copyright (C) 2026 Eric Rakestraw Copyright (C) 2026 Eric Rakestraw
@@ -44,10 +44,10 @@ SPDX-License-Identifier: LGPL-3.0-or-later
License and notices: [LGPL 3.0](licenses/LGPL-3.0.txt) | License and notices: [LGPL 3.0](licenses/LGPL-3.0.txt) |
[GPL 3.0](licenses/GPL-3.0.txt) | [GPL 3.0](licenses/GPL-3.0.txt) |
[COPYRIGHT](https://gitea.maximumdirect.net/eric/ConfigKit/src/commit/67c03690181c5af8dde6be325abac241dae6732f/COPYRIGHT) | [COPYRIGHT](https://gitea.maximumdirect.net/eric/ConfigKit/src/commit/dc09959cca4e105f49ec316c6d4ba585bd2340bd/COPYRIGHT) |
[LICENSE](https://gitea.maximumdirect.net/eric/ConfigKit/src/commit/67c03690181c5af8dde6be325abac241dae6732f/LICENSE). [LICENSE](https://gitea.maximumdirect.net/eric/ConfigKit/src/commit/dc09959cca4e105f49ec316c6d4ba585bd2340bd/LICENSE).
[Source](https://gitea.maximumdirect.net/eric/ConfigKit/src/commit/67c03690181c5af8dde6be325abac241dae6732f). [Source](https://gitea.maximumdirect.net/eric/ConfigKit/src/commit/dc09959cca4e105f49ec316c6d4ba585bd2340bd).
## Promptkit OpenRouter Catalog ## Promptkit OpenRouter Catalog

View File

@@ -2,7 +2,7 @@
**Base Policy Version:** 1.3 **Base Policy Version:** 1.3
**Last Updated**: 2026-09-28 **Last Updated**: 2026-10-03
**Upstream Source:** https://gitea.maximumdirect.net/eric/policy/src/commit/d84a38ebab26f048cafbe59a2246700c35d29843/docs/policy/architecture.md **Upstream Source:** https://gitea.maximumdirect.net/eric/policy/src/commit/d84a38ebab26f048cafbe59a2246700c35d29843/docs/policy/architecture.md
@@ -60,10 +60,11 @@ policy. The [format reference](https://gitea.maximumdirect.net/eric/promptkit/sr
and [outbound integration contract](https://gitea.maximumdirect.net/eric/promptkit/src/tag/v0.11.2/docs/integrations/openai-compatible-chat.md) and [outbound integration contract](https://gitea.maximumdirect.net/eric/promptkit/src/tag/v0.11.2/docs/integrations/openai-compatible-chat.md)
remain Promptkit's contracts. remain Promptkit's contracts.
Scriptorium uses ConfigKit v0.4.2 for strict application YAML decoding, Scriptorium uses ConfigKit v0.5.0 for strict application YAML decoding,
resolution, and validation flow. Scriptorium retains its application schema, resolution, and validation flow. Scriptorium retains its application schema,
defaults, normalization, validation rules, source selection, and CLI override defaults, normalization, validation rules, source selection, and CLI override
mapping. ConfigKit does not own Promptkit framework sources or HTTP artifact mapping. ConfigKit also resolves sibling inheritance in application input
mappings. ConfigKit does not own Promptkit framework sources or HTTP artifact
containment. The [configuration contract](../config.md) owns externally containment. The [configuration contract](../config.md) owns externally
observable configuration behavior. observable configuration behavior.

View File

@@ -80,7 +80,14 @@ affected examples and link checks, not unrelated new runtime tests.
## Stage 1: Adopt The Published Dependency And Its Compatibility Notice ## Stage 1: Adopt The Published Dependency And Its Compatibility Notice
Status: Pending. Status: Complete.
Completion evidence: selected ConfigKit v0.5.0 at
`dc09959cca4e105f49ec316c6d4ba585bd2340bd`, updated its attribution and current
configuration compatibility documentation, and retained the single `Load`
pipeline. `go test ./...`, `go test -race ./...`, `go vet ./...`,
`go build ./cmd/scriptorium`, affected upstream link checks, and
`git diff --check` passed.
Files: `go.mod`, `go.sum`, `docs/oss/attribution.md`, Files: `go.mod`, `go.sum`, `docs/oss/attribution.md`,
`docs/config.md`, `docs/development.md`, and `docs/config.md`, `docs/development.md`, and

2
go.mod
View File

@@ -3,7 +3,7 @@ module gitea.maximumdirect.net/eric/scriptorium
go 1.25.5 go 1.25.5
require ( require (
gitea.maximumdirect.net/eric/ConfigKit v0.4.2 gitea.maximumdirect.net/eric/ConfigKit v0.5.0
gitea.maximumdirect.net/eric/promptkit v0.11.2 gitea.maximumdirect.net/eric/promptkit v0.11.2
) )

4
go.sum
View File

@@ -1,5 +1,5 @@
gitea.maximumdirect.net/eric/ConfigKit v0.4.2 h1:ZMxmv8pOnLtAx2hFTf8Z+pHKUbR89xErkBhwjr4yK24= gitea.maximumdirect.net/eric/ConfigKit v0.5.0 h1:2KwG10+kApWM3avOoYA+p768xcbHUp7tQ2rqizBNpyg=
gitea.maximumdirect.net/eric/ConfigKit v0.4.2/go.mod h1:tYWpsrbLyu05r8+1MapWp5fN6ZrX9I8hU2xEPedYmYk= gitea.maximumdirect.net/eric/ConfigKit v0.5.0/go.mod h1:tYWpsrbLyu05r8+1MapWp5fN6ZrX9I8hU2xEPedYmYk=
gitea.maximumdirect.net/eric/promptkit v0.11.2 h1:2RqI+KtflvSh7vLQaTAQCmMaFQscEA7EPwPazyvXRoY= gitea.maximumdirect.net/eric/promptkit v0.11.2 h1:2RqI+KtflvSh7vLQaTAQCmMaFQscEA7EPwPazyvXRoY=
gitea.maximumdirect.net/eric/promptkit v0.11.2/go.mod h1:onm/FBPUKQ8/NSPwTEk26Ut+dVX2iXcq8vEseB+g/0E= gitea.maximumdirect.net/eric/promptkit v0.11.2/go.mod h1:onm/FBPUKQ8/NSPwTEk26Ut+dVX2iXcq8vEseB+g/0E=
gitea.maximumdirect.net/eric/promptkit-backend-openrouter/v2 v2.20260926.0 h1:wdab+R+lgMZxzYwhbAuCrW7zdSQ1cW9ovBR6UzLmZR4= gitea.maximumdirect.net/eric/promptkit-backend-openrouter/v2 v2.20260926.0 h1:wdab+R+lgMZxzYwhbAuCrW7zdSQ1cW9ovBR6UzLmZR4=