krino: planning — chains, placeholders, conflicts, JSON

1 files changed, 2 insertions, 11 deletions

diff --git a/internal/engine/facts.go b/internal/engine/facts.go
index 60380f3..423bfd9 100644
--- a/internal/engine/facts.go
+++ b/internal/engine/facts.go
@@ -13,6 +13,7 @@ import (
 	"krino/internal/cond"
 	"krino/internal/dup"
 	"krino/internal/norm"
+	"krino/internal/plan"
 	"krino/internal/scan"
 	"krino/internal/xdg"
 )
@@ -166,7 +167,7 @@ func (f *facts) Duplicate(dirs []string) (string, bool, error) {
 	root := f.run.d.Root
 	resolved := make([]string, len(dirs))
 	for i, raw := range dirs {
-		resolved[i] = resolveDir(raw, root)
+		resolved[i] = plan.ResolveDir(raw, root)
 	}
 	sorted := append([]string(nil), resolved...)
 	sort.Strings(sorted)
@@ -183,16 +184,6 @@ func (f *facts) Duplicate(dirs []string) (string, bool, error) {
 	return displayOriginal(orig, root), true, nil
 }
 
-// resolveDir expands a leading ~ and joins a relative directory to root,
-// cleaned.
-func resolveDir(raw, root string) string {
-	p := xdg.Expand(raw)
-	if !filepath.IsAbs(p) {
-		p = filepath.Join(root, p)
-	}
-	return filepath.Clean(p)
-}
-
 // displayOriginal reports orig relative to root when it lies inside root,
 // else as an absolute path.
 func displayOriginal(orig, root string) string {