diff --git a/bun.lock b/bun.lock index a4c7457d6a7..8f88d5f76d6 100644 --- a/bun.lock +++ b/bun.lock @@ -87,7 +87,6 @@ "effect": "catalog:", "fuzzysort": "catalog:", "ghostty-web": "github:anomalyco/ghostty-web#83c0a07b8628b748aed073b232cb4b52a6ca11c1", - "luxon": "catalog:", "qr-scanner": "1.4.2", "remeda": "catalog:", "solid-js": "catalog:", @@ -100,7 +99,6 @@ "@sentry/vite-plugin": "catalog:", "@tailwindcss/vite": "4.3.3", "@types/bun": "catalog:", - "@types/luxon": "catalog:", "@types/node": "catalog:", "@typescript/native-preview": "catalog:", "diff": "catalog:", diff --git a/packages/app/package.json b/packages/app/package.json index 1c63d474505..576a1f792bd 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -46,7 +46,6 @@ "@sentry/vite-plugin": "catalog:", "@tailwindcss/vite": "4.3.3", "@types/bun": "catalog:", - "@types/luxon": "catalog:", "@types/node": "catalog:", "@typescript/native-preview": "catalog:", "diff": "catalog:", @@ -88,7 +87,6 @@ "effect": "catalog:", "fuzzysort": "catalog:", "ghostty-web": "github:anomalyco/ghostty-web#83c0a07b8628b748aed073b232cb4b52a6ca11c1", - "luxon": "catalog:", "qr-scanner": "1.4.2", "remeda": "catalog:", "solid-js": "catalog:", diff --git a/packages/app/src/home/sessions/controller.tsx b/packages/app/src/home/sessions/controller.tsx index b8810144b7f..b1c329d784c 100644 --- a/packages/app/src/home/sessions/controller.tsx +++ b/packages/app/src/home/sessions/controller.tsx @@ -3,7 +3,6 @@ import { useDialog } from "@opencode/ui/context/dialog" import { Button } from "@opencode/ui/button" import { DialogFooter, DialogHeader, DialogTitleGroup, Dialog } from "@opencode/ui/dialog" import { skipToken, useQuery, useQueryClient } from "@tanstack/solid-query" -import { DateTime } from "luxon" import { type Accessor, createEffect, createMemo, type JSX, startTransition, untrack } from "solid-js" import { notifySessionTabsRemoved } from "@/shell/titlebar/session-events" import { useCommand } from "@/shell/commands/command" @@ -327,19 +326,19 @@ export function homeSessionSearchKey(record: HomeSessionRecord) { return `${pathKey(record.session.location.directory)}:${record.session.id}` } +// Calendar day in the local time zone, comparable as a number. +function localDay(date: Date) { + return date.getFullYear() * 10_000 + date.getMonth() * 100 + date.getDate() +} + function groupSessions(records: HomeSessionRecord[], language: ReturnType): HomeSessionGroup[] { - const now = DateTime.local() - const yesterday = now.minus({ days: 1 }) - const todaySessions = records.filter((record) => - DateTime.fromMillis(record.session.time.updated ?? record.session.time.created).hasSame(now, "day"), - ) - const yesterdaySessions = records.filter((record) => - DateTime.fromMillis(record.session.time.updated ?? record.session.time.created).hasSame(yesterday, "day"), - ) - const olderSessions = records.filter((record) => { - const time = DateTime.fromMillis(record.session.time.updated ?? record.session.time.created) - return !time.hasSame(now, "day") && !time.hasSame(yesterday, "day") - }) + const now = new Date() + const today = localDay(now) + const yesterday = localDay(new Date(now.getFullYear(), now.getMonth(), now.getDate() - 1)) + const day = (record: HomeSessionRecord) => localDay(new Date(record.session.time.updated ?? record.session.time.created)) + const todaySessions = records.filter((record) => day(record) === today) + const yesterdaySessions = records.filter((record) => day(record) === yesterday) + const olderSessions = records.filter((record) => day(record) !== today && day(record) !== yesterday) const olderTitle = todaySessions.length === 0 && yesterdaySessions.length === 0 ? language.t("sidebar.project.recentSessions") diff --git a/packages/app/src/providers/models/models.tsx b/packages/app/src/providers/models/models.tsx index efe954d72ae..2b50828aa00 100644 --- a/packages/app/src/providers/models/models.tsx +++ b/packages/app/src/providers/models/models.tsx @@ -1,5 +1,4 @@ import { type Accessor, createMemo } from "solid-js" -import { DateTime } from "luxon" import { filter, firstBy, flat, groupBy, mapValues, pipe, uniqueBy, values } from "remeda" import { createSimpleContext } from "@opencode/ui/context" import { useProviders } from "@/providers/catalog/providers" @@ -9,6 +8,8 @@ export type ModelKey = { providerID: string; modelID: string } type Visibility = "show" | "hide" const RECENT_LIMIT = 5 +// luxon's diffNow().as("months") used an average month; keep the same window. +const sixMonths = 6 * 30.436875 * 24 * 60 * 60 * 1000 function modelKey(model: ModelKey) { return `${model.providerID}:${model.modelID}` @@ -29,27 +30,23 @@ const createModelsController = (directory: Accessor) => { ), ) + // Release dates as epoch ms; an unparseable date is NaN and never counts as recent. const release = createMemo( () => new Map( - available().map((model) => { - const parsed = DateTime.fromISO(model.release_date) - return [modelKey({ providerID: model.provider.id, modelID: model.id }), parsed] as const - }), + available().map( + (model) => [modelKey({ providerID: model.provider.id, modelID: model.id }), Date.parse(model.release_date)] as const, + ), ), ) const latest = createMemo(() => pipe( available(), - filter( - (x) => - Math.abs( - (release().get(modelKey({ providerID: x.provider.id, modelID: x.id })) ?? DateTime.invalid("invalid")) - .diffNow() - .as("months"), - ) < 6, - ), + filter((x) => { + const released = release().get(modelKey({ providerID: x.provider.id, modelID: x.id })) ?? NaN + return Math.abs(Date.now() - released) < sixMonths + }), groupBy((x) => x.provider.id), mapValues((models) => pipe( @@ -101,9 +98,8 @@ const createModelsController = (directory: Accessor) => { if (state === "hide") return false if (state === "show") return true if (latestSet().has(key)) return true - const date = release().get(key) - if (!date?.isValid) return true - return false + // Models without a parseable release date stay visible. + return !Number.isFinite(release().get(key) ?? NaN) } const setVisibility = (model: ModelKey, state: boolean) => { diff --git a/packages/app/src/session/files/session-context-format.ts b/packages/app/src/session/files/session-context-format.ts index e7c536d5841..57acc0338d6 100644 --- a/packages/app/src/session/files/session-context-format.ts +++ b/packages/app/src/session/files/session-context-format.ts @@ -1,6 +1,12 @@ -import { DateTime } from "luxon" - export function createSessionContextFormatter(locale: string) { + // The fields luxon's DATETIME_MED preset passed to Intl; output is identical. + const dateTime = new Intl.DateTimeFormat(locale, { + year: "numeric", + month: "short", + day: "numeric", + hour: "numeric", + minute: "numeric", + }) return { number(value: number | null | undefined) { if (value === undefined) return "—" @@ -14,7 +20,7 @@ export function createSessionContextFormatter(locale: string) { }, time(value: number | undefined) { if (!value) return "—" - return DateTime.fromMillis(value).setLocale(locale).toLocaleString(DateTime.DATETIME_MED) + return dateTime.format(value) }, } }