forked from molecule-ai/molecule-core
Conflicts arose because PR #892 base commits (MemoryInspectorPanel creation, A2A overlay) had already landed on main via a different merge path, and last-tick merges (#876, #888) had modified Toolbar, SidePanel, and test fixtures. Resolution strategy: - Toolbar.tsx, SidePanel.tsx, Canvas.a11y.test.tsx, Canvas.pan-to-node.test.tsx, MemoryInspectorPanel.test.tsx: take main (strictly newer, already contains the branch's A2A overlay content plus subsequent a11y/UX fixes) - MemoryInspectorPanel.tsx: take main (543 lines with semantic search) + apply sanitizeId() helper from #904 + update bodyId prefix to mem-body- - DetailsTab.tsx: take main (has #875 Field/useId + #878 deleteButtonRef/focus) + apply alertdialog structure from #905 while preserving focus management Mechanical conflict resolution by triage-agent; no logic changes beyond the four a11y fixes already in the branch (#902-#905). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| __tests__ | ||
| app | ||
| components | ||
| hooks | ||
| lib | ||
| store | ||
| stores | ||
| styles | ||
| types | ||
| middleware.ts | ||