docs: record consultation integration checkpoint and registry blocker
This commit is contained in:
@@ -4,6 +4,11 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- 2026-09-24：将客户端源 `8a157be4f62d073744164318e02185aebeaadc09` 从 `eb3dc85a2f0ed8457b7f24684c2da3ab192c2e46` 无冲突快进合入本地 `main`，包括预算修复 `de72b1cd945df373d09402a1cf3a0e9b34832f03` 及其源记录 `248776d8550d67de7ce30802a9f827d432c42a99`。
|
||||
咨询统一使用运营下发的智能体，移除固定老师／朋友角色、本地人设与按名称限制工具的逻辑；名称、头像、简介、欢迎语和推荐问题取自发布定义。旧合成朋友话题与草稿只读保留，不自动绑定或提交；项目级草稿、已发布版本、学生计费和现有讨论／主动跟进保持。
|
||||
输入预算区分近似模型 Token 与完整 JSON query 字节，固定配置超限单独提示，修复短问题被错误拦截。源覆盖 323 项相关用例，类型／lint／生产构建、2 项 Electron 交互和 13 项布局测试通过；预算源另有 289 项相关测试。扩展 Main 仍为基线 66 项诊断，无新增。合并未改产品实现，沿用源验证；未推送、打包、安装或做真实付费模型验收。
|
||||
见[统一智能体源任务](tasks/20260924-cloud-consultation-agents-82a6cd19.md)、[预算源任务](tasks/20260924-teacher-context-budget-3a9e6c81.md)和[本地集成记录](tasks/20260923-merge-yuxi-teachers-ml-9d623c5f.md)。本条更新当前咨询规则，旧条目保留为历史；集成文档门禁收尾状态以集成记录为准。
|
||||
|
||||
- 2026-09-23：任务 `20260923-merge-yuxi-teachers-ml-9d623c5f` 经用户确认交接主目录，将 `d20c818fe79bc5833cef15d99974b699dde71c6d` 从 `1f2ad3fb3a71b8b35fabb5b319cd3b54b4c2ebbe` 无冲突快进合入本地 `main`。配套三端已统一为 Yuxi 原生老师、WS 运营选择下发/同步/默认/启停、Main 三个项目/Pi 只读工具及学生账号付费；个人 Agents 保持创建者付费。MakeLore `d20c818` 已关闭 Yuxi 源记录中的子线程正文路由待办。
|
||||
源验证：51 项相关测试、typecheck、lint 和生产构建通过；原 Electron 老师选择/带回草稿流程通过。子线程正文混入先复现失败再修复，回归覆盖两种事件格式及断线游标。 产品文件与源一致，未重写实现；完整生产拓扑及真实供应商计费仍待发布验收。原有 3 份外来文档保持未提交原样，未推送或部署，无本次新增迁移。
|
||||
本条取代早期 Main 独立运行/不保存云端老师消息/运营重复编辑配置的现状说明，旧条目保留为历史。见[本次集成](tasks/20260923-merge-yuxi-teachers-ml-9d623c5f.md)和[源任务](tasks/20260923-yuxi-teachers-client-53ba33e2.md)。
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
- Worktree: D:\Datas\OthersProjects\makelore
|
||||
- Base commit: 1f2ad3fb3a71b8b35fabb5b319cd3b54b4c2ebbe
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
- Status: Blocked
|
||||
|
||||
## Scope
|
||||
|
||||
@@ -42,3 +42,18 @@
|
||||
## Promotion Candidates
|
||||
|
||||
- Applied the accepted source promotion candidates in integration mode. User confirmation already covers native Yuxi teachers, local read tools and student billing; no unresolved product decision remains.
|
||||
|
||||
## 2026-09-24 Consultation Follow-up Integration
|
||||
|
||||
- User requests merging the completed context-budget and server-agent unification follow-ups; explicitly declines the additional Yuxi tool explanation UI. Continue this Yuxi-teacher integration in its existing primary ownership. Current main starts at eb3dc85a2f0ed8457b7f24684c2da3ab192c2e46; exact source is 8a157be4f62d073744164318e02185aebeaadc09, including budget source 248776d8550d67de7ce30802a9f827d432c42a99 / product de72b1cd945df373d09402a1cf3a0e9b34832f03.
|
||||
- Project Context Loaded: official check/start/status passed with unchanged Identity, primary main ownership and exclusive integration lock. Read entry/planning gate, memory index, own and both source records, positioning, teacher ADR/decision index, system/module/data-flow, business rules/glossary/success criteria, current state, evidence/reflection/commitment/stale indexes. Compared all 110 owners with the prior source gate: only this integrator and the completed unification source changed; those records reread. Historical placeholder peer scopes remain unknown/read-only, with no concrete dependency. No new owners or conflicting decisions.
|
||||
- Main owns local access/history; Yuxi/Works own published personas and student billing. The user's explicit removal of fixed teacher/friend categories supersedes earlier fixed personas. Existing cloud contracts, version pins, scoped reads and generic structured discussion remain. Positioning templates are supplemented by README/AGENTS/verified code; old consultation statements are updated only for this accepted scope.
|
||||
- Planning and Integration Gates Passed. Plan: fast-forward the verified source, reconcile accepted canonical consultation/budget facts, prove source ancestry and product equality, run official documentation checks, commit and complete. Preserve all three previously adopted foreign documents byte-for-byte and exclude them from commits; source records stay read-only. No subagents, extra Yuxi UI, cloud changes, paid provider calls, push, packaging or deployment.
|
||||
|
||||
### Follow-up Outcome And Verification
|
||||
|
||||
- Fast-forwarded main from eb3dc85 to 8a157be without conflicts. Both completed source tips are ancestors; no product or test implementation was changed during integration. Exact source code comparison passes. README corrects one remaining old teacher/friend entry description. Canonical decisions, architecture, rules, glossary, evidence and integrated snapshot now state the user-approved server-agent and budget behavior. Source records are unchanged.
|
||||
- Reuse exact source verification: unification covers 323 relevant unit cases, standard typecheck, scoped lint, production build, 2 Electron interactions and 13 layouts; budget source covers 289 relevant cases. Expanded Main remains 66 baseline diagnostics with no additions. No new production/provider/installed-app validation is claimed. Whitespace check and referenced source-document existence pass. Three pre-existing untracked documents remain unchanged and excluded from this checkpoint.
|
||||
- Documentation completion is BLOCKED, not passed: the resumed integrator's original 1f2ad3f base predates later cross-machine main integration. Official check_doc_drift attributes six existing historical task records in that prior first-parent range to this task. All six predate this follow-up and are identical to eb3dc85. Five name source branches not retained locally; one records main, so the unchanged-source import rule cannot prove it. Neither source records nor the official checker are rewritten to suppress this result.
|
||||
- Retain this as an incomplete integration checkpoint. Proposed recovery requires explicit human approval: release this primary ownership with official release --force (required only because the three known foreign documents remain untracked), start a fresh integration task at the current committed main with --adopt-existing for exactly those unchanged documents, then run its full gates to close this merge. This records the true new integration boundary without changing old task bases, branch history or user files. No cleanup, reset, stash or automatic force release.
|
||||
- Both just-integrated managed source worktrees remain retained pending the separate cleanup decision after documentation closure: 20260924-teacher-context-budget-3a9e6c81 and 20260924-cloud-consultation-agents-82a6cd19. Branches and all source commits must remain preserved.
|
||||
|
||||
Reference in New Issue
Block a user