Implemented the config source setter cleanup identified during the code audit

2026-05-23 18:49:44 -05:00
parent 0630d36734
commit 0b01c3a83d
6 changed files with 933 additions and 231 deletions
--- a/internal/core/config/flags.go
+++ b/internal/core/config/flags.go
@@ -51,107 +51,54 @@ func (c *Config) ApplyCLIOverrides(overrides CLIOverrides) error {
 		c.OutputSchema = strings.TrimSpace(*overrides.OutputSchema)
 	}

-	if overrides.PrimaryLLMAPIKey != nil {
-		c.PrimaryLLM.APIKey = *overrides.PrimaryLLMAPIKey
-	}
-	if overrides.ValidationLLMAPIKey != nil {
-		c.ValidationLLM.APIKey = *overrides.ValidationLLMAPIKey
-	}
-	if overrides.PrimaryModel != nil {
-		c.PrimaryLLM.Model = *overrides.PrimaryModel
-	}
-	if overrides.ValidationModel != nil {
-		c.ValidationLLM.Model = *overrides.ValidationModel
-	}
-	if overrides.PrimaryBaseURL != nil {
-		c.PrimaryLLM.BaseURL = *overrides.PrimaryBaseURL
-	}
-	if overrides.ValidationBaseURL != nil {
-		c.ValidationLLM.BaseURL = *overrides.ValidationBaseURL
-	}
-	if overrides.PrimaryLLMTimeoutSeconds != nil {
-		c.PrimaryLLM.TimeoutSeconds = *overrides.PrimaryLLMTimeoutSeconds
-	}
-	totalConcurrencySet := false
-	if overrides.TotalLLMConcurrency != nil {
-		c.TotalLLMConcurrency = *overrides.TotalLLMConcurrency
-		totalConcurrencySet = true
-	}
-	// Backward-compatible alias: --llm-concurrency maps to total concurrency
-	// only when --total-llm-concurrency is not set in the same CLI invocation.
-	if overrides.PrimaryLLMConcurrency != nil && !totalConcurrencySet {
-		c.TotalLLMConcurrency = *overrides.PrimaryLLMConcurrency
-		totalConcurrencySet = true
-	}
-	proposalConcurrencySet := false
-	if overrides.ProposalLLMConcurrency != nil {
-		c.ProposalLLMConcurrency = *overrides.ProposalLLMConcurrency
-		proposalConcurrencySet = true
-	}
-	if totalConcurrencySet && !proposalConcurrencySet {
-		c.ProposalLLMConcurrency = c.TotalLLMConcurrency
-	}
-	if overrides.ValidationLLMTimeoutSeconds != nil {
-		value := *overrides.ValidationLLMTimeoutSeconds
-		c.ValidationLLM.TimeoutSeconds = &value
-	}
-	if overrides.MaxRetries != nil {
-		c.PrimaryLLM.MaxRetries = *overrides.MaxRetries
-	}
-	if overrides.ValidationMaxRetries != nil {
-		value := *overrides.ValidationMaxRetries
-		c.ValidationLLM.MaxRetries = &value
-	}
-	if overrides.ValidationLLMConcurrency != nil {
-		value := *overrides.ValidationLLMConcurrency
-		c.ValidationLLMConcurrency = &value
-	}
+	c.applyPrimaryLLMTargetPatch(llmTargetPatch{
+		apiKey:         overrides.PrimaryLLMAPIKey,
+		model:          overrides.PrimaryModel,
+		baseURL:        overrides.PrimaryBaseURL,
+		timeoutSeconds: overrides.PrimaryLLMTimeoutSeconds,
+		maxRetries:     overrides.MaxRetries,
+	})
+	c.applyValidationLLMTargetPatch(llmTargetPatch{
+		apiKey:         overrides.ValidationLLMAPIKey,
+		model:          overrides.ValidationModel,
+		baseURL:        overrides.ValidationBaseURL,
+		timeoutSeconds: overrides.ValidationLLMTimeoutSeconds,
+		maxRetries:     overrides.ValidationMaxRetries,
+	})
+	c.applyConcurrencyPatch(concurrencyPatch{
+		totalLLM:         overrides.TotalLLMConcurrency,
+		legacyTotalLLM:   overrides.PrimaryLLMConcurrency,
+		proposalLLM:      overrides.ProposalLLMConcurrency,
+		validationLLM:    overrides.ValidationLLMConcurrency,
+		inheritProposal:  true,
+		allowLegacyAlias: true,
+	})
+
 	if overrides.ValidationMaxPromptTokens != nil {
 		c.ValidationMaxPromptTokens = *overrides.ValidationMaxPromptTokens
 	}
