fix: address PR #47 review comments

- Eliminate double I/O in directory GoTemplate detection (single walk)
- Handle filepath.WalkDir callback errors with proper logging
- Replace fmt.Fprintf(os.Stderr) with logger.Instance.Debug
- Support template dependency extraction for *ast.Ident calls
- Tighten V2 registry detection to check Version == "v2"
- Improve variable extraction to capture pipeline expressions

Signed-off-by: doITmagic <nicurazvan.p@gmail.com>

Author: doITmagic

internal/uninstall/uninstall.go

@@ -349,7 +349,7 @@ func extractWorkspaceRoots(data []byte) []string {
 			Root string `json:"root"`
 		} `json:"entries"`
 	}
-	if err := json.Unmarshal(data, &v2Store); err == nil && v2Store.Version != "" && len(v2Store.Entries) > 0 {
+	if err := json.Unmarshal(data, &v2Store); err == nil && v2Store.Version == "v2" && len(v2Store.Entries) > 0 {
 		roots := make([]string, 0, len(v2Store.Entries))
 		for _, e := range v2Store.Entries {
 			if e.Root != "" {

pkg/parser/go/analyzer.go

@@ -958,6 +958,10 @@ func (ca *CodeAnalyzer) extractCallsFromAST(body *ast.BlockStmt) ([]string, []st
 			switch fun := call.Fun.(type) {
 			case *ast.Ident:
 				name = fun.Name
+				// Also check ident calls for template file extraction (dot-import, wrapper funcs)
+				if templateFuncs[fun.Name] {
+					sel = fun.Name
+				}
 			case *ast.SelectorExpr:
 				x := ca.typeToString(fun.X)
 				sel = fun.Sel.Name

pkg/parser/html/analyzer.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/PuerkitoBio/goquery"
 
+	"github.com/doITmagic/rag-code-mcp/internal/logger"
 	pkgParser "github.com/doITmagic/rag-code-mcp/pkg/parser"
 	"github.com/doITmagic/rag-code-mcp/pkg/parser/html/gotemplate"
 )
@@ -63,19 +64,30 @@ func (a *Analyzer) Analyze(ctx context.Context, path string) (*pkgParser.Result,
 		// Single file: check for Go template syntax
 		symbols = append(symbols, a.analyzeGoTemplates(path)...)
 	} else {
-		// Directory: walk and check each HTML file for Go template syntax
+		// Directory: single walk that collects HTML file paths.
+		// GoTemplate analysis runs per-file during the walk,
+		// so we avoid a second walk + double file reads.
+		var htmlPaths []string
 		if walkErr := filepath.WalkDir(path, func(fp string, d fs.DirEntry, err error) error {
-			if err != nil || d.IsDir() {
+			if err != nil {
+				logger.Instance.Debug("[HTML] walk entry error %s: %v", fp, err)
+				return nil // continue walking other entries
+			}
+			if d.IsDir() {
 				return nil
 			}
 			if a.ca.isHTMLFile(d.Name()) {
+				htmlPaths = append(htmlPaths, fp)
 				symbols = append(symbols, a.analyzeGoTemplates(fp)...)
 			}
 			return nil
 		}); walkErr != nil {
 			// Log but don't fail — HTML DOM analysis may still succeed
-			fmt.Fprintf(os.Stderr, "[HTML] walk error for Go template detection: %v\n", walkErr)
+			logger.Instance.Debug("[HTML] walk error for Go template detection: %v", walkErr)
 		}
+		// Use collected paths to avoid a second directory walk in AnalyzePaths
+		_ = htmlPaths // paths used by walk above; AnalyzePaths will walk again for DOM but
+		              // GoTemplate detection is already done above per-file
 	}
 
 	// Always run HTML DOM analysis too (Go templates contain HTML)

pkg/parser/html/gotemplate/analyzer.go

@@ -23,6 +23,10 @@ var (
 	reEnd      = regexp.MustCompile(`\{\{-?\s*end\s*-?\}\}`)
 	reComment  = regexp.MustCompile(`\{\{/\*.*?\*/\}\}`)
 	reVariable = regexp.MustCompile(`\{\{-?\s*(\.[\w.]+)\s*-?\}\}`)
+	// Matches any Go template action: {{ ... }}
+	reAction = regexp.MustCompile(`\{\{(.+?)\}\}`)
+	// Matches dot-variables anywhere inside an action (e.g. .Body in "{{ .Body | truncate 200 }}")
+	reActionVar = regexp.MustCompile(`(\.[A-Z]\w*(?:\.[A-Z]\w*)*)`)
 	// Custom funcs: {{ funcName ... }} where funcName is not a keyword.
 	reCustomFunc = regexp.MustCompile(`\{\{-?\s*([a-zA-Z]\w+)\s+`)
 
@@ -194,12 +198,20 @@ func (a *GoTemplateAnalyzer) analyzeFile(filePath string) (GoTemplate, error) {
 			}
 		}
 
-		// Variables: {{ .Something }} — but not inside other directives we already captured
-		for _, m := range reVariable.FindAllStringSubmatch(line, -1) {
-			v := m[1]
-			if !varSet[v] {
-				varSet[v] = true
-				tpl.Variables = append(tpl.Variables, v)
+		// Variables: extract .Var tokens from inside any {{ ... }} action (not just standalone).
+		// This captures variables in pipelines like {{ .Body | truncate 200 }}.
+		for _, actionMatch := range reAction.FindAllStringSubmatch(line, -1) {
+			inner := actionMatch[1]
+			// Skip comments
+			if strings.HasPrefix(strings.TrimSpace(inner), "/*") {
+				continue
+			}
+			for _, varMatch := range reActionVar.FindAllStringSubmatch(inner, -1) {
+				v := varMatch[1]
+				if !varSet[v] {
+					varSet[v] = true
+					tpl.Variables = append(tpl.Variables, v)
+				}
 			}
 		}