diff --git a/agenda_contracts.py b/agenda_contracts.py index dc995f1..29c8f56 100644 --- a/agenda_contracts.py +++ b/agenda_contracts.py @@ -41,6 +41,30 @@ WINDOW_NAMES = {item[0] for item in WINDOW_DEFINITIONS} WINDOW_SLUGS = {"深夜": "late_night", "早晨": "morning", "下午": "afternoon", "晚上": "evening"} +def window_for_plan_minutes( + plan_date: Any, minutes: Any, *, timezone_name: str = "Asia/Shanghai" +) -> tuple[str, str]: + """把「计划日 + 当日分钟数」还原成 (窗口名, 窗口日期)。 + + 只给分钟数是不够的:深夜跨午夜,同一个「深夜」标签可能分属两个日程日—— + 7/27 的 00:30 属于 **7/26 的深夜**,7/27 的 23:00 属于 7/27 的深夜。 + 时间轴上这两条会同时出现,不带日期就分不出谁是谁。 + + 分钟数可能带 +1440 偏移(计划里时间回绕到次日),先拆出天偏移再还原成真实时刻, + 然后交给 window_for_datetime——判定只保留那一处实现。 + """ + try: + base = date.fromisoformat(str(plan_date)) if not isinstance(plan_date, date) else plan_date + value = int(minutes) + except (TypeError, ValueError): + return "", "" + day_offset, raw = divmod(value, 24 * 60) + tz = timezone_or_default(timezone_name) + moment = datetime.combine(base + timedelta(days=day_offset), datetime.min.time(), tzinfo=tz) + timedelta(minutes=raw) + name, window_date, _start, _end = window_for_datetime(moment, timezone_name=getattr(tz, "key", timezone_name)) + return name, window_date + + def window_for_minutes(minutes: Any) -> str: """把「当日分钟数」归入四段式窗口。 diff --git a/page_api.py b/page_api.py index 0d2690b..64ea2c3 100644 --- a/page_api.py +++ b/page_api.py @@ -27,7 +27,7 @@ from quart import request, send_file from .constants import DEFAULT_DAILY_PLAN_ITEMS, PAGE_FONT_NAMES, PAGE_THEME_NAMES, PLUGIN_NAME, _REASON_TEXT from .config_migration import _ensure_config_parent_dir -from .agenda_contracts import WINDOW_SLUGS, window_for_minutes +from .agenda_contracts import WINDOW_SLUGS, window_for_plan_minutes from .helpers import _flat_get, _normalize_timezone_name, _redact_outbound_secrets, _safe_int, _set_into_config, _set_today_key_timezone, _strip_internal_message_blocks, _text_looks_garbled, _text_similarity, _today_key from .page_api_users_groups import PrivateCompanionPageApiUsersGroupsMixin from .planning import evaluate_daily_plan_quality, generate_daily_plan, generate_detail_enhancement @@ -18638,6 +18638,19 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiUsersGroupsMixin): }, } + def _agenda_window_pair(self, plan: Any, minutes: Any) -> tuple[str, str]: + plan_date = str((plan or {}).get("date") or "") if isinstance(plan, dict) else "" + if not plan_date or minutes is None: + return "", "" + timezone_name = "" + getter = getattr(self.plugin, "_agenda_timezone_name", None) + if callable(getter): + try: + timezone_name = str(getter() or "") + except Exception: + timezone_name = "" + return window_for_plan_minutes(plan_date, minutes, timezone_name=timezone_name or "Asia/Shanghai") + def _daily_timeline_summary(self, data: dict[str, Any]) -> dict[str, Any]: plan = data.get("daily_plan") if isinstance(data.get("daily_plan"), dict) else {} enhanced = data.get("detail_enhanced_segments") if isinstance(data.get("detail_enhanced_segments"), dict) else {} @@ -18664,10 +18677,11 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiUsersGroupsMixin): { "key": str(key), "window": segment.get("window", str(key)), - # 四段式窗口。此前时间轴只有条目自己的时钟区间, - # 与运维页「当前时间段」、归档里的窗口快照三者口径各说各的。 - "agenda_window": window_for_minutes(segment.get("start")), - "agenda_window_slug": WINDOW_SLUGS.get(window_for_minutes(segment.get("start")), ""), + # 四段式窗口 + 窗口日期。只给窗口名不够:深夜跨午夜, + # 同一份计划里的 00:30 与 23:00 都叫「深夜」,却分属两个日程日。 + "agenda_window": self._agenda_window_pair(plan, segment.get("start"))[0], + "agenda_window_date": self._agenda_window_pair(plan, segment.get("start"))[1], + "agenda_window_slug": WINDOW_SLUGS.get(self._agenda_window_pair(plan, segment.get("start"))[0], ""), "start": segment.get("start", 99999), "end": segment.get("end", 99999), "lifecycle": lifecycle, @@ -18711,8 +18725,9 @@ class PrivateCompanionPageApi(PrivateCompanionPageApiUsersGroupsMixin): { "key": key, "window": f"{self.plugin._minutes_to_hhmm(start)}-{self.plugin._minutes_to_hhmm(end)}", - "agenda_window": window_for_minutes(start), - "agenda_window_slug": WINDOW_SLUGS.get(window_for_minutes(start), ""), + "agenda_window": self._agenda_window_pair(plan, start)[0], + "agenda_window_date": self._agenda_window_pair(plan, start)[1], + "agenda_window_slug": WINDOW_SLUGS.get(self._agenda_window_pair(plan, start)[0], ""), "start": start, "end": end, "lifecycle": self.plugin._plan_item_runtime_status(plan, item, index), diff --git a/pages/陪伴面板/app.js b/pages/陪伴面板/app.js index 88c4875..8cdcc2b 100644 --- a/pages/陪伴面板/app.js +++ b/pages/陪伴面板/app.js @@ -8415,10 +8415,19 @@ function renderDashboardLifeDesk(overview = {}) { let windowHeading = entryIndex === nowMarkerIndex ? nowMarkerHtml : ""; if (entry.kind === "schedule") { const agendaWindow = String(entry.segment?.agenda_window || ""); - if (agendaWindow && agendaWindow !== lastAgendaWindow) { - lastAgendaWindow = agendaWindow; + const agendaWindowDate = String(entry.segment?.agenda_window_date || ""); + // 深夜是唯一跨午夜的窗口:同一份计划里 00:30 与 23:00 都叫「深夜」, + // 但前者属于昨夜、后者属于今夜。用窗口日期把两者分开,否则时间轴上 + // 会出现两个一模一样的「深夜」标题。 + const windowKey = `${agendaWindow}@${agendaWindowDate}`; + if (agendaWindow && windowKey !== lastAgendaWindow) { + lastAgendaWindow = windowKey; const slug = String(entry.segment?.agenda_window_slug || ""); - windowHeading += ``; + const planDate = String(timeline.plan_date || ""); + const nightSuffix = agendaWindow === "深夜" && agendaWindowDate && planDate + ? (agendaWindowDate < planDate ? " · 昨夜" : " · 今夜") + : ""; + windowHeading += ``; } } if (entry.kind === "change") { diff --git a/tests/test_agenda_window_labels.py b/tests/test_agenda_window_labels.py index 476635d..60ae1c8 100644 --- a/tests/test_agenda_window_labels.py +++ b/tests/test_agenda_window_labels.py @@ -9,7 +9,13 @@ from __future__ import annotations import unittest from datetime import datetime, timedelta, timezone -from agenda_contracts import WINDOW_DEFINITIONS, WINDOW_SLUGS, window_for_datetime, window_for_minutes +from agenda_contracts import ( + WINDOW_DEFINITIONS, + WINDOW_SLUGS, + window_for_datetime, + window_for_minutes, + window_for_plan_minutes, +) TZ = timezone(timedelta(hours=8)) @@ -52,3 +58,42 @@ class WindowForMinutesTests(unittest.TestCase): if __name__ == "__main__": unittest.main() + + +class WindowForPlanMinutesTests(unittest.TestCase): + """跨午夜归属:同一份计划里的两个「深夜」分属两个日程日。""" + + def test_early_morning_belongs_to_previous_night(self): + self.assertEqual(window_for_plan_minutes("2026-07-27", 30), ("深夜", "2026-07-26")) + self.assertEqual(window_for_plan_minutes("2026-07-27", 5 * 60 + 59), ("深夜", "2026-07-26")) + + def test_late_evening_belongs_to_the_same_day(self): + self.assertEqual(window_for_plan_minutes("2026-07-27", 22 * 60), ("深夜", "2026-07-27")) + self.assertEqual(window_for_plan_minutes("2026-07-27", 23 * 60), ("深夜", "2026-07-27")) + + def test_two_late_nights_in_one_plan_are_distinguishable(self): + """时间轴上 00:30 与 23:00 都叫「深夜」,必须靠窗口日期分开。""" + early = window_for_plan_minutes("2026-07-27", 30) + late = window_for_plan_minutes("2026-07-27", 23 * 60) + self.assertEqual(early[0], late[0]) + self.assertNotEqual(early[1], late[1]) + + def test_daytime_windows_keep_the_plan_date(self): + for minutes, expected in ((7 * 60, "早晨"), (13 * 60, "下午"), (19 * 60, "晚上")): + with self.subTest(minutes=minutes): + self.assertEqual(window_for_plan_minutes("2026-07-27", minutes), (expected, "2026-07-27")) + + def test_wrapped_minutes_resolve_to_the_next_calendar_day(self): + """计划里时间回绕到次日时,_normalized_plan_item_starts 会加 +1440。""" + self.assertEqual(window_for_plan_minutes("2026-07-27", 24 * 60 + 30), ("深夜", "2026-07-27")) + self.assertEqual(window_for_plan_minutes("2026-07-27", 24 * 60 + 7 * 60), ("早晨", "2026-07-28")) + + def test_window_name_agrees_with_the_minutes_only_helper(self): + for minutes in range(0, 24 * 60, 17): + with self.subTest(minutes=minutes): + self.assertEqual(window_for_plan_minutes("2026-07-27", minutes)[0], window_for_minutes(minutes)) + + def test_invalid_input_returns_empty_pair(self): + self.assertEqual(window_for_plan_minutes("", 30), ("", "")) + self.assertEqual(window_for_plan_minutes("not-a-date", 30), ("", "")) + self.assertEqual(window_for_plan_minutes("2026-07-27", None), ("", ""))