docs: 记录智能体对话渲染主分支集成
This commit is contained in:
1 parent
70a3212bce
commit
23aa927441
3 files changed
+50
No files matched your search
@@ -1,5 +1,9 @@
|
||||
# Data Flow
|
||||
|
||||
## Personal agent conversation process
|
||||
|
||||
Yuxi 按 Run 发出消息与工具 SSE → Main 原样代理 → Renderer 按 Run、线程、消息及工具身份累计。思考与 Markdown 正文分开,过程及工具输入/结果可折叠;工具开始后显示实际执行参数。Redis 数字游标抑制重放,终态历史按 Run/消息身份替换实时内容;历史读取失败或滞后保留当前片段。正式、预览、分享及渠道历史复用 CloudMessageBody。重新打开从 Yuxi 已保存记录恢复,Main 仅投影展示字段,不发送原始内部 metadata;完整历史过程要求配套 API 与客户端版本。见[实现证据](../30-worklog/tasks/20261012-agent-reasoning-39afbc21.md)。
|
||||
|
||||
## Personal cloud-agent avatars
|
||||
|
||||
Renderer 选择头像 → Main 原生文件选择及 5 MB 校验 → 当前账号的 Yuxi Makelore 凭据 → 原生公开图片存储 → 返回持久化引用 `icon` 与独立展示地址 `icon_url`。上传只更新未保存预览;创建/保存才写入 Yuxi `Agent.icon`,省略字段保留旧值、显式 null 移除。取消或失败保留现有头像,账号切换丢弃迟到结果。
|
||||
|
||||
@@ -4,6 +4,8 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- 2026-10-12:将个人智能体对话过程源 `70a3212bceb4128b34b7c9f58913d3cfea5b016e` 无冲突快进合入本地 `main`,配套 Yuxi 源为 `01f938733914427ba23b9bd3905146aeffe0278a`。客户端按 Run/消息展示独立思考、工具输入/结果/失败和流式 Markdown,重放去重并由终态历史替换;Yuxi 复用原生解析、工具记录和状态确认可见性,工具开始后的实际执行参数为展示依据。独立 Reviewer PASS,2270 项后端非 slow unit 通过/1 跳过、116 项客户端测试、2 项 HTTP/PostgreSQL、1 项 Electron 场景及类型、lint、构建通过。原有 3 份外来记录保持未跟踪、未改动;未推送或部署,真实模型和配套线上版本仍待验收。见[源记录](tasks/20261012-agent-reasoning-39afbc21.md)与[集成记录](tasks/20261012-integrate-agent-rendering-928ad75c.md)。
|
||||
|
||||
- 2026-10-12:按用户要求,将头像源 `235af24d6cf29b7e13b6be29fec9426fd4c6600c` 无冲突快进合入本地 `main`,配套 Yuxi 源为 `288ab7f84a9d02ca2b092c10da9f7b4ee7d66206`。智能体支持上传、替换、移除、未保存预览与列表/分享/版本展示,复用 Yuxi `Agent.icon` 和公开图片存储;Main 持有上传凭据并解析展示地址,发布头像由快照固定。独立 Reviewer 无阻断发现;98 项客户端测试、Renderer 类型检查、相关 lint、构建及 Electron 流程通过。Main 全量类型检查仍有既有错误,真实 OSS 和安装包未验收。3 份原有记录保持未提交;未推送或部署。见[源记录](tasks/20261012-agent-avatars-840d7fd7.md)和[本次集成](tasks/20261012-integrate-agent-avatars-a1f8e70c.md)。
|
||||
|
||||
- 2026-10-11:用户授权回滚与主目录交接,已在本地 main 合入源 658bf7d 和正式文档整合 9949328,合并提交 5ae6ffd204e4d5e0f8546544fa8fc8cc3e1c51f1。恢复旧 Works Square 登录/刷新/注销路径;产品与已验证源一致。原有三份任务文档保持未提交,未推送、部署或删除工作区。见[主分支记录](tasks/20261011-integrate-makelore-rollback-b8f41a62.md)。
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
# Task: Integrate Makelore personal agent rendering
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20261012-integrate-agent-rendering-928ad75c
|
||||
- Mode: Integration
|
||||
- Branch: main
|
||||
- Worktree: D:\Datas\OthersProjects\makelore
|
||||
- Base commit: 7a7d1f7fd89fff3b77f2fd8f1986da65fb6223ea
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
|
||||
## Scope
|
||||
|
||||
- Integrate the paired personal-agent reasoning, tool and Markdown presentation changes into the local main branch, then reconcile the source's accepted current-state and architecture facts.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- User authorizes the local merge, one fresh read-only Reviewer, and official release/adoption of the completed avatar integration ownership while preserving all five foreign records across repositories. No push, deployment or deletion is implied.
|
||||
- Concurrent and Planning Gates Passed. Official check/start/status verifies this identity, main branch, base and exclusive integration ownership. Read own record; integrated memory matches the already-read source base. Entry, positioning, current-state, decisions, architecture, domain, evidence, reflection and commitments are loaded; unchanged peer scope assessments remain applicable.
|
||||
- Preserve the adopted foreign documents unchanged and untracked. Source task records become read-only after their reviewed commits; integration notes remain in this record.
|
||||
- Plan: independent review and required backend unit gate; commit the reviewed source; fast-forward each main branch; promote agreed facts and verify ancestry, unchanged product tree and documentation ownership.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Fast-forwarded local main to independently reviewed source 70a3212bceb4128b34b7c9f58913d3cfea5b016e without conflicts; paired source 01f938733914427ba23b9bd3905146aeffe0278a is also integrated in its repository.
|
||||
- Accepted source current-state and data-flow promotion candidates. Source task, product, tests and public decision remain unchanged; no additional product code was introduced during integration.
|
||||
- All adopted foreign records remain unchanged and untracked, excluded from commits. No push or deployment.
|
||||
|
||||
## Verification
|
||||
|
||||
- Fresh independent reasoning_merge_review returned PASS after the effective-tool-input finding was fixed and regression-tested. Tool input assertions failed on the earlier implementation and passed after correction.
|
||||
- Final source evidence: 2270 backend non-slow unit passed / 1 skipped; 116 client focused tests; 2 real HTTP/PostgreSQL scenarios; 1 updated Electron-window fixture; typecheck, affected lint (2 pre-existing warnings), Ruff, production build, docs build and engineering verifier plus 62 checker tests.
|
||||
- Final compiled Electron scene uses deterministic test IPC/SSE; HTTP/PostgreSQL verifies actual authorization, native visibility and pagination. Real provider/deployed version behavior remains outside local proof.
|
||||
- Integration verifies source ancestry, unchanged reviewed product/test files, Git whitespace, official task-aware drift and preservation of the original foreign bytes.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- User explicitly chose to retain both source worktrees on 2026-10-12. Source task 20261012-agent-reasoning-39afbc21 and branch codex/20261012-agent-reasoning-39afbc21-agent-reasoning remain available; no retirement or deletion, including ignored dependencies/build artifacts, was performed.
|
||||
- Paired API/client deployment and real provider validation require a separate request. The optional-purpose task remains separate and was not included.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- Accepted source current-state and data-flow facts are promoted here; no unresolved semantic conflict or promotion remains.
|
||||
Reference in new issue
Block a user