-	if overrides.MaxSectionTokens != nil {
-		c.MaxSectionTokens = *overrides.MaxSectionTokens
-	}
-	if overrides.MinSectionTokens != nil {
-		c.MinSectionTokens = *overrides.MinSectionTokens
-	}
-	if overrides.TargetSections != nil {
-		value := *overrides.TargetSections
-		c.TargetSections = &value
-	}
-	if overrides.GlossaryConfidenceThreshold != nil {
-		c.Thresholds.Glossary = *overrides.GlossaryConfidenceThreshold
-	}
-	if overrides.GrammarConfidenceThreshold != nil {
-		c.Thresholds.Grammar = *overrides.GrammarConfidenceThreshold
-	}
-	if overrides.HomophonesConfidenceThreshold != nil {
-		c.Thresholds.Homophones = *overrides.HomophonesConfidenceThreshold
-	}
-	if overrides.SpokenWordConfidenceThreshold != nil {
-		c.Thresholds.SpokenWord = *overrides.SpokenWordConfidenceThreshold
-	}
-	if overrides.NormalizeMaxSegmentGap != nil {
-		c.Normalization.MaxSegmentGap = *overrides.NormalizeMaxSegmentGap
-	}
-	if overrides.NormalizeEllipsisGap != nil {
-		c.Normalization.EllipsisGap = *overrides.NormalizeEllipsisGap
-	}
-	if overrides.NormalizeMaxSegmentDuration != nil {
-		c.Normalization.MaxSegmentDuration = *overrides.NormalizeMaxSegmentDuration
-	}
-	if overrides.NormalizeMaxSegmentTokens != nil {
-		c.Normalization.MaxSegmentTokens = *overrides.NormalizeMaxSegmentTokens
-	}
-	if overrides.TranscriptDescription != nil {
-		c.TranscriptDescription = strings.TrimSpace(*overrides.TranscriptDescription)
-	}
-	if overrides.WorkDir != nil {
-		c.WorkDir = *overrides.WorkDir
-	}
-	if overrides.WorkDirRetention != nil {
-		c.WorkDirRetention = WorkDirRetention(*overrides.WorkDirRetention)
-	}
+	c.applyChunkingPatch(chunkingPatch{
+		targetSections:   overrides.TargetSections,
+		maxSectionTokens: overrides.MaxSectionTokens,
+		minSectionTokens: overrides.MinSectionTokens,
+	})
+	c.applyThresholdsPatch(thresholdsPatch{
+		glossary:   overrides.GlossaryConfidenceThreshold,
+		grammar:    overrides.GrammarConfidenceThreshold,
+		homophones: overrides.HomophonesConfidenceThreshold,
+		spokenWord: overrides.SpokenWordConfidenceThreshold,
+	})
+	c.applyNormalizationPatch(normalizationPatch{
+		maxSegmentGap:      overrides.NormalizeMaxSegmentGap,
+		ellipsisGap:        overrides.NormalizeEllipsisGap,
+		maxSegmentDuration: overrides.NormalizeMaxSegmentDuration,
+		maxSegmentTokens:   overrides.NormalizeMaxSegmentTokens,
+	})
+	c.applyContextPatch(contextPatch{transcriptDescription: overrides.TranscriptDescription})
+	c.applyDiagnosticsPatch(diagnosticsPatch{
+		workDir:          overrides.WorkDir,
+		workDirRetention: overrides.WorkDirRetention,
+	})

 	c.syncLegacyConcurrencyAliases()