Implement direct Notarius extraction execution

internal/app/runner.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"gitea.maximumdirect.net/eric/narratio/internal/adapters/audita"
+	"gitea.maximumdirect.net/eric/narratio/internal/adapters/notarius"
 	"gitea.maximumdirect.net/eric/narratio/internal/adapters/notify"
 	"gitea.maximumdirect.net/eric/narratio/internal/adapters/scriptorium"
 	"gitea.maximumdirect.net/eric/narratio/internal/adapters/seriatim"
@@ -80,6 +81,9 @@ func executeStages(ctx context.Context, cfg *config.Config, stages []stage.Stage
 		}
 		env.Audita = runner
 	}
+	if env.Notarius == nil && needsNotariusForRun(env.Config, stages) {
+		env.Notarius = notarius.NewSubprocessRunner()
+	}
 	if env.Scriptorium == nil {
 		env.Scriptorium = scriptorium.NewSubprocessRunner()
 	}
@@ -672,6 +676,18 @@ func needsObjectStoreForRun(cfg *config.Config, stages []stage.Stage) bool {
 	return true
 }
 
+func needsNotariusForRun(cfg *config.Config, stages []stage.Stage) bool {
+	if cfg == nil || cfg.Pipeline == nil || cfg.Pipeline.Notarius == nil || !cfg.Pipeline.Notarius.Enabled {
+		return false
+	}
+	for _, candidate := range stages {
+		if candidate != nil && candidate.Name() == "extract" {
+			return true
+		}
+	}
+	return false
+}
+
 func needsRemoteLocksForRun(cfg *config.Config, stages []stage.Stage) bool {
 	if cfg == nil || cfg.Pipeline == nil || cfg.Session == nil {
 		return false

internal/app/runner_test.go

@@ -70,6 +70,17 @@ type captureSelectedArtifactsStage struct {
 	captured *[]string
 }
 
+type captureNotariusStage struct {
+	captured *bool
+}
+
+func (s captureNotariusStage) Name() string           { return "extract" }
+func (s captureNotariusStage) Declares() stage.IODecl { return stage.IODecl{} }
+func (s captureNotariusStage) Run(_ context.Context, env *stage.Env, _ *manifest.Manifest) (*stage.StageResult, error) {
+	*s.captured = env.Notarius != nil
+	return &stage.StageResult{}, nil
+}
+
 func (s captureSelectedArtifactsStage) Name() string           { return s.name }
 func (s captureSelectedArtifactsStage) Declares() stage.IODecl { return stage.IODecl{} }
 func (s captureSelectedArtifactsStage) Run(_ context.Context, env *stage.Env, _ *manifest.Manifest) (*stage.StageResult, error) {
@@ -154,6 +165,28 @@ func TestExecuteStagesPropagatesSelectedArtifactsToEnv(t *testing.T) {
 	}
 }
 
+func TestExecuteStagesComposesNotariusOnlyForEnabledExtraction(t *testing.T) {
+	cfg := testConfig(t)
+	cfg.Pipeline.Notarius = &config.NotariusConfig{Enabled: true}
+	captured := false
+
+	_, err := executeStages(context.Background(), cfg, []stage.Stage{captureNotariusStage{captured: &captured}}, RunOptions{})
+	if err != nil {
+		t.Fatalf("executeStages() error = %v", err)
+	}
+	if !captured {
+		t.Fatal("extract stage did not receive the default Notarius runner")
+	}
+
+	if needsNotariusForRun(cfg, []stage.Stage{countingStage{name: "analyze", runs: new(int)}}) {
+		t.Fatal("Notarius runner requested without extract in the selected plan")
+	}
+	cfg.Pipeline.Notarius.Enabled = false
+	if needsNotariusForRun(cfg, []stage.Stage{captureNotariusStage{captured: new(bool)}}) {
+		t.Fatal("Notarius runner requested while extraction is disabled")
+	}
+}
+
 func TestExecuteStagesAnalyzeOutputsPersistAsScriptoriumArtifacts(t *testing.T) {
 	cfg := testConfig(t)
 	storeForPaths := artifacts.NewLocalStore(cfg.Pipeline.Workspace.Root)