Plan canvas toolbar bindings

docs/modernization/build-inventory.md

@@ -269,7 +269,10 @@ Known local toolchain state:
 - `src/legacy_canvas_tool_services.*` is the current app-shell bridge for
   canvas toolbar tool selection, NodeCanvas stylus/input mode switching, and
   canvas hotkey/touch execution. It keeps those live paths on the `pp_app_core`
-  contracts while canvas mode tip visibility and pressure remapping now ask
+  contracts; `App::init_toolbar_draw()` now consumes the tested
+  `pp_app_core` draw-toolbar binding plan exposed through
+  `pano_cli plan-canvas-tool-toolbar` before retained button lookup and legacy
+  execution dispatch. Canvas mode tip visibility and pressure remapping now ask
   `PlatformServices`; `NodeCanvas::update_cursor()` now consumes
   `pp_app_core` canvas cursor visibility planning exposed through
   `pano_cli plan-canvas-cursor` before retained platform cursor dispatch.

docs/modernization/debt.md

@@ -75,6 +75,14 @@ agent or engineer to remove them without reconstructing context from chat.
   small-brush, not-painting, modifier, and malformed-brush states for
   automation. Legacy `Canvas`/`CanvasModePen` state reads and app cursor
   execution remain open under DEBT-0027.
+- 2026-06-05: DEBT-0027 was narrowed again. The full draw-toolbar binding set
+  now goes through tested `pp_app_core` planning, live
+  `App::init_toolbar_draw()` consumes the same plan for button handler wiring
+  and default draw-mode initialization, and `pano_cli plan-canvas-tool-toolbar`
+  exposes the binding ids, actions, button-class expectation, and default
+  selection for automation. Retained `NodeButton`/`NodeButtonCustom` lookup,
+  legacy `Canvas` mode mutation, picking/touch-lock state, and transform action
+  execution remain open under DEBT-0027.
 - 2026-06-05: DEBT-0033 was narrowed again. Canvas reset-camera defaults,
   viewport density, and cursor mode now go through tested `pp_app_core` plans
   and shared `src/legacy_canvas_view_services.*` execution. Live Tools
@@ -190,7 +198,7 @@ agent or engineer to remove them without reconstructing context from chat.
 | DEBT-0024 | Open | Modernization | Grid/heightmap/lightmap UI planning and execution dispatch now consume pure `pp_app_core` through `NodePanelGrid`, `pano_cli plan-grid-operation`, and the `GridUiServices` boundary; live execution is centralized in `src/legacy_grid_ui_services.*`, and retained CPU lightmap row dispatch now uses shared `parallel_for` instead of platform-specific Win32/Apple worker APIs, but the bridge still performs legacy image loading, OpenGL texture updates, nanort lightmap baking/progress, and `Canvas::draw_objects` commit execution | Preserve grid/lightmap behavior while moving renderable grid commands toward app/renderer/document boundaries | `pp_app_core_grid_ui_tests`; `pano_cli plan-grid-operation --kind render --float32 --texture-resolution 1024 --samples 32`; `ctest --preset desktop-fast --build-config Debug` | Grid heightmap/lightmap execution is owned by app/renderer/document services with `NodePanelGrid` acting only as UI adapter |
 | DEBT-0025 | Open | Modernization | Quick brush/color slot, mini-state, and size/flow slider preview planning now consume pure `pp_app_core` through `NodePanelQuick`, `pano_cli plan-quick-operation`, `pano_cli plan-quick-slider-preview`, and the `QuickUiServices` boundary; live slot/popup/restore/reset execution is centralized in `src/legacy_quick_ui_services.*`, and live slider callbacks now consume `pp_app_core` preview cursor/tip planning directly, but the bridge and panel adapter still mutate legacy quick UI widgets, `Brush` previews, color picker popup state, preset popup state, and direct legacy `CanvasModePen`/`CanvasModeLine` fields | Preserve quick-panel behavior while quick brush/color and slider preview commands move toward a brush/app command boundary with safer automation coverage | `pp_app_core_quick_ui_tests`; `pano_cli plan-quick-operation --kind brush --current-index 0 --slot-index 2`; `pano_cli plan-quick-operation --kind restore --brush-index 2 --color-index 1 --fire-event`; `pano_cli plan-quick-slider-preview --slider-x 10 --slider-y 20 --slider-height 40 --zoom 2 --pen-mode --no-line-mode`; `ctest --preset desktop-fast --build-config Debug` | Quick-panel selection, popup, restore, reset, brush preview, color execution, and slider preview mode updates are owned by injected app/brush/UI/canvas services with no legacy quick-panel adapter, popup adapter, direct brush-preview mutation, or direct `CanvasMode*` field writes |
 | DEBT-0026 | Open | Modernization | Toolbar history command planning and canvas hotkey history dispatch now consume pure `pp_app_core` through `App::init_toolbar_main`, `NodeCanvas`, `pano_cli plan-history-operation`, and the `HistoryUiServices` boundary, and both live callers share `src/legacy_history_services.*` for saturated legacy history metrics and execution, but the shared live bridge still mutates legacy `ActionManager` stacks directly | Preserve undo/redo/clear behavior while moving action history toward document/app command services | `pp_app_core_history_ui_tests`; `pano_cli plan-history-operation --kind undo --undo-count 2`; `pano_cli plan-history-operation --kind clear --undo-count 2 --redo-count 1 --memory-bytes 4096`; `ctest --preset desktop-fast --build-config Debug` | Undo/redo/clear execution is owned by injected document/app history services with no legacy `ActionManager` adapter |
