wangxuming/makelore
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

docs(coding-teacher): integrate read-only project context repair

Browse Source
This commit is contained in:
brother7
2026-09-22 19:21:26 +08:00
parent 44e754a43e
commit 9b5324fb2e
9 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.project-docs/30-worklog/current-state.md
View File

@@ -4,6 +4,13 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
## Integrated Through
- 2026-09-22：原老师集成任务后续将修复源 `44e754a43ec6d286fee6b6492da0d1f9347770e6` 从 `7f5131e` 无冲突快进合入本地 `main`。
老师能按需只读当前项目目录、UTF-8 代码/配置和本轮捕获的主会话/老师话题原文；长来源及上一轮老师回答保留最近问答节选，避免上下文被全部丢弃或连续追问失败。
Main 原生工具结果续接最多六批后要求最终回答，检查账号与取消状态，计算完整输入预算并累计模型用量；不启动 Pi、不写文件或执行命令。
原 no-tools/no-files 决策按用户明确要求更新；固定发布版本和既有话题保持，无云端协议或数据库修改。
产品树与已测源完全一致，沿用源 56 项相关测试、1 项 Electron 流程、Renderer typecheck、scoped lint 和构建证据；Main 全量严格类型检查仍有既有 66 条诊断。
三份外部任务文档原样保留；未推送、打包、安装或真实模型计费验收。见[集成记录](tasks/20260922-merge-coding-teacher-client-b80c376f.md)、[源记录](tasks/20260922-teacher-context-c40f7b51.md)与[老师决定](../10-decisions/ADR-2026-09-22-coding-teacher.md)。
- 2026-09-22：原老师集成任务后续将修复源 `28e0decbc34c10cd69c9261d554aed448bb8e145` 从 `e5d271b` 快进合入本地 `main`。
修复发布定义中默认思考强度 `effort=null` 被当作具体强度而误报不可用的问题，旧话题可继续使用其固定版本；显式强度与真实不支持选项的校验保持。
源复现测试先失败，修复后 25 项相关测试、类型检查、scoped lint 与 Vite 全目标构建通过；合并产品树与已测源完全一致。

11
.project-docs/30-worklog/tasks/20260922-merge-coding-teacher-client-b80c376f.md
View File

