fix(test): update scaffold_test.go for env.runner migration

The review harness now uses env.runner/env.sandbox instead of runner_env.
Update scaffold_test.go assertions to check both legacy RunnerEnv and
new Env.Runner fields.

Assisted-by: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Ralph Bean <rbean@redhat.com>

Author: ralphbean

internal/scaffold/scaffold_test.go

@@ -632,7 +632,8 @@ func TestHarnessesLoadAndValidate(t *testing.T) {
 				assert.Nil(t, h.Forge, "Forge should be nil after resolution")
 				assert.NotEmpty(t, h.PreScript, "PreScript should be set after forge resolution")
 				assert.NotEmpty(t, h.PostScript, "PostScript should be set after forge resolution")
-				assert.NotEmpty(t, h.RunnerEnv, "RunnerEnv should be non-empty after merge")
+				hasRunnerEnv := len(h.RunnerEnv) > 0 || (h.Env != nil && len(h.Env.Runner) > 0)
+				assert.True(t, hasRunnerEnv, "RunnerEnv or Env.Runner should be non-empty after merge")
 
 				resolveErr := h.ResolveRelativeTo(dir)
 				require.NoError(t, resolveErr, "ResolveRelativeTo should succeed")
@@ -700,11 +701,22 @@ func TestHarnessForgeRunnerEnvMerge(t *testing.T) {
 			h, loadErr := harness.LoadWithOpts(harnessPath, harness.LoadOpts{ForgePlatform: "github"})
 			require.NoError(t, loadErr)
 
+			// Build a combined env map from both legacy RunnerEnv and new Env.Runner.
+			combined := make(map[string]string)
+			for k, v := range h.RunnerEnv {
+				combined[k] = v
+			}
+			if h.Env != nil {
+				for k, v := range h.Env.Runner {
+					combined[k] = v
+				}
+			}
+
 			for _, key := range tt.topLevelKeys {
-				assert.Contains(t, h.RunnerEnv, key, "merged RunnerEnv should contain top-level key %s", key)
+				assert.Contains(t, combined, key, "merged env should contain top-level key %s", key)
 			}
 			for _, key := range tt.forgeGithubKeys {
-				assert.Contains(t, h.RunnerEnv, key, "merged RunnerEnv should contain forge.github key %s", key)
+				assert.Contains(t, combined, key, "merged env should contain forge.github key %s", key)
 			}
 		})
 	}