eric/narratio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Implement final changes from the code quality and deduplication opportunity audit

Browse Source
This commit is contained in:
Eric Rakestraw
2026-05-23 10:05:14 -05:00
parent 5620fc5bcf
commit 72deccb4e2
32 changed files with 27 additions and 1339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/stage/analyze_test.go
View File

@@ -255,7 +255,7 @@ func TestAnalyzeOmitsOptionalCanonicalPreviousRecapWhenUnavailable(t *testing.T)
}
}
func TestAnalyzeUsesRunLocalPathsAndPromotesCanonical(t *testing.T) {
func TestAnalyzeUsesRunLocalPathsAndMaterializesCanonical(t *testing.T) {
env, m, fake := setupAnalyzeEnv(t)
env.Config.Session.Campaign = "sample-campaign"
m.Campaign = "sample-campaign"

4
internal/stage/merge.go
View File

@@ -156,7 +156,7 @@ func (mergeStage) Run(ctx context.Context, env *Env, m *manifest.Manifest) (*Sta
SessionID: sessionID,
})
if err != nil {
return nil, fmt.Errorf("merge: promote merged transcript: %w", err)
return nil, fmt.Errorf("merge: materialize canonical base transcript: %w", err)
}
outputs := []artifacts.Ref{materializedMerged}
if reportEnabled {
@@ -166,7 +166,7 @@ func (mergeStage) Run(ctx context.Context, env *Env, m *manifest.Manifest) (*Sta
SessionID: sessionID,
})
if err != nil {
return nil, fmt.Errorf("merge: promote report: %w", err)
return nil, fmt.Errorf("merge: materialize canonical report: %w", err)
}
outputs = append(outputs, materializedReport)
}

2
internal/stage/merge_test.go
View File

@@ -289,7 +289,7 @@ func TestMergeStageFailsWhenNormalizedOutputInvalid(t *testing.T) {
}
}
func TestMergeStageUsesRunLocalPathsAndPromotesCanonical(t *testing.T) {
func TestMergeStageUsesRunLocalPathsAndMaterializesCanonical(t *testing.T) {
env, m := setupMergeEnv(t)
env.Config.Session.Campaign = "sample-campaign"
m.Campaign = "sample-campaign"

4
internal/stage/normalize.go
View File

@@ -139,7 +139,7 @@ func (normalizeStage) Run(ctx context.Context, env *Env, m *manifest.Manifest) (
SessionID: sessionID,
})
if err != nil {
return nil, fmt.Errorf("normalize: promote normalized transcript: %w", err)
return nil, fmt.Errorf("normalize: materialize canonical final transcript: %w", err)
}
outputs := []artifacts.Ref{materializedNormalized}
if reportEnabled {
@@ -149,7 +149,7 @@ func (normalizeStage) Run(ctx context.Context, env *Env, m *manifest.Manifest) (
SessionID: sessionID,
})
if err != nil {
return nil, fmt.Errorf("normalize: promote report: %w", err)
return nil, fmt.Errorf("normalize: materialize canonical report: %w", err)
}
outputs = append(outputs, materializedReport)
}

2
internal/stage/normalize_test.go
View File