-| DEBT-0027 | Open | Modernization | Canvas draw-tool toolbar command, canvas input mode switching, active-state planning/execution dispatch, canvas cursor visibility planning, and canvas keyboard/touch command planning now consume pure `pp_app_core` through `App::init_toolbar_draw`, `App::update`, `NodeCanvas`, `pano_cli plan-canvas-tool`, `pano_cli plan-canvas-tool-state`, `pano_cli plan-canvas-cursor`, `pano_cli plan-canvas-hotkey`, `CanvasToolServices`, and `CanvasHotkeyServices`, live toolbar/input/hotkey execution is centralized in `src/legacy_canvas_tool_services.*`, `NodeCanvas::update_cursor()` consumes the cursor planner before retained platform cursor dispatch, and canvas mode tip visibility plus pressure remapping now route through `PlatformServices`, but the bridge still mutates or reads legacy `Canvas` mode state, `CanvasModePen` drawing/resizing/picking state, touch-lock state, transform copy/cut action objects, `ActionManager`, legacy save UI, legacy stroke size controls, and cursor/UI singletons | Preserve current toolbar, stylus eraser, cursor visibility, keyboard, and touch command behavior while canvas input/tools move toward an app/document command boundary | `pp_app_core_canvas_tool_ui_tests`; `pp_app_core_canvas_hotkey_tests`; `pp_platform_api_tests`; `pano_cli plan-canvas-tool --kind copy`; `pano_cli plan-canvas-tool-state --mode draw --picking --touch-lock`; `pano_cli plan-canvas-cursor --mode draw --visibility small-brush --brush-size 9.5`; `pano_cli plan-canvas-cursor --visibility small-brush --bad-size`; `pano_cli plan-canvas-hotkey --event key-up --key z --ctrl --undo-count 2`; `pano_cli plan-canvas-hotkey --event key-up --key s --ctrl --shift`; `ctest --preset desktop-fast --build-config Debug` | Canvas tool selection, toolbar state refresh, picking, touch lock, stylus eraser/key mode switching, cursor visibility planning/execution, hotkey/touch command dispatch, save hotkeys, history hotkeys, brush-size hotkeys, and transform action execution are owned by injected app/document/canvas services with no legacy toolbar/canvas adapter |
+| DEBT-0027 | Open | Modernization | Canvas draw-tool toolbar command, full draw-toolbar binding planning, canvas input mode switching, active-state planning/execution dispatch, canvas cursor visibility planning, and canvas keyboard/touch command planning now consume pure `pp_app_core` through `App::init_toolbar_draw`, `App::update`, `NodeCanvas`, `pano_cli plan-canvas-tool`, `pano_cli plan-canvas-tool-toolbar`, `pano_cli plan-canvas-tool-state`, `pano_cli plan-canvas-cursor`, `pano_cli plan-canvas-hotkey`, `CanvasToolServices`, and `CanvasHotkeyServices`, live toolbar/input/hotkey execution is centralized in `src/legacy_canvas_tool_services.*`, `NodeCanvas::update_cursor()` consumes the cursor planner before retained platform cursor dispatch, and canvas mode tip visibility plus pressure remapping now route through `PlatformServices`, but the bridge still mutates or reads legacy `Canvas` mode state, `CanvasModePen` drawing/resizing/picking state, touch-lock state, transform copy/cut action objects, `ActionManager`, legacy save UI, legacy stroke size controls, retained `NodeButton`/`NodeButtonCustom` lookup, and cursor/UI singletons | Preserve current toolbar, stylus eraser, cursor visibility, keyboard, and touch command behavior while canvas input/tools move toward an app/document command boundary | `pp_app_core_canvas_tool_ui_tests`; `pp_app_core_canvas_hotkey_tests`; `pp_platform_api_tests`; `pano_cli plan-canvas-tool --kind copy`; `pano_cli plan-canvas-tool-toolbar`; `pano_cli plan-canvas-tool-state --mode draw --picking --touch-lock`; `pano_cli plan-canvas-cursor --mode draw --visibility small-brush --brush-size 9.5`; `pano_cli plan-canvas-cursor --visibility small-brush --bad-size`; `pano_cli plan-canvas-hotkey --event key-up --key z --ctrl --undo-count 2`; `pano_cli plan-canvas-hotkey --event key-up --key s --ctrl --shift`; `ctest --preset desktop-fast --build-config Debug` | Canvas tool selection, toolbar binding, toolbar state refresh, picking, touch lock, stylus eraser/key mode switching, cursor visibility planning/execution, hotkey/touch command dispatch, save hotkeys, history hotkeys, brush-size hotkeys, and transform action execution are owned by injected app/document/canvas services with no legacy toolbar/canvas adapter |
 | DEBT-0028 | Open | Modernization | Canvas clear command planning and execution dispatch now consume pure `pp_app_core` through `App::init_toolbar_main`, Layer menu clear, `pano_cli plan-canvas-clear`, and the `DocumentCanvasClearServices` boundary, and toolbar/Layer-menu clear share `src/legacy_document_canvas_services.*`, but the shared live bridge still calls legacy `Canvas::clear`, which records `ActionLayerClear`, clears the current layer/frame, and marks legacy `Canvas::I` unsaved | Preserve clear-current-layer behavior while canvas/document commands move toward document/app command services | `pp_app_core_document_canvas_tests`; `pano_cli plan-canvas-clear --r 0 --g 0.1 --b 0.2 --a 0.3`; `pano_cli plan-canvas-clear --no-canvas`; `pano_cli plan-layer-menu --command clear --current-index 1 --current-name Paint`; `ctest --preset desktop-fast --build-config Debug` | Canvas clear execution, undo recording, dirty-state updates, and clear color handling are owned by injected document/app services with no legacy canvas-clear adapter |
 | DEBT-0029 | Open | Modernization | Image import route planning and execution dispatch now consume pure `pp_app_core` through the File menu, `pano_cli plan-image-import`, and the `DocumentImageImportServices` boundary, and live File-menu import execution is centralized in `src/legacy_app_shell_services.*`, but the bridge still loads images with legacy `Image`, calls legacy `Canvas::import_equirectangular`, or configures legacy import transform mode directly | Preserve current File > Import behavior while image import moves toward document/app/asset command services | `pp_app_core_document_import_tests`; `pano_cli plan-image-import --width 4096 --height 2048`; `pano_cli plan-image-import --width 1024 --height 1024`; `ctest --preset desktop-fast --build-config Debug` | Image loading, equirectangular import, transform-placement import, and failure reporting are owned by injected document/app/asset services with File-menu callbacks acting only as adapters and no legacy image-import adapter |
 | DEBT-0030 | Open | Modernization | File export menu action planning and execution dispatch now consume pure `pp_app_core` through the File menu, `pano_cli plan-export-menu`, and the `DocumentExportMenuServices` boundary, and live execution is centralized in `src/legacy_app_shell_services.*`, but the bridge still opens legacy export dialogs and then reaches legacy canvas/render/video export code | Preserve current export menu behavior while export command execution moves toward document/app/renderer/video services | `pp_app_core_document_export_tests`; `pano_cli plan-export-menu --kind png`; `pano_cli plan-export-menu --kind animation-mp4 --demo`; `pano_cli plan-export-menu --kind layers --no-canvas`; `ctest --preset desktop-fast --build-config Debug` | Export menu routing, license gating, target creation, image/layer/cube/depth/animation/timelapse execution, and error reporting are owned by injected document/app/renderer/video services with File-menu callbacks acting only as UI adapters and no legacy export adapter |

