diff --git a/docs/roadmap/remediation.md b/docs/roadmap/remediation.md index 8bc17dd..6c9b82e 100644 --- a/docs/roadmap/remediation.md +++ b/docs/roadmap/remediation.md @@ -93,6 +93,9 @@ isolated pass as full-suite success. ## 3. P3: Finish the planned field-level publish resolution cleanup +Status: Complete. Field-only defaults and destinations retain precise native +history. Publish and authored append/upsert/replace regression checks pass. + Stages: 1 and 3; the roadmap's integration scope requires field-level recording for field-only changes. diff --git a/internal/config/pipeline_configkit.go b/internal/config/pipeline_configkit.go index a93354f..ec38614 100644 --- a/internal/config/pipeline_configkit.go +++ b/internal/config/pipeline_configkit.go @@ -200,19 +200,12 @@ func resolvePipelineConfig(cfg *PipelineConfig, resolution *configkit.Resolution } } if cfg.Publish != nil { - defaultedOutput := false for index := range cfg.Publish.Outputs { output := cfg.Publish.Outputs[index] path := configkit.Keys("publish", "outputs").Index(index).Key("required") - if !resolution.IsExplicit(path) { - defaultedOutput = true - } configkit.Default(resolution, path, &output.Required, boolPtr(true), "publish outputs are required by default") cfg.Publish.Outputs[index] = output } - if defaultedOutput { - resolution.RecordDerivedDefault(configkit.Keys("publish", "outputs"), "publish output entry defaults") - } } before := cloneNotariusForResolution(cfg.Notarius) if err := NormalizePipelineConfig(cfg); err != nil { @@ -229,11 +222,6 @@ func resolvePipelineConfig(cfg *PipelineConfig, resolution *configkit.Resolution configkit.Normalize(resolution, configkit.Keys("publish", "outputs").Index(derived.index).Key("dest"), &output.Dest, derived.dest, "derived from publish source") cfg.Publish.Outputs[derived.index] = output } - if len(destinations) > 0 { - // ConfigKit compares sequences atomically; child records alone do not - // cover the list mutation when requiredness was already explicit. - resolution.RecordNormalization(configkit.Keys("publish", "outputs"), "derived publish destinations") - } } return nil } diff --git a/internal/config/publish_field_history_test.go b/internal/config/publish_field_history_test.go new file mode 100644 index 0000000..3d293ac --- /dev/null +++ b/internal/config/publish_field_history_test.go @@ -0,0 +1,31 @@ +package config + +import ( + "testing" + + configkit "go.maximumdirect.net/configkit" +) + +func TestPublishFieldResolutionPreservesUnchangedSourceHistory(t *testing.T) { + root := writePipelineFixture(t, t.TempDir(), "pipeline.yml", "publish:\n outputs:\n - source: narratio.transcript.final\n") + cfg, err := LoadPipeline(root) + if err != nil { + t.Fatal(err) + } + output := cfg.Publish.Outputs[0] + if output.Dest == "" || output.Required == nil || !*output.Required { + t.Fatalf("missing resolved defaults: %#v", output) + } + base := configkit.Keys("publish", "outputs").Index(0) + for _, change := range cfg.resolution.configkitMetadata.History(base.Key("source")) { + if change.Origin.Layer == configkit.LayerResolution { + t.Fatalf("untouched source has resolution history: %#v", change) + } + } + for _, field := range []string{"required", "dest"} { + info, ok := cfg.resolution.configkitMetadata.Lookup(base.Key(field)) + if !ok || info.Origin.Layer != configkit.LayerResolution { + t.Fatalf("missing field origin for %s: %#v", field, info) + } + } +}