Adopt ConfigKit for pipeline loading

internal/config/load.go

@@ -17,9 +17,8 @@ func LoadPipeline(path string) (*PipelineConfig, error) {
 	return LoadPipelineWithOptions(path, PipelineLoadOptions{})
 }
 
-// PipelineLoadOptions carries an optional explicit profile selection. A nil
-// Profile means the caller omitted selection; a non-nil empty value is an
-// explicit invalid selection.
+// PipelineLoadOptions carries an optional explicit profile selection. Nil,
+// empty, and the exact name "default" select the base configuration.
 type PipelineLoadOptions struct {
 	Profile *string
 }
@@ -27,77 +26,32 @@ type PipelineLoadOptions struct {
 // LoadPipelineWithOptions loads pipeline configuration with strict field
 // checking and optional named-profile selection.
 func LoadPipelineWithOptions(path string, opts PipelineLoadOptions) (*PipelineConfig, error) {
-	sources, err := loadPipelineCompositionSources(path)
+	cfg, err := loadPipelineWithConfigKit(path, opts)
 	if err != nil {
-		return nil, fmt.Errorf("load pipeline config: %w", err)
-	}
-	if _, err := selectPipelineProfile(sources.envelope, opts); err != nil {
-		return nil, fmt.Errorf("load pipeline config: %w", err)
-	}
-	if err := sources.loadOverlays(); err != nil {
-		return nil, fmt.Errorf("load pipeline config: %w", err)
-	}
-	cfg, err := sources.resolve(opts)
-	if err != nil {
-		return nil, fmt.Errorf("load pipeline config: %w", err)
+		return nil, err
 	}
 	return finalizeLoadedPipeline(path, cfg)
 }
 
-// LoadPipelineProfilePair resolves two explicit named profiles from one parsed
-// pipeline root and its declared source set. Each result is independently
-// decoded, defaulted, and finalized so later resolution can safely mutate one
-// effective pipeline without affecting the other.
+// LoadPipelineProfilePair resolves two profiles as independent ConfigKit loads.
 func LoadPipelineProfilePair(path, leftProfile, rightProfile string) (*PipelineConfig, *PipelineConfig, error) {
-	if _, err := normalizePipelineProfileName(leftProfile, "left profile selection"); err != nil {
-		return nil, nil, fmt.Errorf("load left pipeline profile: %w", err)
-	}
-	if _, err := normalizePipelineProfileName(rightProfile, "right profile selection"); err != nil {
-		return nil, nil, fmt.Errorf("load right pipeline profile: %w", err)
-	}
 	if leftProfile == rightProfile {
 		return nil, nil, fmt.Errorf("load pipeline profiles: left and right profile selections must differ")
 	}
-	sources, err := loadPipelineCompositionSources(path)
-	if err != nil {
-		return nil, nil, fmt.Errorf("load pipeline config: %w", err)
-	}
 	leftOptions := PipelineLoadOptions{Profile: &leftProfile}
 	rightOptions := PipelineLoadOptions{Profile: &rightProfile}
-	if _, err := selectPipelineProfile(sources.envelope, leftOptions); err != nil {
-		return nil, nil, fmt.Errorf("load left pipeline profile: %w", err)
-	}
-	if _, err := selectPipelineProfile(sources.envelope, rightOptions); err != nil {
-		return nil, nil, fmt.Errorf("load right pipeline profile: %w", err)
-	}
-	if err := sources.loadOverlays(); err != nil {
-		return nil, nil, fmt.Errorf("load pipeline config: %w", err)
-	}
-	left, err := sources.resolve(leftOptions)
+	left, err := LoadPipelineWithOptions(path, leftOptions)
 	if err != nil {
 		return nil, nil, fmt.Errorf("load left pipeline profile: %w", err)
 	}
-	right, err := sources.resolve(rightOptions)
+	right, err := LoadPipelineWithOptions(path, rightOptions)
 	if err != nil {
 		return nil, nil, fmt.Errorf("load right pipeline profile: %w", err)
 	}
-	left, err = finalizeLoadedPipeline(path, left)
-	if err != nil {
-		return nil, nil, err
-	}
-	right, err = finalizeLoadedPipeline(path, right)
-	if err != nil {
-		return nil, nil, err
-	}
 	return left, right, nil
 }
 
 func finalizeLoadedPipeline(path string, cfg *PipelineConfig) (*PipelineConfig, error) {
-	cfg.resolution.publishDeclared = cfg.Publish != nil
-	applyPipelineDefaults(cfg)
-	if err := NormalizePipelineConfig(cfg); err != nil {
-		return nil, fmt.Errorf("load pipeline config: %w", err)
-	}
 	captureLogicalNotariusPaths(cfg)
 	if err := resolveNotariusPaths(cfg, path); err != nil {
 		return nil, fmt.Errorf("load pipeline config: %w", err)
@@ -504,217 +458,6 @@ func shortName(path, fallback string) string {
 	return base
 }
 
-func applyPipelineDefaults(cfg *PipelineConfig) {
-	if cfg == nil {
-		return
-	}
-	applyWorkspaceDefaults(&cfg.Workspace)
-	applyCampaignsDefaults(&cfg.Campaigns)
-	applyStorageDefaults(&cfg.Storage)
-	applySpoolDefaults(&cfg.Spool)
-	applyCacheDefaults(&cfg.Cache)
-	applyPublishDefaults(&cfg.Publish)
-	applyWhisperXDefaults(&cfg.WhisperX)
-	applySeriatimDefaults(&cfg.Seriatim)
-	applyAuditaDefaults(&cfg.Audita)
-	if cfg.Normalize == nil {
-		cfg.Normalize = &NormalizeConfig{}
-	}
-	applyNormalizeDefaults(cfg.Normalize)
-	if cfg.Trim == nil {
-		cfg.Trim = &TrimConfig{}
-	}
-	applyTrimDefaults(cfg.Trim)
-	if trimEnabled(cfg.Trim) && cfg.Scriptorium == nil {
-		cfg.Scriptorium = &ScriptoriumConfig{}
-	}
-	applyRenderDefaults(&cfg.Render)
-	applyScriptoriumDefaults(cfg.Scriptorium)
-	applyNotariusDefaults(cfg.Notarius)
-	applyNotificationDefaults(&cfg.Notification)
-}
-
-func applyNotificationDefaults(cfg *NotificationConfig) {
-	if cfg == nil {
-		return
-	}
-	if strings.TrimSpace(cfg.Mode) == "" {
-		cfg.Mode = DefaultNotificationMode
-	}
-}
-
-func applyCampaignsDefaults(cfg *CampaignsConfig) {
-	if cfg == nil {
-		return
-	}
-	if cfg.Root == "" {
-		cfg.Root = DefaultCampaignsRoot
-	}
-}
-
-func applyWorkspaceDefaults(cfg *WorkspaceConfig) {
-	if cfg == nil {
-		return
-	}
-	if cfg.Root == "" {
-		cfg.Root = DefaultWorkspaceRoot
-	}
-}
-
-func applyStorageDefaults(cfg *StorageConfig) {
-	if cfg == nil {
-		return
-	}
-	backend := strings.ToLower(strings.TrimSpace(cfg.Backend))
-	if backend == "" {
-		backend = StorageBackendLocal
-	}
-	cfg.Backend = backend
-	if cfg.S3 == nil {
-		return
-	}
-	if cfg.S3.RootPrefix == "" {
-		cfg.S3.RootPrefix = DefaultStorageS3RootPrefix
-	}
-	if cfg.S3.AccessKeyIDEnv == "" {
-		cfg.S3.AccessKeyIDEnv = DefaultS3AccessKeyIDEnv
-	}
-	if cfg.S3.SecretKeyEnv == "" {
-		cfg.S3.SecretKeyEnv = DefaultS3SecretAccessKeyEnv
-	}
-}
-
-func applySpoolDefaults(cfg *SpoolConfig) {
-	if cfg == nil {
-		return
-	}
-	if cfg.Root == "" {
-		cfg.Root = DefaultSpoolRoot
-	}
-}
-
-func applyCacheDefaults(cfg *CacheConfig) {
-	if cfg == nil {
-		return
-	}
-	if cfg.Root == "" {
-		cfg.Root = DefaultCacheRoot
-	}
-	if cfg.S3Audio == nil {
-		cfg.S3Audio = boolPtr(DefaultCacheS3Audio)
-	}
-}
-
-func applyPublishDefaults(cfg **PublishConfig) {
-	if cfg == nil {
-		return
-	}
-	if *cfg == nil {
-		*cfg = &PublishConfig{}
-	}
-
-	if (*cfg).Enabled == nil {
-		(*cfg).Enabled = boolPtr(DefaultArchiveEnabled)
-	}
-	if (*cfg).UploadRun == nil {
-		(*cfg).UploadRun = boolPtr(DefaultArchiveUploadRun)
-	}
-	if len((*cfg).Outputs) == 0 {
-		(*cfg).Outputs = append([]PublishOutputRule(nil), DefaultPublishOutputs...)
-	}
-	for i := range (*cfg).Outputs {
-		if (*cfg).Outputs[i].Required == nil {
-			(*cfg).Outputs[i].Required = boolPtr(true)
-		}
-	}
-}
-
-func applyWhisperXDefaults(cfg *WhisperXConfig) {
-	if cfg == nil {
-		return
-	}
-	if cfg.Language == "" {
-		cfg.Language = DefaultWhisperXLanguage
-	}
-	if cfg.Timeout == "" {
-		cfg.Timeout = DefaultWhisperXTimeout
-	}
-	if cfg.RetryDelay == "" {
-		cfg.RetryDelay = DefaultWhisperXRetryDelay
-	}
-	if cfg.Concurrency == nil {
-		cfg.Concurrency = intPtr(DefaultWhisperXConcurrency)
-	}
-	if cfg.Retries == nil {
-		cfg.Retries = intPtr(DefaultWhisperXRetries)
-	}
-}
-
-func intPtr(v int) *int {
-	p := v
-	return &p
-}
-
-func applySeriatimDefaults(cfg *SeriatimConfig) {
-	if cfg == nil {
-		return
-	}
-	if cfg.Binary == "" {
-		cfg.Binary = DefaultSeriatimBinary
-	}
-	if cfg.Timeout == "" {
-		cfg.Timeout = DefaultSeriatimTimeout
-	}
-	if cfg.OutputSchema == "" {
-		cfg.OutputSchema = DefaultSeriatimOutputSchema
-	}
-	if cfg.CoalesceGap == nil {
-		cfg.CoalesceGap = float64Ptr(DefaultSeriatimCoalesceGap)
-	}
-	if cfg.Report == nil {
-		cfg.Report = boolPtr(DefaultSeriatimReport)
-	}
-}
-
-func applyAuditaDefaults(cfg *AuditaConfig) {
-	if cfg == nil {
-		return
-	}
-	if cfg.Binary == "" {
-		cfg.Binary = DefaultAuditaBinary
-	}
-	if cfg.Timeout == "" {
-		cfg.Timeout = DefaultAuditaTimeout
-	}
-	if cfg.Report == nil {
-		cfg.Report = boolPtr(DefaultAuditaReport)
-	}
-}
-
-func applyScriptoriumDefaults(cfg *ScriptoriumConfig) {
-	if cfg == nil {
-		return
-	}
-	if cfg.Binary == "" {
-		cfg.Binary = DefaultScriptoriumBinary
-	}
-	if cfg.Timeout == "" {
-		cfg.Timeout = DefaultScriptoriumTimeout
-	}
-}
-
-func applyNotariusDefaults(cfg *NotariusConfig) {
-	if cfg == nil {
-		return
-	}
-	if cfg.Binary == "" {
-		cfg.Binary = DefaultNotariusBinary
-	}
-	if cfg.Timeout == "" {
-		cfg.Timeout = DefaultNotariusTimeout
-	}
-}
-
 func resolveNotariusPaths(cfg *PipelineConfig, pipelinePath string) error {
 	if cfg == nil || cfg.Notarius == nil || !cfg.Notarius.Enabled {
 		return nil
@@ -753,83 +496,3 @@ func resolveNotariusPaths(cfg *PipelineConfig, pipelinePath string) error {
 	cfg.Notarius.WorkingDirectory = workingDirectory
 	return nil
 }
-
-func applyTrimDefaults(cfg *TrimConfig) {
-	if cfg == nil {
-		return
-	}
-	if cfg.Enabled == nil {
-		cfg.Enabled = boolPtr(DefaultTrimEnabled)
-	}
-	if strings.TrimSpace(cfg.OutputPath) == "" {
-		cfg.OutputPath = DefaultTrimOutputPath
-	}
-	if strings.TrimSpace(cfg.Bounds.PromptID) == "" {
-		cfg.Bounds.PromptID = DefaultTrimBoundsPromptID
-	}
-	if strings.TrimSpace(cfg.Bounds.TranscriptInputName) == "" {
-		cfg.Bounds.TranscriptInputName = DefaultTrimBoundsTranscriptInputName
-	}
-	if strings.TrimSpace(cfg.Bounds.OutputPath) == "" {
-		cfg.Bounds.OutputPath = DefaultTrimBoundsOutputPath
-	}
-	if cfg.Bounds.Timeout == "" {
-		cfg.Bounds.Timeout = DefaultTrimBoundsTimeout
-	}
-	if cfg.Seriatim.Report == nil {
-		cfg.Seriatim.Report = boolPtr(DefaultTrimSeriatimReport)
-	}
-}
-
-func trimEnabled(cfg *TrimConfig) bool {
-	return cfg != nil && cfg.Enabled != nil && *cfg.Enabled
-}
-
-func applyRenderDefaults(cfg **RenderConfig) {
-	if cfg == nil {
-		return
-	}
-	if *cfg == nil {
-		*cfg = &RenderConfig{}
-	}
-	if (*cfg).Enabled == nil {
-		(*cfg).Enabled = boolPtr(DefaultRenderEnabled)
-	}
-	if strings.TrimSpace((*cfg).Format) == "" {
-		(*cfg).Format = DefaultRenderFormat
-	}
-	if strings.TrimSpace((*cfg).Title) == "" {
-		(*cfg).Title = DefaultRenderTitle
-	}
-	if (*cfg).IncludeTimestamps == nil {
-		(*cfg).IncludeTimestamps = boolPtr(DefaultRenderTimestamps)
-	}
-	if (*cfg).IncludeSegmentIDs == nil {
-		(*cfg).IncludeSegmentIDs = boolPtr(DefaultRenderSegmentIDs)
-	}
-}
-
-func applyNormalizeDefaults(cfg *NormalizeConfig) {
-	if cfg == nil {
-		return
-	}
-	if cfg.OutputSchema == "" {
-		cfg.OutputSchema = DefaultNormalizeOutputSchema
-	}
-	if cfg.OutputPath == "" && !cfg.outputPathWasSet() {
-		cfg.OutputPath = DefaultNormalizeOutputPath
-	}
-	if cfg.Report == nil {
-		cfg.Report = boolPtr(DefaultNormalizeReport)
-	}
-}
-
-func float64Ptr(v float64) *float64 {
-	p := v
-	return &p
-}
-
-func boolPtr(v bool) *bool {
-	p := v
-	return &p
-}