docs/modernization/roadmap.md

@@ -611,6 +611,12 @@ camera, grid, copy, cut, fill, mask, flood-fill, pick, and touch-lock toolbar
 commands. Canvas tool execution now dispatches through `CanvasToolServices`
 in `src/legacy_canvas_tool_services.*` before legacy toolbar selection, `Canvas`
 mode, pen picking, touch-lock, and transform state adapters continue.
+`pano_cli plan-canvas-tool-toolbar` now exposes the full draw-toolbar binding
+set, including button ids, select/toggle actions, button-class expectation, and
+the default draw-mode initialization. Live `App::init_toolbar_draw` consumes the
+same app-core toolbar plan to install handlers and apply the initial draw tool
+while retained `NodeButton`/`NodeButtonCustom` lookup and legacy canvas-tool
+execution remain under `DEBT-0027`.
 `pano_cli plan-canvas-tool-state` exposes the matching toolbar active-state
 refresh used by `App::update` before legacy `Canvas` mode state remains the
 source of truth. `NodeCanvas` stylus eraser mode switching consumes the same
@@ -1911,8 +1917,9 @@ Results:
   grid/heightmap/lightmap planning as JSON automation.
 - `pp_app_core_canvas_tool_ui_tests` passed, covering toolbar mode selection,
   copy/cut transform action planning, pick no-op outside draw mode, and
