Restart session

components/backend/git/operations.go

@@ -40,6 +40,8 @@ type ProjectSettings struct {
 type DiffSummary struct {
 	TotalAdded   int `json:"total_added"`
 	TotalRemoved int `json:"total_removed"`
+	FilesAdded   int `json:"files_added"`
+	FilesRemoved int `json:"files_removed"`
 }
 
 // getProjectSettings retrieves the ProjectSettings CR for a project using the provided dynamic client
@@ -871,7 +873,7 @@ func DiffRepo(ctx context.Context, repoDir string) (*DiffSummary, error) {
 
 	summary := &DiffSummary{}
 
-	// Get numstat for modified files (working tree vs HEAD)
+	// Get numstat for modified tracked files (working tree vs HEAD)
 	numstatOut, err := run("git", "diff", "--numstat", "HEAD")
 	if err == nil && strings.TrimSpace(numstatOut) != "" {
 		lines := strings.Split(strings.TrimSpace(numstatOut), "\n")
@@ -896,11 +898,37 @@ func DiffRepo(ctx context.Context, repoDir string) (*DiffSummary, error) {
 				fmt.Sscanf(removed, "%d", &n)
 				summary.TotalRemoved += n
 			}
+			// If file was deleted (0 added, all removed), count as removed file
+			if added == "0" && removed != "0" {
+				summary.FilesRemoved++
+			}
+		}
+	}
+
+	// Get untracked files (new files not yet added to git)
+	untrackedOut, err := run("git", "ls-files", "--others", "--exclude-standard")
+	if err == nil && strings.TrimSpace(untrackedOut) != "" {
+		untrackedFiles := strings.Split(strings.TrimSpace(untrackedOut), "\n")
+		for _, filePath := range untrackedFiles {
+			if filePath == "" {
+				continue
+			}
+			// Count lines in the untracked file
+			fullPath := filepath.Join(repoDir, filePath)
+			if data, err := os.ReadFile(fullPath); err == nil {
+				// Count lines (all lines in a new file are "added")
+				lineCount := strings.Count(string(data), "\n")
+				if len(data) > 0 && !strings.HasSuffix(string(data), "\n") {
+					lineCount++ // Count last line if it doesn't end with newline
+				}
+				summary.TotalAdded += lineCount
+				summary.FilesAdded++
+			}
 		}
 	}
 
-	log.Printf("gitDiffRepo: total_added=%d total_removed=%d",
-		summary.TotalAdded, summary.TotalRemoved)
+	log.Printf("gitDiffRepo: files_added=%d files_removed=%d total_added=%d total_removed=%d",
+		summary.FilesAdded, summary.FilesRemoved, summary.TotalAdded, summary.TotalRemoved)
 	return summary, nil
 }
 

components/backend/handlers/content.go

