Normalize seed dotenv source names

internal/seed/catalog.go

@@ -2,6 +2,7 @@ package seed
 
 import (
 	"context"
+	"path/filepath"
 	"sort"
 	"strings"
 
@@ -95,6 +96,7 @@ func dotenvVariables(opts Options) ([]owl.DotenvVariable, error) {
 	}
 	var vars []owl.DotenvVariable
 	for _, file := range envFiles {
+		source := owl.Source{Name: sourceNameForPath(opts.WorkDir, file), Kind: "dotenv"}
 		raw, ok, err := readOptionalEnvFile(file)
 		if err != nil {
 			return nil, err
@@ -115,13 +117,24 @@ func dotenvVariables(opts Options) ([]owl.DotenvVariable, error) {
 			vars = append(vars, owl.DotenvVariable{
 				Key:    key,
 				Value:  parsed[key],
-				Source: owl.Source{Name: file, Kind: "dotenv"},
+				Source: source,
 			})
 		}
 	}
 	return vars, nil
 }
 
+func sourceNameForPath(workDir, path string) string {
+	if workDir == "" || path == "" || !filepath.IsAbs(path) {
+		return path
+	}
+	rel, err := filepath.Rel(workDir, path)
+	if err != nil || rel == "." || strings.HasPrefix(rel, ".."+string(filepath.Separator)) || rel == ".." {
+		return path
+	}
+	return rel
+}
+
 func reverseSourceGroups(vars []owl.DotenvVariable) []owl.DotenvVariable {
 	type sourceGroup struct {
 		source owl.Source

internal/seed/seed_test.go

@@ -171,7 +171,7 @@ func TestNewStoreSkipsMissingEnvFiles(t *testing.T) {
 	require.Len(t, dotenvVars, 1)
 	assert.Equal(t, "PRESENT", dotenvVars[0].Key)
 	assert.Equal(t, "from-dotenv", dotenvVars[0].Value)
-	assert.Equal(t, owl.Source{Name: envFile, Kind: "dotenv"}, dotenvVars[0].Source)
+	assert.Equal(t, owl.Source{Name: ".env", Kind: "dotenv"}, dotenvVars[0].Source)
 }
 
 func TestNewStoreUsesDefaultEnvFilesInPrecedenceOrder(t *testing.T) {
@@ -194,13 +194,13 @@ func TestNewStoreUsesDefaultEnvFilesInPrecedenceOrder(t *testing.T) {
 	dotenvVars := result.Catalog.DotenvResolverInput()
 	require.Len(t, dotenvVars, 4)
 	assert.Equal(t, "from-env-dev", dotenvVars[0].Value)
-	assert.Equal(t, ".env.dev", filepath.Base(dotenvVars[0].Source.Name))
+	assert.Equal(t, ".env.dev", dotenvVars[0].Source.Name)
 	assert.Equal(t, "from-env-development", dotenvVars[1].Value)
-	assert.Equal(t, ".env.development", filepath.Base(dotenvVars[1].Source.Name))
+	assert.Equal(t, ".env.development", dotenvVars[1].Source.Name)
 	assert.Equal(t, "from-env-local", dotenvVars[2].Value)
-	assert.Equal(t, ".env.local", filepath.Base(dotenvVars[2].Source.Name))
+	assert.Equal(t, ".env.local", dotenvVars[2].Source.Name)
 	assert.Equal(t, "from-env", dotenvVars[3].Value)
-	assert.Equal(t, ".env", filepath.Base(dotenvVars[3].Source.Name))
+	assert.Equal(t, ".env", dotenvVars[3].Source.Name)
 }
 
 func TestNewRawValueStoreSkipsMissingEnvFiles(t *testing.T) {
@@ -221,7 +221,7 @@ func TestNewRawValueStoreSkipsMissingEnvFiles(t *testing.T) {
 	assert.Equal(t, "from-dotenv", env.Value)
 	assert.Equal(t, owl.VisibilityLiteral, env.Visibility)
 	assert.Equal(t, "dotenv", env.Source.Kind)
-	assert.Equal(t, ".env", filepath.Base(env.Source.Name))
+	assert.Equal(t, ".env", env.Source.Name)
 }
 
 func TestNewRawValueStoreUsesDefaultEnvFilesInOrder(t *testing.T) {
@@ -240,7 +240,24 @@ func TestNewRawValueStoreUsesDefaultEnvFilesInOrder(t *testing.T) {
 	require.NoError(t, err)
 	env := snapshotItemByName(items)["DEFAULT_ORDER"]
 	assert.Equal(t, "from-env-dev", env.Value)
-	assert.Equal(t, ".env.dev", filepath.Base(env.Source.Name))
+	assert.Equal(t, ".env.dev", env.Source.Name)
+}
+
+func TestDotenvVariablesKeepAbsoluteSourceOutsideWorkDir(t *testing.T) {
+	t.Parallel()
+
+	workDir := t.TempDir()
+	outsideDir := t.TempDir()
+	outsideEnvFile := filepath.Join(outsideDir, ".env")
+	require.NoError(t, os.WriteFile(outsideEnvFile, []byte("OUTSIDE=from-outside\n"), 0o600))
+
+	vars, err := dotenvVariables(Options{
+		WorkDir:  workDir,
+		EnvFiles: []string{outsideEnvFile},
+	})
+	require.NoError(t, err)
+	require.Len(t, vars, 1)
+	assert.Equal(t, owl.Source{Name: outsideEnvFile, Kind: "dotenv"}, vars[0].Source)
 }
 
 func TestDotenvVariablesReturnsEnvFileReadErrorsExceptMissing(t *testing.T) {

internal/seed/store.go

@@ -83,7 +83,7 @@ func newBaseStore(req baseStoreRequest) (*owl.Store, error) {
 			if !ok {
 				continue
 			}
-			storeOpts = append(storeOpts, owl.WithDotenv(file, bytes.NewReader(raw)))
+			storeOpts = append(storeOpts, owl.WithDotenv(sourceNameForPath(opts.WorkDir, file), bytes.NewReader(raw)))
 		}
 	}
 

pkg/owl/seed/seed_test.go

@@ -58,7 +58,7 @@ func TestNewStoreSkipsMissingEnvFiles(t *testing.T) {
 	assert.Equal(t, "PRESENT", items[0].Name)
 	assert.Equal(t, "from-dotenv", items[0].Value)
 	assert.Equal(t, "dotenv", items[0].Source.Kind)
-	assert.Equal(t, ".env", filepath.Base(items[0].Source.Name))
+	assert.Equal(t, ".env", items[0].Source.Name)
 }
 
 func TestNewStoreUsesDefaultEnvFilesInOrder(t *testing.T) {
@@ -84,5 +84,5 @@ func TestNewStoreUsesDefaultEnvFilesInOrder(t *testing.T) {
 	require.Len(t, items, 1)
 	assert.Equal(t, "DEFAULT_ORDER", items[0].Name)
 	assert.Equal(t, "from-env-dev", items[0].Value)
-	assert.Equal(t, ".env.dev", filepath.Base(items[0].Source.Name))
+	assert.Equal(t, ".env.dev", items[0].Source.Name)
 }