fix: fix calculate lines changes

Author: tduyng

lua/codeme/profile/helpers.lua

@@ -273,7 +273,7 @@ function M.format_items_list(items, key, max_items)
 	return M.format_list(extracted, max_items)
 end
 
-function M.get_top_from_session_list(list, max)
+function M.top_items(list, max)
 	if not list or #list == 0 then
 		return ""
 	end
@@ -285,19 +285,13 @@ function M.get_top_from_session_list(list, max)
 		result[#result + 1] = list[i]
 	end
 
+	-- If there are more items, show "• x more" in subtle gray
 	if #list > max then
-		result[#result + 1] = "..."
+		local remaining = #list - max
+		result[#result + 1] = string.format(" +%d more", remaining)
 	end
 
 	return table.concat(result, ", ")
 end
 
-function M.get_top_projects(session, max)
-	return M.get_top_from_session_list(session.projects, max or 3)
-end
-
-function M.get_top_languages(session, max)
-	return M.get_top_from_session_list(session.languages, max or 5)
-end
-
 return M

lua/codeme/profile/tabs/activity.lua

@@ -136,8 +136,8 @@ function M.render()
 				duration_str = duration_str .. " ⭐"
 			end
 
-			local projects = helpers.get_top_projects(session, 2)
-			local languages = helpers.get_top_languages(session, 5)
+			local projects = helpers.top_items(session.projects, 2)
+			local languages = helpers.top_items(session.languages, 5)
 
 			tbl[#tbl + 1] = {
 				time_str,

lua/codeme/profile/tabs/dashboard.lua

@@ -55,7 +55,7 @@ function M.render()
 	table.insert(lines, {})
 
 	-- TODAY AT A GLANCE
-	local focus_str = focus_score > 0 and tostring(focus_score) .. "/100" or "N/A"
+	local focus_str = focus_score > 0 and tostring(focus_score) .. "/100" or ""
 
 	-- Create metrics table
 	local metrics_tbl = {

lua/codeme/profile/tabs/weekly.lua

@@ -1,6 +1,7 @@
 local state = require("codeme.profile.state")
 local fmt = require("codeme.profile.formatters")
 local ui = require("codeme.ui")
+local helpers = require("codeme.profile.helpers")
 
 local M = {}
 
@@ -45,11 +46,11 @@ function M.get_weekday_date(weekday, monday)
 end
 
 function M.render()
-	local s = state.stats
+	local globalStats = state.stats
 	local lines = {}
 
-	local this_week = s.this_week or {}
-	local last_week = s.last_week or {}
+	local this_week = globalStats.this_week or {}
+	local last_week = globalStats.last_week or {}
 
 	local week_time = this_week.total_time or 0
 	local last_week_time = last_week.total_time or 0
@@ -72,7 +73,7 @@ function M.render()
 	-- Calculate week boundaries
 	local week_monday, week_sunday, today = M.get_week_boundaries()
 
-	local daily_activity = s.daily_activity or {}
+	local daily_activity = globalStats.daily_activity or {}
 
 	table.insert(lines, { { "  📊 Daily Breakdown (Mon-Sun)", "exgreen" } })
 	table.insert(lines, {})
@@ -93,32 +94,35 @@ function M.render()
 			day_stat = { time = 0, lines = 0, files = 0 }
 		end
 
-		local session_count = this_week.session_count
+		local session_count = day_stat.session_count or 0
+		local time_value = day_stat.time or 0
+		local lines_value = day_stat.lines or 0
+		local has_activity = time_value > 0 or lines_value > 0 or session_count > 0
 
-		if day_stat.time > max_day_time then
-			max_day_time = day_stat.time
+		if time_value > max_day_time then
+			max_day_time = time_value
 			max_day_data = {
 				day_name = day_name,
 				date = expected_date,
-				time = day_stat.time,
-				lines = day_stat.lines or 0,
+				time = time_value,
+				lines = lines_value,
 				sessions = session_count,
 			}
 		end
 
 		local day_label = day_name:sub(1, 3)
-		local date_label = expected_date:sub(6, 10) -- MM-DD format
-		local time_str = fmt.fmt_time(day_stat.time)
-		local lines_str = fmt.fmt_num(day_stat.lines or 0)
-		local sessions_str = tostring(session_count)
-		local trend_str = day_stat.time > 0 and "↗" or "-"
+		local date_str = tostring(expected_date)
+		local date_label = date_str:sub(6, 10) -- MM-DD
+
+		local time_str = has_activity and fmt.fmt_time(time_value) or "-"
+		local lines_str = has_activity and fmt.fmt_num(lines_value) or "-"
+		local sessions_str = has_activity and tostring(session_count) or "-"
+		local trend_str = time_value > 0 and "↗" or "-"
 
-		-- Mark today with a star
 		if expected_date == today then
 			day_label = day_label .. " ★"
 		end
 
-		-- Show "-" for future dates
 		if expected_date > today then
 			time_str = "-"
 			lines_str = "-"
@@ -146,48 +150,45 @@ function M.render()
 	table.insert(lines, { { "  📌 Week Summary", "exgreen" } })
 	table.insert(lines, {})
 
-	-- ✅ Most Productive Day (from backend records)
-	local records = s.records or {}
-	local most_productive_day = records.most_productive_day or {}
+	local most_productive_day = globalStats.this_week.most_productive_day or {}
 
 	if most_productive_day.time and most_productive_day.time > 0 then
 		table.insert(lines, {
 			{ "  • Most Productive: ", "commentfg" },
-			{ most_productive_day.weekday or "Unknown", "exgreen" },
+			{ most_productive_day.weekday or "", "exgreen" },
 			{ ", " .. fmt.fmt_date_full(most_productive_day.date or ""), "commentfg" },
 			{ string.format(" (%s)", fmt.fmt_time(most_productive_day.time)), "exyellow" },
 		})
 
 		-- Session details
-		if most_productive_day.sessions and most_productive_day.sessions > 0 then
+		if most_productive_day.session_count and most_productive_day.session_count > 0 then
 			table.insert(lines, {
 				{ "    ↳ Sessions: ", "commentfg" },
-				{ tostring(most_productive_day.sessions), "exgreen" },
+				{ tostring(most_productive_day.session_count), "exgreen" },
 				{ string.format(", %s lines", fmt.fmt_num(most_productive_day.lines or 0)), "commentfg" },
 			})
 		end
 
-		-- Top languages
-		if most_productive_day.languages and #most_productive_day.languages > 0 then
-			local languages_result = table.concat(most_productive_day.languages, ", ")
-			table.insert(lines, {
-				{ "    ↳ Languages: ", "commentfg" },
-				{ languages_result, "exgreen" },
-			})
-		end
-
 		-- Main projects
 		if most_productive_day.projects and #most_productive_day.projects > 0 then
-			local projects_result = table.concat(most_productive_day.projects, ", ")
+			local projects_result = helpers.top_items(most_productive_day.projects, 3)
 			table.insert(lines, {
 				{ "    ↳ Projects: ", "commentfg" },
 				{ projects_result, "exyellow" },
 			})
 		end
 
+		-- Top languages
+		if most_productive_day.languages and #most_productive_day.languages > 0 then
+			local languages_result = helpers.top_items(most_productive_day.languages, 5)
+			table.insert(lines, {
+				{ "    ↳ Languages: ", "commentfg" },
+				{ languages_result, "exgreen" },
+			})
+		end
+
 		table.insert(lines, {})
 	elseif max_day_data and max_day_time > 0 then
-		-- Fallback to calculated data
 		table.insert(lines, {
 			{ "  • Most Productive: ", "commentfg" },
 			{ max_day_data.day_name, "exgreen" },
@@ -287,7 +288,7 @@ function M.render()
 	end
 
 	-- ✅ Productivity Trend (from backend)
-	local productivity_trend = s.productivity_trend or ""
+	local productivity_trend = globalStats.productivity_trend or ""
 	if productivity_trend ~= "" then
 		local trend_text
 		local trend_color
@@ -312,7 +313,7 @@ function M.render()
 	table.insert(lines, {})
 
 	-- ✅ Heatmap (from backend weekly_heatmap)
-	local hm = s.weekly_heatmap
+	local hm = globalStats.weekly_heatmap
 	if hm and #hm > 0 then
 		table.insert(lines, { { "  📅 Activity Heatmap", "exgreen" } })
 		table.insert(lines, {})

lua/codeme/tracker.lua

@@ -61,13 +61,12 @@ end
 
 local function send_to_backend(filepath, lines_changed, opts)
 	opts = opts or {}
-
 	local bufnr = vim.fn.bufnr(filepath)
 	if bufnr == -1 or not vim.api.nvim_buf_is_valid(bufnr) then
 		return
 	end
 
-	local language = vim.bo[bufnr].filetype ~= "" and vim.bo[bufnr].filetype or "n/a"
+	local language = vim.bo[bufnr].filetype ~= "" and vim.bo[bufnr].filetype or ""
 
 	local cmd = {
 		opts.codeme_bin or "codeme",
@@ -86,7 +85,7 @@ local function send_to_backend(filepath, lines_changed, opts)
 		detach = true,
 		on_exit = function(_, code)
 			if opts.verbose then
-				local heartbeat_type = opts.heartbeat_type or "n/a"
+				local heartbeat_type = opts.heartbeat_type or ""
 				if code == 0 then
 					vim.notify(
 						string.format(
@@ -114,41 +113,38 @@ local function calculate_lines_changed(filepath)
 	if current_diff ~= nil then
 		-- GIT-TRACKED FILE
 		local last_diff = last_git_diff_lines[filepath] or 0
-		local delta = current_diff - last_diff
 
-		-- Update baseline
-		last_git_diff_lines[filepath] = current_diff
-
-		if delta > 0 then
-			return delta, "save" -- productivity signal
+		if current_diff == 0 and last_diff > 0 then
+			last_git_diff_lines[filepath] = 0
+			return 0, "reset"
 		end
 
-		-- File was reset (commit, checkout, stash, etc.)
-		-- Still send heartbeat with 0 lines to preserve time tracking
-		if current_diff == 0 and last_diff > 0 then
-			return 0, "save_reset" -- still counts as time spent
+		local delta = current_diff - last_diff
+		last_git_diff_lines[filepath] = current_diff
+
+		if delta ~= 0 then
+			-- Lines changed in git diff
+			-- Count both additions and deletions as work
+			return math.abs(delta), delta > 0 and "add" or "delete"
 		end
 
-		-- No new changes since last save (delta <= 0)
-		-- Don't send redundant heartbeat
-		return nil, nil
+		-- Git diff unchanged, but still editing/refactoring
+		-- This catches: refactors, formatting, renames, navigation
+		-- Send minimal signal to prevent "always 0" problem
+		return 1, "edit_idle"
 	else
 		-- NON-GIT-TRACKED FILE (with NON_GIT_COOLDOWN throttling)
 		local now = os.time()
 		local last_save = last_non_git_save_time[filepath]
 
 		if not last_save then
-			-- First save of this non-git file
 			last_non_git_save_time[filepath] = now
-			return 0, "save_new" -- new file, track time only
+			return 0, "new_file"
 		elseif (now - last_save) < NON_GIT_COOLDOWN then
-			-- Too soon since last save, skip to prevent spam
-			-- This implements the NON_GIT_COOLDOWN throttling
 			return nil, nil
 		else
-			-- Enough time passed, send heartbeat and reset timer
 			last_non_git_save_time[filepath] = now
-			return 0, "save_untracked" -- untracked file, time only
+			return 0, "untracked"
 		end
 	end
 end
@@ -237,7 +233,6 @@ vim.api.nvim_create_autocmd("BufEnter", {
 	end,
 })
 
---- Wire into BufWritePost: file saved
 vim.api.nvim_create_autocmd("BufWritePost", {
 	group = augroup,
 	callback = function()