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

merge: integrate Robot device selection fix

Browse Source
This commit is contained in:
brother7
2026-08-16 16:21:25 +08:00
parent 3b4669722e 87a95b4cec
commit 4ff1a7a846
3 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.project-docs/30-worklog/tasks/20260813-sync-push-main-9c2f71.md
View File

@@ -276,9 +276,16 @@ Gate result:
- Created no-ff merge commit `1d0878bb5b18e9b17b147a4d43ea0861913da785` with `953b0f4` as first parent and source `fd9b5b4` as second parent.
- The first independent integration review returned `FAIL` on two uncovered edges: HTTP polling-only idle could release the run while leaving its compaction running, and cold busy hydration could misclassify a historical compaction Part as current.
- Closed both findings in `7a811590c4943b7b1b7ea5f3b4d3ce3ce05622a5`: compact polling idle now completes only the matching `runID + generation` event before queue release, and cold hydration keeps a native Part running only when current transcript state provides a matching running identity. Historical compactions remain completed during a later ordinary busy run.
- On 2026-08-16, staged a local no-ff merge of reviewed Robot device-selection source `87a95b4` onto `main` at `3b46697`; Git reported no textual conflicts. The source task record remains intact on the source commit and feature branch and is excluded from the `main` result to preserve task-document ownership boundaries.
- The Robot workspace now derives device rows and per-agent counts from the selected agent, keeps activation-code binding fixed to that current agent, and retains the editable agent selector only for explicit reassignment. This is a Makelore-only correction and does not add device discovery, manual MAC entry, or new Works Square/Xiaozhi endpoints.
- This resumption intentionally performs a local merge only. It does not fetch or push, and the existing remote-authentication follow-up for this long-running integration task remains unchanged.
## Verification
- 2026-08-16 Robot device-selection merged-tree regression selection — 3 files / 92 tests passed.
- Robot device-selection merged-tree `pnpm run typecheck` and scoped ESLint — passed.
- Staged/unstaged whitespace checks and unmerged-entry checks — passed before independent review.
- Independent Robot device-selection integration review — `PASS`, no P0-P3 findings; it confirmed selected-agent device isolation and counts, immutable bind target, retained reassignment semantics, source-record exclusion, and the Makelore-only API boundary.
- 2026-08-16 Guided Hotspot source final Sol re-review — `PASS`, no P0-P3 findings after fixed-address copy recovery, conflict/already-bound overview refresh, and complete state-machine/remount coverage were added.
- Staged local-main merge Robot selection — 3 files / 91 tests passed.
- Staged local-main merge `pnpm test` — 156 files / 1755 tests passed.