Organize generic and Seriatim modules by domain

internal/cli/compatibility_test.go

@@ -20,11 +20,11 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/chunk/dnd/scenes"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/extract/dnd/spells"
+	validjson "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/validate/valid_json"
+	validjsonschema "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/validate/valid_json_schema"
 	spellshape "gitea.maximumdirect.net/eric/notarius/internal/validators/extract/dnd/spells/shape"
 	spellsourcerefs "gitea.maximumdirect.net/eric/notarius/internal/validators/extract/dnd/spells/source_refs"
 	spellrelatedness "gitea.maximumdirect.net/eric/notarius/internal/validators/extract/dnd/spells/source_relatedness"
-	validjson "gitea.maximumdirect.net/eric/notarius/internal/validators/generic/valid_json"
-	validjsonschema "gitea.maximumdirect.net/eric/notarius/internal/validators/generic/valid_json_schema"
 )
 
 func TestProductionCompatibilitySnapshot(t *testing.T) {

internal/cli/run_test.go

@@ -23,19 +23,19 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/chunk/dnd/scenes"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/chunk/generic"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/extract/dnd/spells"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/input/seriatim"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/merge/appendorder"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/normalize/noop"
-	jsonoutput "gitea.maximumdirect.net/eric/notarius/internal/modules/output/json"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/chunk/units"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/merge/appendorder"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/normalize/noop"
+	jsonoutput "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/output/json"
+	alwaysaccept "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/validate/always_accept"
+	alwaysreject "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/validate/always_reject"
+	validjson "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/validate/valid_json"
+	validjsonschema "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/validate/valid_json_schema"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/seriatim/input/transcript"
 	spellshape "gitea.maximumdirect.net/eric/notarius/internal/validators/extract/dnd/spells/shape"
 	spellsourcerefs "gitea.maximumdirect.net/eric/notarius/internal/validators/extract/dnd/spells/source_refs"
 	spellrelatedness "gitea.maximumdirect.net/eric/notarius/internal/validators/extract/dnd/spells/source_relatedness"
-	alwaysaccept "gitea.maximumdirect.net/eric/notarius/internal/validators/generic/always_accept"
-	alwaysreject "gitea.maximumdirect.net/eric/notarius/internal/validators/generic/always_reject"
-	validjson "gitea.maximumdirect.net/eric/notarius/internal/validators/generic/valid_json"
-	validjsonschema "gitea.maximumdirect.net/eric/notarius/internal/validators/generic/valid_json_schema"
 	"gitea.maximumdirect.net/eric/scriptorium"
 )
 
