Centralize output schema and module key validation catalogs

2026-05-23 17:39:13 +00:00
parent fa1bd237d1
commit 938bfe88c1
14 changed files with 233 additions and 101 deletions
--- a/internal/cli/run.go
+++ b/internal/cli/run.go
@@ -653,6 +653,10 @@ func runConfigValidate(args []string, stdout, stderr io.Writer) int {
 		fmt.Fprintf(stderr, "audita config validate: %v\n", err)
 		return 2
 	}
+	if err := cfg.Validate(); err != nil {
+		fmt.Fprintf(stderr, "audita config validate: %v\n", err)
+		return 2
+	}
 	fmt.Fprintln(stdout, "config is valid")
 	return 0
 }
--- a/internal/cli/run_test.go
+++ b/internal/cli/run_test.go
@@ -21,7 +21,6 @@ import (
 	"gitea.maximumdirect.net/eric/audita/internal/core/schema"
 	"gitea.maximumdirect.net/eric/audita/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/audita/internal/framework/llm"
-	"gitea.maximumdirect.net/eric/audita/internal/framework/modules"
 	"gitea.maximumdirect.net/eric/audita/internal/framework/proposal_generation"
 	"gitea.maximumdirect.net/eric/audita/internal/framework/proposals"
 	"gitea.maximumdirect.net/eric/audita/internal/framework/runner"
@@ -210,6 +209,23 @@ func TestRunConfigValidateUnknownField(t *testing.T) {
 	}
 }

