Integrate extraction artifacts into analysis catalog

internal/stage/analyze.go

@@ -84,7 +84,13 @@ func (analyzeStage) Run(ctx context.Context, env *Env, m *manifest.Manifest) (*S
 		}}, nil
 	}
 
-	runtimeCatalog, err := buildAnalyzeRuntimeArtifactCatalog(paths, env.Config.Pipeline.Scriptorium, env.SelectedArtifactKeys)
+	runtimeCatalog, err := buildAnalyzeRuntimeArtifactCatalog(
+		paths,
+		m,
+		env.Config.Pipeline.Scriptorium,
+		env.Config.Pipeline.Notarius,
+		env.SelectedArtifactKeys,
+	)
 	if err != nil {
 		return nil, fmt.Errorf("analyze: build runtime artifact catalog: %w", err)
 	}
@@ -668,6 +674,16 @@ func resolveScriptoriumInput(
 			return resolved.Path, true, &copy, nil
 		}
 		if errors.Is(err, artifacts.ErrSessionArtifactNotFound) {
+			if descriptor.Source.Kind == artifactpolicy.SourceKindExtraction {
+				if inputCfg.Required {
+					return "", false, nil, fmt.Errorf(
+						"required extraction source %q is unavailable; enable and configure pipeline.notarius output %q, then rerun extract with --force",
+						source,
+						descriptor.Source.ConfiguredKey,
+					)
+				}
+				return "", false, nil, nil
+			}
 			if descriptor.Source.Kind == artifactpolicy.SourceKindConfiguredArtifact {
 				if inputCfg.Required {
 					return "", false, nil, fmt.Errorf("configured artifact source %q is unavailable", source)
@@ -727,13 +743,20 @@ func preparedStableInputFilename(sourceID string) (string, bool) {
 
 func buildAnalyzeRuntimeArtifactCatalog(
 	paths artifacts.SessionPaths,
+	m *manifest.Manifest,
 	scriptoriumCfg *config.ScriptoriumConfig,
+	notariusCfg *config.NotariusConfig,
 	selectedArtifacts []string,
 ) (*artifacts.ArtifactCatalog, error) {
 	catalog := artifacts.NewArtifactCatalog()
 	if err := catalog.RegisterBuiltIns(); err != nil {
 		return nil, err
 	}
+	extractionDefinitions := configuredExtractionDefinitions(notariusCfg)
+	if err := catalog.RegisterExtractionArtifacts(extractionDefinitions); err != nil {
+		return nil, err
+	}
+	catalog.HydrateExtractionArtifacts(paths, m, extractionDefinitions)
 	if scriptoriumCfg == nil {
 		return catalog, nil
 	}