@starwish-ai/xingyuan-dsh 0.5.6 → 0.5.8

package/CHANGELOG.md

@@ -5,6 +5,164 @@ 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.8] - 2026-09-04
+
+> **Note:** this release is the fourth six-perspective quality pass. It finishes
+> the promised-vs-planned caliber split across every surface: the Today tab and
+> the calendar day panel now show only claimed obligations (the unclaimed pool
+> lives on the Tasks tab and in chat), the growth 30-day range chart no longer
+> counts unclaimed tasks as failure gaps, and every surface labels expired
+> tasks honestly instead of mislabeling them as unclaimed. No data format
+> changes; existing databases and recorded sessions replay as before.
+
+### Changed
+- **Today tab shows claimed obligations only** (user decision): the unclaimed
+  candidate group and its claim buttons were removed from the Today tab; the
+  claim entry point now lives on the Tasks tab's unclaimed group and in chat
+  (the opening overview and `get_today_unchecked_tasks` still list them
+  separately, with the "never claim on the model's own" constraint). The
+  standalone `/xingyuan/today` page follows the same rule.
+- **Calendar day panel shows claimed tasks on every date** (user decision):
+  previously only non-today panels filtered out unclaimed rows; today's panel
+  kept them with a claim button. The panel is now claimed-only for today as
+  well. Expired tasks still appear on their deadline day as honest "expired"
+  failure records (not checkable; revived via the task detail panel), matching
+  the chat tool labeling.
+- **Growth 30-day range chart counts only claimed tasks**: unclaimed
+  opportunity days no longer render as failure gaps (same caliber as the month
+  calendar and the Today progress). The underlying plan API for future-schedule
+  tools keeps the planned caliber and labels unclaimed counts explicitly.
+- **Honest completion ratio on the Today page**: the progress now floors —
+  249/250 displays 99% instead of 100% without the "all done" banner (same
+  rule as wish progress).
+- **Wish progress keeps its plan-caliber denominator, now labeled**: wish cards
+  and the wish-progress chart subtitle append "includes unclaimed tasks"
+  whenever any shown wish has unclaimed tasks; the future-arrangement query
+  tools split their counts into "to check in N, unclaimed M".
+- **Expired tasks are labeled "expired" on every surface**: the chat date query
+  and the standalone calendar detail previously mislabeled them "unclaimed";
+  the React calendar panel now renders the state word as well.
+- **Single-source claimed predicate**: all host-side filtering goes through
+  `store.ts` `isClaimed` (charts included), the day API exposes the `claimed`
+  boolean for the client, and the client no longer duplicates status predicates
+  on the day surface.
+
+### Added
+- Route-level test locks for the promised-caliber semantics: overview totals,
+  month-calendar cells, day rows, the growth range (unclaimed ≠ failure gap),
+  and expired-task retention on the schedule surface.
+
+## [0.5.7] - 2026-08-29
+
+> **Note:** this release is the third six-perspective quality pass (product,
+> design, end-user, dsh-plugin engineering, architecture, UX). It closes the
+> last honesty gap in the write paths, makes tab switching lossless for
+> in-progress input, hardens the opportunity-date calculator against a
+> process-hanging edge case, and lands the accessibility/contrast leftovers.
+> No data format changes; existing databases and recorded sessions replay as before.
+
+### Added
+- **Draft snapshots across tab switches**: typing a memory (up to 1000 chars)
+  or filling the quick-create forms used to be silently lost when switching
+  conversation view tabs (pages unmount on switch). Form drafts now survive tab
+  switches and panel collapse; successful saves clear them.
+- **Instant growth feedback on check-in**: the check-in tool reply appends the
+  current level and experience progress, closing the "check in → grow" loop at
+  the moment of the action instead of deferring it to the Growth page.
+- **Non-preset session hint on the chat-directed pages**: in "always show" mode the six tabs
+  render in every session, but wishes/tasks/memory empty states directed users
+  to a chat that has no XingYuan tools there. The Today page's "preset not
+  enabled" hint row now also renders on the other three pages.
+- **HTTP shell tests**: route dispatch (status-code mapping, the 64 KB limit,
+  JSON parsing, the `ToolError.code` passthrough that powers client-side error
+  localization) had zero coverage; locked with mocked `IncomingMessage`/
+  `ServerResponse` in `test/routes-shell.test.ts`.
+
+### Changed
+- **Claiming an overdue unclaimed task is rejected, not silently closed**
+  (`claim_expired`): the old flow claimed it and immediately expired-closed it
+  while the tool reply asserted "claimed, now in progress" and the page toast
+  said "go check in" — both false, and the task-line button kept offering an
+  action that always fails. The row shows a guidance hint instead, the chat
+  task card hides its claim button for the same state, and the detail panel's
+  revive row (extend due date) now also covers overdue-unclaimed tasks.
+- **The early check-in confirms no longer assert a falsehood**: the task-row,
+  card and detail dialogs said "today is not a check-in day" — false when today
+  was already checked in (the natural path: check in via chat, then tap the
+  button on the updated card); the calendar dialog said "{date} is not a
+  check-in day" for a day the panel only lists because it IS one. All four now
+  state only what is true: the target day is after today, and an early check-in
+  commits to finishing that day.
+- **Growth-ladder and completed rows dim by text color, not row opacity**:
+  whole-row `opacity` (0.65-0.78) blended 12 px text below the WCAG AA 4.5:1
+  line (≈2.6-3.1:1 measured in both themes); the hierarchy now comes from the
+  secondary text color (4.76/5.15:1) while transparency stays on decorative
+  elements only.
+- **Danger icon buttons share one quiet tier**: the memory-row delete joined
+  the wish-card delete at 0.78 idle opacity with hover/focus restore (long
+  lists stop glowing red; non-text contrast ≥3:1, the stale "≥4.5:1" comment
+  corrected to the non-text standard).
+- **Growth chart stops squeezing its columns on narrow panels**: below the
+  520 px breakpoint the 30 daily columns scroll horizontally at a minimum
+  width (~13 px per column, up from ~10 px) instead of being flex-crushed;
+  a deliberate trade-off against the 24 px touch-target ideal, whose full
+  width would make the chart scroll several screens.
+- **HITL confirm sorts callers by whether any confirm UI exists**: callers
+  with no confirm UI at all (`NO_PROVIDER`, `CALLER_NOT_LIVE` — both raised
+  before `NO_PROVIDER` in rc.2) are allowed, as before for headless; a
+  delegated caller (`DELEGATED_CALLER`, e.g. a session-spawned subagent) is
+  now failed closed with actionable guidance ("confirm in the main
+  conversation, then run it there") instead of the raw platform error —
+  keeping the always-on delete confirmation intact on delegated paths.
+  Recorded in the engineering doc's HITL contract section.
+- **weekly/monthly expectation management**: tool descriptions and the task
+  guide now state that opportunity days run from the claim date (every 7 days /
+  monthly by claim date) and never bind to a weekday — the model must say so
+  instead of silently accepting "every Wednesday" requests. Recorded in Known
+  Limitations.
+- **The recommendation tool states its ordering**: `get_recommended_tasks` is
+  a fixed "top 5 by historical check-in count" ranking, not curation;
+  description and reply now say so.
+- **Dedup guidance covers paraphrase**: the wish/task guides instruct the model
+  to sweep the existing list semantically when substring dedup finds no hit but
+  the request is loosely phrased.
+- **Prompt/UI drift sync**: the Tasks page has four status groups (not three)
+  and two more settings entries (confirm-card language, tab visibility) — the
+  capabilities section now matches what users see.
+- **Copy/wording**: user-facing strings unify "机会日" to "打卡日" (the check-in
+  tool guidance already used the plain term; leftover error strings swept
+  too); the bare-wish card points to the
+  chat path for task suggestions; the task-created toast explains "claim it to
+  start checking in"; five English strings polished ("To check in", "entries",
+  "Check-ins · last 30 days", "saved when you leave the field", the grid
+  summary).
+
+### Fixed
+- **Opportunity-date loops can no longer hang the process**: termination used
+  ISO string comparison, which silently assumes four-digit years — a sequence
+  crossing 9999-12-31 (only reachable via hand-edited sqlite) compared
+  `'10000-xx' <= '9999-xx'` as true forever, hanging daily/weekly/monthly in an
+  allocating loop. Termination is now numeric (UTC day numbers; the monthly
+  branch via `Date.UTC`, since `Date.parse('10000-…')` returns `NaN`). Locked
+  by termination tests including the year-boundary crossing.
+- **Toast glyph semantics & screen readers**: the info glyph was "★" — the star
+  is the high-importance memory marker (`.xy-star-hi`); info is now "i", and
+  toast glyphs are `aria-hidden` so decorative symbols are not announced inside
+  the live region.
+- **Centered header baselines**: the `.xy-meta` top margin leaked into centered
+  card/page heads, sinking secondary text by 2 px; the treatment the detail
+  area already had now covers the heads too.
+- **Focus management**: closing the category rename editor returns focus (to
+  the row's rename button, or the page title when the row was rebuilt by a
+  rename); finishing the last "load more" page moves focus to the "all shown"
+  line and announces it (`role="status"`).
+- **Docs**: reference links pointed at the nonexistent `main` branch of the
+  upstream repository (the default branch is `master`) and at a cookbook page
+  that does not exist (the conversation-node contract lives in
+  `subsystems/conversation`); a dsh upgrade checklist now records the two
+  patch-DSL hazards (schedule insert id collision, storage-domain whole-line
+  replacement).
+
 ## [0.5.6] - 2026-08-29
 
 > **Note:** this release is the follow-up to the v0.5.5 six-perspective quality

