more audit cleanup

Author: pelikhan

pkg/cli/audit.go

@@ -844,6 +844,7 @@ func renderAuditCompletion(runOutputDir string, jsonOutput bool) {
 	}
 	absOutputDir, _ := filepath.Abs(runOutputDir)
 	fmt.Fprintln(os.Stderr, console.FormatSuccessMessage("Audit complete. Logs saved to "+absOutputDir))
+	fmt.Fprintln(os.Stderr, console.FormatInfoMessage("Tip: use --artifacts to select specific artifact sets (agent, firewall, mcp, activation, detection, etc.)"))
 }
 
 // auditJobRunOptions holds parameters for auditJobRun.

pkg/cli/audit_report.go

@@ -444,43 +444,53 @@ func buildAuditData(processedRun ProcessedRun, metrics LogMetrics, mcpToolUsage
 	return auditData
 }
 
-// extractDownloadedFiles scans the logs directory and returns file information
+// extractDownloadedFiles scans the logs directory recursively and returns file information.
+// It walks subdirectories (aw-prompts/, base/, etc.) so the JSON output enumerates every
+// file available for inspection. Baseline directories are excluded to keep output focused.
 func extractDownloadedFiles(logsPath string) []FileInfo {
 	auditReportLog.Printf("Extracting downloaded files from: %s", logsPath)
 	var files []FileInfo
 
-	entries, err := os.ReadDir(logsPath)
+	absLogsPath, err := filepath.Abs(logsPath)
 	if err != nil {
-		auditReportLog.Printf("Failed to read logs directory: %v", err)
-		return files
+		auditReportLog.Printf("Failed to resolve absolute logs path: %v", err)
+		absLogsPath = logsPath
 	}
 
-	for _, entry := range entries {
-		// Skip directories
-		if entry.IsDir() {
-			continue
+	err = filepath.WalkDir(absLogsPath, func(path string, d os.DirEntry, walkErr error) error {
+		if walkErr != nil {
+			return nil // skip unreadable entries
 		}
 
-		name := entry.Name()
-		fullPath := filepath.Join(logsPath, name)
+		// Skip baseline directories — they belong to comparison runs, not the audited run
+		if d.IsDir() && strings.HasPrefix(d.Name(), "baseline-") {
+			return filepath.SkipDir
+		}
 
-		// Use absolute path so callers get a directly usable path
-		absPath, err := filepath.Abs(fullPath)
-		if err != nil {
-			auditReportLog.Printf("Failed to resolve absolute path for %s: %v", fullPath, err)
-			absPath = fullPath
+		// Skip the base/ directory — it's the full cloned repo, not a log artifact
+		if d.IsDir() && d.Name() == "base" && path == filepath.Join(absLogsPath, "base") {
+			return filepath.SkipDir
+		}
+
+		// Skip directories themselves (we only list files)
+		if d.IsDir() {
+			return nil
 		}
 
 		fileInfo := FileInfo{
-			Path:        absPath,
-			Description: describeFile(name),
+			Path:        path,
+			Description: describeFile(d.Name()),
 		}
 
-		if info, err := os.Stat(fullPath); err == nil {
+		if info, statErr := os.Stat(path); statErr == nil {
 			fileInfo.Size = info.Size()
 		}
 
 		files = append(files, fileInfo)
+		return nil
+	})
+	if err != nil {
+		auditReportLog.Printf("Failed to walk logs directory: %v", err)
 	}
 
 	auditReportLog.Printf("Extracted %d files from logs directory", len(files))

pkg/cli/audit_report_helpers_test.go

@@ -171,8 +171,8 @@ func TestDownloadedFilesInAuditData(t *testing.T) {
 	// Extract downloaded files
 	files := extractDownloadedFiles(tmpDir)
 
-	// Verify we got all files (directories are now excluded)
-	expectedCount := len(testFiles)
+	// Verify we got all files including subdirectory contents
+	expectedCount := len(testFiles) + 1 // +1 for result.json in agent_output/
 	if len(files) != expectedCount {
 		t.Errorf("Expected %d files, got %d", expectedCount, len(files))
 	}
@@ -320,8 +320,8 @@ func TestAuditReportFileListingIntegration(t *testing.T) {
 	// Extract downloaded files (simulates what audit command does)
 	files := extractDownloadedFiles(tmpDir)
 
-	// Verify we got all expected files (directories are now excluded)
-	expectedCount := len(artifacts)
+	// Verify we got all expected files including subdirectory contents
+	expectedCount := len(artifacts) + len(dirs) // +3 for file.txt in each subdir
 	if len(files) != expectedCount {
 		t.Errorf("Expected %d items, got %d", expectedCount, len(files))
 		t.Logf("Files found: %v", files)