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

docs: complete abort main integration

Browse Source
This commit is contained in:
brother7
2026-09-01 15:39:36 +08:00
parent 8590071790
commit 52e2a97a12
4 changed files with 95 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,8 +6,10 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
- Conversation abort reconciliation source
`d2ef37bc4d7d3609cec0a55c4ae8ffb2734696d5` from task
`20260901-conversation-abort-stall-6f4c2a91` is prepared for local `main`
promotion by integration task `20260901-promote-conversation-abort-7b4e2c91`.
`20260901-conversation-abort-stall-6f4c2a91` is merged into local `main` as
`85900717906713d8343c2087eade904aead8f111` through verified candidate
`599d1847f73a590690cbac2ee1c5bf36e8cd83f1` by task
`20260901-merge-abort-main-a83d4c71`.
Both visible abort actions now call the Main-owned abort route and then silently
reload only the target Conversation's authoritative Snapshot. This closes the
installed 1.2.1 case where Pi had already recorded bash results and a final