chore(coding): record ML-03 correction
This commit is contained in:
@@ -96,6 +96,15 @@
|
|||||||
deleted from this coordinator after cherry-pick; the source worktree retains
|
deleted from this coordinator after cherry-pick; the source worktree retains
|
||||||
its own record. The ML-04 frontier is this integrated commit plus the
|
its own record. The ML-04 frontier is this integrated commit plus the
|
||||||
coordinator's cleanup/record commit.
|
coordinator's cleanup/record commit.
|
||||||
|
- Applied the ML-03 post-merge correctness correction from source commit
|
||||||
|
`0ecceef15d2e43190f835fd71a7a1478222f1ba8` onto coordinator frontier
|
||||||
|
`e15d8b7f51bea6b56558c981964082a4e76e523c`. The expected modify/delete
|
||||||
|
conflict was limited to the already-removed foreign ML-03 task record; it
|
||||||
|
was kept deleted, and the correction cherry-picked as feature commit
|
||||||
|
`6b36753` (`fix(coding): reject mismatched Data Service errors`). The Main
|
||||||
|
client now rejects known error codes paired with undocumented HTTP statuses
|
||||||
|
as `upstream_invalid_response`, with one focused regression test. The ML-04
|
||||||
|
frontier is `6b36753` plus this coordinator record commit.
|
||||||
|
|
||||||
## Verification
|
## Verification
|
||||||
|
|
||||||
@@ -150,6 +159,16 @@
|
|||||||
- `git diff --check`: passed.
|
- `git diff --check`: passed.
|
||||||
- Coordinator branch, clean state, exact ML-02 HEAD, and ML-03 commit parent
|
- Coordinator branch, clean state, exact ML-02 HEAD, and ML-03 commit parent
|
||||||
were verified before integration; cherry-pick completed without conflicts.
|
were verified before integration; cherry-pick completed without conflicts.
|
||||||
|
- ML-03 correction focused tests: the same 3-file command passed 18 tests after
|
||||||
|
integrating `6b36753`.
|
||||||
|
- ML-03 correction `pnpm typecheck`: passed.
|
||||||
|
- ML-03 correction `pnpm lint:check`: passed with 0 errors and the same 5
|
||||||
|
existing warnings in `src/pages/Home/index.tsx` and
|
||||||
|
`src/pages/Makelore/index.tsx`.
|
||||||
|
- ML-03 correction `git diff --check`: passed.
|
||||||
|
- Correction cherry-pick was applied from the exact `e15d8b7` coordinator
|
||||||
|
frontier; only the expected foreign task-record modify/delete conflict
|
||||||
|
occurred, and the source record remains in the source worktree.
|
||||||
|
|
||||||
## Follow-ups
|
## Follow-ups
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user