@starwish-ai/xingyuan-dsh 0.5.9 → 0.6.1

package/CHANGELOG.md

@@ -5,6 +5,68 @@ 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.1] - 2026-09-05
+
+### Added
+- **Wishes page: collapsible task area**: each wish card's task list now starts collapsed
+  behind a full-row disclosure toggle ("N 个任务" / "Tasks (N)" with a chevron that flips
+  when expanded). Card-header progress, the "N to claim" badge and the wrap-up guidance
+  line stay visible while collapsed; expanding restores the task rows exactly as before —
+  claim / check-in buttons and the inline per-task detail expansion now nest inside the
+  card-level disclosure. Achieved wishes collapse the same way; wishes without tasks keep
+  their existing hint and get no toggle. Expanded cards are remembered across view-tab
+  switches (view-state snapshot). Client-only: no API, storage or write-path changes.
+
+### Changed
+- Wish-card copy de-jargoned: the empty hint now says "还没有任务" (was "暂无下属任务")
+  and the delete-wish confirmation says "它的任务…" (was "下属任务…"), matching the
+  established plain-wording standard for user-facing surfaces.
+
+## [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,19 @@ 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.noTasks': '还没有任务——在对话里告诉我，让我为它推荐打卡任务',
+    'wish.tasksToggle': '{n} 个任务',
     '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': '告诉我想实现什么，我来帮你拆解成可坚持的计划。',
