Complete compatibility purge audit

internal/stage/analyze_evidence_test_helpers_test.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"gitea.maximumdirect.net/eric/narratio/internal/artifactmodel"
+	"gitea.maximumdirect.net/eric/narratio/internal/artifactpolicy"
 	"gitea.maximumdirect.net/eric/narratio/internal/artifacts"
 	"gitea.maximumdirect.net/eric/narratio/internal/manifest"
 )
@@ -55,3 +56,14 @@ func setCurrentBuiltInEvidence(t *testing.T, m *manifest.Manifest, stage, kind,
 		ProducerRunID: stage + "-run", Checksum: checksum,
 	}})
 }
+
+func setCurrentPreviousArtifactInput(t *testing.T, m *manifest.Manifest, path string) {
+	t.Helper()
+	checksum, err := artifacts.SHA256File(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	m.Inputs = append(m.Inputs, manifest.InputRecord{
+		Kind: "previous_artifact", Source: artifactpolicy.PreviousSessionSourceID("session_recap"), Path: path, Checksum: checksum,
+	})
+}

internal/stage/analyze_input_identity_test.go

@@ -61,7 +61,7 @@ func TestResolveAnalyzeInputIdentitiesSupportsEverySourceKind(t *testing.T) {
 			setup: func(t *testing.T, env *Env, m *manifest.Manifest) string {
 				path := mustPreviousArtifactPath(t, sessionPathsForEnv(env, m.SessionID), "artifacts/session_recap.md")
 				writeAnalyzeFile(t, path, "previous recap\n")
-				m.Inputs = append(m.Inputs, manifest.InputRecord{Kind: "previous_artifact", Path: path})
+				setCurrentPreviousArtifactInput(t, m, path)
 				return path
 			},
 			wantOutputKind: "previous_session_cache",

internal/stage/analyze_test.go

@@ -392,6 +392,7 @@ func TestAnalyzeIncludesCanonicalPreviousRecapWhenPreparedCacheExists(t *testing
 
 	previousRecapPath := mustPreviousArtifactPath(t, paths, "artifacts/session_recap.md")
 	writeAnalyzeFile(t, previousRecapPath, "previous recap\n")
+	setCurrentPreviousArtifactInput(t, m, previousRecapPath)
 
 	env.Config.Pipeline.Scriptorium.Artifacts["session_recap"] = config.ScriptoriumArtifactConfig{
 		Enabled:    true,
@@ -804,10 +805,7 @@ func TestAnalyzeResolvesCanonicalPreviousSessionArtifactFromManifestInput(t *tes
 
 	previousPath := mustPreviousArtifactPath(t, paths, "artifacts/session_recap.md")
 	writeAnalyzeFile(t, previousPath, "previous recap\n")
-	m.Inputs = append(m.Inputs, manifest.InputRecord{
-		Kind: "previous_artifact",
-		Path: previousPath,
-	})
+	setCurrentPreviousArtifactInput(t, m, previousPath)
 
 	sessionRecap := env.Config.Pipeline.Scriptorium.Artifacts["session_recap"]
 	sessionRecap.Inputs["previous_recap"] = config.ScriptoriumInputConfig{
@@ -860,10 +858,7 @@ func TestAnalyzeRenderDebugWithCanonicalPreviousSessionInput(t *testing.T) {
 
 	previousPath := mustPreviousArtifactPath(t, paths, "artifacts/session_recap.md")
 	writeAnalyzeFile(t, previousPath, "previous recap\n")
-	m.Inputs = append(m.Inputs, manifest.InputRecord{
-		Kind: "previous_artifact",
-		Path: previousPath,
-	})
+	setCurrentPreviousArtifactInput(t, m, previousPath)
 
 	sessionRecap := env.Config.Pipeline.Scriptorium.Artifacts["session_recap"]
 	sessionRecap.Inputs["previous_recap"] = config.ScriptoriumInputConfig{
@@ -894,10 +889,7 @@ func TestAnalyzeDoesNotCallObjectStoreForCanonicalPreviousSessionInput(t *testin
 
 	previousPath := mustPreviousArtifactPath(t, paths, "artifacts/session_recap.md")
 	writeAnalyzeFile(t, previousPath, "previous recap\n")
-	m.Inputs = append(m.Inputs, manifest.InputRecord{
-		Kind: "previous_artifact",
-		Path: previousPath,
-	})
+	setCurrentPreviousArtifactInput(t, m, previousPath)
 
 	sessionRecap := env.Config.Pipeline.Scriptorium.Artifacts["session_recap"]
 	sessionRecap.Inputs["previous_recap"] = config.ScriptoriumInputConfig{

internal/stage/prepare_previous.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 
 	"gitea.maximumdirect.net/eric/narratio/internal/adapters/storage"
+	"gitea.maximumdirect.net/eric/narratio/internal/artifactpolicy"
 	"gitea.maximumdirect.net/eric/narratio/internal/artifacts"
 	"gitea.maximumdirect.net/eric/narratio/internal/fileops"
 	"gitea.maximumdirect.net/eric/narratio/internal/manifest"
@@ -79,11 +80,15 @@ func hydratePreviousSessionArtifacts(
 			return nil, fmt.Errorf("install previous-session object %q: %w", record.RemoteKey, err)
 		}
 
+		source := preparePreviousInputSource
+		if record.Kind == preparePreviousInputKindArtifact {
+			source = artifactpolicy.PreviousSessionSourceID(record.RequirementName)
+		}
 		result.Inputs = append(result.Inputs, manifest.InputRecord{
 			Kind:     record.Kind,
 			Path:     record.LocalPath,
 			Checksum: checksum,
-			Source:   preparePreviousInputSource,
+			Source:   source,
 			S3Bucket: record.S3Bucket,
 			S3Key:    record.RemoteKey,
 		})

internal/stage/prepare_previous_test.go

@@ -70,8 +70,8 @@ func TestHydratePreviousSessionArtifactsDownloadsManifestAndRequiredArtifact(t *
 	if artifactInput == nil {
 		t.Fatalf("missing input kind %q", preparePreviousInputKindArtifact)
 	}
-	if artifactInput.Source != preparePreviousInputSource {
-		t.Fatalf("artifact input source = %q, want %q", artifactInput.Source, preparePreviousInputSource)
+	if artifactInput.Source != "narratio.previous_session.artifact.session_recap" {
+		t.Fatalf("artifact input source = %q, want canonical previous source", artifactInput.Source)
 	}
 	if artifactInput.Path != recapPath {
 		t.Fatalf("artifact input path = %q, want %q", artifactInput.Path, recapPath)

internal/stage/publish_test.go

@@ -910,9 +910,6 @@ func TestPublishFailurePreservesPreviousCommittedSnapshotAndRetryIsDeterministic
 	if !sort.StringsAreSorted(destinations) {
 		t.Fatalf("retried immutable mapping is not deterministic: %v", destinations)
 	}
-	if _, exists := fake.Objects[m.S3SessionPrefix+"current/manifest.json"]; exists {
-		t.Fatal("new publication wrote legacy current manifest")
-	}
 }
 
 func TestPublishRejectsConflictingImmutableObject(t *testing.T) {