+func TestRunConfigValidateUnsupportedModuleKey(t *testing.T) {
+	var stdout bytes.Buffer
+	var stderr bytes.Buffer
+	cfgPath := writeFile(t, "config.yml", "version: 1\npipeline:\n  modules: [made_up]\n")
+
+	exitCode := Run([]string{"config", "validate", "--config", cfgPath}, &stdout, &stderr)
+	if exitCode == 0 {
+		t.Fatalf("expected failure for unsupported module key")
+	}
+	if stdout.Len() != 0 {
+		t.Fatalf("expected empty stdout on failure, got %q", stdout.String())
+	}
+	if !strings.Contains(stderr.String(), "unsupported module key") {
+		t.Fatalf("expected unsupported module key error, got %q", stderr.String())
+	}
+}
+
 func TestRunConfigPrintEffectiveOutputsRedactedJSON(t *testing.T) {
 	var stdout bytes.Buffer
 	var stderr bytes.Buffer
@@ -369,8 +385,8 @@ diagnostics:

 func TestRunProcessEnvOverridesConfigFile(t *testing.T) {
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m": fakeModule{
-			key:    "m",
+		"grammar": fakeModule{
+			key:    "grammar",
 			policy: proposals.ReplacementPolicyRequireUnique,
 			validators: []contracts.Validator{
 				fakeValidator{name: "capture-config", validateF: func(req contracts.ValidationRequest) (validators.Result, error) {
@@ -392,7 +408,7 @@ func TestRunProcessEnvOverridesConfigFile(t *testing.T) {
 	cfgPath := writeFile(t, "config.yml", `
 version: 1
 pipeline:
-  modules: [m]
+  modules: [grammar]
 llm:
  proposal:
    model: file-model
@@ -404,7 +420,7 @@ llm:
 		fixturePath("tiny_transcript.json"),
 		"--glossary", fixturePath("tiny_glossary.yaml"),
 		"--config", cfgPath,
-		"--modules", "m",
+		"--modules", "grammar",
 	}, &stdout, &stderr)
 	if exitCode != 0 {
 		t.Fatalf("expected success, got %d stderr=%q", exitCode, stderr.String())
@@ -413,8 +429,8 @@ llm:

 func TestRunProcessCLIOverridesEnvAndConfigFile(t *testing.T) {
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m": fakeModule{
-			key:    "m",
+		"grammar": fakeModule{
+			key:    "grammar",
 			policy: proposals.ReplacementPolicyRequireUnique,
 			validators: []contracts.Validator{
 				fakeValidator{name: "capture-config", validateF: func(req contracts.ValidationRequest) (validators.Result, error) {
@@ -436,7 +452,7 @@ func TestRunProcessCLIOverridesEnvAndConfigFile(t *testing.T) {
 	cfgPath := writeFile(t, "config.yml", `
 version: 1
 pipeline:
-  modules: [m]
+  modules: [grammar]
 llm:
  proposal:
    model: file-model
@@ -448,7 +464,7 @@ llm:
 		fixturePath("tiny_transcript.json"),
 		"--glossary", fixturePath("tiny_glossary.yaml"),
 		"--config", cfgPath,
-		"--modules", "m",
+		"--modules", "grammar",
 		"--model", "cli-model",
 	}, &stdout, &stderr)
 	if exitCode != 0 {
@@ -495,8 +511,8 @@ diagnostics:

 func TestRunProcessTranscriptDescriptionCLIOverridesConfigFileContextDescription(t *testing.T) {
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m": fakeModule{
-			key:    "m",
+		"grammar": fakeModule{
+			key:    "grammar",
 			policy: proposals.ReplacementPolicyRequireUnique,
 			validators: []contracts.Validator{
 				fakeValidator{name: "capture-config", validateF: func(req contracts.ValidationRequest) (validators.Result, error) {
@@ -517,7 +533,7 @@ func TestRunProcessTranscriptDescriptionCLIOverridesConfigFileContextDescription
 	cfgPath := writeFile(t, "config.yml", `
 version: 1
 pipeline:
-  modules: [m]
+  modules: [grammar]
 context:
  description: "file transcript description"
 `)
@@ -528,7 +544,7 @@ context:
 		fixturePath("tiny_transcript.json"),
 		"--glossary", fixturePath("tiny_glossary.yaml"),
 		"--config", cfgPath,
-		"--modules", "m",
+		"--modules", "grammar",
 		"--transcript-description", "cli transcript description",
 	}, &stdout, &stderr)
 	if exitCode != 0 {
@@ -692,8 +708,8 @@ func TestRunProcessCLIOverridesEnvironment(t *testing.T) {

 func TestRunProcessTranscriptDescriptionDefaultEmpty(t *testing.T) {
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m": fakeModule{
-			key:    "m",
+		"grammar": fakeModule{
+			key:    "grammar",
 			policy: proposals.ReplacementPolicyRequireUnique,
 			validators: []contracts.Validator{
 				fakeValidator{name: "capture-config", validateF: func(req contracts.ValidationRequest) (validators.Result, error) {
@@ -720,7 +736,7 @@ func TestRunProcessTranscriptDescriptionDefaultEmpty(t *testing.T) {
 	exitCode := Run([]string{
 		"process", transcriptPath,
 		"--glossary", fixturePath("tiny_glossary.yaml"),
-		"--modules", "m",
+		"--modules", "grammar",
 	}, &stdout, &stderr)
 	if exitCode != 0 {
 		t.Fatalf("expected success, got %d stderr=%q", exitCode, stderr.String())
@@ -729,8 +745,8 @@ func TestRunProcessTranscriptDescriptionDefaultEmpty(t *testing.T) {

 func TestRunProcessTranscriptDescriptionCLIOverrideAndTrim(t *testing.T) {
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m": fakeModule{
-			key:    "m",
+		"grammar": fakeModule{
+			key:    "grammar",
 			policy: proposals.ReplacementPolicyRequireUnique,
 			validators: []contracts.Validator{
 				fakeValidator{name: "capture-config", validateF: func(req contracts.ValidationRequest) (validators.Result, error) {
@@ -757,7 +773,7 @@ func TestRunProcessTranscriptDescriptionCLIOverrideAndTrim(t *testing.T) {
 	exitCode := Run([]string{
 		"process", transcriptPath,
 		"--glossary", fixturePath("tiny_glossary.yaml"),
-		"--modules", "m",
+		"--modules", "grammar",
 		"--transcript-description", "   speaker background context   ",
 	}, &stdout, &stderr)
 	if exitCode != 0 {
@@ -823,8 +839,8 @@ func TestRunProcessRejectsValidationConcurrencyAboveTotalConcurrency(t *testing.

 func TestRunProcessTotalLLMConcurrencyDrivesEffectiveValidationConcurrencyWhenUnset(t *testing.T) {
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m": fakeModule{
-			key:    "m",
+		"grammar": fakeModule{
+			key:    "grammar",
 			policy: proposals.ReplacementPolicyRequireUnique,
 			validators: []contracts.Validator{
 				fakeValidator{name: "capture-config", validateF: func(req contracts.ValidationRequest) (validators.Result, error) {
@@ -865,7 +881,7 @@ func TestRunProcessTotalLLMConcurrencyDrivesEffectiveValidationConcurrencyWhenUn
 		"--glossary",
 		fixturePath("tiny_glossary.yaml"),
 		"--modules",
-		"m",
+		"grammar",
 		"--total-llm-concurrency",
 		"4",
 	}, &stdout, &stderr)
@@ -908,8 +924,8 @@ func TestRunProcessRejectsProposalConcurrencyAboveTotalConcurrency(t *testing.T)

 func TestRunProcessLegacyLLMConcurrencyAliasSetsTotalAndProposal(t *testing.T) {
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m": fakeModule{
-			key:    "m",
+		"grammar": fakeModule{
+			key:    "grammar",
 			policy: proposals.ReplacementPolicyRequireUnique,
 			validators: []contracts.Validator{
 				fakeValidator{name: "capture-config", validateF: func(req contracts.ValidationRequest) (validators.Result, error) {
@@ -944,7 +960,7 @@ func TestRunProcessLegacyLLMConcurrencyAliasSetsTotalAndProposal(t *testing.T) {
 		"--glossary",
 		fixturePath("tiny_glossary.yaml"),
 		"--modules",
-		"m",
+		"grammar",
 		"--llm-concurrency",
 		"3",
 	}, &stdout, &stderr)
@@ -955,8 +971,8 @@ func TestRunProcessLegacyLLMConcurrencyAliasSetsTotalAndProposal(t *testing.T) {

 func TestRunProcessLLMConcurrencyFlagsOverrideEnvironment(t *testing.T) {
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m": fakeModule{
-			key:    "m",
+		"grammar": fakeModule{
+			key:    "grammar",
 			policy: proposals.ReplacementPolicyRequireUnique,
 			validators: []contracts.Validator{
 				fakeValidator{name: "capture-config", validateF: func(req contracts.ValidationRequest) (validators.Result, error) {
@@ -997,7 +1013,7 @@ func TestRunProcessLLMConcurrencyFlagsOverrideEnvironment(t *testing.T) {
 		"--glossary",
 		fixturePath("tiny_glossary.yaml"),
 		"--modules",
-		"m",
+		"grammar",
 		"--total-llm-concurrency",
 		"4",
 		"--proposal-llm-concurrency",
@@ -1010,8 +1026,8 @@ func TestRunProcessLLMConcurrencyFlagsOverrideEnvironment(t *testing.T) {

 func TestRunProcessAcceptsLLMConcurrencyEnvironmentVariables(t *testing.T) {
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m": fakeModule{
-			key:    "m",
+		"grammar": fakeModule{
+			key:    "grammar",
 			policy: proposals.ReplacementPolicyRequireUnique,
 			validators: []contracts.Validator{
 				fakeValidator{name: "capture-config", validateF: func(req contracts.ValidationRequest) (validators.Result, error) {
@@ -1052,7 +1068,7 @@ func TestRunProcessAcceptsLLMConcurrencyEnvironmentVariables(t *testing.T) {
 		"--glossary",
 		fixturePath("tiny_glossary.yaml"),
 		"--modules",
-		"m",
+		"grammar",
 	}, &stdout, &stderr)
 	if exitCode != 0 {
 		t.Fatalf("expected success, got %d stderr=%q", exitCode, stderr.String())
@@ -1883,12 +1899,12 @@ func TestRunProcessInjectedFactoryExecutesRunnerAndReportsModules(t *testing.T)
 		return validators.Result{ValidatorName: "allow", Decisions: decisions}, nil
 	}}
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m1": fakeModule{key: "m1", policy: proposals.ReplacementPolicyRequireUnique, validators: []contracts.Validator{allow}, proposeF: func(req contracts.ProposalRequest) ([]proposals.CorrectionProposal, error) {
+		"glossary": fakeModule{key: "glossary", policy: proposals.ReplacementPolicyRequireUnique, validators: []contracts.Validator{allow}, proposeF: func(req contracts.ProposalRequest) ([]proposals.CorrectionProposal, error) {
 			return []proposals.CorrectionProposal{
 				{TargetSegmentID: 1, OriginalText: "Hello", CorrectedText: "Hi", Confidence: 1},
 			}, nil
 		}},
-		"m2": fakeModule{key: "m2", policy: proposals.ReplacementPolicyRequireUnique, validators: []contracts.Validator{allow}, proposeF: func(req contracts.ProposalRequest) ([]proposals.CorrectionProposal, error) {
+		"homophones": fakeModule{key: "homophones", policy: proposals.ReplacementPolicyRequireUnique, validators: []contracts.Validator{allow}, proposeF: func(req contracts.ProposalRequest) ([]proposals.CorrectionProposal, error) {
 			if req.WorkingTranscript.Segments[0].Text != "Hi world" {
 				t.Fatalf("expected module 2 to see module 1 changes, got %q", req.WorkingTranscript.Segments[0].Text)
 			}
@@ -1911,7 +1927,7 @@ func TestRunProcessInjectedFactoryExecutesRunnerAndReportsModules(t *testing.T)
 	exitCode := Run([]string{
 		"process", transcriptPath,
 		"--glossary", fixturePath("tiny_glossary.yaml"),
-		"--modules", "m1,m2",
+		"--modules", "glossary,homophones",
 		"--output", outputPath,
 		"--report-json", reportPath,
 		"--work-dir", workDir,
@@ -1970,7 +1986,7 @@ func TestRunProcessInjectedFactoryLLMValidatorResultsInReports(t *testing.T) {
 		}},
 	}
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m": fakeModule{key: "m", policy: proposals.ReplacementPolicyRequireUnique, validators: []contracts.Validator{llmValidator}, proposeF: func(req contracts.ProposalRequest) ([]proposals.CorrectionProposal, error) {
+		"grammar": fakeModule{key: "grammar", policy: proposals.ReplacementPolicyRequireUnique, validators: []contracts.Validator{llmValidator}, proposeF: func(req contracts.ProposalRequest) ([]proposals.CorrectionProposal, error) {
 			return []proposals.CorrectionProposal{{TargetSegmentID: 1, OriginalText: "Hello", CorrectedText: "Hi", Confidence: 1}}, nil
 		}},
 	}}
@@ -1990,7 +2006,7 @@ func TestRunProcessInjectedFactoryLLMValidatorResultsInReports(t *testing.T) {
 	exitCode := Run([]string{
 		"process", transcriptPath,
 		"--glossary", fixturePath("tiny_glossary.yaml"),
-		"--modules", "m",
+		"--modules", "grammar",
 		"--output", outputPath,
 		"--report-json", reportPath,
 		"--work-dir", workDir,
@@ -2011,7 +2027,7 @@ func TestRunProcessInjectedFactoryLLMValidatorResultsInReports(t *testing.T) {

 func TestRunProcessInjectedFactorySkippedKeepsAutoRetention(t *testing.T) {
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m1": fakeModule{key: "m1", policy: proposals.ReplacementPolicyRequireUnique, proposeF: func(req contracts.ProposalRequest) ([]proposals.CorrectionProposal, error) {
+		"glossary": fakeModule{key: "glossary", policy: proposals.ReplacementPolicyRequireUnique, proposeF: func(req contracts.ProposalRequest) ([]proposals.CorrectionProposal, error) {
 			return []proposals.CorrectionProposal{
 				{TargetSegmentID: 1, OriginalText: "word", CorrectedText: "term", Confidence: 1},
 			}, nil
@@ -2027,7 +2043,7 @@ func TestRunProcessInjectedFactorySkippedKeepsAutoRetention(t *testing.T) {
 	exitCode := Run([]string{
 		"process", transcriptPath,
 		"--glossary", fixturePath("tiny_glossary.yaml"),
-		"--modules", "m1",
+		"--modules", "glossary",
 		"--work-dir", workDir,
 		"--work-dir-retention", "auto",
 	}, &stdout, &stderr)
@@ -2041,7 +2057,7 @@ func TestRunProcessInjectedFactorySkippedKeepsAutoRetention(t *testing.T) {

 func TestRunProcessInjectedFactoryFailureWritesFailedReport(t *testing.T) {
 	processModuleFactory = fakeModuleFactory{modules: map[string]contracts.TranscriptModule{
-		"m1": fakeModule{key: "m1", policy: proposals.ReplacementPolicyRequireUnique, proposeF: func(req contracts.ProposalRequest) ([]proposals.CorrectionProposal, error) {
+		"glossary": fakeModule{key: "glossary", policy: proposals.ReplacementPolicyRequireUnique, proposeF: func(req contracts.ProposalRequest) ([]proposals.CorrectionProposal, error) {
 			return nil, errors.New("test failure")
 		}},
 	}}
@@ -2057,7 +2073,7 @@ func TestRunProcessInjectedFactoryFailureWritesFailedReport(t *testing.T) {
 	exitCode := Run([]string{
 		"process", transcriptPath,
 		"--glossary", fixturePath("tiny_glossary.yaml"),
-		"--modules", "m1",
+		"--modules", "glossary",
 		"--work-dir", workDir,
 		"--work-dir-retention", "always",
 		"--report-json", reportPath,
@@ -2089,14 +2105,8 @@ func TestRunProcessInjectedFactoryFailureWritesFailedReport(t *testing.T) {
 	}
 }

-func TestRunProcessProductionRegistryUnsupportedModuleFailsCleanly(t *testing.T) {
-	cfg := modules.Dependencies{}
-	processModuleFactory = modules.NewFactory(cfg)
-	t.Cleanup(func() { processModuleFactory = nil })
-
+func TestRunProcessUnsupportedModuleFailsDuringConfigValidation(t *testing.T) {
 	var stdout, stderr bytes.Buffer
-	workDir := t.TempDir()
-	reportPath := filepath.Join(t.TempDir(), "report.json")
 	transcriptPath := writeFile(t, "transcript.json", `[
  {"id":1,"speaker":"Alice","start":0.0,"end":1.0,"text":"Hello"}
 ]`)
@@ -2105,9 +2115,6 @@ func TestRunProcessProductionRegistryUnsupportedModuleFailsCleanly(t *testing.T)
 		"process", transcriptPath,
 		"--glossary", fixturePath("tiny_glossary.yaml"),
 		"--modules", "made_up",
-		"--work-dir", workDir,
-		"--work-dir-retention", "always",
-		"--report-json", reportPath,
 	}, &stdout, &stderr)
 	if exitCode == 0 {
 		t.Fatal("expected failure exit code")
@@ -2115,23 +2122,12 @@ func TestRunProcessProductionRegistryUnsupportedModuleFailsCleanly(t *testing.T)
 	if stdout.Len() != 0 {
 		t.Fatalf("expected empty stdout on failure, got %q", stdout.String())
 	}
-	if !strings.Contains(stderr.String(), "runner_execution") {
-		t.Fatalf("expected runner_execution failure on stderr, got %q", stderr.String())
+	if !strings.Contains(stderr.String(), "invalid CLI configuration") {
+		t.Fatalf("expected config validation failure on stderr, got %q", stderr.String())
 	}
 	if !strings.Contains(stderr.String(), "unsupported module key") {
 		t.Fatalf("expected explicit unsupported module message, got %q", stderr.String())
 	}
-
-	report := readProcessReport(t, reportPath)
-	if report.Status != "failed" {
-		t.Fatalf("expected failed report status, got %q", report.Status)
-	}
-	if report.ErrorPhase != "runner_execution" {
-		t.Fatalf("expected runner_execution phase, got %q", report.ErrorPhase)
-	}
-	if !strings.Contains(report.ErrorMessage, "unsupported module key") {
-		t.Fatalf("expected report error message to mention unsupported module, got %q", report.ErrorMessage)
-	}
 }

 func TestRunProcessExplicitUnsupportedModulesFailClearly(t *testing.T) {