From ac94c8bea094be231dbb7860f4236ee09464281d Mon Sep 17 00:00:00 2001 From: Simone <185146821+Lucenx9@users.noreply.github.com> Date: Thu, 19 Nov 2026 05:57:54 +0000 Subject: [PATCH 1/2] fix(server): use Codex's time zone for reset times from zoneinfo paths --- apps/server/src/provider/codexUsageLimits.test.ts | 6 ++++++ apps/server/src/provider/codexUsageLimits.ts | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/server/src/provider/codexUsageLimits.test.ts b/apps/server/src/provider/codexUsageLimits.test.ts index 3a5cae4a9d2c..35beadf5fe41 100644 --- a/apps/server/src/provider/codexUsageLimits.test.ts +++ b/apps/server/src/provider/codexUsageLimits.test.ts @@ -370,6 +370,12 @@ describe("codexTimeZone", () => { it("uses Codex's TZ and falls back to the server's zone", () => { const local = DateTime.zoneToString(DateTime.zoneMakeLocal()); expect(DateTime.zoneToString(codexTimeZone({ TZ: ":Asia/Dhaka" }))).toBe("Asia/Dhaka"); + expect(DateTime.zoneToString(codexTimeZone({ TZ: ":/usr/share/zoneinfo/Asia/Dhaka" }))).toBe( + "Asia/Dhaka", + ); + expect( + DateTime.zoneToString(codexTimeZone({ TZ: "/usr/share/zoneinfo/America/Chicago" })), + ).toBe("America/Chicago"); expect(DateTime.zoneToString(codexTimeZone({ TZ: "not/a-zone" }))).toBe(local); expect(DateTime.zoneToString(codexTimeZone({}))).toBe(local); }); diff --git a/apps/server/src/provider/codexUsageLimits.ts b/apps/server/src/provider/codexUsageLimits.ts index 526852332033..9c354a28319a 100644 --- a/apps/server/src/provider/codexUsageLimits.ts +++ b/apps/server/src/provider/codexUsageLimits.ts @@ -210,10 +210,8 @@ const MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", " export function codexTimeZone( environment: Readonly>, ): DateTime.TimeZone { - return Option.getOrElse( - DateTime.zoneMakeNamed(environment.TZ?.replace(/^:/, "") ?? ""), - DateTime.zoneMakeLocal, - ); + const zoneName = environment.TZ?.replace(/^:/u, "").replace(/^\/usr\/share\/zoneinfo\//u, ""); + return Option.getOrElse(DateTime.zoneMakeNamed(zoneName ?? ""), DateTime.zoneMakeLocal); } /** From b852211c454d21f2a2e53da200cd37c67558b3a5 Mon Sep 17 00:00:00 2001 From: Simone <185146821+Lucenx9@users.noreply.github.com> Date: Thu, 19 Nov 2026 10:02:57 +0000 Subject: [PATCH 2/2] fix(server): handle posix zoneinfo paths for Codex reset times --- apps/server/src/provider/codexUsageLimits.test.ts | 3 +++ apps/server/src/provider/codexUsageLimits.ts | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/server/src/provider/codexUsageLimits.test.ts b/apps/server/src/provider/codexUsageLimits.test.ts index 35beadf5fe41..7e3c5416c863 100644 --- a/apps/server/src/provider/codexUsageLimits.test.ts +++ b/apps/server/src/provider/codexUsageLimits.test.ts @@ -376,6 +376,9 @@ describe("codexTimeZone", () => { expect( DateTime.zoneToString(codexTimeZone({ TZ: "/usr/share/zoneinfo/America/Chicago" })), ).toBe("America/Chicago"); + expect( + DateTime.zoneToString(codexTimeZone({ TZ: ":/usr/share/zoneinfo/posix/America/Chicago" })), + ).toBe("America/Chicago"); expect(DateTime.zoneToString(codexTimeZone({ TZ: "not/a-zone" }))).toBe(local); expect(DateTime.zoneToString(codexTimeZone({}))).toBe(local); }); diff --git a/apps/server/src/provider/codexUsageLimits.ts b/apps/server/src/provider/codexUsageLimits.ts index 9c354a28319a..2c371e7504cd 100644 --- a/apps/server/src/provider/codexUsageLimits.ts +++ b/apps/server/src/provider/codexUsageLimits.ts @@ -210,7 +210,10 @@ const MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", " export function codexTimeZone( environment: Readonly>, ): DateTime.TimeZone { - const zoneName = environment.TZ?.replace(/^:/u, "").replace(/^\/usr\/share\/zoneinfo\//u, ""); + const zoneName = environment.TZ?.replace(/^:/u, "").replace( + /^\/usr\/share\/zoneinfo\/(?:posix\/)?/u, + "", + ); return Option.getOrElse(DateTime.zoneMakeNamed(zoneName ?? ""), DateTime.zoneMakeLocal); }