@starwish-ai/xingyuan-dsh 0.5.3 → 0.5.4

package/CHANGELOG.md

@@ -5,6 +5,100 @@ All notable changes to this project are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.4] - 2026-08-28
+
+> **Note:** trailing chart statistics no longer count future pre-checked days (see
+> *Changed*). Chart cards generated by this version carry a "generated on" stamp so a
+> stale card is distinguishable from current data; cards written by earlier versions
+> replay unchanged, without the stamp.
+
+**Charts and records now tell the truth about time.** Future pre-checked days were
+counted by every trailing statistic as if they had already happened — a "how is this
+week going" chart could be inflated by check-ins for days that have not occurred, and a
+task's check-in grid could end up showing nothing but future days while today's check-in
+was invisible. Undoing a check-in said "revert today's?" while actually reverting a
+future pre-check, because the pages let the server fall back to "most recent record".
+
+### Added
+- **Chart snapshot stamp**: chart events carry `generatedAt` and the card renders a
+  localized "generated on" date; cards generated by older versions replay without it
+  (the field is optional and degrades honestly).
+- **"No schedule" ≠ 0%**: in the daily completion-rate trend, days with no scheduled
+  opportunity render as an empty slot labelled "no schedule" (tooltip and screen reader
+  alike) instead of a 0% data point.
+- The completion-rate chart annotates its subtitle with "including unclaimed tasks"
+  when pending tasks count toward the total, so the denominator is never a mystery.
+- **Startup consistency sweep** (`src/consistency-sweep.ts`): check-ins whose task no
+  longer exists, tasks whose wish was deleted out from under them, and dangling
+  micro-action states are cleaned once per launch through the same cascade the delete
+  tools use. Idempotent, runs after activation without blocking it, and pinned by
+  `test/integrity.test.ts`.
+- **Task-detail grid window**: the check-in grid shows the last 28 opportunity days up
+  to today, plus every checked day — future pre-checks stay visible (they are standing
+  commitments), and check-ins outside the opportunity series (deadline-free tasks) make
+  the grid their check-in history. Today is never squeezed out of the window, however
+  many future days are pre-checked; unchecked future days remain in the "upcoming"
+  preview line.
+- **gzip content negotiation** for the standalone pages (`/xingyuan/today`, `/calendar`,
+  `/growth`) per RFC 9110 §12.5.3: absent header accepts any coding, an empty value or
+  an explicit opt-out gets plaintext, `Vary: Accept-Encoding` is always sent, and the
+  compressed template is cached per body.
+- **Request timeout**: client fetches abort after 15 s with a localized message instead
+  of hanging forever.
+- **Focus refetch**: page data refetches when the window regains focus if older than
+  60 s, and always when the local day has changed — overnight sessions no longer show
+  yesterday's "today".
+- **Undo readability**: the detail panel's undo button announces the exact day it will
+  revert (screen-reader label), and its visibility no longer requires today to be the
+  checked day — a pre-check can be undone right where it was made.
+
+### Fixed
+- **The cancel dialog said "today" while a different day was reverted.** The today page
+  and the task detail panel posted the cancel without a date and the server falls back
+  to the most recent check-in — which a future pre-check satisfies. Every page now sends
+  the explicit date; the dialog, the toast and the reverted record all name the same day.
+- `weekComparison` folded future pre-checks into weekday buckets as if they were in the
+  current week; the week window is now a closed interval from last Monday to today.
+- Wish progress **rounded** instead of flooring: 249/250 displayed as 100% and could
+  archive the wish one day early.
+- Checking in an expired (closed) task failed with a generic error; it now explains that
+  the deadline must be extended to revive the task before further check-ins.
+- Concurrent writes to the global document (coach style, profile, category colors,
+  micro-action state) could lose updates under interleaving; all writers now serialize
+  through one promise chain, a failed writer no longer poisons the chain, and no-op
+  mutations skip the write entirely.
+- The memory page could deadlock with a perpetual "loading more" spinner when an
+  in-flight request was superseded by a newer one (the reset ran on only one of two
+  completion paths).
+- The calendar's post-action detail refetch swallowed failures; the panel now shows an
+  error state with a retry button instead of silently keeping stale content.
+- A deadline-free one-shot task disappeared from the today page the moment it was
+  checked; the completed row now stays revocable for the rest of the day (it never
+  reappears the next day).
+- `/xingyuan/api/day` and `/xingyuan/api/range` answered a malformed `date` with an
+  empty day list or an unlabelled `RangeError`; both now reject with a structured
+  `bad_date` error, consistent with the POST action surface.
+- Creating a task with a name over 100 characters through a page action failed with a
+  bare validation message; the error now states the limit and the actual length.
+- The claim button in the calendar is gated to the picked day being today, matching the
+  server-side anchor semantics.
+- Display dates across cards, toasts and pages are localized (ISO strings remain only in
+  confirm-dialog copy and screen-reader strings, per the documented convention).
+- The standalone growth page used `color-mix()`, which some shells render as an invalid
+  declaration; the darker tone is now precomputed in JS.
+
+### Changed
+- Trailing chart statistics (trend, daily rate, week comparison, by-category, ranking,
+  time-of-day, weekday activity) only count check-ins up to today; the calendar heatmap
+  deliberately keeps future pre-checks visible. Chart cards are snapshots of their
+  generation time — the coach guide tells the model to regenerate for current data.
+- `cancel_check_in_task` parameter guidance now instructs the model to pass the date
+  whenever the user names a day (including "today"), so the "most recent" fallback is a
+  deliberate choice rather than an accident.
+- zh copy no longer pads localized dates with spaces ("已撤销 8月29日 的打卡" →
+  "已撤销8月29日的打卡"), and the grid legend says "待打卡" where it previously said
+  "未来机会日" for what is now only ever today's pending slot.
+
 ## [0.5.3] - 2026-08-28
 
 > **Note:** this is a patch release but it carries one breaking change — the `xingyuan`

