docs: integrate account UI refinements on main
This commit is contained in:
@@ -4,6 +4,15 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- 2026-09-20:任务 `20260920-merge-account-ui-38b91cd6` 经用户授权移交主目录登记,
|
||||
将 `e047877`、`c953126`、`fba5880` 从 `7fb4c60` 无冲突快进合入本地 `main`。
|
||||
智能体移除指定用户分享入口并改名“使用与接入”;微信绑定确认后自动收起二维码,
|
||||
显示连接成功与下一步;左下角重置卡列表隐藏已使用卡,确认兑换后立即移除该卡。
|
||||
后端授权、扫码身份、显式路由/启用、兑换与账本行为保持。产品树沿用三个顺序源,
|
||||
源记录的 50、24、9 项相关单测、类型检查、scoped lint、构建及三个 Electron 场景通过。
|
||||
三份原有未跟踪文档保留;未推送、打包或部署。实际微信与计费不以本地夹具代替验收。
|
||||
详见[集成记录](tasks/20260920-merge-account-ui-38b91cd6.md)。
|
||||
|
||||
- 2026-09-18:集成任务 `20260918-merge-agent-apply-86d41b2e` 收录 MakeLore 智能体应用入口源
|
||||
`b28f6f0`([源任务](tasks/20260918-agent-apply-visible-5a83c1e2.md))。
|
||||
已发布助手在工作区顶部直接应用已保存修改,并明确区分未保存、已保存待应用、
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
# Task: Integrate account UI refinements
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20260920-merge-account-ui-38b91cd6
|
||||
- Mode: Integration
|
||||
- Branch: main
|
||||
- Worktree: D:\Datas\OthersProjects\makelore
|
||||
- Base commit: 7fb4c60492da1cbbdd1b5b4fcf4198dcf1973684
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
|
||||
## Scope
|
||||
|
||||
- Fast-forward the three completed MakeLore UI sources e047877, c953126 and fba5880 into local main.
|
||||
- Promote the accepted desktop sharing removal, WeChat QR completion and redeemed-card visibility rules without changing source task records.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- User authorized main integration and explicitly confirmed release of old owner 20260918-land-agent-apply-2b594e7a and adoption of the three original untracked task documents. Preserve those files, branches and commits.
|
||||
- Official start/status establish this integration task on main at D:\Datas\OthersProjects\makelore, base 7fb4c60492da1cbbdd1b5b4fcf4198dcf1973684. Concurrent and Planning Gates passed; 144 peers retain ownership. The separate CloudCosts work is not included; historical incomplete peer records remain read-only with unknown coordination state and no identified dependency.
|
||||
- The explicit UI requests supply product authorization for the promotions. Backend grants, account identity, routing, billing and redemption contracts are unchanged. No push, packaging, installation or deployment is included; cleanup needs separate consent.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Fast-forwarded local main from 7fb4c60 to fba5880 without conflicts. This includes e047877 (selected-user sharing UI removed), c953126 (confirmed WeChat QR flow closes), and fba5880 (redeemed reset cards hidden).
|
||||
- Updated current state, cloud-agent ADR/decision index and reset-card business rule. Source records remain read-only imports; the stale sharing-source promotion path is resolved to canonical 30-worklog/current-state.md without rewriting that source.
|
||||
- The three original untracked documents remain outside the integration commit: 20260901-package-122-c5e8.md, 20260901-package-123-d7f3.md and 20260902-client-hang-diagnosis-a47c9e2b.md.
|
||||
|
||||
## Verification
|
||||
|
||||
- Before merge, ancestry confirmed a direct fast-forward. Source records show 50 sharing, 24 channel and 9 reset-card unit tests passing, plus typecheck, scoped lint, Vite builds and the three relevant Electron scenarios. These are sequential source commits; this merge adds no product changes.
|
||||
- Final product-tree and all three source-record comparisons against fba5880 passed with no differences. git diff --check and the task-aware document drift gate passed; the latter confirms the three adopted foreign documents are exactly unchanged.
|
||||
- Reused exact-source validation evidence because this fast-forward introduced no product changes or unresolved integration concerns. Local Host fixtures do not constitute live WeChat or billing acceptance.
|
||||
- All three retained source worktrees are clean, still on their recorded branches and commits, and their latest HEADs are ancestors of main. Their registry and committed task records identify ready managed sources, eligible for cleanup only with separate consent.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- Ship an updated client to expose these changes; no backend deployment is required by this UI-only change.
|
||||
- Offer separate cleanup of the three clean source worktrees after integration verification. Preserve the main checkout and all source branches/commits.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- Accepted and promoted: desktop access UI no longer offers selected-user sharing; confirmed WeChat binding closes transient QR UI with explicit next steps; account-menu inventory omits redeemed cards. These implement the user's requests and preserve existing backend behavior.
|
||||
Reference in New Issue
Block a user