@@ -12,6 +12,7 @@
## Scope
- Continue this same teacher integration for approved context/file repair source `44e754a43ec6d286fee6b6492da0d1f9347770e6`, with bounded canonical capability and evidence reconciliation.
- Integrate approved coding teacher source 9242a40d874984159d71494ac6510f3a248e89c0 into the local primary branch and reconcile canonical memory; preserve unrelated dirty documents.
## Intent And Constraints
@@ -28,6 +29,7 @@
## Outcome
- Context/file follow-up: fast-forwarded local main from `7f5131e` to tested source `44e754a43ec6d286fee6b6492da0d1f9347770e6` without conflicts. Current-project read-only tools, captured conversation originals, recent Q&A excerpts, continuous follow-ups and native model continuations are now integrated. Source task record imported unchanged. Canonical teacher capability, data flow, domain, decision/index, evidence and provenance updated under existing user authorization; client wording now describes the Operations-selected current teacher rather than asserting singleton management.
- Follow-up: fast-forwarded main from e5d271b to 28e0decbc34c10cd69c9261d554aed448bb8e145, including prior source diagnosis commit 2c20314 and the unchanged source task record. Teacher wire DTO now represents nullable effort; model preparation canonicalizes null/missing default strength before validation. Topic definitions remain pinned, no data or Operations migration. User confirmed the new-topic workaround works.
- Merged source 9242a40d874984159d71494ac6510f3a248e89c0 into main in 00ad84c, preserving main permanent wallet source a1cce42. Only conflict was Sidebar refs: retain projectEntryIntentRef, do not reintroduce removed tokenPointRequestIdRef/resetCardRequestIdRef. README auto-merge retains both features.
- Promoted accepted project/default-Agent/teacher contracts; amended ADR-008 old first-Agent entry using the already-approved product decision. Source task record imported unchanged.
@@ -37,6 +39,7 @@
## Verification
- Context/file follow-up: official same-task start/status passed on primary main, preserving the original task base, lock and three adopted foreign documents. Read 105 peer records (17 placeholder scopes remain unknown/read-only) and source outcome/promotions. Source HEAD is clean and committed Ready for Integration. Source is a descendant of main; after fast-forward `git diff 44e754a -- README.md electron shared src tests package.json pnpm-lock.yaml` is empty. Reuse exact-source 56 unit tests, 1 Electron scenario, Renderer typecheck, scoped ESLint and full Vite build from the immediately preceding repair turn; no product changes or conflict require duplicate runs. Main's existing 66 diagnostics remain disclosed. Task-aware drift validates canonical edits and unchanged foreign/source documents.
- Follow-up: latest source ancestry and clean/committed Ready for Integration status confirmed. After fast-forward, git diff 28e0dec -- electron shared src tests returned empty. Reuse exact-source 25 teacher/model regression tests, Renderer typecheck, scoped ESLint and Vite full build from the preceding turn; no new product code or merge conflict justified repeating them. Review the actual merged code and task-aware documentation drift to catch import or ownership mistakes.
- Primary pnpm typecheck initially failed because tsc was absent from the existing primary dependency directory; no product diagnostic ran there.
- Copied the resolved merged Git index to C:/Users/7brot/AppData/Local/Temp/teacher-merge-client-20260922-b80c376f, linked source-verified dependencies, then completed all checks before source cleanup: 112 relevant unit tests (teacher service/UI, workspace/project entry/schema/conversation store, wallet/sidebar/billing client/routes), pnpm run typecheck and pnpm run build:vite passed.
@@ -48,6 +51,7 @@
## Follow-ups
- Context/file repair is merged locally only; push, rebuilt installer and real teacher/provider billing acceptance are not included. Source checkout `D:/Datas/OthersProjects/.codex-worktrees/makelore/20260922-teacher-context-c40f7b51`, branch `codex/20260922-teacher-context-c40f7b51-teacher-context`, remains available pending separate cleanup consent. Branch/commits must be retained on retirement; no earlier backup cleanup is implied.
- Reasoning-fix source checkout 20260922-teacher-unavailable-6d8fa721 at D:/Datas/OthersProjects/.codex-worktrees/makelore/20260922-teacher-unavailable-6d8fa721, branch codex/20260922-teacher-unavailable-6d8fa721-teacher-unavailable: user explicitly approved cleanup. Official retire failed with Directory not empty even with process-local Git core.longpaths=true; the Git marker and worktree registration were gone, while 2,996 dependency Junctions and file residuals remained. A bounded native residual-delete attempt was rejected before execution by automatic approval (blocked by policy, no more detail). No deletion retry or policy workaround was attempted. Preserved all residual bytes in the same-parent 20260922-teacher-unavailable-6d8fa721-recovery-backup directory, then official release-missing succeeded. Source branch still resolves to 28e0dec. Cleanup is partial: registry released, backup retained. No cleanup requested for the separate server read-only contract task or old backups.
- The running installed app still needs a release containing 28e0dec; this follow-up performs local main integration only, without push/package/install or paid model verification.
- No remote push, installer or deployment. Pair with server 93ece7c6; migrate 0095 then configure/test/publish/enable teacher and verify real gateway billing.
@@ -66,3 +70,10 @@
- Plan: import the exact tested fix, record integrated provenance and default-effort semantics, check task-document boundaries, commit/complete and offer source checkout cleanup separately.
- Follow-up Task Documentation Gate: inspected source-to-main product equality, provenance and clean imported source record; task-aware drift passed with the original three foreign documents unchanged. Only current-state and this integration record are committed for the follow-up.
## Teacher context and project-file integration follow-up
- User explicitly requests merging the completed `44e754a` repair. This continues the same cloud coding teacher integration, not an unrelated task inheriting main ownership.
- Project Context Loaded: official same-task integration resume/status Passed, branch main at `7f5131e`, primary worktree and original base `0cf67be` match; exclusive integration lock retained. Read entry/memory-index/own record, positioning, current-state, decision-index/teacher ADR, architecture/domain, evidence/reflection/commitment/stale indexes and source record. Read 105 peer scopes; 17 existing placeholder scopes are unknown, with no concrete conflict affecting this exact source.
- Project goal remains Electron Main ownership of runtime/auth/storage; active scope is current-project/current-conversation read-only teacher access. User's explicit reading request supersedes no-tools/no-files; user already selected Operations-owned current teacher behavior. No additional approval is needed for these decisions. Positioning template gaps are supplied by README/AGENTS and verified source. Real provider acceptance remains unverified.
- Planning Gate and Integration Gate Passed. Applied fast-forward, canonical capability/evidence reconciliation and exact product-tree check; no source product changes, subagents, push, installation, deployment or paid requests. Source and foreign task records remain unchanged. Task Documentation Gate checked the actual committed/working range from the original task base and preserved ownership boundaries.