@@ -211,7 +211,7 @@ func TestNormalizeStageReportEnabledFailsWhenReportMissing(t *testing.T) {
}
}
func TestNormalizeStageUsesRunLocalPathsAndPromotesCanonical(t *testing.T) {
func TestNormalizeStageUsesRunLocalPathsAndMaterializesCanonical(t *testing.T) {
env, m, ser := setupNormalizeEnv(t)
env.Config.Session.Campaign = "sample-campaign"
m.Campaign = "sample-campaign"

4
internal/stage/placeholders_test.go
View File

@@ -96,7 +96,6 @@ func TestStagesReturnExpectedMetadata(t *testing.T) {
Seriatim: sf,
Audita: af,
Scriptorium: sc,
Storage: st,
ObjectStore: st,
Notifier: nf,
}
@@ -221,9 +220,6 @@ func TestStagesReturnExpectedMetadata(t *testing.T) {
if len(sc.RunRequests) != 0 {
t.Fatalf("scriptorium run calls = %d, want 0 when scriptorium config is absent", len(sc.RunRequests))
}
if len(st.Requests) != 0 {
t.Fatalf("storage publish calls = %d, want 0", len(st.Requests))
}
if _, ok := st.Objects["dnd/campaigns/sample-campaign/sessions/2026-05-03/runs/"+m.RunID+"/manifest.json"]; !ok {
t.Fatalf("publish upload missing manifest key in fake object store")
}

4
internal/stage/polish.go
View File

@@ -155,7 +155,7 @@ func (polishStage) Run(ctx context.Context, env *Env, m *manifest.Manifest) (*St
SessionID: sessionID,
})
if err != nil {
return nil, fmt.Errorf("polish: promote processed transcript: %w", err)
return nil, fmt.Errorf("polish: materialize canonical polished transcript: %w", err)
}
outputs := []artifacts.Ref{materializedProcessed}
if reportEnabled {
@@ -165,7 +165,7 @@ func (polishStage) Run(ctx context.Context, env *Env, m *manifest.Manifest) (*St
SessionID: sessionID,
})
if err != nil {
return nil, fmt.Errorf("polish: promote report: %w", err)
return nil, fmt.Errorf("polish: materialize canonical report: %w", err)
}
outputs = append(outputs, materializedReport)
}

2
internal/stage/polish_test.go
View File

@@ -238,7 +238,7 @@ func TestPolishStageFailsWhenReportInvalid(t *testing.T) {
}
}
func TestPolishStageUsesRunLocalPathsAndPromotesCanonical(t *testing.T) {
func TestPolishStageUsesRunLocalPathsAndMaterializesCanonical(t *testing.T) {
env, m := setupPolishEnv(t)
env.Config.Session.Campaign = "sample-campaign"
m.Campaign = "sample-campaign"

1
internal/stage/stage.go
View File

@@ -27,7 +27,6 @@ type Env struct {
Seriatim seriatim.Runner
Audita audita.Runner
Scriptorium scriptorium.Runner
Storage storage.Backend
ObjectStore storage.ObjectStore
Notifier notify.Sender
}

2
internal/stage/transcribe_test.go
View File

@@ -191,7 +191,7 @@ func TestTranscribeStageInvalidJSONFails(t *testing.T) {
}
}
func TestTranscribeStageUsesRunLocalOutputAndPromotesCanonical(t *testing.T) {
func TestTranscribeStageUsesRunLocalOutputAndMaterializesCanonical(t *testing.T) {
env, m := setupTranscribeEnv(t, []string{"alice.flac"})
env.Config.Session.Campaign = "sample-campaign"
m.Campaign = "sample-campaign"

6
internal/stage/trim.go
View File

@@ -106,7 +106,7 @@ func (trimStage) Run(ctx context.Context, env *Env, m *manifest.Manifest) (*Stag
SessionID: sessionID,
})
if err != nil {
return nil, fmt.Errorf("trim: promote trimmed transcript: %w", err)
return nil, fmt.Errorf("trim: materialize canonical final trimmed transcript: %w", err)
}
metadata["trim_action"] = "copy_disabled"
return &StageResult{
@@ -357,7 +357,7 @@ func (trimStage) Run(ctx context.Context, env *Env, m *manifest.Manifest) (*Stag
SessionID: sessionID,
})
if err != nil {
return nil, fmt.Errorf("trim: promote trimmed transcript: %w", err)
return nil, fmt.Errorf("trim: materialize canonical final trimmed transcript: %w", err)
}
materializedBounds, err := materializeRunLocalOutput(env.ArtifactStore, finalBoundsOutputPath, canonicalBoundsOutputPath, artifacts.Ref{
Kind: "session_bounds",
@@ -365,7 +365,7 @@ func (trimStage) Run(ctx context.Context, env *Env, m *manifest.Manifest) (*Stag
SessionID: sessionID,
})
if err != nil {
return nil, fmt.Errorf("trim: promote session bounds: %w", err)
return nil, fmt.Errorf("trim: materialize canonical session bounds: %w", err)
}
return &StageResult{

4
internal/stage/trim_test.go
View File

@@ -298,7 +298,7 @@ func TestTrimStageDisabledCopiesNormalizedTranscript(t *testing.T) {
}
}
func TestTrimStageUsesRunLocalPathsAndPromotesCanonical(t *testing.T) {
func TestTrimStageUsesRunLocalPathsAndMaterializesCanonical(t *testing.T) {
env, m, scr, ser := setupTrimEnv(t)
env.Config.Session.Campaign = "sample-campaign"
m.Campaign = "sample-campaign"
@@ -322,7 +322,7 @@ func TestTrimStageUsesRunLocalPathsAndPromotesCanonical(t *testing.T) {
t.Fatalf("trim output path = %q, want run-local path", ser.TrimRequests[0].OutputTrimmedPath)
}
if len(result.Outputs) < 2 {
t.Fatalf("outputs = %#v, want promoted trimmed+bounds outputs", result.Outputs)
t.Fatalf("outputs = %#v, want materialized trimmed+bounds outputs", result.Outputs)
}
for _, out := range result.Outputs {
if strings.Contains(out.AbsolutePath, string(filepath.Separator)+"runs"+string(filepath.Separator)) {