feat: more refactoring

Author: benjivesterby

bin/canary

@@ -8,9 +8,9 @@ package files
 import (
 	"fmt"
 	"os"
-	"sort"
 
 	"github.com/spf13/cobra"
+	"go.devnw.com/canary"
 	"go.devnw.com/canary/internal/storage"
 )
 
@@ -62,66 +62,13 @@ Examples:
 
 		// Format output
 		fmt.Printf("Implementation files for %s:\n\n", reqID)
-		formatFilesList(fileGroups)
+		fmt.Print(canary.FormatFilesList(fileGroups))
 
 		return nil
 	},
 }
 
 // formatFilesList formats file groups by aspect
-func formatFilesList(fileGroups map[string][]*storage.Token) {
-	// Group files by aspect
-	aspectFiles := make(map[string][]string)
-	fileCounts := make(map[string]int)
-
-	for filePath, tokens := range fileGroups {
-		// Get aspect from first token (all tokens in same file may have different aspects)
-		aspects := make(map[string]bool)
-		for _, token := range tokens {
-			aspects[token.Aspect] = true
-		}
-
-		// Add file to each unique aspect
-		for aspect := range aspects {
-			aspectFiles[aspect] = append(aspectFiles[aspect], filePath)
-		}
-
-		fileCounts[filePath] = len(tokens)
-	}
-
-	// Sort aspects for consistent output
-	var aspects []string
-	for aspect := range aspectFiles {
-		aspects = append(aspects, aspect)
-	}
-	sort.Strings(aspects)
-
-	// Display by aspect
-	for _, aspect := range aspects {
-		files := aspectFiles[aspect]
-		sort.Strings(files)
-
-		fmt.Printf("**%s:**\n", aspect)
-		for _, file := range files {
-			count := fileCounts[file]
-			plural := "token"
-			if count > 1 {
-				plural = "tokens"
-			}
-			fmt.Printf("  %s (%d %s)\n", file, count, plural)
-		}
-		fmt.Println()
-	}
-
-	// Summary
-	totalFiles := len(fileGroups)
-	totalTokens := 0
-	for _, tokens := range fileGroups {
-		totalTokens += len(tokens)
-	}
-	fmt.Printf("Total: %d files, %d tokens\n", totalFiles, totalTokens)
-}
-
 func init() {
 	FilesCmd.Flags().String("prompt", "", "Custom prompt file or embedded prompt name (future use)")
 	FilesCmd.Flags().Bool("all", false, "Include spec and template files")

bin/canary_test_build

@@ -9,6 +9,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"go.devnw.com/canary"
 	"go.devnw.com/canary/internal/storage"
 )
 
@@ -114,7 +115,7 @@ func TestCANARY_CBIN_CLI_001_CLI_FilesCmd_Formatting(t *testing.T) {
 	}
 
 	// Test that formatFilesList doesn't panic
-	formatFilesList(fileGroups)
+	canary.FormatFilesList(fileGroups)
 
 	// Verify total counts
 	totalFiles := len(fileGroups)
@@ -141,7 +142,7 @@ func TestCANARY_CBIN_CLI_001_CLI_FilesCmd_AspectGrouping(t *testing.T) {
 	}
 
 	// Format output (should group by aspect)
-	formatFilesList(fileGroups)
+	canary.FormatFilesList(fileGroups)
 
 	// Verify that file appears under both aspects
 	aspectFiles := make(map[string][]string)

internal/cmds/files/files.go

@@ -8,9 +8,9 @@ package grep
 import (
 	"fmt"
 	"os"
-	"strings"
 
 	"github.com/spf13/cobra"
+	"go.devnw.com/canary"
 	"go.devnw.com/canary/internal/storage"
 )
 
@@ -53,7 +53,7 @@ Examples:
 		defer db.Close()
 
 		// Search for matching tokens
-		tokens, err := grepTokens(db, pattern)
+		tokens, err := canary.GrepTokens(db, pattern)
 		if err != nil {
 			return fmt.Errorf("search tokens: %w", err)
 		}
@@ -67,101 +67,16 @@ Examples:
 		fmt.Printf("Found %d tokens matching '%s':\n\n", len(tokens), pattern)
 
 		if groupBy == "requirement" {
-			displayGrepResultsByRequirement(tokens)
+			fmt.Print(canary.FormatGrepResultsByRequirement(tokens))
 		} else {
-			displayGrepResults(tokens)
+			fmt.Print(canary.FormatGrepResults(tokens))
 		}
 
 		return nil
 	},
 }
 
 // grepTokens searches for tokens matching the pattern
