docs: integrate account UI refinements on main
This commit is contained in:
@@ -6,7 +6,7 @@ Accepted / implemented,2026-09-11 集成。产品范围、三端分工、创
|
||||
|
||||
## Decision
|
||||
|
||||
- MakeLore Agents 面向个人创作者,支持配置试用、发布、指定账号分享、应用 API 与主动/定时任务;不引入组织、团队钱包或小智平台。
|
||||
- MakeLore Agents 面向个人创作者,支持配置试用、发布、微信渠道、应用 API 与主动/定时任务;桌面不再提供指定账号分享入口,不引入组织、团队钱包或小智平台。
|
||||
- Works Square 拥有账号、模块/模型资格、短期授权和唯一 Token Points 账本;Yuxi 拥有云配置、不可变版本、访问授权、原生 Request/FIFO/Run、worker、checkpoint、调度及资源;MakeLore Main 拥有凭据、网络、文件传输与账号隔离的本机恢复记录,Renderer 使用 typed Host API。
|
||||
- 创建者为自用、分享、API、定时、预览及知识流程中另行发起的聊天模型调用付款;知识库 embedding 由平台承担,不计算用户用量、词元点数或智能体金额预算。调用者独享会话/文件,应用是独立主体。创建者只查看应用调用状态、版本、时间及费用元数据,付款不增加内容权限。
|
||||
- 接受请求时固化身份、版本和配置;恢复与子调用沿用根 Request。每次真实模型调用检查当前访问资格,收费聊天调用另按当前服务端政策检查金额预算;embedding 不进入预算。
|
||||
@@ -49,6 +49,12 @@ Accepted / implemented,2026-09-11 集成。产品范围、三端分工、创
|
||||
|
||||
实现源 `6e6a8c92ddb66747a71af714809e2205292a0bf9`,见[源任务](../30-worklog/tasks/20260914-agent-ux-discussion-930b45dd.md)。相关回归、类型检查、lint、生产构建与 Electron fixture 验收已通过;全量测试仍有与本改动无关的既有 Pi runtime v6/v7 断言不一致。未进行真实收费模型或学生可用性研究,不据此宣称实际学习效果已验证。
|
||||
|
||||
## Desktop Access Entry(2026-09-20 amended / implemented)
|
||||
|
||||
用户明确移除“分享给指定用户”模块。桌面入口改名“使用与接入”,保留关联微信渠道、应用 API、费用、启停和版本管理;不再显示账号查找、分享授权管理或分享链接。该决定替代早期桌面指定用户分享入口,既有服务端授权、访问合同和历史费用记录不变,不自动撤销已存在的授权。
|
||||
|
||||
源 `e047877`,见[源任务](../30-worklog/tasks/20260919-remove-agent-user-share-64b7c21e.md)。50 项相关单测、类型检查、scoped lint、构建和 Electron 场景通过。
|
||||
|
||||
## Personal WeChat Publication(2026-09-13 accepted / implemented)
|
||||
|
||||
- The native Channels page owns account creation, local QR rendering, login verification, direct use by the scanning account, enable/pause, route switch, disconnect, safe activity and failed-file retry. Agent publication provides a linked-account summary. Pairing codes, contact invitations, audience configuration and caller management are removed.
|
||||
@@ -62,6 +68,7 @@ Source `2e710db0fb512f276fda8ae8a3939d366b34a972`, [source task](../30-worklog/t
|
||||
## User-Owned WeChat Accounts(2026-09-14 accepted / implemented)
|
||||
|
||||
- 用户在 MakeLore 的“渠道 > 微信”统一管理多个个人微信账号;账号可以先创建、扫码连接,再选择自己已发布的智能体。每个账号只有一个可选当前目标,多个账号可路由到同一智能体。
|
||||
- 2026-09-20:创建、验证码提交或轮询返回当前绑定会话已确认时,收起二维码和验证码输入、停止轮询,并显示该账号的连接成功与下一步指引。未选目标时引导选择和启用,已暂停时引导启用,已启用时引导回微信;不自动路由或启用。仅提交验证码不算成功,已连接账号重新连接时保留新二维码直到新会话确认。源 `c953126`,见[验证记录](../30-worklog/tasks/20260920-wechat-qr-completion-29ea4d7c.md)。
|
||||
- AgentBus Core 的 ChannelAccount 继续拥有账号、当前路由、代次和操作回执;无目标创建默认停用,请求体不增加 `enabled` 字段。清空目标必须停用,切换或清空路由保留微信登录凭据与 Provider generation。
|
||||
- Yuxi 提供用户级 `/api/makelore/channel-accounts` 与按操作 ID 恢复的接口。已有 Agent binding 仅索引当前路由,历史 caller/session 保留;旧渠道与无目标账号均按 Core 账号清单呈现。多个账号分别保留通知目标和会话隔离。
|
||||
- MakeLore Main 继续拥有凭据、请求与持久恢复,Renderer 只消费 typed Host API。智能体发布页改为关联渠道摘要与跳转;活动记录及微信对话定位到明确选中的账号。
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
|
||||
## Active Decisions
|
||||
|
||||
- [桌面智能体接入与微信绑定完成](ADR-2026-09-11-personal-cloud-agents.md):2026-09-20 amended / implemented;移除指定用户分享界面,入口改为“使用与接入”;确认微信绑定后收起二维码并提示下一步,路由和启用仍由用户明确操作。
|
||||
|
||||
- [知识文档处理与可用状态](ADR-2026-09-11-personal-cloud-agents.md#知识文档处理与可用状态):2026-09-15 amended / implemented;上传、导入、替换自动解析索引,持续刷新阶段与真实可用性,失败可恢复且保留旧资料。
|
||||
|
||||
- [知识库向量配置与平台承担](ADR-2026-09-11-personal-cloud-agents.md):2026-09-15 amended / implemented;embedding 由 Yuxi 配置并直连供应商,不计用户用量、词元点数或金额预算,聊天沿用原计费。
|
||||
|
||||
@@ -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.
|
||||
@@ -20,7 +20,9 @@
|
||||
it must not calculate the reset allowance, expose internal grant/audit fields, treat
|
||||
a shared wallet as redeemable, or claim success before Works Square confirms it.
|
||||
Confirmed fulfillment refreshes both the card list and authoritative Token Point V2
|
||||
balance.
|
||||
balance. The account-menu inventory omits redeemed cards, including immediately
|
||||
after confirmed redemption, and shows 暂无未使用的重置卡。 when no visible cards remain.
|
||||
Available and expired cards keep their existing behavior; server history is retained.
|
||||
- Account Library, Device Installation, project enablement, Agent assignment, runtime
|
||||
authorization, and billing are separate states. No read, install, acquisition, or
|
||||
assignment may silently advance another state. The code-owned project-wide identities
|
||||
|
||||
Reference in New Issue
Block a user