Harden initial framework skeleton

internal/app/app.go

@@ -1,50 +1,7 @@
 package app
 
-import (
-	"log/slog"
-
-	"gitea.maximumdirect.net/eric/narratio/internal/adapters/analyzer"
-	"gitea.maximumdirect.net/eric/narratio/internal/adapters/audita"
-	"gitea.maximumdirect.net/eric/narratio/internal/adapters/notify"
-	"gitea.maximumdirect.net/eric/narratio/internal/adapters/seriatim"
-	"gitea.maximumdirect.net/eric/narratio/internal/adapters/storage"
-	"gitea.maximumdirect.net/eric/narratio/internal/adapters/whisperx"
-	"gitea.maximumdirect.net/eric/narratio/internal/artifacts"
-	"gitea.maximumdirect.net/eric/narratio/internal/config"
-	"gitea.maximumdirect.net/eric/narratio/internal/manifest"
-	"gitea.maximumdirect.net/eric/narratio/internal/stage"
-)
+import "gitea.maximumdirect.net/eric/narratio/internal/stage"
 
 // Env is the shared dependency container passed to orchestrator components.
-type Env struct {
-	Config        *config.Config
-	ArtifactStore artifacts.Store
-	ManifestStore manifest.Store
-	Logger        *slog.Logger
-
-	WhisperX whisperx.Client
-	Seriatim seriatim.Runner
-	Audita   audita.Runner
-	Analyzer analyzer.Runner
-	Storage  storage.Backend
-	Notifier notify.Sender
-}
-
-func toStageEnv(env *Env) *stage.Env {
-	if env == nil {
-		return nil
-	}
-
-	return &stage.Env{
-		Config:        env.Config,
-		ArtifactStore: env.ArtifactStore,
-		ManifestStore: env.ManifestStore,
-		Logger:        env.Logger,
-		WhisperX:      env.WhisperX,
-		Seriatim:      env.Seriatim,
-		Audita:        env.Audita,
-		Analyzer:      env.Analyzer,
-		Storage:       env.Storage,
-		Notifier:      env.Notifier,
-	}
-}
+// It aliases stage.Env so orchestration and stages stay on one source of truth.
+type Env = stage.Env

internal/app/runner.go

@@ -89,7 +89,7 @@ func executeStages(ctx context.Context, cfg *config.Config, stages []stage.Stage
 		return nil, err
 	}
 
-	stageEnv := toStageEnv(env)
+	stageEnv := env
 
 	decisions := decideStageActions(stages, m, opts.Force)
 
@@ -102,15 +102,18 @@ func executeStages(ctx context.Context, cfg *config.Config, stages []stage.Stage
 
 		if d.Action == stageActionSkip {
 			skipped = append(skipped, s.Name())
+			env.Logger.Info("skipping stage", "stage", s.Name(), "reason", "already_succeeded", "force", opts.Force)
 			continue
 		}
 		executed = append(executed, s.Name())
 
 		now := nowUTC()
 		m.MarkStageRunning(s.Name(), now)
+		env.Logger.Info("starting stage", "stage", s.Name())
 		if err := env.ManifestStore.Save(ctx, manifestPath, m); err != nil {
 			return nil, fmt.Errorf("save manifest before stage %q: %w", s.Name(), err)
 		}
+		env.Logger.Debug("manifest saved", "stage", s.Name(), "transition", "running", "path", manifestPath)
 
 		result, err := s.Run(ctx, stageEnv, m)
 		if err != nil {
@@ -118,6 +121,7 @@ func executeStages(ctx context.Context, cfg *config.Config, stages []stage.Stage
 			if saveErr := env.ManifestStore.Save(ctx, manifestPath, m); saveErr != nil {
 				return nil, fmt.Errorf("stage %q failed (%v) and manifest save failed (%v)", s.Name(), err, saveErr)
 			}
+			env.Logger.Info("stage failed", "stage", s.Name(), "error", err)
 			return nil, fmt.Errorf("stage %q failed: %w", s.Name(), err)
 		}
 
@@ -128,6 +132,8 @@ func executeStages(ctx context.Context, cfg *config.Config, stages []stage.Stage
 		if err := env.ManifestStore.Save(ctx, manifestPath, m); err != nil {
 			return nil, fmt.Errorf("save manifest after stage %q: %w", s.Name(), err)
 		}
+		env.Logger.Debug("manifest saved", "stage", s.Name(), "transition", "succeeded", "path", manifestPath)
+		env.Logger.Info("stage succeeded", "stage", s.Name())
 	}
 
 	return &RunSummary{