diff --git a/.project-docs/30-worklog/current-state.md b/.project-docs/30-worklog/current-state.md index 44af5149..56ffc2c6 100644 --- a/.project-docs/30-worklog/current-state.md +++ b/.project-docs/30-worklog/current-state.md @@ -4,6 +4,11 @@ This file is the integrated default-branch snapshot. Feature tasks record progre ## Integrated Through +- 2026-09-22:原老师集成任务后续将修复源 `28e0decbc34c10cd69c9261d554aed448bb8e145` 从 `e5d271b` 快进合入本地 `main`。 + 修复发布定义中默认思考强度 `effort=null` 被当作具体强度而误报不可用的问题,旧话题可继续使用其固定版本;显式强度与真实不支持选项的校验保持。 + 源复现测试先失败,修复后 25 项相关测试、类型检查、scoped lint 与 Vite 全目标构建通过;合并产品树与已测源完全一致。 + 用户确认发布关闭思考后新建话题可用;当前修复尚未推送、打包或安装,不代表现有安装版已更新。见[集成记录](tasks/20260922-merge-coding-teacher-client-b80c376f.md)和[修复源记录](tasks/20260922-teacher-unavailable-6d8fa721.md)。 + - 2026-09-22:集成任务 `20260922-merge-coding-teacher-client-b80c376f` 以 `00ad84c` 合入教师源 `9242a40d874984159d71494ac6510f3a248e89c0`,保留当前永久点数钱包。 项目自动创建默认 Agent,会话直接位于项目下;右侧老师按云端发布配置独立答疑,回答可追加主草稿。 唯一 Sidebar 引用冲突保留项目切换引用及主线钱包行为;合并代码 112 项相关单测、Renderer typecheck、Vite 全目标构建与 3 项 Electron 流程通过。 diff --git a/.project-docs/30-worklog/tasks/20260922-merge-coding-teacher-client-b80c376f.md b/.project-docs/30-worklog/tasks/20260922-merge-coding-teacher-client-b80c376f.md index b1dff4ca..6a5760a4 100644 --- a/.project-docs/30-worklog/tasks/20260922-merge-coding-teacher-client-b80c376f.md +++ b/.project-docs/30-worklog/tasks/20260922-merge-coding-teacher-client-b80c376f.md @@ -28,6 +28,7 @@ ## Outcome +- 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. - User authorized old wallet recovery: renamed the invalid residual directory to D:/Datas/OthersProjects/.codex-worktrees/makelore/20260922-permanent-points-client-7f4c9a2e-recovery-backup, preserving all contents and its node_modules junction. Official release-missing cleared the exact stale reservation; integration claim then succeeded. @@ -36,6 +37,7 @@ ## Verification +- 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. - Three real Electron scenarios passed on that merged build: teacher answer appends the main draft without submission; first PI Conversation editable under 500 ms and submits before Snapshot; wallet reopens unpaid frozen order and refreshes only after confirmed credit. Controlled local responses, no real payment/model charge. @@ -46,6 +48,8 @@ ## Follow-ups +- 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. - Keep both client recovery-backup directories. The teacher checkout cleanup is partial: its registered worktree is released, residual backup retained. Removing backup bytes is not claimed as completed. - Existing primary dependency directory is incomplete; validation used isolated dependencies. Reinstalling the primary development environment is separate work. @@ -53,3 +57,12 @@ ## Promotion Candidates - Applied the user-approved source candidates in integration mode; no unresolved teacher product decision remains. + +## Teacher reasoning fix integration follow-up + +- User confirms new teacher topic works and explicitly requests fixing the old-topic error; continue this same teacher integration task for source 28e0dec, without changing topic-version policy. +- Project Context Loaded: official same-task integration resume/status Passed on main at e5d271b; identity, original base 0cf67be, absolute primary worktree and exclusive integration lock match. Read own/source records and entry; reuse unchanged teacher ADR and required memory, architecture/domain/evidence/reflection/commitment context loaded during this conversation. Read 123 peer task records, 17 unknown placeholder scopes; no concrete semantic conflict. Source task is clean and Ready for Integration. +- Planning Gate Passed. Main is the exact source base, so integrate with fast-forward; source product verification remains applicable. Preserve the three adopted foreign docs unchanged and exclude them from commits. No subagents, remote push, deployment, installed-file changes or paid calls. +- 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.