package/lib/client/api.js

@@ -40,8 +40,27 @@ export function describeError(e) {
 export async function postAction(path, body) {
     return postJson(`/xingyuan/api/action/${path}`, body);
 }
+/** 请求超时：手动 AbortController——AbortSignal.timeout 为 Baseline 2024 "Newly available"，
+ * 不满足 dsh 壳的保守浏览器矩阵（同 color-mix 禁令的判断口径），不用。 */
+const REQUEST_TIMEOUT_MS = 15_000;
+async function fetchWithTimeout(path, init) {
+    const controller = new AbortController();
+    const timer = window.setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+    try {
+        return await fetch(path, { ...init, signal: controller.signal });
+    }
+    catch (e) {
+        // 超时中止统一转本地化文案；真实网络错误原样抛出（保留连接拒绝等语义）
+        if (e instanceof DOMException && e.name === 'AbortError')
+            throw new Error(t('common.requestTimeout'));
+        throw e;
+    }
+    finally {
+        window.clearTimeout(timer);
+    }
+}
 export async function postJson(path, body) {
-    const response = await fetch(path, {
+    const response = await fetchWithTimeout(path, {
         method: 'POST',
         headers: { 'content-type': 'application/json' },
         body: JSON.stringify(body),
@@ -49,7 +68,7 @@ export async function postJson(path, body) {
     return parsePayload(response, () => t('common.actionFailed'));
 }
 export async function getJson(path) {
-    const response = await fetch(path, { headers: { accept: 'application/json' } });
+    const response = await fetchWithTimeout(path, { headers: { accept: 'application/json' } });
     return parsePayload(response, () => t('common.requestFailed'));
 }
 async function parsePayload(response, fallback) {

package/lib/client/cards.js

@@ -11,7 +11,7 @@ import { toast, toastError } from './ui.js';
 import { localYmd, softConfirm } from './hooks.js';
 import { useXyT, t, activeLocale } from './i18n.js';
 import { categoryVars } from '../category-color.js';
-import { cycleLabel, durationText, dateSuffix } from './pages/format.js';
+import { cycleLabel, durationText, dateSuffix, formatMediumDate, formatShortDate } from './pages/format.js';
 function WishView(props) {
     const t = useXyT();
     const wish = props.node.data.data;
@@ -95,7 +95,7 @@ function TaskView(props) {
     const showClaim = !deleted && phase === 'idle' && task.status === 'pending';
     const showCheckIn = !deleted && phase !== 'done' && (task.status === 'in_progress' || phase === 'claimed');
     const preview = event.opportunityPreview.length > 0
-        ? t('task.upcoming', { dates: event.opportunityPreview.join(activeLocale() === 'en' ? ', ' : '、') })
+        ? t('task.upcoming', { dates: event.opportunityPreview.map((date) => formatShortDate(date)).join(activeLocale() === 'en' ? ', ' : '、') })
         : undefined;
     return createElement('div', { className: `xy-card ${deleted ? 'xy-deleted' : ''}` }, createElement('div', { className: 'xy-card-head' }, createElement('span', { className: 'xy-badge xy-badge-task' }, t('badge.task')), createElement('span', { className: 'xy-title' }, deleted ? t('state.deleted', { title: task.name }) : task.name), !deleted && phase === 'done'
         ? createElement('span', { className: 'xy-meta xy-actioned' }, 
@@ -105,7 +105,7 @@ function TaskView(props) {
         ? createElement('button', { className: 'xy-btn xy-btn-inline', disabled: busy, onClick: () => run('claim') }, t('action.claim'))
         : null, showCheckIn
         ? createElement('button', { className: 'xy-btn xy-btn-primary xy-btn-inline', disabled: busy, onClick: () => run('checkin') }, t('action.checkin'))
-        : null), createElement('div', { className: 'xy-meta' }, `${cycleLabel(task.checkInCycle)}${task.dueDate !== undefined ? ` · ${t('task.due', { date: task.dueDate })}` : ''} · ${durationText(task.completedDays, task.requiredDays)}`), deleted === false && preview !== undefined
+        : null), createElement('div', { className: 'xy-meta' }, `${cycleLabel(task.checkInCycle)}${task.dueDate !== undefined ? ` · ${t('task.due', { date: formatShortDate(task.dueDate) })}` : ''} · ${durationText(task.completedDays, task.requiredDays)}`), deleted === false && preview !== undefined
         ? createElement('div', { className: 'xy-preview' }, preview)
         : null);
 }
@@ -139,23 +139,29 @@ function CheckinView(props) {
     const event = props.node.data.data;
     const cancelled = event.op === 'cancelled';
     return createElement('div', { className: 'xy-card xy-checkin' }, createElement('div', { className: 'xy-card-head' }, createElement('span', { className: `xy-glyph ${cancelled ? 'xy-glyph-back' : 'xy-glyph-ok'}`, 'aria-hidden': 'true' }, cancelled ? '↩' : '✓'), createElement('span', { className: 'xy-title' }, cancelled
-        ? t('checkin.cancelled', { task: event.taskName, date: event.date })
-        : t('checkin.success', { task: event.taskName }))), createElement('div', { className: 'xy-meta' }, `${event.date}${event.wishName !== undefined ? ` · ${event.wishName}` : ''} · ${durationText(event.completedDays, event.requiredDays)}`));
+        ? t('checkin.cancelled', { task: event.taskName, date: formatShortDate(event.date) })
+        : t('checkin.success', { task: event.taskName }))), createElement('div', { className: 'xy-meta' }, `${formatShortDate(event.date)}${event.wishName !== undefined ? ` · ${event.wishName}` : ''} · ${durationText(event.completedDays, event.requiredDays)}`));
 }
 function ChartView(props) {
     const t = useXyT();
     const event = props.node.data.data;
     // 悬停柱下标（与成长页悬浮明细同一交互语法；null = 未悬停）
     const [hoverIdx, setHoverIdx] = useState(null);
-    return createElement('div', { className: 'xy-card xy-chart' }, createElement('div', { className: 'xy-card-head' }, createElement('span', { className: 'xy-badge xy-badge-chart' }, t('badge.chart')), createElement('span', { className: 'xy-title' }, event.title), event.subtitle !== undefined ? createElement('span', { className: 'xy-meta' }, event.subtitle) : null), chartBody(event, t('chart.noData'), hoverIdx, setHoverIdx));
+    return createElement('div', { className: 'xy-card xy-chart' }, createElement('div', { className: 'xy-card-head' }, createElement('span', { className: 'xy-badge xy-badge-chart' }, t('badge.chart')), createElement('span', { className: 'xy-title' }, event.title), event.subtitle !== undefined ? createElement('span', { className: 'xy-meta' }, event.subtitle) : null), 
+    // 快照时点标注（事件溯源：卡片=当时的事实）：无 generatedAt 的旧事件诚实降级不显示。
+    // 中格式带年份——回放的旧卡可能跨年，「生成于 3月5日」须能定位到哪一年。
+    // ISO → 本地日再格式化：直接 slice 会把 UTC 日期当本地日（UTC+8 零点后 8 小时内差一天）
+    event.generatedAt !== undefined
+        ? createElement('div', { className: 'xy-meta' }, t('chart.generatedAt', { date: formatMediumDate(localYmd(new Date(event.generatedAt))) }))
+        : null, chartBody(event, t('chart.noData'), t('chart.noSchedule'), hoverIdx, setHoverIdx));
 }
 /** 图表卡主体：四类渲染路径（占比条/占比列表/热力格/柱图）颜色全部走主题变量，深浅色自适应。 */
-function chartBody(event, noDataText, hoverIdx, onHover) {
+function chartBody(event, noDataText, noScheduleText, hoverIdx, onHover) {
     const { chartType, data } = event;
     if (data.length === 0)
         return createElement('div', { className: 'xy-meta' }, noDataText);
-    const max = Math.max(...data.map((d) => d.value), 1);
-    const labelValue = (d) => `${d.label}${activeLocale() === 'en' ? ': ' : '：'}${d.value}`;
+    const max = Math.max(...data.filter((d) => !d.inactive).map((d) => d.value), 1);
+    const labelValue = (d) => `${d.label}${activeLocale() === 'en' ? ': ' : '：'}${d.inactive === true ? noScheduleText : d.value}`;
     if (chartType === 'arcbars') {
         const ratio = Math.min(Math.max(data[0].ratio ?? 0, 0), 1);
         return createElement('div', { className: 'xy-arcwrap' }, createElement('div', { className: 'xy-arcnum' }, `${Math.round(ratio * 100)}%`), 
@@ -187,19 +193,22 @@ function chartBody(event, noDataText, hoverIdx, onHover) {
         const r = Math.min(2, h, w / 2);
         return `M${x},${y + h}L${x},${y + r}Q${x},${y} ${x + r},${y}L${x + w - r},${y}Q${x + w},${y} ${x + w},${y + r}L${x + w},${y + h}Z`;
     };
-    const bars = data.map((d, i) => {
+    const bars = data.flatMap((d, i) => {
+        // 无安排日不画柱（缺失≠0）：空槽由下标占位保留，柱序与日期轴不塌缩
+        if (d.inactive === true)
+            return [];
         // 微值可见性下限：有值但按比例不足 2px 的柱给 2px，避免「有数据却看不见」
         const rawH = Math.round((d.value / max) * (height - 24));
         const h = d.value > 0 ? Math.max(rawH, 2) : rawH;
         const seriesIdx = d.series !== undefined ? seriesList.indexOf(d.series) : -1;
-        return createElement('path', {
-            key: i,
-            d: topRoundedBar(i * step + 2, height - 18 - h, Math.max(step - 4, 2), h),
-            style: { fill: seriesIdx > 0 ? seriesColor(seriesIdx) : 'var(--xyd-accent)', opacity: seriesIdx > 0 ? 0.55 : 0.85 },
-            onMouseEnter: () => onHover(i),
-        }, 
-        // 每根柱子带 <title>：原生悬停提示；精确数值另由上方悬浮明细条实时呈现
-        createElement('title', null, labelValue(d)));
+        return [createElement('path', {
+                key: i,
+                d: topRoundedBar(i * step + 2, height - 18 - h, Math.max(step - 4, 2), h),
+                style: { fill: seriesIdx > 0 ? seriesColor(seriesIdx) : 'var(--xyd-accent)', opacity: seriesIdx > 0 ? 0.55 : 0.85 },
+                onMouseEnter: () => onHover(i),
+            }, 
+            // 每根柱子带 <title>：原生悬停提示；精确数值另由上方悬浮明细条实时呈现
+            createElement('title', null, labelValue(d)))];
     });
     // 标签用原始下标定位：indexOf 会把重复标签（如分组系列的「周一」×2）全部钉到首个位置
     const labelStep = data.length <= 10 ? 1 : Math.ceil(data.length / 8);
@@ -221,7 +230,7 @@ function chartBody(event, noDataText, hoverIdx, onHover) {
     createElement('svg', {
         viewBox: `0 0 ${width} ${height}`, className: 'xy-svg',
         role: 'img', 'aria-label': event.title,
-    }, createElement('line', { x1: 0, y1: height - 18, x2: width, y2: height - 18, style: { stroke: 'var(--dsw-alias-border-l2)' } }), ...bars, ...labels)), createElement('span', { className: 'xy-visually-hidden' }, data.map((d) => `${d.label} ${d.value}`).join(activeLocale() === 'en' ? '; ' : '；')));
+    }, createElement('line', { x1: 0, y1: height - 18, x2: width, y2: height - 18, style: { stroke: 'var(--dsw-alias-border-l2)' } }), ...bars, ...labels)), createElement('span', { className: 'xy-visually-hidden' }, data.map((d) => `${d.label} ${d.inactive === true ? noScheduleText : d.value}`).join(activeLocale() === 'en' ? '; ' : '；')));
 }
 export const CARD_VIEWS = {
     WishView,

package/lib/client/hooks.js

@@ -18,10 +18,18 @@ export function recentRangeDays(days) {
         end: localYmd(now),
     };
 }
+/** 窗口重新可见后的重取门槛（ms）：等价 TanStack Query 的 staleTime——
+ * 数据在此年龄内视为新鲜，聚焦不重取；跨天翻篇则无视门槛一律重取。 */
+const FOCUS_REFETCH_MIN_AGE_MS = 60_000;
 /**
  * 取数三态统一：挂载（或 deps 变化）即拉取，error 存本地化文案，
  * reload 供错误态按钮与动作后刷新复用。path 支持函数形态（如日历按月取参）；
  * 内置序号守卫：快速翻页/连点时慢的旧响应不得覆盖新状态。
+ *
+ * 跨天/回焦自动新鲜化（习惯类应用的基本预期——凌晨挂着的今日页不能还是昨天）：
+ * 监听 visibilitychange/focus，翻篇（本地日期变化）必重取，未翻篇仅当数据年龄
+ * 超过门槛才重取（有节流上限，不空转不定时器）。NN/g「系统应始终让用户知情」：
+ * 时间流逝导致的状态变化要在回到页面时即刻呈现。
  */
 export function usePageData(path, deps = []) {
     const [data, setData] = useState(undefined);
@@ -29,9 +37,13 @@ export function usePageData(path, deps = []) {
     const seqRef = useRef(0);
     const pathRef = useRef(path);
     pathRef.current = path;
+    const lastLoadAtRef = useRef(0);
+    const lastLoadDayRef = useRef(undefined);
     const load = useCallback(() => {
         const seq = ++seqRef.current;
         setError(undefined);
+        lastLoadAtRef.current = Date.now();
+        lastLoadDayRef.current = localYmd(new Date());
         return getJson(typeof pathRef.current === 'function' ? pathRef.current() : pathRef.current)
             .then((payload) => { if (seq === seqRef.current)
             setData(payload); })
@@ -39,6 +51,23 @@ export function usePageData(path, deps = []) {
             setError(describeError(e)); });
     }, deps);
     useEffect(() => { void load(); }, [load]);
+    useEffect(() => {
+        const maybeReload = () => {
+            if (document.visibilityState !== 'visible')
+                return;
+            const today = localYmd(new Date());
+            // 翻篇必取；未翻篇按数据年龄节流（TanStack Query focus 重取的 staleTime 语义）
+            if (lastLoadDayRef.current !== today || Date.now() - lastLoadAtRef.current > FOCUS_REFETCH_MIN_AGE_MS) {
+                void load();
+            }
+        };
+        document.addEventListener('visibilitychange', maybeReload);
+        window.addEventListener('focus', maybeReload);
+        return () => {
+            document.removeEventListener('visibilitychange', maybeReload);
+            window.removeEventListener('focus', maybeReload);
+        };
+    }, [load]);
     return { data, error, reload: load };
 }
 /**

package/lib/client/i18n.js

@@ -41,6 +41,7 @@ const ZH_DICT = {
     'common.edit': '编辑',
     'common.requestFailed': '请求失败',
     'common.actionFailed': '操作失败',
+    'common.requestTimeout': '请求超时，请重试',
     'common.dayUnit': '{n} 天',
     'common.countUnit': '{n} 次',
     'common.countUnitOne': '{n} 次',
@@ -86,18 +87,18 @@ const ZH_DICT = {
     'action.checkinFuture': '提前打卡 {date}',
     'action.checkinThisDay': '打卡此日',
     'action.undoCheckin': '撤销',
-    'action.cancelCheckin': '取消打卡', 'action.expand': '展开详情',
+    'action.cancelCheckin': '取消打卡',
+    'action.cancelCheckinAria': '撤销{date}的打卡', 'action.expand': '展开详情',
     'action.collapse': '收起详情',
     'action.createWish': '＋ 新建愿望',
     'action.createTask': '＋ 新建任务',
     'action.manageCategories': '分类管理',
     'action.askAi': '让 AI 总结',
-    'today.notCheckinDay': '今天不是打卡日',
     // --- 动作反馈 toast ---
     'toast.claimed': '已领取「{name}」，去打卡吧',
     'toast.checkinOk': '打卡成功',
     'toast.undone': '打卡已撤销',
-    'toast.undoneAt': '已撤销 {date} 的打卡',
+    'toast.undoneAt': '已撤销{date}的打卡',
     'toast.wishCreated': '已创建愿望「{title}」',
     'toast.taskCreated': '已创建任务「{name}」',
     'toast.deleted': '已删除「{name}」',
@@ -106,10 +107,10 @@ const ZH_DICT = {
     'toast.categoryColorReset': '「{name}」配色已重置，跟随愿望默认色',
     'toast.categoryDeleted': '已清除「{name}」的自定义颜色',
     // --- 确认弹窗 ---
-    'confirm.futureCheckin': '「{name}」今天不是打卡日，提前打卡 {date} 表示承诺当天完成。确认？',
+    'confirm.futureCheckin': '「{name}」今天不是打卡日，提前打卡{date}表示承诺当天完成。确认？',
     'confirm.undoToday': '确定撤销「{name}」今天的打卡吗？进度将回退。',
-    'confirm.undoAt': '确定撤销「{name}」在 {date} 的打卡吗？进度将回退。',
-    'confirm.futureAt': '「{name}」在 {date} 不是当天，提前打卡表示承诺当天完成。确认？',
+    'confirm.undoAt': '确定撤销「{name}」在{date}的打卡吗？进度将回退。',
+    'confirm.futureAt': '「{name}」{date}不是打卡日，提前打卡表示承诺当天完成。确认？',
     'confirm.deleteTask': '确定删除任务「{name}」吗？其打卡记录将一并删除，不可恢复。',
     'confirm.deleteWish': '确定删除愿望「{name}」吗？下属任务与打卡记录将一并删除，不可恢复。',
     'confirm.renameCategory': '把分类「{old}」下的全部愿望改名为「{new}」吗？（共 {count} 个）', 'confirm.deleteEmptyCategory': '删除空分类「{name}」的自定义颜色吗？',
@@ -257,18 +258,20 @@ const ZH_DICT = {
     'micro.progress': '进度 {done}/{total} 完成',
     // --- 打卡卡 ---
     'checkin.success': '「{task}」打卡成功',
-    'checkin.cancelled': '已取消「{task}」{date} 的打卡',
+    'checkin.cancelled': '已取消「{task}」{date}的打卡',
     // --- 图表卡 ---
     'chart.noData': '暂无数据',
+    'chart.noSchedule': '无安排',
+    'chart.generatedAt': '生成于 {date}',
     // --- 详情聚合视图 ---
     'detail.grid.title': '打卡记录',
-    'detail.grid.summary': '近 {total} 个机会日：已打 {checked}，未打 {missed}，未来 {future}',
+    'detail.grid.summary': '近 {total} 格：已打 {checked}，未打 {missed}，待打卡 {future}',
     'detail.legend.checked': '已打卡',
     'detail.legend.missed': '未打卡',
-    'detail.legend.future': '未来机会日',
+    'detail.legend.future': '待打卡',
     'detail.grid.checked': '{date} 已打卡',
     'detail.grid.missed': '{date} 未打卡',
-    'detail.grid.future': '{date} 未来机会日',
+    'detail.grid.future': '{date} 待打卡',
     'detail.next.title': '接下来的机会日：{dates}',
     'detail.micro.title': '微行动进度',
     'detail.micro.idle': '尚未开始微行动拆解（可在对话里说「帮我拆解」）。',
@@ -359,6 +362,7 @@ const EN_DICT = {
     'common.edit': 'Edit',
     'common.requestFailed': 'Request failed',
     'common.actionFailed': 'Action failed',
+    'common.requestTimeout': 'Request timed out, please retry',
     'common.dayUnit': '{n} days',
     'common.countUnit': '{n} times',
     'common.countUnitOne': '{n} time',
@@ -401,13 +405,13 @@ const EN_DICT = {
     'action.checkinThisDay': 'Check in',
     'action.undoCheckin': 'Undo',
     'action.cancelCheckin': 'Undo check-in',
+    'action.cancelCheckinAria': 'Undo the check-in on {date}',
     'action.expand': 'Details',
     'action.collapse': 'Hide',
     'action.createWish': '+ New wish',
     'action.createTask': '+ New task',
     'action.manageCategories': 'Categories',
     'action.askAi': 'AI summary',
-    'today.notCheckinDay': 'Not a check-in day today',
     'toast.claimed': 'Claimed “{name}”. Time to check in!',
     'toast.checkinOk': 'Checked in',
     'toast.undone': 'Check-in reverted',
@@ -566,14 +570,16 @@ const EN_DICT = {
     'checkin.success': '“{task}” checked in',
     'checkin.cancelled': 'Cancelled the check-in of “{task}” on {date}',
     'chart.noData': 'No data yet',
+    'chart.noSchedule': 'Not scheduled',
+    'chart.generatedAt': 'Generated on {date}',
     'detail.grid.title': 'Check-in record',
-    'detail.grid.summary': 'Last {total} opportunity days: {checked} checked, {missed} missed, {future} upcoming',
+    'detail.grid.summary': 'Last {total} cells: {checked} checked, {missed} missed, {future} pending',
     'detail.legend.checked': 'Checked in',
     'detail.legend.missed': 'Missed',
-    'detail.legend.future': 'Upcoming',
+    'detail.legend.future': 'Pending today',
     'detail.grid.checked': '{date} checked in',
     'detail.grid.missed': '{date} missed',
-    'detail.grid.future': '{date} upcoming opportunity',
+    'detail.grid.future': '{date} pending check-in',
     'detail.next.title': 'Upcoming opportunity dates: {dates}',
     'detail.micro.title': 'Micro-step progress',
     'detail.micro.idle': 'No micro-step plan yet (ask “help me break it down” in chat).',

package/lib/client/pages/calendar.js

@@ -4,7 +4,7 @@ import { getJson, postAction } from '../api.js';
 import { t } from '../i18n.js';
 import { softConfirm, useActionGuard, usePageData, useStableScrollbar, localYmd } from '../hooks.js';
 import { PageError, PageSkeleton, toast } from '../ui.js';
-import { cycleLabel, dateSuffix, formatFriendlyDate, formatMonth } from './format.js';
+import { cycleLabel, dateSuffix, formatFriendlyDate, formatMonth, formatShortDate } from './format.js';
 function monthOf(offset) {
     const base = new Date();
     base.setDate(1);
@@ -66,7 +66,7 @@ export function CalendarPage() {
                     ? t('toast.claimed', { name: taskName })
                     : action === 'checkin'
                         ? t('toast.checkinOk') + dateSuffix(date)
-                        : t('toast.undoneAt', { date }), 'ok');
+                        : t('toast.undoneAt', { date: formatShortDate(date) }), 'ok');
                 // busy 窗口覆盖月历重取；之后仅当操作日仍是当前选中日才回填详情——
                 // 动作与快速连点另一日期竞争时，慢的旧响应不得覆盖新选中日的面板
                 return page.reload().then(() => {
@@ -77,7 +77,10 @@ export function CalendarPage() {
                         .then((dayAfter) => { if (seq === pickSeqRef.current) {
                         setDetail(dayAfter);
                         setPickState('idle');
-                    } });
+                    } })
+                        // 动作已成功、仅详情回取失败：转面板错误态（重试即重新拾取），不静默吞掉也不误报动作失败
+                        .catch(() => { if (seq === pickSeqRef.current)
+                        setPickState('error'); });
                 });
             }));
         };
@@ -202,7 +205,10 @@ export function CalendarPage() {
                             ...(task.wishName !== undefined ? [task.wishName] : []),
                             ...(stateText !== '' ? [stateText] : []),
                         ];
-                        return createElement('li', { key: task.taskId, className: 'xy-grouprow' }, createElement('div', { className: 'xy-rowmain' }, createElement('span', { className: 'xy-rowtitle' }, task.name), createElement('span', { className: 'xy-meta' }, segments.join(' · '))), task.status === 'pending' && !task.checked
+                        return createElement('li', { key: task.taskId, className: 'xy-grouprow' }, createElement('div', { className: 'xy-rowmain' }, createElement('span', { className: 'xy-rowtitle' }, task.name), createElement('span', { className: 'xy-meta' }, segments.join(' · '))), 
+                        // 领取仅限今日：claim 无日期语义，claimDate 恒为领取当天——
+                        // 过去/未来选中日的「领取」按钮会造出锚点与所见不符的任务
+                        task.status === 'pending' && !task.checked && detail.date === data.today
                             ? createElement('button', { className: 'xy-btn', disabled: busy, onClick: () => act('claim', task.taskId, task.name, detail.date) }, t('action.claim'))
                             : !task.checked && task.status === 'in_progress'
                                 ? createElement('button', { className: 'xy-btn xy-btn-primary', disabled: busy || !task.canCheckIn, onClick: () => act('checkin', task.taskId, task.name, detail.date) }, t('action.checkinThisDay'))

package/lib/client/pages/detail.js

@@ -1,6 +1,6 @@
 /**
- * 任务详情聚合视图：行内展开——打卡记录网格（近段机会日 checked/missed/future）、
- * 接下来机会日、微行动进度、状态机操作栏（领取/打卡/取消今日/删除）与「让 AI 总结」降级入口。
+ * 任务详情聚合视图：行内展开——打卡记录网格（截至今天的机会日末段 + 预勾）、
+ * 接下来机会日、微行动进度、状态机操作栏（领取/打卡/取消打卡/删除）与「让 AI 总结」降级入口。
  * 数据经 GET /xingyuan/api/task-detail；动作直连 POST（用户点击即本人授权），动作后原位刷新
  * 详情并回调上层列表刷新。
  */
@@ -9,7 +9,7 @@ import { getJson, postAction } from '../api.js';
 import { useXyT, t as translate, activeLocale } from '../i18n.js';
 import { localYmd, softConfirm, softConfirmDanger, useActionGuard } from '../hooks.js';
 import { toast } from '../ui.js';
-import { formatShortDate } from './format.js';
+import { dateSuffix, formatShortDate } from './format.js';
 /** 「让 AI 总结」提示词：触发者是人、产物直接可见，模板随界面语言切换（与 prompts.ts 总结分析模式同一结构诉求）。 */
 function summaryPrompt(taskName) {
     return activeLocale() === 'en'
@@ -41,6 +41,21 @@ function weekdayMon0(ymd) {
     const date = new Date(Number(ymd.slice(0, 4)), Number(ymd.slice(5, 7)) - 1, Number(ymd.slice(8)), 12);
     return Number.isNaN(date.getTime()) ? 0 : (date.getDay() + 6) % 7;
 }
+/**
+ * 撤销目标=网格内最近一条打卡（含未来预勾）。必须由客户端解析出具体日期并随请求显式携带：
+ * 服务端「不传日期=撤最近一次」的隐式口径下，弹框文案无法与实际撤销对象同源
+ * （今天已打卡 + 未来预勾并存时，弹框说撤今天、实际撤掉的是预勾日）。
+ */
+export function latestCheckedDate(grid) {
+    let latest;
+    for (const cell of grid) {
+        if (cell.state !== 'checked')
+            continue;
+        if (latest === undefined || cell.date > latest)
+            latest = cell.date;
+    }
+    return latest;
+}
 /**
  * 任务详情面板：expanded 由调用方持有（TaskLine trailing 放 DetailToggle）。
  * today 缺省取本地日期；onChanged 在任何写动作成功后回调（供列表 reload，
@@ -87,12 +102,14 @@ export function TaskDetailPanel(props) {
         return null;
     const today = props.today ?? localYmd(new Date());
     const task = detail.task;
-    const checkedToday = detail.grid.some((cell) => cell.date === today && cell.state === 'checked');
+    // 撤销目标=最近一条打卡（含预勾）；只要有打卡记录撤销入口就可达（预勾也能在详情页撤销）
+    const undoTarget = latestCheckedDate(detail.grid);
     // 网格可访问性：28 格逐格播报是读屏灾难——格子 aria-hidden，整体以一条
     // 汇总 aria-label 暴露（role=img），逐日细节保留 title 供鼠标悬停。
     // 视觉按周对齐（周一始，GitHub/Streaks 惯例）：首行前置隐形占位，今日格加 accent 环，
     // 连续坚持一眼可读；换月错位不再出现流式换行的参差断行。
-    const recent = detail.grid.slice(-28);
+    // 服务端窗口恒 ≤28（GRID_DATES_LIMIT，§5.10 口径）——此处不再重复截尾，避免双份常量漂移
+    const recent = detail.grid;
     const gridCells = [
         ...Array.from({ length: recent.length > 0 ? weekdayMon0(recent[0].date) : 0 }, (_, i) => createElement('span', { key: `pad-${i}`, className: 'xy-dcell xy-dcell-blank', 'aria-hidden': 'true' })),
         ...recent.map((cell) => {
@@ -150,7 +167,9 @@ export function TaskDetailPanel(props) {
             key: 'checkin', className: 'xy-btn xy-btn-primary', disabled: busy,
             onClick: () => {
                 const future = task.nextOpportunityDate !== undefined && task.nextOpportunityDate > today ? task.nextOpportunityDate : undefined;
-                const submit = () => act('checkin', { taskId: task.taskId }, () => translate('toast.checkinOk'));
+                const submit = () => act('checkin', { taskId: task.taskId }, () => 
+                // 与今日页/日历/任务行同口径：toast 带实际勾选日期（预勾时不是今天）
+                translate('toast.checkinOk') + dateSuffix(future ?? today));
                 if (future === undefined) {
                     submit();
                     return;
@@ -160,13 +179,20 @@ export function TaskDetailPanel(props) {
             },
         }, t('action.checkin')));
     }
-    if (checkedToday) {
+    if (undoTarget !== undefined) {
         ops.push(createElement('button', {
             key: 'cancel', className: 'xy-btn', disabled: busy,
+            // 读屏标签携带目标日期：不开确认弹窗即知将撤销哪一天（含预勾场景）
+            'aria-label': t('action.cancelCheckinAria', { date: formatShortDate(undoTarget) }),
             onClick: () => {
-                void softConfirm(translate('confirm.undoToday', { name: task.name })).then((ok) => {
-                    if (ok)
-                        act('cancel-checkin', { taskId: task.taskId }, () => translate('toast.undoneAt', { date: today }));
+                // 日期显式随请求携带，弹框/toast 与实际撤销对象同源；确认文案保留 ISO（§5.10 口径）
+                const message = undoTarget === today
+                    ? translate('confirm.undoToday', { name: task.name })
+                    : translate('confirm.undoAt', { name: task.name, date: undoTarget });
+                void softConfirm(message).then((ok) => {
+                    if (ok) {
+                        act('cancel-checkin', { taskId: task.taskId, date: undoTarget }, () => translate('toast.undoneAt', { date: formatShortDate(undoTarget) }));
+                    }
                 });
             },
         }, t('action.cancelCheckin')));

package/lib/client/pages/format.js

@@ -39,9 +39,10 @@ export function englishPlural(n) {
 export function countKey(n, oneKey, manyKey) {
     return englishPlural(n) ? manyKey : oneKey;
 }
-/** 打卡日期后缀（toast/完成态用）：zh 全角括号 / en 半角括号，由词典统一口径。 */
+/** 打卡日期后缀（toast/完成态用）：入参 ISO，内部本地化为短日期（§5.10 界面禁裸奔 ISO）；
+ * zh 全角括号 / en 半角括号由词典统一口径。 */
 export function dateSuffix(date) {
-    return date !== undefined && date !== '' ? t('common.dateSuffix', { date }) : '';
+    return date !== undefined && date !== '' ? t('common.dateSuffix', { date: formatShortDate(date) }) : '';
 }
 /** 紧凑按钮内的本地化短日期：'2026-03-05' → 「3月5日」/「Mar 5」（解析失败原样回显）。 */
 export function formatShortDate(ymd) {

package/lib/client/pages/memory.js

@@ -55,6 +55,9 @@ export function MemoryPage() {
     const moreSeqRef = useRef(0);
     useEffect(() => {
         moreSeqRef.current += 1;
+        // 使在途加载失效的同时必须复位按钮态：否则在途请求的 finally 因 seq 失配
+        // 跳过复位，loadingMore 永挂 true——「加载更多」自此点不动（P0 级交互死锁）
+        setLoadingMore(false);
         setMore([]);
         setLoadError(undefined);
     }, [debounced]);
@@ -78,6 +81,8 @@ export function MemoryPage() {
     /** 写操作后的全量刷新：追加页必须丢弃（offset 语义已失效），回到首屏。 */
     const refreshAll = () => {
         moreSeqRef.current += 1;
+        // 同 useEffect 的失效点：在途加载被弃时按钮态就地复位（防死锁）
+        setLoadingMore(false);
         setMore([]);
         setLoadError(undefined);
         void page.reload();

package/lib/client/pages/today.js

@@ -5,7 +5,7 @@ import { toast } from '../ui.js';
 import { useXyT } from '../i18n.js';
 import { softConfirm, useActionGuard, usePageData, useStableScrollbar, localYmd } from '../hooks.js';
 import { PageEmpty, PageError, PageSkeleton } from '../ui.js';
-import { cycleLabel, dateSuffix, formatFriendlyDate } from './format.js';
+import { cycleLabel, dateSuffix, formatFriendlyDate, formatShortDate } from './format.js';
 import { todayHintStore } from '../tab-hint.js';
 export function TodayPage() {
     const t = useXyT();
@@ -40,8 +40,9 @@ export function TodayPage() {
     const rows = [...openItems, ...pendingItems].map((task) => createElement('li', { key: task.taskId, className: 'xy-grouprow' }, createElement('div', { className: 'xy-rowmain' }, createElement('span', { className: 'xy-rowtitle' }, task.name), createElement('span', { className: 'xy-meta' }, `${cycleLabel(task.cycle)}${task.wishName !== undefined ? ` · ${task.wishName}` : ''}${task.hint !== undefined ? ` · ${task.hint}` : ''}`)), task.status === 'in_progress'
         ? createElement('button', {
             className: 'xy-btn xy-btn-primary',
+            // planForDay 保证展示行必为未打卡的进行中任务，canCheckIn 恒 true——
+            // 不再有「disabled 但无解释」的死分支；disabled 仅服务动作在途的 busy 窗口
             disabled: busy || !task.canCheckIn,
-            title: task.canCheckIn ? undefined : t('today.notCheckinDay'),
             onClick: () => act('checkin', { taskId: task.taskId }, (p) => t('toast.checkinOk') + dateSuffix(typeof p.date === 'string' ? String(p.date) : undefined)),
         }, t('action.checkin'))
         : createElement('button', {
@@ -54,8 +55,10 @@ export function TodayPage() {
             void softConfirm(t('confirm.undoToday', { name: task.name })).then((ok) => {
                 if (!ok)
                     return;
-                act('cancel-checkin', { taskId: task.taskId }, (p) => typeof p.date === 'string'
-                    ? t('toast.undoneAt', { date: String(p.date) })
+                // 完成区行=今天的打卡：日期必须显式携带——服务端「不传日期=撤最近一次」
+                // 会误撤未来预勾（弹框却说撤今天）
+                act('cancel-checkin', { taskId: task.taskId, date: data.today }, (p) => typeof p.date === 'string'
+                    ? t('toast.undoneAt', { date: formatShortDate(String(p.date)) })
                     : t('toast.undone'));
             });
         } }, t('action.undoCheckin'))));