package/lib/client/api.js

@@ -22,6 +22,7 @@ const ERROR_KEY = {
     already_checked: 'err.already_checked',
     not_opportunity_day: 'err.not_opportunity_day',
     already_claimed: 'err.already_claimed',
+    claim_expired: 'err.claim_expired',
     task_closed: 'err.task_closed',
     due_past: 'err.due_past',
     due_too_far: 'err.due_too_far',
@@ -58,6 +59,15 @@ export function describeError(e) {
 export async function postAction(path, body) {
     return postJson(`/xingyuan/api/action/${path}`, body);
 }
+/** 当日数据 URL：今日页/日历页多条取数路径共用同一构造（§5.10 URL 纪律——
+ * 带 query 请求统一 URLSearchParams、同资源共用构造函数，防分隔符/编码口径漂移）。 */
+export function dayUrl(date) {
+    return `/xingyuan/api/day?${new URLSearchParams({ date }).toString()}`;
+}
+/** 月历数据 URL：日历页取数路径同规构造（月份参数由 URLSearchParams 编码）。 */
+export function calendarUrl(month) {
+    return `/xingyuan/api/calendar?${new URLSearchParams({ month }).toString()}`;
+}
 /** 请求超时：手动 AbortController——AbortSignal.timeout 为 Baseline 2024 "Newly available"，
  * 不满足 dsh 壳的保守浏览器矩阵（同 color-mix 禁令的判断口径），不用。 */
 const REQUEST_TIMEOUT_MS = 15_000;

package/lib/client/cards.js

@@ -93,7 +93,10 @@ function TaskView(props) {
         perform();
     };
     const deleted = event.op === 'deleted';
-    const showClaim = !deleted && phase === 'idle' && task.status === 'pending';
+    // 截止日已过的待领取任务写路径拒绝领取（store.claim_expired）：卡片按钮同口径隐藏，
+    // 避免点按必失败（卡片是快照，today 取渲染当时——与写路径校验同一新鲜口径）
+    const claimExpired = task.status === 'pending' && task.dueDate !== undefined && task.dueDate < localYmd(new Date());
+    const showClaim = !deleted && phase === 'idle' && task.status === 'pending' && !claimExpired;
     const showCheckIn = !deleted && phase !== 'done' && (task.status === 'in_progress' || phase === 'claimed');
     const preview = event.opportunityPreview.length > 0
         ? t('task.upcoming', { dates: event.opportunityPreview.map((date) => formatShortDate(date)).join(activeLocale() === 'en' ? ', ' : '、') })

package/lib/client/chart-labels.js

@@ -82,6 +82,7 @@ export const CHART_SUBTITLE_KEYS = {
     '按愿望 TopN': 'chart.subtitle.byWishTopN',
     '按实际打卡时刻分桶；过滤范围为打卡日区间': 'chart.subtitle.byHourBucket',
     '%（应打天数完成率）': 'chart.subtitle.progressPercent',
+    '%（应打天数完成率，含未领取任务）': 'chart.subtitle.progressPercentPending',
 };
 /**
  * 副标题本地化：固定短语查表；含数字的模板（近 N 天 / A/B 天 / 当前 A 天 / 最长 B 天 /

package/lib/client/i18n.js

@@ -58,8 +58,9 @@ export const ZH_DICT = {
     'state.done': '已完成',
     // --- 愿望卡 / 愿望页 ---
     'wish.progress': '进度 {percent}%',
+    'wish.progressHasPending': '含未领取任务',
     'wish.eta': '预计完成 {date}',
-    'wish.noTasks': '暂无下属任务',
+    'wish.noTasks': '暂无下属任务——在对话里告诉我，让我为它推荐打卡任务',
     'wish.pageTitle': '我的愿望',
     'wish.summary': '{active} 个进行中{achieved}', 'wish.achievedSuffix': ' · {n} 个已达成',
     'wish.sectionAchieved': '已达成',
@@ -78,6 +79,7 @@ export const ZH_DICT = {
     'task.group.pending': '待领取',
     'task.group.achieved': '已达成',
     'task.group.expired': '已过期',
+    'task.claimExpiredHint': '该任务截止日已过，无法领取——可展开详情延长截止日重新开始',
     'task.expiredHint': '截止日已过——在下方延长截止日即可重新开始，也可以在对话里让我处理。',
     'task.pageTitle': '全部任务',
     'task.totalCount': '共 {n} 个',
@@ -107,17 +109,17 @@ export const ZH_DICT = {
     'toast.undone': '打卡已撤销',
     'toast.undoneAt': '已撤销{date}的打卡',
     'toast.wishCreated': '已创建愿望「{title}」',
-    'toast.taskCreated': '已创建任务「{name}」',
+    'toast.taskCreated': '已创建任务「{name}」，领取后开始打卡',
     'toast.deleted': '已删除「{name}」',
     'toast.categoryRenamed': '分类已改名为「{name}」',
     'toast.categoryColored': '「{name}」配色已更新',
     '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.futureAt': '「{name}」的打卡日 {date} 在今天之后，提前打卡表示承诺当天完成。确认？',
     'confirm.deleteTask': '确定删除任务「{name}」吗？其打卡记录与微行动拆解将一并删除，不可恢复。',
     'confirm.deleteWish': '确定删除愿望「{name}」吗？下属任务、打卡记录与微行动拆解将一并删除，不可恢复。',
     'confirm.renameCategory': '把分类「{old}」下的全部愿望改名为「{new}」吗？（共 {count} 个）', 'confirm.deleteEmptyCategory': '删除空分类「{name}」的自定义颜色吗？',
@@ -141,20 +143,19 @@ export const ZH_DICT = {
     'cal.backToMonth': '回到本月',
     'cal.prevMonth': '上个月',
     'cal.nextMonth': '下个月',
-    'cal.legend.c0': '无安排',
+    'cal.legend.c0': '无打卡安排',
     'cal.legend.c1': '待打卡',
     'cal.legend.c2': '部分完成',
     'cal.legend.c3': '全部完成',
-    'cal.cellAria.none': '{date}，无安排',
+    'cal.cellAria.none': '{date}，无打卡安排',
     'cal.cellAria.some': '{date}，已完成 {checked}/{due}',
-    'cal.cellTitle.none': '{date}，无安排',
+    'cal.cellTitle.none': '{date}，无打卡安排',
     'cal.cellTitle.some': '{date}，打卡 {checked}/{due}',
     'cal.panelHint': '点击日期查看当日任务，可直接补卡或取消打卡。',
     'cal.dayLoadFailed': '当日任务加载失败，请重试。',
     'cal.dayEmpty': '这一天没有任务安排。',
     'cal.state.checked': '✓ 已打卡',
     'cal.state.todo': '○ 待打卡',
-    'cal.state.unclaimed': '未领取',
     // --- 成长页 ---
     'growth.levelLabel': '当前等级',
     'growth.levelFallback': '初心者',
@@ -343,6 +344,7 @@ export const ZH_DICT = {
     'chart.subtitle.byWishTopN': '按愿望 TopN',
     'chart.subtitle.byHourBucket': '按实际打卡时刻分桶；过滤范围为打卡日区间',
     'chart.subtitle.progressPercent': '%（应打天数完成率）',
+    'chart.subtitle.progressPercentPending': '%（应打天数完成率，含未领取任务）',
     'chart.subtitle.lastDays': '近 {n} 天',
     'chart.subtitle.daysInclPending': '{done}/{due} 天（含未领取任务）',
     'chart.subtitle.daysRatio': '{done}/{due} 天',
@@ -356,7 +358,7 @@ export const ZH_DICT = {
     'detail.grid.checked': '{date} 已打卡',
     'detail.grid.missed': '{date} 未打卡',
     'detail.grid.future': '{date} 待打卡',
-    'detail.next.title': '接下来的机会日：{dates}',
+    'detail.next.title': '接下来的打卡日：{dates}',
     'detail.revive.label': '延长截止日（重新开始）',
     'detail.revive.action': '延长并重新开始',
     'detail.revive.done': '截止日已延长，任务重新开始',
@@ -425,8 +427,9 @@ export const ZH_DICT = {
     'err.missing_field': '缺少必填字段：{field}',
     'err.not_found': '目标不存在或已被删除',
     'err.already_checked': '该日期已打卡；如需修改，请先撤销当日打卡',
-    'err.not_opportunity_day': '该日期不是机会日；可在日历页选择最近的机会日',
+    'err.not_opportunity_day': '该日期不是打卡日；可在日历页选择最近的打卡日',
     'err.already_claimed': '该任务已领取过',
+    'err.claim_expired': '该任务截止日已过，无法领取——请先延长截止日使任务重新开始',
     'err.task_closed': '任务已完结，无法再打卡',
     'err.due_past': '截止日期不能早于今天',
     'err.due_too_far': '截止日期不能超过今天起 10 年',
@@ -435,7 +438,7 @@ export const ZH_DICT = {
     'err.bad_date': '日期格式或取值不合法（yyyy-MM-dd，且不得早于今天）',
     'err.overwrite_required': '已存在同名记录，需确认覆盖',
     'err.not_claimed': '任务尚未领取，请先领取',
-    'err.no_opportunity_left': '没有可勾选的打卡日：机会日已全部完成或截止',
+    'err.no_opportunity_left': '没有可勾选的打卡日：应打卡的日期已全部完成或截止',
     'err.no_checkins': '该任务暂无打卡记录',
     'err.title_too_long': '标题不能超过 50 字符',
     'err.name_too_long': '任务名不能超过 100 字符',
@@ -477,8 +480,9 @@ const EN_DICT = {
     'state.deleted': 'Deleted “{title}”',
     'state.done': 'Done',
     'wish.progress': 'Progress {percent}%',
+    'wish.progressHasPending': 'includes unclaimed tasks',
     'wish.eta': 'Target date {date}',
-    'wish.noTasks': 'No tasks yet',
+    'wish.noTasks': 'No tasks yet — tell me in chat and I will suggest check-in tasks for it',
     'wish.pageTitle': 'My Wishes',
     'wish.summary': '{active} in progress{achieved}',
     'wish.achievedSuffix': ' · {n} achieved',
@@ -497,6 +501,7 @@ const EN_DICT = {
     'task.group.pending': 'Unclaimed',
     'task.group.achieved': 'Achieved',
     'task.group.expired': 'Expired',
+    'task.claimExpiredHint': 'Past its due date and unclaimed — open the task detail to extend the due date and restart it',
     'task.expiredHint': 'The due date has passed — extend it below to restart the task, or just ask me in chat.',
     'task.pageTitle': 'All Tasks',
     'task.totalCount': '{n} in total',
@@ -524,16 +529,16 @@ const EN_DICT = {
     'toast.undone': 'Check-in reverted',
     'toast.undoneAt': 'Reverted the check-in on {date}',
     'toast.wishCreated': 'Wish “{title}” created',
-    'toast.taskCreated': 'Task “{name}” created',
+    'toast.taskCreated': 'Task “{name}” created — claim it to start checking in',
     'toast.deleted': '“{name}” deleted',
     'toast.categoryRenamed': 'Category renamed to “{name}”',
     'toast.categoryColored': 'Color updated for “{name}”',
     'toast.categoryColorReset': 'Color of “{name}” reset to follow wish colors',
     'toast.categoryDeleted': 'Custom color of “{name}” cleared',
-    'confirm.futureCheckin': '“{name}” is not due today. Checking in early for {date} means committing to finish it that day. Continue?',
+    'confirm.futureCheckin': 'The check-in day {date} for “{name}” is after today. Checking in early means committing to finish it that day. Continue?',
     'confirm.undoToday': "Undo today’s check-in for “{name}”? Progress will roll back.",
     'confirm.undoAt': 'Undo the check-in of “{name}” on {date}? Progress will roll back.',
-    'confirm.futureAt': '{date} is not the due day of “{name}”. Checking in early means committing to finish it that day. Continue?',
+    'confirm.futureAt': 'The check-in day {date} for “{name}” is after today. Checking in early means committing to finish it that day. Continue?',
     'confirm.deleteTask': 'Delete task “{name}”? Its check-ins and micro-step plan will be removed too. This cannot be undone.',
     'confirm.deleteWish': 'Delete wish “{name}”? Its tasks, check-ins and micro-step plans will be removed too. This cannot be undone.',
     'confirm.renameCategory': 'Rename category “{old}” to “{new}” everywhere? ({count} affected)',
@@ -556,20 +561,19 @@ const EN_DICT = {
     'cal.backToMonth': 'This month',
     'cal.prevMonth': 'Previous month',
     'cal.nextMonth': 'Next month',
-    'cal.legend.c0': 'Free',
+    'cal.legend.c0': 'No check-in planned',
     'cal.legend.c1': 'To check',
     'cal.legend.c2': 'Partial',
     'cal.legend.c3': 'Complete',
-    'cal.cellAria.none': '{date}, nothing scheduled',
+    'cal.cellAria.none': '{date}, no check-in planned',
     'cal.cellAria.some': '{date}, completed {checked}/{due}',
-    'cal.cellTitle.none': '{date}, nothing scheduled',
+    'cal.cellTitle.none': '{date}, no check-in planned',
     'cal.cellTitle.some': '{date}, checked {checked}/{due}',
     'cal.panelHint': 'Pick a date to see its tasks; make up or cancel check-ins inline.',
     'cal.dayLoadFailed': 'Failed to load tasks for this day. Please retry.',
     'cal.dayEmpty': 'Nothing scheduled on this day.',
     'cal.state.checked': '✓ Checked in',
     'cal.state.todo': '○ To check in',
-    'cal.state.unclaimed': 'Unclaimed',
     'growth.levelLabel': 'Current level',
     'growth.levelFallback': 'Beginner',
     'growth.maxed': 'Max level',
@@ -584,7 +588,7 @@ const EN_DICT = {
     'growth.stat.taskTotal': 'Tasks created',
     'growth.stat.taskDone': 'Tasks achieved',
     'growth.stat.none': 'None',
-    'growth.chart.title': 'Last 30 days',
+    'growth.chart.title': 'Check-ins · last 30 days',
     'growth.chart.empty': 'No data yet. Your trend chart grows after the first check-in.',
     'growth.chart.hint': 'Blue = checked in, striped = missed gap, green = full day. Hover or focus a bar for daily details.',
     'growth.chart.tooltip': '{date}: checked {checked}/{total}',
@@ -621,7 +625,7 @@ const EN_DICT = {
     'memory.importanceLabel': 'Importance: {level}',
     'memory.add': '+ Add',
     'memory.saveEdit': 'Save changes',
-    'memory.capNote': '{total} in total, showing the latest {shown}; narrow down with search.',
+    'memory.capNote': '{total} in total, showing the latest {shown} entries; narrow down with search.',
     'memory.more': 'Load more',
     'memory.loadedAll': 'All {n} shown',
     'memory.empty.title': 'No memories yet',
@@ -678,7 +682,7 @@ const EN_DICT = {
     'settings.pref.confirmWrites': 'Confirm write actions',
     'settings.pref.confirmWritesHint': 'Show an in-app confirmation before creating wishes/tasks, checking in or canceling (deletes always confirm). Turn off to execute directly.',
     'settings.pref.memoryLimit': 'Memory injection limit',
-    'settings.pref.memoryLimitHint': 'Max memories auto-injected per chat (5-200, default 40); saved on blur.',
+    'settings.pref.memoryLimitHint': 'Max memories auto-injected per chat (5-200, default 40); saved when you leave the field.',
     'settings.pref.limitInvalid': 'Enter an integer between 5 and 200',
     'settings.pref.writeFailed': 'The change did not save; please try again.',
     'settings.pref.confirmLang': 'Confirm card language',
@@ -748,15 +752,16 @@ const EN_DICT = {
     'chart.subtitle.byWishTopN': 'By wish (top N)',
     'chart.subtitle.byHourBucket': 'Bucketed by actual check-in time; filtered to the check-in date range',
     'chart.subtitle.progressPercent': '% of scheduled-day completion',
+    'chart.subtitle.progressPercentPending': '% of scheduled-day completion (incl. unclaimed)',
     'chart.subtitle.lastDays': 'Last {n} days',
     'chart.subtitle.daysInclPending': '{done}/{due} days (incl. unclaimed)',
     'chart.subtitle.daysRatio': '{done}/{due} days',
     'chart.subtitle.streak': 'Current {current}d / best {best}d',
     'detail.grid.title': 'Check-in record',
-    'detail.grid.summary': 'Last {total} cell(s): {checked} checked, {missed} missed, {future} pending',
+    'detail.grid.summary': 'Last {total} shown: {checked} checked, {missed} missed, {future} to check in',
     'detail.legend.checked': 'Checked in',
     'detail.legend.missed': 'Missed',
-    'detail.legend.future': 'Pending today',
+    'detail.legend.future': 'To check in',
     'detail.grid.checked': '{date} checked in',
     'detail.grid.missed': '{date} missed',
     'detail.grid.future': '{date} pending check-in',
@@ -824,8 +829,9 @@ const EN_DICT = {
     'err.missing_field': 'Missing required field: {field}',
     'err.not_found': 'Not found, or already deleted',
     'err.already_checked': 'Already checked in on this date — undo it first to change',
-    'err.not_opportunity_day': 'Not an opportunity day — pick the nearest one in the Calendar tab',
+    'err.not_opportunity_day': 'Not a check-in day — pick the nearest one in the Calendar tab',
     'err.already_claimed': 'Already claimed',
+    'err.claim_expired': 'This task is past its due date — extend the due date first to restart it',
     'err.task_closed': 'Task is closed and cannot be checked in',
     'err.due_past': 'Due date cannot be before today',
     'err.due_too_far': 'Due date cannot be more than 10 years ahead',
@@ -834,7 +840,7 @@ const EN_DICT = {
     'err.bad_date': 'Invalid date (yyyy-MM-dd, not before today)',
     'err.overwrite_required': 'Already exists; confirmation required to overwrite',
     'err.not_claimed': 'Task must be claimed first',
-    'err.no_opportunity_left': 'No check-in day left to tick — all opportunity days are done or past the deadline',
+    'err.no_opportunity_left': 'No check-in day left to tick — all scheduled days are done or past the deadline',
     'err.no_checkins': 'No check-in records for this task',
     'err.title_too_long': 'Title exceeds 50 characters',
     'err.name_too_long': 'Task name exceeds 100 characters',

package/lib/client/pages/calendar.js

@@ -1,6 +1,6 @@
 /** 日历页：月历（机会日语义着色）+ 日期详情面板（补卡/取消打卡）。 */
 import { createElement, useEffect, useRef, useState } from 'react';
-import { getJson, postAction } from '../api.js';
+import { calendarUrl, dayUrl, getJson, postAction } from '../api.js';
 import { t } from '../i18n.js';
 import { softConfirm, useActionGuard, usePageData, useScrollTopOnMount, useStableScrollbar, localYmd } from '../hooks.js';
 import { PageError, PageSkeleton, StaleBanner, toast } from '../ui.js';
@@ -22,7 +22,7 @@ export function CalendarPage() {
     const pickSeqRef = useRef(0);
     const stabilize = useStableScrollbar();
     const { busy, guard } = useActionGuard();
-    const page = usePageData(() => `/xingyuan/api/calendar?month=${monthOf(offset)}`, [offset]);
+    const page = usePageData(() => calendarUrl(monthOf(offset)), [offset]);
     const [detail, setDetail] = useState(undefined);
     const [pickedDate, setPickedDate] = useState(undefined);
     // 拾取三态：loading（面板骨架行）/ error（错误 + 重试）/ idle——交互闭环不静默吞错
@@ -34,18 +34,25 @@ export function CalendarPage() {
         // pickedDateRef 一并失效：动作完成链凭它决定是否回填详情，
         // 不清则「打卡在途时切月」会让旧月份详情复活到新月视图
         pickedDateRef.current = undefined;
+        // 翻月/回本月重置自动拾取许可：回到本月时允许再自动 pick 今天
+        autoPickRef.current = false;
         setDetail(undefined);
         setPickedDate(undefined);
         setPickState('idle');
     }, [offset]);
     // 动作后重取详情需要知道「当前选中日」；用 ref 避免 act 闭包读到过期 state
     const pickedDateRef = useRef(undefined);
-    const pick = (date) => {
+    // 自动拾取许可：首载/回本月置空后允许自动 pick 今天一次；任何 pick（含自动）置位。
+    // 守卫必须走 ref 而非 pickedDate state——清除 effect 的 setState 不回写闭包，
+    // 「点过历史日期后回本月」时旧闭包值会把自动拾取挡死（回归：面板滞留提示态）
+    const autoPickRef = useRef(false);
+    const pick = (date, scroll = true) => {
+        autoPickRef.current = true;
         pickedDateRef.current = date;
         setPickedDate(date);
         setPickState('loading');
         const seq = ++pickSeqRef.current;
-        getJson(`/xingyuan/api/day?date=${date}`)
+        getJson(dayUrl(date))
             .then((payload) => {
             if (seq !== pickSeqRef.current)
                 return;
@@ -55,11 +62,22 @@ export function CalendarPage() {
             .catch(() => { if (seq === pickSeqRef.current)
             setPickState('error'); });
         // 窄视口下详情面板可能落在折叠线下方：拾取后滚到面板近处，选中反馈不止是格子高亮
-        window.requestAnimationFrame(() => {
-            document.getElementById('xy-daypanel')?.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
-        });
+        if (scroll) {
+            window.requestAnimationFrame(() => {
+                document.getElementById('xy-daypanel')?.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
+            });
+        }
     };
     const data = page.data;
+    // 默认加载今天（口径决策）：首次进入/「回到本月」落在当月视图即自动展开今天详情，
+    // 无需用户先点一下；自动拾取不滚动页面（进入时维持顶部锚定，面板在折叠线下方属预期）
+    useEffect(() => {
+        if (offset !== 0 || data === undefined || autoPickRef.current)
+            return;
+        pick(data.today, false);
+        // pick 随渲染重建，但本效果只关心 offset/data 变迁，无需跟随
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [offset, data]);
     const act = (action, taskId, taskName, date) => {
         // 需要确认的动作先弹应用内确认，通过后才进入写路径；无需确认的动作直接执行
         const confirmMessage = action === 'checkin' && date > (data?.today ?? '')
@@ -68,20 +86,18 @@ export function CalendarPage() {
                 ? t('confirm.undoAt', { name: taskName, date })
                 : undefined;
         const run = () => {
-            // claim 服务端只读 taskId；checkin/cancel-checkin 的 date 是必读参数
-            guard(() => postAction(action, action === 'claim' ? { taskId } : { taskId, date }).then(() => {
-                toast(action === 'claim'
-                    ? t('toast.claimed', { name: taskName })
-                    : action === 'checkin'
-                        ? t('toast.checkinOk') + dateSuffix(date)
-                        : t('toast.undoneAt', { date: formatShortDate(date) }), 'ok');
+            // checkin/cancel-checkin 的 date 是必读参数（claim 已随候选池移出日历面板）
+            guard(() => postAction(action, { taskId, date }).then(() => {
+                toast(action === 'checkin'
+                    ? t('toast.checkinOk') + dateSuffix(date)
+                    : t('toast.undoneAt', { date: formatShortDate(date) }), 'ok');
                 // busy 窗口覆盖月历重取；之后仅当操作日仍是当前选中日才回填详情——
                 // 动作与快速连点另一日期竞争时，慢的旧响应不得覆盖新选中日的面板
                 return page.reload().then(() => {
                     if (pickedDateRef.current !== date)
                         return undefined;
                     const seq = ++pickSeqRef.current;
-                    return getJson(`/xingyuan/api/day?date=${date}`)
+                    return getJson(dayUrl(date))
                         .then((dayAfter) => { if (seq === pickSeqRef.current) {
                         setDetail(dayAfter);
                         setPickState('idle');
@@ -157,6 +173,13 @@ export function CalendarPage() {
             });
         });
     }
+    // 月历隐藏未领取任务（承诺口径，服务端 cell 已过滤）；详情面板全日期同口径——
+    // 含今天：候选池不进日历（2026-08 用户裁决两轮：今日页 → 日历面板），
+    // 领取入口收归任务页待领取组与对话。判定消费服务端 claimed 布尔
+    // （§5.2 规则 7 单一判定，client 不重复写 status 谓词）
+    const visibleTasks = detail === undefined
+        ? []
+        : detail.tasks.filter((task) => task.claimed);
     return createElement('div', { className: 'xy-page', ref: stabilize }, 
     // 月份导航居中（日历惯例）：‹ 标题 › 成组居中，「回到本月」绝对定位贴右缘不挤占中轴
     createElement('div', { className: 'xy-page-head xy-calnav' }, createElement('button', { className: 'xy-btn', 'aria-label': t('cal.prevMonth'), onClick: () => goMonth(-1) }, '‹'), createElement('h2', { className: 'xy-page-title' }, formatMonth(data.month)), createElement('button', { className: 'xy-btn', 'aria-label': t('cal.nextMonth'), onClick: () => goMonth(1) }, '›'), offset !== 0 ? createElement('button', { className: 'xy-btn xy-calnav-back', onClick: () => goMonth(-offset) }, t('cal.backToMonth')) : null), 
@@ -206,28 +229,29 @@ export function CalendarPage() {
                 ? createElement('div', { className: 'xy-meta xy-dayhint' }, t('cal.panelHint'))
                 : createElement('div', { className: 'xy-daydetail' }, 
                 // 面板头 = 本地化友好日期（含星期），与今日页标题同一语法；不再裸奔 ISO
-                createElement('h3', { className: 'xy-section-title' }, formatFriendlyDate(detail.date)), detail.tasks.length === 0
+                createElement('h3', { className: 'xy-section-title' }, formatFriendlyDate(detail.date)), visibleTasks.length === 0
                     ? createElement('div', { className: 'xy-meta' }, t('cal.dayEmpty'))
-                    : createElement('ul', { className: 'xy-grouplist' }, detail.tasks.map((task) => {
+                    : createElement('ul', { className: 'xy-grouplist' }, visibleTasks.map((task) => {
                         // 元信息分段拼接：空段不产悬挂分隔符（如已完结任务无状态词）
+                        // 面板行已按 claimed 过滤（未领取不达此处）；已领取且不可勾且未勾
+                        // = 过期关闭（达标关闭在计划面已剔除——失败记录，与工具面「— 已过期」同口径）
                         const stateText = task.checked
                             ? t('cal.state.checked')
                             : task.canCheckIn ? t('cal.state.todo')
-                                : task.status === 'pending' ? t('cal.state.unclaimed') : '';
+                                : t('task.status.expired');
                         const segments = [
                             cycleLabel(task.cycle),
                             ...(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(' · '))), 
-                        // 领取仅限今日：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'))
-                                : task.checked && task.canCancel
-                                    ? createElement('button', { className: 'xy-btn', disabled: busy, onClick: () => act('cancel-checkin', task.taskId, task.name, detail.date) }, t('action.cancelCheckin'))
-                                    : null);
+                        // 打卡按钮消费 host 单一真值 canCheckIn（=未勾选且进行中）：
+                        // 「已领取」不等于「可打卡」——过期关闭等已完结任务不渲染按钮，
+                        // 避免「打卡此日」disabled 死分支（评审回归 C1）；未领取行已过滤
+                        task.canCheckIn
+                            ? createElement('button', { className: 'xy-btn xy-btn-primary', disabled: busy, onClick: () => act('checkin', task.taskId, task.name, detail.date) }, t('action.checkinThisDay'))
+                            : task.checked && task.canCancel
+                                ? createElement('button', { className: 'xy-btn', disabled: busy, onClick: () => act('cancel-checkin', task.taskId, task.name, detail.date) }, t('action.cancelCheckin'))
+                                : null);
                     })))));
 }