@starwish-ai/xingyuan-dsh 0.5.9 → 0.6.0

package/CHANGELOG.md

@@ -5,6 +5,51 @@ 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.6.0] - 2026-09-05
+
+> **Note:** behavioral revision — long-term ratios (wish progress, progress charts) join
+> the commitment semantics: unclaimed tasks no longer count in the denominator, and
+> achievement additionally requires zero unclaimed tasks. No data format change; upgrades
+> from 0.5.x are seamless — the switch can only raise progress, and every newly-qualifying
+> wish carries unclaimed candidates that the achievement gate holds back (nothing archives
+> by accident).
+
+### Added
+- **Achievement gate and the "wrapping up" state**: a wish achieves only at 100% progress
+  with no unclaimed tasks (single formula `wishProgressFromAgg` shared by the write path and
+  the read side). Full progress with unclaimed tasks parks the wish at "wrapping up" — the
+  bar is full, the wish is not archived — and the card shows the pending count with the
+  guidance line "claim to continue, or delete to achieve". The call is always the user's:
+  the assistant never claims or deletes on its own to force achievement.
+- **Gate flips always reach the model**: check-in / claim / update / cancel / delete / create
+  (including batches) compare before/after wish views and, on achieve / wrap-up / rollback,
+  say so in the tool reply and re-emit the wish event, so chat card, reply and wishes page
+  stay in sync. Count drift without a flip also re-emits (the "N to claim" badge never
+  freezes).
+- **Single-source display bits**: `pendingCount` / `settled` / `planning` / `achieved` are
+  produced by `freshWishes` and delivered via `/api/wishes` and `xingyuan/wish` events;
+  replays of older events degrade honestly to a plain progress display.
+- **Wording standard**: all user-facing and verbatim-relay surfaces (i18n, tool replies,
+  prompt guides, standalone pages) say "待领取的任务" / "待收尾" — no internal jargon.
+  Locked by a banned-word test (`test/prompts.test.ts`) and a shared guidance-line constant.
+
+### Changed
+- `wishProgress` and `taskCompletionRate` now divide by claimed-task days only; the
+  subtitle is fixed to "已领取任务" (the conditional "含未领取任务" wording is gone —
+  one metric, one meaning).
+- Growth-page achievement counts and the `wishAchievement` chart consume the derived
+  achieved bit instead of `progress >= 100`, matching the wish card exactly.
+- The session-opening overview reads fresh derived views (not the stored `archived` bit)
+  and distinguishes "all wishes achieved" from "no wishes yet".
+
+### Fixed
+- Creating a bare wish showed "进度 0%" on the chat card while the wishes page said
+  "计划中" (the create event dropped the derived bits).
+- Claiming a standalone task (no parent wish) claimed its days were folded into "wish
+  progress".
+- Batch-delete replies glued the achievement guidance onto the summary line; batch paths
+  no longer re-scan the task table per wish on the after side.
+
 ## [0.5.9] - 2026-09-04
 
 > **Note:** this release migrates the plugin to DeepSeek Harness `0.1.2-rc.1`

package/README.en-US.md

@@ -12,6 +12,7 @@ XingYuan is a wish & habit-building companion, shipped as a DeepSeek Harness plu
 
 - **Conversation-driven**: create wishes / tasks in natural language with duplicate detection
 - **Opportunity-day check-ins**: check-in, make-up, cancel, and future pre-checks; progress always recomputed against today
+- **Commitment-based progress**: only claimed tasks count; a wish achieves when everything committed is done and nothing is left to claim — full progress with unclaimed tasks leaves it "wrapping up" for your call (claim to continue, or delete to achieve), never nagging, never deciding for you
 - **Micro-actions**: break an overwhelming goal into 3–7 tiny steps and walk through them guided
 - **Growth system**: levels Lv.1–Lv.10, streak bonuses, stat cards, 30-day bar chart
 - **Session view tabs**: Today / Wishes / Tasks / Calendar / Growth / Memory — buttons call action endpoints directly; shown only in XingYuan-preset sessions by default, switchable to always show/hide and per-tab in Settings

package/README.md

@@ -12,6 +12,8 @@
 
 - **对话驱动**：自然语言创建愿望 / 任务，自动查重相似项
 - **机会日打卡**：周期任务打卡、补卡、取消、未来预勾，进度跨天恒为最新
+- **承诺口径进度**：只有领取的任务算进度；达成 = 承诺全部完成且没有待领取的任务——
+  做完但有没领的，愿望停在「待收尾」等你决定（领了继续，或删掉就达成），不催也不代劳
 - **微行动拆解**：把无从下手的目标拆成 3–7 个小步，引导式逐个完成或跳过
 - **成长体系**：等级 Lv.1–Lv.10、连续加成、统计卡与近 30 天柱状图
 - **会话视图页**：今日 / 愿望 / 任务 / 日历 / 成长 / 记忆 六个标签页，页面按钮直连动作接口；

package/lib/client/cards.js

@@ -22,9 +22,11 @@ function WishView(props) {
         style: categoryVars(wish.wish.colorKey, wish.wish.categoryName),
     }, t('badge.wish')), createElement('span', { className: 'xy-title' }, deleted ? t('state.deleted', { title: wish.wish.title }) : wish.wish.title)), 
     // 已删除卡不再渲染活体进度（删除态 × 进度百分比自相矛盾）
