@starwish-ai/xingyuan-dsh 0.5.7 → 0.5.8

package/CHANGELOG.md

@@ -5,6 +5,53 @@ 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,

package/lib/client/api.js

@@ -59,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/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,6 +58,7 @@ export const ZH_DICT = {
     'state.done': '已完成',
     // --- 愿望卡 / 愿望页 ---
     'wish.progress': '进度 {percent}%',
+    'wish.progressHasPending': '含未领取任务',
     'wish.eta': '预计完成 {date}',
     'wish.noTasks': '暂无下属任务——在对话里告诉我，让我为它推荐打卡任务',
     'wish.pageTitle': '我的愿望',
@@ -142,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': '初心者',
@@ -344,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} 天',
@@ -479,6 +480,7 @@ 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 — tell me in chat and I will suggest check-in tasks for it',
     'wish.pageTitle': 'My Wishes',
@@ -559,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',
@@ -751,6 +752,7 @@ 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',

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);
                     })))));
 }

package/lib/client/pages/detail.js

@@ -106,7 +106,7 @@ export function TaskDetailPanel(props) {
     /** 取详情的 Promise 形态：act 里用于把 busy 窗口延伸到刷新完成。 */
     const fetchDetail = () => {
         setError(undefined);
-        return getJson(`/xingyuan/api/task-detail?taskId=${encodeURIComponent(props.taskId)}`)
+        return getJson(`/xingyuan/api/task-detail?${new URLSearchParams({ taskId: props.taskId }).toString()}`)
             .then((payload) => setDetail(payload))
             .catch((e) => { setError(e instanceof Error ? e.message : String(e)); });
     };

package/lib/client/pages/growth.js

@@ -47,7 +47,7 @@ export function GrowthPage() {
     const growth = usePageData('/xingyuan/api/growth');
     const range = usePageData(() => {
         const { start, end } = recentRangeDays(30);
-        return `/xingyuan/api/range?start=${start}&end=${end}`;
+        return `/xingyuan/api/range?${new URLSearchParams({ start, end }).toString()}`;
     }, []);
     // 悬停列数据源（null = 未悬停）
     const [hoverIdx, setHoverIdx] = useState(null);

package/lib/client/pages/today.js

@@ -1,6 +1,6 @@
 /** 今日页：今日打卡总览 + 一键打卡/领取 + 已完成撤销。 */
 import { createElement, useSyncExternalStore } from 'react';
-import { postAction } from '../api.js';
+import { dayUrl, postAction } from '../api.js';
 import { toast } from '../ui.js';
 import { useXyT } from '../i18n.js';
 import { softConfirm, useActionGuard, usePageData, useScrollTopOnMount, useStableScrollbar, localYmd } from '../hooks.js';
@@ -14,7 +14,7 @@ export function TodayPage() {
     // 「始终显示 × 非星愿会话」轻提示：控制器写值，本页订阅渲染（默认 false 零开销）
     const showNoPresetHint = useSyncExternalStore(todayHintStore.subscribe, todayHintStore.getSnapshot);
     const overview = usePageData('/xingyuan/api/overview');
-    const day = usePageData(() => `/xingyuan/api/day?date=${localYmd(new Date())}`);
+    const day = usePageData(() => dayUrl(localYmd(new Date())));
     const { busy, guard } = useActionGuard();
     const reload = () => Promise.all([overview.reload(), day.reload()]).then(() => undefined);
     const act = (action, body, doneText) => {
@@ -46,27 +46,26 @@ export function TodayPage() {
     if (data === undefined || dayData === undefined)
         return createElement(PageSkeleton);
     const stale = overview.error !== undefined || day.error !== undefined;
-    const ratio = data.total > 0 ? Math.round((data.checked / data.total) * 100) : 0;
+    // 完成率 floor（诚实口径，与愿望进度同规）：round 会显示「249/250 · 100%」却无
+    // 「全部完成」横幅（AGENTS.md §5.2 进度口径）；floor 只在真正全完成时到 100。
+    const ratio = data.total > 0 ? Math.floor((data.checked / data.total) * 100) : 0;
     const doneItems = dayData.tasks.filter((task) => task.checked);
-    const openItems = dayData.tasks.filter((task) => !task.checked && task.status === 'in_progress');
-    const pendingItems = dayData.tasks.filter((task) => !task.checked && task.status === 'pending');
-    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,
-            onClick: () => {
-                void act('checkin', { taskId: task.taskId }, (p) => t('toast.checkinOk') + dateSuffix(typeof p.date === 'string' ? String(p.date) : undefined))
-                    // 行随刷新从「待完成」组迁入「已完成」组、原按钮销毁，焦点交给页面
-                    // 标题兜底（与下方撤销路径同款；领取行留在同一列表内不迁移，无需兜底）
-                    .then(focusPageTitle, () => { });
-            },
-        }, t('action.checkin'))
-        : createElement('button', {
-            className: 'xy-btn', disabled: busy,
-            onClick: () => act('claim', { taskId: task.taskId }, () => t('toast.claimed', { name: task.name })),
-        }, t('action.claim'))));
+    // 今日只呈现已领取义务（2026-08 用户裁决：候选池不进今日页，领取入口=任务页待领取组、
+    // 日历今天面板/对话）：claimed 布尔来自服务端单一判定（§5.2 规则 7），client 不重复写
+    // status 谓词；canCheckIn 显式并入（与日历面板同为 host 真值门控）——防计划层未来改动
+    // 时静默复造「可点但服务端拒绝」，不变量（claimed 且未勾 ⇒ in_progress）失效即隐身该行
+    const openItems = dayData.tasks.filter((task) => !task.checked && task.claimed && task.canCheckIn);
+    const openRows = openItems.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}` : ''}`)), createElement('button', {
+        className: 'xy-btn xy-btn-primary',
+        // 展示行已按 canCheckIn 显式过滤（上方 openItems），按钮无需再判——
+        // disabled 仅服务动作在途的 busy 窗口，不再有「disabled 但无解释」的死分支
+        disabled: busy,
+        onClick: () => {
+            void act('checkin', { taskId: task.taskId }, (p) => t('toast.checkinOk') + dateSuffix(typeof p.date === 'string' ? String(p.date) : undefined))
+                // 行随刷新从「待打卡」组迁入「已完成」组、原按钮销毁，焦点交给页面标题兜底
+                .then(focusPageTitle, () => { });
+        },
+    }, t('action.checkin'))));
     const doneRows = doneItems.map((task) => createElement('li', { key: task.taskId, className: 'xy-grouprow xy-done' }, createElement('div', { className: 'xy-rowmain' }, createElement('span', { className: 'xy-rowtitle' }, createElement('span', { className: 'xy-done-glyph', 'aria-hidden': 'true' }, '✓'), task.name), 
     // 与待完成行同口径：周期 + 所属愿望（hint 是当天行动备忘，完成后不再展示）
     createElement('span', { className: 'xy-meta' }, `${cycleLabel(task.cycle)}${task.wishName !== undefined ? ` · ${task.wishName}` : ''}`)), createElement('button', {
@@ -108,7 +107,9 @@ export function TodayPage() {
     // 刷新失败但旧数据仍在：诚实降级（写已成功，页面数据可能滞后），可就地重试
     stale ? createElement(StaleBanner, { onRetry: () => void reload() }) : null, 
     // 始终显示模式下非星愿会话：概览卡下一行轻提示（页面可浏览/操作，对话能力受限）
-    showNoPresetHint ? createElement('p', { className: 'xy-hint' }, t('today.noPresetHint')) : null, rows.length > 0 ? createElement('section', { className: 'xy-group' }, createElement('h3', { className: 'xy-group-head' }, createElement('span', { className: 'xy-group-dot xy-group-dot-warn', 'aria-hidden': 'true' }), createElement('span', null, t('today.sectionOpen')), createElement('span', { className: 'xy-group-count' }, String(rows.length))), createElement('ul', { className: 'xy-grouplist' }, rows)) : null, doneRows.length > 0 ? createElement('section', { className: 'xy-group' }, createElement('h3', { className: 'xy-group-head' }, createElement('span', { className: 'xy-group-dot xy-group-dot-ok', 'aria-hidden': 'true' }), createElement('span', null, t('today.sectionDone')), createElement('span', { className: 'xy-group-count' }, String(doneRows.length))), createElement('ul', { className: 'xy-grouplist' }, doneRows)) : null, data.total === 0
+    showNoPresetHint ? createElement('p', { className: 'xy-hint' }, t('today.noPresetHint')) : null, openRows.length > 0 ? createElement('section', { className: 'xy-group' }, createElement('h3', { className: 'xy-group-head' }, createElement('span', { className: 'xy-group-dot xy-group-dot-warn', 'aria-hidden': 'true' }), createElement('span', null, t('today.sectionOpen')), createElement('span', { className: 'xy-group-count' }, String(openRows.length))), createElement('ul', { className: 'xy-grouplist' }, openRows)) : null, doneRows.length > 0 ? createElement('section', { className: 'xy-group' }, createElement('h3', { className: 'xy-group-head' }, createElement('span', { className: 'xy-group-dot xy-group-dot-ok', 'aria-hidden': 'true' }), createElement('span', null, t('today.sectionDone')), createElement('span', { className: 'xy-group-count' }, String(doneRows.length))), createElement('ul', { className: 'xy-grouplist' }, doneRows)) : null, 
+    // 空态 = 今天没有已领取义务（候选池不走今日页；领取入口在任务页/日历今天面板/对话）
+    data.total === 0
         ? createElement(PageEmpty, { title: t('today.empty.title'), hint: t('today.empty.hint') })
         : null);
 }

package/lib/client/pages/wishes.js

@@ -73,7 +73,12 @@ export function WishesPage() {
     const card = (wish) => createElement('div', { key: wish.wishId, className: 'xy-wishcard' }, createElement('div', { className: 'xy-card-head' }, createElement('span', {
         className: 'xy-badge xy-badge-cat',
         style: categoryVars(wish.colorKey, wish.categoryName),
-    }, wish.categoryName), createElement('span', { className: 'xy-title' }, wish.title), createElement('span', { className: 'xy-progress-num' }, t('wish.progress', { percent: wish.progress })), createElement('button', {
+    }, wish.categoryName), createElement('span', { className: 'xy-title' }, wish.title), 
+    // 长期尺度 = 计划口径（分母含未领取任务的应打天数，§5.2 规则 7）：愿望含未领取
+    // 任务时必须呈现「含未领取任务」标注，避免把计划分母误读为承诺分母
+    createElement('span', { className: 'xy-progress-num' }, t('wish.progress', { percent: wish.progress }), wish.tasks.some((task) => task.status === 'pending')
+        ? createElement('span', { className: 'xy-meta' }, ` · ${t('wish.progressHasPending')}`)
+        : null), createElement('button', {
         className: 'xy-btn xy-btn-danger xy-btn-icon',
         disabled: deleting,
         'aria-label': t('common.delete') + ' · ' + wish.title,
@@ -89,7 +94,8 @@ export function WishesPage() {
         'aria-valuemin': 0,
         'aria-valuemax': 100,
         'aria-valuenow': wish.progress,
-        'aria-label': t('wish.progress', { percent: wish.progress }),
+        'aria-label': t('wish.progress', { percent: wish.progress })
+            + (wish.tasks.some((task) => task.status === 'pending') ? ` · ${t('wish.progressHasPending')}` : ''),
     }, createElement('div', { className: 'xy-bar-fill', style: { transform: `scaleX(${Math.min(wish.progress, 100) / 100})` } })), wish.tasks.length > 0
         ? createElement('div', { className: 'xy-wishtasks' }, ...wishTasks(wish))
         : createElement('div', { className: 'xy-meta' }, t('wish.noTasks')));