Record teacher component removal integration
This commit is contained in:
@@ -4,6 +4,8 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- 2026-09-28:用户确认主目录交接后,将组件移除源 317def79129503062d15076585881ceae753055c 从 592920d 无冲突快进合入本地 main。老师对话栏移除想法板、结构图、流程图、对照及其专用交互,新问题不再请求组件输出;普通正文、快捷求助、历史数据及未确认旧请求的原身份恢复保留。产品/测试与源一致,沿用47项单测、12项布局、1项Electron以及类型/lint/构建验证。三份外来文档原样保留且未提交;未推送、打包或更新安装版。见[源记录](tasks/20260928-remove-teacher-cards-ef1cf59c.md)和[集成记录](tasks/20260928-merge-teacher-cards-a09c07f3.md)。本条取代下方历史记录中的可见讨论组件描述。
|
||||
|
||||
- 2026-09-28:按用户“不同项目应有不同会话”的明确纠正,无冲突合入源 `4b41c23a3a5e9da1a329b1b69930787a670163de`(基于 `a21a1f0`)。当前唯一聊天身份为账号+项目+下发智能体,历史、草稿、已读、SSE、接受锁和模型上下文按项目隔离;同项目保持持续聊天,无新话题入口。旧全局轮按已知项目归属导入,保留原文件与请求身份,使用新云端执行段;不明归属保留原档案。本文下方跨项目单聊天条目保留为历史,本条及修订咨询ADR为当前规则。产品/测试与已验证源一致,沿用382项相关测试、标准typecheck、scoped lint、Vite构建和3项Electron场景;扩展Main仍有66项既有诊断。三份外来文档未改动、未提交;未推送、打包、部署或调用收费模型。独立主动观察未合入,后续须适配项目聊天。见[修复源](tasks/20260928-agent-project-chat-6644c06d.md)与[本次集成](tasks/20260928-merge-agent-single-chat-9911c6df.md#project-isolation-correction-resume)。
|
||||
|
||||
- 2026-09-28:续接已批准的集成任务,将远程 `4495345fb0a9ea1abef8e603629ce9b51d73eb05` 与本地 `56da6b99111027e93ae34432fb52fdaa1a016384` 合并。保留账号/智能体唯一聊天、跨项目草稿及每轮项目/发布版本,接入共享手动刷新、顶栏悬停介绍和简化咨询栏;旧话题时代测试与说明已适配,未合入独立主动观察功能。120 项相关单测、标准类型检查、scoped lint、Vite 构建、3 项 Electron 交互与9项布局场景通过。3份原有未跟踪文档和远程来源记录保持原样;未推送、打包、部署或调用真实收费模型。见[续接集成记录](tasks/20260928-merge-agent-single-chat-9911c6df.md#remote-merge-resume)。
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
# Task: Integrate teacher conversation component removal
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20260928-merge-teacher-cards-a09c07f3
|
||||
- Mode: Integration
|
||||
- Branch: main
|
||||
- Worktree: D:\Datas\OthersProjects\makelore
|
||||
- Base commit: 592920da060276fa222ce15383bc22d2dde2eb49
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
|
||||
## Scope
|
||||
|
||||
- Integrate verified MakeLore source 317def7 into local main and promote its approved component-free teacher conversation contract.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- User explicitly approved releasing completed main owner 20260928-merge-agent-single-chat-9911c6df and adopting the three inspected foreign task records unchanged. Bundled release/start/status establish this integration task, main, absolute worktree, base and exclusive integration ownership.
|
||||
- Concurrent Task Gate and Planning Gate Passed. Reused unchanged same-base positioning/success/architecture context from implementation; refreshed entry/own/source tasks, memory index, current-state, teacher ADR/index, architecture/data-flow/domain and relevant evidence. Inspected 133 peer records; no missing paths. Historical placeholder scopes remain unknown without blocking dependencies. Independent observer work and read-only macOS diagnosis remain outside this merge.
|
||||
- Plan: fast-forward exact verified source, promote accepted contract, compare integrated product/test/source-record bytes, pass document boundaries, then commit/complete.
|
||||
- Preserve source records and three unrelated untracked files; no subagents, push, packaging, deployment or paid model calls.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Fast-forwarded local main from 592920da060276fa222ce15383bc22d2dde2eb49 to 317def79129503062d15076585881ceae753055c without conflicts.
|
||||
- Promoted the approved removal of visible discussion components and new-request component metadata to positioning, teacher ADR/index, architecture/data-flow, business rules and Integrated Through. Main history, old uncertain request recovery, ordinary chat and project isolation remain.
|
||||
- Three adopted foreign documents remain unmodified and uncommitted. Source worktree retained pending cleanup decision; branch and commits preserved.
|
||||
- Works Square product is unchanged; its companion routing-only record is not needed for the client main merge.
|
||||
|
||||
## Verification
|
||||
|
||||
- Fast-forward ancestry verified; source checkout is clean at 317def7 with Ready for Integration ownership.
|
||||
- Reuse source evidence because integration changes only project memory beyond source: 47 focused unit tests, 12 browser layouts, 1 Electron scenario, typecheck, scoped lint and production compilation passed.
|
||||
- Source browser fixture had KaTeX-font allow-list warnings under reused dependencies; source build warnings and live-model/installed-version limitations remain in its task record.
|
||||
- Final Git comparison confirms every non-project-document file and the imported source record match 317def7 exactly. git diff --check and task-aware documentation drift checks passed; the latter also verifies adopted foreign records remain unchanged. No repeat application suite is warranted.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- Await explicit cleanup decision for source task 20260928-remove-teacher-cards-ef1cf59c at D:\Datas\OthersProjects\.codex-worktrees\makelore\20260928-remove-teacher-cards-ef1cf59c, branch codex/20260928-remove-teacher-cards-ef1cf59c-remove-teacher-cards. Removal preserves branch/commits but removes checkout/build outputs; no cleanup performed.
|
||||
- Installed clients need an updated build; remote push is not included.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- Accepted source candidates promoted under user removal and merge instructions. Source task records remain read-only; no unresolved product-direction choice.
|
||||
|
||||
Reference in New Issue
Block a user