Merge pull request #10155 from gitbutlerapp/fix-timezones

Fix timezones

Author: Caleb-T-Owens

apps/desktop/src/components/codegen/CodegenServiceMessage.svelte

@@ -68,22 +68,16 @@
 		return `${seconds.toFixed(1)}s`;
 	}
 
-	function getUTCNow() {
-		const time = new Date();
-		const offset = time.getTimezoneOffset();
-		return Date.now() + offset * 1000 * 60;
-	}
-
 	let currentWord = $state(getWord());
-	let currentDuration = $state(milisToEnglish(getUTCNow() - lastUserMessageSent.getTime()));
+	let currentDuration = $state(milisToEnglish(Date.now() - lastUserMessageSent.getTime()));
 
 	$effect(() => {
 		const updateWordInterval = setInterval(() => {
 			currentWord = getWord();
 		}, 1000 * 15);
 
 		const updateTimeInterval = setInterval(() => {
-			currentDuration = milisToEnglish(getUTCNow() - lastUserMessageSent.getTime());
+			currentDuration = milisToEnglish(Date.now() - lastUserMessageSent.getTime());
 		}, 100);
 
 		return () => {

apps/desktop/src/lib/codegen/messages.ts

@@ -281,6 +281,10 @@ export function currentStatus(events: ClaudeMessage[], isActive: boolean): Claud
 	return 'running';
 }
 
+function normalizeDate(date: Date): Date {
+	return new Date(date.getTime() - date.getTimezoneOffset() * 60 * 1000);
+}
+
 /**
  * Thinking duration in ms
  */
@@ -293,7 +297,7 @@ export function lastUserMessageSentAt(events: ClaudeMessage[]): Date | undefined
 		}
 	}
 	if (!event) return;
-	return new Date(event.createdAt);
+	return normalizeDate(new Date(event.createdAt));
 }
 
 /**
@@ -302,7 +306,8 @@ export function lastUserMessageSentAt(events: ClaudeMessage[]): Date | undefined
 export function lastInteractionTime(events: ClaudeMessage[]): Date | undefined {
 	if (events.length === 0) return undefined;
 	const lastEvent = events[events.length - 1];
-	return lastEvent ? new Date(lastEvent.createdAt) : undefined;
+	if (!lastEvent) return;
+	return normalizeDate(new Date(lastEvent.createdAt));
 }
 
 /**