@@ -121,7 +129,7 @@ export const ZH_DICT = {
     'confirm.undoAt': '确定撤销「{name}」在{date}的打卡吗？进度将回退。',
     'confirm.futureAt': '「{name}」的打卡日 {date} 在今天之后，提前打卡表示承诺当天完成。确认？',
     'confirm.deleteTask': '确定删除任务「{name}」吗？其打卡记录与微行动拆解将一并删除，不可恢复。',
-    'confirm.deleteWish': '确定删除愿望「{name}」吗？下属任务、打卡记录与微行动拆解将一并删除，不可恢复。',
+    'confirm.deleteWish': '确定删除愿望「{name}」吗？它的任务、打卡记录与微行动拆解将一并删除，不可恢复。',
     'confirm.renameCategory': '把分类「{old}」下的全部愿望改名为「{new}」吗？（共 {count} 个）', 'confirm.deleteEmptyCategory': '删除空分类「{name}」的自定义颜色吗？',
     // --- 今日页 ---
     'today.title': '今日打卡 · {date}',
@@ -343,10 +351,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 +487,18 @@ 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.tasksToggle': 'Tasks ({n})',
     '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 +765,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

@@ -1,11 +1,11 @@
-/** 愿望页：进行中/已达成愿望卡 + 下属任务行（领取/打卡/详情聚合）+ 愿望删除 + 分类管理 + 快速新建。 */
+/** 愿望页：进行中/已达成愿望卡 + 任务区披露（默认收起，展开集合跨标签保留）+ 任务行（领取/打卡/详情聚合）+ 愿望删除 + 分类管理 + 快速新建。 */
 import { createElement, useState, useSyncExternalStore } from 'react';
 import { postAction } from '../api.js';
 import { useXyT } from '../i18n.js';
 import { softConfirmDanger, useActionGuard, usePageData, useScrollTopOnMount, useStableScrollbar } from '../hooks.js';
 import { getViewState, setViewState } from '../view-state.js';
 import { todayHintStore } from '../tab-hint.js';
-import { PageEmpty, PageError, PageSkeleton, StaleBanner, toast, IconTrash, focusPageTitle } from '../ui.js';
+import { PageEmpty, PageError, PageSkeleton, StaleBanner, toast, IconTrash, IconChevronDown, focusPageTitle } from '../ui.js';
 import { categoryVars } from '../../category-color.js';
 import { TaskLine } from './task-line.js';
 import { formatMediumDate } from './format.js';
@@ -34,13 +34,30 @@ export function WishesPage() {
             next.add(taskId);
         setExpanded(next);
     };
+    // 愿望卡任务区披露集合（默认收起）：愿望页定位总览，任务明细是二级信息；打卡/领取
+    // 主触点在今日页/日历，卡头进度/待领取数/收尾指引不受收起影响。展开集合与任务详情
+    // 展开集分开（两个粒度互不覆盖），同样经 view-state 跨标签切换保留
+    const [tasksOpen, setTasksOpenRaw] = useState(() => getViewState('wishes.tasksOpen', new Set()));
+    const setTasksOpen = (next) => { setViewState('wishes.tasksOpen', next); setTasksOpenRaw(next); };
+    const toggleTasks = (wishId) => {
+        const next = new Set(tasksOpen);
+        if (next.has(wishId))
+            next.delete(wishId);
+        else
+            next.add(wishId);
+        setTasksOpen(next);
+    };
     if (page.error !== undefined && page.data === undefined)
         return createElement(PageError, { message: page.error, onRetry: () => void page.reload() });
     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 +87,59 @@ 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, 
+        // 任务区披露：有任务时默认收起为整行开关（文本=任务数 + 箭头，aria-controls 关联
+        // 容器 id；展开后开关仍在列表上方兼作收起控件）；无任务维持原文案，不出开关
+        ...(wish.tasks.length > 0
+            ? [
+                createElement('button', {
+                    key: 'wishtoggle',
+                    className: 'xy-wishtoggle',
+                    'aria-expanded': tasksOpen.has(wish.wishId),
+                    'aria-controls': `xy-wishtasks-${wish.wishId}`,
+                    onClick: () => toggleTasks(wish.wishId),
+                }, t('wish.tasksToggle', { n: wish.tasks.length }), createElement(IconChevronDown)),
+                tasksOpen.has(wish.wishId)
+                    ? createElement('div', { key: 'wishtasks', id: `xy-wishtasks-${wish.wishId}`, className: 'xy-wishtasks' }, ...wishTasks(wish))
+                    : null,
+            ]
+            : [createElement('div', { key: 'notasks', 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/styles.js

@@ -236,9 +236,9 @@ body[data-ds-dark-theme] .xy-badge-cat{background:hsl(var(--cat-h,275) calc(var(
 }
 .xy-btn:active:not(:disabled){transform:scale(.97)}
 .xy-btn:disabled{opacity:.55;cursor:not-allowed}
-.xy-btn:focus-visible,.xy-input:focus-visible,.xy-cell:focus-visible,.xy-seg-btn:focus-visible,.xy-toggle:focus-visible,.xy-swatch:focus-visible,.xy-growth-col:focus-visible{outline:2px solid var(--xyd-accent);outline-offset:2px}
+.xy-btn:focus-visible,.xy-input:focus-visible,.xy-cell:focus-visible,.xy-seg-btn:focus-visible,.xy-toggle:focus-visible,.xy-swatch:focus-visible,.xy-growth-col:focus-visible,.xy-wishtoggle:focus-visible{outline:2px solid var(--xyd-accent);outline-offset:2px}
 /* 触控基线：消除移动端双击缩放延迟与系统点按高亮（交互反馈统一由 hover/active 承担） */
-.xy-btn,.xy-seg-btn,.xy-cell,.xy-swatch,.xy-toggle,.xy-growth-col{touch-action:manipulation;-webkit-tap-highlight-color:transparent}
+.xy-btn,.xy-seg-btn,.xy-cell,.xy-swatch,.xy-toggle,.xy-growth-col,.xy-wishtoggle{touch-action:manipulation;-webkit-tap-highlight-color:transparent}
 /* 行内按钮：≥26px 命中目标（卡片头/操作行的紧凑主战按钮） */
 .xy-btn-inline{margin-left:auto;padding:3px 10px;font-size:12px;min-height:26px;display:inline-flex;align-items:center}
 /* 图标幽灵键（≥26px 方形命中目标）：编辑/删除这类高频重复的行内低频动作降噪——
@@ -321,9 +321,17 @@ body[data-ds-dark-theme] .xy-badge-cat{background:hsl(var(--cat-h,275) calc(var(
   .xy-wishcard:hover{border-color:var(--dsw-alias-border-l2);box-shadow:var(--xyd-shadow-card)}
 }
 .xy-progress-num{margin-left:auto;flex:none;color:var(--dsw-alias-label-secondary);font-size:12px;font-variant-numeric:tabular-nums}
-/* 卡内子任务列表：分隔线替代裸 gap 堆叠；行留白由任务行自身 padding 承担。
+/* 任务区披露开关（默认收起，展开集合走 view-state）：整行按钮继承虚线分隔（原属
+ * .xy-wishtasks 的卡内分界），箭头旋转只动 transform；按钮文本含任务数（口语化，无状态词）。 */
+.xy-wishtoggle{margin-top:8px;display:flex;align-items:center;gap:5px;width:100%;padding:8px 0 5px;background:none;border:0;border-top:1px dashed var(--dsw-alias-border-l1);color:var(--dsw-alias-label-secondary);font:inherit;font-size:13px;cursor:pointer;text-align:left}
+@media (hover:hover) and (pointer:fine){
+  .xy-wishtoggle:hover{color:var(--dsw-alias-label-primary)}
+}
+.xy-wishtoggle svg{flex:none;transition:transform .15s ease}
+.xy-wishtoggle[aria-expanded='true'] svg{transform:rotate(180deg)}
+/* 卡内子任务列表：分隔线已上移到披露开关，行留白由任务行自身 padding 承担。
  * 结构为 [taskline, detail?, taskline, detail?] —— 相邻选择器精确命中「新任务行」边界。 */
-.xy-wishtasks{margin-top:8px;display:flex;flex-direction:column;border-top:1px dashed var(--dsw-alias-border-l1)}
+.xy-wishtasks{display:flex;flex-direction:column}
 .xy-wishtasks>.xy-taskline+.xy-taskline,.xy-wishtasks>.xy-detail+.xy-taskline{border-top:1px solid var(--dsw-alias-border-l1)}
 .xy-wishtasks>.xy-taskline{padding:9px 0}
 /* 展开详情是卡内最后一个元素时收掉底部留白：卡片自身 padding 已承担收尾 */
@@ -581,6 +589,6 @@ body[data-ds-dark-theme] .xy-dcell-checked{color:var(--xyd-on-dcell)}
 @media (prefers-reduced-motion: reduce){
   .xy-skel,.xy-toast,.xy-modal-backdrop,.xy-modal{animation:none}
   .xy-toast-out,.xy-modal-backdrop.xy-modal-out,.xy-modal-out .xy-modal{transition:none}
-  .xy-bar-fill,.xy-btn,.xy-toggle,.xy-toggle::after,.xy-wishcard,.xy-cell,.xy-daynum,.xy-seg-btn,.xy-input,.xy-swatch,.xy-grouprow{transition:none}
+  .xy-bar-fill,.xy-btn,.xy-toggle,.xy-toggle::after,.xy-wishcard,.xy-cell,.xy-daynum,.xy-seg-btn,.xy-input,.xy-swatch,.xy-grouprow,.xy-wishtoggle svg{transition:none}
 }
 `;

package/lib/client/ui.js

@@ -200,6 +200,13 @@ export function IconEdit() {
         style: { display: 'block', fill: 'none', stroke: 'currentColor', strokeWidth: 2, strokeLinecap: 'round', strokeLinejoin: 'round' },
     }, createElement('path', { d: 'M13.5 5l5.5 5.5' }), createElement('path', { d: 'M5 19l1-4L17.5 3.5a2.12 2.12 0 0 1 3 3L9 18z' }));
 }
+/** 下箭头线性图标（披露开关方向指示；展开态旋转由宿主按钮的 aria-expanded 选择器驱动）。 */
+export function IconChevronDown() {
+    return createElement('svg', {
+        viewBox: '0 0 24 24', width: 14, height: 14, 'aria-hidden': 'true', focusable: 'false',
+        style: { display: 'block', fill: 'none', stroke: 'currentColor', strokeWidth: 2, strokeLinecap: 'round', strokeLinejoin: 'round' },
+    }, createElement('path', { d: 'M6 9l6 6 6-6' }));
+}
 // ===== 页面三态 =====
 export function PageError(props) {
     return createElement('div', { className: 'xy-page-center' }, createElement('div', { className: 'xy-empty-title' }, props.message), createElement('button', { className: 'xy-btn', onClick: props.onRetry }, props.retryLabel ?? t('common.retry')));