@@ -143,13 +143,13 @@ func TestProductionCatalogIncludesProductionModulesValidatorsAndDefaults(t *test
 	}{
 		{
 			name: "seriatim input",
-			got:  func() (pipeline.ModuleSpec, bool) { return catalog.Inputs.Spec(seriatim.Key) },
-			want: seriatim.ModuleSpec(),
+			got:  func() (pipeline.ModuleSpec, bool) { return catalog.Inputs.Spec(transcript.Key) },
+			want: transcript.ModuleSpec(),
 		},
 		{
 			name: "generic chunker",
-			got:  func() (pipeline.ModuleSpec, bool) { return catalog.Chunkers.Spec(generic.Key) },
-			want: generic.ModuleSpec(),
+			got:  func() (pipeline.ModuleSpec, bool) { return catalog.Chunkers.Spec(units.Key) },
+			want: units.ModuleSpec(),
 		},
 		{
 			name: "dnd scenes chunker",
@@ -222,7 +222,7 @@ func TestProductionCatalogIncludesProductionModulesValidatorsAndDefaults(t *test
 	if !reflect.DeepEqual(gotChain, wantChain) {
 		t.Fatalf("dnd spell default validator chain = %#v, want %#v", gotChain, wantChain)
 	}
-	if got := catalog.ValidatorChains.Validators(pipeline.StageChunk, generic.Key); len(got) != 0 {
+	if got := catalog.ValidatorChains.Validators(pipeline.StageChunk, units.Key); len(got) != 0 {
 		t.Fatalf("generic chunker default validator chain = %#v, want empty", got)
 	}
 }

internal/framework/pipeline/default_modules_test.go

@@ -8,10 +8,10 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/core/source"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/chunk/generic"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/merge/appendorder"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/normalize/noop"
-	jsonoutput "gitea.maximumdirect.net/eric/notarius/internal/modules/output/json"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/chunk/units"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/merge/appendorder"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/normalize/noop"
+	jsonoutput "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/output/json"
 )
 
 func TestPipelineConfigResolvesWithProductionDefaultsRegistered(t *testing.T) {
@@ -34,8 +34,8 @@ func TestPipelineConfigResolvesWithProductionDefaultsRegistered(t *testing.T) {
 	}
 
 	pipeline := resolved.ResolvedPipeline
-	if pipeline.Chunk.Module != generic.Key {
-		t.Fatalf("Chunk.Module = %q, want %q", pipeline.Chunk.Module, generic.Key)
+	if pipeline.Chunk.Module != units.Key {
+		t.Fatalf("Chunk.Module = %q, want %q", pipeline.Chunk.Module, units.Key)
 	}
 	if pipeline.Output.Module != jsonoutput.Key {
 		t.Fatalf("Output.Module = %q, want %q", pipeline.Output.Module, jsonoutput.Key)
@@ -68,7 +68,7 @@ func defaultModuleCatalog(t *testing.T) pipeline.ModuleCatalog {
 	}); err != nil {
 		t.Fatalf("register input: %v", err)
 	}
-	if err := generic.Register(chunkers); err != nil {
+	if err := units.Register(chunkers); err != nil {
 		t.Fatalf("register generic chunker: %v", err)
 	}
 	if err := extractors.RegisterWithSpec(pipeline.ModuleSpec{

internal/modules/dnd/register/register.go

@@ -8,11 +8,11 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/chunk/dnd/scenes"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/extract/dnd/spells"
+	validjson "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/validate/valid_json"
+	validjsonschema "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/validate/valid_json_schema"
 	spellshape "gitea.maximumdirect.net/eric/notarius/internal/validators/extract/dnd/spells/shape"
 	spellsourcerefs "gitea.maximumdirect.net/eric/notarius/internal/validators/extract/dnd/spells/source_refs"
 	spellrelatedness "gitea.maximumdirect.net/eric/notarius/internal/validators/extract/dnd/spells/source_relatedness"
-	validjson "gitea.maximumdirect.net/eric/notarius/internal/validators/generic/valid_json"
-	validjsonschema "gitea.maximumdirect.net/eric/notarius/internal/validators/generic/valid_json_schema"
 )
 
 // Register adds all production D&D modules, validators, policy, and assets.

internal/modules/extract/dnd/spells/config_test.go

@@ -10,9 +10,9 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/core/source"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/input/seriatim"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/merge/appendorder"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/normalize/noop"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/merge/appendorder"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/normalize/noop"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/seriatim/input/transcript"
 )
 
 func TestPipelineConfigLoadsAndResolvesWithDNDSpellsExtractor(t *testing.T) {
@@ -65,7 +65,7 @@ func TestPipelineConfigLoadsAndResolvesWithDNDSpellsExtractor(t *testing.T) {
 }
 
 func TestPipelineConfigRejectsMissingTranscriptCapabilityForDNDSpells(t *testing.T) {
-	inputSpec := seriatim.ModuleSpec()
+	inputSpec := transcript.ModuleSpec()
 	inputSpec.Provides = withoutCapability(inputSpec.Provides, "source.transcript")
 	chunkSpec := dndSpellsChunkerSpec()
 	chunkSpec.Requires = nil
@@ -156,11 +156,11 @@ func dndSpellsTestCatalog(t *testing.T, specs dndSpellsCatalogSpecs) pipeline.Mo
 	outputs := pipeline.NewOutputEncoderRegistry()
 
 	if specs.input.Key == "" {
-		if err := seriatim.Register(inputs); err != nil {
+		if err := transcript.Register(inputs); err != nil {
 			t.Fatalf("register seriatim input: %v", err)
 		}
 	} else if err := inputs.RegisterWithSpec(specs.input, func() (contracts.InputAdapter, error) {
-		return seriatim.New(), nil
+		return transcript.New(), nil
 	}); err != nil {
 		t.Fatalf("register seriatim input override: %v", err)
 	}

internal/modules/extract/dnd/spells/runner_test.go

@@ -11,7 +11,7 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/core/source"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/input/seriatim"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/seriatim/input/transcript"
 )
 
 func TestRunnerProcessesSeriatimInputWithDNDSpellsExtractor(t *testing.T) {
@@ -75,8 +75,8 @@ func TestRunnerProcessesSeriatimInputWithDNDSpellsExtractor(t *testing.T) {
 		}
 	}
 
-	if output.Manifest.InputModule != seriatim.Key {
-		t.Fatalf("manifest input module = %q, want %q", output.Manifest.InputModule, seriatim.Key)
+	if output.Manifest.InputModule != transcript.Key {
+		t.Fatalf("manifest input module = %q, want %q", output.Manifest.InputModule, transcript.Key)
 	}
 	if output.Manifest.ValidationStatus != "approved" {
 		t.Fatalf("ValidationStatus = %q, want approved", output.Manifest.ValidationStatus)
@@ -343,7 +343,7 @@ func readDNDSpellsFixture(t *testing.T) []byte {
 func parseDNDSpellsFixture(t *testing.T, raw []byte) *source.SourceDocument {
 	t.Helper()
 
-	doc, err := seriatim.New().Parse(context.Background(), contracts.ParseRequest{Raw: raw})
+	doc, err := transcript.New().Parse(context.Background(), contracts.ParseRequest{Raw: raw})
 	if err != nil {
 		t.Fatalf("Parse() error = %v, want nil", err)
 	}

internal/modules/generic/chunk/units/chunker.go

@@ -1,4 +1,4 @@
-package generic
+package units
 
 import (
 	"context"

internal/modules/generic/chunk/units/chunker_test.go

@@ -1,4 +1,4 @@
-package generic
+package units
 
 import (
 	"context"

internal/modules/generic/register/register.go

@@ -6,14 +6,14 @@ import (
 
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/llm"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/chunk/generic"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/merge/appendorder"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/normalize/noop"
-	jsonoutput "gitea.maximumdirect.net/eric/notarius/internal/modules/output/json"
-	alwaysaccept "gitea.maximumdirect.net/eric/notarius/internal/validators/generic/always_accept"
-	alwaysreject "gitea.maximumdirect.net/eric/notarius/internal/validators/generic/always_reject"
-	validjson "gitea.maximumdirect.net/eric/notarius/internal/validators/generic/valid_json"
-	validjsonschema "gitea.maximumdirect.net/eric/notarius/internal/validators/generic/valid_json_schema"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/chunk/units"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/merge/appendorder"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/normalize/noop"
+	jsonoutput "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/output/json"
+	alwaysaccept "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/validate/always_accept"
+	alwaysreject "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/validate/always_reject"
+	validjson "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/validate/valid_json"
+	validjsonschema "gitea.maximumdirect.net/eric/notarius/internal/modules/generic/validate/valid_json_schema"
 )
 
 // Register adds all production domain-neutral modules and validators.
@@ -26,7 +26,7 @@ func Register(registries pipeline.Registries, assets *llm.AssetRegistry) error {
 		name     string
 		register func() error
 	}{
-		{name: "generic chunker", register: func() error { return generic.Register(registries.Chunkers) }},
+		{name: "generic chunker", register: func() error { return units.Register(registries.Chunkers) }},
 		{name: "appendorder merger", register: func() error { return appendorder.Register(registries.Mergers) }},
 		{name: "noop normalizer", register: func() error { return noop.Register(registries.Normalizers) }},
 		{name: "always accept validator", register: func() error { return alwaysaccept.Register(registries.Validators) }},

internal/modules/seriatim/input/transcript/adapter.go

@@ -1,4 +1,4 @@
-package seriatim
+package transcript
 
 import (
 	"context"

internal/modules/seriatim/input/transcript/adapter_test.go

@@ -1,4 +1,4 @@
-package seriatim
+package transcript
 
 import (
 	"context"

internal/modules/seriatim/input/transcript/config_test.go

@@ -1,4 +1,4 @@
-package seriatim
+package transcript
 
 import (
 	"context"
@@ -10,8 +10,8 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/core/config"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/merge/appendorder"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/normalize/noop"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/merge/appendorder"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/normalize/noop"
 )
 
 func TestPipelineConfigLoadsAndResolvesWithSeriatimInput(t *testing.T) {

internal/modules/seriatim/input/transcript/metadata.go

@@ -1,4 +1,4 @@
-package seriatim
+package transcript
 
 import (
 	"encoding/json"

internal/modules/seriatim/input/transcript/model.go

@@ -1,4 +1,4 @@
-package seriatim
+package transcript
 
 import (
 	"bytes"

internal/modules/seriatim/input/transcript/registry_test.go

@@ -1,4 +1,4 @@
-package seriatim
+package transcript
 
 import (
 	"encoding/json"

internal/modules/seriatim/input/transcript/runner_test.go

@@ -1,4 +1,4 @@
-package seriatim
+package transcript
 
 import (
 	"context"
@@ -11,8 +11,8 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/core/source"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/merge/appendorder"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/normalize/noop"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/merge/appendorder"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/generic/normalize/noop"
 )
 
 func TestRunnerProcessesSeriatimInputWithFakeModules(t *testing.T) {

internal/modules/seriatim/register/register.go

@@ -6,7 +6,7 @@ import (
 
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/llm"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/input/seriatim"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/seriatim/input/transcript"
 )
 
 // Register adds all production Seriatim modules.
@@ -15,7 +15,7 @@ func Register(registries pipeline.Registries, assets *llm.AssetRegistry) error {
 	if registries.Inputs == nil {
 		return fmt.Errorf("seriatim registrar: input registry must not be nil")
 	}
-	if err := seriatim.Register(registries.Inputs); err != nil {
+	if err := transcript.Register(registries.Inputs); err != nil {
 		return fmt.Errorf("register transcript input: %w", err)
 	}
 	return nil