@@ -128,11 +128,22 @@ func ContentGitDiff(c *gin.Context) {
 
 	summary, err := GitDiffRepo(c.Request.Context(), repoDir)
 	if err != nil {
-		c.JSON(http.StatusOK, gin.H{"total_added": 0, "total_removed": 0})
+		c.JSON(http.StatusOK, gin.H{
+			"files": gin.H{
+				"added":   0,
+				"removed": 0,
+			},
+			"total_added":   0,
+			"total_removed": 0,
+		})
 		return
 	}
 
 	c.JSON(http.StatusOK, gin.H{
+		"files": gin.H{
+			"added":   summary.FilesAdded,
+			"removed": summary.FilesRemoved,
+		},
 		"total_added":   summary.TotalAdded,
 		"total_removed": summary.TotalRemoved,
 	})
@@ -146,23 +157,31 @@ func ContentWrite(c *gin.Context) {
 		Encoding string `json:"encoding"`
 	}
 	if err := c.ShouldBindJSON(&req); err != nil {
+		log.Printf("ContentWrite: bind JSON failed: %v", err)
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
+	log.Printf("ContentWrite: path=%q contentLen=%d encoding=%q StateBaseDir=%q", req.Path, len(req.Content), req.Encoding, StateBaseDir)
+
 	path := filepath.Clean("/" + strings.TrimSpace(req.Path))
 	if path == "/" || strings.Contains(path, "..") {
+		log.Printf("ContentWrite: invalid path rejected: path=%q", path)
 		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid path"})
 		return
 	}
 	abs := filepath.Join(StateBaseDir, path)
+	log.Printf("ContentWrite: absolute path=%q", abs)
+
 	if err := os.MkdirAll(filepath.Dir(abs), 0755); err != nil {
+		log.Printf("ContentWrite: mkdir failed for %q: %v", filepath.Dir(abs), err)
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to create directory"})
 		return
 	}
 	var data []byte
 	if strings.EqualFold(req.Encoding, "base64") {
 		b, err := base64.StdEncoding.DecodeString(req.Content)
 		if err != nil {
+			log.Printf("ContentWrite: base64 decode failed: %v", err)
 			c.JSON(http.StatusBadRequest, gin.H{"error": "invalid base64 content"})
 			return
 		}
@@ -171,42 +190,60 @@ func ContentWrite(c *gin.Context) {
 		data = []byte(req.Content)
 	}
 	if err := os.WriteFile(abs, data, 0644); err != nil {
+		log.Printf("ContentWrite: write failed for %q: %v", abs, err)
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to write file"})
 		return
 	}
+	log.Printf("ContentWrite: successfully wrote %d bytes to %q", len(data), abs)
 	c.JSON(http.StatusOK, gin.H{"message": "ok"})
 }
 
 // ContentRead handles GET /content/file?path=
 func ContentRead(c *gin.Context) {
 	path := filepath.Clean("/" + strings.TrimSpace(c.Query("path")))
+	log.Printf("ContentRead: requested path=%q StateBaseDir=%q", c.Query("path"), StateBaseDir)
+	log.Printf("ContentRead: cleaned path=%q", path)
+
 	if path == "/" || strings.Contains(path, "..") {
+		log.Printf("ContentRead: invalid path rejected: path=%q", path)
 		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid path"})
 		return
 	}
 	abs := filepath.Join(StateBaseDir, path)
+	log.Printf("ContentRead: absolute path=%q", abs)
+
 	b, err := os.ReadFile(abs)
 	if err != nil {
+		log.Printf("ContentRead: read failed for %q: %v", abs, err)
 		if os.IsNotExist(err) {
 			c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
 		} else {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": "read failed"})
 		}
 		return
 	}
+	log.Printf("ContentRead: successfully read %d bytes from %q", len(b), abs)
 	c.Data(http.StatusOK, "application/octet-stream", b)
 }
 
 // ContentList handles GET /content/list?path=
 func ContentList(c *gin.Context) {
 	path := filepath.Clean("/" + strings.TrimSpace(c.Query("path")))
+	log.Printf("ContentList: requested path=%q", c.Query("path"))
+	log.Printf("ContentList: cleaned path=%q", path)
+	log.Printf("ContentList: StateBaseDir=%q", StateBaseDir)
+
 	if path == "/" || strings.Contains(path, "..") {
+		log.Printf("ContentList: invalid path rejected: path=%q", path)
 		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid path"})
 		return
 	}
 	abs := filepath.Join(StateBaseDir, path)
+	log.Printf("ContentList: absolute path=%q", abs)
+
 	info, err := os.Stat(abs)
 	if err != nil {
+		log.Printf("ContentList: stat failed for %q: %v", abs, err)
 		if os.IsNotExist(err) {
 			c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
 		} else {
@@ -241,5 +278,6 @@ func ContentList(c *gin.Context) {
 			"modifiedAt": info.ModTime().UTC().Format(time.RFC3339),
 		})
 	}
+	log.Printf("ContentList: returning %d items for path=%q", len(items), path)
 	c.JSON(http.StatusOK, gin.H{"items": items})
 }