-  touch-lock toggling, plus toolbar active-state derivation for draw, copy, and
-  bucket modes, service dispatch ordering, pick no-op execution, and malformed
+  touch-lock toggling, full draw-toolbar binding projection, binding-to-action
+  conversion, plus toolbar active-state derivation for draw, copy, and bucket
+  modes, service dispatch ordering, pick no-op execution, and malformed
   execution payload rejection.
 - `pp_app_core_canvas_hotkey_tests` passed, covering E draw/erase toggles,
   Ctrl+Z/Ctrl+Shift+Z history planning, Ctrl+S/Ctrl+Shift+S document save
@@ -1931,10 +1938,20 @@ Results:
   `pano_cli_plan_canvas_tool_touch_lock_smoke`, and
   `pano_cli_plan_canvas_tool_rejects_unknown` passed and expose live draw
   toolbar planning as JSON automation.
+- `pano_cli_plan_canvas_tool_toolbar_smoke` and
+  `pano_cli_plan_canvas_tool_toolbar_rejects_unknown` passed and expose the
+  full live draw-toolbar binding set as JSON automation.
 - `pano_cli_plan_canvas_tool_state_draw_smoke`,
   `pano_cli_plan_canvas_tool_state_copy_smoke`, and
   `pano_cli_plan_canvas_tool_state_rejects_unknown` passed and expose draw
   toolbar active-state refresh as JSON automation.
+- `PanoPainter`, `pano_cli`, and `pp_app_core_canvas_tool_ui_tests` built on
+  Windows after `App::init_toolbar_draw()` moved to the app-core toolbar
+  binding plan; the build required the documented clean after a stale
+  debug-info `LNK1103`.
+- Android arm64 headless `pp_app_core`, `pano_cli`, and
+  `pp_app_core_canvas_tool_ui_tests` built after the same toolbar binding
+  planner change.
 - `pp_app_core_document_canvas_tests` passed, covering clear-current-layer
   undo/dirty intent, no-canvas no-op behavior, and invalid clear color
   rejection, service dispatch color forwarding, no-op execution preservation,