From e7a8b0db0415bac656fed470a73619c8440322b8 Mon Sep 17 00:00:00 2001 From: Eric Rakestraw Date: Wed, 18 Nov 2026 19:01:17 +0000 Subject: [PATCH] Unify PromptKit and ConfigKit source wiring --- docs/roadmap/implementation.md | 2 ++ go.mod | 13 +++++-------- go.sum | 10 ++++++++++ internal/adapter/cli/application_config.go | 9 +-------- internal/adapter/cli/framework_config.go | 13 ++++++------- internal/adapter/cli/framework_config_test.go | 2 +- internal/adapter/cli/framework_sources.go | 6 +++--- internal/adapter/cli/framework_sources_test.go | 4 ++-- internal/adapter/cli/run.go | 11 +++++------ internal/adapter/cli/run_test.go | 9 ++++----- internal/adapter/dependency_test.go | 4 ++-- internal/adapter/http/artifact_reader.go | 2 +- internal/adapter/http/artifact_reader_test.go | 2 +- internal/adapter/http/handler.go | 2 +- internal/adapter/http/handler_test.go | 4 ++-- internal/format/inspection.go | 2 +- internal/format/inspection_test.go | 2 +- internal/format/prepared_run.go | 2 +- internal/format/prepared_run_test.go | 2 +- internal/report/report.go | 2 +- internal/report/report_test.go | 4 ++-- 21 files changed, 53 insertions(+), 54 deletions(-) diff --git a/docs/roadmap/implementation.md b/docs/roadmap/implementation.md index d7f38f8..cef259d 100644 --- a/docs/roadmap/implementation.md +++ b/docs/roadmap/implementation.md @@ -18,6 +18,8 @@ scaffolding, or conversation and coordination features. ## Stage 1: Unify dependencies and framework source wiring +**Status: Complete.** + 1. Update `go.mod` to require `go.maximumdirect.net/promptkit v0.23.2` and `go.maximumdirect.net/configkit v1.2.1`. Remove the old PromptKit and ConfigKit requirements and both old catalog requirements. Replace Go diff --git a/go.mod b/go.mod index ad143de..ab04592 100644 --- a/go.mod +++ b/go.mod @@ -3,15 +3,12 @@ module gitea.maximumdirect.net/eric/scriptorium go 1.27.0 require ( - gitea.maximumdirect.net/eric/ConfigKit v0.5.0 - gitea.maximumdirect.net/eric/promptkit v0.12.0 - go.maximumdirect.net/configkit v1.2.0 + go.maximumdirect.net/configkit v1.2.1 + go.maximumdirect.net/promptkit v0.23.2 ) require ( - gitea.maximumdirect.net/eric/promptkit-backend-openrouter/v3 v3.20260930.0 // indirect - gitea.maximumdirect.net/eric/promptkit-backend-rakestrawhome/v3 v3.20260930.0 // indirect - github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect - go.yaml.in/yaml/v4 v4.0.0-rc.6 // indirect - golang.org/x/text v0.14.0 // indirect + github.com/santhosh-tekuri/jsonschema/v6 v6.0.3 // indirect + go.yaml.in/yaml/v4 v4.0.0 // indirect + golang.org/x/text v0.44.0 // indirect ) diff --git a/go.sum b/go.sum index 5cee96a..7cdca2f 100644 --- a/go.sum +++ b/go.sum @@ -10,11 +10,21 @@ github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxK github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ= github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU= +github.com/santhosh-tekuri/jsonschema/v6 v6.0.3 h1:1EYB5IzjZawrrnELUi78f9fPu57HuXjmddZPjrls/28= +github.com/santhosh-tekuri/jsonschema/v6 v6.0.3/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU= go.maximumdirect.net/configkit v1.2.0 h1:c4tDJ6Xeh/Jg90UZplLxsnf500lvrZBVj0E3i1ysir8= go.maximumdirect.net/configkit v1.2.0/go.mod h1:s1zLJ9GGB/1Q4a+aOHMLISonJxWFgNWpA6SpPlOafeA= +go.maximumdirect.net/configkit v1.2.1 h1:f+/6WjNl6CULbMr6ZSVwi4aty9rmuDfJlvpeU7I+HZM= +go.maximumdirect.net/configkit v1.2.1/go.mod h1:ewu6blSokUDCMovy8JBXAdXRikGmlHXAQpFghnPWRfs= +go.maximumdirect.net/promptkit v0.23.2 h1:nE+Qqqbw5GN4PHD2e5OEWUHXcYkESZm3ryZVBsKWwFQ= +go.maximumdirect.net/promptkit v0.23.2/go.mod h1:vPFg76VXcffP0JBFMS2WADCHwV5FYvO2O4bvIoiDlwc= go.yaml.in/yaml/v4 v4.0.0-rc.6 h1:1h7H1ohdUh93/FyE4YaDa1Zh64K6VVbjF4K6WUxMtH4= go.yaml.in/yaml/v4 v4.0.0-rc.6/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0= +go.yaml.in/yaml/v4 v4.0.0 h1:/LG1pNO84Z4l603j/xMn69CcS5OYhMQ/f7l2LoQUGuw= +go.yaml.in/yaml/v4 v4.0.0/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.44.0 h1:YItdp/mQNGnsmrgpcdA5yQ3bnRxCfo/Tj/iByGW9GGo= +golang.org/x/text v0.44.0/go.mod h1:S4FR1waQ9LbjQTls97SyRjDaUUVkaM+cXwwuG/G+MwY= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/adapter/cli/application_config.go b/internal/adapter/cli/application_config.go index 68c6360..cfe2133 100644 --- a/internal/adapter/cli/application_config.go +++ b/internal/adapter/cli/application_config.go @@ -6,7 +6,6 @@ import ( "fmt" "io" - legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit" appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config" "go.maximumdirect.net/configkit" ) @@ -54,18 +53,12 @@ func loadApplicationSettings(configPath, overlay string, explicit bool, override func writeApplicationError(output io.Writer, label string, err error) { var loadError *configkit.LoadError if errors.As(err, &loadError) { + _, _ = fmt.Fprintf(output, "%s error:\n", label) if writeErr := configkit.WriteDiagnostics(output, loadError.Diagnostics()); writeErr != nil { _, _ = fmt.Fprintf(output, "%s diagnostic write error: %v\n", label, writeErr) } return } - var legacyLoadError *legacyconfigkit.LoadError - if errors.As(err, &legacyLoadError) { - if writeErr := legacyconfigkit.WriteDiagnostics(output, legacyLoadError.Diagnostics()); writeErr != nil { - _, _ = fmt.Fprintf(output, "%s diagnostic write error: %v\n", label, writeErr) - } - return - } _, _ = fmt.Fprintf(output, "%s error: %v\n", label, err) } diff --git a/internal/adapter/cli/framework_config.go b/internal/adapter/cli/framework_config.go index b37281d..de66a55 100644 --- a/internal/adapter/cli/framework_config.go +++ b/internal/adapter/cli/framework_config.go @@ -7,7 +7,6 @@ import ( "fmt" "io" - legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit" "go.maximumdirect.net/configkit" ) @@ -23,8 +22,8 @@ type frameworkConfigurationConfig struct { type frameworkConfigurationSource struct { ID string `json:"id"` Label string `json:"label"` - Layer legacyconfigkit.Layer `json:"layer"` - Kind legacyconfigkit.SourceKind `json:"kind"` + Layer configkit.Layer `json:"layer"` + Kind configkit.SourceKind `json:"kind"` UnderlayIndex int `json:"underlay_index"` Path string `json:"path,omitempty"` ImportedFrom *frameworkConfigurationLocation `json:"imported_from,omitempty"` @@ -42,9 +41,9 @@ func inspectFrameworkConfigurationCommand(args []string, stdout, stderr io.Write writeApplicationError(stderr, "inspect configuration parse", err) return ExitRuntimeError } - var explanationPath legacyconfigkit.Path + var explanationPath configkit.Path if cfg.mode == "explain" { - explanationPath, err = legacyconfigkit.ParsePath(cfg.path) + explanationPath, err = configkit.ParsePath(cfg.path) if err != nil { writeApplicationError(stderr, "inspect configuration path", err) return ExitRuntimeError @@ -68,7 +67,7 @@ func inspectFrameworkConfigurationCommand(args []string, stdout, stderr io.Write writeApplicationError(stderr, "inspect configuration", err) return ExitRuntimeError } - if err := legacyconfigkit.WriteDiagnostics(stderr, view.Diagnostics()); err != nil { + if err := configkit.WriteDiagnostics(stderr, view.Diagnostics()); err != nil { return ExitRuntimeError } if cfg.mode == "validate" { @@ -147,7 +146,7 @@ func resolveAppSettingsForFrameworkConfiguration(cfg *frameworkConfigurationConf }, nil } -func frameworkConfigurationSources(sources []legacyconfigkit.SourceInfo) []frameworkConfigurationSource { +func frameworkConfigurationSources(sources []configkit.SourceInfo) []frameworkConfigurationSource { result := make([]frameworkConfigurationSource, 0, len(sources)) for _, source := range sources { item := frameworkConfigurationSource{ diff --git a/internal/adapter/cli/framework_config_test.go b/internal/adapter/cli/framework_config_test.go index 8f8afa9..138f72b 100644 --- a/internal/adapter/cli/framework_config_test.go +++ b/internal/adapter/cli/framework_config_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - configkit "gitea.maximumdirect.net/eric/ConfigKit" renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format" + configkit "go.maximumdirect.net/configkit" ) func TestFrameworkConfigurationCommandsNeedNoPromptOrCredential(t *testing.T) { diff --git a/internal/adapter/cli/framework_sources.go b/internal/adapter/cli/framework_sources.go index f7cad4d..5a161a6 100644 --- a/internal/adapter/cli/framework_sources.go +++ b/internal/adapter/cli/framework_sources.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit" - "gitea.maximumdirect.net/eric/promptkit" + "go.maximumdirect.net/configkit" + "go.maximumdirect.net/promptkit" ) type promptKitSourceFlagEntry struct { @@ -71,5 +71,5 @@ func writeFrameworkDiagnostics(output io.Writer, engine *promptkit.Engine) error if err != nil { return fmt.Errorf("inspect captured PromptKit diagnostics: %w", err) } - return legacyconfigkit.WriteDiagnostics(output, view.Diagnostics()) + return configkit.WriteDiagnostics(output, view.Diagnostics()) } diff --git a/internal/adapter/cli/framework_sources_test.go b/internal/adapter/cli/framework_sources_test.go index 4316b55..1bcfe30 100644 --- a/internal/adapter/cli/framework_sources_test.go +++ b/internal/adapter/cli/framework_sources_test.go @@ -10,9 +10,9 @@ import ( "reflect" "testing" - configkit "gitea.maximumdirect.net/eric/ConfigKit" - "gitea.maximumdirect.net/eric/promptkit" appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config" + configkit "go.maximumdirect.net/configkit" + "go.maximumdirect.net/promptkit" ) func TestFrameworkSourceGroupsComposeAndValidateEffectiveDefinitions(t *testing.T) { diff --git a/internal/adapter/cli/run.go b/internal/adapter/cli/run.go index ca7d812..3c77985 100644 --- a/internal/adapter/cli/run.go +++ b/internal/adapter/cli/run.go @@ -13,14 +13,13 @@ import ( "strings" "time" - legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit" - "gitea.maximumdirect.net/eric/promptkit" httpadapter "gitea.maximumdirect.net/eric/scriptorium/internal/adapter/http" appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config" "gitea.maximumdirect.net/eric/scriptorium/internal/defaults" renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format" executionreport "gitea.maximumdirect.net/eric/scriptorium/internal/report" "go.maximumdirect.net/configkit" + "go.maximumdirect.net/promptkit" ) const ( @@ -544,12 +543,12 @@ func (c serveConfig) engineSettings() engineSettings { } func newEngine(settings engineSettings, options ...promptkit.Option) (*promptkit.Engine, error) { - underlays := make([]legacyconfigkit.Underlay, 0, len(settings.promptkitSources)) + underlays := make([]configkit.Underlay, 0, len(settings.promptkitSources)) for index, selection := range settings.promptkitSources { - var inputs []legacyconfigkit.Input + var inputs []configkit.Input switch { case selection.File != "" && selection.Directory == "": - inputs = []legacyconfigkit.Input{{Source: legacyconfigkit.File(selection.File), Imports: true}} + inputs = []configkit.Input{{Source: configkit.File(selection.File), Imports: true}} case selection.Directory != "" && selection.File == "": var err error inputs, err = promptkit.DirectoryInputs(selection.Directory) @@ -561,7 +560,7 @@ func newEngine(settings engineSettings, options ...promptkit.Option) (*promptkit cause := fmt.Errorf("PromptKit source %d must select exactly one file or directory", index+1) return nil, fmt.Errorf("engine initialization from application configuration: %w", errors.Join(promptkit.ErrInvalidConfig, cause)) } - underlays = append(underlays, legacyconfigkit.Underlay{Inputs: inputs}) + underlays = append(underlays, configkit.Underlay{Inputs: inputs}) } engine, err := promptkit.NewEngine(promptkit.Config{ Sources: promptkit.ConfigurationSources{Underlays: underlays}, diff --git a/internal/adapter/cli/run_test.go b/internal/adapter/cli/run_test.go index 4787b22..1de4f81 100644 --- a/internal/adapter/cli/run_test.go +++ b/internal/adapter/cli/run_test.go @@ -18,12 +18,11 @@ import ( "testing" "time" - legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit" - "gitea.maximumdirect.net/eric/promptkit" appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config" "gitea.maximumdirect.net/eric/scriptorium/internal/defaults" renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format" "go.maximumdirect.net/configkit" + "go.maximumdirect.net/promptkit" ) func TestParseMappingsSingleAndRepeated(t *testing.T) { @@ -569,9 +568,9 @@ func TestConfigurationErrorsUseTheirNativeDiagnosticWriters(t *testing.T) { } } _, err := newEngine(engineSettings{promptkitSources: []appconfig.SourceSelection{{File: framework}}}) - var legacyError *legacyconfigkit.LoadError - if !errors.As(err, &legacyError) { - t.Fatalf("framework load lost legacy diagnostic identity: %v", err) + var loadError *configkit.LoadError + if !errors.As(err, &loadError) { + t.Fatalf("framework load lost diagnostic identity: %v", err) } } diff --git a/internal/adapter/dependency_test.go b/internal/adapter/dependency_test.go index 573c93a..b576dd2 100644 --- a/internal/adapter/dependency_test.go +++ b/internal/adapter/dependency_test.go @@ -15,7 +15,7 @@ import ( const ( scriptoriumModulePath = "gitea.maximumdirect.net/eric/scriptorium" - promptkitInternalPath = "gitea.maximumdirect.net/eric/promptkit/internal" + promptkitInternalPath = "go.maximumdirect.net/promptkit/internal" promptkitOpenRouterCatalogPath = "gitea.maximumdirect.net/eric/promptkit-backend-openrouter" promptkitRakestrawhomeCatalogPath = "gitea.maximumdirect.net/eric/promptkit-backend-rakestrawhome" ) @@ -149,7 +149,7 @@ func TestForbiddenImportScannerAllowsRetainedApplicationPackages(t *testing.T) { source := `package consumer import ( - _ "gitea.maximumdirect.net/eric/promptkit" + _ "go.maximumdirect.net/promptkit" _ "gitea.maximumdirect.net/eric/scriptorium/internal/adapter/http" _ "gitea.maximumdirect.net/eric/scriptorium/internal/config" _ "gitea.maximumdirect.net/eric/scriptorium/internal/defaults" diff --git a/internal/adapter/http/artifact_reader.go b/internal/adapter/http/artifact_reader.go index 1c9638c..f59502e 100644 --- a/internal/adapter/http/artifact_reader.go +++ b/internal/adapter/http/artifact_reader.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "gitea.maximumdirect.net/eric/promptkit" + "go.maximumdirect.net/promptkit" ) var ( diff --git a/internal/adapter/http/artifact_reader_test.go b/internal/adapter/http/artifact_reader_test.go index a42aae1..0c9a330 100644 --- a/internal/adapter/http/artifact_reader_test.go +++ b/internal/adapter/http/artifact_reader_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "gitea.maximumdirect.net/eric/promptkit" + "go.maximumdirect.net/promptkit" ) func TestRestrictedArtifactReaderReadsContainedFiles(t *testing.T) { diff --git a/internal/adapter/http/handler.go b/internal/adapter/http/handler.go index 4a15c2f..80e8846 100644 --- a/internal/adapter/http/handler.go +++ b/internal/adapter/http/handler.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "gitea.maximumdirect.net/eric/promptkit" "gitea.maximumdirect.net/eric/scriptorium/internal/defaults" executionreport "gitea.maximumdirect.net/eric/scriptorium/internal/report" + "go.maximumdirect.net/promptkit" ) type Runner interface { diff --git a/internal/adapter/http/handler_test.go b/internal/adapter/http/handler_test.go index 01bbb1e..b567e41 100644 --- a/internal/adapter/http/handler_test.go +++ b/internal/adapter/http/handler_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "gitea.maximumdirect.net/eric/ConfigKit" - "gitea.maximumdirect.net/eric/promptkit" + "go.maximumdirect.net/configkit" + "go.maximumdirect.net/promptkit" ) type fakeRunner struct { diff --git a/internal/format/inspection.go b/internal/format/inspection.go index cd0c267..e446d8c 100644 --- a/internal/format/inspection.go +++ b/internal/format/inspection.go @@ -7,7 +7,7 @@ import ( "fmt" "strconv" - "gitea.maximumdirect.net/eric/promptkit" + "go.maximumdirect.net/promptkit" ) type PromptInspection struct { diff --git a/internal/format/inspection_test.go b/internal/format/inspection_test.go index a8067ec..23f6adf 100644 --- a/internal/format/inspection_test.go +++ b/internal/format/inspection_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "gitea.maximumdirect.net/eric/promptkit" + "go.maximumdirect.net/promptkit" ) func TestFormatPromptInspectionPreservesDeclaredOrderAndEmptyValues(t *testing.T) { diff --git a/internal/format/prepared_run.go b/internal/format/prepared_run.go index 2516c5e..8618043 100644 --- a/internal/format/prepared_run.go +++ b/internal/format/prepared_run.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "gitea.maximumdirect.net/eric/promptkit" + "go.maximumdirect.net/promptkit" ) var ErrUnknownPreparedRunFormat = errors.New("unknown prepared run format") diff --git a/internal/format/prepared_run_test.go b/internal/format/prepared_run_test.go index 2668253..e5a7725 100644 --- a/internal/format/prepared_run_test.go +++ b/internal/format/prepared_run_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "gitea.maximumdirect.net/eric/promptkit" + "go.maximumdirect.net/promptkit" ) func TestTextFormatterIncludesPreparedRunDetails(t *testing.T) { diff --git a/internal/report/report.go b/internal/report/report.go index 21064af..ee408b1 100644 --- a/internal/report/report.go +++ b/internal/report/report.go @@ -1,6 +1,6 @@ package report -import "gitea.maximumdirect.net/eric/promptkit" +import "go.maximumdirect.net/promptkit" // Execution is the terminal observation exposed by Scriptorium's opt-in adapters. type Execution struct { diff --git a/internal/report/report_test.go b/internal/report/report_test.go index eb12dc1..90f93a9 100644 --- a/internal/report/report_test.go +++ b/internal/report/report_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "gitea.maximumdirect.net/eric/ConfigKit" - "gitea.maximumdirect.net/eric/promptkit" + "go.maximumdirect.net/configkit" + "go.maximumdirect.net/promptkit" ) func TestCollectorProjectsOnlyTerminalAggregates(t *testing.T) {