按规划继续工作

结论：修正 standalone 工具表 adapter 的工具查找顺序，使 M61 Q2 current-pocket 行为与 upstream rs274 -t -i 对齐，并将 tool_semantics 的 M61 事件纳入原生 side-by-side 基线。

wasm-port/docs/compatibility-validation.md

@@ -522,13 +522,13 @@ parser/conversion, arc geometry, offsets, feed-control and feed-state
 readback, comment/logging,
 numbered-parameter, local named-parameter plus `_ini[...]` lookup through
 `rs274 -i`, probing, spindle-orient, file-open reset, file-finish,
-tool-reload, tool select/change/length-offset, canned-cycle, state-tag motion,
-tool-table setup, and O-word subroutine fixtures, plus threading/rigid tap,
-NURBS dispatch boundaries, and the comparable canonical runtime edge and
-program-end cleanup calls. The same upstream baseline also validates the
-current negative fixture error text and absent canonical-event constraints.
-Fixtures that depend on standalone-only runtime
-adapters, HAL/tool-change state, upstream `rs274` output gaps such as
+tool-reload, tool select/change/length-offset, M61 current-tool-number update,
+canned-cycle, state-tag motion, tool-table setup, and O-word subroutine
+fixtures, plus threading/rigid tap, NURBS dispatch boundaries, and the
+comparable canonical runtime edge and program-end cleanup calls. The same
+upstream baseline also validates the current negative fixture error text and
+absent canonical-event constraints. Fixtures that depend on standalone-only runtime
+adapters, HAL state, upstream `rs274` output gaps such as
 `WAIT` or hidden NURBS control-point detail, or richer machine session state
 still need dedicated native LinuxCNC baselines.
 
@@ -539,10 +539,9 @@ while `namedparam_ini_semantics` now covers the local named-parameter and
 LinuxCNC `_ini[...]` subset against upstream `rs274 -i`. `state_tag_motion`
 now compares its motion events with upstream `rs274`, while `UPDATE_TAG`
 events remain a standalone state-tag capture boundary. `tool_semantics` now
-compares T/M6/G43/G49 canonical events with upstream `rs274`; M61
-current-pocket host-state behavior remains covered by the standalone fixture
-expectation, and `Interp::synch()` current/selected tool slot reads are
-covered by the native init harness.
+compares T/M6/G43/G49 and M61 canonical/current-pocket readback with upstream
+`rs274 -t -i`; `Interp::synch()` current/selected tool slot reads are covered
+by the native init harness.
 
 The kinematics probes currently cover LinuxCNC identity/trivial kinematics, the
 switchable `5axiskins` XYZBCW bridge-mill model, TRT `xyzac`/`xyzbc`

wasm-port/docs/drift-report.md

@@ -93,10 +93,10 @@ semantic rewrites:
   arc geometry, offsets, feed-control, comment/logging, numbered-parameter,
   local named-parameter plus `_ini[...]` lookup through `rs274 -i`, probing,
   spindle-orient, file-open reset, file-finish, tool-reload, and tool
-  select/change/length-offset, canned-cycle, state-tag motion, tool-table
-  setup, and O-word subroutine fixtures; it also covers threading/rigid tap,
-  NURBS dispatch boundaries, and comparable canonical runtime edge and
-  program-end cleanup calls. It now also checks the negative fixture set
+  select/change/length-offset plus M61 current-tool-number update,
+  canned-cycle, state-tag motion, tool-table setup, and O-word subroutine
+  fixtures; it also covers threading/rigid tap, NURBS dispatch boundaries, and
+  comparable canonical runtime edge and program-end cleanup calls. It now also checks the negative fixture set
   against upstream `rs274 -g` for expected error text and absent canonical
   event constraints.
   HAL-backed adapter-heavy fixtures, standalone modal-state assertions, and upstream
@@ -107,9 +107,9 @@ semantic rewrites:
   default `G73/G83` peck-clearance values for millimeter units.
 - `tool_table_setup` is now in the upstream `rs274` side-by-side baseline using
   a dedicated `rs274 -t` tool table and `-i` millimeter-unit INI boundary.
-- `tool_semantics` now compares its T/M6/G43/G49 canonical subset with
-  upstream `rs274 -t -i`; M61 current-pocket host-state behavior remains a
-  standalone fixture expectation.
+- `tool_semantics` now compares T/M6/G43/G49 plus M61
+  `CHANGE_TOOL_NUMBER` and current-pocket readback with upstream
+  `rs274 -t -i`.
 - `namedparam_ini_semantics` now compares local named-parameter behavior and
   `_ini[...]` lookup with upstream `rs274 -i`; the broader
   `namedparam_semantics` fixture still keeps `_hal[...]` lookup on the