-func grepTokens(db *storage.DB, pattern string) ([]*storage.Token, error) {
-	if pattern == "" {
-		return []*storage.Token{}, nil
-	}
-
-	// Get all tokens and filter by pattern
-	// We use SearchTokens which already does keyword matching
-	tokens, err := db.SearchTokens(pattern)
-	if err != nil {
-		return nil, err
-	}
-
-	// Additional filtering for file paths and test names
-	allTokens, err := db.ListTokens(nil, "", "", 0)
-	if err != nil {
-		return nil, err
-	}
-
-	patternLower := strings.ToLower(pattern)
-	matchMap := make(map[string]*storage.Token)
-
-	// Add tokens from keyword search
-	for _, token := range tokens {
-		key := fmt.Sprintf("%s:%s:%s:%d", token.ReqID, token.Feature, token.FilePath, token.LineNumber)
-		matchMap[key] = token
-	}
-
-	// Add tokens matching file path, test, or bench
-	for _, token := range allTokens {
-		if strings.Contains(strings.ToLower(token.FilePath), patternLower) ||
-			strings.Contains(strings.ToLower(token.Test), patternLower) ||
-			strings.Contains(strings.ToLower(token.Bench), patternLower) {
-			key := fmt.Sprintf("%s:%s:%s:%d", token.ReqID, token.Feature, token.FilePath, token.LineNumber)
-			matchMap[key] = token
-		}
-	}
-
-	// Convert map back to slice
-	result := make([]*storage.Token, 0, len(matchMap))
-	for _, token := range matchMap {
-		result = append(result, token)
-	}
-
-	return result, nil
-}
-
-// displayGrepResults shows grep results in a simple list format
-func displayGrepResults(tokens []*storage.Token) {
-	for _, token := range tokens {
-		fmt.Printf("📌 %s - %s\n", token.ReqID, token.Feature)
-		fmt.Printf("   Status: %s | Aspect: %s\n", token.Status, token.Aspect)
-		fmt.Printf("   Location: %s:%d\n", token.FilePath, token.LineNumber)
-		if token.Test != "" {
-			fmt.Printf("   Test: %s\n", token.Test)
-		}
-		if token.Bench != "" {
-			fmt.Printf("   Bench: %s\n", token.Bench)
-		}
-		fmt.Println()
-	}
-}
-
-// displayGrepResultsByRequirement groups results by requirement ID
-func displayGrepResultsByRequirement(tokens []*storage.Token) {
-	// Group by requirement
-	reqMap := make(map[string][]*storage.Token)
-	for _, token := range tokens {
-		reqMap[token.ReqID] = append(reqMap[token.ReqID], token)
-	}
-
-	// Display grouped results
-	for reqID, reqTokens := range reqMap {
-		fmt.Printf("## %s (%d tokens)\n\n", reqID, len(reqTokens))
-		for _, token := range reqTokens {
-			fmt.Printf("  📌 %s\n", token.Feature)
-			fmt.Printf("     Status: %s | Aspect: %s | %s:%d\n",
-				token.Status, token.Aspect, token.FilePath, token.LineNumber)
-			if token.Test != "" {
-				fmt.Printf("     Test: %s\n", token.Test)
-			}
-		}
-		fmt.Println()
-	}
-}
-
 func init() {
 	GrepCmd.Flags().String("prompt", "", "Custom prompt file or embedded prompt name (future use)")
 	GrepCmd.Flags().String("db", ".canary/canary.db", "Path to database file")

internal/cmds/files/files_test.go

@@ -9,6 +9,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"go.devnw.com/canary"
 	"go.devnw.com/canary/internal/storage"
 )
 
@@ -96,7 +97,7 @@ func TestCANARY_CBIN_CLI_001_CLI_GrepCmd(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			tokens, err := grepTokens(db, tt.pattern)
+			tokens, err := canary.GrepTokens(db, tt.pattern)
 			if err != nil {
 				t.Fatalf("grepTokens failed: %v", err)
 			}
@@ -162,7 +163,7 @@ func TestCANARY_CBIN_CLI_001_CLI_GrepCmd_CaseInsensitive(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.pattern, func(t *testing.T) {
-			tokens, err := grepTokens(db, tt.pattern)
+			tokens, err := canary.GrepTokens(db, tt.pattern)
 			if err != nil {
 				t.Fatalf("grepTokens failed: %v", err)
 			}
@@ -191,7 +192,7 @@ func TestCANARY_CBIN_CLI_001_CLI_GrepCmd_EmptyPattern(t *testing.T) {
 	defer db.Close()
 
 	// Empty pattern should return no results
-	tokens, err := grepTokens(db, "")
+	tokens, err := canary.GrepTokens(db, "")
 	if err != nil {
 		t.Fatalf("grepTokens failed: %v", err)
 	}