Unify PromptKit and ConfigKit source wiring

This commit is contained in:
2026-11-18 19:01:17 +00:00
parent ae5344a77d
commit e7a8b0db04
21 changed files with 53 additions and 54 deletions

View File

@@ -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{