diff --git a/apps/server/src/provider/codexUsageLimits.test.ts b/apps/server/src/provider/codexUsageLimits.test.ts index 3a5cae4a9d2c1..7e3c5416c863b 100644 --- a/apps/server/src/provider/codexUsageLimits.test.ts +++ b/apps/server/src/provider/codexUsageLimits.test.ts @@ -370,6 +370,15 @@ 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: ":/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 526852332033d..2c371e7504cdd 100644 --- a/apps/server/src/provider/codexUsageLimits.ts +++ b/apps/server/src/provider/codexUsageLimits.ts @@ -210,10 +210,11 @@ 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\/(?:posix\/)?/u, + "", ); + return Option.getOrElse(DateTime.zoneMakeNamed(zoneName ?? ""), DateTime.zoneMakeLocal); } /**