diff --git a/docs/roadmap/configkit.md b/docs/roadmap/configkit.md index 4ece702..8b80ad6 100644 --- a/docs/roadmap/configkit.md +++ b/docs/roadmap/configkit.md @@ -2,10 +2,11 @@ ## Status And Intent -Drafted on 2026-11-17. The maintainer selected an interim ConfigKit v1.2.0 -upgrade, followed by ConfigKit v1.2.1 as part of the upcoming PromptKit upgrade. -This roadmap describes that interim target and the changes needed to reach it; -it is not an implementation plan or a claim that the upgrade has landed. +Drafted on 2026-11-17. The interim ConfigKit v1.2.0 adoption is implemented; +the [implementation plan](implementation.md) records its verification. The +upcoming PromptKit upgrade retains the separate ConfigKit v1.2.1 and stable +YAML handoff, including retirement of the old module when no longer needed. +This roadmap preserves the interim target, rationale, and scope. The maintainer is adopting ConfigKit across an application suite to standardize configuration semantics. Scriptorium should use the selected ConfigKit's native diff --git a/docs/roadmap/implementation.md b/docs/roadmap/implementation.md index f40ae8a..efb1490 100644 --- a/docs/roadmap/implementation.md +++ b/docs/roadmap/implementation.md @@ -415,6 +415,16 @@ remain separate preparation; this stage does not authorize publication. ## Stage 7: Validate The End State And Record The Handoff +**Complete.** With Go 1.27.4 and the provisioned offline module cache, `go test +./...`, `go test -race ./...`, `go vet ./...`, the native build, and both +Linux release-target builds passed. Ordinary, composed, inheritance, and +collection renders, application explanation, framework source inspection, +workflow YAML and shell syntax, affected local links, formatting, and +`git diff --check` were checked. The module and executable dependency graphs +retain the intended two ConfigKit generations and YAML prerelease; no +workspace, replacement, or vendoring was added. The future PromptKit handoff +still owns ConfigKit v1.2.1, stable YAML, and removal of the old module. + **Work** 1. Review the entire diff for unintended contract strengthening or obsolete diff --git a/internal/config/load_test.go b/internal/config/load_test.go index 5e767d1..d5a542a 100644 --- a/internal/config/load_test.go +++ b/internal/config/load_test.go @@ -175,6 +175,22 @@ func TestLoadDiscoveryErrorQuotesPath(t *testing.T) { if !strings.Contains(diagnostics.String(), string(configkit.CodeSourceNotRegular)) || strings.Contains(diagnostics.String(), "directory-\n.yml") { t.Fatalf("discovery diagnostics exposed an unescaped path: %s", diagnostics.String()) } + + // A decoding diagnostic can contain an authored configuration path even + // though the nonregular-file diagnostic omits its filesystem path. + file := filepath.Join(dir, "invalid.yml") + writeApplicationFile(t, file, "server:\n \"bad\\nkey\": value\n") + _, err = Load(LoadOptions{Path: file, Explicit: true}) + if !errors.As(err, &loadError) { + t.Fatalf("expected decoding diagnostic: %v", err) + } + diagnostics.Reset() + if err := configkit.WriteDiagnostics(&diagnostics, loadError.Diagnostics()); err != nil { + t.Fatal(err) + } + if !strings.Contains(diagnostics.String(), `\n`) || strings.Contains(diagnostics.String(), "bad\nkey") { + t.Fatalf("diagnostic path was not escaped: %q", diagnostics.String()) + } } func TestLoadComposesExplicitImportsAndSelectedOverlay(t *testing.T) {