+    // 三态位（achieved/planning/settled/pendingCount）来自事件载荷（wishProgressFromAgg 派生），
+    // 与愿望页/工具回包同一称呼；旧事件无这些位则如实降级为纯「进度 X%」显示（不重建谓词，§5.2 规则 7）
     createElement('div', { className: 'xy-meta' }, deleted
         ? wish.wish.categoryName
-        : `${wish.wish.categoryName} · ${t('wish.progress', { percent: wish.wish.progress })}`));
+        : `${wish.wish.categoryName} · ${wish.wish.achieved ? t('wish.achieved') : wish.wish.planning ? t('wish.planning') : t('wish.progress', { percent: wish.wish.progress })}${wish.wish.pendingCount ? ` · ${t('wish.pendingCount', { n: wish.wish.pendingCount })}` : ''}${wish.wish.settled ? ` · ${t('wish.settled')}` : ''}`));
 }
 function TaskView(props) {
     const t = useXyT();

package/lib/client/chart-labels.js

@@ -81,12 +81,11 @@ export const CHART_SUBTITLE_KEYS = {
     '按任务 TopN': 'chart.subtitle.byTaskTopN',
     '按愿望 TopN': 'chart.subtitle.byWishTopN',
     '按实际打卡时刻分桶；过滤范围为打卡日区间': 'chart.subtitle.byHourBucket',
-    '%（应打天数完成率）': 'chart.subtitle.progressPercent',
-    '%（应打天数完成率，含未领取任务）': 'chart.subtitle.progressPercentPending',
+    '%（已领取任务完成率）': 'chart.subtitle.claimedPercent',
 };
 /**
  * 副标题本地化：固定短语查表；含数字的模板（近 N 天 / A/B 天 / 当前 A 天 / 最长 B 天 /
- * 含未领取任务）按正则重排——服务端模板变化时未知副标题原样回显（诚实降级）。
+ * 已领取任务口径）按正则重排——服务端模板变化时未知副标题原样回显（诚实降级）。
  */
 export function localizeChartSubtitle(subtitle) {
     const fixed = CHART_SUBTITLE_KEYS[subtitle];
@@ -95,9 +94,9 @@ export function localizeChartSubtitle(subtitle) {
     let m = /^近 (\d+) 天$/.exec(subtitle);
     if (m !== null)
         return t('chart.subtitle.lastDays', { n: m[1] });
-    m = /^(\d+)\/(\d+) 天（含未领取任务）$/.exec(subtitle);
+    m = /^(\d+)\/(\d+) 天（已领取任务）$/.exec(subtitle);
     if (m !== null)
-        return t('chart.subtitle.daysInclPending', { done: m[1], due: m[2] });
+        return t('chart.subtitle.daysClaimed', { done: m[1], due: m[2] });
     m = /^(\d+)\/(\d+) 天$/.exec(subtitle);
     if (m !== null)
         return t('chart.subtitle.daysRatio', { done: m[1], due: m[2] });

package/lib/client/i18n.js

@@ -58,11 +58,18 @@ export const ZH_DICT = {
     'state.done': '已完成',
     // --- 愿望卡 / 愿望页 ---
     'wish.progress': '进度 {percent}%',
-    'wish.progressHasPending': '含未领取任务',
+    'wish.planning': '计划中',
+    'wish.achieved': '已达成 🎉',
+    'wish.pendingCount': '{n} 个任务待领取',
+    'wish.settled': '待收尾',
+    'wish.settleHint': '答应自己的都做完了——待领取的领了继续，或删掉就达成',
     'wish.eta': '预计完成 {date}',
     'wish.noTasks': '暂无下属任务——在对话里告诉我，让我为它推荐打卡任务',
     'wish.pageTitle': '我的愿望',
-    'wish.summary': '{active} 个进行中{achieved}', 'wish.achievedSuffix': ' · {n} 个已达成',
+    'wish.summary': '{active} 个进行中{planning}{settled}{achieved}',
+    'wish.planningSuffix': ' · {n} 个计划中',
+    'wish.settledSuffix': ' · {n} 个待收尾',
+    'wish.achievedSuffix': ' · {n} 个已达成',
     'wish.sectionAchieved': '已达成',
     'wish.empty.title': '还没有愿望',
     'wish.empty.hint': '告诉我想实现什么，我来帮你拆解成可坚持的计划。',
@@ -343,10 +350,9 @@ export const ZH_DICT = {
     'chart.subtitle.byTaskTopN': '按任务 TopN',
     'chart.subtitle.byWishTopN': '按愿望 TopN',
     'chart.subtitle.byHourBucket': '按实际打卡时刻分桶；过滤范围为打卡日区间',
-    'chart.subtitle.progressPercent': '%（应打天数完成率）',
-    'chart.subtitle.progressPercentPending': '%（应打天数完成率，含未领取任务）',
+    'chart.subtitle.claimedPercent': '%（已领取任务完成率）',
     'chart.subtitle.lastDays': '近 {n} 天',
-    'chart.subtitle.daysInclPending': '{done}/{due} 天（含未领取任务）',
+    'chart.subtitle.daysClaimed': '{done}/{due} 天（已领取任务）',
     'chart.subtitle.daysRatio': '{done}/{due} 天',
     'chart.subtitle.streak': '当前 {current} 天 / 最长 {best} 天',
     // --- 详情聚合视图 ---
@@ -480,11 +486,17 @@ const EN_DICT = {
     'state.deleted': 'Deleted “{title}”',
     'state.done': 'Done',
     'wish.progress': 'Progress {percent}%',
-    'wish.progressHasPending': 'includes unclaimed tasks',
+    'wish.planning': 'Planning',
+    'wish.achieved': 'Achieved 🎉',
+    'wish.pendingCount': '{n} to claim',
+    'wish.settled': 'Wrapping up',
+    'wish.settleHint': 'Everything you committed to is done — claim the rest to keep going, or delete them to achieve the wish',
     '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',
-    'wish.summary': '{active} in progress{achieved}',
+    'wish.summary': '{active} in progress{planning}{settled}{achieved}',
+    'wish.planningSuffix': ' · {n} planning',
+    'wish.settledSuffix': ' · {n} wrapping up',
     'wish.achievedSuffix': ' · {n} achieved',
     'wish.sectionAchieved': 'Achieved',
     'wish.empty.title': 'No wishes yet',
@@ -751,10 +763,9 @@ const EN_DICT = {
     'chart.subtitle.byTaskTopN': 'By task (top N)',
     '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.claimedPercent': '% of committed-task completion',
     'chart.subtitle.lastDays': 'Last {n} days',
-    'chart.subtitle.daysInclPending': '{done}/{due} days (incl. unclaimed)',
+    'chart.subtitle.daysClaimed': '{done}/{due} days (claimed tasks)',
     'chart.subtitle.daysRatio': '{done}/{due} days',
     'chart.subtitle.streak': 'Current {current}d / best {best}d',
     'detail.grid.title': 'Check-in record',

package/lib/client/pages/wishes.js

@@ -39,8 +39,12 @@ export function WishesPage() {
     const data = page.data;
     if (data === undefined)
         return createElement(PageSkeleton);
-    const active = data.wishes.filter((w) => !w.archived);
+    // 页头四态计数：进行中/计划中/待收尾/已达成各计各的，与卡头徽章同一称呼
+    // （消灭「摘要算进行中、卡上写计划中」的并见歧义）；全部取服务端派生位，展示层不重建谓词
     const achieved = data.wishes.filter((w) => w.archived);
+    const settledCount = data.wishes.filter((w) => w.settled).length;
+    const planningCount = data.wishes.filter((w) => !w.archived && w.planning).length;
+    const active = data.wishes.filter((w) => !w.archived);
     /** 删除愿望（级联下属任务与打卡记录，服务端同一写路径）：确认后直连动作并整页刷新。
      * 行移除后触发按钮销毁、焦点落空——刷新完成后把焦点交给页面标题兜底。 */
     const removeWish = (wish) => {
@@ -70,37 +74,45 @@ export function WishesPage() {
             ? [line, createElement(TaskDetailPanel, { key: `d-${task.taskId}`, id: `xy-task-detail-${task.taskId}`, taskId: task.taskId, today: data.today, onChanged: page.reload })]
             : [line];
     });
-    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), 
-    // 长期尺度 = 计划口径（分母含未领取任务的应打天数，§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,
-        title: t('common.delete'),
-        onClick: () => removeWish(wish),
-    }, createElement(IconTrash))), wish.description !== undefined ? createElement('div', { className: 'xy-meta' }, wish.description) : null, wish.estimatedCompletionDate !== undefined
-        ? createElement('div', { className: 'xy-meta' }, t('wish.eta', { date: formatMediumDate(wish.estimatedCompletionDate) }))
-        : null, 
-    // 与今日页 hero 进度条同一语义语法：读屏可感知进度（role+valuenow），不只是一根哑条
-    createElement('div', {
-        className: 'xy-bar',
-        role: 'progressbar',
-        'aria-valuemin': 0,
-        'aria-valuemax': 100,
-        'aria-valuenow': 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')));
+    const card = (wish) => {
+        // 承诺口径（§5.2 规则 7）：进度分母只计已领取任务。展示三态：
+        // 计划中（无已领取任务）/ 进行中（正常百分比）/ 待结算（满进度而有候选——不归档，附收尾指引）。
+        // settled/pendingCount/planning 直取服务端 wishProgressFromAgg 派生位（随 /api/wishes 下发），
+        // 展示层禁止重建 `progress>=100 && 有候选` 闸门或 planning 谓词（单一判定源，防与工具回包分叉）
+        const { pendingCount, settled, planning } = wish;
+        const progressLabel = planning ? t('wish.planning') : t('wish.progress', { percent: wish.progress });
+        const pendingMeta = pendingCount > 0 ? ` · ${t('wish.pendingCount', { n: pendingCount })}` : '';
+        return 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' }, progressLabel, pendingCount > 0
+            ? createElement('span', { className: 'xy-meta' }, pendingMeta)
+            : null), createElement('button', {
+            className: 'xy-btn xy-btn-danger xy-btn-icon',
+            disabled: deleting,
+            'aria-label': t('common.delete') + ' · ' + wish.title,
+            title: t('common.delete'),
+            onClick: () => removeWish(wish),
+        }, createElement(IconTrash))), wish.description !== undefined ? createElement('div', { className: 'xy-meta' }, wish.description) : null, wish.estimatedCompletionDate !== undefined
+            ? createElement('div', { className: 'xy-meta' }, t('wish.eta', { date: formatMediumDate(wish.estimatedCompletionDate) }))
+            : null, 
+        // 与今日页 hero 进度条同一语义语法：读屏可感知进度（role+valuenow），不只是一根哑条
+        createElement('div', {
+            className: 'xy-bar',
+            role: 'progressbar',
+            'aria-valuemin': 0,
+            'aria-valuemax': 100,
+            'aria-valuenow': wish.progress,
+            'aria-label': progressLabel + pendingMeta,
+        }, createElement('div', { className: 'xy-bar-fill', style: { transform: `scaleX(${Math.min(wish.progress, 100) / 100})` } })), settled ? createElement('div', { className: 'xy-meta' }, t('wish.settleHint')) : null, wish.tasks.length > 0
+            ? createElement('div', { className: 'xy-wishtasks' }, ...wishTasks(wish))
+            : createElement('div', { className: 'xy-meta' }, t('wish.noTasks')));
+    };
     return createElement('div', { className: 'xy-page', ref: stabilize }, page.error !== undefined ? createElement(StaleBanner, { onRetry: () => void page.reload() }) : null, showNoPresetHint ? createElement('p', { className: 'xy-hint' }, t('today.noPresetHint')) : null, createElement('div', { className: 'xy-page-head' }, createElement('h2', { className: 'xy-page-title' }, t('wish.pageTitle')), createElement('span', { className: 'xy-meta' }, t('wish.summary', {
-        active: active.length,
+        // 四态计数各计各的（进行中扣除计划中与待收尾，不相套）；列表渲染仍归未完成组（未完成≠进行中计数）
+        active: active.length - settledCount - planningCount,
+        planning: planningCount > 0 ? t('wish.planningSuffix', { n: planningCount }) : '',
+        settled: settledCount > 0 ? t('wish.settledSuffix', { n: settledCount }) : '',
         achieved: achieved.length > 0 ? t('wish.achievedSuffix', { n: achieved.length }) : '',
     })), 
     // 动作组整体右置（单一 margin-left:auto），避免多按钮各自 auto margin 平分剩余空间

package/lib/client.js

@@ -61,11 +61,17 @@ const ZH_DICT = {
 	"state.deleted": "已删除「{title}」",
 	"state.done": "已完成",
 	"wish.progress": "进度 {percent}%",
-	"wish.progressHasPending": "含未领取任务",
+	"wish.planning": "计划中",
+	"wish.achieved": "已达成 🎉",
+	"wish.pendingCount": "{n} 个任务待领取",
+	"wish.settled": "待收尾",
+	"wish.settleHint": "答应自己的都做完了——待领取的领了继续，或删掉就达成",
 	"wish.eta": "预计完成 {date}",
 	"wish.noTasks": "暂无下属任务——在对话里告诉我，让我为它推荐打卡任务",
 	"wish.pageTitle": "我的愿望",
-	"wish.summary": "{active} 个进行中{achieved}",
+	"wish.summary": "{active} 个进行中{planning}{settled}{achieved}",
+	"wish.planningSuffix": " · {n} 个计划中",
+	"wish.settledSuffix": " · {n} 个待收尾",
 	"wish.achievedSuffix": " · {n} 个已达成",
 	"wish.sectionAchieved": "已达成",
 	"wish.empty.title": "还没有愿望",
@@ -332,10 +338,9 @@ const ZH_DICT = {
 	"chart.subtitle.byTaskTopN": "按任务 TopN",
 	"chart.subtitle.byWishTopN": "按愿望 TopN",
 	"chart.subtitle.byHourBucket": "按实际打卡时刻分桶；过滤范围为打卡日区间",
-	"chart.subtitle.progressPercent": "%（应打天数完成率）",
-	"chart.subtitle.progressPercentPending": "%（应打天数完成率，含未领取任务）",
+	"chart.subtitle.claimedPercent": "%（已领取任务完成率）",
 	"chart.subtitle.lastDays": "近 {n} 天",
-	"chart.subtitle.daysInclPending": "{done}/{due} 天（含未领取任务）",
+	"chart.subtitle.daysClaimed": "{done}/{due} 天（已领取任务）",
 	"chart.subtitle.daysRatio": "{done}/{due} 天",
 	"chart.subtitle.streak": "当前 {current} 天 / 最长 {best} 天",
 	"detail.grid.title": "打卡记录",
@@ -462,11 +467,17 @@ const EN_DICT = {
 	"state.deleted": "Deleted “{title}”",
 	"state.done": "Done",
 	"wish.progress": "Progress {percent}%",
-	"wish.progressHasPending": "includes unclaimed tasks",
+	"wish.planning": "Planning",
+	"wish.achieved": "Achieved 🎉",
+	"wish.pendingCount": "{n} to claim",
+	"wish.settled": "Wrapping up",
+	"wish.settleHint": "Everything you committed to is done — claim the rest to keep going, or delete them to achieve the wish",
 	"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",
-	"wish.summary": "{active} in progress{achieved}",
+	"wish.summary": "{active} in progress{planning}{settled}{achieved}",
+	"wish.planningSuffix": " · {n} planning",
+	"wish.settledSuffix": " · {n} wrapping up",
 	"wish.achievedSuffix": " · {n} achieved",
 	"wish.sectionAchieved": "Achieved",
 	"wish.empty.title": "No wishes yet",
@@ -733,10 +744,9 @@ const EN_DICT = {
 	"chart.subtitle.byTaskTopN": "By task (top N)",
 	"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.claimedPercent": "% of committed-task completion",
 	"chart.subtitle.lastDays": "Last {n} days",
-	"chart.subtitle.daysInclPending": "{done}/{due} days (incl. unclaimed)",
+	"chart.subtitle.daysClaimed": "{done}/{due} days (claimed tasks)",
 	"chart.subtitle.daysRatio": "{done}/{due} days",
 	"chart.subtitle.streak": "Current {current}d / best {best}d",
 	"detail.grid.title": "Check-in record",
@@ -2107,20 +2117,19 @@ const CHART_SUBTITLE_KEYS = {
 	"按任务 TopN": "chart.subtitle.byTaskTopN",
 	"按愿望 TopN": "chart.subtitle.byWishTopN",
 	"按实际打卡时刻分桶；过滤范围为打卡日区间": "chart.subtitle.byHourBucket",
-	"%（应打天数完成率）": "chart.subtitle.progressPercent",
-	"%（应打天数完成率，含未领取任务）": "chart.subtitle.progressPercentPending"
+	"%（已领取任务完成率）": "chart.subtitle.claimedPercent"
 };
 /**
 * 副标题本地化：固定短语查表；含数字的模板（近 N 天 / A/B 天 / 当前 A 天 / 最长 B 天 /
-* 含未领取任务）按正则重排——服务端模板变化时未知副标题原样回显（诚实降级）。
+* 已领取任务口径）按正则重排——服务端模板变化时未知副标题原样回显（诚实降级）。
 */
 function localizeChartSubtitle(subtitle) {
 	const fixed = CHART_SUBTITLE_KEYS[subtitle];
 	if (fixed !== void 0) return t(fixed);
 	let m = /^近 (\d+) 天$/.exec(subtitle);
 	if (m !== null) return t("chart.subtitle.lastDays", { n: m[1] });
-	m = /^(\d+)\/(\d+) 天（含未领取任务）$/.exec(subtitle);
-	if (m !== null) return t("chart.subtitle.daysInclPending", {
+	m = /^(\d+)\/(\d+) 天（已领取任务）$/.exec(subtitle);
+	if (m !== null) return t("chart.subtitle.daysClaimed", {
 		done: m[1],
 		due: m[2]
 	});
@@ -2392,7 +2401,7 @@ function WishView(props) {
 	return (0, react.createElement)("div", { className: `xy-card ${deleted ? "xy-deleted" : ""}` }, (0, react.createElement)("div", { className: "xy-card-head" }, (0, react.createElement)("span", {
 		className: "xy-badge xy-badge-cat",
 		style: categoryVars(wish.wish.colorKey, wish.wish.categoryName)
-	}, t("badge.wish")), (0, react.createElement)("span", { className: "xy-title" }, deleted ? t("state.deleted", { title: wish.wish.title }) : wish.wish.title)), (0, react.createElement)("div", { className: "xy-meta" }, deleted ? wish.wish.categoryName : `${wish.wish.categoryName} · ${t("wish.progress", { percent: wish.wish.progress })}`));
+	}, t("badge.wish")), (0, react.createElement)("span", { className: "xy-title" }, deleted ? t("state.deleted", { title: wish.wish.title }) : wish.wish.title)), (0, react.createElement)("div", { className: "xy-meta" }, deleted ? wish.wish.categoryName : `${wish.wish.categoryName} · ${wish.wish.achieved ? t("wish.achieved") : wish.wish.planning ? t("wish.planning") : t("wish.progress", { percent: wish.wish.progress })}${wish.wish.pendingCount ? ` · ${t("wish.pendingCount", { n: wish.wish.pendingCount })}` : ""}${wish.wish.settled ? ` · ${t("wish.settled")}` : ""}`));
 }
 function TaskView(props) {
 	const t = useXyT();
@@ -3660,8 +3669,10 @@ function WishesPage() {
 	});
 	const data = page.data;
 	if (data === void 0) return (0, react.createElement)(PageSkeleton);
-	const active = data.wishes.filter((w) => !w.archived);
 	const achieved = data.wishes.filter((w) => w.archived);
+	const settledCount = data.wishes.filter((w) => w.settled).length;
+	const planningCount = data.wishes.filter((w) => !w.archived && w.planning).length;
+	const active = data.wishes.filter((w) => !w.archived);
 	/** 删除愿望（级联下属任务与打卡记录，服务端同一写路径）：确认后直连动作并整页刷新。
 	* 行移除后触发按钮销毁、焦点落空——刷新完成后把焦点交给页面标题兜底。 */
 	const removeWish = (wish) => {
@@ -3696,34 +3707,41 @@ function WishesPage() {
 			onChanged: page.reload
 		})] : [line];
 	});
-	const card = (wish) => (0, react.createElement)("div", {
-		key: wish.wishId,
-		className: "xy-wishcard"
-	}, (0, react.createElement)("div", { className: "xy-card-head" }, (0, react.createElement)("span", {
-		className: "xy-badge xy-badge-cat",
-		style: categoryVars(wish.colorKey, wish.categoryName)
-	}, wish.categoryName), (0, react.createElement)("span", { className: "xy-title" }, wish.title), (0, react.createElement)("span", { className: "xy-progress-num" }, t("wish.progress", { percent: wish.progress }), wish.tasks.some((task) => task.status === "pending") ? (0, react.createElement)("span", { className: "xy-meta" }, ` · ${t("wish.progressHasPending")}`) : null), (0, react.createElement)("button", {
-		className: "xy-btn xy-btn-danger xy-btn-icon",
-		disabled: deleting,
-		"aria-label": t("common.delete") + " · " + wish.title,
-		title: t("common.delete"),
-		onClick: () => removeWish(wish)
-	}, (0, react.createElement)(IconTrash))), wish.description !== void 0 ? (0, react.createElement)("div", { className: "xy-meta" }, wish.description) : null, wish.estimatedCompletionDate !== void 0 ? (0, react.createElement)("div", { className: "xy-meta" }, t("wish.eta", { date: formatMediumDate(wish.estimatedCompletionDate) })) : null, (0, react.createElement)("div", {
-		className: "xy-bar",
-		role: "progressbar",
-		"aria-valuemin": 0,
-		"aria-valuemax": 100,
-		"aria-valuenow": wish.progress,
-		"aria-label": t("wish.progress", { percent: wish.progress }) + (wish.tasks.some((task) => task.status === "pending") ? ` · ${t("wish.progressHasPending")}` : "")
-	}, (0, react.createElement)("div", {
-		className: "xy-bar-fill",
-		style: { transform: `scaleX(${Math.min(wish.progress, 100) / 100})` }
-	})), wish.tasks.length > 0 ? (0, react.createElement)("div", { className: "xy-wishtasks" }, ...wishTasks(wish)) : (0, react.createElement)("div", { className: "xy-meta" }, t("wish.noTasks")));
+	const card = (wish) => {
+		const { pendingCount, settled, planning } = wish;
+		const progressLabel = planning ? t("wish.planning") : t("wish.progress", { percent: wish.progress });
+		const pendingMeta = pendingCount > 0 ? ` · ${t("wish.pendingCount", { n: pendingCount })}` : "";
+		return (0, react.createElement)("div", {
+			key: wish.wishId,
+			className: "xy-wishcard"
+		}, (0, react.createElement)("div", { className: "xy-card-head" }, (0, react.createElement)("span", {
+			className: "xy-badge xy-badge-cat",
+			style: categoryVars(wish.colorKey, wish.categoryName)
+		}, wish.categoryName), (0, react.createElement)("span", { className: "xy-title" }, wish.title), (0, react.createElement)("span", { className: "xy-progress-num" }, progressLabel, pendingCount > 0 ? (0, react.createElement)("span", { className: "xy-meta" }, pendingMeta) : null), (0, react.createElement)("button", {
+			className: "xy-btn xy-btn-danger xy-btn-icon",
+			disabled: deleting,
+			"aria-label": t("common.delete") + " · " + wish.title,
+			title: t("common.delete"),
+			onClick: () => removeWish(wish)
+		}, (0, react.createElement)(IconTrash))), wish.description !== void 0 ? (0, react.createElement)("div", { className: "xy-meta" }, wish.description) : null, wish.estimatedCompletionDate !== void 0 ? (0, react.createElement)("div", { className: "xy-meta" }, t("wish.eta", { date: formatMediumDate(wish.estimatedCompletionDate) })) : null, (0, react.createElement)("div", {
+			className: "xy-bar",
+			role: "progressbar",
+			"aria-valuemin": 0,
+			"aria-valuemax": 100,
+			"aria-valuenow": wish.progress,
+			"aria-label": progressLabel + pendingMeta
+		}, (0, react.createElement)("div", {
+			className: "xy-bar-fill",
+			style: { transform: `scaleX(${Math.min(wish.progress, 100) / 100})` }
+		})), settled ? (0, react.createElement)("div", { className: "xy-meta" }, t("wish.settleHint")) : null, wish.tasks.length > 0 ? (0, react.createElement)("div", { className: "xy-wishtasks" }, ...wishTasks(wish)) : (0, react.createElement)("div", { className: "xy-meta" }, t("wish.noTasks")));
+	};
 	return (0, react.createElement)("div", {
 		className: "xy-page",
 		ref: stabilize
 	}, page.error !== void 0 ? (0, react.createElement)(StaleBanner, { onRetry: () => void page.reload() }) : null, showNoPresetHint ? (0, react.createElement)("p", { className: "xy-hint" }, t("today.noPresetHint")) : null, (0, react.createElement)("div", { className: "xy-page-head" }, (0, react.createElement)("h2", { className: "xy-page-title" }, t("wish.pageTitle")), (0, react.createElement)("span", { className: "xy-meta" }, t("wish.summary", {
-		active: active.length,
+		active: active.length - settledCount - planningCount,
+		planning: planningCount > 0 ? t("wish.planningSuffix", { n: planningCount }) : "",
+		settled: settledCount > 0 ? t("wish.settledSuffix", { n: settledCount }) : "",
 		achieved: achieved.length > 0 ? t("wish.achievedSuffix", { n: achieved.length }) : ""
 	})), (0, react.createElement)("div", { className: "xy-page-actions" }, (0, react.createElement)("button", {
 		className: "xy-btn",

package/lib/growth.js

@@ -117,7 +117,9 @@ export function resolveLevel(totalExperience) {
 export function growthSummary(store, today = todayIso()) {
     // 单遍任务索引批量新鲜化（freshWishes），替代逐愿望嵌套全表扫描 O(W×T)
     const wishes = freshWishes(store);
-    const completedWishes = wishes.filter((wish) => wish.progress >= 100).length;
+    // 达成口径与愿望卡一致（freshWishes 派生的 archived 谓词）：承诺全部完成且无未处理候选——
+    // 禁止在此重复写 progress >= 100 谓词（候选拦达成会漏掉，见 §5.2 规则 7）
+    const completedWishes = wishes.filter((wish) => wish.archived).length;
     let totalTasks = 0;
     let completedTasks = 0;
     for (const [, task] of store.domain.table('tasks').entries()) {

package/lib/preset/charts.js

@@ -1,4 +1,4 @@
-import { anchorOf, checkinCountIndex, freshTask, freshWishes, isClaimed } from '../store.js';
+import { anchorOf, checkinCountIndex, claimedDaysSum, freshTask, freshWishes, isClaimed } from '../store.js';
 import { computeCheckInStats } from '../growth.js';
 import { calculateOpportunityDates, todayIso } from '../opportunity.js';
 export const CHART_KEYS = [
@@ -137,23 +137,17 @@ export function buildChart(key, params, store, config, today = todayIso()) {
             };
         }
         case 'taskCompletionRate': {
-            let required = 0;
-            let completed = 0;
-            let hasPending = false;
-            for (const task of tasksOf(store, params.wishId)) {
-                required += task.requiredDays;
-                completed += task.completedDays;
-                if (!isClaimed(task))
-                    hasPending = true;
-            }
+            // 承诺口径（§5.2 规则 7）：分母只计已领取任务的应打天数——候选不进比率、不拖累完成率，
+            // 求和走 store.claimedDaysSum（与愿望进度公式族单一收口，消费侧不重复 isClaimed 聚合）
+            const { required, completed } = claimedDaysSum(tasksOf(store, params.wishId));
             if (required <= 0)
                 return undefined;
             const ratio = completed / required;
             return {
                 chartKey: key,
                 title: params.title ?? '任务完成率',
-                // 口径透明（诚实标注惯例）：分母含未领取任务的应打天数，与愿望进度同一公式
-                subtitle: `${completed}/${required} 天${hasPending ? '（含未领取任务）' : ''}`,
+                // 口径自述：副标题恒标注分母范围，读图无需区分有无候选（候选可见性由愿望卡与任务页承担）
+                subtitle: `${completed}/${required} 天（已领取任务）`,
                 chartType: 'arcbars',
                 data: [{ label: '完成率', value: completed, ratio }],
             };
@@ -308,18 +302,16 @@ function buildTailChart(key, params, store, today, days, limit, config) {
             return undefined;
         const shown = wishes.slice().sort((a, b) => b.progress - a.progress).slice(0, limit);
         const data = shown.map((wish) => ({ label: wish.title, value: wish.progress }));
-        // 长期尺度 = 计划口径（§5.2 规则 7）：分母含未领取任务的应打天数——愿望着含
-        // 未领取任务时副标题动态标注，与 taskCompletionRate 同款诚实口径
-        const pendingWishIds = new Set(tasksOf(store).filter((task) => !isClaimed(task))
-            .map((task) => task.wishId).filter((id) => id !== undefined));
-        const hasPending = shown.some((wish) => pendingWishIds.has(wish.wishId));
-        return { chartKey: key, title: params.title ?? '愿望进度', subtitle: hasPending ? '%（应打天数完成率，含未领取任务）' : '%（应打天数完成率）', chartType: 'bar', data };
+        // 承诺口径（§5.2 规则 7）：分母只计已领取任务，候选不进比率、不拖累进度；
+        // 副标题恒标注口径，候选的可见性由愿望卡候选行与任务页待领取组承担
+        return { chartKey: key, title: params.title ?? '愿望进度', subtitle: '%（已领取任务完成率）', chartType: 'bar', data };
     }
     if (key === 'wishAchievement') {
         const wishes = freshWishes(store);
         if (!wishes.length)
             return undefined;
-        const achieved = wishes.filter((wish) => wish.progress >= 100).length;
+        // 达成口径与愿望卡一致（freshWishes 派生的 archived 谓词）：承诺全部完成且无未处理候选
+        const achieved = wishes.filter((wish) => wish.archived).length;
         return {
             chartKey: key,
             title: params.title ?? '愿望达成率',

package/lib/preset/prompts.js

@@ -1,4 +1,4 @@
-import { CYCLE_LABELS, isClaimed, planForDay } from '../store.js';
+import { CYCLE_LABELS, freshWishes, isClaimed, planForDay } from '../store.js';
 import { todayIso } from '../opportunity.js';
 /** 未领取任务单列的用户可见文案：提示词上下文与工具输出共用同一份，防口径漂移（§5.2 规则 7）。 */
 export const UNCLAIMED_NOTE = '可领取后打卡；是否领取由用户决定，不得主动领取';
@@ -304,6 +304,13 @@ const WISH_GUIDE = `# 愿望操作指南
 - 用户未提供预计完成日期时：按主题推算合理期限（语言/乐器/学习类 3-6 个月，健身/健康类 2-3 个月，工作类 3 个月，具体事项类 1 个月），格式 yyyy-MM-dd
 - 用户已明确提供的信息（日期、描述）必须优先使用，不得覆盖；只在缺失时补全
 
+## 进度与达成规则（转述数字时如实说明）
+- 愿望进度 = 已领取任务的应打天数完成率；待领取的任务不算进进度——不拖累完成率，删除待领取的任务也不抬高进度
+- 愿望达成 = 进度 100% 且没有待领取任务：都做完但还有待领取的任务时，愿望停在「待收尾」（进度条满了，先不归档）——向用户说明并让其决定：领了继续，或删掉就达成
+- 不得为促成达成主动领取或删除任务（领取不可逆，删除是计划修订，都是用户的决定）
+- 还没开始的愿望显示「计划中」；进度只反映已承诺的部分，待领取的任务在任务页「待领取」组可见
+- 对用户说话用日常用语：统一说「待领取的任务」，不说「候选」「待结算」「口径」「锚点」这类内部词
+
 ## 注意事项
 - 分类名称优先2-3个中文字符（如：学习、健康、工作）`;
 const TASK_GUIDE = `# 任务操作指南
@@ -325,6 +332,8 @@ const TASK_GUIDE = `# 任务操作指南
 ## 状态流转
 pending（待领取）→ claim_task → in_progress（进行中）→ check_in 达标 → closed（完结）
 截止日过期未达标也会关闭（closed/expired）；对已过期任务延长截止日即触发重新开始。
+- 领取即扩大承诺范围：任务的应打天数计入所属愿望进度（进度只统计已领取任务），进度可能因此回落——回包会注明，如实转述
+- 待领取的任务不计入愿望进度、不拖累完成率，但进度满了而还有待领取的任务时愿望不达成（停在「待收尾」，等用户决定领取或删除收尾）
 
 ## 字段自动补全
 - 用户未指定截止日期时：按周期推算合理日期（daily→约30天后、weekly→8周后、monthly→3个月后、once→2周内），格式 yyyy-MM-dd 且不早于今天
@@ -381,7 +390,7 @@ const CHART_GUIDE = `# 图表展示指南（均为内部能力，通过 generate
 - 「一般几点打卡/打卡时间规律」→ chartKey=checkinTimeDistribution（雷达，按时段）
 - 「周几打卡最多/周活跃规律」→ chartKey=weeklyActivity（雷达，按星期）
 
-## 数据口径与相互区别（易混淆图表，按维度选）
+## 数据规则与相互区别（易混淆图表，按维度选）
 - checkinTrend vs checkinRateTrend：前者每日打卡次数，后者每日完成率（已打卡/应打卡）
 - checkinTrend vs checkinCalendar：前者近N天逐日折线，后者自然日网格热力图
 - checkinByCategory vs wishCategory：前者打卡次数按分类，后者愿望数量按分类
@@ -390,9 +399,9 @@ const CHART_GUIDE = `# 图表展示指南（均为内部能力，通过 generate
 - wishProgress vs wishAchievement：前者逐愿望进度排行（条形），后者整体达成率（环状）
 - checkinTimeDistribution vs weeklyActivity：前者一天内时段分布，后者星期几分布
 
-## 统计口径（回复涉及数字时按此措辞，不臆测）
+## 统计规则（回复涉及数字时按此措辞，不臆测）
 - 统计类图表只统计今天（含）以前的打卡；提前勾选的未来日期不计入统计，只体现在打卡日历热力图上
-- taskCompletionRate 分母含未领取任务的应打天数（与愿望进度同一公式），副标题会标注口径——解读时如实转述
+- taskCompletionRate 与 wishProgress 都只算已领取任务的应打天数（与愿望进度同一规则），待领取的不算进也不拖累完成率，副标题恒标注「已领取任务」——转述时说「只算已领取的任务」
 - checkinRateTrend 的无安排日（当日没有应打卡任务）不产出比率点，不代表完成率为 0%
 - checkinTrend/checkinCalendar 的取消打卡会即时反映（记录已撤销）；但已生成的图表卡是生成时刻的快照，回放时以卡片标注的「生成于」为准，需要最新数据应重新生成
 
@@ -486,7 +495,11 @@ export function registerPrompts(ctx, config) {
             const due = claimed.filter((item) => !item.checked);
             const done = claimed.length - due.length;
             const pending = plan.items.filter((item) => !isClaimed(item.task));
-            const openWishes = [...store.domain.table('wishes').entries()].map(([, w]) => w).filter((w) => !w.archived);
+            // 承诺口径读侧统一走 freshWishes：库存 progress/archived 只在写路径刷新，
+            // 达成闸门（候选拦达成）变更后库存位可与派生面分叉——上下文与列表/页面必须同源
+            const wishViews = freshWishes(store);
+            const openWishes = wishViews.filter((w) => !w.archived);
+            const settledWishes = wishViews.filter((w) => w.settled);
             const parts = [`<today_context>`, `今天是 ${today}。`];
             if (claimed.length > 0) {
                 parts.push(`今日打卡进度：${done}/${claimed.length}。`);
@@ -507,7 +520,11 @@ export function registerPrompts(ctx, config) {
                 }
             }
             if (openWishes.length > 0)
-                parts.push(`进行中的愿望 ${openWishes.length} 个。`);
+                parts.push(`进行中的愿望 ${openWishes.length} 个${settledWishes.length > 0 ? `（其中 ${settledWishes.length} 个待收尾：答应自己的都做完了，还有任务待领取，等用户决定领了继续还是删掉达成）` : ''}。`);
+            // 全达成与从零两态分开：曾一律说「还没有任何愿望」，完成全部愿望的老用户
+            // 被模型当新客介绍产品、被引导说「第一个愿望」，如实说成就再谈下一步
+            else if (wishViews.length > 0)
+                parts.push(`用户的 ${wishViews.length} 个愿望均已达成：先肯定这份坚持，再自然地邀请许下一个新愿望。`);
             else
                 parts.push('用户还没有任何愿望：新会话请友好自我介绍（你是星愿AI助手，帮用户拆解愿望、制定计划、坚持打卡），引导说出第一个愿望；已有会话则自然衔接。');
             parts.push('</today_context>');