diff --git a/docs/content/en/api-reference/editor/page.mdx b/docs/content/en/api-reference/editor/page.mdx
index d3c58871..585e5ee5 100644
--- a/docs/content/en/api-reference/editor/page.mdx
+++ b/docs/content/en/api-reference/editor/page.mdx
@@ -85,6 +85,8 @@ firmware that violates those barriers.
 interface EditorCommitRequest {
   baseRevision: number;
   mutationId: string;
+  gestureId?: string;
+  gestureIds?: string[];
   changes: EditorPatchV1;
 }
 
@@ -113,6 +115,12 @@ intended for immediate IPC retries; the in-memory deduplication window does not
 survive an app restart. Reusing a retained ID for a different request is
 rejected.
 
+`gestureId` is the representative history gesture. `gestureIds` carries every
+preview session coalesced into the request so the committed event can echo the
+complete set. Both fields are optional and accept UUIDs only. The `gestureIds`
+array can contain at most 32 entries, and the combined unique set across both
+fields is also limited to 32 IDs.
+
 If the submitted values are already current, the result keeps the current
 revision, returns an empty `changedFields`, and emits no canonical committed
 event. Compatibility wrappers may still project their legacy per-field refresh
@@ -153,6 +161,8 @@ the human-readable `message`.
 type EditorCommitErrorCode =
   | 'REVISION_CONFLICT'
   | 'VALIDATION_FAILED'
+  | 'TOO_MANY_GESTURE_IDS'
+  | 'INVALID_GESTURE_ID'
   | 'PAIRED_UPDATE_REQUIRED'
   | 'MUTATION_ID_REUSED'
   | 'IO_ERROR';
@@ -169,13 +179,15 @@ interface EditorCommitError {
 }
 ```
 
-| Code                     | Meaning                                                    | `retryable` |
-| ------------------------ | ---------------------------------------------------------- | ----------- |
-| `REVISION_CONFLICT`      | `baseRevision` is stale; read, reconcile, and commit again | `true`      |
-| `VALIDATION_FAILED`      | The completed document violates an editor validation rule  | `false`     |
-| `PAIRED_UPDATE_REQUIRED` | A structural key change omitted its paired collection      | `false`     |
-| `MUTATION_ID_REUSED`     | The same mutation ID was used for a different request      | `false`     |
-| `IO_ERROR`               | The document could not be persisted                        | `true`      |
+| Code                     | Meaning                                                                   | `retryable` |
+| ------------------------ | ------------------------------------------------------------------------- | ----------- |
+| `REVISION_CONFLICT`      | `baseRevision` is stale; read, reconcile, and commit again                | `true`      |
+| `VALIDATION_FAILED`      | The completed document violates an editor validation rule                 | `false`     |
+| `TOO_MANY_GESTURE_IDS`   | `gestureIds` exceeds 32 entries or the combined unique set exceeds 32 IDs | `false`     |
+| `INVALID_GESTURE_ID`     | A gesture ID is not a UUID within the 64-byte limit                       | `false`     |
+| `PAIRED_UPDATE_REQUIRED` | A structural key change omitted its paired collection                     | `false`     |
+| `MUTATION_ID_REUSED`     | The same mutation ID was used for a different request                     | `false`     |
+| `IO_ERROR`               | The document could not be persisted                                       | `true`      |
 
 `details.currentRevision`, `details.validationCode`, or `details.field` is
 included when it applies to the error.
@@ -192,6 +204,8 @@ interface EditorCommittedV1 {
   schemaVersion: 1;
   revision: number;
   mutationId: string;
+  gestureId?: string | null;
+  gestureIds?: string[];
   origin?: string;
   changedFields: EditorField[];
   patch: EditorPatchV1;
diff --git a/docs/content/en/declarative-api/page.mdx b/docs/content/en/declarative-api/page.mdx
index 186c2199..e28fba9a 100644
--- a/docs/content/en/declarative-api/page.mdx
+++ b/docs/content/en/declarative-api/page.mdx
@@ -309,6 +309,7 @@ Use `resizable` option to let users resize elements directly in the grid.
 ### resizable
 
 Set `resizable: true` to show 8-direction resize handles:
+The initial size is 200×150. A saved or estimated size takes precedence when available.
 
 ```javascript
 dmn.plugin.defineElement({
diff --git a/docs/content/en/guide/installation/page.mdx b/docs/content/en/guide/installation/page.mdx
index 72c0a7de..49651d73 100644
--- a/docs/content/en/guide/installation/page.mdx
+++ b/docs/content/en/guide/installation/page.mdx
@@ -9,7 +9,7 @@ description: How to download, install, and run DM Note
 
 DM Note can be downloaded from GitHub Releases.
 
-1. Download the latest version from the [GitHub Releases page](https://github.com/lee-sihun/DmNote/releases).
+1. Download the latest version from the [GitHub Releases page](https://github.com/DmNote-App/DmNote/releases).
 2. Extract the downloaded ZIP file to your desired location.
 3. Run the `DM Note.exe` file.
 
diff --git a/docs/content/en/guide/settings/page.mdx b/docs/content/en/guide/settings/page.mdx
index 4543913c..3331b11e 100644
--- a/docs/content/en/guide/settings/page.mdx
+++ b/docs/content/en/guide/settings/page.mdx
@@ -39,6 +39,13 @@ When enabled, the overlay window ignores mouse events (click-through) allowing y
   When locked, you cannot directly interact with the overlay.
 </Callout>
 
+### Detaching the Properties Panel
+
+Use the detach button at the top of the properties panel to move it into a separate window at any time. Key, note, and counter editing as well as layer management work the same in the detached window.
+
+- Use the X button on the detached window or the reattach button at the top of the panel to return it inline.
+- While detached, picking a gradient color anchor on the canvas is limited.
+
 ## Graphics Settings
 
 ### Rendering Option
diff --git a/docs/content/ko/api-reference/editor/page.mdx b/docs/content/ko/api-reference/editor/page.mdx
index 8e1c447e..84e1f38e 100644
--- a/docs/content/ko/api-reference/editor/page.mdx
+++ b/docs/content/ko/api-reference/editor/page.mdx
@@ -75,15 +75,17 @@ console.log(revision, document.keyPositions);
 고장까지 애플리케이션이 절대 보장할 수는 없습니다.
 
 <Callout type="info">
-  앱의 Undo/Redo도 편집 컬렉션 6개, 커스텀 탭 정보, 선택 모드, 카운터,
-  프리셋 설정, 탭별 노트 설정을 백엔드 store 트랜잭션 한 번으로 함께 복원합니다.
-  이 내부 커맨드는 공개 플러그인 API로 노출하지 않습니다.
+  앱의 Undo/Redo도 편집 컬렉션 6개, 커스텀 탭 정보, 선택 모드, 카운터, 프리셋
+  설정, 탭별 노트 설정을 백엔드 store 트랜잭션 한 번으로 함께 복원합니다. 이
+  내부 커맨드는 공개 플러그인 API로 노출하지 않습니다.
 </Callout>
 
 ```typescript
 interface EditorCommitRequest {
   baseRevision: number;
   mutationId: string;
+  gestureId?: string;
+  gestureIds?: string[];
   changes: EditorPatchV1;
 }
 
@@ -111,6 +113,11 @@ console.log('커밋된 revision:', result.revision);
 방지는 즉시 IPC 재시도용이며 앱을 재시작하면 유지되지 않습니다. 아직 보관 중인
 ID를 다른 요청에 재사용하면 거절됩니다.
 
+`gestureId`는 히스토리 병합의 대표 게스처입니다. `gestureIds`는 요청 하나로
+합쳐진 모든 프리뷰 세션을 전달하여 committed 이벤트가 전체 집합을 echo하게
+합니다. 두 필드는 모두 선택 사항이며 UUID만 허용합니다. `gestureIds` 배열은
+항목이 최대 32개이고, 두 필드를 합친 고유 ID 집합도 최대 32개로 제한됩니다.
+
 제출한 값이 이미 현재 값과 같으면 현재 revision과 빈 `changedFields`를
 반환하고 canonical committed 이벤트는 발행하지 않습니다. 호환 wrapper는 예전
 필드별 refresh 이벤트를 한 번 투영할 수 있지만, 같은 `mutationId` 재시도에서는
@@ -151,6 +158,8 @@ await dmn.editor.commit({
 type EditorCommitErrorCode =
   | 'REVISION_CONFLICT'
   | 'VALIDATION_FAILED'
+  | 'TOO_MANY_GESTURE_IDS'
+  | 'INVALID_GESTURE_ID'
   | 'PAIRED_UPDATE_REQUIRED'
   | 'MUTATION_ID_REUSED'
   | 'IO_ERROR';
@@ -167,13 +176,15 @@ interface EditorCommitError {
 }
 ```
 
-| 코드                     | 의미                                              | `retryable` |
-| ------------------------ | ------------------------------------------------- | ----------- |
-| `REVISION_CONFLICT`      | `baseRevision`이 오래됨. 다시 조회·조정한 뒤 커밋 | `true`      |
-| `VALIDATION_FAILED`      | 완성된 문서가 에디터 검증 규칙을 위반함           | `false`     |
-| `PAIRED_UPDATE_REQUIRED` | 키 구조 변경에 짝 컬렉션이 빠짐                   | `false`     |
-| `MUTATION_ID_REUSED`     | 같은 mutation ID를 다른 요청에 재사용함           | `false`     |
-| `IO_ERROR`               | 문서를 디스크에 저장하지 못함                     | `true`      |
+| 코드                     | 의미                                                      | `retryable` |
+| ------------------------ | --------------------------------------------------------- | ----------- |
+| `REVISION_CONFLICT`      | `baseRevision`이 오래됨. 다시 조회·조정한 뒤 커밋         | `true`      |
+| `VALIDATION_FAILED`      | 완성된 문서가 에디터 검증 규칙을 위반함                   | `false`     |
+| `TOO_MANY_GESTURE_IDS`   | `gestureIds`가 32개를 넘거나 합친 고유 ID가 32개를 초과함 | `false`     |
+| `INVALID_GESTURE_ID`     | gesture ID가 UUID가 아니거나 64바이트를 초과함            | `false`     |
+| `PAIRED_UPDATE_REQUIRED` | 키 구조 변경에 짝 컬렉션이 빠짐                           | `false`     |
+| `MUTATION_ID_REUSED`     | 같은 mutation ID를 다른 요청에 재사용함                   | `false`     |
+| `IO_ERROR`               | 문서를 디스크에 저장하지 못함                             | `true`      |
 
 오류에 해당할 때 `details.currentRevision`, `details.validationCode`,
 `details.field`가 함께 제공됩니다.
@@ -190,6 +201,8 @@ interface EditorCommittedV1 {
   schemaVersion: 1;
   revision: number;
   mutationId: string;
+  gestureId?: string | null;
+  gestureIds?: string[];
   origin?: string;
   changedFields: EditorField[];
   patch: EditorPatchV1;
diff --git a/docs/content/ko/declarative-api/page.mdx b/docs/content/ko/declarative-api/page.mdx
index 4cdf77f8..3e6a6837 100644
--- a/docs/content/ko/declarative-api/page.mdx
+++ b/docs/content/ko/declarative-api/page.mdx
@@ -308,6 +308,7 @@ dmn.plugin.defineElement({
 ### resizable
 
 `resizable: true`로 설정하면 요소에 8방향 리사이즈 핸들이 표시됩니다.
+첫 생성 크기는 200×150이며, 저장된 크기나 추정 크기가 있으면 해당 값을 우선합니다.
 
 ```javascript
 dmn.plugin.defineElement({
diff --git a/docs/content/ko/guide/installation/page.mdx b/docs/content/ko/guide/installation/page.mdx
index e4d77302..658e5bdf 100644
--- a/docs/content/ko/guide/installation/page.mdx
+++ b/docs/content/ko/guide/installation/page.mdx
@@ -9,7 +9,7 @@ description: DM Note 다운로드, 설치 및 실행 방법
 
 DM Note는 GitHub Releases에서 다운로드할 수 있습니다.
 
-1. [GitHub Releases 페이지](https://github.com/lee-sihun/DmNote/releases)에서 최신 버전을 다운로드합니다.
+1. [GitHub Releases 페이지](https://github.com/DmNote-App/DmNote/releases)에서 최신 버전을 다운로드합니다.
 2. 다운로드한 ZIP 파일의 압축을 원하는 위치에 해제합니다.
 3. `DM Note.exe` 파일을 실행합니다.
 
diff --git a/docs/content/ko/guide/settings/page.mdx b/docs/content/ko/guide/settings/page.mdx
index 324100a6..264b218a 100644
--- a/docs/content/ko/guide/settings/page.mdx
+++ b/docs/content/ko/guide/settings/page.mdx
@@ -38,6 +38,13 @@ DM Note의 다양한 설정 옵션을 안내합니다.
   고정을 켠 상태에서는 오버레이를 직접 조작할 수 없습니다.
 </Callout>
 
+### 속성 패널 분리
+
+캔버스 우측 속성 패널의 상단 분리 버튼을 누르면 언제든 별도 창으로 분리할 수 있습니다. 분리된 창에서도 키·노트·카운터 편집과 레이어 관리를 동일하게 사용할 수 있습니다.
+
+- 분리 창의 X 버튼 또는 패널 상단의 되돌리기 버튼으로 다시 인라인 패널로 복귀합니다.
+- 분리 상태에서는 그라디언트 색상의 캔버스 앵커 지정이 제한됩니다.
+
 ## 그래픽 설정
 
 ### 렌더링 옵션
diff --git a/src-tauri/gen/schemas/acl-manifests.json b/src-tauri/gen/schemas/acl-manifests.json
index 85c000df..05ffef14 100644
--- a/src-tauri/gen/schemas/acl-manifests.json
+++ b/src-tauri/gen/schemas/acl-manifests.json
@@ -1 +1 @@
-{"__app-acl__":{"default_permission":null,"permissions":{"dmnote-allow-all":{"identifier":"dmnote-allow-all","description":"Full DM Note command access for renderer","commands":{"allow":["app_auto_update","app_bootstrap","app_cancel_editor_flush","app_open_external","app_quit","app_quit_after_editor_flush","app_restart","counter_animation_create","counter_animation_delete","counter_animation_list","counter_animation_update","css_get","css_get_use","css_history_activate","css_history_get","css_history_remove","css_load","css_reset","css_set_content","css_tab_activate_history","css_tab_clear","css_tab_export","css_tab_get","css_tab_get_all","css_tab_load","css_tab_set","css_tab_toggle","css_toggle","custom_tabs_create","custom_tabs_delete","custom_tabs_list","custom_tabs_restore","custom_tabs_select","editor_commit","editor_get","editor_preview_cancel","editor_preview_publish","editor_preview_subscribe","font_load","get_cursor_settings","graph_positions_get","graph_positions_update","history_redo","history_status","history_undo","image_load","js_get","js_get_use","js_load","js_reload","js_remove_plugin","js_reset","js_set_content","js_set_plugin_enabled","js_toggle","key_sound_get_output_state","key_sound_get_status","key_sound_list_output_devices","key_sound_load_soundpack","key_sound_set_enabled","key_sound_set_latency_logging","key_sound_set_output_backend","key_sound_set_volume","key_sound_unload_soundpack","keys_get","keys_get_counters","keys_reset_all","keys_reset_counters","keys_reset_counters_mode","keys_reset_mode","keys_reset_single_counter","keys_set_counters","keys_set_mode","knob_positions_get","knob_positions_update","layer_groups_get","note_tab_clear","note_tab_get","note_tab_get_all","note_tab_set","obs_regenerate_token","obs_start","obs_status","obs_stop","overlay_get","overlay_resize","overlay_set_anchor","overlay_set_lock","overlay_set_visible","panel_window_close","panel_window_close_ack","panel_window_is_open","panel_window_show","panel_window_start_dragging","panel_window_take_view_state","plugin_authority_reset","plugin_bridge_send","plugin_bridge_send_to","plugin_instances_commit","plugin_instances_get","plugin_instances_reconcile","plugin_rpc_respond","plugin_rpc_send","plugin_storage_clear","plugin_storage_clear_by_prefix","plugin_storage_get","plugin_storage_has_data","plugin_storage_keys","plugin_storage_remove","plugin_storage_set","positions_get","preset_load","preset_load_tab","preset_save","preset_save_tab","raw_input_subscribe","raw_input_unsubscribe","selection_session_get","selection_session_publish","settings_get","settings_update","sound_delete","sound_list","sound_load","sound_load_original","sound_rename","sound_save_processed_wav","sound_set_enabled","sound_set_hidden","sound_update_processed_wav","stat_positions_get","stat_positions_update","window_close","window_minimize","window_open_devtools_all","window_show_main"],"deny":[]}}},"permission_sets":{},"global_scope_schema":null},"core":{"default_permission":{"identifier":"default","description":"Default core plugins set.","permissions":["core:path:default","core:event:default","core:window:default","core:webview:default","core:app:default","core:image:default","core:resources:default","core:menu:default","core:tray:default"]},"permissions":{},"permission_sets":{},"global_scope_schema":null},"core:app":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin.","permissions":["allow-version","allow-name","allow-tauri-version","allow-identifier","allow-bundle-type","allow-register-listener","allow-remove-listener"]},"permissions":{"allow-app-hide":{"identifier":"allow-app-hide","description":"Enables the app_hide command without any pre-configured scope.","commands":{"allow":["app_hide"],"deny":[]}},"allow-app-show":{"identifier":"allow-app-show","description":"Enables the app_show command without any pre-configured scope.","commands":{"allow":["app_show"],"deny":[]}},"allow-bundle-type":{"identifier":"allow-bundle-type","description":"Enables the bundle_type command without any pre-configured scope.","commands":{"allow":["bundle_type"],"deny":[]}},"allow-default-window-icon":{"identifier":"allow-default-window-icon","description":"Enables the default_window_icon command without any pre-configured scope.","commands":{"allow":["default_window_icon"],"deny":[]}},"allow-fetch-data-store-identifiers":{"identifier":"allow-fetch-data-store-identifiers","description":"Enables the fetch_data_store_identifiers command without any pre-configured scope.","commands":{"allow":["fetch_data_store_identifiers"],"deny":[]}},"allow-identifier":{"identifier":"allow-identifier","description":"Enables the identifier command without any pre-configured scope.","commands":{"allow":["identifier"],"deny":[]}},"allow-name":{"identifier":"allow-name","description":"Enables the name command without any pre-configured scope.","commands":{"allow":["name"],"deny":[]}},"allow-register-listener":{"identifier":"allow-register-listener","description":"Enables the register_listener command without any pre-configured scope.","commands":{"allow":["register_listener"],"deny":[]}},"allow-remove-data-store":{"identifier":"allow-remove-data-store","description":"Enables the remove_data_store command without any pre-configured scope.","commands":{"allow":["remove_data_store"],"deny":[]}},"allow-remove-listener":{"identifier":"allow-remove-listener","description":"Enables the remove_listener command without any pre-configured scope.","commands":{"allow":["remove_listener"],"deny":[]}},"allow-set-app-theme":{"identifier":"allow-set-app-theme","description":"Enables the set_app_theme command without any pre-configured scope.","commands":{"allow":["set_app_theme"],"deny":[]}},"allow-set-dock-visibility":{"identifier":"allow-set-dock-visibility","description":"Enables the set_dock_visibility command without any pre-configured scope.","commands":{"allow":["set_dock_visibility"],"deny":[]}},"allow-tauri-version":{"identifier":"allow-tauri-version","description":"Enables the tauri_version command without any pre-configured scope.","commands":{"allow":["tauri_version"],"deny":[]}},"allow-version":{"identifier":"allow-version","description":"Enables the version command without any pre-configured scope.","commands":{"allow":["version"],"deny":[]}},"deny-app-hide":{"identifier":"deny-app-hide","description":"Denies the app_hide command without any pre-configured scope.","commands":{"allow":[],"deny":["app_hide"]}},"deny-app-show":{"identifier":"deny-app-show","description":"Denies the app_show command without any pre-configured scope.","commands":{"allow":[],"deny":["app_show"]}},"deny-bundle-type":{"identifier":"deny-bundle-type","description":"Denies the bundle_type command without any pre-configured scope.","commands":{"allow":[],"deny":["bundle_type"]}},"deny-default-window-icon":{"identifier":"deny-default-window-icon","description":"Denies the default_window_icon command without any pre-configured scope.","commands":{"allow":[],"deny":["default_window_icon"]}},"deny-fetch-data-store-identifiers":{"identifier":"deny-fetch-data-store-identifiers","description":"Denies the fetch_data_store_identifiers command without any pre-configured scope.","commands":{"allow":[],"deny":["fetch_data_store_identifiers"]}},"deny-identifier":{"identifier":"deny-identifier","description":"Denies the identifier command without any pre-configured scope.","commands":{"allow":[],"deny":["identifier"]}},"deny-name":{"identifier":"deny-name","description":"Denies the name command without any pre-configured scope.","commands":{"allow":[],"deny":["name"]}},"deny-register-listener":{"identifier":"deny-register-listener","description":"Denies the register_listener command without any pre-configured scope.","commands":{"allow":[],"deny":["register_listener"]}},"deny-remove-data-store":{"identifier":"deny-remove-data-store","description":"Denies the remove_data_store command without any pre-configured scope.","commands":{"allow":[],"deny":["remove_data_store"]}},"deny-remove-listener":{"identifier":"deny-remove-listener","description":"Denies the remove_listener command without any pre-configured scope.","commands":{"allow":[],"deny":["remove_listener"]}},"deny-set-app-theme":{"identifier":"deny-set-app-theme","description":"Denies the set_app_theme command without any pre-configured scope.","commands":{"allow":[],"deny":["set_app_theme"]}},"deny-set-dock-visibility":{"identifier":"deny-set-dock-visibility","description":"Denies the set_dock_visibility command without any pre-configured scope.","commands":{"allow":[],"deny":["set_dock_visibility"]}},"deny-tauri-version":{"identifier":"deny-tauri-version","description":"Denies the tauri_version command without any pre-configured scope.","commands":{"allow":[],"deny":["tauri_version"]}},"deny-version":{"identifier":"deny-version","description":"Denies the version command without any pre-configured scope.","commands":{"allow":[],"deny":["version"]}}},"permission_sets":{},"global_scope_schema":null},"core:event":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin, which enables all commands.","permissions":["allow-listen","allow-unlisten","allow-emit","allow-emit-to"]},"permissions":{"allow-emit":{"identifier":"allow-emit","description":"Enables the emit command without any pre-configured scope.","commands":{"allow":["emit"],"deny":[]}},"allow-emit-to":{"identifier":"allow-emit-to","description":"Enables the emit_to command without any pre-configured scope.","commands":{"allow":["emit_to"],"deny":[]}},"allow-listen":{"identifier":"allow-listen","description":"Enables the listen command without any pre-configured scope.","commands":{"allow":["listen"],"deny":[]}},"allow-unlisten":{"identifier":"allow-unlisten","description":"Enables the unlisten command without any pre-configured scope.","commands":{"allow":["unlisten"],"deny":[]}},"deny-emit":{"identifier":"deny-emit","description":"Denies the emit command without any pre-configured scope.","commands":{"allow":[],"deny":["emit"]}},"deny-emit-to":{"identifier":"deny-emit-to","description":"Denies the emit_to command without any pre-configured scope.","commands":{"allow":[],"deny":["emit_to"]}},"deny-listen":{"identifier":"deny-listen","description":"Denies the listen command without any pre-configured scope.","commands":{"allow":[],"deny":["listen"]}},"deny-unlisten":{"identifier":"deny-unlisten","description":"Denies the unlisten command without any pre-configured scope.","commands":{"allow":[],"deny":["unlisten"]}}},"permission_sets":{},"global_scope_schema":null},"core:image":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin, which enables all commands.","permissions":["allow-new","allow-from-bytes","allow-from-path","allow-rgba","allow-size"]},"permissions":{"allow-from-bytes":{"identifier":"allow-from-bytes","description":"Enables the from_bytes command without any pre-configured scope.","commands":{"allow":["from_bytes"],"deny":[]}},"allow-from-path":{"identifier":"allow-from-path","description":"Enables the from_path command without any pre-configured scope.","commands":{"allow":["from_path"],"deny":[]}},"allow-new":{"identifier":"allow-new","description":"Enables the new command without any pre-configured scope.","commands":{"allow":["new"],"deny":[]}},"allow-rgba":{"identifier":"allow-rgba","description":"Enables the rgba command without any pre-configured scope.","commands":{"allow":["rgba"],"deny":[]}},"allow-size":{"identifier":"allow-size","description":"Enables the size command without any pre-configured scope.","commands":{"allow":["size"],"deny":[]}},"deny-from-bytes":{"identifier":"deny-from-bytes","description":"Denies the from_bytes command without any pre-configured scope.","commands":{"allow":[],"deny":["from_bytes"]}},"deny-from-path":{"identifier":"deny-from-path","description":"Denies the from_path command without any pre-configured scope.","commands":{"allow":[],"deny":["from_path"]}},"deny-new":{"identifier":"deny-new","description":"Denies the new command without any pre-configured scope.","commands":{"allow":[],"deny":["new"]}},"deny-rgba":{"identifier":"deny-rgba","description":"Denies the rgba command without any pre-configured scope.","commands":{"allow":[],"deny":["rgba"]}},"deny-size":{"identifier":"deny-size","description":"Denies the size command without any pre-configured scope.","commands":{"allow":[],"deny":["size"]}}},"permission_sets":{},"global_scope_schema":null},"core:menu":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin, which enables all commands.","permissions":["allow-new","allow-append","allow-prepend","allow-insert","allow-remove","allow-remove-at","allow-items","allow-get","allow-popup","allow-create-default","allow-set-as-app-menu","allow-set-as-window-menu","allow-text","allow-set-text","allow-is-enabled","allow-set-enabled","allow-set-accelerator","allow-set-as-windows-menu-for-nsapp","allow-set-as-help-menu-for-nsapp","allow-is-checked","allow-set-checked","allow-set-icon"]},"permissions":{"allow-append":{"identifier":"allow-append","description":"Enables the append command without any pre-configured scope.","commands":{"allow":["append"],"deny":[]}},"allow-create-default":{"identifier":"allow-create-default","description":"Enables the create_default command without any pre-configured scope.","commands":{"allow":["create_default"],"deny":[]}},"allow-get":{"identifier":"allow-get","description":"Enables the get command without any pre-configured scope.","commands":{"allow":["get"],"deny":[]}},"allow-insert":{"identifier":"allow-insert","description":"Enables the insert command without any pre-configured scope.","commands":{"allow":["insert"],"deny":[]}},"allow-is-checked":{"identifier":"allow-is-checked","description":"Enables the is_checked command without any pre-configured scope.","commands":{"allow":["is_checked"],"deny":[]}},"allow-is-enabled":{"identifier":"allow-is-enabled","description":"Enables the is_enabled command without any pre-configured scope.","commands":{"allow":["is_enabled"],"deny":[]}},"allow-items":{"identifier":"allow-items","description":"Enables the items command without any pre-configured scope.","commands":{"allow":["items"],"deny":[]}},"allow-new":{"identifier":"allow-new","description":"Enables the new command without any pre-configured scope.","commands":{"allow":["new"],"deny":[]}},"allow-popup":{"identifier":"allow-popup","description":"Enables the popup command without any pre-configured scope.","commands":{"allow":["popup"],"deny":[]}},"allow-prepend":{"identifier":"allow-prepend","description":"Enables the prepend command without any pre-configured scope.","commands":{"allow":["prepend"],"deny":[]}},"allow-remove":{"identifier":"allow-remove","description":"Enables the remove command without any pre-configured scope.","commands":{"allow":["remove"],"deny":[]}},"allow-remove-at":{"identifier":"allow-remove-at","description":"Enables the remove_at command without any pre-configured scope.","commands":{"allow":["remove_at"],"deny":[]}},"allow-set-accelerator":{"identifier":"allow-set-accelerator","description":"Enables the set_accelerator command without any pre-configured scope.","commands":{"allow":["set_accelerator"],"deny":[]}},"allow-set-as-app-menu":{"identifier":"allow-set-as-app-menu","description":"Enables the set_as_app_menu command without any pre-configured scope.","commands":{"allow":["set_as_app_menu"],"deny":[]}},"allow-set-as-help-menu-for-nsapp":{"identifier":"allow-set-as-help-menu-for-nsapp","description":"Enables the set_as_help_menu_for_nsapp command without any pre-configured scope.","commands":{"allow":["set_as_help_menu_for_nsapp"],"deny":[]}},"allow-set-as-window-menu":{"identifier":"allow-set-as-window-menu","description":"Enables the set_as_window_menu command without any pre-configured scope.","commands":{"allow":["set_as_window_menu"],"deny":[]}},"allow-set-as-windows-menu-for-nsapp":{"identifier":"allow-set-as-windows-menu-for-nsapp","description":"Enables the set_as_windows_menu_for_nsapp command without any pre-configured scope.","commands":{"allow":["set_as_windows_menu_for_nsapp"],"deny":[]}},"allow-set-checked":{"identifier":"allow-set-checked","description":"Enables the set_checked command without any pre-configured scope.","commands":{"allow":["set_checked"],"deny":[]}},"allow-set-enabled":{"identifier":"allow-set-enabled","description":"Enables the set_enabled command without any pre-configured scope.","commands":{"allow":["set_enabled"],"deny":[]}},"allow-set-icon":{"identifier":"allow-set-icon","description":"Enables the set_icon command without any pre-configured scope.","commands":{"allow":["set_icon"],"deny":[]}},"allow-set-text":{"identifier":"allow-set-text","description":"Enables the set_text command without any pre-configured scope.","commands":{"allow":["set_text"],"deny":[]}},"allow-text":{"identifier":"allow-text","description":"Enables the text command without any pre-configured scope.","commands":{"allow":["text"],"deny":[]}},"deny-append":{"identifier":"deny-append","description":"Denies the append command without any pre-configured scope.","commands":{"allow":[],"deny":["append"]}},"deny-create-default":{"identifier":"deny-create-default","description":"Denies the create_default command without any pre-configured scope.","commands":{"allow":[],"deny":["create_default"]}},"deny-get":{"identifier":"deny-get","description":"Denies the get command without any pre-configured scope.","commands":{"allow":[],"deny":["get"]}},"deny-insert":{"identifier":"deny-insert","description":"Denies the insert command without any pre-configured scope.","commands":{"allow":[],"deny":["insert"]}},"deny-is-checked":{"identifier":"deny-is-checked","description":"Denies the is_checked command without any pre-configured scope.","commands":{"allow":[],"deny":["is_checked"]}},"deny-is-enabled":{"identifier":"deny-is-enabled","description":"Denies the is_enabled command without any pre-configured scope.","commands":{"allow":[],"deny":["is_enabled"]}},"deny-items":{"identifier":"deny-items","description":"Denies the items command without any pre-configured scope.","commands":{"allow":[],"deny":["items"]}},"deny-new":{"identifier":"deny-new","description":"Denies the new command without any pre-configured scope.","commands":{"allow":[],"deny":["new"]}},"deny-popup":{"identifier":"deny-popup","description":"Denies the popup command without any pre-configured scope.","commands":{"allow":[],"deny":["popup"]}},"deny-prepend":{"identifier":"deny-prepend","description":"Denies the prepend command without any pre-configured scope.","commands":{"allow":[],"deny":["prepend"]}},"deny-remove":{"identifier":"deny-remove","description":"Denies the remove command without any pre-configured scope.","commands":{"allow":[],"deny":["remove"]}},"deny-remove-at":{"identifier":"deny-remove-at","description":"Denies the remove_at command without any pre-configured scope.","commands":{"allow":[],"deny":["remove_at"]}},"deny-set-accelerator":{"identifier":"deny-set-accelerator","description":"Denies the set_accelerator command without any pre-configured scope.","commands":{"allow":[],"deny":["set_accelerator"]}},"deny-set-as-app-menu":{"identifier":"deny-set-as-app-menu","description":"Denies the set_as_app_menu command without any pre-configured scope.","commands":{"allow":[],"deny":["set_as_app_menu"]}},"deny-set-as-help-menu-for-nsapp":{"identifier":"deny-set-as-help-menu-for-nsapp","description":"Denies the set_as_help_menu_for_nsapp command without any pre-configured scope.","commands":{"allow":[],"deny":["set_as_help_menu_for_nsapp"]}},"deny-set-as-window-menu":{"identifier":"deny-set-as-window-menu","description":"Denies the set_as_window_menu command without any pre-configured scope.","commands":{"allow":[],"deny":["set_as_window_menu"]}},"deny-set-as-windows-menu-for-nsapp":{"identifier":"deny-set-as-windows-menu-for-nsapp","description":"Denies the set_as_windows_menu_for_nsapp command without any pre-configured scope.","commands":{"allow":[],"deny":["set_as_windows_menu_for_nsapp"]}},"deny-set-checked":{"identifier":"deny-set-checked","description":"Denies the set_checked command without any pre-configured scope.","commands":{"allow":[],"deny":["set_checked"]}},"deny-set-enabled":{"identifier":"deny-set-enabled","description":"Denies the set_enabled command without any pre-configured scope.","commands":{"allow":[],"deny":["set_enabled"]}},"deny-set-icon":{"identifier":"deny-set-icon","description":"Denies the set_icon command without any pre-configured scope.","commands":{"allow":[],"deny":["set_icon"]}},"deny-set-text":{"identifier":"deny-set-text","description":"Denies the set_text command without any pre-configured scope.","commands":{"allow":[],"deny":["set_text"]}},"deny-text":{"identifier":"deny-text","description":"Denies the text command without any pre-configured scope.","commands":{"allow":[],"deny":["text"]}}},"permission_sets":{},"global_scope_schema":null},"core:path":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin, which enables all commands.","permissions":["allow-resolve-directory","allow-resolve","allow-normalize","allow-join","allow-dirname","allow-extname","allow-basename","allow-is-absolute"]},"permissions":{"allow-basename":{"identifier":"allow-basename","description":"Enables the basename command without any pre-configured scope.","commands":{"allow":["basename"],"deny":[]}},"allow-dirname":{"identifier":"allow-dirname","description":"Enables the dirname command without any pre-configured scope.","commands":{"allow":["dirname"],"deny":[]}},"allow-extname":{"identifier":"allow-extname","description":"Enables the extname command without any pre-configured scope.","commands":{"allow":["extname"],"deny":[]}},"allow-is-absolute":{"identifier":"allow-is-absolute","description":"Enables the is_absolute command without any pre-configured scope.","commands":{"allow":["is_absolute"],"deny":[]}},"allow-join":{"identifier":"allow-join","description":"Enables the join command without any pre-configured scope.","commands":{"allow":["join"],"deny":[]}},"allow-normalize":{"identifier":"allow-normalize","description":"Enables the normalize command without any pre-configured scope.","commands":{"allow":["normalize"],"deny":[]}},"allow-resolve":{"identifier":"allow-resolve","description":"Enables the resolve command without any pre-configured scope.","commands":{"allow":["resolve"],"deny":[]}},"allow-resolve-directory":{"identifier":"allow-resolve-directory","description":"Enables the resolve_directory command without any pre-configured scope.","commands":{"allow":["resolve_directory"],"deny":[]}},"deny-basename":{"identifier":"deny-basename","description":"Denies the basename command without any pre-configured scope.","commands":{"allow":[],"deny":["basename"]}},"deny-dirname":{"identifier":"deny-dirname","description":"Denies the dirname command without any pre-configured scope.","commands":{"allow":[],"deny":["dirname"]}},"deny-extname":{"identifier":"deny-extname","description":"Denies the extname command without any pre-configured scope.","commands":{"allow":[],"deny":["extname"]}},"deny-is-absolute":{"identifier":"deny-is-absolute","description":"Denies the is_absolute command without any pre-configured scope.","commands":{"allow":[],"deny":["is_absolute"]}},"deny-join":{"identifier":"deny-join","description":"Denies the join command without any pre-configured scope.","commands":{"allow":[],"deny":["join"]}},"deny-normalize":{"identifier":"deny-normalize","description":"Denies the normalize command without any pre-configured scope.","commands":{"allow":[],"deny":["normalize"]}},"deny-resolve":{"identifier":"deny-resolve","description":"Denies the resolve command without any pre-configured scope.","commands":{"allow":[],"deny":["resolve"]}},"deny-resolve-directory":{"identifier":"deny-resolve-directory","description":"Denies the resolve_directory command without any pre-configured scope.","commands":{"allow":[],"deny":["resolve_directory"]}}},"permission_sets":{},"global_scope_schema":null},"core:resources":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin, which enables all commands.","permissions":["allow-close"]},"permissions":{"allow-close":{"identifier":"allow-close","description":"Enables the close command without any pre-configured scope.","commands":{"allow":["close"],"deny":[]}},"deny-close":{"identifier":"deny-close","description":"Denies the close command without any pre-configured scope.","commands":{"allow":[],"deny":["close"]}}},"permission_sets":{},"global_scope_schema":null},"core:tray":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin, which enables all commands.","permissions":["allow-new","allow-get-by-id","allow-remove-by-id","allow-set-icon","allow-set-menu","allow-set-tooltip","allow-set-title","allow-set-visible","allow-set-temp-dir-path","allow-set-icon-as-template","allow-set-show-menu-on-left-click"]},"permissions":{"allow-get-by-id":{"identifier":"allow-get-by-id","description":"Enables the get_by_id command without any pre-configured scope.","commands":{"allow":["get_by_id"],"deny":[]}},"allow-new":{"identifier":"allow-new","description":"Enables the new command without any pre-configured scope.","commands":{"allow":["new"],"deny":[]}},"allow-remove-by-id":{"identifier":"allow-remove-by-id","description":"Enables the remove_by_id command without any pre-configured scope.","commands":{"allow":["remove_by_id"],"deny":[]}},"allow-set-icon":{"identifier":"allow-set-icon","description":"Enables the set_icon command without any pre-configured scope.","commands":{"allow":["set_icon"],"deny":[]}},"allow-set-icon-as-template":{"identifier":"allow-set-icon-as-template","description":"Enables the set_icon_as_template command without any pre-configured scope.","commands":{"allow":["set_icon_as_template"],"deny":[]}},"allow-set-menu":{"identifier":"allow-set-menu","description":"Enables the set_menu command without any pre-configured scope.","commands":{"allow":["set_menu"],"deny":[]}},"allow-set-show-menu-on-left-click":{"identifier":"allow-set-show-menu-on-left-click","description":"Enables the set_show_menu_on_left_click command without any pre-configured scope.","commands":{"allow":["set_show_menu_on_left_click"],"deny":[]}},"allow-set-temp-dir-path":{"identifier":"allow-set-temp-dir-path","description":"Enables the set_temp_dir_path command without any pre-configured scope.","commands":{"allow":["set_temp_dir_path"],"deny":[]}},"allow-set-title":{"identifier":"allow-set-title","description":"Enables the set_title command without any pre-configured scope.","commands":{"allow":["set_title"],"deny":[]}},"allow-set-tooltip":{"identifier":"allow-set-tooltip","description":"Enables the set_tooltip command without any pre-configured scope.","commands":{"allow":["set_tooltip"],"deny":[]}},"allow-set-visible":{"identifier":"allow-set-visible","description":"Enables the set_visible command without any pre-configured scope.","commands":{"allow":["set_visible"],"deny":[]}},"deny-get-by-id":{"identifier":"deny-get-by-id","description":"Denies the get_by_id command without any pre-configured scope.","commands":{"allow":[],"deny":["get_by_id"]}},"deny-new":{"identifier":"deny-new","description":"Denies the new command without any pre-configured scope.","commands":{"allow":[],"deny":["new"]}},"deny-remove-by-id":{"identifier":"deny-remove-by-id","description":"Denies the remove_by_id command without any pre-configured scope.","commands":{"allow":[],"deny":["remove_by_id"]}},"deny-set-icon":{"identifier":"deny-set-icon","description":"Denies the set_icon command without any pre-configured scope.","commands":{"allow":[],"deny":["set_icon"]}},"deny-set-icon-as-template":{"identifier":"deny-set-icon-as-template","description":"Denies the set_icon_as_template command without any pre-configured scope.","commands":{"allow":[],"deny":["set_icon_as_template"]}},"deny-set-menu":{"identifier":"deny-set-menu","description":"Denies the set_menu command without any pre-configured scope.","commands":{"allow":[],"deny":["set_menu"]}},"deny-set-show-menu-on-left-click":{"identifier":"deny-set-show-menu-on-left-click","description":"Denies the set_show_menu_on_left_click command without any pre-configured scope.","commands":{"allow":[],"deny":["set_show_menu_on_left_click"]}},"deny-set-temp-dir-path":{"identifier":"deny-set-temp-dir-path","description":"Denies the set_temp_dir_path command without any pre-configured scope.","commands":{"allow":[],"deny":["set_temp_dir_path"]}},"deny-set-title":{"identifier":"deny-set-title","description":"Denies the set_title command without any pre-configured scope.","commands":{"allow":[],"deny":["set_title"]}},"deny-set-tooltip":{"identifier":"deny-set-tooltip","description":"Denies the set_tooltip command without any pre-configured scope.","commands":{"allow":[],"deny":["set_tooltip"]}},"deny-set-visible":{"identifier":"deny-set-visible","description":"Denies the set_visible command without any pre-configured scope.","commands":{"allow":[],"deny":["set_visible"]}}},"permission_sets":{},"global_scope_schema":null},"core:webview":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin.","permissions":["allow-get-all-webviews","allow-webview-position","allow-webview-size","allow-internal-toggle-devtools"]},"permissions":{"allow-clear-all-browsing-data":{"identifier":"allow-clear-all-browsing-data","description":"Enables the clear_all_browsing_data command without any pre-configured scope.","commands":{"allow":["clear_all_browsing_data"],"deny":[]}},"allow-create-webview":{"identifier":"allow-create-webview","description":"Enables the create_webview command without any pre-configured scope.","commands":{"allow":["create_webview"],"deny":[]}},"allow-create-webview-window":{"identifier":"allow-create-webview-window","description":"Enables the create_webview_window command without any pre-configured scope.","commands":{"allow":["create_webview_window"],"deny":[]}},"allow-get-all-webviews":{"identifier":"allow-get-all-webviews","description":"Enables the get_all_webviews command without any pre-configured scope.","commands":{"allow":["get_all_webviews"],"deny":[]}},"allow-internal-toggle-devtools":{"identifier":"allow-internal-toggle-devtools","description":"Enables the internal_toggle_devtools command without any pre-configured scope.","commands":{"allow":["internal_toggle_devtools"],"deny":[]}},"allow-print":{"identifier":"allow-print","description":"Enables the print command without any pre-configured scope.","commands":{"allow":["print"],"deny":[]}},"allow-reparent":{"identifier":"allow-reparent","description":"Enables the reparent command without any pre-configured scope.","commands":{"allow":["reparent"],"deny":[]}},"allow-set-webview-auto-resize":{"identifier":"allow-set-webview-auto-resize","description":"Enables the set_webview_auto_resize command without any pre-configured scope.","commands":{"allow":["set_webview_auto_resize"],"deny":[]}},"allow-set-webview-background-color":{"identifier":"allow-set-webview-background-color","description":"Enables the set_webview_background_color command without any pre-configured scope.","commands":{"allow":["set_webview_background_color"],"deny":[]}},"allow-set-webview-focus":{"identifier":"allow-set-webview-focus","description":"Enables the set_webview_focus command without any pre-configured scope.","commands":{"allow":["set_webview_focus"],"deny":[]}},"allow-set-webview-position":{"identifier":"allow-set-webview-position","description":"Enables the set_webview_position command without any pre-configured scope.","commands":{"allow":["set_webview_position"],"deny":[]}},"allow-set-webview-size":{"identifier":"allow-set-webview-size","description":"Enables the set_webview_size command without any pre-configured scope.","commands":{"allow":["set_webview_size"],"deny":[]}},"allow-set-webview-zoom":{"identifier":"allow-set-webview-zoom","description":"Enables the set_webview_zoom command without any pre-configured scope.","commands":{"allow":["set_webview_zoom"],"deny":[]}},"allow-webview-close":{"identifier":"allow-webview-close","description":"Enables the webview_close command without any pre-configured scope.","commands":{"allow":["webview_close"],"deny":[]}},"allow-webview-hide":{"identifier":"allow-webview-hide","description":"Enables the webview_hide command without any pre-configured scope.","commands":{"allow":["webview_hide"],"deny":[]}},"allow-webview-position":{"identifier":"allow-webview-position","description":"Enables the webview_position command without any pre-configured scope.","commands":{"allow":["webview_position"],"deny":[]}},"allow-webview-show":{"identifier":"allow-webview-show","description":"Enables the webview_show command without any pre-configured scope.","commands":{"allow":["webview_show"],"deny":[]}},"allow-webview-size":{"identifier":"allow-webview-size","description":"Enables the webview_size command without any pre-configured scope.","commands":{"allow":["webview_size"],"deny":[]}},"deny-clear-all-browsing-data":{"identifier":"deny-clear-all-browsing-data","description":"Denies the clear_all_browsing_data command without any pre-configured scope.","commands":{"allow":[],"deny":["clear_all_browsing_data"]}},"deny-create-webview":{"identifier":"deny-create-webview","description":"Denies the create_webview command without any pre-configured scope.","commands":{"allow":[],"deny":["create_webview"]}},"deny-create-webview-window":{"identifier":"deny-create-webview-window","description":"Denies the create_webview_window command without any pre-configured scope.","commands":{"allow":[],"deny":["create_webview_window"]}},"deny-get-all-webviews":{"identifier":"deny-get-all-webviews","description":"Denies the get_all_webviews command without any pre-configured scope.","commands":{"allow":[],"deny":["get_all_webviews"]}},"deny-internal-toggle-devtools":{"identifier":"deny-internal-toggle-devtools","description":"Denies the internal_toggle_devtools command without any pre-configured scope.","commands":{"allow":[],"deny":["internal_toggle_devtools"]}},"deny-print":{"identifier":"deny-print","description":"Denies the print command without any pre-configured scope.","commands":{"allow":[],"deny":["print"]}},"deny-reparent":{"identifier":"deny-reparent","description":"Denies the reparent command without any pre-configured scope.","commands":{"allow":[],"deny":["reparent"]}},"deny-set-webview-auto-resize":{"identifier":"deny-set-webview-auto-resize","description":"Denies the set_webview_auto_resize command without any pre-configured scope.","commands":{"allow":[],"deny":["set_webview_auto_resize"]}},"deny-set-webview-background-color":{"identifier":"deny-set-webview-background-color","description":"Denies the set_webview_background_color command without any pre-configured scope.","commands":{"allow":[],"deny":["set_webview_background_color"]}},"deny-set-webview-focus":{"identifier":"deny-set-webview-focus","description":"Denies the set_webview_focus command without any pre-configured scope.","commands":{"allow":[],"deny":["set_webview_focus"]}},"deny-set-webview-position":{"identifier":"deny-set-webview-position","description":"Denies the set_webview_position command without any pre-configured scope.","commands":{"allow":[],"deny":["set_webview_position"]}},"deny-set-webview-size":{"identifier":"deny-set-webview-size","description":"Denies the set_webview_size command without any pre-configured scope.","commands":{"allow":[],"deny":["set_webview_size"]}},"deny-set-webview-zoom":{"identifier":"deny-set-webview-zoom","description":"Denies the set_webview_zoom command without any pre-configured scope.","commands":{"allow":[],"deny":["set_webview_zoom"]}},"deny-webview-close":{"identifier":"deny-webview-close","description":"Denies the webview_close command without any pre-configured scope.","commands":{"allow":[],"deny":["webview_close"]}},"deny-webview-hide":{"identifier":"deny-webview-hide","description":"Denies the webview_hide command without any pre-configured scope.","commands":{"allow":[],"deny":["webview_hide"]}},"deny-webview-position":{"identifier":"deny-webview-position","description":"Denies the webview_position command without any pre-configured scope.","commands":{"allow":[],"deny":["webview_position"]}},"deny-webview-show":{"identifier":"deny-webview-show","description":"Denies the webview_show command without any pre-configured scope.","commands":{"allow":[],"deny":["webview_show"]}},"deny-webview-size":{"identifier":"deny-webview-size","description":"Denies the webview_size command without any pre-configured scope.","commands":{"allow":[],"deny":["webview_size"]}}},"permission_sets":{},"global_scope_schema":null},"core:window":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin.","permissions":["allow-get-all-windows","allow-scale-factor","allow-inner-position","allow-outer-position","allow-inner-size","allow-outer-size","allow-is-fullscreen","allow-is-minimized","allow-is-maximized","allow-is-focused","allow-is-decorated","allow-is-resizable","allow-is-maximizable","allow-is-minimizable","allow-is-closable","allow-is-visible","allow-is-enabled","allow-title","allow-current-monitor","allow-primary-monitor","allow-monitor-from-point","allow-available-monitors","allow-cursor-position","allow-theme","allow-is-always-on-top","allow-internal-toggle-maximize"]},"permissions":{"allow-available-monitors":{"identifier":"allow-available-monitors","description":"Enables the available_monitors command without any pre-configured scope.","commands":{"allow":["available_monitors"],"deny":[]}},"allow-center":{"identifier":"allow-center","description":"Enables the center command without any pre-configured scope.","commands":{"allow":["center"],"deny":[]}},"allow-close":{"identifier":"allow-close","description":"Enables the close command without any pre-configured scope.","commands":{"allow":["close"],"deny":[]}},"allow-create":{"identifier":"allow-create","description":"Enables the create command without any pre-configured scope.","commands":{"allow":["create"],"deny":[]}},"allow-current-monitor":{"identifier":"allow-current-monitor","description":"Enables the current_monitor command without any pre-configured scope.","commands":{"allow":["current_monitor"],"deny":[]}},"allow-cursor-position":{"identifier":"allow-cursor-position","description":"Enables the cursor_position command without any pre-configured scope.","commands":{"allow":["cursor_position"],"deny":[]}},"allow-destroy":{"identifier":"allow-destroy","description":"Enables the destroy command without any pre-configured scope.","commands":{"allow":["destroy"],"deny":[]}},"allow-get-all-windows":{"identifier":"allow-get-all-windows","description":"Enables the get_all_windows command without any pre-configured scope.","commands":{"allow":["get_all_windows"],"deny":[]}},"allow-hide":{"identifier":"allow-hide","description":"Enables the hide command without any pre-configured scope.","commands":{"allow":["hide"],"deny":[]}},"allow-inner-position":{"identifier":"allow-inner-position","description":"Enables the inner_position command without any pre-configured scope.","commands":{"allow":["inner_position"],"deny":[]}},"allow-inner-size":{"identifier":"allow-inner-size","description":"Enables the inner_size command without any pre-configured scope.","commands":{"allow":["inner_size"],"deny":[]}},"allow-internal-toggle-maximize":{"identifier":"allow-internal-toggle-maximize","description":"Enables the internal_toggle_maximize command without any pre-configured scope.","commands":{"allow":["internal_toggle_maximize"],"deny":[]}},"allow-is-always-on-top":{"identifier":"allow-is-always-on-top","description":"Enables the is_always_on_top command without any pre-configured scope.","commands":{"allow":["is_always_on_top"],"deny":[]}},"allow-is-closable":{"identifier":"allow-is-closable","description":"Enables the is_closable command without any pre-configured scope.","commands":{"allow":["is_closable"],"deny":[]}},"allow-is-decorated":{"identifier":"allow-is-decorated","description":"Enables the is_decorated command without any pre-configured scope.","commands":{"allow":["is_decorated"],"deny":[]}},"allow-is-enabled":{"identifier":"allow-is-enabled","description":"Enables the is_enabled command without any pre-configured scope.","commands":{"allow":["is_enabled"],"deny":[]}},"allow-is-focused":{"identifier":"allow-is-focused","description":"Enables the is_focused command without any pre-configured scope.","commands":{"allow":["is_focused"],"deny":[]}},"allow-is-fullscreen":{"identifier":"allow-is-fullscreen","description":"Enables the is_fullscreen command without any pre-configured scope.","commands":{"allow":["is_fullscreen"],"deny":[]}},"allow-is-maximizable":{"identifier":"allow-is-maximizable","description":"Enables the is_maximizable command without any pre-configured scope.","commands":{"allow":["is_maximizable"],"deny":[]}},"allow-is-maximized":{"identifier":"allow-is-maximized","description":"Enables the is_maximized command without any pre-configured scope.","commands":{"allow":["is_maximized"],"deny":[]}},"allow-is-minimizable":{"identifier":"allow-is-minimizable","description":"Enables the is_minimizable command without any pre-configured scope.","commands":{"allow":["is_minimizable"],"deny":[]}},"allow-is-minimized":{"identifier":"allow-is-minimized","description":"Enables the is_minimized command without any pre-configured scope.","commands":{"allow":["is_minimized"],"deny":[]}},"allow-is-resizable":{"identifier":"allow-is-resizable","description":"Enables the is_resizable command without any pre-configured scope.","commands":{"allow":["is_resizable"],"deny":[]}},"allow-is-visible":{"identifier":"allow-is-visible","description":"Enables the is_visible command without any pre-configured scope.","commands":{"allow":["is_visible"],"deny":[]}},"allow-maximize":{"identifier":"allow-maximize","description":"Enables the maximize command without any pre-configured scope.","commands":{"allow":["maximize"],"deny":[]}},"allow-minimize":{"identifier":"allow-minimize","description":"Enables the minimize command without any pre-configured scope.","commands":{"allow":["minimize"],"deny":[]}},"allow-monitor-from-point":{"identifier":"allow-monitor-from-point","description":"Enables the monitor_from_point command without any pre-configured scope.","commands":{"allow":["monitor_from_point"],"deny":[]}},"allow-outer-position":{"identifier":"allow-outer-position","description":"Enables the outer_position command without any pre-configured scope.","commands":{"allow":["outer_position"],"deny":[]}},"allow-outer-size":{"identifier":"allow-outer-size","description":"Enables the outer_size command without any pre-configured scope.","commands":{"allow":["outer_size"],"deny":[]}},"allow-primary-monitor":{"identifier":"allow-primary-monitor","description":"Enables the primary_monitor command without any pre-configured scope.","commands":{"allow":["primary_monitor"],"deny":[]}},"allow-request-user-attention":{"identifier":"allow-request-user-attention","description":"Enables the request_user_attention command without any pre-configured scope.","commands":{"allow":["request_user_attention"],"deny":[]}},"allow-scale-factor":{"identifier":"allow-scale-factor","description":"Enables the scale_factor command without any pre-configured scope.","commands":{"allow":["scale_factor"],"deny":[]}},"allow-set-always-on-bottom":{"identifier":"allow-set-always-on-bottom","description":"Enables the set_always_on_bottom command without any pre-configured scope.","commands":{"allow":["set_always_on_bottom"],"deny":[]}},"allow-set-always-on-top":{"identifier":"allow-set-always-on-top","description":"Enables the set_always_on_top command without any pre-configured scope.","commands":{"allow":["set_always_on_top"],"deny":[]}},"allow-set-background-color":{"identifier":"allow-set-background-color","description":"Enables the set_background_color command without any pre-configured scope.","commands":{"allow":["set_background_color"],"deny":[]}},"allow-set-badge-count":{"identifier":"allow-set-badge-count","description":"Enables the set_badge_count command without any pre-configured scope.","commands":{"allow":["set_badge_count"],"deny":[]}},"allow-set-badge-label":{"identifier":"allow-set-badge-label","description":"Enables the set_badge_label command without any pre-configured scope.","commands":{"allow":["set_badge_label"],"deny":[]}},"allow-set-closable":{"identifier":"allow-set-closable","description":"Enables the set_closable command without any pre-configured scope.","commands":{"allow":["set_closable"],"deny":[]}},"allow-set-content-protected":{"identifier":"allow-set-content-protected","description":"Enables the set_content_protected command without any pre-configured scope.","commands":{"allow":["set_content_protected"],"deny":[]}},"allow-set-cursor-grab":{"identifier":"allow-set-cursor-grab","description":"Enables the set_cursor_grab command without any pre-configured scope.","commands":{"allow":["set_cursor_grab"],"deny":[]}},"allow-set-cursor-icon":{"identifier":"allow-set-cursor-icon","description":"Enables the set_cursor_icon command without any pre-configured scope.","commands":{"allow":["set_cursor_icon"],"deny":[]}},"allow-set-cursor-position":{"identifier":"allow-set-cursor-position","description":"Enables the set_cursor_position command without any pre-configured scope.","commands":{"allow":["set_cursor_position"],"deny":[]}},"allow-set-cursor-visible":{"identifier":"allow-set-cursor-visible","description":"Enables the set_cursor_visible command without any pre-configured scope.","commands":{"allow":["set_cursor_visible"],"deny":[]}},"allow-set-decorations":{"identifier":"allow-set-decorations","description":"Enables the set_decorations command without any pre-configured scope.","commands":{"allow":["set_decorations"],"deny":[]}},"allow-set-effects":{"identifier":"allow-set-effects","description":"Enables the set_effects command without any pre-configured scope.","commands":{"allow":["set_effects"],"deny":[]}},"allow-set-enabled":{"identifier":"allow-set-enabled","description":"Enables the set_enabled command without any pre-configured scope.","commands":{"allow":["set_enabled"],"deny":[]}},"allow-set-focus":{"identifier":"allow-set-focus","description":"Enables the set_focus command without any pre-configured scope.","commands":{"allow":["set_focus"],"deny":[]}},"allow-set-focusable":{"identifier":"allow-set-focusable","description":"Enables the set_focusable command without any pre-configured scope.","commands":{"allow":["set_focusable"],"deny":[]}},"allow-set-fullscreen":{"identifier":"allow-set-fullscreen","description":"Enables the set_fullscreen command without any pre-configured scope.","commands":{"allow":["set_fullscreen"],"deny":[]}},"allow-set-icon":{"identifier":"allow-set-icon","description":"Enables the set_icon command without any pre-configured scope.","commands":{"allow":["set_icon"],"deny":[]}},"allow-set-ignore-cursor-events":{"identifier":"allow-set-ignore-cursor-events","description":"Enables the set_ignore_cursor_events command without any pre-configured scope.","commands":{"allow":["set_ignore_cursor_events"],"deny":[]}},"allow-set-max-size":{"identifier":"allow-set-max-size","description":"Enables the set_max_size command without any pre-configured scope.","commands":{"allow":["set_max_size"],"deny":[]}},"allow-set-maximizable":{"identifier":"allow-set-maximizable","description":"Enables the set_maximizable command without any pre-configured scope.","commands":{"allow":["set_maximizable"],"deny":[]}},"allow-set-min-size":{"identifier":"allow-set-min-size","description":"Enables the set_min_size command without any pre-configured scope.","commands":{"allow":["set_min_size"],"deny":[]}},"allow-set-minimizable":{"identifier":"allow-set-minimizable","description":"Enables the set_minimizable command without any pre-configured scope.","commands":{"allow":["set_minimizable"],"deny":[]}},"allow-set-overlay-icon":{"identifier":"allow-set-overlay-icon","description":"Enables the set_overlay_icon command without any pre-configured scope.","commands":{"allow":["set_overlay_icon"],"deny":[]}},"allow-set-position":{"identifier":"allow-set-position","description":"Enables the set_position command without any pre-configured scope.","commands":{"allow":["set_position"],"deny":[]}},"allow-set-progress-bar":{"identifier":"allow-set-progress-bar","description":"Enables the set_progress_bar command without any pre-configured scope.","commands":{"allow":["set_progress_bar"],"deny":[]}},"allow-set-resizable":{"identifier":"allow-set-resizable","description":"Enables the set_resizable command without any pre-configured scope.","commands":{"allow":["set_resizable"],"deny":[]}},"allow-set-shadow":{"identifier":"allow-set-shadow","description":"Enables the set_shadow command without any pre-configured scope.","commands":{"allow":["set_shadow"],"deny":[]}},"allow-set-simple-fullscreen":{"identifier":"allow-set-simple-fullscreen","description":"Enables the set_simple_fullscreen command without any pre-configured scope.","commands":{"allow":["set_simple_fullscreen"],"deny":[]}},"allow-set-size":{"identifier":"allow-set-size","description":"Enables the set_size command without any pre-configured scope.","commands":{"allow":["set_size"],"deny":[]}},"allow-set-size-constraints":{"identifier":"allow-set-size-constraints","description":"Enables the set_size_constraints command without any pre-configured scope.","commands":{"allow":["set_size_constraints"],"deny":[]}},"allow-set-skip-taskbar":{"identifier":"allow-set-skip-taskbar","description":"Enables the set_skip_taskbar command without any pre-configured scope.","commands":{"allow":["set_skip_taskbar"],"deny":[]}},"allow-set-theme":{"identifier":"allow-set-theme","description":"Enables the set_theme command without any pre-configured scope.","commands":{"allow":["set_theme"],"deny":[]}},"allow-set-title":{"identifier":"allow-set-title","description":"Enables the set_title command without any pre-configured scope.","commands":{"allow":["set_title"],"deny":[]}},"allow-set-title-bar-style":{"identifier":"allow-set-title-bar-style","description":"Enables the set_title_bar_style command without any pre-configured scope.","commands":{"allow":["set_title_bar_style"],"deny":[]}},"allow-set-visible-on-all-workspaces":{"identifier":"allow-set-visible-on-all-workspaces","description":"Enables the set_visible_on_all_workspaces command without any pre-configured scope.","commands":{"allow":["set_visible_on_all_workspaces"],"deny":[]}},"allow-show":{"identifier":"allow-show","description":"Enables the show command without any pre-configured scope.","commands":{"allow":["show"],"deny":[]}},"allow-start-dragging":{"identifier":"allow-start-dragging","description":"Enables the start_dragging command without any pre-configured scope.","commands":{"allow":["start_dragging"],"deny":[]}},"allow-start-resize-dragging":{"identifier":"allow-start-resize-dragging","description":"Enables the start_resize_dragging command without any pre-configured scope.","commands":{"allow":["start_resize_dragging"],"deny":[]}},"allow-theme":{"identifier":"allow-theme","description":"Enables the theme command without any pre-configured scope.","commands":{"allow":["theme"],"deny":[]}},"allow-title":{"identifier":"allow-title","description":"Enables the title command without any pre-configured scope.","commands":{"allow":["title"],"deny":[]}},"allow-toggle-maximize":{"identifier":"allow-toggle-maximize","description":"Enables the toggle_maximize command without any pre-configured scope.","commands":{"allow":["toggle_maximize"],"deny":[]}},"allow-unmaximize":{"identifier":"allow-unmaximize","description":"Enables the unmaximize command without any pre-configured scope.","commands":{"allow":["unmaximize"],"deny":[]}},"allow-unminimize":{"identifier":"allow-unminimize","description":"Enables the unminimize command without any pre-configured scope.","commands":{"allow":["unminimize"],"deny":[]}},"deny-available-monitors":{"identifier":"deny-available-monitors","description":"Denies the available_monitors command without any pre-configured scope.","commands":{"allow":[],"deny":["available_monitors"]}},"deny-center":{"identifier":"deny-center","description":"Denies the center command without any pre-configured scope.","commands":{"allow":[],"deny":["center"]}},"deny-close":{"identifier":"deny-close","description":"Denies the close command without any pre-configured scope.","commands":{"allow":[],"deny":["close"]}},"deny-create":{"identifier":"deny-create","description":"Denies the create command without any pre-configured scope.","commands":{"allow":[],"deny":["create"]}},"deny-current-monitor":{"identifier":"deny-current-monitor","description":"Denies the current_monitor command without any pre-configured scope.","commands":{"allow":[],"deny":["current_monitor"]}},"deny-cursor-position":{"identifier":"deny-cursor-position","description":"Denies the cursor_position command without any pre-configured scope.","commands":{"allow":[],"deny":["cursor_position"]}},"deny-destroy":{"identifier":"deny-destroy","description":"Denies the destroy command without any pre-configured scope.","commands":{"allow":[],"deny":["destroy"]}},"deny-get-all-windows":{"identifier":"deny-get-all-windows","description":"Denies the get_all_windows command without any pre-configured scope.","commands":{"allow":[],"deny":["get_all_windows"]}},"deny-hide":{"identifier":"deny-hide","description":"Denies the hide command without any pre-configured scope.","commands":{"allow":[],"deny":["hide"]}},"deny-inner-position":{"identifier":"deny-inner-position","description":"Denies the inner_position command without any pre-configured scope.","commands":{"allow":[],"deny":["inner_position"]}},"deny-inner-size":{"identifier":"deny-inner-size","description":"Denies the inner_size command without any pre-configured scope.","commands":{"allow":[],"deny":["inner_size"]}},"deny-internal-toggle-maximize":{"identifier":"deny-internal-toggle-maximize","description":"Denies the internal_toggle_maximize command without any pre-configured scope.","commands":{"allow":[],"deny":["internal_toggle_maximize"]}},"deny-is-always-on-top":{"identifier":"deny-is-always-on-top","description":"Denies the is_always_on_top command without any pre-configured scope.","commands":{"allow":[],"deny":["is_always_on_top"]}},"deny-is-closable":{"identifier":"deny-is-closable","description":"Denies the is_closable command without any pre-configured scope.","commands":{"allow":[],"deny":["is_closable"]}},"deny-is-decorated":{"identifier":"deny-is-decorated","description":"Denies the is_decorated command without any pre-configured scope.","commands":{"allow":[],"deny":["is_decorated"]}},"deny-is-enabled":{"identifier":"deny-is-enabled","description":"Denies the is_enabled command without any pre-configured scope.","commands":{"allow":[],"deny":["is_enabled"]}},"deny-is-focused":{"identifier":"deny-is-focused","description":"Denies the is_focused command without any pre-configured scope.","commands":{"allow":[],"deny":["is_focused"]}},"deny-is-fullscreen":{"identifier":"deny-is-fullscreen","description":"Denies the is_fullscreen command without any pre-configured scope.","commands":{"allow":[],"deny":["is_fullscreen"]}},"deny-is-maximizable":{"identifier":"deny-is-maximizable","description":"Denies the is_maximizable command without any pre-configured scope.","commands":{"allow":[],"deny":["is_maximizable"]}},"deny-is-maximized":{"identifier":"deny-is-maximized","description":"Denies the is_maximized command without any pre-configured scope.","commands":{"allow":[],"deny":["is_maximized"]}},"deny-is-minimizable":{"identifier":"deny-is-minimizable","description":"Denies the is_minimizable command without any pre-configured scope.","commands":{"allow":[],"deny":["is_minimizable"]}},"deny-is-minimized":{"identifier":"deny-is-minimized","description":"Denies the is_minimized command without any pre-configured scope.","commands":{"allow":[],"deny":["is_minimized"]}},"deny-is-resizable":{"identifier":"deny-is-resizable","description":"Denies the is_resizable command without any pre-configured scope.","commands":{"allow":[],"deny":["is_resizable"]}},"deny-is-visible":{"identifier":"deny-is-visible","description":"Denies the is_visible command without any pre-configured scope.","commands":{"allow":[],"deny":["is_visible"]}},"deny-maximize":{"identifier":"deny-maximize","description":"Denies the maximize command without any pre-configured scope.","commands":{"allow":[],"deny":["maximize"]}},"deny-minimize":{"identifier":"deny-minimize","description":"Denies the minimize command without any pre-configured scope.","commands":{"allow":[],"deny":["minimize"]}},"deny-monitor-from-point":{"identifier":"deny-monitor-from-point","description":"Denies the monitor_from_point command without any pre-configured scope.","commands":{"allow":[],"deny":["monitor_from_point"]}},"deny-outer-position":{"identifier":"deny-outer-position","description":"Denies the outer_position command without any pre-configured scope.","commands":{"allow":[],"deny":["outer_position"]}},"deny-outer-size":{"identifier":"deny-outer-size","description":"Denies the outer_size command without any pre-configured scope.","commands":{"allow":[],"deny":["outer_size"]}},"deny-primary-monitor":{"identifier":"deny-primary-monitor","description":"Denies the primary_monitor command without any pre-configured scope.","commands":{"allow":[],"deny":["primary_monitor"]}},"deny-request-user-attention":{"identifier":"deny-request-user-attention","description":"Denies the request_user_attention command without any pre-configured scope.","commands":{"allow":[],"deny":["request_user_attention"]}},"deny-scale-factor":{"identifier":"deny-scale-factor","description":"Denies the scale_factor command without any pre-configured scope.","commands":{"allow":[],"deny":["scale_factor"]}},"deny-set-always-on-bottom":{"identifier":"deny-set-always-on-bottom","description":"Denies the set_always_on_bottom command without any pre-configured scope.","commands":{"allow":[],"deny":["set_always_on_bottom"]}},"deny-set-always-on-top":{"identifier":"deny-set-always-on-top","description":"Denies the set_always_on_top command without any pre-configured scope.","commands":{"allow":[],"deny":["set_always_on_top"]}},"deny-set-background-color":{"identifier":"deny-set-background-color","description":"Denies the set_background_color command without any pre-configured scope.","commands":{"allow":[],"deny":["set_background_color"]}},"deny-set-badge-count":{"identifier":"deny-set-badge-count","description":"Denies the set_badge_count command without any pre-configured scope.","commands":{"allow":[],"deny":["set_badge_count"]}},"deny-set-badge-label":{"identifier":"deny-set-badge-label","description":"Denies the set_badge_label command without any pre-configured scope.","commands":{"allow":[],"deny":["set_badge_label"]}},"deny-set-closable":{"identifier":"deny-set-closable","description":"Denies the set_closable command without any pre-configured scope.","commands":{"allow":[],"deny":["set_closable"]}},"deny-set-content-protected":{"identifier":"deny-set-content-protected","description":"Denies the set_content_protected command without any pre-configured scope.","commands":{"allow":[],"deny":["set_content_protected"]}},"deny-set-cursor-grab":{"identifier":"deny-set-cursor-grab","description":"Denies the set_cursor_grab command without any pre-configured scope.","commands":{"allow":[],"deny":["set_cursor_grab"]}},"deny-set-cursor-icon":{"identifier":"deny-set-cursor-icon","description":"Denies the set_cursor_icon command without any pre-configured scope.","commands":{"allow":[],"deny":["set_cursor_icon"]}},"deny-set-cursor-position":{"identifier":"deny-set-cursor-position","description":"Denies the set_cursor_position command without any pre-configured scope.","commands":{"allow":[],"deny":["set_cursor_position"]}},"deny-set-cursor-visible":{"identifier":"deny-set-cursor-visible","description":"Denies the set_cursor_visible command without any pre-configured scope.","commands":{"allow":[],"deny":["set_cursor_visible"]}},"deny-set-decorations":{"identifier":"deny-set-decorations","description":"Denies the set_decorations command without any pre-configured scope.","commands":{"allow":[],"deny":["set_decorations"]}},"deny-set-effects":{"identifier":"deny-set-effects","description":"Denies the set_effects command without any pre-configured scope.","commands":{"allow":[],"deny":["set_effects"]}},"deny-set-enabled":{"identifier":"deny-set-enabled","description":"Denies the set_enabled command without any pre-configured scope.","commands":{"allow":[],"deny":["set_enabled"]}},"deny-set-focus":{"identifier":"deny-set-focus","description":"Denies the set_focus command without any pre-configured scope.","commands":{"allow":[],"deny":["set_focus"]}},"deny-set-focusable":{"identifier":"deny-set-focusable","description":"Denies the set_focusable command without any pre-configured scope.","commands":{"allow":[],"deny":["set_focusable"]}},"deny-set-fullscreen":{"identifier":"deny-set-fullscreen","description":"Denies the set_fullscreen command without any pre-configured scope.","commands":{"allow":[],"deny":["set_fullscreen"]}},"deny-set-icon":{"identifier":"deny-set-icon","description":"Denies the set_icon command without any pre-configured scope.","commands":{"allow":[],"deny":["set_icon"]}},"deny-set-ignore-cursor-events":{"identifier":"deny-set-ignore-cursor-events","description":"Denies the set_ignore_cursor_events command without any pre-configured scope.","commands":{"allow":[],"deny":["set_ignore_cursor_events"]}},"deny-set-max-size":{"identifier":"deny-set-max-size","description":"Denies the set_max_size command without any pre-configured scope.","commands":{"allow":[],"deny":["set_max_size"]}},"deny-set-maximizable":{"identifier":"deny-set-maximizable","description":"Denies the set_maximizable command without any pre-configured scope.","commands":{"allow":[],"deny":["set_maximizable"]}},"deny-set-min-size":{"identifier":"deny-set-min-size","description":"Denies the set_min_size command without any pre-configured scope.","commands":{"allow":[],"deny":["set_min_size"]}},"deny-set-minimizable":{"identifier":"deny-set-minimizable","description":"Denies the set_minimizable command without any pre-configured scope.","commands":{"allow":[],"deny":["set_minimizable"]}},"deny-set-overlay-icon":{"identifier":"deny-set-overlay-icon","description":"Denies the set_overlay_icon command without any pre-configured scope.","commands":{"allow":[],"deny":["set_overlay_icon"]}},"deny-set-position":{"identifier":"deny-set-position","description":"Denies the set_position command without any pre-configured scope.","commands":{"allow":[],"deny":["set_position"]}},"deny-set-progress-bar":{"identifier":"deny-set-progress-bar","description":"Denies the set_progress_bar command without any pre-configured scope.","commands":{"allow":[],"deny":["set_progress_bar"]}},"deny-set-resizable":{"identifier":"deny-set-resizable","description":"Denies the set_resizable command without any pre-configured scope.","commands":{"allow":[],"deny":["set_resizable"]}},"deny-set-shadow":{"identifier":"deny-set-shadow","description":"Denies the set_shadow command without any pre-configured scope.","commands":{"allow":[],"deny":["set_shadow"]}},"deny-set-simple-fullscreen":{"identifier":"deny-set-simple-fullscreen","description":"Denies the set_simple_fullscreen command without any pre-configured scope.","commands":{"allow":[],"deny":["set_simple_fullscreen"]}},"deny-set-size":{"identifier":"deny-set-size","description":"Denies the set_size command without any pre-configured scope.","commands":{"allow":[],"deny":["set_size"]}},"deny-set-size-constraints":{"identifier":"deny-set-size-constraints","description":"Denies the set_size_constraints command without any pre-configured scope.","commands":{"allow":[],"deny":["set_size_constraints"]}},"deny-set-skip-taskbar":{"identifier":"deny-set-skip-taskbar","description":"Denies the set_skip_taskbar command without any pre-configured scope.","commands":{"allow":[],"deny":["set_skip_taskbar"]}},"deny-set-theme":{"identifier":"deny-set-theme","description":"Denies the set_theme command without any pre-configured scope.","commands":{"allow":[],"deny":["set_theme"]}},"deny-set-title":{"identifier":"deny-set-title","description":"Denies the set_title command without any pre-configured scope.","commands":{"allow":[],"deny":["set_title"]}},"deny-set-title-bar-style":{"identifier":"deny-set-title-bar-style","description":"Denies the set_title_bar_style command without any pre-configured scope.","commands":{"allow":[],"deny":["set_title_bar_style"]}},"deny-set-visible-on-all-workspaces":{"identifier":"deny-set-visible-on-all-workspaces","description":"Denies the set_visible_on_all_workspaces command without any pre-configured scope.","commands":{"allow":[],"deny":["set_visible_on_all_workspaces"]}},"deny-show":{"identifier":"deny-show","description":"Denies the show command without any pre-configured scope.","commands":{"allow":[],"deny":["show"]}},"deny-start-dragging":{"identifier":"deny-start-dragging","description":"Denies the start_dragging command without any pre-configured scope.","commands":{"allow":[],"deny":["start_dragging"]}},"deny-start-resize-dragging":{"identifier":"deny-start-resize-dragging","description":"Denies the start_resize_dragging command without any pre-configured scope.","commands":{"allow":[],"deny":["start_resize_dragging"]}},"deny-theme":{"identifier":"deny-theme","description":"Denies the theme command without any pre-configured scope.","commands":{"allow":[],"deny":["theme"]}},"deny-title":{"identifier":"deny-title","description":"Denies the title command without any pre-configured scope.","commands":{"allow":[],"deny":["title"]}},"deny-toggle-maximize":{"identifier":"deny-toggle-maximize","description":"Denies the toggle_maximize command without any pre-configured scope.","commands":{"allow":[],"deny":["toggle_maximize"]}},"deny-unmaximize":{"identifier":"deny-unmaximize","description":"Denies the unmaximize command without any pre-configured scope.","commands":{"allow":[],"deny":["unmaximize"]}},"deny-unminimize":{"identifier":"deny-unminimize","description":"Denies the unminimize command without any pre-configured scope.","commands":{"allow":[],"deny":["unminimize"]}}},"permission_sets":{},"global_scope_schema":null}}
\ No newline at end of file
+{"__app-acl__":{"default_permission":null,"permissions":{"dmnote-allow-all":{"identifier":"dmnote-allow-all","description":"Full DM Note command access for renderer","commands":{"allow":["app_auto_update","app_bootstrap","app_cancel_editor_flush","app_open_external","app_quit","app_quit_after_editor_flush","app_restart","commit_gesture","counter_animation_create","counter_animation_delete","counter_animation_list","counter_animation_update","css_get","css_get_use","css_history_activate","css_history_get","css_history_remove","css_load","css_reset","css_set_content","css_tab_activate_history","css_tab_clear","css_tab_export","css_tab_get","css_tab_get_all","css_tab_load","css_tab_set","css_tab_toggle","css_toggle","custom_tabs_create","custom_tabs_delete","custom_tabs_list","custom_tabs_restore","custom_tabs_select","editor_commit","editor_get","editor_preview_cancel","editor_preview_publish","editor_preview_subscribe","font_load","get_cursor_settings","graph_positions_get","graph_positions_update","history_redo","history_status","history_undo","image_load","js_get","js_get_use","js_load","js_reload","js_remove_plugin","js_reset","js_set_content","js_set_plugin_enabled","js_toggle","key_sound_get_output_state","key_sound_get_status","key_sound_list_output_devices","key_sound_load_soundpack","key_sound_set_enabled","key_sound_set_latency_logging","key_sound_set_output_backend","key_sound_set_volume","key_sound_unload_soundpack","keys_get","keys_get_counters","keys_reset_all","keys_reset_counters","keys_reset_counters_mode","keys_reset_mode","keys_reset_single_counter","keys_set_counters","keys_set_mode","knob_positions_get","knob_positions_update","layer_groups_get","note_tab_clear","note_tab_get","note_tab_get_all","note_tab_set","obs_regenerate_token","obs_start","obs_status","obs_stop","overlay_get","overlay_resize","overlay_set_anchor","overlay_set_lock","overlay_set_visible","panel_window_close","panel_window_close_ack","panel_window_is_open","panel_window_show","panel_window_start_dragging","panel_window_take_view_state","plugin_authority_reset","plugin_bridge_send","plugin_bridge_send_to","plugin_instances_commit","plugin_instances_get","plugin_instances_reconcile","plugin_rpc_respond","plugin_rpc_send","plugin_storage_clear","plugin_storage_clear_by_prefix","plugin_storage_get","plugin_storage_has_data","plugin_storage_keys","plugin_storage_remove","plugin_storage_set","positions_get","preset_load","preset_load_tab","preset_save","preset_save_tab","raw_input_subscribe","raw_input_unsubscribe","selection_session_get","selection_session_publish","settings_get","settings_update","sound_delete","sound_list","sound_load","sound_load_original","sound_rename","sound_save_processed_wav","sound_set_enabled","sound_set_hidden","sound_update_processed_wav","stat_positions_get","stat_positions_update","window_close","window_minimize","window_open_devtools_all","window_show_main"],"deny":[]}}},"permission_sets":{},"global_scope_schema":null},"core":{"default_permission":{"identifier":"default","description":"Default core plugins set.","permissions":["core:path:default","core:event:default","core:window:default","core:webview:default","core:app:default","core:image:default","core:resources:default","core:menu:default","core:tray:default"]},"permissions":{},"permission_sets":{},"global_scope_schema":null},"core:app":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin.","permissions":["allow-version","allow-name","allow-tauri-version","allow-identifier","allow-bundle-type","allow-register-listener","allow-remove-listener"]},"permissions":{"allow-app-hide":{"identifier":"allow-app-hide","description":"Enables the app_hide command without any pre-configured scope.","commands":{"allow":["app_hide"],"deny":[]}},"allow-app-show":{"identifier":"allow-app-show","description":"Enables the app_show command without any pre-configured scope.","commands":{"allow":["app_show"],"deny":[]}},"allow-bundle-type":{"identifier":"allow-bundle-type","description":"Enables the bundle_type command without any pre-configured scope.","commands":{"allow":["bundle_type"],"deny":[]}},"allow-default-window-icon":{"identifier":"allow-default-window-icon","description":"Enables the default_window_icon command without any pre-configured scope.","commands":{"allow":["default_window_icon"],"deny":[]}},"allow-fetch-data-store-identifiers":{"identifier":"allow-fetch-data-store-identifiers","description":"Enables the fetch_data_store_identifiers command without any pre-configured scope.","commands":{"allow":["fetch_data_store_identifiers"],"deny":[]}},"allow-identifier":{"identifier":"allow-identifier","description":"Enables the identifier command without any pre-configured scope.","commands":{"allow":["identifier"],"deny":[]}},"allow-name":{"identifier":"allow-name","description":"Enables the name command without any pre-configured scope.","commands":{"allow":["name"],"deny":[]}},"allow-register-listener":{"identifier":"allow-register-listener","description":"Enables the register_listener command without any pre-configured scope.","commands":{"allow":["register_listener"],"deny":[]}},"allow-remove-data-store":{"identifier":"allow-remove-data-store","description":"Enables the remove_data_store command without any pre-configured scope.","commands":{"allow":["remove_data_store"],"deny":[]}},"allow-remove-listener":{"identifier":"allow-remove-listener","description":"Enables the remove_listener command without any pre-configured scope.","commands":{"allow":["remove_listener"],"deny":[]}},"allow-set-app-theme":{"identifier":"allow-set-app-theme","description":"Enables the set_app_theme command without any pre-configured scope.","commands":{"allow":["set_app_theme"],"deny":[]}},"allow-set-dock-visibility":{"identifier":"allow-set-dock-visibility","description":"Enables the set_dock_visibility command without any pre-configured scope.","commands":{"allow":["set_dock_visibility"],"deny":[]}},"allow-tauri-version":{"identifier":"allow-tauri-version","description":"Enables the tauri_version command without any pre-configured scope.","commands":{"allow":["tauri_version"],"deny":[]}},"allow-version":{"identifier":"allow-version","description":"Enables the version command without any pre-configured scope.","commands":{"allow":["version"],"deny":[]}},"deny-app-hide":{"identifier":"deny-app-hide","description":"Denies the app_hide command without any pre-configured scope.","commands":{"allow":[],"deny":["app_hide"]}},"deny-app-show":{"identifier":"deny-app-show","description":"Denies the app_show command without any pre-configured scope.","commands":{"allow":[],"deny":["app_show"]}},"deny-bundle-type":{"identifier":"deny-bundle-type","description":"Denies the bundle_type command without any pre-configured scope.","commands":{"allow":[],"deny":["bundle_type"]}},"deny-default-window-icon":{"identifier":"deny-default-window-icon","description":"Denies the default_window_icon command without any pre-configured scope.","commands":{"allow":[],"deny":["default_window_icon"]}},"deny-fetch-data-store-identifiers":{"identifier":"deny-fetch-data-store-identifiers","description":"Denies the fetch_data_store_identifiers command without any pre-configured scope.","commands":{"allow":[],"deny":["fetch_data_store_identifiers"]}},"deny-identifier":{"identifier":"deny-identifier","description":"Denies the identifier command without any pre-configured scope.","commands":{"allow":[],"deny":["identifier"]}},"deny-name":{"identifier":"deny-name","description":"Denies the name command without any pre-configured scope.","commands":{"allow":[],"deny":["name"]}},"deny-register-listener":{"identifier":"deny-register-listener","description":"Denies the register_listener command without any pre-configured scope.","commands":{"allow":[],"deny":["register_listener"]}},"deny-remove-data-store":{"identifier":"deny-remove-data-store","description":"Denies the remove_data_store command without any pre-configured scope.","commands":{"allow":[],"deny":["remove_data_store"]}},"deny-remove-listener":{"identifier":"deny-remove-listener","description":"Denies the remove_listener command without any pre-configured scope.","commands":{"allow":[],"deny":["remove_listener"]}},"deny-set-app-theme":{"identifier":"deny-set-app-theme","description":"Denies the set_app_theme command without any pre-configured scope.","commands":{"allow":[],"deny":["set_app_theme"]}},"deny-set-dock-visibility":{"identifier":"deny-set-dock-visibility","description":"Denies the set_dock_visibility command without any pre-configured scope.","commands":{"allow":[],"deny":["set_dock_visibility"]}},"deny-tauri-version":{"identifier":"deny-tauri-version","description":"Denies the tauri_version command without any pre-configured scope.","commands":{"allow":[],"deny":["tauri_version"]}},"deny-version":{"identifier":"deny-version","description":"Denies the version command without any pre-configured scope.","commands":{"allow":[],"deny":["version"]}}},"permission_sets":{},"global_scope_schema":null},"core:event":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin, which enables all commands.","permissions":["allow-listen","allow-unlisten","allow-emit","allow-emit-to"]},"permissions":{"allow-emit":{"identifier":"allow-emit","description":"Enables the emit command without any pre-configured scope.","commands":{"allow":["emit"],"deny":[]}},"allow-emit-to":{"identifier":"allow-emit-to","description":"Enables the emit_to command without any pre-configured scope.","commands":{"allow":["emit_to"],"deny":[]}},"allow-listen":{"identifier":"allow-listen","description":"Enables the listen command without any pre-configured scope.","commands":{"allow":["listen"],"deny":[]}},"allow-unlisten":{"identifier":"allow-unlisten","description":"Enables the unlisten command without any pre-configured scope.","commands":{"allow":["unlisten"],"deny":[]}},"deny-emit":{"identifier":"deny-emit","description":"Denies the emit command without any pre-configured scope.","commands":{"allow":[],"deny":["emit"]}},"deny-emit-to":{"identifier":"deny-emit-to","description":"Denies the emit_to command without any pre-configured scope.","commands":{"allow":[],"deny":["emit_to"]}},"deny-listen":{"identifier":"deny-listen","description":"Denies the listen command without any pre-configured scope.","commands":{"allow":[],"deny":["listen"]}},"deny-unlisten":{"identifier":"deny-unlisten","description":"Denies the unlisten command without any pre-configured scope.","commands":{"allow":[],"deny":["unlisten"]}}},"permission_sets":{},"global_scope_schema":null},"core:image":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin, which enables all commands.","permissions":["allow-new","allow-from-bytes","allow-from-path","allow-rgba","allow-size"]},"permissions":{"allow-from-bytes":{"identifier":"allow-from-bytes","description":"Enables the from_bytes command without any pre-configured scope.","commands":{"allow":["from_bytes"],"deny":[]}},"allow-from-path":{"identifier":"allow-from-path","description":"Enables the from_path command without any pre-configured scope.","commands":{"allow":["from_path"],"deny":[]}},"allow-new":{"identifier":"allow-new","description":"Enables the new command without any pre-configured scope.","commands":{"allow":["new"],"deny":[]}},"allow-rgba":{"identifier":"allow-rgba","description":"Enables the rgba command without any pre-configured scope.","commands":{"allow":["rgba"],"deny":[]}},"allow-size":{"identifier":"allow-size","description":"Enables the size command without any pre-configured scope.","commands":{"allow":["size"],"deny":[]}},"deny-from-bytes":{"identifier":"deny-from-bytes","description":"Denies the from_bytes command without any pre-configured scope.","commands":{"allow":[],"deny":["from_bytes"]}},"deny-from-path":{"identifier":"deny-from-path","description":"Denies the from_path command without any pre-configured scope.","commands":{"allow":[],"deny":["from_path"]}},"deny-new":{"identifier":"deny-new","description":"Denies the new command without any pre-configured scope.","commands":{"allow":[],"deny":["new"]}},"deny-rgba":{"identifier":"deny-rgba","description":"Denies the rgba command without any pre-configured scope.","commands":{"allow":[],"deny":["rgba"]}},"deny-size":{"identifier":"deny-size","description":"Denies the size command without any pre-configured scope.","commands":{"allow":[],"deny":["size"]}}},"permission_sets":{},"global_scope_schema":null},"core:menu":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin, which enables all commands.","permissions":["allow-new","allow-append","allow-prepend","allow-insert","allow-remove","allow-remove-at","allow-items","allow-get","allow-popup","allow-create-default","allow-set-as-app-menu","allow-set-as-window-menu","allow-text","allow-set-text","allow-is-enabled","allow-set-enabled","allow-set-accelerator","allow-set-as-windows-menu-for-nsapp","allow-set-as-help-menu-for-nsapp","allow-is-checked","allow-set-checked","allow-set-icon"]},"permissions":{"allow-append":{"identifier":"allow-append","description":"Enables the append command without any pre-configured scope.","commands":{"allow":["append"],"deny":[]}},"allow-create-default":{"identifier":"allow-create-default","description":"Enables the create_default command without any pre-configured scope.","commands":{"allow":["create_default"],"deny":[]}},"allow-get":{"identifier":"allow-get","description":"Enables the get command without any pre-configured scope.","commands":{"allow":["get"],"deny":[]}},"allow-insert":{"identifier":"allow-insert","description":"Enables the insert command without any pre-configured scope.","commands":{"allow":["insert"],"deny":[]}},"allow-is-checked":{"identifier":"allow-is-checked","description":"Enables the is_checked command without any pre-configured scope.","commands":{"allow":["is_checked"],"deny":[]}},"allow-is-enabled":{"identifier":"allow-is-enabled","description":"Enables the is_enabled command without any pre-configured scope.","commands":{"allow":["is_enabled"],"deny":[]}},"allow-items":{"identifier":"allow-items","description":"Enables the items command without any pre-configured scope.","commands":{"allow":["items"],"deny":[]}},"allow-new":{"identifier":"allow-new","description":"Enables the new command without any pre-configured scope.","commands":{"allow":["new"],"deny":[]}},"allow-popup":{"identifier":"allow-popup","description":"Enables the popup command without any pre-configured scope.","commands":{"allow":["popup"],"deny":[]}},"allow-prepend":{"identifier":"allow-prepend","description":"Enables the prepend command without any pre-configured scope.","commands":{"allow":["prepend"],"deny":[]}},"allow-remove":{"identifier":"allow-remove","description":"Enables the remove command without any pre-configured scope.","commands":{"allow":["remove"],"deny":[]}},"allow-remove-at":{"identifier":"allow-remove-at","description":"Enables the remove_at command without any pre-configured scope.","commands":{"allow":["remove_at"],"deny":[]}},"allow-set-accelerator":{"identifier":"allow-set-accelerator","description":"Enables the set_accelerator command without any pre-configured scope.","commands":{"allow":["set_accelerator"],"deny":[]}},"allow-set-as-app-menu":{"identifier":"allow-set-as-app-menu","description":"Enables the set_as_app_menu command without any pre-configured scope.","commands":{"allow":["set_as_app_menu"],"deny":[]}},"allow-set-as-help-menu-for-nsapp":{"identifier":"allow-set-as-help-menu-for-nsapp","description":"Enables the set_as_help_menu_for_nsapp command without any pre-configured scope.","commands":{"allow":["set_as_help_menu_for_nsapp"],"deny":[]}},"allow-set-as-window-menu":{"identifier":"allow-set-as-window-menu","description":"Enables the set_as_window_menu command without any pre-configured scope.","commands":{"allow":["set_as_window_menu"],"deny":[]}},"allow-set-as-windows-menu-for-nsapp":{"identifier":"allow-set-as-windows-menu-for-nsapp","description":"Enables the set_as_windows_menu_for_nsapp command without any pre-configured scope.","commands":{"allow":["set_as_windows_menu_for_nsapp"],"deny":[]}},"allow-set-checked":{"identifier":"allow-set-checked","description":"Enables the set_checked command without any pre-configured scope.","commands":{"allow":["set_checked"],"deny":[]}},"allow-set-enabled":{"identifier":"allow-set-enabled","description":"Enables the set_enabled command without any pre-configured scope.","commands":{"allow":["set_enabled"],"deny":[]}},"allow-set-icon":{"identifier":"allow-set-icon","description":"Enables the set_icon command without any pre-configured scope.","commands":{"allow":["set_icon"],"deny":[]}},"allow-set-text":{"identifier":"allow-set-text","description":"Enables the set_text command without any pre-configured scope.","commands":{"allow":["set_text"],"deny":[]}},"allow-text":{"identifier":"allow-text","description":"Enables the text command without any pre-configured scope.","commands":{"allow":["text"],"deny":[]}},"deny-append":{"identifier":"deny-append","description":"Denies the append command without any pre-configured scope.","commands":{"allow":[],"deny":["append"]}},"deny-create-default":{"identifier":"deny-create-default","description":"Denies the create_default command without any pre-configured scope.","commands":{"allow":[],"deny":["create_default"]}},"deny-get":{"identifier":"deny-get","description":"Denies the get command without any pre-configured scope.","commands":{"allow":[],"deny":["get"]}},"deny-insert":{"identifier":"deny-insert","description":"Denies the insert command without any pre-configured scope.","commands":{"allow":[],"deny":["insert"]}},"deny-is-checked":{"identifier":"deny-is-checked","description":"Denies the is_checked command without any pre-configured scope.","commands":{"allow":[],"deny":["is_checked"]}},"deny-is-enabled":{"identifier":"deny-is-enabled","description":"Denies the is_enabled command without any pre-configured scope.","commands":{"allow":[],"deny":["is_enabled"]}},"deny-items":{"identifier":"deny-items","description":"Denies the items command without any pre-configured scope.","commands":{"allow":[],"deny":["items"]}},"deny-new":{"identifier":"deny-new","description":"Denies the new command without any pre-configured scope.","commands":{"allow":[],"deny":["new"]}},"deny-popup":{"identifier":"deny-popup","description":"Denies the popup command without any pre-configured scope.","commands":{"allow":[],"deny":["popup"]}},"deny-prepend":{"identifier":"deny-prepend","description":"Denies the prepend command without any pre-configured scope.","commands":{"allow":[],"deny":["prepend"]}},"deny-remove":{"identifier":"deny-remove","description":"Denies the remove command without any pre-configured scope.","commands":{"allow":[],"deny":["remove"]}},"deny-remove-at":{"identifier":"deny-remove-at","description":"Denies the remove_at command without any pre-configured scope.","commands":{"allow":[],"deny":["remove_at"]}},"deny-set-accelerator":{"identifier":"deny-set-accelerator","description":"Denies the set_accelerator command without any pre-configured scope.","commands":{"allow":[],"deny":["set_accelerator"]}},"deny-set-as-app-menu":{"identifier":"deny-set-as-app-menu","description":"Denies the set_as_app_menu command without any pre-configured scope.","commands":{"allow":[],"deny":["set_as_app_menu"]}},"deny-set-as-help-menu-for-nsapp":{"identifier":"deny-set-as-help-menu-for-nsapp","description":"Denies the set_as_help_menu_for_nsapp command without any pre-configured scope.","commands":{"allow":[],"deny":["set_as_help_menu_for_nsapp"]}},"deny-set-as-window-menu":{"identifier":"deny-set-as-window-menu","description":"Denies the set_as_window_menu command without any pre-configured scope.","commands":{"allow":[],"deny":["set_as_window_menu"]}},"deny-set-as-windows-menu-for-nsapp":{"identifier":"deny-set-as-windows-menu-for-nsapp","description":"Denies the set_as_windows_menu_for_nsapp command without any pre-configured scope.","commands":{"allow":[],"deny":["set_as_windows_menu_for_nsapp"]}},"deny-set-checked":{"identifier":"deny-set-checked","description":"Denies the set_checked command without any pre-configured scope.","commands":{"allow":[],"deny":["set_checked"]}},"deny-set-enabled":{"identifier":"deny-set-enabled","description":"Denies the set_enabled command without any pre-configured scope.","commands":{"allow":[],"deny":["set_enabled"]}},"deny-set-icon":{"identifier":"deny-set-icon","description":"Denies the set_icon command without any pre-configured scope.","commands":{"allow":[],"deny":["set_icon"]}},"deny-set-text":{"identifier":"deny-set-text","description":"Denies the set_text command without any pre-configured scope.","commands":{"allow":[],"deny":["set_text"]}},"deny-text":{"identifier":"deny-text","description":"Denies the text command without any pre-configured scope.","commands":{"allow":[],"deny":["text"]}}},"permission_sets":{},"global_scope_schema":null},"core:path":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin, which enables all commands.","permissions":["allow-resolve-directory","allow-resolve","allow-normalize","allow-join","allow-dirname","allow-extname","allow-basename","allow-is-absolute"]},"permissions":{"allow-basename":{"identifier":"allow-basename","description":"Enables the basename command without any pre-configured scope.","commands":{"allow":["basename"],"deny":[]}},"allow-dirname":{"identifier":"allow-dirname","description":"Enables the dirname command without any pre-configured scope.","commands":{"allow":["dirname"],"deny":[]}},"allow-extname":{"identifier":"allow-extname","description":"Enables the extname command without any pre-configured scope.","commands":{"allow":["extname"],"deny":[]}},"allow-is-absolute":{"identifier":"allow-is-absolute","description":"Enables the is_absolute command without any pre-configured scope.","commands":{"allow":["is_absolute"],"deny":[]}},"allow-join":{"identifier":"allow-join","description":"Enables the join command without any pre-configured scope.","commands":{"allow":["join"],"deny":[]}},"allow-normalize":{"identifier":"allow-normalize","description":"Enables the normalize command without any pre-configured scope.","commands":{"allow":["normalize"],"deny":[]}},"allow-resolve":{"identifier":"allow-resolve","description":"Enables the resolve command without any pre-configured scope.","commands":{"allow":["resolve"],"deny":[]}},"allow-resolve-directory":{"identifier":"allow-resolve-directory","description":"Enables the resolve_directory command without any pre-configured scope.","commands":{"allow":["resolve_directory"],"deny":[]}},"deny-basename":{"identifier":"deny-basename","description":"Denies the basename command without any pre-configured scope.","commands":{"allow":[],"deny":["basename"]}},"deny-dirname":{"identifier":"deny-dirname","description":"Denies the dirname command without any pre-configured scope.","commands":{"allow":[],"deny":["dirname"]}},"deny-extname":{"identifier":"deny-extname","description":"Denies the extname command without any pre-configured scope.","commands":{"allow":[],"deny":["extname"]}},"deny-is-absolute":{"identifier":"deny-is-absolute","description":"Denies the is_absolute command without any pre-configured scope.","commands":{"allow":[],"deny":["is_absolute"]}},"deny-join":{"identifier":"deny-join","description":"Denies the join command without any pre-configured scope.","commands":{"allow":[],"deny":["join"]}},"deny-normalize":{"identifier":"deny-normalize","description":"Denies the normalize command without any pre-configured scope.","commands":{"allow":[],"deny":["normalize"]}},"deny-resolve":{"identifier":"deny-resolve","description":"Denies the resolve command without any pre-configured scope.","commands":{"allow":[],"deny":["resolve"]}},"deny-resolve-directory":{"identifier":"deny-resolve-directory","description":"Denies the resolve_directory command without any pre-configured scope.","commands":{"allow":[],"deny":["resolve_directory"]}}},"permission_sets":{},"global_scope_schema":null},"core:resources":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin, which enables all commands.","permissions":["allow-close"]},"permissions":{"allow-close":{"identifier":"allow-close","description":"Enables the close command without any pre-configured scope.","commands":{"allow":["close"],"deny":[]}},"deny-close":{"identifier":"deny-close","description":"Denies the close command without any pre-configured scope.","commands":{"allow":[],"deny":["close"]}}},"permission_sets":{},"global_scope_schema":null},"core:tray":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin, which enables all commands.","permissions":["allow-new","allow-get-by-id","allow-remove-by-id","allow-set-icon","allow-set-menu","allow-set-tooltip","allow-set-title","allow-set-visible","allow-set-temp-dir-path","allow-set-icon-as-template","allow-set-show-menu-on-left-click"]},"permissions":{"allow-get-by-id":{"identifier":"allow-get-by-id","description":"Enables the get_by_id command without any pre-configured scope.","commands":{"allow":["get_by_id"],"deny":[]}},"allow-new":{"identifier":"allow-new","description":"Enables the new command without any pre-configured scope.","commands":{"allow":["new"],"deny":[]}},"allow-remove-by-id":{"identifier":"allow-remove-by-id","description":"Enables the remove_by_id command without any pre-configured scope.","commands":{"allow":["remove_by_id"],"deny":[]}},"allow-set-icon":{"identifier":"allow-set-icon","description":"Enables the set_icon command without any pre-configured scope.","commands":{"allow":["set_icon"],"deny":[]}},"allow-set-icon-as-template":{"identifier":"allow-set-icon-as-template","description":"Enables the set_icon_as_template command without any pre-configured scope.","commands":{"allow":["set_icon_as_template"],"deny":[]}},"allow-set-menu":{"identifier":"allow-set-menu","description":"Enables the set_menu command without any pre-configured scope.","commands":{"allow":["set_menu"],"deny":[]}},"allow-set-show-menu-on-left-click":{"identifier":"allow-set-show-menu-on-left-click","description":"Enables the set_show_menu_on_left_click command without any pre-configured scope.","commands":{"allow":["set_show_menu_on_left_click"],"deny":[]}},"allow-set-temp-dir-path":{"identifier":"allow-set-temp-dir-path","description":"Enables the set_temp_dir_path command without any pre-configured scope.","commands":{"allow":["set_temp_dir_path"],"deny":[]}},"allow-set-title":{"identifier":"allow-set-title","description":"Enables the set_title command without any pre-configured scope.","commands":{"allow":["set_title"],"deny":[]}},"allow-set-tooltip":{"identifier":"allow-set-tooltip","description":"Enables the set_tooltip command without any pre-configured scope.","commands":{"allow":["set_tooltip"],"deny":[]}},"allow-set-visible":{"identifier":"allow-set-visible","description":"Enables the set_visible command without any pre-configured scope.","commands":{"allow":["set_visible"],"deny":[]}},"deny-get-by-id":{"identifier":"deny-get-by-id","description":"Denies the get_by_id command without any pre-configured scope.","commands":{"allow":[],"deny":["get_by_id"]}},"deny-new":{"identifier":"deny-new","description":"Denies the new command without any pre-configured scope.","commands":{"allow":[],"deny":["new"]}},"deny-remove-by-id":{"identifier":"deny-remove-by-id","description":"Denies the remove_by_id command without any pre-configured scope.","commands":{"allow":[],"deny":["remove_by_id"]}},"deny-set-icon":{"identifier":"deny-set-icon","description":"Denies the set_icon command without any pre-configured scope.","commands":{"allow":[],"deny":["set_icon"]}},"deny-set-icon-as-template":{"identifier":"deny-set-icon-as-template","description":"Denies the set_icon_as_template command without any pre-configured scope.","commands":{"allow":[],"deny":["set_icon_as_template"]}},"deny-set-menu":{"identifier":"deny-set-menu","description":"Denies the set_menu command without any pre-configured scope.","commands":{"allow":[],"deny":["set_menu"]}},"deny-set-show-menu-on-left-click":{"identifier":"deny-set-show-menu-on-left-click","description":"Denies the set_show_menu_on_left_click command without any pre-configured scope.","commands":{"allow":[],"deny":["set_show_menu_on_left_click"]}},"deny-set-temp-dir-path":{"identifier":"deny-set-temp-dir-path","description":"Denies the set_temp_dir_path command without any pre-configured scope.","commands":{"allow":[],"deny":["set_temp_dir_path"]}},"deny-set-title":{"identifier":"deny-set-title","description":"Denies the set_title command without any pre-configured scope.","commands":{"allow":[],"deny":["set_title"]}},"deny-set-tooltip":{"identifier":"deny-set-tooltip","description":"Denies the set_tooltip command without any pre-configured scope.","commands":{"allow":[],"deny":["set_tooltip"]}},"deny-set-visible":{"identifier":"deny-set-visible","description":"Denies the set_visible command without any pre-configured scope.","commands":{"allow":[],"deny":["set_visible"]}}},"permission_sets":{},"global_scope_schema":null},"core:webview":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin.","permissions":["allow-get-all-webviews","allow-webview-position","allow-webview-size","allow-internal-toggle-devtools"]},"permissions":{"allow-clear-all-browsing-data":{"identifier":"allow-clear-all-browsing-data","description":"Enables the clear_all_browsing_data command without any pre-configured scope.","commands":{"allow":["clear_all_browsing_data"],"deny":[]}},"allow-create-webview":{"identifier":"allow-create-webview","description":"Enables the create_webview command without any pre-configured scope.","commands":{"allow":["create_webview"],"deny":[]}},"allow-create-webview-window":{"identifier":"allow-create-webview-window","description":"Enables the create_webview_window command without any pre-configured scope.","commands":{"allow":["create_webview_window"],"deny":[]}},"allow-get-all-webviews":{"identifier":"allow-get-all-webviews","description":"Enables the get_all_webviews command without any pre-configured scope.","commands":{"allow":["get_all_webviews"],"deny":[]}},"allow-internal-toggle-devtools":{"identifier":"allow-internal-toggle-devtools","description":"Enables the internal_toggle_devtools command without any pre-configured scope.","commands":{"allow":["internal_toggle_devtools"],"deny":[]}},"allow-print":{"identifier":"allow-print","description":"Enables the print command without any pre-configured scope.","commands":{"allow":["print"],"deny":[]}},"allow-reparent":{"identifier":"allow-reparent","description":"Enables the reparent command without any pre-configured scope.","commands":{"allow":["reparent"],"deny":[]}},"allow-set-webview-auto-resize":{"identifier":"allow-set-webview-auto-resize","description":"Enables the set_webview_auto_resize command without any pre-configured scope.","commands":{"allow":["set_webview_auto_resize"],"deny":[]}},"allow-set-webview-background-color":{"identifier":"allow-set-webview-background-color","description":"Enables the set_webview_background_color command without any pre-configured scope.","commands":{"allow":["set_webview_background_color"],"deny":[]}},"allow-set-webview-focus":{"identifier":"allow-set-webview-focus","description":"Enables the set_webview_focus command without any pre-configured scope.","commands":{"allow":["set_webview_focus"],"deny":[]}},"allow-set-webview-position":{"identifier":"allow-set-webview-position","description":"Enables the set_webview_position command without any pre-configured scope.","commands":{"allow":["set_webview_position"],"deny":[]}},"allow-set-webview-size":{"identifier":"allow-set-webview-size","description":"Enables the set_webview_size command without any pre-configured scope.","commands":{"allow":["set_webview_size"],"deny":[]}},"allow-set-webview-zoom":{"identifier":"allow-set-webview-zoom","description":"Enables the set_webview_zoom command without any pre-configured scope.","commands":{"allow":["set_webview_zoom"],"deny":[]}},"allow-webview-close":{"identifier":"allow-webview-close","description":"Enables the webview_close command without any pre-configured scope.","commands":{"allow":["webview_close"],"deny":[]}},"allow-webview-hide":{"identifier":"allow-webview-hide","description":"Enables the webview_hide command without any pre-configured scope.","commands":{"allow":["webview_hide"],"deny":[]}},"allow-webview-position":{"identifier":"allow-webview-position","description":"Enables the webview_position command without any pre-configured scope.","commands":{"allow":["webview_position"],"deny":[]}},"allow-webview-show":{"identifier":"allow-webview-show","description":"Enables the webview_show command without any pre-configured scope.","commands":{"allow":["webview_show"],"deny":[]}},"allow-webview-size":{"identifier":"allow-webview-size","description":"Enables the webview_size command without any pre-configured scope.","commands":{"allow":["webview_size"],"deny":[]}},"deny-clear-all-browsing-data":{"identifier":"deny-clear-all-browsing-data","description":"Denies the clear_all_browsing_data command without any pre-configured scope.","commands":{"allow":[],"deny":["clear_all_browsing_data"]}},"deny-create-webview":{"identifier":"deny-create-webview","description":"Denies the create_webview command without any pre-configured scope.","commands":{"allow":[],"deny":["create_webview"]}},"deny-create-webview-window":{"identifier":"deny-create-webview-window","description":"Denies the create_webview_window command without any pre-configured scope.","commands":{"allow":[],"deny":["create_webview_window"]}},"deny-get-all-webviews":{"identifier":"deny-get-all-webviews","description":"Denies the get_all_webviews command without any pre-configured scope.","commands":{"allow":[],"deny":["get_all_webviews"]}},"deny-internal-toggle-devtools":{"identifier":"deny-internal-toggle-devtools","description":"Denies the internal_toggle_devtools command without any pre-configured scope.","commands":{"allow":[],"deny":["internal_toggle_devtools"]}},"deny-print":{"identifier":"deny-print","description":"Denies the print command without any pre-configured scope.","commands":{"allow":[],"deny":["print"]}},"deny-reparent":{"identifier":"deny-reparent","description":"Denies the reparent command without any pre-configured scope.","commands":{"allow":[],"deny":["reparent"]}},"deny-set-webview-auto-resize":{"identifier":"deny-set-webview-auto-resize","description":"Denies the set_webview_auto_resize command without any pre-configured scope.","commands":{"allow":[],"deny":["set_webview_auto_resize"]}},"deny-set-webview-background-color":{"identifier":"deny-set-webview-background-color","description":"Denies the set_webview_background_color command without any pre-configured scope.","commands":{"allow":[],"deny":["set_webview_background_color"]}},"deny-set-webview-focus":{"identifier":"deny-set-webview-focus","description":"Denies the set_webview_focus command without any pre-configured scope.","commands":{"allow":[],"deny":["set_webview_focus"]}},"deny-set-webview-position":{"identifier":"deny-set-webview-position","description":"Denies the set_webview_position command without any pre-configured scope.","commands":{"allow":[],"deny":["set_webview_position"]}},"deny-set-webview-size":{"identifier":"deny-set-webview-size","description":"Denies the set_webview_size command without any pre-configured scope.","commands":{"allow":[],"deny":["set_webview_size"]}},"deny-set-webview-zoom":{"identifier":"deny-set-webview-zoom","description":"Denies the set_webview_zoom command without any pre-configured scope.","commands":{"allow":[],"deny":["set_webview_zoom"]}},"deny-webview-close":{"identifier":"deny-webview-close","description":"Denies the webview_close command without any pre-configured scope.","commands":{"allow":[],"deny":["webview_close"]}},"deny-webview-hide":{"identifier":"deny-webview-hide","description":"Denies the webview_hide command without any pre-configured scope.","commands":{"allow":[],"deny":["webview_hide"]}},"deny-webview-position":{"identifier":"deny-webview-position","description":"Denies the webview_position command without any pre-configured scope.","commands":{"allow":[],"deny":["webview_position"]}},"deny-webview-show":{"identifier":"deny-webview-show","description":"Denies the webview_show command without any pre-configured scope.","commands":{"allow":[],"deny":["webview_show"]}},"deny-webview-size":{"identifier":"deny-webview-size","description":"Denies the webview_size command without any pre-configured scope.","commands":{"allow":[],"deny":["webview_size"]}}},"permission_sets":{},"global_scope_schema":null},"core:window":{"default_permission":{"identifier":"default","description":"Default permissions for the plugin.","permissions":["allow-get-all-windows","allow-scale-factor","allow-inner-position","allow-outer-position","allow-inner-size","allow-outer-size","allow-is-fullscreen","allow-is-minimized","allow-is-maximized","allow-is-focused","allow-is-decorated","allow-is-resizable","allow-is-maximizable","allow-is-minimizable","allow-is-closable","allow-is-visible","allow-is-enabled","allow-title","allow-current-monitor","allow-primary-monitor","allow-monitor-from-point","allow-available-monitors","allow-cursor-position","allow-theme","allow-is-always-on-top","allow-internal-toggle-maximize"]},"permissions":{"allow-available-monitors":{"identifier":"allow-available-monitors","description":"Enables the available_monitors command without any pre-configured scope.","commands":{"allow":["available_monitors"],"deny":[]}},"allow-center":{"identifier":"allow-center","description":"Enables the center command without any pre-configured scope.","commands":{"allow":["center"],"deny":[]}},"allow-close":{"identifier":"allow-close","description":"Enables the close command without any pre-configured scope.","commands":{"allow":["close"],"deny":[]}},"allow-create":{"identifier":"allow-create","description":"Enables the create command without any pre-configured scope.","commands":{"allow":["create"],"deny":[]}},"allow-current-monitor":{"identifier":"allow-current-monitor","description":"Enables the current_monitor command without any pre-configured scope.","commands":{"allow":["current_monitor"],"deny":[]}},"allow-cursor-position":{"identifier":"allow-cursor-position","description":"Enables the cursor_position command without any pre-configured scope.","commands":{"allow":["cursor_position"],"deny":[]}},"allow-destroy":{"identifier":"allow-destroy","description":"Enables the destroy command without any pre-configured scope.","commands":{"allow":["destroy"],"deny":[]}},"allow-get-all-windows":{"identifier":"allow-get-all-windows","description":"Enables the get_all_windows command without any pre-configured scope.","commands":{"allow":["get_all_windows"],"deny":[]}},"allow-hide":{"identifier":"allow-hide","description":"Enables the hide command without any pre-configured scope.","commands":{"allow":["hide"],"deny":[]}},"allow-inner-position":{"identifier":"allow-inner-position","description":"Enables the inner_position command without any pre-configured scope.","commands":{"allow":["inner_position"],"deny":[]}},"allow-inner-size":{"identifier":"allow-inner-size","description":"Enables the inner_size command without any pre-configured scope.","commands":{"allow":["inner_size"],"deny":[]}},"allow-internal-toggle-maximize":{"identifier":"allow-internal-toggle-maximize","description":"Enables the internal_toggle_maximize command without any pre-configured scope.","commands":{"allow":["internal_toggle_maximize"],"deny":[]}},"allow-is-always-on-top":{"identifier":"allow-is-always-on-top","description":"Enables the is_always_on_top command without any pre-configured scope.","commands":{"allow":["is_always_on_top"],"deny":[]}},"allow-is-closable":{"identifier":"allow-is-closable","description":"Enables the is_closable command without any pre-configured scope.","commands":{"allow":["is_closable"],"deny":[]}},"allow-is-decorated":{"identifier":"allow-is-decorated","description":"Enables the is_decorated command without any pre-configured scope.","commands":{"allow":["is_decorated"],"deny":[]}},"allow-is-enabled":{"identifier":"allow-is-enabled","description":"Enables the is_enabled command without any pre-configured scope.","commands":{"allow":["is_enabled"],"deny":[]}},"allow-is-focused":{"identifier":"allow-is-focused","description":"Enables the is_focused command without any pre-configured scope.","commands":{"allow":["is_focused"],"deny":[]}},"allow-is-fullscreen":{"identifier":"allow-is-fullscreen","description":"Enables the is_fullscreen command without any pre-configured scope.","commands":{"allow":["is_fullscreen"],"deny":[]}},"allow-is-maximizable":{"identifier":"allow-is-maximizable","description":"Enables the is_maximizable command without any pre-configured scope.","commands":{"allow":["is_maximizable"],"deny":[]}},"allow-is-maximized":{"identifier":"allow-is-maximized","description":"Enables the is_maximized command without any pre-configured scope.","commands":{"allow":["is_maximized"],"deny":[]}},"allow-is-minimizable":{"identifier":"allow-is-minimizable","description":"Enables the is_minimizable command without any pre-configured scope.","commands":{"allow":["is_minimizable"],"deny":[]}},"allow-is-minimized":{"identifier":"allow-is-minimized","description":"Enables the is_minimized command without any pre-configured scope.","commands":{"allow":["is_minimized"],"deny":[]}},"allow-is-resizable":{"identifier":"allow-is-resizable","description":"Enables the is_resizable command without any pre-configured scope.","commands":{"allow":["is_resizable"],"deny":[]}},"allow-is-visible":{"identifier":"allow-is-visible","description":"Enables the is_visible command without any pre-configured scope.","commands":{"allow":["is_visible"],"deny":[]}},"allow-maximize":{"identifier":"allow-maximize","description":"Enables the maximize command without any pre-configured scope.","commands":{"allow":["maximize"],"deny":[]}},"allow-minimize":{"identifier":"allow-minimize","description":"Enables the minimize command without any pre-configured scope.","commands":{"allow":["minimize"],"deny":[]}},"allow-monitor-from-point":{"identifier":"allow-monitor-from-point","description":"Enables the monitor_from_point command without any pre-configured scope.","commands":{"allow":["monitor_from_point"],"deny":[]}},"allow-outer-position":{"identifier":"allow-outer-position","description":"Enables the outer_position command without any pre-configured scope.","commands":{"allow":["outer_position"],"deny":[]}},"allow-outer-size":{"identifier":"allow-outer-size","description":"Enables the outer_size command without any pre-configured scope.","commands":{"allow":["outer_size"],"deny":[]}},"allow-primary-monitor":{"identifier":"allow-primary-monitor","description":"Enables the primary_monitor command without any pre-configured scope.","commands":{"allow":["primary_monitor"],"deny":[]}},"allow-request-user-attention":{"identifier":"allow-request-user-attention","description":"Enables the request_user_attention command without any pre-configured scope.","commands":{"allow":["request_user_attention"],"deny":[]}},"allow-scale-factor":{"identifier":"allow-scale-factor","description":"Enables the scale_factor command without any pre-configured scope.","commands":{"allow":["scale_factor"],"deny":[]}},"allow-set-always-on-bottom":{"identifier":"allow-set-always-on-bottom","description":"Enables the set_always_on_bottom command without any pre-configured scope.","commands":{"allow":["set_always_on_bottom"],"deny":[]}},"allow-set-always-on-top":{"identifier":"allow-set-always-on-top","description":"Enables the set_always_on_top command without any pre-configured scope.","commands":{"allow":["set_always_on_top"],"deny":[]}},"allow-set-background-color":{"identifier":"allow-set-background-color","description":"Enables the set_background_color command without any pre-configured scope.","commands":{"allow":["set_background_color"],"deny":[]}},"allow-set-badge-count":{"identifier":"allow-set-badge-count","description":"Enables the set_badge_count command without any pre-configured scope.","commands":{"allow":["set_badge_count"],"deny":[]}},"allow-set-badge-label":{"identifier":"allow-set-badge-label","description":"Enables the set_badge_label command without any pre-configured scope.","commands":{"allow":["set_badge_label"],"deny":[]}},"allow-set-closable":{"identifier":"allow-set-closable","description":"Enables the set_closable command without any pre-configured scope.","commands":{"allow":["set_closable"],"deny":[]}},"allow-set-content-protected":{"identifier":"allow-set-content-protected","description":"Enables the set_content_protected command without any pre-configured scope.","commands":{"allow":["set_content_protected"],"deny":[]}},"allow-set-cursor-grab":{"identifier":"allow-set-cursor-grab","description":"Enables the set_cursor_grab command without any pre-configured scope.","commands":{"allow":["set_cursor_grab"],"deny":[]}},"allow-set-cursor-icon":{"identifier":"allow-set-cursor-icon","description":"Enables the set_cursor_icon command without any pre-configured scope.","commands":{"allow":["set_cursor_icon"],"deny":[]}},"allow-set-cursor-position":{"identifier":"allow-set-cursor-position","description":"Enables the set_cursor_position command without any pre-configured scope.","commands":{"allow":["set_cursor_position"],"deny":[]}},"allow-set-cursor-visible":{"identifier":"allow-set-cursor-visible","description":"Enables the set_cursor_visible command without any pre-configured scope.","commands":{"allow":["set_cursor_visible"],"deny":[]}},"allow-set-decorations":{"identifier":"allow-set-decorations","description":"Enables the set_decorations command without any pre-configured scope.","commands":{"allow":["set_decorations"],"deny":[]}},"allow-set-effects":{"identifier":"allow-set-effects","description":"Enables the set_effects command without any pre-configured scope.","commands":{"allow":["set_effects"],"deny":[]}},"allow-set-enabled":{"identifier":"allow-set-enabled","description":"Enables the set_enabled command without any pre-configured scope.","commands":{"allow":["set_enabled"],"deny":[]}},"allow-set-focus":{"identifier":"allow-set-focus","description":"Enables the set_focus command without any pre-configured scope.","commands":{"allow":["set_focus"],"deny":[]}},"allow-set-focusable":{"identifier":"allow-set-focusable","description":"Enables the set_focusable command without any pre-configured scope.","commands":{"allow":["set_focusable"],"deny":[]}},"allow-set-fullscreen":{"identifier":"allow-set-fullscreen","description":"Enables the set_fullscreen command without any pre-configured scope.","commands":{"allow":["set_fullscreen"],"deny":[]}},"allow-set-icon":{"identifier":"allow-set-icon","description":"Enables the set_icon command without any pre-configured scope.","commands":{"allow":["set_icon"],"deny":[]}},"allow-set-ignore-cursor-events":{"identifier":"allow-set-ignore-cursor-events","description":"Enables the set_ignore_cursor_events command without any pre-configured scope.","commands":{"allow":["set_ignore_cursor_events"],"deny":[]}},"allow-set-max-size":{"identifier":"allow-set-max-size","description":"Enables the set_max_size command without any pre-configured scope.","commands":{"allow":["set_max_size"],"deny":[]}},"allow-set-maximizable":{"identifier":"allow-set-maximizable","description":"Enables the set_maximizable command without any pre-configured scope.","commands":{"allow":["set_maximizable"],"deny":[]}},"allow-set-min-size":{"identifier":"allow-set-min-size","description":"Enables the set_min_size command without any pre-configured scope.","commands":{"allow":["set_min_size"],"deny":[]}},"allow-set-minimizable":{"identifier":"allow-set-minimizable","description":"Enables the set_minimizable command without any pre-configured scope.","commands":{"allow":["set_minimizable"],"deny":[]}},"allow-set-overlay-icon":{"identifier":"allow-set-overlay-icon","description":"Enables the set_overlay_icon command without any pre-configured scope.","commands":{"allow":["set_overlay_icon"],"deny":[]}},"allow-set-position":{"identifier":"allow-set-position","description":"Enables the set_position command without any pre-configured scope.","commands":{"allow":["set_position"],"deny":[]}},"allow-set-progress-bar":{"identifier":"allow-set-progress-bar","description":"Enables the set_progress_bar command without any pre-configured scope.","commands":{"allow":["set_progress_bar"],"deny":[]}},"allow-set-resizable":{"identifier":"allow-set-resizable","description":"Enables the set_resizable command without any pre-configured scope.","commands":{"allow":["set_resizable"],"deny":[]}},"allow-set-shadow":{"identifier":"allow-set-shadow","description":"Enables the set_shadow command without any pre-configured scope.","commands":{"allow":["set_shadow"],"deny":[]}},"allow-set-simple-fullscreen":{"identifier":"allow-set-simple-fullscreen","description":"Enables the set_simple_fullscreen command without any pre-configured scope.","commands":{"allow":["set_simple_fullscreen"],"deny":[]}},"allow-set-size":{"identifier":"allow-set-size","description":"Enables the set_size command without any pre-configured scope.","commands":{"allow":["set_size"],"deny":[]}},"allow-set-size-constraints":{"identifier":"allow-set-size-constraints","description":"Enables the set_size_constraints command without any pre-configured scope.","commands":{"allow":["set_size_constraints"],"deny":[]}},"allow-set-skip-taskbar":{"identifier":"allow-set-skip-taskbar","description":"Enables the set_skip_taskbar command without any pre-configured scope.","commands":{"allow":["set_skip_taskbar"],"deny":[]}},"allow-set-theme":{"identifier":"allow-set-theme","description":"Enables the set_theme command without any pre-configured scope.","commands":{"allow":["set_theme"],"deny":[]}},"allow-set-title":{"identifier":"allow-set-title","description":"Enables the set_title command without any pre-configured scope.","commands":{"allow":["set_title"],"deny":[]}},"allow-set-title-bar-style":{"identifier":"allow-set-title-bar-style","description":"Enables the set_title_bar_style command without any pre-configured scope.","commands":{"allow":["set_title_bar_style"],"deny":[]}},"allow-set-visible-on-all-workspaces":{"identifier":"allow-set-visible-on-all-workspaces","description":"Enables the set_visible_on_all_workspaces command without any pre-configured scope.","commands":{"allow":["set_visible_on_all_workspaces"],"deny":[]}},"allow-show":{"identifier":"allow-show","description":"Enables the show command without any pre-configured scope.","commands":{"allow":["show"],"deny":[]}},"allow-start-dragging":{"identifier":"allow-start-dragging","description":"Enables the start_dragging command without any pre-configured scope.","commands":{"allow":["start_dragging"],"deny":[]}},"allow-start-resize-dragging":{"identifier":"allow-start-resize-dragging","description":"Enables the start_resize_dragging command without any pre-configured scope.","commands":{"allow":["start_resize_dragging"],"deny":[]}},"allow-theme":{"identifier":"allow-theme","description":"Enables the theme command without any pre-configured scope.","commands":{"allow":["theme"],"deny":[]}},"allow-title":{"identifier":"allow-title","description":"Enables the title command without any pre-configured scope.","commands":{"allow":["title"],"deny":[]}},"allow-toggle-maximize":{"identifier":"allow-toggle-maximize","description":"Enables the toggle_maximize command without any pre-configured scope.","commands":{"allow":["toggle_maximize"],"deny":[]}},"allow-unmaximize":{"identifier":"allow-unmaximize","description":"Enables the unmaximize command without any pre-configured scope.","commands":{"allow":["unmaximize"],"deny":[]}},"allow-unminimize":{"identifier":"allow-unminimize","description":"Enables the unminimize command without any pre-configured scope.","commands":{"allow":["unminimize"],"deny":[]}},"deny-available-monitors":{"identifier":"deny-available-monitors","description":"Denies the available_monitors command without any pre-configured scope.","commands":{"allow":[],"deny":["available_monitors"]}},"deny-center":{"identifier":"deny-center","description":"Denies the center command without any pre-configured scope.","commands":{"allow":[],"deny":["center"]}},"deny-close":{"identifier":"deny-close","description":"Denies the close command without any pre-configured scope.","commands":{"allow":[],"deny":["close"]}},"deny-create":{"identifier":"deny-create","description":"Denies the create command without any pre-configured scope.","commands":{"allow":[],"deny":["create"]}},"deny-current-monitor":{"identifier":"deny-current-monitor","description":"Denies the current_monitor command without any pre-configured scope.","commands":{"allow":[],"deny":["current_monitor"]}},"deny-cursor-position":{"identifier":"deny-cursor-position","description":"Denies the cursor_position command without any pre-configured scope.","commands":{"allow":[],"deny":["cursor_position"]}},"deny-destroy":{"identifier":"deny-destroy","description":"Denies the destroy command without any pre-configured scope.","commands":{"allow":[],"deny":["destroy"]}},"deny-get-all-windows":{"identifier":"deny-get-all-windows","description":"Denies the get_all_windows command without any pre-configured scope.","commands":{"allow":[],"deny":["get_all_windows"]}},"deny-hide":{"identifier":"deny-hide","description":"Denies the hide command without any pre-configured scope.","commands":{"allow":[],"deny":["hide"]}},"deny-inner-position":{"identifier":"deny-inner-position","description":"Denies the inner_position command without any pre-configured scope.","commands":{"allow":[],"deny":["inner_position"]}},"deny-inner-size":{"identifier":"deny-inner-size","description":"Denies the inner_size command without any pre-configured scope.","commands":{"allow":[],"deny":["inner_size"]}},"deny-internal-toggle-maximize":{"identifier":"deny-internal-toggle-maximize","description":"Denies the internal_toggle_maximize command without any pre-configured scope.","commands":{"allow":[],"deny":["internal_toggle_maximize"]}},"deny-is-always-on-top":{"identifier":"deny-is-always-on-top","description":"Denies the is_always_on_top command without any pre-configured scope.","commands":{"allow":[],"deny":["is_always_on_top"]}},"deny-is-closable":{"identifier":"deny-is-closable","description":"Denies the is_closable command without any pre-configured scope.","commands":{"allow":[],"deny":["is_closable"]}},"deny-is-decorated":{"identifier":"deny-is-decorated","description":"Denies the is_decorated command without any pre-configured scope.","commands":{"allow":[],"deny":["is_decorated"]}},"deny-is-enabled":{"identifier":"deny-is-enabled","description":"Denies the is_enabled command without any pre-configured scope.","commands":{"allow":[],"deny":["is_enabled"]}},"deny-is-focused":{"identifier":"deny-is-focused","description":"Denies the is_focused command without any pre-configured scope.","commands":{"allow":[],"deny":["is_focused"]}},"deny-is-fullscreen":{"identifier":"deny-is-fullscreen","description":"Denies the is_fullscreen command without any pre-configured scope.","commands":{"allow":[],"deny":["is_fullscreen"]}},"deny-is-maximizable":{"identifier":"deny-is-maximizable","description":"Denies the is_maximizable command without any pre-configured scope.","commands":{"allow":[],"deny":["is_maximizable"]}},"deny-is-maximized":{"identifier":"deny-is-maximized","description":"Denies the is_maximized command without any pre-configured scope.","commands":{"allow":[],"deny":["is_maximized"]}},"deny-is-minimizable":{"identifier":"deny-is-minimizable","description":"Denies the is_minimizable command without any pre-configured scope.","commands":{"allow":[],"deny":["is_minimizable"]}},"deny-is-minimized":{"identifier":"deny-is-minimized","description":"Denies the is_minimized command without any pre-configured scope.","commands":{"allow":[],"deny":["is_minimized"]}},"deny-is-resizable":{"identifier":"deny-is-resizable","description":"Denies the is_resizable command without any pre-configured scope.","commands":{"allow":[],"deny":["is_resizable"]}},"deny-is-visible":{"identifier":"deny-is-visible","description":"Denies the is_visible command without any pre-configured scope.","commands":{"allow":[],"deny":["is_visible"]}},"deny-maximize":{"identifier":"deny-maximize","description":"Denies the maximize command without any pre-configured scope.","commands":{"allow":[],"deny":["maximize"]}},"deny-minimize":{"identifier":"deny-minimize","description":"Denies the minimize command without any pre-configured scope.","commands":{"allow":[],"deny":["minimize"]}},"deny-monitor-from-point":{"identifier":"deny-monitor-from-point","description":"Denies the monitor_from_point command without any pre-configured scope.","commands":{"allow":[],"deny":["monitor_from_point"]}},"deny-outer-position":{"identifier":"deny-outer-position","description":"Denies the outer_position command without any pre-configured scope.","commands":{"allow":[],"deny":["outer_position"]}},"deny-outer-size":{"identifier":"deny-outer-size","description":"Denies the outer_size command without any pre-configured scope.","commands":{"allow":[],"deny":["outer_size"]}},"deny-primary-monitor":{"identifier":"deny-primary-monitor","description":"Denies the primary_monitor command without any pre-configured scope.","commands":{"allow":[],"deny":["primary_monitor"]}},"deny-request-user-attention":{"identifier":"deny-request-user-attention","description":"Denies the request_user_attention command without any pre-configured scope.","commands":{"allow":[],"deny":["request_user_attention"]}},"deny-scale-factor":{"identifier":"deny-scale-factor","description":"Denies the scale_factor command without any pre-configured scope.","commands":{"allow":[],"deny":["scale_factor"]}},"deny-set-always-on-bottom":{"identifier":"deny-set-always-on-bottom","description":"Denies the set_always_on_bottom command without any pre-configured scope.","commands":{"allow":[],"deny":["set_always_on_bottom"]}},"deny-set-always-on-top":{"identifier":"deny-set-always-on-top","description":"Denies the set_always_on_top command without any pre-configured scope.","commands":{"allow":[],"deny":["set_always_on_top"]}},"deny-set-background-color":{"identifier":"deny-set-background-color","description":"Denies the set_background_color command without any pre-configured scope.","commands":{"allow":[],"deny":["set_background_color"]}},"deny-set-badge-count":{"identifier":"deny-set-badge-count","description":"Denies the set_badge_count command without any pre-configured scope.","commands":{"allow":[],"deny":["set_badge_count"]}},"deny-set-badge-label":{"identifier":"deny-set-badge-label","description":"Denies the set_badge_label command without any pre-configured scope.","commands":{"allow":[],"deny":["set_badge_label"]}},"deny-set-closable":{"identifier":"deny-set-closable","description":"Denies the set_closable command without any pre-configured scope.","commands":{"allow":[],"deny":["set_closable"]}},"deny-set-content-protected":{"identifier":"deny-set-content-protected","description":"Denies the set_content_protected command without any pre-configured scope.","commands":{"allow":[],"deny":["set_content_protected"]}},"deny-set-cursor-grab":{"identifier":"deny-set-cursor-grab","description":"Denies the set_cursor_grab command without any pre-configured scope.","commands":{"allow":[],"deny":["set_cursor_grab"]}},"deny-set-cursor-icon":{"identifier":"deny-set-cursor-icon","description":"Denies the set_cursor_icon command without any pre-configured scope.","commands":{"allow":[],"deny":["set_cursor_icon"]}},"deny-set-cursor-position":{"identifier":"deny-set-cursor-position","description":"Denies the set_cursor_position command without any pre-configured scope.","commands":{"allow":[],"deny":["set_cursor_position"]}},"deny-set-cursor-visible":{"identifier":"deny-set-cursor-visible","description":"Denies the set_cursor_visible command without any pre-configured scope.","commands":{"allow":[],"deny":["set_cursor_visible"]}},"deny-set-decorations":{"identifier":"deny-set-decorations","description":"Denies the set_decorations command without any pre-configured scope.","commands":{"allow":[],"deny":["set_decorations"]}},"deny-set-effects":{"identifier":"deny-set-effects","description":"Denies the set_effects command without any pre-configured scope.","commands":{"allow":[],"deny":["set_effects"]}},"deny-set-enabled":{"identifier":"deny-set-enabled","description":"Denies the set_enabled command without any pre-configured scope.","commands":{"allow":[],"deny":["set_enabled"]}},"deny-set-focus":{"identifier":"deny-set-focus","description":"Denies the set_focus command without any pre-configured scope.","commands":{"allow":[],"deny":["set_focus"]}},"deny-set-focusable":{"identifier":"deny-set-focusable","description":"Denies the set_focusable command without any pre-configured scope.","commands":{"allow":[],"deny":["set_focusable"]}},"deny-set-fullscreen":{"identifier":"deny-set-fullscreen","description":"Denies the set_fullscreen command without any pre-configured scope.","commands":{"allow":[],"deny":["set_fullscreen"]}},"deny-set-icon":{"identifier":"deny-set-icon","description":"Denies the set_icon command without any pre-configured scope.","commands":{"allow":[],"deny":["set_icon"]}},"deny-set-ignore-cursor-events":{"identifier":"deny-set-ignore-cursor-events","description":"Denies the set_ignore_cursor_events command without any pre-configured scope.","commands":{"allow":[],"deny":["set_ignore_cursor_events"]}},"deny-set-max-size":{"identifier":"deny-set-max-size","description":"Denies the set_max_size command without any pre-configured scope.","commands":{"allow":[],"deny":["set_max_size"]}},"deny-set-maximizable":{"identifier":"deny-set-maximizable","description":"Denies the set_maximizable command without any pre-configured scope.","commands":{"allow":[],"deny":["set_maximizable"]}},"deny-set-min-size":{"identifier":"deny-set-min-size","description":"Denies the set_min_size command without any pre-configured scope.","commands":{"allow":[],"deny":["set_min_size"]}},"deny-set-minimizable":{"identifier":"deny-set-minimizable","description":"Denies the set_minimizable command without any pre-configured scope.","commands":{"allow":[],"deny":["set_minimizable"]}},"deny-set-overlay-icon":{"identifier":"deny-set-overlay-icon","description":"Denies the set_overlay_icon command without any pre-configured scope.","commands":{"allow":[],"deny":["set_overlay_icon"]}},"deny-set-position":{"identifier":"deny-set-position","description":"Denies the set_position command without any pre-configured scope.","commands":{"allow":[],"deny":["set_position"]}},"deny-set-progress-bar":{"identifier":"deny-set-progress-bar","description":"Denies the set_progress_bar command without any pre-configured scope.","commands":{"allow":[],"deny":["set_progress_bar"]}},"deny-set-resizable":{"identifier":"deny-set-resizable","description":"Denies the set_resizable command without any pre-configured scope.","commands":{"allow":[],"deny":["set_resizable"]}},"deny-set-shadow":{"identifier":"deny-set-shadow","description":"Denies the set_shadow command without any pre-configured scope.","commands":{"allow":[],"deny":["set_shadow"]}},"deny-set-simple-fullscreen":{"identifier":"deny-set-simple-fullscreen","description":"Denies the set_simple_fullscreen command without any pre-configured scope.","commands":{"allow":[],"deny":["set_simple_fullscreen"]}},"deny-set-size":{"identifier":"deny-set-size","description":"Denies the set_size command without any pre-configured scope.","commands":{"allow":[],"deny":["set_size"]}},"deny-set-size-constraints":{"identifier":"deny-set-size-constraints","description":"Denies the set_size_constraints command without any pre-configured scope.","commands":{"allow":[],"deny":["set_size_constraints"]}},"deny-set-skip-taskbar":{"identifier":"deny-set-skip-taskbar","description":"Denies the set_skip_taskbar command without any pre-configured scope.","commands":{"allow":[],"deny":["set_skip_taskbar"]}},"deny-set-theme":{"identifier":"deny-set-theme","description":"Denies the set_theme command without any pre-configured scope.","commands":{"allow":[],"deny":["set_theme"]}},"deny-set-title":{"identifier":"deny-set-title","description":"Denies the set_title command without any pre-configured scope.","commands":{"allow":[],"deny":["set_title"]}},"deny-set-title-bar-style":{"identifier":"deny-set-title-bar-style","description":"Denies the set_title_bar_style command without any pre-configured scope.","commands":{"allow":[],"deny":["set_title_bar_style"]}},"deny-set-visible-on-all-workspaces":{"identifier":"deny-set-visible-on-all-workspaces","description":"Denies the set_visible_on_all_workspaces command without any pre-configured scope.","commands":{"allow":[],"deny":["set_visible_on_all_workspaces"]}},"deny-show":{"identifier":"deny-show","description":"Denies the show command without any pre-configured scope.","commands":{"allow":[],"deny":["show"]}},"deny-start-dragging":{"identifier":"deny-start-dragging","description":"Denies the start_dragging command without any pre-configured scope.","commands":{"allow":[],"deny":["start_dragging"]}},"deny-start-resize-dragging":{"identifier":"deny-start-resize-dragging","description":"Denies the start_resize_dragging command without any pre-configured scope.","commands":{"allow":[],"deny":["start_resize_dragging"]}},"deny-theme":{"identifier":"deny-theme","description":"Denies the theme command without any pre-configured scope.","commands":{"allow":[],"deny":["theme"]}},"deny-title":{"identifier":"deny-title","description":"Denies the title command without any pre-configured scope.","commands":{"allow":[],"deny":["title"]}},"deny-toggle-maximize":{"identifier":"deny-toggle-maximize","description":"Denies the toggle_maximize command without any pre-configured scope.","commands":{"allow":[],"deny":["toggle_maximize"]}},"deny-unmaximize":{"identifier":"deny-unmaximize","description":"Denies the unmaximize command without any pre-configured scope.","commands":{"allow":[],"deny":["unmaximize"]}},"deny-unminimize":{"identifier":"deny-unminimize","description":"Denies the unminimize command without any pre-configured scope.","commands":{"allow":[],"deny":["unminimize"]}}},"permission_sets":{},"global_scope_schema":null}}
\ No newline at end of file
diff --git a/src-tauri/permissions/dmnote-allow-all.json b/src-tauri/permissions/dmnote-allow-all.json
index 85830e11..378871dc 100644
--- a/src-tauri/permissions/dmnote-allow-all.json
+++ b/src-tauri/permissions/dmnote-allow-all.json
@@ -13,6 +13,7 @@
           "app_quit",
           "app_quit_after_editor_flush",
           "app_restart",
+          "commit_gesture",
           "counter_animation_create",
           "counter_animation_delete",
           "counter_animation_list",
diff --git a/src-tauri/src/commands/app/update.rs b/src-tauri/src/commands/app/update.rs
index ccf9525e..b92798a6 100644
--- a/src-tauri/src/commands/app/update.rs
+++ b/src-tauri/src/commands/app/update.rs
@@ -56,7 +56,7 @@ fn app_auto_update_windows(
 ) -> CmdResult<AutoUpdateResult> {
     use std::time::Duration;
 
-    const REPO_OWNER: &str = "lee-sihun";
+    const REPO_OWNER: &str = "DmNote-App";
     const REPO_NAME: &str = "DmNote";
     const ASSET_NAME: &str = "DM.NOTE.exe";
     const SIGNATURE_ASSET_NAME: &str = "DM.NOTE.exe.sig";
diff --git a/src-tauri/src/commands/editor/gesture.rs b/src-tauri/src/commands/editor/gesture.rs
new file mode 100644
index 00000000..941baa73
--- /dev/null
+++ b/src-tauri/src/commands/editor/gesture.rs
@@ -0,0 +1,90 @@
+use tauri::{AppHandle, State, WebviewWindow};
+
+use crate::{
+    commands::{
+        editor::state::{emit_best_effort, publish_editor_change, publish_legacy_editor_fields},
+        plugin::instances::publish_plugin_instances_changed,
+    },
+    errors::{CmdResult, EditorCommitError},
+    models::{GestureCommitRequest, GestureCommitResult, PluginInstancesChangedPayload},
+    services::preview_broker::PreviewBroker,
+    state::{gesture::validate_gesture_commit_request, AppState},
+};
+
+const MAIN_WINDOW_LABEL: &str = "main";
+
+#[tauri::command]
+pub fn commit_gesture(
+    state: State<'_, AppState>,
+    broker: State<'_, PreviewBroker>,
+    app: AppHandle,
+    window: WebviewWindow,
+    request: GestureCommitRequest,
+) -> CmdResult<GestureCommitResult> {
+    validate_gesture_commit_request(&request)?;
+    if window.label() != MAIN_WINDOW_LABEL {
+        return Err(crate::errors::CommandError::msg(
+            "GESTURE_MUTATION_NOT_ALLOWED",
+        ));
+    }
+
+    let authority = state
+        .plugin_authority()
+        .admit(request.authority_generation)
+        .map_err(crate::errors::CommandError::msg)?;
+    let admission = state
+        .admit_frontend_history_mutation(window.label())
+        .map_err(|_| EditorCommitError::history_in_progress())?;
+    let mutation_id = request.mutation_id.clone();
+    let gesture_id = request.gesture_id.clone();
+    let requested_fields = request
+        .editor_changes
+        .as_ref()
+        .map_or_else(Vec::new, |changes| changes.included_fields());
+    let previous_mode = requested_fields
+        .contains(&crate::models::EditorField::Keys)
+        .then(|| state.keyboard.current_mode());
+
+    let committed = state
+        .store
+        .commit_gesture_with_admission(request, admission)?;
+    let outcome = &committed.outcome;
+    if let Err(error) =
+        broker.finish_committed_session(window.label(), &gesture_id, outcome.change.is_none())
+    {
+        log::warn!("failed to finish committed gesture preview session: {error}");
+    }
+
+    if let Some(change) = outcome.change.as_ref() {
+        publish_editor_change(state.inner(), &app, change, false);
+        if !outcome.replayed {
+            publish_legacy_editor_fields(state.inner(), &app, change, &requested_fields);
+            if previous_mode.is_some_and(|mode| mode != change.selected_key_type) {
+                emit_best_effort(
+                    &app,
+                    "keys:mode-changed",
+                    &serde_json::json!({ "mode": &change.selected_key_type }),
+                );
+            }
+        }
+    }
+    if !outcome.replayed {
+        for plugin_id in &outcome.changed_plugin_ids {
+            publish_plugin_instances_changed(
+                &app,
+                &PluginInstancesChangedPayload {
+                    plugin_id: plugin_id.clone(),
+                    revision: outcome.result.plugin_model_revision,
+                    origin_mutation_id: Some(mutation_id.clone()),
+                },
+            );
+        }
+    }
+    if let Some(status) = outcome.history_status.as_ref() {
+        emit_best_effort(&app, "history:status", status);
+    }
+
+    let mut result = outcome.result.clone();
+    result.authority_generation = authority.generation();
+    Ok(result)
+}
diff --git a/src-tauri/src/commands/editor/history.rs b/src-tauri/src/commands/editor/history.rs
index c255f9a2..01b80399 100644
--- a/src-tauri/src/commands/editor/history.rs
+++ b/src-tauri/src/commands/editor/history.rs
@@ -144,6 +144,20 @@ fn run_history_operation(
                 );
             }
             Some(HistoryAuxChange::PluginElements { .. }) => {}
+            Some(HistoryAuxChange::PluginElementsBatch { .. }) => {
+                if let Some(change) = committed_change.filter(|change| {
+                    change
+                        .result
+                        .changed_fields
+                        .contains(&crate::models::EditorField::Keys)
+                }) {
+                    state.apply_committed_editor_keys_without_counters(
+                        outcome.runtime_publication_generation,
+                        &change.document.keys,
+                        &change.selected_key_type,
+                    );
+                }
+            }
             None => {
                 if let Some(change) = committed_change.filter(|change| {
                     change
@@ -325,6 +339,21 @@ fn publish_history_aux_change(
                 },
             );
         }
+        Some(HistoryAuxChange::PluginElementsBatch {
+            plugin_ids,
+            revision,
+        }) => {
+            for plugin_id in plugin_ids {
+                publish_plugin_instances_changed(
+                    app,
+                    &PluginInstancesChangedPayload {
+                        plugin_id: plugin_id.clone(),
+                        revision: *revision,
+                        origin_mutation_id: None,
+                    },
+                );
+            }
+        }
         None => {}
     }
 }
diff --git a/src-tauri/src/commands/editor/mod.rs b/src-tauri/src/commands/editor/mod.rs
index b4d43bd5..da586e2d 100644
--- a/src-tauri/src/commands/editor/mod.rs
+++ b/src-tauri/src/commands/editor/mod.rs
@@ -1,4 +1,5 @@
 pub mod css;
+pub mod gesture;
 pub mod history;
 pub mod js;
 pub mod note_tab;
diff --git a/src-tauri/src/commands/editor/preview.rs b/src-tauri/src/commands/editor/preview.rs
index 9298703a..d00efe6e 100644
--- a/src-tauri/src/commands/editor/preview.rs
+++ b/src-tauri/src/commands/editor/preview.rs
@@ -25,7 +25,6 @@ pub fn editor_preview_cancel(
     broker: State<'_, PreviewBroker>,
     window: WebviewWindow,
     session_id: String,
-    min_revision: Option<u64>,
 ) -> Result<(), String> {
-    broker.cancel(window.label(), &session_id, min_revision)
+    broker.cancel(window.label(), &session_id)
 }
diff --git a/src-tauri/src/commands/editor/state.rs b/src-tauri/src/commands/editor/state.rs
index 41f81f38..4aa6f8c6 100644
--- a/src-tauri/src/commands/editor/state.rs
+++ b/src-tauri/src/commands/editor/state.rs
@@ -200,7 +200,7 @@ pub fn editor_commit(
     let admission = state
         .admit_frontend_history_mutation(window.label())
         .map_err(|_| crate::errors::EditorCommitError::history_in_progress())?;
-    let gesture_id = request.gesture_id.clone();
+    let gesture_ids = request.echoed_gesture_ids();
     let requested_fields = request.changes.included_fields();
     let previous_mode = requested_fields
         .contains(&EditorField::Keys)
@@ -208,6 +208,13 @@ pub fn editor_commit(
     let change = state
         .store
         .commit_editor_document_admitted(request, &admission)?;
+    for gesture_id in &gesture_ids {
+        if let Err(error) =
+            broker.finish_committed_session(window.label(), gesture_id, change.event.is_none())
+        {
+            log::warn!("failed to finish committed preview session: {error}");
+        }
+    }
     if change.event.is_some() {
         publish_editor_change(state.inner(), &app, &change, false);
     }
@@ -221,15 +228,6 @@ pub fn editor_commit(
             );
         }
     }
-    if let Some(gesture_id) = gesture_id {
-        if let Err(error) = broker.finish_committed_session(
-            window.label(),
-            &gesture_id,
-            Some(change.result.revision),
-        ) {
-            log::warn!("failed to finish committed preview session: {error}");
-        }
-    }
     if let Some(history_status) = change.history_status.as_ref() {
         emit_best_effort(&app, "history:status", history_status);
     }
diff --git a/src-tauri/src/commands/layout/panel.rs b/src-tauri/src/commands/layout/panel.rs
index 18d24987..8186c212 100644
--- a/src-tauri/src/commands/layout/panel.rs
+++ b/src-tauri/src/commands/layout/panel.rs
@@ -120,7 +120,13 @@ fn start_panel_window_dragging(
             } else {
                 let modifier_flags = NSEvent::modifierFlags(current_event);
                 let timestamp = NSEvent::timestamp(current_event);
-                let event_number = NSEvent::eventNumber(current_event);
+                // eventNumber는 마우스 계열 이벤트에만 유효, 키 이벤트 등에 조회하면 NSInternalInconsistencyException
+                let event_type: NSUInteger = msg_send![current_event, type];
+                let event_number = if is_mouse_event_type(event_type) {
+                    NSEvent::eventNumber(current_event)
+                } else {
+                    0
+                };
                 (modifier_flags, timestamp, event_number)
             };
 
@@ -176,9 +182,24 @@ fn is_panel_mouse_down_event(
     event_type == 1 && event_window_number == target_window_number
 }
 
+// NSLeftMouseDown(1)~NSMouseExited(9), NSOtherMouse*(25~27)
+fn is_mouse_event_type(event_type: u64) -> bool {
+    matches!(event_type, 1..=9 | 25..=27)
+}
+
 #[cfg(test)]
 mod tests {
-    use super::{is_panel_mouse_down_event, panel_drag_local_coordinates};
+    use super::{is_mouse_event_type, is_panel_mouse_down_event, panel_drag_local_coordinates};
+
+    #[test]
+    fn panel_drag_synthetic_event_borrows_event_number_from_mouse_events_only() {
+        assert!(is_mouse_event_type(1));
+        assert!(is_mouse_event_type(9));
+        assert!(is_mouse_event_type(26));
+        assert!(!is_mouse_event_type(10)); // NSKeyDown
+        assert!(!is_mouse_event_type(11)); // NSKeyUp
+        assert!(!is_mouse_event_type(12)); // NSFlagsChanged
+    }
 
     #[test]
     fn panel_drag_reuses_only_the_target_windows_mouse_down_event() {
diff --git a/src-tauri/src/errors.rs b/src-tauri/src/errors.rs
index 705559df..34c441a9 100644
--- a/src-tauri/src/errors.rs
+++ b/src-tauri/src/errors.rs
@@ -4,7 +4,10 @@ use serde::Serialize;
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
 pub enum EditorCommitErrorCode {
     RevisionConflict,
+    PluginRevisionConflict,
     ValidationFailed,
+    TooManyGestureIds,
+    InvalidGestureId,
     PairedUpdateRequired,
     MutationIdReused,
     HistoryInProgress,
@@ -48,6 +51,17 @@ impl EditorCommitError {
         }
     }
 
+    pub fn plugin_revision_conflict(current_plugin_model_revision: u64) -> Self {
+        Self {
+            error_code: EditorCommitErrorCode::PluginRevisionConflict,
+            message: format!(
+                "plugin model revision conflict at revision {current_plugin_model_revision}"
+            ),
+            details: None,
+            retryable: true,
+        }
+    }
+
     pub fn validation(validation_code: impl Into<String>, message: impl Into<String>) -> Self {
         Self {
             error_code: EditorCommitErrorCode::ValidationFailed,
@@ -60,6 +74,24 @@ impl EditorCommitError {
         }
     }
 
+    pub fn too_many_gesture_ids(max: usize) -> Self {
+        Self {
+            error_code: EditorCommitErrorCode::TooManyGestureIds,
+            message: format!("gesture ID count exceeds {max}"),
+            details: None,
+            retryable: false,
+        }
+    }
+
+    pub fn invalid_gesture_id() -> Self {
+        Self {
+            error_code: EditorCommitErrorCode::InvalidGestureId,
+            message: "gesture IDs must be UUIDs no longer than 64 bytes".to_string(),
+            details: None,
+            retryable: false,
+        }
+    }
+
     pub fn paired_update_required(field: impl Into<String>) -> Self {
         let field = field.into();
         Self {
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 854cc0e2..12476a37 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -217,6 +217,7 @@ fn main() {
             commands::editor::note_tab::note_tab_clear,
             commands::editor::state::editor_get,
             commands::editor::state::editor_commit,
+            commands::editor::gesture::commit_gesture,
             commands::editor::history::history_status,
             commands::editor::history::history_undo,
             commands::editor::history::history_redo,
diff --git a/src-tauri/src/models/editor.rs b/src-tauri/src/models/editor.rs
index 8c4a2e1c..8298b886 100644
--- a/src-tauri/src/models/editor.rs
+++ b/src-tauri/src/models/editor.rs
@@ -188,9 +188,30 @@ pub struct EditorCommitRequest {
     pub mutation_id: String,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub gesture_id: Option<String>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub gesture_ids: Vec<String>,
     pub changes: EditorPatchV1,
 }
 
+impl EditorCommitRequest {
+    pub fn echoed_gesture_ids(&self) -> Vec<String> {
+        let mut gesture_ids =
+            Vec::with_capacity(self.gesture_ids.len() + usize::from(self.gesture_id.is_some()));
+        for gesture_id in self.gesture_ids.iter().chain(self.gesture_id.iter()) {
+            if !gesture_ids.contains(gesture_id) {
+                gesture_ids.push(gesture_id.clone());
+            }
+        }
+        gesture_ids
+    }
+
+    pub fn history_gesture_id(&self) -> Option<String> {
+        self.gesture_id
+            .clone()
+            .or_else(|| self.gesture_ids.last().cloned())
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct EditorCommitResult {
@@ -232,6 +253,8 @@ pub struct EditorCommittedV1 {
     pub mutation_id: String,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub gesture_id: Option<String>,
+    #[serde(default)]
+    pub gesture_ids: Vec<String>,
     pub origin: String,
     pub changed_fields: Vec<EditorField>,
     pub patch: EditorPatchV1,
@@ -240,6 +263,7 @@ pub struct EditorCommittedV1 {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum EditorCommitOrigin {
     StrictEditorCommit,
+    GestureCommit,
     LegacyAdapter(String),
     HistoryUndo,
     HistoryRedo,
@@ -252,6 +276,7 @@ impl EditorCommitOrigin {
     pub fn event_name(&self) -> Option<String> {
         match self {
             Self::StrictEditorCommit => Some("editorCommit".to_string()),
+            Self::GestureCommit => Some("gestureCommit".to_string()),
             Self::LegacyAdapter(command) => Some(format!("legacy:{command}")),
             Self::HistoryUndo => Some("historyUndo".to_string()),
             Self::HistoryRedo => Some("historyRedo".to_string()),
diff --git a/src-tauri/src/models/gesture.rs b/src-tauri/src/models/gesture.rs
new file mode 100644
index 00000000..3246072e
--- /dev/null
+++ b/src-tauri/src/models/gesture.rs
@@ -0,0 +1,35 @@
+use serde::{Deserialize, Serialize};
+
+use super::{EditorField, EditorPatchV1, SavedPluginInstance};
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", deny_unknown_fields)]
+pub struct GesturePluginInstancesChange {
+    pub plugin_id: String,
+    pub instances: Vec<SavedPluginInstance>,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", deny_unknown_fields)]
+pub struct GestureCommitRequest {
+    pub gesture_id: String,
+    pub mutation_id: String,
+    pub editor_base_revision: u64,
+    pub plugin_base_revision: u64,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub observed_history_epoch: Option<u64>,
+    pub authority_generation: u64,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub editor_changes: Option<EditorPatchV1>,
+    pub plugin_changes: Vec<GesturePluginInstancesChange>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GestureCommitResult {
+    pub editor_revision: u64,
+    pub changed_fields: Vec<EditorField>,
+    pub plugin_model_revision: u64,
+    pub changed_plugin_ids: Vec<String>,
+    pub authority_generation: u64,
+}
diff --git a/src-tauri/src/models/mod.rs b/src-tauri/src/models/mod.rs
index 7759d109..093b2dbf 100644
--- a/src-tauri/src/models/mod.rs
+++ b/src-tauri/src/models/mod.rs
@@ -1,8 +1,10 @@
 pub mod editor;
+pub mod gesture;
 pub mod obs;
 pub mod plugin;
 
 pub use editor::*;
+pub use gesture::*;
 pub use plugin::*;
 
 use serde::de::Error as DeError;
diff --git a/src-tauri/src/models/plugin.rs b/src-tauri/src/models/plugin.rs
index aabc6858..d021e1d0 100644
--- a/src-tauri/src/models/plugin.rs
+++ b/src-tauri/src/models/plugin.rs
@@ -35,6 +35,10 @@ pub struct SavedPluginInstance {
     pub measured_size: Option<PluginSize>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub tab_id: Option<String>,
+    #[serde(default)]
+    pub hidden: bool,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub z_index: Option<f64>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
diff --git a/src-tauri/src/services/preview_broker.rs b/src-tauri/src/services/preview_broker.rs
index 2934c805..350435f5 100644
--- a/src-tauri/src/services/preview_broker.rs
+++ b/src-tauri/src/services/preview_broker.rs
@@ -113,9 +113,6 @@ pub struct PreviewEnvelope {
     pub mode: String,
     pub targets: Vec<u32>,
     pub patch: Map<String, Value>,
-    // cancel 전용: 수신측이 이 revision 반영 후에만 세션을 제거하는 순서 게이트
-    #[serde(default)]
-    pub min_revision: Option<u64>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -218,7 +215,6 @@ impl PreviewBroker {
             mode: request.mode,
             targets: request.targets,
             patch: request.patch,
-            min_revision: None,
         };
         validate_payload_size(&envelope)?;
 
@@ -302,12 +298,7 @@ impl PreviewBroker {
         cancelled
     }
 
-    pub fn cancel(
-        &self,
-        label: &str,
-        session_id: &str,
-        min_revision: Option<u64>,
-    ) -> Result<(), String> {
+    pub fn cancel(&self, label: &str, session_id: &str) -> Result<(), String> {
         validate_session_id(session_id)?;
         let (recipients, envelope) = {
             let mut state = self.state.lock();
@@ -339,9 +330,7 @@ impl PreviewBroker {
             };
             insert_tombstone(&mut state, session_id.to_string());
             let recipients = clone_channels(&state, Some(label));
-            let mut envelope = cancellation_envelope(session_id, &session);
-            envelope.min_revision = min_revision;
-            (recipients, envelope)
+            (recipients, cancellation_envelope(session_id, &session))
         };
 
         send_envelopes(&recipients, &[envelope]);
@@ -352,12 +341,12 @@ impl PreviewBroker {
         &self,
         label: &str,
         session_id: &str,
-        committed_revision: Option<u64>,
+        broadcast_cancel: bool,
     ) -> Result<bool, String> {
         if Uuid::parse_str(session_id).is_err() {
             return Ok(false);
         }
-        let (recipients, envelope) = {
+        let (recipients, cancellation) = {
             let mut state = self.state.lock();
             if state.tombstones.contains(session_id) {
                 return Ok(false);
@@ -382,14 +371,19 @@ impl PreviewBroker {
                 },
             };
             insert_tombstone(&mut state, session_id.to_string());
-            let recipients = clone_channels(&state, Some(label));
-            let mut envelope = cancellation_envelope(session_id, &session);
-            // 수신측이 커밋 canonical 반영 후에만 세션을 제거하도록 게이트
-            envelope.min_revision = committed_revision;
-            (recipients, envelope)
+            let recipients = if broadcast_cancel {
+                clone_channels(&state, Some(label))
+            } else {
+                Vec::new()
+            };
+            let cancellation =
+                broadcast_cancel.then(|| cancellation_envelope(session_id, &session));
+            (recipients, cancellation)
         };
 
-        send_envelopes(&recipients, &[envelope]);
+        if let Some(cancellation) = cancellation {
+            send_envelopes(&recipients, &[cancellation]);
+        }
         Ok(true)
     }
 
@@ -501,7 +495,6 @@ fn cancellation_envelope(session_id: &str, session: &PreviewSession) -> PreviewE
         mode: String::new(),
         targets: Vec::new(),
         patch: Map::new(),
-        min_revision: None,
     }
 }
 
@@ -574,7 +567,6 @@ mod tests {
             mode: request.mode,
             targets: request.targets,
             patch: request.patch,
-            min_revision: None,
         }
     }
 
@@ -756,34 +748,42 @@ mod tests {
     }
 
     #[test]
-    fn successful_commit_ends_preview_session() {
+    fn committed_sessions_are_tombstoned_without_auxiliary_broadcast() {
         let broker = PreviewBroker::default();
         subscribe(&broker, "owner");
         let observer_messages = subscribe(&broker, "observer");
-        let session_id = session_id();
-        broker
-            .publish("owner", request(&session_id, 1))
-            .expect("publish succeeds");
+        let session_ids = vec![session_id(), session_id()];
+        for session_id in &session_ids {
+            broker
+                .publish("owner", request(session_id, 1))
+                .expect("publish succeeds");
+        }
 
-        assert!(broker
-            .finish_committed_session("owner", &session_id, Some(7))
-            .expect("commit cleanup succeeds"));
+        for session_id in &session_ids {
+            assert!(broker
+                .finish_committed_session("owner", session_id, false)
+                .expect("commit cleanup succeeds"));
+        }
         assert_eq!(observer_messages.load(Ordering::SeqCst), 2);
-        assert!(broker
-            .publish("owner", request(&session_id, 2))
-            .unwrap_err()
-            .contains("already ended"));
+        for session_id in &session_ids {
+            assert!(broker
+                .publish("owner", request(session_id, 2))
+                .unwrap_err()
+                .contains("already ended"));
+        }
     }
 
     #[test]
-    fn commit_before_first_publish_rejects_late_patch() {
+    fn no_op_commit_broadcasts_cancel_and_rejects_late_patch() {
         let broker = PreviewBroker::default();
         subscribe(&broker, "owner");
+        let observer_messages = subscribe(&broker, "observer");
         let session_id = session_id();
 
         assert!(broker
-            .finish_committed_session("owner", &session_id, None)
+            .finish_committed_session("owner", &session_id, true)
             .expect("commit cleanup succeeds"));
+        assert_eq!(observer_messages.load(Ordering::SeqCst), 1);
 
         assert!(broker
             .publish("owner", request(&session_id, 1))
@@ -798,7 +798,7 @@ mod tests {
         let session_id = session_id();
 
         broker
-            .cancel("owner", &session_id, None)
+            .cancel("owner", &session_id)
             .expect("early cancel succeeds");
 
         assert!(broker
diff --git a/src-tauri/src/state/app_state.rs b/src-tauri/src/state/app_state.rs
index a1f089cd..db10c250 100644
--- a/src-tauri/src/state/app_state.rs
+++ b/src-tauri/src/state/app_state.rs
@@ -93,7 +93,7 @@ struct ShutdownWatchdogState {
     stage: &'static str,
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 struct PanelBoundsSample {
     position: PhysicalPosition<i32>,
     position_scale_factor: f64,
@@ -104,6 +104,7 @@ struct PanelBoundsSample {
 
 #[derive(Debug, Clone, Copy)]
 enum PanelBoundsChange {
+    Snapshot(PanelBoundsSample),
     Moved(PhysicalPosition<i32>),
     Resized(PhysicalSize<u32>),
     ScaleFactorChanged {
@@ -113,14 +114,31 @@ enum PanelBoundsChange {
     },
 }
 
-#[derive(Debug)]
-struct PanelBoundsSettleState {
+#[derive(Default)]
+struct PanelBoundsPersistenceState {
     latest: Option<PanelBoundsSample>,
+    window: Option<WebviewWindow>,
+    applied_max_height: Option<f64>,
+    session: u64,
     generation: u64,
     worker_running: bool,
+    dirty: bool,
     active: bool,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq)]
+struct PanelBoundsPersistWork {
+    session: u64,
+    generation: u64,
+    sample: PanelBoundsSample,
+}
+
+struct PanelBoundsPersistenceController {
+    store: Arc<AppStore>,
+    state: Mutex<PanelBoundsPersistenceState>,
+    persist_lock: Mutex<()>,
+}
+
 #[derive(Debug, Clone, Copy, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) enum FrontendLifecycleAction {
@@ -763,7 +781,7 @@ pub struct AppState {
     selection_session: Mutex<SelectionSessionSnapshot>,
     plugin_authority: PluginRuntimeAuthority,
     plugin_rpc_router: PluginRpcRouter,
-    panel_bounds_generation: Arc<AtomicU64>,
+    panel_bounds_persistence: Arc<PanelBoundsPersistenceController>,
     panel_visible: AtomicBool,
     panel_creation_lock: Mutex<()>,
     panel_close_request: Mutex<PanelCloseRequestState>,
@@ -819,6 +837,8 @@ impl AppState {
         let key_sound = Arc::new(KeySoundEngine::with_output_backend(initial_backend));
         let obs_bridge = Arc::new(ObsBridgeService::new(env!("CARGO_PKG_VERSION")));
         let authorized_css_paths = collect_authorized_css_paths(&snapshot);
+        let panel_bounds_persistence =
+            Arc::new(PanelBoundsPersistenceController::new(Arc::clone(&store)));
         let selection_session = SelectionSessionSnapshot {
             mode: snapshot.selected_key_type.clone(),
             ..SelectionSessionSnapshot::default()
@@ -836,7 +856,7 @@ impl AppState {
             selection_session: Mutex::new(selection_session),
             plugin_authority: PluginRuntimeAuthority::default(),
             plugin_rpc_router: PluginRpcRouter::default(),
-            panel_bounds_generation: Arc::new(AtomicU64::new(0)),
+            panel_bounds_persistence,
             panel_visible: AtomicBool::new(false),
             panel_creation_lock: Mutex::new(()),
             panel_close_request: Mutex::new(PanelCloseRequestState::Idle),
@@ -2559,16 +2579,9 @@ impl AppState {
         *self.panel_destroy_reason.lock() = Some(reason);
         let mut bounds_error = None;
         if let Some(window) = app.get_webview_window(PANEL_LABEL) {
-            if let Err(error) =
-                defer_panel_bounds_from_window(&window, &self.store, &self.panel_bounds_generation)
-            {
+            if let Err(error) = self.panel_bounds_persistence.flush_now(&window) {
                 bounds_error = Some(error);
             }
-            if let Err(error) =
-                flush_deferred_panel_bounds(&self.store, &self.panel_bounds_generation)
-            {
-                bounds_error.get_or_insert(error);
-            }
             if let Err(error) = window.destroy() {
                 self.clear_panel_destroy_reason(reason);
                 return Err(error.into());
@@ -2617,8 +2630,7 @@ impl AppState {
         let Some(window) = app.get_webview_window(PANEL_LABEL) else {
             return Ok(());
         };
-        defer_panel_bounds_from_window(&window, &self.store, &self.panel_bounds_generation)?;
-        flush_deferred_panel_bounds(&self.store, &self.panel_bounds_generation)
+        self.panel_bounds_persistence.flush_now(&window)
     }
 
     pub fn handle_panel_window_destroyed(&self, app: &AppHandle) {
@@ -2682,25 +2694,22 @@ impl AppState {
         app: &AppHandle,
         initial_max_height: f64,
     ) {
-        let store = self.store.clone();
-        let bounds_generation = self.panel_bounds_generation.clone();
+        let bounds_session = self
+            .panel_bounds_persistence
+            .attach(window, initial_max_height);
+        let bounds_persistence = Arc::clone(&self.panel_bounds_persistence);
         let panel_window = window.clone();
         let app_handle = app.clone();
-        let panel_max_height = Arc::new(Mutex::new(Some(initial_max_height)));
-        let panel_bounds_settle = Arc::new(Mutex::new(PanelBoundsSettleState {
-            latest: panel_bounds_sample_from_window(window).ok(),
-            generation: 0,
-            worker_running: false,
-            active: true,
-        }));
 
         window.on_window_event(move |event| match event {
             WindowEvent::CloseRequested { api, .. } => {
                 api.prevent_close();
-                if let Err(err) =
-                    defer_panel_bounds_from_window(&panel_window, &store, &bounds_generation)
-                {
-                    log::warn!("failed to capture panel bounds on close request: {err}");
+                match panel_bounds_sample_from_window(&panel_window) {
+                    Ok(sample) => bounds_persistence
+                        .record_event(bounds_session, PanelBoundsChange::Snapshot(sample)),
+                    Err(err) => {
+                        log::warn!("failed to capture panel bounds on close request: {err}")
+                    }
                 }
                 let Some(state) = app_handle.try_state::<AppState>() else {
                     return;
@@ -2735,36 +2744,19 @@ impl AppState {
                 });
             }
             WindowEvent::Moved(position) => {
-                schedule_panel_bounds_settle(
-                    &panel_window,
-                    &store,
-                    &bounds_generation,
-                    &panel_max_height,
-                    &panel_bounds_settle,
-                    PanelBoundsChange::Moved(*position),
-                );
+                bounds_persistence
+                    .record_event(bounds_session, PanelBoundsChange::Moved(*position));
             }
             WindowEvent::Resized(size) => {
-                schedule_panel_bounds_settle(
-                    &panel_window,
-                    &store,
-                    &bounds_generation,
-                    &panel_max_height,
-                    &panel_bounds_settle,
-                    PanelBoundsChange::Resized(*size),
-                );
+                bounds_persistence.record_event(bounds_session, PanelBoundsChange::Resized(*size));
             }
             WindowEvent::ScaleFactorChanged {
                 scale_factor,
                 new_inner_size,
                 ..
             } => {
-                schedule_panel_bounds_settle(
-                    &panel_window,
-                    &store,
-                    &bounds_generation,
-                    &panel_max_height,
-                    &panel_bounds_settle,
+                bounds_persistence.record_event(
+                    bounds_session,
                     PanelBoundsChange::ScaleFactorChanged {
                         position: panel_window.outer_position().ok(),
                         size: *new_inner_size,
@@ -2773,7 +2765,7 @@ impl AppState {
                 );
             }
             WindowEvent::Destroyed => {
-                panel_bounds_settle.lock().active = false;
+                bounds_persistence.deactivate(bounds_session);
             }
             _ => {}
         });
@@ -4283,6 +4275,7 @@ fn panel_bounds_from_sample(sample: PanelBoundsSample) -> PanelBounds {
 
 fn apply_panel_bounds_change(sample: &mut PanelBoundsSample, change: PanelBoundsChange) {
     match change {
+        PanelBoundsChange::Snapshot(snapshot) => *sample = snapshot,
         PanelBoundsChange::Moved(position) => {
             sample.position = position;
             sample.position_scale_factor = sample.current_scale_factor;
@@ -4308,185 +4301,266 @@ fn apply_panel_bounds_change(sample: &mut PanelBoundsSample, change: PanelBounds
     }
 }
 
-fn schedule_panel_bounds_settle(
-    window: &WebviewWindow,
-    store: &Arc<AppStore>,
-    generation: &Arc<AtomicU64>,
-    applied_max_height: &Arc<Mutex<Option<f64>>>,
-    settle_state: &Arc<Mutex<PanelBoundsSettleState>>,
-    change: PanelBoundsChange,
-) {
-    let mut state = settle_state.lock();
-    if !state.active {
-        return;
+impl PanelBoundsPersistenceController {
+    fn new(store: Arc<AppStore>) -> Self {
+        Self {
+            store,
+            state: Mutex::new(PanelBoundsPersistenceState::default()),
+            persist_lock: Mutex::new(()),
+        }
     }
-    if state.latest.is_none() {
-        state.latest = panel_bounds_sample_from_window(window).ok();
+
+    fn attach(&self, window: &WebviewWindow, max_height: f64) -> u64 {
+        let latest = panel_bounds_sample_from_window(window).ok();
+        let mut state = self.state.lock();
+        state.session = state.session.wrapping_add(1);
+        state.latest = latest;
+        state.window = Some(window.clone());
+        state.applied_max_height = Some(max_height);
+        state.generation = state.generation.wrapping_add(1);
+        state.dirty = false;
+        state.active = true;
+        state.session
+    }
+
+    fn record_event(self: &Arc<Self>, session: u64, change: PanelBoundsChange) {
+        let should_spawn = {
+            let mut state = self.state.lock();
+            if !state.active || state.session != session {
+                return;
+            }
+            if state.latest.is_none() {
+                state.latest = state
+                    .window
+                    .as_ref()
+                    .and_then(|window| panel_bounds_sample_from_window(window).ok());
+            }
+            Self::record_change(&mut state, session, change)
+        };
+        if should_spawn {
+            self.spawn_worker();
+        }
     }
-    if let Some(latest) = state.latest.as_mut() {
+
+    fn record_change(
+        state: &mut PanelBoundsPersistenceState,
+        session: u64,
+        change: PanelBoundsChange,
+    ) -> bool {
+        if !state.active || state.session != session {
+            return false;
+        }
+        if let PanelBoundsChange::Snapshot(snapshot) = change {
+            state.latest = Some(snapshot);
+            return Self::mark_dirty(state);
+        }
+        let Some(latest) = state.latest.as_mut() else {
+            return false;
+        };
         apply_panel_bounds_change(latest, change);
+        Self::mark_dirty(state)
     }
-    let scheduled_generation = generation.fetch_add(1, Ordering::SeqCst).wrapping_add(1);
-    state.generation = scheduled_generation;
-    if state.worker_running {
-        return;
+
+    fn mark_dirty(state: &mut PanelBoundsPersistenceState) -> bool {
+        state.generation = state.generation.wrapping_add(1);
+        state.dirty = true;
+        let should_spawn = !state.worker_running;
+        state.worker_running = true;
+        should_spawn
     }
-    state.worker_running = true;
-    drop(state);
 
-    let window = window.clone();
-    let store = Arc::clone(store);
-    let generation = Arc::clone(generation);
-    let applied_max_height = Arc::clone(applied_max_height);
-    let settle_state = Arc::clone(settle_state);
-    tauri::async_runtime::spawn(async move {
-        loop {
-            tokio::time::sleep(Duration::from_millis(PANEL_BOUNDS_DEBOUNCE_MS)).await;
-            let (observed_generation, sample) = {
-                let mut state = settle_state.lock();
-                if !state.active {
-                    state.worker_running = false;
-                    return;
-                }
-                if generation.load(Ordering::SeqCst) != state.generation {
-                    state.worker_running = false;
-                    return;
-                }
-                let Some(sample) = state.latest else {
-                    state.worker_running = false;
-                    return;
-                };
-                (state.generation, sample)
-            };
+    fn take_dirty_work(state: &mut PanelBoundsPersistenceState) -> Option<PanelBoundsPersistWork> {
+        let sample = state.latest.filter(|_| state.active && state.dirty)?;
+        state.dirty = false;
+        Some(PanelBoundsPersistWork {
+            session: state.session,
+            generation: state.generation,
+            sample,
+        })
+    }
 
-            let is_current = || {
-                let state = settle_state.lock();
-                state.active
-                    && state.generation == observed_generation
-                    && generation.load(Ordering::SeqCst) == observed_generation
-            };
-            if !is_current() {
-                continue;
-            }
+    fn work_is_current(state: &PanelBoundsPersistenceState, work: &PanelBoundsPersistWork) -> bool {
+        state.active && state.session == work.session && state.generation == work.generation
+    }
 
-            let bounds = panel_bounds_from_sample(sample);
-            if !is_current() {
-                continue;
-            }
-            let persisted = Arc::new(AtomicBool::new(false));
-            let persist_generation = Arc::clone(&generation);
-            let persist_state = Arc::clone(&settle_state);
-            let persisted_result = Arc::clone(&persisted);
-            if let Err(err) = store.update_deferred(move |state| {
-                let settle = persist_state.lock();
-                if settle.active
-                    && settle.generation == observed_generation
-                    && persist_generation.load(Ordering::SeqCst) == observed_generation
-                {
-                    state.panel_bounds = Some(bounds);
-                    persisted_result.store(true, Ordering::SeqCst);
+    fn restore_failed_work(
+        state: &mut PanelBoundsPersistenceState,
+        work: &PanelBoundsPersistWork,
+    ) -> bool {
+        if !Self::work_is_current(state, work) {
+            return false;
+        }
+        state.dirty = true;
+        true
+    }
+
+    fn persist_sample(&self, sample: PanelBoundsSample) -> Result<()> {
+        let bounds = panel_bounds_from_sample(sample);
+        self.store
+            .update_deferred(move |data| {
+                data.panel_bounds = Some(bounds);
+            })
+            .context("failed to capture settled panel bounds")?;
+        self.store
+            .flush()
+            .context("failed to flush settled panel bounds")
+    }
+
+    fn persist_worker_work(&self, work: PanelBoundsPersistWork) -> Result<bool> {
+        let _persist_guard = self.persist_lock.lock();
+        if !Self::work_is_current(&self.state.lock(), &work) {
+            return Ok(false);
+        }
+        self.persist_sample(work.sample)?;
+        Ok(true)
+    }
+
+    fn spawn_worker(self: &Arc<Self>) {
+        let controller = Arc::clone(self);
+        tauri::async_runtime::spawn(async move {
+            loop {
+                tokio::time::sleep(Duration::from_millis(PANEL_BOUNDS_DEBOUNCE_MS)).await;
+                let (work, window) = {
+                    let mut state = controller.state.lock();
+                    let Some(work) = Self::take_dirty_work(&mut state) else {
+                        state.worker_running = false;
+                        return;
+                    };
+                    (work, state.window.clone())
+                };
+
+                let persist_result = controller.persist_worker_work(work);
+                if let Err(err) = &persist_result {
+                    log::warn!("failed to persist settled panel bounds: {err:#}");
                 }
-            }) {
-                log::warn!("failed to capture settled panel bounds: {err}");
-            } else if persisted.load(Ordering::SeqCst) && is_current() {
-                if let Err(err) = store.flush() {
-                    log::warn!("failed to flush settled panel bounds: {err}");
+
+                if let Some(window) = window {
+                    let constraint_controller = Arc::clone(&controller);
+                    let constraint_window = window.clone();
+                    if let Err(err) = window.app_handle().run_on_main_thread(move || {
+                        if let Err(err) = constraint_controller.apply_monitor_constraints(
+                            &constraint_window,
+                            work.session,
+                            work.generation,
+                        ) {
+                            log::warn!("failed to update settled panel monitor constraints: {err}");
+                        }
+                    }) {
+                        log::warn!("failed to schedule settled panel constraints: {err}");
+                    }
                 }
-            }
 
-            let constraint_window = window.clone();
-            let constraint_max_height = Arc::clone(&applied_max_height);
-            let constraint_generation = Arc::clone(&generation);
-            let constraint_state = Arc::clone(&settle_state);
-            if let Err(err) = window.app_handle().run_on_main_thread(move || {
-                let is_current = {
-                    let state = constraint_state.lock();
-                    state.active
-                        && state.generation == observed_generation
-                        && constraint_generation.load(Ordering::SeqCst) == observed_generation
-                };
-                if !is_current {
+                let mut state = controller.state.lock();
+                if persist_result.is_err() && Self::restore_failed_work(&mut state, &work) {
+                    state.worker_running = false;
                     return;
                 }
-                if let Err(err) =
-                    apply_panel_monitor_constraints(&constraint_window, &constraint_max_height)
-                {
-                    log::warn!("failed to update settled panel monitor constraints: {err}");
+                if !state.active || !state.dirty {
+                    state.worker_running = false;
+                    return;
                 }
-            }) {
-                log::warn!("failed to schedule settled panel constraints: {err}");
             }
+        });
+    }
 
-            let mut state = settle_state.lock();
-            if state.generation == observed_generation
-                && generation.load(Ordering::SeqCst) == observed_generation
-            {
-                state.worker_running = false;
-                return;
+    fn apply_monitor_constraints(
+        &self,
+        window: &WebviewWindow,
+        session: u64,
+        generation: u64,
+    ) -> Result<()> {
+        let Some(max_height) = window
+            .current_monitor()?
+            .and_then(MonitorSpec::from_monitor)
+            .map(|monitor| panel_max_height(Some(monitor.logical_height)))
+        else {
+            return Ok(());
+        };
+        let max_height = {
+            let state = self.state.lock();
+            if !state.active || state.session != session || state.generation != generation {
+                return Ok(());
             }
+            changed_panel_max_height(state.applied_max_height, max_height)
+        };
+        let Some(max_height) = max_height else {
+            return Ok(());
+        };
+        window.set_max_size(Some(tauri::Size::Logical(tauri::LogicalSize::new(
+            PANEL_WIDTH,
+            max_height,
+        ))))?;
+        let mut state = self.state.lock();
+        if state.active && state.session == session && state.generation == generation {
+            state.applied_max_height = Some(max_height);
         }
-    });
-}
+        Ok(())
+    }
 
-fn apply_panel_monitor_constraints(
-    window: &WebviewWindow,
-    applied_max_height: &Mutex<Option<f64>>,
-) -> Result<()> {
-    let Some(max_height) = window
-        .current_monitor()?
-        .and_then(MonitorSpec::from_monitor)
-        .map(|monitor| panel_max_height(Some(monitor.logical_height)))
-    else {
-        return Ok(());
-    };
-    let mut applied = applied_max_height.lock();
-    let Some(max_height) = changed_panel_max_height(*applied, max_height) else {
-        return Ok(());
-    };
-    window.set_max_size(Some(tauri::Size::Logical(tauri::LogicalSize::new(
-        PANEL_WIDTH,
-        max_height,
-    ))))?;
-    *applied = Some(max_height);
-    Ok(())
-}
+    fn flush_now(&self, window: &WebviewWindow) -> Result<()> {
+        let _persist_guard = self.persist_lock.lock();
+        let generation_before_sample = self.state.lock().generation;
+        let sampled = panel_bounds_sample_from_window(window);
+        Self::flush_samples(&self.state, generation_before_sample, sampled, |sample| {
+            self.persist_sample(sample)
+        })
+    }
 
-fn defer_panel_bounds_from_window(
-    window: &WebviewWindow,
-    store: &Arc<AppStore>,
-    generation: &Arc<AtomicU64>,
-) -> Result<()> {
-    let scale_factor = window.scale_factor().unwrap_or(1.0);
-    let position = window.outer_position()?.to_logical::<f64>(scale_factor);
-    let size = window.inner_size()?.to_logical::<f64>(scale_factor);
-    let bounds = PanelBounds {
-        x: position.x,
-        y: position.y,
-        height: size.height.max(PANEL_MIN_HEIGHT),
-    };
-    let scheduled_generation = generation.fetch_add(1, Ordering::SeqCst).wrapping_add(1);
-    store.update_deferred(move |state| {
-        state.panel_bounds = Some(bounds);
-    })?;
+    fn flush_samples(
+        state_mutex: &Mutex<PanelBoundsPersistenceState>,
+        generation_before_sample: u64,
+        sampled: Result<PanelBoundsSample>,
+        mut persist: impl FnMut(PanelBoundsSample) -> Result<()>,
+    ) -> Result<()> {
+        let mut work = {
+            let mut state = state_mutex.lock();
+            let sampled = match sampled {
+                Ok(sample) => sample,
+                Err(error) => state.latest.ok_or(error)?,
+            };
+            let sample = if state.generation != generation_before_sample {
+                state.latest.unwrap_or(sampled)
+            } else {
+                sampled
+            };
+            state.latest = Some(sample);
+            state.generation = state.generation.wrapping_add(1);
+            state.dirty = false;
+            PanelBoundsPersistWork {
+                session: state.session,
+                generation: state.generation,
+                sample,
+            }
+        };
 
-    let store = Arc::clone(store);
-    let generation = Arc::clone(generation);
-    tauri::async_runtime::spawn(async move {
-        tokio::time::sleep(Duration::from_millis(PANEL_BOUNDS_DEBOUNCE_MS)).await;
-        if generation.load(Ordering::SeqCst) != scheduled_generation {
-            return;
-        }
-        if let Err(err) = store.flush() {
-            log::warn!("failed to flush debounced panel bounds: {err}");
+        loop {
+            if let Err(error) = persist(work.sample) {
+                Self::restore_failed_work(&mut state_mutex.lock(), &work);
+                return Err(error);
+            }
+            let Some(next) = Self::take_dirty_work(&mut state_mutex.lock()) else {
+                return Ok(());
+            };
+            work = next;
         }
-    });
+    }
 
-    Ok(())
-}
+    fn deactivate(&self, session: u64) {
+        let mut state = self.state.lock();
+        Self::deactivate_state(&mut state, session);
+    }
 
-fn flush_deferred_panel_bounds(store: &Arc<AppStore>, generation: &Arc<AtomicU64>) -> Result<()> {
-    generation.fetch_add(1, Ordering::SeqCst);
-    store.flush()
+    fn deactivate_state(state: &mut PanelBoundsPersistenceState, session: u64) -> bool {
+        if state.session != session {
+            return false;
+        }
+        state.active = false;
+        state.window = None;
+        state.applied_max_height = None;
+        state.generation = state.generation.wrapping_add(1);
+        state.dirty = false;
+        true
+    }
 }
 
 fn defer_overlay_bounds_from_window(
@@ -4607,7 +4681,8 @@ mod tests {
         take_targeted_panel_view_state, validate_selection_session, EditorFlushAcknowledge,
         EditorFlushCompletion, EditorFlushHandshake, EditorFlushRequest, FrontendFlushAction,
         FrontendHistoryFlushPhase, FrontendHistoryFlushReady, FrontendLifecycleAction,
-        LifecycleHandshakeInstall, MonitorData, Mutex, PanelBoundsChange, PanelBoundsSample,
+        LifecycleHandshakeInstall, MonitorData, Mutex, PanelBoundsChange,
+        PanelBoundsPersistenceController, PanelBoundsPersistenceState, PanelBoundsSample,
         PanelCloseRequestState, PanelCloseRequestedPayload, PanelLayerTab, PanelPropertyTab,
         PanelViewMode, PanelViewState, PanelViewTarget, PanelVisibilityEventEmitter,
         PanelVisibilityPayload, PanelVisibilityReason, PhysicalPosition, PhysicalSize,
@@ -4712,7 +4787,7 @@ mod tests {
     }
 
     #[test]
-    fn settled_panel_bounds_preserve_each_geometry_scale_domain() {
+    fn panel_bounds_controller_preserves_scale_domains_and_coalesces_events() {
         let mut sample = PanelBoundsSample {
             position: PhysicalPosition::new(600, 300),
             position_scale_factor: 2.0,
@@ -4733,6 +4808,243 @@ mod tests {
         assert_eq!(bounds.x, 300.0);
         assert_eq!(bounds.y, 150.0);
         assert_eq!(bounds.height, 1_000.0);
+        let mut state = PanelBoundsPersistenceState {
+            latest: Some(sample),
+            session: 1,
+            active: true,
+            ..PanelBoundsPersistenceState::default()
+        };
+        assert!(PanelBoundsPersistenceController::record_change(
+            &mut state,
+            1,
+            PanelBoundsChange::Moved(PhysicalPosition::new(800, 400)),
+        ));
+        assert!(!PanelBoundsPersistenceController::record_change(
+            &mut state,
+            1,
+            PanelBoundsChange::Resized(PhysicalSize::new(480, 1_200)),
+        ));
+        assert_eq!(
+            (state.generation, state.worker_running, state.dirty),
+            (2, true, true)
+        );
+        let mut empty_state = PanelBoundsPersistenceState {
+            session: 1,
+            active: true,
+            ..PanelBoundsPersistenceState::default()
+        };
+        assert!(PanelBoundsPersistenceController::record_change(
+            &mut empty_state,
+            1,
+            PanelBoundsChange::Snapshot(sample),
+        ));
+        assert_eq!(empty_state.latest, Some(sample));
+    }
+
+    #[test]
+    fn panel_bounds_deactivate_ignores_a_stale_session_token() {
+        let sample = PanelBoundsSample {
+            position: PhysicalPosition::new(600, 300),
+            position_scale_factor: 2.0,
+            size: PhysicalSize::new(480, 1_000),
+            size_scale_factor: 2.0,
+            current_scale_factor: 2.0,
+        };
+        let mut state = PanelBoundsPersistenceState {
+            latest: Some(sample),
+            applied_max_height: Some(900.0),
+            session: 2,
+            generation: 7,
+            dirty: true,
+            active: true,
+            ..PanelBoundsPersistenceState::default()
+        };
+
+        assert!(!PanelBoundsPersistenceController::deactivate_state(
+            &mut state, 1,
+        ));
+        assert!(state.active);
+        assert_eq!(state.session, 2);
+        assert_eq!(state.generation, 7);
+        assert!(state.dirty);
+        assert_eq!(state.latest, Some(sample));
+        assert_eq!(state.applied_max_height, Some(900.0));
+    }
+
+    #[test]
+    fn panel_bounds_record_event_ignores_a_stale_session_token() {
+        let sample = PanelBoundsSample {
+            position: PhysicalPosition::new(600, 300),
+            position_scale_factor: 2.0,
+            size: PhysicalSize::new(480, 1_000),
+            size_scale_factor: 2.0,
+            current_scale_factor: 2.0,
+        };
+        let mut state = PanelBoundsPersistenceState {
+            latest: Some(sample),
+            session: 2,
+            generation: 7,
+            active: true,
+            ..PanelBoundsPersistenceState::default()
+        };
+
+        assert!(!PanelBoundsPersistenceController::record_change(
+            &mut state,
+            1,
+            PanelBoundsChange::Moved(PhysicalPosition::new(800, 400)),
+        ));
+        assert_eq!(state.latest, Some(sample));
+        assert_eq!(state.generation, 7);
+        assert!(!state.dirty);
+        assert!(!state.worker_running);
+    }
+
+    #[test]
+    fn panel_bounds_flush_keeps_event_after_sample_that_old_code_overwrote() {
+        let initial = PanelBoundsSample {
+            position: PhysicalPosition::new(600, 300),
+            position_scale_factor: 2.0,
+            size: PhysicalSize::new(480, 1_000),
+            size_scale_factor: 2.0,
+            current_scale_factor: 2.0,
+        };
+        let state = Mutex::new(PanelBoundsPersistenceState {
+            latest: Some(initial),
+            session: 4,
+            active: true,
+            ..PanelBoundsPersistenceState::default()
+        });
+        let generation_before_sample = state.lock().generation;
+        let sampled = state.lock().latest.unwrap();
+
+        assert!(PanelBoundsPersistenceController::record_change(
+            &mut state.lock(),
+            4,
+            PanelBoundsChange::Moved(PhysicalPosition::new(800, 400)),
+        ));
+        let expected = state.lock().latest.unwrap();
+        let mut persisted = Vec::new();
+
+        PanelBoundsPersistenceController::flush_samples(
+            &state,
+            generation_before_sample,
+            Ok(sampled),
+            |sample| {
+                persisted.push(sample);
+                Ok(())
+            },
+        )
+        .unwrap();
+
+        assert_eq!(persisted, vec![expected]);
+        let state = state.lock();
+        assert_eq!(state.latest, Some(expected));
+        assert!(!state.dirty);
+    }
+
+    #[test]
+    fn panel_bounds_flush_and_event_interleave_without_loss_or_duplicate_sample() {
+        let initial = PanelBoundsSample {
+            position: PhysicalPosition::new(600, 300),
+            position_scale_factor: 2.0,
+            size: PhysicalSize::new(480, 1_000),
+            size_scale_factor: 2.0,
+            current_scale_factor: 2.0,
+        };
+        let state = Mutex::new(PanelBoundsPersistenceState {
+            latest: Some(initial),
+            session: 4,
+            active: true,
+            ..PanelBoundsPersistenceState::default()
+        });
+        let mut persisted = Vec::new();
+
+        PanelBoundsPersistenceController::flush_samples(&state, 0, Ok(initial), |sample| {
+            persisted.push(sample);
+            if persisted.len() == 1 {
+                assert!(PanelBoundsPersistenceController::record_change(
+                    &mut state.lock(),
+                    4,
+                    PanelBoundsChange::Moved(PhysicalPosition::new(800, 400)),
+                ));
+            }
+            Ok(())
+        })
+        .unwrap();
+
+        let mut expected_latest = initial;
+        apply_panel_bounds_change(
+            &mut expected_latest,
+            PanelBoundsChange::Moved(PhysicalPosition::new(800, 400)),
+        );
+        assert_eq!(persisted, vec![initial, expected_latest]);
+        let state = state.lock();
+        assert_eq!(state.latest, Some(expected_latest));
+        assert!(!state.dirty);
+    }
+
+    #[test]
+    fn panel_bounds_flush_uses_latest_when_window_read_fails() {
+        let latest = PanelBoundsSample {
+            position: PhysicalPosition::new(600, 300),
+            position_scale_factor: 2.0,
+            size: PhysicalSize::new(480, 1_000),
+            size_scale_factor: 2.0,
+            current_scale_factor: 2.0,
+        };
+        let state = Mutex::new(PanelBoundsPersistenceState {
+            latest: Some(latest),
+            session: 5,
+            active: true,
+            ..PanelBoundsPersistenceState::default()
+        });
+        let mut persisted = Vec::new();
+
+        PanelBoundsPersistenceController::flush_samples(
+            &state,
+            0,
+            Err(anyhow::anyhow!("window bounds unavailable")),
+            |sample| {
+                persisted.push(sample);
+                Ok(())
+            },
+        )
+        .unwrap();
+        assert_eq!(persisted, vec![latest]);
+
+        let empty = Mutex::new(PanelBoundsPersistenceState::default());
+        assert!(PanelBoundsPersistenceController::flush_samples(
+            &empty,
+            0,
+            Err(anyhow::anyhow!("window bounds unavailable")),
+            |_| panic!("missing bounds must not be persisted"),
+        )
+        .is_err());
+    }
+
+    #[test]
+    fn panel_bounds_flush_failure_restores_dirty_state() {
+        let sample = PanelBoundsSample {
+            position: PhysicalPosition::new(600, 300),
+            position_scale_factor: 2.0,
+            size: PhysicalSize::new(480, 1_000),
+            size_scale_factor: 2.0,
+            current_scale_factor: 2.0,
+        };
+        let state = Mutex::new(PanelBoundsPersistenceState {
+            latest: Some(sample),
+            session: 6,
+            active: true,
+            ..PanelBoundsPersistenceState::default()
+        });
+
+        assert!(
+            PanelBoundsPersistenceController::flush_samples(&state, 0, Ok(sample), |_| Err(
+                anyhow::anyhow!("disk unavailable")
+            ),)
+            .is_err()
+        );
+        assert!(state.lock().dirty);
     }
 
     #[test]
diff --git a/src-tauri/src/state/editor.rs b/src-tauri/src/state/editor.rs
index ebf0b796..e88b2335 100644
--- a/src-tauri/src/state/editor.rs
+++ b/src-tauri/src/state/editor.rs
@@ -20,6 +20,8 @@ pub(crate) const MAX_CUSTOM_TABS: usize = 30;
 
 const MAX_MUTATION_ID_BYTES: usize = 64;
 const MAX_GESTURE_ID_BYTES: usize = 64;
+// 프론트 editorCoordinator.ts의 MAX_PENDING_GESTURE_IDS와 동일한 IPC 상한
+const MAX_GESTURE_IDS: usize = 32;
 const MAX_MODE_ID_BYTES: usize = 128;
 const MAX_MODES: usize = 64;
 const MAX_ITEMS_PER_MODE: usize = 512;
@@ -44,6 +46,7 @@ pub(crate) type RequestFingerprint = [u8; 32];
 struct FingerprintPayload<'a> {
     base_revision: u64,
     gesture_id: Option<&'a str>,
+    gesture_ids: &'a [String],
     changes: &'a crate::models::EditorPatchV1,
 }
 
@@ -88,15 +91,27 @@ pub(crate) fn validate_request_envelope(
         ));
     }
 
+    if request.gesture_ids.len() > MAX_GESTURE_IDS
+        || request
+            .gesture_ids
+            .iter()
+            .chain(request.gesture_id.iter())
+            .collect::<HashSet<_>>()
+            .len()
+            > MAX_GESTURE_IDS
+    {
+        return Err(EditorCommitError::too_many_gesture_ids(MAX_GESTURE_IDS));
+    }
+
     if request
         .gesture_id
-        .as_ref()
-        .is_some_and(|gesture_id| gesture_id.len() > MAX_GESTURE_ID_BYTES)
+        .iter()
+        .chain(request.gesture_ids.iter())
+        .any(|gesture_id| {
+            gesture_id.len() > MAX_GESTURE_ID_BYTES || Uuid::parse_str(gesture_id).is_err()
+        })
     {
-        return Err(EditorCommitError::validation(
-            "INVALID_GESTURE_ID",
-            "gestureId must be no longer than 64 bytes",
-        ));
+        return Err(EditorCommitError::invalid_gesture_id());
     }
 
     Ok(())
@@ -199,12 +214,18 @@ pub(crate) fn validate_history_restore_metadata(
 pub(crate) fn request_fingerprint(
     request: &EditorCommitRequest,
 ) -> Result<RequestFingerprint, EditorCommitError> {
-    let value = serde_json::to_value(FingerprintPayload {
+    canonical_request_fingerprint(&FingerprintPayload {
         base_revision: request.base_revision,
         gesture_id: request.gesture_id.as_deref(),
+        gesture_ids: &request.gesture_ids,
         changes: &request.changes,
     })
-    .map_err(|error| {
+}
+
+pub(crate) fn canonical_request_fingerprint(
+    payload: &impl Serialize,
+) -> Result<RequestFingerprint, EditorCommitError> {
+    let value = serde_json::to_value(payload).map_err(|error| {
         EditorCommitError::validation(
             "INVALID_REQUEST_PAYLOAD",
             format!("failed to serialize editor request: {error}"),
@@ -1034,6 +1055,7 @@ mod tests {
             base_revision: 0,
             mutation_id: Uuid::new_v4().to_string(),
             gesture_id: None,
+            gesture_ids: Vec::new(),
             changes: EditorPatchV1 {
                 keys: Some(keys),
                 ..EditorPatchV1::default()
@@ -1636,6 +1658,7 @@ mod tests {
             base_revision: 0,
             mutation_id: "not-a-uuid".to_string(),
             gesture_id: None,
+            gesture_ids: Vec::new(),
             changes: EditorPatchV1::default(),
         };
         assert!(validate_request_envelope(&invalid).is_err());
@@ -1644,6 +1667,37 @@ mod tests {
         oversized_gesture.gesture_id = Some("가".repeat(22));
         assert_eq!(oversized_gesture.gesture_id.as_ref().unwrap().len(), 66);
         assert!(validate_request_envelope(&oversized_gesture).is_err());
+
+        let mut oversized_merged_gesture = request(KeyMappings::new());
+        oversized_merged_gesture.gesture_ids = vec!["가".repeat(22)];
+        assert!(validate_request_envelope(&oversized_merged_gesture).is_err());
+
+        let mut malformed_gesture = request(KeyMappings::new());
+        malformed_gesture.gesture_ids = vec!["not-a-uuid".to_string()];
+        let malformed_error = validate_request_envelope(&malformed_gesture).unwrap_err();
+        assert_eq!(
+            malformed_error.error_code,
+            crate::errors::EditorCommitErrorCode::InvalidGestureId
+        );
+        assert!(!malformed_error.retryable);
+
+        let mut too_many_gestures = request(KeyMappings::new());
+        too_many_gestures.gesture_ids = (0..=MAX_GESTURE_IDS)
+            .map(|index| Uuid::from_u128(index as u128 + 1).to_string())
+            .collect();
+        let count_error = validate_request_envelope(&too_many_gestures).unwrap_err();
+        assert_eq!(
+            count_error.error_code,
+            crate::errors::EditorCommitErrorCode::TooManyGestureIds
+        );
+        assert!(!count_error.retryable);
+
+        let mut representative_overflow = request(KeyMappings::new());
+        representative_overflow.gesture_ids = (0..MAX_GESTURE_IDS)
+            .map(|index| Uuid::from_u128(index as u128 + 1).to_string())
+            .collect();
+        representative_overflow.gesture_id = Some(Uuid::from_u128(u128::MAX).to_string());
+        assert!(validate_request_envelope(&representative_overflow).is_err());
     }
 
     #[test]
diff --git a/src-tauri/src/state/gesture.rs b/src-tauri/src/state/gesture.rs
new file mode 100644
index 00000000..aeaf46bd
--- /dev/null
+++ b/src-tauri/src/state/gesture.rs
@@ -0,0 +1,89 @@
+use std::collections::HashSet;
+
+use crate::{
+    errors::EditorCommitError,
+    models::{EditorCommitRequest, GestureCommitRequest, PluginInstancesCommitRequest},
+};
+
+use super::{
+    editor::{request_payload_size, validate_request_envelope, validate_revision},
+    plugin::validate_plugin_instances_request,
+};
+
+const MAX_GESTURE_PLUGINS: usize = 64;
+const MAX_GESTURE_REQUEST_BYTES: usize = 16 * 1024 * 1024;
+
+pub(crate) fn validate_gesture_commit_request(
+    request: &GestureCommitRequest,
+) -> Result<usize, EditorCommitError> {
+    validate_revision(request.editor_base_revision)?;
+    validate_revision(request.plugin_base_revision)?;
+    validate_revision(request.authority_generation)?;
+    if let Some(epoch) = request.observed_history_epoch {
+        validate_revision(epoch)?;
+    }
+
+    let editor_envelope = EditorCommitRequest {
+        base_revision: request.editor_base_revision,
+        mutation_id: request.mutation_id.clone(),
+        gesture_id: Some(request.gesture_id.clone()),
+        gesture_ids: Vec::new(),
+        changes: request.editor_changes.clone().unwrap_or_default(),
+    };
+    validate_request_envelope(&editor_envelope)?;
+    request_payload_size(&editor_envelope)?;
+
+    if request.plugin_changes.is_empty() || request.plugin_changes.len() > MAX_GESTURE_PLUGINS {
+        return Err(EditorCommitError::validation(
+            "INVALID_GESTURE_PLUGIN_COUNT",
+            format!("gesture transaction must contain between 1 and {MAX_GESTURE_PLUGINS} plugins"),
+        ));
+    }
+
+    let mut plugin_ids = HashSet::with_capacity(request.plugin_changes.len());
+    for change in &request.plugin_changes {
+        if !plugin_ids.insert(change.plugin_id.as_str()) {
+            return Err(EditorCommitError::validation(
+                "DUPLICATE_GESTURE_PLUGIN",
+                format!(
+                    "gesture transaction contains duplicate plugin '{}'",
+                    change.plugin_id
+                ),
+            ));
+        }
+        let plugin_request = PluginInstancesCommitRequest {
+            plugin_id: change.plugin_id.clone(),
+            instances: change.instances.clone(),
+            mutation_id: request.mutation_id.clone(),
+            gesture_id: Some(request.gesture_id.clone()),
+            observed_history_epoch: request.observed_history_epoch,
+            expected_model_revision: Some(request.plugin_base_revision),
+            authority_generation: request.authority_generation,
+        };
+        validate_plugin_instances_request(&plugin_request).map_err(|error| {
+            EditorCommitError::validation(
+                error.clone(),
+                format!(
+                    "invalid plugin gesture change '{}': {error}",
+                    change.plugin_id
+                ),
+            )
+        })?;
+    }
+
+    let size = serde_json::to_vec(request)
+        .map_err(|error| {
+            EditorCommitError::validation(
+                "INVALID_REQUEST_PAYLOAD",
+                format!("failed to serialize gesture request: {error}"),
+            )
+        })?
+        .len();
+    if size > MAX_GESTURE_REQUEST_BYTES {
+        return Err(EditorCommitError::validation(
+            "REQUEST_TOO_LARGE",
+            format!("gesture request exceeds the {MAX_GESTURE_REQUEST_BYTES} byte limit"),
+        ));
+    }
+    Ok(size)
+}
diff --git a/src-tauri/src/state/history.rs b/src-tauri/src/state/history.rs
index ac3139fb..31ddadbd 100644
--- a/src-tauri/src/state/history.rs
+++ b/src-tauri/src/state/history.rs
@@ -33,6 +33,7 @@ pub(crate) enum HistoryScope {
     Counters,
     PresetFull,
     PluginElements,
+    Compound,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -55,10 +56,19 @@ pub(crate) struct HistoryEntry {
     pub(crate) scope: HistoryScope,
     pub(crate) before: HistorySnapshot,
     pub(crate) gesture_id: Option<String>,
+    pub(crate) gesture_ids: Vec<String>,
     size_bytes: usize,
     access_sequence: u64,
 }
 
+impl HistoryEntry {
+    fn matches_any_gesture(&self, gesture_ids: &[String]) -> bool {
+        gesture_ids
+            .iter()
+            .any(|gesture_id| self.gesture_ids.contains(gesture_id))
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct CustomTabsHistorySnapshot {
@@ -258,6 +268,9 @@ pub(crate) enum HistorySnapshot {
     Counters(KeyCounters),
     PresetFull(Box<PresetFullHistorySnapshot>),
     PluginElements(PluginElementsHistorySnapshot),
+    Compound {
+        snapshots: Vec<HistorySnapshot>,
+    },
 }
 
 impl HistorySnapshot {
@@ -269,23 +282,218 @@ impl HistorySnapshot {
             Self::Counters(_) => HistoryScope::Counters,
             Self::PresetFull(_) => HistoryScope::PresetFull,
             Self::PluginElements(_) => HistoryScope::PluginElements,
+            Self::Compound { .. } => HistoryScope::Compound,
         }
     }
 }
 
+fn merged_editor_before(
+    first_fields: &[EditorField],
+    first_before: &EditorPatchV1,
+    changed_fields: Vec<EditorField>,
+    before: EditorPatchV1,
+) -> HistorySnapshot {
+    let mut merged_fields = first_fields.to_vec();
+    for field in changed_fields {
+        if !merged_fields.contains(&field) {
+            merged_fields.push(field);
+        }
+    }
+    let mut merged_before = before;
+    preserve_editor_before_values(&mut merged_before, first_before);
+    HistorySnapshot::Editor {
+        changed_fields: merged_fields,
+        before: merged_before,
+    }
+}
+
+fn merge_editor_snapshot(
+    existing: &HistorySnapshot,
+    changed_fields: Vec<EditorField>,
+    before: EditorPatchV1,
+) -> Result<HistorySnapshot, String> {
+    match existing {
+        HistorySnapshot::Editor {
+            changed_fields: first_fields,
+            before: first_before,
+        } => Ok(merged_editor_before(
+            first_fields,
+            first_before,
+            changed_fields,
+            before,
+        )),
+        HistorySnapshot::PluginElements(_) => Ok(HistorySnapshot::Compound {
+            snapshots: vec![
+                existing.clone(),
+                HistorySnapshot::Editor {
+                    changed_fields,
+                    before,
+                },
+            ],
+        }),
+        HistorySnapshot::Compound { snapshots } => {
+            validate_compound_snapshots(snapshots)?;
+            let mut merged = snapshots.clone();
+            if let Some(index) = merged
+                .iter()
+                .position(|snapshot| matches!(snapshot, HistorySnapshot::Editor { .. }))
+            {
+                let HistorySnapshot::Editor {
+                    changed_fields: first_fields,
+                    before: first_before,
+                } = &merged[index]
+                else {
+                    unreachable!();
+                };
+                merged[index] =
+                    merged_editor_before(first_fields, first_before, changed_fields, before);
+            } else {
+                merged.push(HistorySnapshot::Editor {
+                    changed_fields,
+                    before,
+                });
+            }
+            Ok(HistorySnapshot::Compound { snapshots: merged })
+        }
+        _ => Err("gesture history cannot merge editor with this scope".to_string()),
+    }
+}
+
+fn merge_plugin_elements_snapshot(
+    existing: &HistorySnapshot,
+    before: PluginElementsHistorySnapshot,
+) -> Result<HistorySnapshot, String> {
+    match existing {
+        HistorySnapshot::Editor { .. } => Ok(HistorySnapshot::Compound {
+            snapshots: vec![existing.clone(), HistorySnapshot::PluginElements(before)],
+        }),
+        HistorySnapshot::PluginElements(first_before) => {
+            if first_before.plugin_id == before.plugin_id {
+                Ok(existing.clone())
+            } else {
+                Ok(HistorySnapshot::Compound {
+                    snapshots: vec![existing.clone(), HistorySnapshot::PluginElements(before)],
+                })
+            }
+        }
+        HistorySnapshot::Compound { snapshots } => {
+            validate_compound_snapshots(snapshots)?;
+            if snapshots.iter().any(|snapshot| {
+                matches!(
+                    snapshot,
+                    HistorySnapshot::PluginElements(first_before)
+                        if first_before.plugin_id == before.plugin_id
+                )
+            }) {
+                return Ok(existing.clone());
+            }
+            let mut merged = snapshots.clone();
+            merged.push(HistorySnapshot::PluginElements(before));
+            Ok(HistorySnapshot::Compound { snapshots: merged })
+        }
+        _ => Err("gesture history cannot merge plugin elements with this scope".to_string()),
+    }
+}
+
+fn validate_compound_snapshots(snapshots: &[HistorySnapshot]) -> Result<(), String> {
+    let mut has_editor = false;
+    let mut plugin_ids = HashSet::new();
+    for snapshot in snapshots {
+        match snapshot {
+            HistorySnapshot::Editor { .. } if !has_editor => has_editor = true,
+            HistorySnapshot::PluginElements(before)
+                if plugin_ids.insert(before.plugin_id.as_str()) => {}
+            HistorySnapshot::Editor { .. } => {
+                return Err("compound history contains duplicate editor snapshots".to_string())
+            }
+            HistorySnapshot::PluginElements(_) => {
+                return Err("compound history contains duplicate plugin snapshots".to_string())
+            }
+            _ => return Err("compound history contains an unsupported snapshot".to_string()),
+        }
+    }
+    if snapshots.is_empty() {
+        return Err("compound history cannot be empty".to_string());
+    }
+    Ok(())
+}
+
+fn normalize_gesture_ids(gesture_ids: Vec<String>) -> Vec<String> {
+    let mut normalized = Vec::with_capacity(gesture_ids.len());
+    for gesture_id in gesture_ids {
+        if !normalized.contains(&gesture_id) {
+            normalized.push(gesture_id);
+        }
+    }
+    normalized
+}
+
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
 struct HistoryEntryPayload<'a> {
     scope: HistoryScope,
     before: &'a HistorySnapshot,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    gesture_id: &'a Option<String>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    gesture_ids: &'a Vec<String>,
+}
+
+fn refresh_history_entry_size(entry: &mut HistoryEntry) {
+    if let Ok(payload) = serde_json::to_vec(&HistoryEntryPayload {
+        scope: entry.scope,
+        before: &entry.before,
+        gesture_ids: &entry.gesture_ids,
+    }) {
+        entry.size_bytes = payload.len();
+    }
+}
+
+fn remove_net_zero_editor_snapshot(entry: &mut HistoryEntry, canonical: &EditorDocumentV1) -> bool {
+    let editor_is_net_zero = |snapshot: &HistorySnapshot| {
+        matches!(
+            snapshot,
+            HistorySnapshot::Editor {
+                changed_fields,
+                before,
+            } if canonical.patch_for_fields(changed_fields) == *before
+        )
+    };
+    match &mut entry.before {
+        snapshot @ HistorySnapshot::Editor { .. } if editor_is_net_zero(snapshot) => return true,
+        HistorySnapshot::Compound { snapshots } => {
+            snapshots.retain(|snapshot| !editor_is_net_zero(snapshot));
+        }
+        _ => {}
+    }
+    refresh_history_entry_size(entry);
+    matches!(&entry.before, HistorySnapshot::Compound { snapshots } if snapshots.is_empty())
+}
+
+fn remove_net_zero_plugin_snapshot(
+    entry: &mut HistoryEntry,
+    canonical: &PluginElementsHistorySnapshot,
+) -> bool {
+    let plugin_is_net_zero = |snapshot: &HistorySnapshot| matches!(snapshot, HistorySnapshot::PluginElements(before) if before == canonical);
+    match &mut entry.before {
+        snapshot @ HistorySnapshot::PluginElements(_) if plugin_is_net_zero(snapshot) => {
+            return true
+        }
+        HistorySnapshot::Compound { snapshots } => {
+            snapshots.retain(|snapshot| !plugin_is_net_zero(snapshot));
+        }
+        _ => {}
+    }
+    refresh_history_entry_size(entry);
+    matches!(&entry.before, HistorySnapshot::Compound { snapshots } if snapshots.is_empty())
 }
 
 #[derive(Debug)]
 pub(crate) enum HistoryRecordPlan {
     Entry(Box<HistoryEntry>),
-    Merge(Box<HistoryEntry>),
+    Merge {
+        entry: Box<HistoryEntry>,
+        target_access_sequence: u64,
+        remove_access_sequences: Vec<u64>,
+    },
     Truncate,
 }
 
@@ -363,51 +571,60 @@ impl HistoryService {
         self.history_revision
     }
 
+    #[cfg(test)]
     pub(crate) fn prepare_entry(
         &self,
         changed_fields: Vec<EditorField>,
         before: EditorPatchV1,
         gesture_id: Option<String>,
     ) -> Result<HistoryRecordPlan, String> {
-        if let Some(top) = self.past.back().filter(|entry| {
-            self.future.is_empty()
-                && entry.scope == HistoryScope::Editor
-                && gesture_id.is_some()
-                && entry.gesture_id == gesture_id
-        }) {
-            let HistorySnapshot::Editor {
-                changed_fields: first_fields,
-                before: first_before,
-            } = &top.before
-            else {
-                return Err("editor history scope contains a non-editor snapshot".to_string());
-            };
-            let mut merged_fields = first_fields.clone();
-            for field in changed_fields {
-                if !merged_fields.contains(&field) {
-                    merged_fields.push(field);
-                }
+        self.prepare_entry_with_gesture_ids(
+            changed_fields,
+            before,
+            gesture_id.into_iter().collect(),
+        )
+    }
+
+    pub(crate) fn prepare_entry_with_gesture_ids(
+        &self,
+        changed_fields: Vec<EditorField>,
+        before: EditorPatchV1,
+        gesture_ids: Vec<String>,
+    ) -> Result<HistoryRecordPlan, String> {
+        let gesture_ids = normalize_gesture_ids(gesture_ids);
+        if self.future.is_empty() && !gesture_ids.is_empty() {
+            if let Some(top) = self
+                .past
+                .back()
+                .filter(|entry| entry.matches_any_gesture(&gesture_ids))
+            {
+                let merged = merge_editor_snapshot(&top.before, changed_fields, before)?;
+                let mut merged_gesture_ids = top
+                    .gesture_ids
+                    .iter()
+                    .filter(|existing| !gesture_ids.contains(*existing))
+                    .cloned()
+                    .collect::<Vec<_>>();
+                merged_gesture_ids.extend(gesture_ids);
+                return self.prepare_snapshot_with_gesture_ids(
+                    merged.scope(),
+                    merged,
+                    normalize_gesture_ids(merged_gesture_ids),
+                    Some(top.access_sequence),
+                    Vec::new(),
+                );
             }
-            let mut merged_before = before;
-            preserve_editor_before_values(&mut merged_before, first_before);
-            return self.prepare_snapshot(
-                HistoryScope::Editor,
-                HistorySnapshot::Editor {
-                    changed_fields: merged_fields,
-                    before: merged_before,
-                },
-                gesture_id,
-                true,
-            );
         }
-        self.prepare_snapshot(
+
+        self.prepare_snapshot_with_gesture_ids(
             HistoryScope::Editor,
             HistorySnapshot::Editor {
                 changed_fields,
                 before,
             },
-            gesture_id,
-            false,
+            gesture_ids,
+            None,
+            Vec::new(),
         )
     }
 
@@ -424,7 +641,7 @@ impl HistoryService {
                 before,
             },
             gesture_id,
-            false,
+            None,
         )
     }
 
@@ -436,7 +653,7 @@ impl HistoryService {
             HistoryScope::CustomTabs,
             HistorySnapshot::CustomTabs(before),
             None,
-            false,
+            None,
         )
     }
 
@@ -445,7 +662,7 @@ impl HistoryService {
             HistoryScope::Mode,
             HistorySnapshot::Mode(before),
             None,
-            false,
+            None,
         )
     }
 
@@ -457,7 +674,7 @@ impl HistoryService {
             HistoryScope::Counters,
             HistorySnapshot::Counters(before),
             None,
-            false,
+            None,
         )
     }
 
@@ -469,7 +686,7 @@ impl HistoryService {
             HistoryScope::PresetFull,
             HistorySnapshot::PresetFull(Box::new(before)),
             None,
-            false,
+            None,
         )
     }
 
@@ -478,31 +695,29 @@ impl HistoryService {
         before: PluginElementsHistorySnapshot,
         gesture_id: Option<String>,
     ) -> Result<HistoryRecordPlan, String> {
-        if let Some(top) = self.past.back().filter(|entry| {
+        let gesture_ids = gesture_id.into_iter().collect::<Vec<_>>();
+        if let Some(target) = self.past.iter().rev().find(|entry| {
             self.future.is_empty()
-                && entry.scope == HistoryScope::PluginElements
-                && gesture_id.is_some()
-                && entry.gesture_id == gesture_id
+                && !gesture_ids.is_empty()
+                && entry.matches_any_gesture(&gesture_ids)
         }) {
-            let HistorySnapshot::PluginElements(first_before) = &top.before else {
-                return Err(
-                    "plugin elements history scope contains a mismatched snapshot".to_string(),
-                );
-            };
-            if first_before.plugin_id == before.plugin_id {
-                return self.prepare_snapshot(
-                    HistoryScope::PluginElements,
-                    HistorySnapshot::PluginElements(first_before.clone()),
-                    gesture_id,
-                    true,
-                );
-            }
+            let merged = merge_plugin_elements_snapshot(&target.before, before)?;
+            let mut merged_gesture_ids = target.gesture_ids.clone();
+            merged_gesture_ids.extend(gesture_ids);
+            return self.prepare_snapshot_with_gesture_ids(
+                merged.scope(),
+                merged,
+                normalize_gesture_ids(merged_gesture_ids),
+                Some(target.access_sequence),
+                Vec::new(),
+            );
         }
-        self.prepare_snapshot(
+        self.prepare_snapshot_with_gesture_ids(
             HistoryScope::PluginElements,
             HistorySnapshot::PluginElements(before),
-            gesture_id,
-            false,
+            gesture_ids,
+            None,
+            Vec::new(),
         )
     }
 
@@ -514,7 +729,37 @@ impl HistoryService {
             HistoryScope::PluginElements,
             HistorySnapshot::PluginElements(before),
             None,
-            false,
+            None,
+        )
+    }
+
+    pub(crate) fn prepare_opposite_compound_entry(
+        &self,
+        snapshots: Vec<HistorySnapshot>,
+        gesture_ids: Vec<String>,
+    ) -> Result<HistoryRecordPlan, String> {
+        validate_compound_snapshots(&snapshots)?;
+        self.prepare_snapshot_with_gesture_ids(
+            HistoryScope::Compound,
+            HistorySnapshot::Compound { snapshots },
+            gesture_ids,
+            None,
+            Vec::new(),
+        )
+    }
+
+    pub(crate) fn prepare_gesture_entry(
+        &self,
+        snapshots: Vec<HistorySnapshot>,
+        gesture_id: String,
+    ) -> Result<HistoryRecordPlan, String> {
+        validate_compound_snapshots(&snapshots)?;
+        self.prepare_snapshot_with_gesture_ids(
+            HistoryScope::Compound,
+            HistorySnapshot::Compound { snapshots },
+            vec![gesture_id],
+            None,
+            Vec::new(),
         )
     }
 
@@ -523,12 +768,31 @@ impl HistoryService {
         scope: HistoryScope,
         before: HistorySnapshot,
         gesture_id: Option<String>,
-        merge: bool,
+        merge_target: Option<u64>,
+    ) -> Result<HistoryRecordPlan, String> {
+        self.prepare_snapshot_with_gesture_ids(
+            scope,
+            before,
+            gesture_id.into_iter().collect(),
+            merge_target,
+            Vec::new(),
+        )
+    }
+
+    fn prepare_snapshot_with_gesture_ids(
+        &self,
+        scope: HistoryScope,
+        before: HistorySnapshot,
+        gesture_ids: Vec<String>,
+        merge_target: Option<u64>,
+        remove_access_sequences: Vec<u64>,
     ) -> Result<HistoryRecordPlan, String> {
+        let gesture_ids = normalize_gesture_ids(gesture_ids);
+        let gesture_id = gesture_ids.last().cloned();
         let size_bytes = serde_json::to_vec(&HistoryEntryPayload {
             scope,
             before: &before,
-            gesture_id: &gesture_id,
+            gesture_ids: &gesture_ids,
         })
         .map_err(|error| format!("failed to serialize history entry: {error}"))?
         .len();
@@ -541,13 +805,17 @@ impl HistoryService {
             scope,
             before,
             gesture_id,
+            gesture_ids,
             size_bytes,
             access_sequence: 0,
         });
-        Ok(if merge {
-            HistoryRecordPlan::Merge(entry)
-        } else {
-            HistoryRecordPlan::Entry(entry)
+        Ok(match merge_target {
+            Some(target_access_sequence) => HistoryRecordPlan::Merge {
+                entry,
+                target_access_sequence,
+                remove_access_sequences,
+            },
+            None => HistoryRecordPlan::Entry(entry),
         })
     }
 
@@ -558,10 +826,20 @@ impl HistoryService {
                 self.push_past(*entry);
                 self.advance_revision();
             }
-            HistoryRecordPlan::Merge(mut entry) => {
-                self.next_access_sequence = self.next_access_sequence.saturating_add(1);
-                entry.access_sequence = self.next_access_sequence;
-                if let Some(previous) = self.past.back_mut() {
+            HistoryRecordPlan::Merge {
+                mut entry,
+                target_access_sequence,
+                remove_access_sequences,
+            } => {
+                for access_sequence in remove_access_sequences {
+                    self.remove_past_by_access_sequence(access_sequence);
+                }
+                if let Some(previous) = self
+                    .past
+                    .iter_mut()
+                    .find(|entry| entry.access_sequence == target_access_sequence)
+                {
+                    entry.access_sequence = previous.access_sequence;
                     self.total_bytes = self.total_bytes.saturating_sub(previous.size_bytes);
                     self.total_bytes = self.total_bytes.saturating_add(entry.size_bytes);
                     *previous = *entry;
@@ -586,23 +864,18 @@ impl HistoryService {
 
     pub(crate) fn apply_editor_record_plan(
         &mut self,
-        plan: HistoryRecordPlan,
+        mut plan: HistoryRecordPlan,
         canonical: &EditorDocumentV1,
     ) {
-        let net_zero_merge = matches!(
-            &plan,
-            HistoryRecordPlan::Merge(entry)
-                if matches!(
-                    &entry.before,
-                    HistorySnapshot::Editor {
-                        changed_fields,
-                        before,
-                    } if canonical.patch_for_fields(changed_fields) == *before
-                )
-        );
-        if net_zero_merge {
+        let remove_entry = match &mut plan {
+            HistoryRecordPlan::Merge { entry, .. } => {
+                remove_net_zero_editor_snapshot(entry, canonical)
+            }
+            _ => false,
+        };
+        if remove_entry {
             self.clear_future();
-            self.pop_past();
+            self.remove_merge_target(&plan);
             self.advance_revision();
             self.enforce_budget();
             return;
@@ -612,20 +885,18 @@ impl HistoryService {
 
     pub(crate) fn apply_plugin_elements_record_plan(
         &mut self,
-        plan: HistoryRecordPlan,
+        mut plan: HistoryRecordPlan,
         canonical: &PluginElementsHistorySnapshot,
     ) {
-        let net_zero_merge = matches!(
-            &plan,
-            HistoryRecordPlan::Merge(entry)
-                if matches!(
-                    &entry.before,
-                    HistorySnapshot::PluginElements(before) if before == canonical
-                )
-        );
-        if net_zero_merge {
+        let remove_entry = match &mut plan {
+            HistoryRecordPlan::Merge { entry, .. } => {
+                remove_net_zero_plugin_snapshot(entry, canonical)
+            }
+            _ => false,
+        };
+        if remove_entry {
             self.clear_future();
-            self.pop_past();
+            self.remove_merge_target(&plan);
             self.advance_revision();
             self.enforce_budget();
             return;
@@ -730,6 +1001,34 @@ impl HistoryService {
         Some(entry)
     }
 
+    fn remove_merge_target(&mut self, plan: &HistoryRecordPlan) {
+        let HistoryRecordPlan::Merge {
+            target_access_sequence,
+            remove_access_sequences,
+            ..
+        } = plan
+        else {
+            return;
+        };
+        for access_sequence in remove_access_sequences {
+            self.remove_past_by_access_sequence(*access_sequence);
+        }
+        self.remove_past_by_access_sequence(*target_access_sequence);
+    }
+
+    fn remove_past_by_access_sequence(&mut self, target_access_sequence: u64) {
+        let Some(index) = self
+            .past
+            .iter()
+            .position(|entry| entry.access_sequence == target_access_sequence)
+        else {
+            return;
+        };
+        if let Some(entry) = self.past.remove(index) {
+            self.total_bytes = self.total_bytes.saturating_sub(entry.size_bytes);
+        }
+    }
+
     fn clear_past(&mut self) {
         self.past.clear();
         self.recalculate_total_bytes();
@@ -1015,6 +1314,306 @@ mod tests {
         }
     }
 
+    fn plugin_snapshot(plugin_id: &str) -> PluginElementsHistorySnapshot {
+        PluginElementsHistorySnapshot {
+            plugin_id: plugin_id.to_string(),
+            instances: None,
+        }
+    }
+
+    #[test]
+    fn shared_gesture_merges_editor_and_plugins_into_one_compound_entry() {
+        let mut history = HistoryService::default();
+        let gesture_id = uuid::Uuid::new_v4().to_string();
+
+        let editor = history
+            .prepare_entry(
+                vec![EditorField::Keys],
+                patch("before"),
+                Some(gesture_id.clone()),
+            )
+            .unwrap();
+        history.apply_record_plan(editor);
+        for plugin_id in ["plugin-a", "plugin-b"] {
+            let plugin = history
+                .prepare_plugin_elements_entry(plugin_snapshot(plugin_id), Some(gesture_id.clone()))
+                .unwrap();
+            history.apply_record_plan(plugin);
+        }
+
+        assert_eq!(history.past.len(), 1);
+        let entry = history.past.back().unwrap();
+        assert_eq!(entry.scope, HistoryScope::Compound);
+        let HistorySnapshot::Compound { snapshots } = &entry.before else {
+            panic!("shared gesture must produce a compound snapshot");
+        };
+        assert_eq!(snapshots.len(), 3);
+        assert!(matches!(snapshots[0], HistorySnapshot::Editor { .. }));
+        assert!(matches!(
+            &snapshots[1],
+            HistorySnapshot::PluginElements(snapshot) if snapshot.plugin_id == "plugin-a"
+        ));
+        assert!(matches!(
+            &snapshots[2],
+            HistorySnapshot::PluginElements(snapshot) if snapshot.plugin_id == "plugin-b"
+        ));
+        assert_eq!(history.history_revision(), 1);
+    }
+
+    #[test]
+    fn delayed_shared_gesture_merges_in_place_without_reordering_later_entry() {
+        let mut history = HistoryService::default();
+        let gesture_id = uuid::Uuid::new_v4().to_string();
+        let editor = history
+            .prepare_entry(
+                vec![EditorField::Keys],
+                patch("before"),
+                Some(gesture_id.clone()),
+            )
+            .unwrap();
+        history.apply_record_plan(editor);
+
+        let later = history
+            .prepare_plugin_elements_entry(plugin_snapshot("later-plugin"), None)
+            .unwrap();
+        history.apply_record_plan(later);
+        let delayed = history
+            .prepare_plugin_elements_entry(plugin_snapshot("shared-plugin"), Some(gesture_id))
+            .unwrap();
+        history.apply_record_plan(delayed);
+
+        assert_eq!(history.past.len(), 2);
+        assert!(matches!(
+            history.past.front().map(|entry| &entry.before),
+            Some(HistorySnapshot::Compound { snapshots }) if snapshots.len() == 2
+        ));
+        assert!(matches!(
+            history.past.back().map(|entry| &entry.before),
+            Some(HistorySnapshot::PluginElements(snapshot))
+                if snapshot.plugin_id == "later-plugin"
+        ));
+        assert_eq!(history.history_revision(), 2);
+    }
+
+    #[test]
+    fn repeated_editor_gesture_does_not_merge_across_an_intervening_entry() {
+        let mut history = HistoryService::default();
+        let gesture_id = uuid::Uuid::new_v4().to_string();
+        let first = history
+            .prepare_entry(
+                vec![EditorField::Keys],
+                patch("first"),
+                Some(gesture_id.clone()),
+            )
+            .unwrap();
+        history.apply_record_plan(first);
+        let intervening = history
+            .prepare_plugin_elements_entry(plugin_snapshot("later-plugin"), None)
+            .unwrap();
+        history.apply_record_plan(intervening);
+
+        let repeated = history
+            .prepare_entry(vec![EditorField::Keys], patch("repeated"), Some(gesture_id))
+            .unwrap();
+        assert!(matches!(repeated, HistoryRecordPlan::Entry(_)));
+        history.apply_record_plan(repeated);
+
+        assert_eq!(history.past.len(), 3);
+        assert!(matches!(
+            history.past.back().map(|entry| &entry.before),
+            Some(HistorySnapshot::Editor { before, .. })
+                if before.keys.as_ref().unwrap()["mode"] == ["repeated"]
+        ));
+    }
+
+    #[test]
+    fn merged_editor_gesture_aliases_absorb_only_the_top_plugin_entry() {
+        let mut history = HistoryService::default();
+        let first_gesture = uuid::Uuid::new_v4().to_string();
+        let second_gesture = uuid::Uuid::new_v4().to_string();
+        for (plugin_id, gesture_id) in [
+            ("plugin-a", first_gesture.clone()),
+            ("plugin-b", second_gesture.clone()),
+        ] {
+            let plugin = history
+                .prepare_plugin_elements_entry(plugin_snapshot(plugin_id), Some(gesture_id))
+                .unwrap();
+            history.apply_record_plan(plugin);
+        }
+
+        let editor = history
+            .prepare_entry_with_gesture_ids(
+                vec![EditorField::Keys],
+                patch("before"),
+                vec![first_gesture.clone(), second_gesture.clone()],
+            )
+            .unwrap();
+        history.apply_record_plan(editor);
+
+        assert_eq!(history.past.len(), 2);
+        let first_entry = history.past.front().unwrap();
+        assert!(matches!(
+            &first_entry.before,
+            HistorySnapshot::PluginElements(snapshot) if snapshot.plugin_id == "plugin-a"
+        ));
+        assert_eq!(first_entry.gesture_ids, vec![first_gesture.clone()]);
+
+        let top = history.past.back().unwrap();
+        assert_eq!(top.gesture_ids, vec![first_gesture, second_gesture]);
+        let HistorySnapshot::Compound { snapshots } = &top.before else {
+            panic!("top history entry must be compound");
+        };
+        assert!(matches!(
+            snapshots.as_slice(),
+            [
+                HistorySnapshot::PluginElements(plugin),
+                HistorySnapshot::Editor { before, .. }
+            ] if plugin.plugin_id == "plugin-b"
+                && before.keys.as_ref().unwrap()["mode"] == ["before"]
+        ));
+    }
+
+    #[test]
+    fn multi_alias_editor_stays_above_a_later_editor_entry() {
+        let mut history = HistoryService::default();
+        let first_gesture = uuid::Uuid::new_v4().to_string();
+        let second_gesture = uuid::Uuid::new_v4().to_string();
+        for (plugin_id, gesture_id) in [
+            ("plugin-a", first_gesture.clone()),
+            ("plugin-b", second_gesture.clone()),
+        ] {
+            let plugin = history
+                .prepare_plugin_elements_entry(plugin_snapshot(plugin_id), Some(gesture_id))
+                .unwrap();
+            history.apply_record_plan(plugin);
+        }
+
+        let intervening_gesture = uuid::Uuid::new_v4().to_string();
+        let intervening_editor = history
+            .prepare_entry(
+                vec![EditorField::Keys],
+                patch("before-intervening-editor"),
+                Some(intervening_gesture.clone()),
+            )
+            .unwrap();
+        history.apply_record_plan(intervening_editor);
+
+        let latest_editor = history
+            .prepare_entry_with_gesture_ids(
+                vec![EditorField::Keys],
+                patch("after-intervening-editor"),
+                vec![first_gesture.clone(), second_gesture.clone()],
+            )
+            .unwrap();
+        assert!(matches!(latest_editor, HistoryRecordPlan::Entry(_)));
+        history.apply_record_plan(latest_editor);
+
+        assert_eq!(history.past.len(), 4);
+        let mut undo_order = history.past.iter().rev();
+        let latest = undo_order.next().unwrap();
+        assert_eq!(latest.gesture_ids, vec![first_gesture, second_gesture]);
+        assert!(matches!(
+            &latest.before,
+            HistorySnapshot::Editor { before, .. }
+                if before.keys.as_ref().unwrap()["mode"] == ["after-intervening-editor"]
+        ));
+
+        let intervening = undo_order.next().unwrap();
+        assert_eq!(intervening.gesture_ids, vec![intervening_gesture]);
+        assert!(matches!(
+            &intervening.before,
+            HistorySnapshot::Editor { before, .. }
+                if before.keys.as_ref().unwrap()["mode"] == ["before-intervening-editor"]
+        ));
+    }
+
+    #[test]
+    fn delayed_net_zero_merge_removes_only_its_original_entry() {
+        let mut history = HistoryService::default();
+        let gesture_id = uuid::Uuid::new_v4().to_string();
+        let original = plugin_snapshot("shared-plugin");
+        let first = history
+            .prepare_plugin_elements_entry(original.clone(), Some(gesture_id.clone()))
+            .unwrap();
+        history.apply_record_plan(first);
+        let later = history
+            .prepare_plugin_elements_entry(plugin_snapshot("later-plugin"), None)
+            .unwrap();
+        history.apply_record_plan(later);
+
+        let back_to_original = history
+            .prepare_plugin_elements_entry(original.clone(), Some(gesture_id))
+            .unwrap();
+        history.apply_plugin_elements_record_plan(back_to_original, &original);
+
+        assert_eq!(history.past.len(), 1);
+        assert!(matches!(
+            history.past.back().map(|entry| &entry.before),
+            Some(HistorySnapshot::PluginElements(snapshot))
+                if snapshot.plugin_id == "later-plugin"
+        ));
+    }
+
+    #[test]
+    fn compound_entry_counts_as_one_budget_slot() {
+        let mut history = HistoryService::with_limits(8 * 1024 * 1024, 32 * 1024 * 1024, 1);
+        let gesture_id = uuid::Uuid::new_v4().to_string();
+        let editor = history
+            .prepare_entry(
+                vec![EditorField::Keys],
+                patch("before"),
+                Some(gesture_id.clone()),
+            )
+            .unwrap();
+        history.apply_record_plan(editor);
+        let plugin = history
+            .prepare_plugin_elements_entry(plugin_snapshot("plugin-a"), Some(gesture_id))
+            .unwrap();
+        history.apply_record_plan(plugin);
+
+        assert_eq!(history.past.len(), 1);
+        assert!(history.status(false).can_undo);
+    }
+
+    #[test]
+    fn compound_merge_honors_combined_entry_size_limit() {
+        let gesture_id = uuid::Uuid::new_v4().to_string();
+        let mut probe = HistoryService::default();
+        let editor = probe
+            .prepare_entry(
+                vec![EditorField::Keys],
+                patch("before"),
+                Some(gesture_id.clone()),
+            )
+            .unwrap();
+        probe.apply_record_plan(editor);
+        let compound = probe
+            .prepare_plugin_elements_entry(plugin_snapshot("plugin-a"), Some(gesture_id.clone()))
+            .unwrap();
+        let HistoryRecordPlan::Merge {
+            entry: compound, ..
+        } = compound
+        else {
+            panic!("shared gesture must prepare a compound merge");
+        };
+        let limit = compound.size_bytes - 1;
+
+        let mut history = HistoryService::with_limits(limit, 32 * 1024 * 1024, 50);
+        let editor = history
+            .prepare_entry(
+                vec![EditorField::Keys],
+                patch("before"),
+                Some(gesture_id.clone()),
+            )
+            .unwrap();
+        assert!(matches!(editor, HistoryRecordPlan::Entry(_)));
+        history.apply_record_plan(editor);
+        let oversized = history
+            .prepare_plugin_elements_entry(plugin_snapshot("plugin-a"), Some(gesture_id))
+            .unwrap();
+        assert!(matches!(oversized, HistoryRecordPlan::Truncate));
+    }
+
     #[test]
     fn oversized_entry_truncates_both_stacks_atomically() {
         let mut history = HistoryService::with_limits(200, 1_000, 50);
diff --git a/src-tauri/src/state/mod.rs b/src-tauri/src/state/mod.rs
index bada1fa3..58bf0500 100644
--- a/src-tauri/src/state/mod.rs
+++ b/src-tauri/src/state/mod.rs
@@ -2,6 +2,7 @@ pub mod app_state;
 pub(crate) mod atomic_file;
 pub(crate) mod builtin_sounds;
 pub(crate) mod editor;
+pub(crate) mod gesture;
 pub(crate) mod history;
 pub(crate) mod local_asset_path;
 #[cfg(target_os = "macos")]
diff --git a/src-tauri/src/state/plugin.rs b/src-tauri/src/state/plugin.rs
index 0cbd401f..0afc5c18 100644
--- a/src-tauri/src/state/plugin.rs
+++ b/src-tauri/src/state/plugin.rs
@@ -357,6 +357,14 @@ pub(crate) fn validate_saved_plugin_instances(
                 return Err(format!("INVALID_PLUGIN_INSTANCE_SIZE:{index}"));
             }
         }
+        if instance.z_index.is_some_and(|z_index| {
+            !z_index.is_finite()
+                || z_index.fract() != 0.0
+                || z_index < f64::from(i32::MIN)
+                || z_index > f64::from(i32::MAX)
+        }) {
+            return Err(format!("INVALID_PLUGIN_INSTANCE_Z_INDEX:{index}"));
+        }
         if instance
             .tab_id
             .as_deref()
@@ -664,10 +672,43 @@ mod tests {
             settings: None,
             measured_size: None,
             tab_id: Some("4key".to_string()),
+            hidden: false,
+            z_index: None,
         };
         validate_saved_plugin_instances(&[valid]).unwrap();
     }
 
+    #[test]
+    fn saved_instance_wire_defaults_legacy_visibility_and_z_index() {
+        let instance = serde_json::from_value::<SavedPluginInstance>(serde_json::json!({
+            "position": { "x": 1.0, "y": 2.0 },
+            "tabId": "4key"
+        }))
+        .unwrap();
+
+        assert!(!instance.hidden);
+        assert_eq!(instance.z_index, None);
+    }
+
+    #[test]
+    fn saved_instance_wire_rejects_invalid_z_indexes() {
+        for z_index in [1.5, f64::from(i32::MAX) + 1.0, f64::NAN] {
+            let instance = SavedPluginInstance {
+                position: PluginPoint { x: 1.0, y: 2.0 },
+                settings: None,
+                measured_size: None,
+                tab_id: Some("4key".to_string()),
+                hidden: false,
+                z_index: Some(z_index),
+            };
+
+            assert_eq!(
+                validate_saved_plugin_instances(&[instance]).unwrap_err(),
+                "INVALID_PLUGIN_INSTANCE_Z_INDEX:0"
+            );
+        }
+    }
+
     #[test]
     fn plugin_instances_request_enforces_compact_size_limit() {
         let mut settings = BTreeMap::new();
@@ -680,6 +721,8 @@ mod tests {
             settings: Some(settings),
             measured_size: None,
             tab_id: Some("4key".to_string()),
+            hidden: false,
+            z_index: None,
         };
         let request = PluginInstancesCommitRequest {
             plugin_id: "demo".to_string(),
diff --git a/src-tauri/src/state/store.rs b/src-tauri/src/state/store.rs
index faf26c54..11d088b9 100644
--- a/src-tauri/src/state/store.rs
+++ b/src-tauri/src/state/store.rs
@@ -11,9 +11,10 @@ use crate::errors::{EditorCommitError, EditorCommitErrorCode};
 use crate::models::{
     AppStoreData, CommittedEditorChange, CustomCssPatch, CustomJsPatch, EditorCommitOrigin,
     EditorCommitRequest, EditorCommitResult, EditorCommittedV1, EditorDocumentV1, EditorField,
-    EditorGetResult, EditorTransactionResult, FontType, HistoryStatus, KeyCounters, KeyPosition,
-    NoteSettingsPatch, PluginInstancesCommitRequest, PluginInstancesReconcileRequest,
-    SavedPluginInstance, SettingsDiff, SettingsPatchInput, SettingsState, EDITOR_SCHEMA_VERSION,
+    EditorGetResult, EditorTransactionResult, FontType, GestureCommitRequest, GestureCommitResult,
+    HistoryStatus, KeyCounters, KeyPosition, NoteSettingsPatch, PluginInstancesCommitRequest,
+    PluginInstancesReconcileRequest, SavedPluginInstance, SettingsDiff, SettingsPatchInput,
+    SettingsState, EDITOR_SCHEMA_VERSION,
 };
 use anyhow::{anyhow, Context, Result};
 use parking_lot::{Mutex, RwLock, RwLockWriteGuard};
@@ -24,11 +25,12 @@ use tauri::Runtime;
 use super::atomic_file::atomic_replace;
 use super::builtin_sounds::seed_builtin_sounds;
 use super::editor::{
-    next_revision, repair_selected_mode, request_fingerprint, request_payload_size,
-    sync_key_counters, touched_pair, validate_document_transition,
+    canonical_request_fingerprint, next_revision, repair_selected_mode, request_fingerprint,
+    request_payload_size, sync_key_counters, touched_pair, validate_document_transition,
     validate_history_restore_metadata, validate_paired_update, validate_request_envelope,
     RequestFingerprint, MUTATION_ACK_CAPACITY,
 };
+use super::gesture::validate_gesture_commit_request;
 use super::history::{
     CustomTabsHistorySnapshot, HistoryAdmissionGate, HistoryAdmissionLease, HistoryDirection,
     HistoryEntry, HistoryRecordPlan, HistoryScope, HistoryService, HistorySnapshot,
@@ -85,6 +87,7 @@ struct VersionedStoreState {
     dirty: bool,
     accepting_writes: bool,
     mutation_acks: VecDeque<MutationAck>,
+    gesture_mutation_acks: VecDeque<GestureMutationAck>,
     plugin_model_revision: u64,
     history: HistoryService,
 }
@@ -115,6 +118,10 @@ pub(crate) enum HistoryAuxChange {
         plugin_id: String,
         revision: u64,
     },
+    PluginElementsBatch {
+        plugin_ids: Vec<String>,
+        revision: u64,
+    },
 }
 
 #[derive(Debug)]
@@ -131,6 +138,21 @@ pub(crate) struct AdmittedPluginInstancesCommit {
     _admission: HistoryAdmissionLease,
 }
 
+#[derive(Debug)]
+pub(crate) struct GestureCommitOutcome {
+    pub(crate) result: GestureCommitResult,
+    pub(crate) change: Option<CommittedEditorChange>,
+    pub(crate) changed_plugin_ids: Vec<String>,
+    pub(crate) history_status: Option<HistoryStatus>,
+    pub(crate) replayed: bool,
+}
+
+#[derive(Debug)]
+pub(crate) struct AdmittedGestureCommit {
+    pub(crate) outcome: GestureCommitOutcome,
+    _admission: HistoryAdmissionLease,
+}
+
 #[derive(Debug)]
 pub(crate) struct AdmittedPluginStorageMutation<T> {
     pub(crate) value: T,
@@ -166,6 +188,13 @@ struct MutationAck {
     result: EditorCommitResult,
 }
 
+#[derive(Clone)]
+struct GestureMutationAck {
+    id: String,
+    fingerprint: RequestFingerprint,
+    result: GestureCommitResult,
+}
+
 struct PluginInstancesMutationInput {
     plugin_id: String,
     instances: Vec<SavedPluginInstance>,
@@ -175,6 +204,7 @@ struct PluginInstancesMutationInput {
 struct EditorPatchCommitOptions {
     mutation_id: String,
     gesture_id: Option<String>,
+    gesture_ids: Vec<String>,
     origin: EditorCommitOrigin,
     record_history: bool,
     apply_key_side_effects: bool,
@@ -317,6 +347,7 @@ impl AppStore {
                 dirty: false,
                 accepting_writes: true,
                 mutation_acks: VecDeque::with_capacity(MUTATION_ACK_CAPACITY),
+                gesture_mutation_acks: VecDeque::with_capacity(MUTATION_ACK_CAPACITY),
                 plugin_model_revision: 0,
                 history: HistoryService::default(),
             }),
@@ -489,6 +520,7 @@ impl AppStore {
                 return Err("HISTORY_SCOPE_MISMATCH".to_string());
             }
             let target_gesture_id = target.gesture_id.clone();
+            let target_gesture_ids = target.gesture_ids.clone();
 
             let current_store = guard.data.clone();
             let origin = match direction {
@@ -515,6 +547,7 @@ impl AppStore {
                             EditorPatchCommitOptions {
                                 mutation_id: operation_id.to_string(),
                                 gesture_id: None,
+                                gesture_ids: Vec::new(),
                                 origin,
                                 record_history: false,
                                 apply_key_side_effects: false,
@@ -643,6 +676,51 @@ impl AppStore {
                         }),
                     )
                 }
+                HistorySnapshot::Compound { snapshots } => {
+                    let current = EditorDocumentV1::from_store(&current_store);
+                    let mut opposite_snapshots = Vec::with_capacity(snapshots.len());
+                    for snapshot in &snapshots {
+                        match snapshot {
+                            HistorySnapshot::Editor { changed_fields, .. } => {
+                                opposite_snapshots.push(HistorySnapshot::Editor {
+                                    changed_fields: changed_fields.clone(),
+                                    before: current.patch_for_fields(changed_fields),
+                                });
+                            }
+                            HistorySnapshot::PluginElements(before) => {
+                                opposite_snapshots.push(HistorySnapshot::PluginElements(
+                                    plugin_elements_snapshot(&current_store, &before.plugin_id)?,
+                                ));
+                            }
+                            _ => {
+                                return Err(
+                                    "compound history contains an unsupported snapshot".to_string()
+                                )
+                            }
+                        }
+                    }
+                    let opposite =
+                        require_history_entry(guard.history.prepare_opposite_compound_entry(
+                            opposite_snapshots,
+                            target_gesture_ids,
+                        )?)?;
+                    let (change, plugin_ids, plugin_model_revision) = self
+                        .commit_compound_history_locked(
+                            &mut guard,
+                            &snapshots,
+                            operation_id,
+                            origin,
+                        )
+                        .map_err(editor_history_error)?;
+                    (
+                        opposite,
+                        change,
+                        Some(HistoryAuxChange::PluginElementsBatch {
+                            plugin_ids,
+                            revision: plugin_model_revision,
+                        }),
+                    )
+                }
             };
 
             guard
@@ -764,6 +842,8 @@ impl AppStore {
             ));
         }
 
+        let gesture_id = request.history_gesture_id();
+        let gesture_ids = request.echoed_gesture_ids();
         let touched_fields = request.changes.included_fields();
         let change = self.commit_editor_patch_locked(
             &mut guard,
@@ -771,7 +851,8 @@ impl AppStore {
             &touched_fields,
             EditorPatchCommitOptions {
                 mutation_id: request.mutation_id.clone(),
-                gesture_id: request.gesture_id,
+                gesture_id,
+                gesture_ids,
                 origin: EditorCommitOrigin::StrictEditorCommit,
                 record_history: true,
                 apply_key_side_effects: true,
@@ -795,25 +876,8 @@ impl AppStore {
         options: EditorPatchCommitOptions,
     ) -> std::result::Result<CommittedEditorChange, EditorCommitError> {
         let current_store = guard.data.clone();
-        let current = EditorDocumentV1::from_store(&current_store);
-        let mut candidate = current.clone();
-        candidate.apply_patch(changes);
-
-        let mut scratch = current_store.clone();
-        candidate.apply_to_store(&mut scratch);
-        crate::state::migration::canonicalize_gradient_pairs(&mut scratch);
-        candidate = EditorDocumentV1::from_store(&scratch);
-
-        validate_paired_update(
-            &current,
-            &candidate,
-            touched_fields.contains(&EditorField::Keys),
-            touched_fields.contains(&EditorField::KeyPositions),
-        )?;
-        scratch.editor_revision = current_store.editor_revision;
-        validate_document_transition(&current, &candidate, &current_store, &scratch)?;
-
-        let changed_fields = current.changed_fields(&candidate);
+        let (current, candidate, mut scratch, changed_fields) =
+            prepare_editor_patch_transition(&current_store, changes, touched_fields)?;
         if options.enforce_touched_fields
             && changed_fields
                 .iter()
@@ -843,10 +907,10 @@ impl AppStore {
         let history_plan = options
             .record_history
             .then(|| {
-                guard.history.prepare_entry(
+                guard.history.prepare_entry_with_gesture_ids(
                     changed_fields.clone(),
                     current.patch_for_fields(&changed_fields),
-                    options.gesture_id.clone(),
+                    options.gesture_ids.clone(),
                 )
             })
             .transpose()
@@ -875,6 +939,7 @@ impl AppStore {
             revision,
             mutation_id: options.mutation_id,
             gesture_id: options.gesture_id,
+            gesture_ids: options.gesture_ids,
             origin,
             changed_fields: changed_fields.clone(),
             patch: candidate.patch_for_fields(&changed_fields),
@@ -895,6 +960,350 @@ impl AppStore {
         })
     }
 
+    #[cfg(test)]
+    pub(crate) fn commit_gesture(
+        &self,
+        request: GestureCommitRequest,
+    ) -> std::result::Result<AdmittedGestureCommit, EditorCommitError> {
+        let admission = self.admit_editor_mutation()?;
+        self.commit_gesture_with_admission(request, admission)
+    }
+
+    pub(crate) fn commit_gesture_with_admission(
+        &self,
+        request: GestureCommitRequest,
+        admission: HistoryAdmissionLease,
+    ) -> std::result::Result<AdmittedGestureCommit, EditorCommitError> {
+        validate_gesture_commit_request(&request)?;
+        let outcome = self.commit_gesture_admitted(request, &admission)?;
+        Ok(AdmittedGestureCommit {
+            outcome,
+            _admission: admission,
+        })
+    }
+
+    fn commit_gesture_admitted(
+        &self,
+        request: GestureCommitRequest,
+        admission: &HistoryAdmissionLease,
+    ) -> std::result::Result<GestureCommitOutcome, EditorCommitError> {
+        let fingerprint = canonical_request_fingerprint(&request)?;
+        let mut guard = self
+            .lock_for_update()
+            .map_err(|error| EditorCommitError::io(error.to_string()))?;
+        admission
+            .revalidate_for(&self.history_gate)
+            .map_err(|_| EditorCommitError::history_in_progress())?;
+
+        if let Some(ack) = guard
+            .gesture_mutation_acks
+            .iter()
+            .find(|ack| ack.id == request.mutation_id)
+        {
+            if ack.fingerprint != fingerprint {
+                return Err(EditorCommitError::mutation_id_reused());
+            }
+            return Ok(GestureCommitOutcome {
+                result: ack.result.clone(),
+                change: None,
+                changed_plugin_ids: Vec::new(),
+                history_status: None,
+                replayed: true,
+            });
+        }
+
+        validate_observed_history_epoch(&guard.history, request.observed_history_epoch)?;
+        if request.editor_base_revision != guard.data.editor_revision {
+            return Err(EditorCommitError::revision_conflict(
+                guard.data.editor_revision,
+            ));
+        }
+        if request.plugin_base_revision != guard.plugin_model_revision {
+            return Err(EditorCommitError::plugin_revision_conflict(
+                guard.plugin_model_revision,
+            ));
+        }
+
+        let current_store = guard.data.clone();
+        let (current_editor, candidate_editor, mut scratch, changed_fields) =
+            if let Some(changes) = request.editor_changes.as_ref() {
+                let touched_fields = changes.included_fields();
+                prepare_editor_patch_transition(&current_store, changes, &touched_fields)?
+            } else {
+                let current = EditorDocumentV1::from_store(&current_store);
+                (current.clone(), current, current_store.clone(), Vec::new())
+            };
+
+        let mut history_snapshots = Vec::with_capacity(request.plugin_changes.len() + 1);
+        if !changed_fields.is_empty() {
+            history_snapshots.push(HistorySnapshot::Editor {
+                changed_fields: changed_fields.clone(),
+                before: current_editor.patch_for_fields(&changed_fields),
+            });
+        }
+
+        let mut changed_plugin_ids = Vec::new();
+        for plugin_change in &request.plugin_changes {
+            let current_snapshot =
+                plugin_elements_snapshot(&current_store, &plugin_change.plugin_id).map_err(
+                    |error| EditorCommitError::validation("INVALID_GESTURE_PLUGIN", error),
+                )?;
+            let canonical = PluginElementsHistorySnapshot {
+                plugin_id: plugin_change.plugin_id.clone(),
+                instances: (!plugin_change.instances.is_empty())
+                    .then_some(plugin_change.instances.clone()),
+            };
+            if current_snapshot == canonical {
+                continue;
+            }
+            apply_plugin_elements_snapshot(&mut scratch, &canonical)
+                .map_err(|error| EditorCommitError::validation("INVALID_GESTURE_PLUGIN", error))?;
+            history_snapshots.push(HistorySnapshot::PluginElements(current_snapshot));
+            changed_plugin_ids.push(plugin_change.plugin_id.clone());
+        }
+
+        let editor_revision = if changed_fields.is_empty() {
+            current_store.editor_revision
+        } else {
+            let revision = next_revision(current_store.editor_revision)?;
+            if changed_fields.contains(&EditorField::Keys) {
+                sync_key_counters(&mut scratch.key_counters, &candidate_editor.keys);
+                repair_selected_mode(&mut scratch);
+            }
+            scratch.editor_revision = revision;
+            revision
+        };
+        let plugin_model_revision = if changed_plugin_ids.is_empty() {
+            guard.plugin_model_revision
+        } else {
+            next_plugin_model_revision(guard.plugin_model_revision).map_err(|error| {
+                EditorCommitError::validation("PLUGIN_MODEL_REVISION_OUT_OF_RANGE", error)
+            })?
+        };
+        let result = GestureCommitResult {
+            editor_revision,
+            changed_fields: changed_fields.clone(),
+            plugin_model_revision,
+            changed_plugin_ids: changed_plugin_ids.clone(),
+            authority_generation: request.authority_generation,
+        };
+
+        if history_snapshots.is_empty() {
+            insert_gesture_mutation_ack(
+                &mut guard.gesture_mutation_acks,
+                request.mutation_id,
+                fingerprint,
+                result.clone(),
+            );
+            return Ok(GestureCommitOutcome {
+                result,
+                change: None,
+                changed_plugin_ids: Vec::new(),
+                history_status: None,
+                replayed: false,
+            });
+        }
+
+        let history_plan = guard
+            .history
+            .prepare_gesture_entry(history_snapshots, request.gesture_id.clone())
+            .map_err(|error| {
+                EditorCommitError::validation("HISTORY_SERIALIZATION_FAILED", error)
+            })?;
+        if matches!(history_plan, HistoryRecordPlan::Truncate) {
+            return Err(EditorCommitError::validation(
+                HISTORY_ENTRY_TOO_LARGE,
+                "gesture history entry exceeds the size limit",
+            ));
+        }
+
+        let selected_key_type = scratch.selected_key_type.clone();
+        let key_counters = scratch.key_counters.clone();
+        self.commit_locked(&mut guard, scratch, ())
+            .map_err(|error| EditorCommitError::io(error.to_string()))?;
+        guard.plugin_model_revision = plugin_model_revision;
+        guard.history.apply_record_plan(history_plan);
+        let history_status = Some(guard.history.issue_status(self.history_gate.is_closed()));
+
+        let change = (!changed_fields.is_empty()).then(|| CommittedEditorChange {
+            result: EditorCommitResult {
+                revision: editor_revision,
+                changed_fields: changed_fields.clone(),
+            },
+            event: Some(EditorCommittedV1 {
+                schema_version: EDITOR_SCHEMA_VERSION,
+                revision: editor_revision,
+                mutation_id: request.mutation_id.clone(),
+                gesture_id: Some(request.gesture_id.clone()),
+                gesture_ids: vec![request.gesture_id],
+                origin: EditorCommitOrigin::GestureCommit
+                    .event_name()
+                    .expect("gesture commits publish editor events"),
+                changed_fields: changed_fields.clone(),
+                patch: candidate_editor.patch_for_fields(&changed_fields),
+            }),
+            replayed: false,
+            document: candidate_editor,
+            selected_key_type,
+            key_counters,
+            history_status: None,
+            runtime_publication_generation: guard.revision,
+        });
+
+        insert_gesture_mutation_ack(
+            &mut guard.gesture_mutation_acks,
+            request.mutation_id,
+            fingerprint,
+            result.clone(),
+        );
+        Ok(GestureCommitOutcome {
+            result,
+            change,
+            changed_plugin_ids,
+            history_status,
+            replayed: false,
+        })
+    }
+
+    fn commit_compound_history_locked(
+        &self,
+        guard: &mut VersionedStoreState,
+        snapshots: &[HistorySnapshot],
+        operation_id: &str,
+        origin: EditorCommitOrigin,
+    ) -> std::result::Result<(Option<CommittedEditorChange>, Vec<String>, u64), EditorCommitError>
+    {
+        let current_store = guard.data.clone();
+        let mut editor_target = None;
+        let mut plugin_targets = Vec::new();
+        let mut seen_plugin_ids = HashSet::new();
+
+        for snapshot in snapshots {
+            match snapshot {
+                HistorySnapshot::Editor {
+                    changed_fields,
+                    before,
+                } => {
+                    if editor_target.is_some() {
+                        return Err(EditorCommitError::validation(
+                            "HISTORY_COMPOUND_INVALID",
+                            "compound history contains duplicate editor snapshots",
+                        ));
+                    }
+                    editor_target = Some((changed_fields, before));
+                }
+                HistorySnapshot::PluginElements(target) => {
+                    if !seen_plugin_ids.insert(target.plugin_id.as_str()) {
+                        return Err(EditorCommitError::validation(
+                            "HISTORY_COMPOUND_INVALID",
+                            "compound history contains duplicate plugin snapshots",
+                        ));
+                    }
+                    plugin_targets.push(target);
+                }
+                _ => {
+                    return Err(EditorCommitError::validation(
+                        "HISTORY_COMPOUND_INVALID",
+                        "compound history contains an unsupported snapshot",
+                    ))
+                }
+            }
+        }
+
+        let (mut scratch, editor_restore) = if let Some((changed_fields, before)) = editor_target {
+            let (_, candidate, next_store, actual_fields) =
+                prepare_editor_patch_transition(&current_store, before, changed_fields)?;
+            if actual_fields
+                .iter()
+                .any(|field| !changed_fields.contains(field))
+            {
+                return Err(EditorCommitError::validation(
+                    "HISTORY_RESTORE_CHANGED_UNDECLARED_FIELD",
+                    "history restore changed an editor field outside its entry",
+                ));
+            }
+            (next_store, Some((candidate, actual_fields)))
+        } else {
+            (current_store.clone(), None)
+        };
+        let mut plugin_ids = Vec::new();
+        for target in plugin_targets {
+            let current =
+                plugin_elements_snapshot(&current_store, &target.plugin_id).map_err(|error| {
+                    EditorCommitError::validation("HISTORY_COMPOUND_INVALID", error)
+                })?;
+            if current == *target {
+                continue;
+            }
+            apply_plugin_elements_snapshot(&mut scratch, target).map_err(|error| {
+                EditorCommitError::validation("HISTORY_COMPOUND_INVALID", error)
+            })?;
+            plugin_ids.push(target.plugin_id.clone());
+        }
+
+        let editor_changed = editor_restore
+            .as_ref()
+            .is_some_and(|(_, changed_fields)| !changed_fields.is_empty());
+        if !editor_changed && plugin_ids.is_empty() {
+            return Err(EditorCommitError::validation(
+                "HISTORY_TARGET_ALREADY_APPLIED",
+                "history target is already applied",
+            ));
+        }
+
+        let editor_revision = if editor_changed {
+            let revision = next_revision(current_store.editor_revision)?;
+            scratch.editor_revision = revision;
+            revision
+        } else {
+            current_store.editor_revision
+        };
+        let plugin_model_revision = if plugin_ids.is_empty() {
+            guard.plugin_model_revision
+        } else {
+            next_plugin_model_revision(guard.plugin_model_revision).map_err(|error| {
+                EditorCommitError::validation("PLUGIN_MODEL_REVISION_OUT_OF_RANGE", error)
+            })?
+        };
+        let selected_key_type = scratch.selected_key_type.clone();
+        let key_counters = scratch.key_counters.clone();
+
+        self.commit_locked(guard, scratch, ())
+            .map_err(|error| EditorCommitError::io(error.to_string()))?;
+        guard.plugin_model_revision = plugin_model_revision;
+
+        let change = editor_restore.and_then(|(candidate, changed_fields)| {
+            if changed_fields.is_empty() {
+                return None;
+            }
+            let event = origin.event_name().map(|origin| EditorCommittedV1 {
+                schema_version: EDITOR_SCHEMA_VERSION,
+                revision: editor_revision,
+                mutation_id: operation_id.to_string(),
+                gesture_id: None,
+                gesture_ids: Vec::new(),
+                origin,
+                changed_fields: changed_fields.clone(),
+                patch: candidate.patch_for_fields(&changed_fields),
+            });
+            Some(CommittedEditorChange {
+                result: EditorCommitResult {
+                    revision: editor_revision,
+                    changed_fields,
+                },
+                event,
+                replayed: false,
+                document: candidate,
+                selected_key_type,
+                key_counters,
+                history_status: None,
+                runtime_publication_generation: guard.revision,
+            })
+        });
+
+        Ok((change, plugin_ids, plugin_model_revision))
+    }
+
     fn commit_custom_tabs_history_locked(
         &self,
         guard: &mut VersionedStoreState,
@@ -949,6 +1358,7 @@ impl AppStore {
             revision,
             mutation_id: operation_id.to_string(),
             gesture_id: None,
+            gesture_ids: Vec::new(),
             origin,
             changed_fields: changed_fields.clone(),
             patch: candidate.patch_for_fields(&changed_fields),
@@ -1020,6 +1430,7 @@ impl AppStore {
             revision,
             mutation_id: operation_id.to_string(),
             gesture_id: None,
+            gesture_ids: Vec::new(),
             origin,
             changed_fields: changed_fields.clone(),
             patch: candidate.patch_for_fields(&changed_fields),
@@ -1294,6 +1705,7 @@ impl AppStore {
                 revision,
                 mutation_id: uuid::Uuid::new_v4().to_string(),
                 gesture_id: None,
+                gesture_ids: Vec::new(),
                 origin,
                 changed_fields: changed_fields.clone(),
                 patch: candidate.patch_for_fields(&changed_fields),
@@ -2213,7 +2625,10 @@ fn ensure_generic_editor_unchanged(before: &AppStoreData, after: &AppStoreData)
 fn editor_error_outcome(code: EditorCommitErrorCode) -> &'static str {
     match code {
         EditorCommitErrorCode::RevisionConflict => "revision_conflict",
+        EditorCommitErrorCode::PluginRevisionConflict => "plugin_revision_conflict",
         EditorCommitErrorCode::ValidationFailed => "validation_failed",
+        EditorCommitErrorCode::TooManyGestureIds => "too_many_gesture_ids",
+        EditorCommitErrorCode::InvalidGestureId => "invalid_gesture_id",
         EditorCommitErrorCode::PairedUpdateRequired => "paired_update_required",
         EditorCommitErrorCode::MutationIdReused => "mutation_id_reused",
         EditorCommitErrorCode::HistoryInProgress => "history_in_progress",
@@ -2222,10 +2637,45 @@ fn editor_error_outcome(code: EditorCommitErrorCode) -> &'static str {
     }
 }
 
+fn prepare_editor_patch_transition(
+    current_store: &AppStoreData,
+    changes: &crate::models::EditorPatchV1,
+    touched_fields: &[EditorField],
+) -> std::result::Result<
+    (
+        EditorDocumentV1,
+        EditorDocumentV1,
+        AppStoreData,
+        Vec<EditorField>,
+    ),
+    EditorCommitError,
+> {
+    let current = EditorDocumentV1::from_store(current_store);
+    let mut candidate = current.clone();
+    candidate.apply_patch(changes);
+
+    let mut scratch = current_store.clone();
+    candidate.apply_to_store(&mut scratch);
+    crate::state::migration::canonicalize_gradient_pairs(&mut scratch);
+    candidate = EditorDocumentV1::from_store(&scratch);
+
+    validate_paired_update(
+        &current,
+        &candidate,
+        touched_fields.contains(&EditorField::Keys),
+        touched_fields.contains(&EditorField::KeyPositions),
+    )?;
+    scratch.editor_revision = current_store.editor_revision;
+    validate_document_transition(&current, &candidate, current_store, &scratch)?;
+    let changed_fields = current.changed_fields(&candidate);
+
+    Ok((current, candidate, scratch, changed_fields))
+}
+
 fn require_history_entry(plan: HistoryRecordPlan) -> Result<HistoryEntry, String> {
     match plan {
         HistoryRecordPlan::Entry(entry) => Ok(*entry),
-        HistoryRecordPlan::Merge(_) => Err("HISTORY_INVALID_OPPOSITE_ENTRY".to_string()),
+        HistoryRecordPlan::Merge { .. } => Err("HISTORY_INVALID_OPPOSITE_ENTRY".to_string()),
         HistoryRecordPlan::Truncate => Err(HISTORY_ENTRY_TOO_LARGE.to_string()),
     }
 }
@@ -2376,6 +2826,22 @@ fn insert_mutation_ack(
     });
 }
 
+fn insert_gesture_mutation_ack(
+    acks: &mut VecDeque<GestureMutationAck>,
+    id: String,
+    fingerprint: RequestFingerprint,
+    result: GestureCommitResult,
+) {
+    if acks.len() == MUTATION_ACK_CAPACITY {
+        acks.pop_front();
+    }
+    acks.push_back(GestureMutationAck {
+        id,
+        fingerprint,
+        result,
+    });
+}
+
 struct AssetReferencePaths {
     keys: HashSet<String>,
     complete: bool,
@@ -3393,8 +3859,9 @@ mod tests {
         models::{
             AppStoreData, CommittedEditorChange, CustomCss, CustomFont, CustomTab,
             EditorCommitOrigin, EditorCommitRequest, EditorDocumentV1, EditorField, EditorPatchV1,
-            FontSettings, FontType, GraphPosition, GraphStatType, GraphType, JsPlugin, KeyCounters,
-            KeyPosition, KnobPosition, OverlayBounds, PanelBounds, PendingProcessedWavReplacement,
+            FontSettings, FontType, GestureCommitRequest, GesturePluginInstancesChange,
+            GraphPosition, GraphStatType, GraphType, JsPlugin, KeyCounters, KeyPosition,
+            KnobPosition, OverlayBounds, PanelBounds, PendingProcessedWavReplacement,
             PluginInstancesCommitRequest, PluginInstancesReconcileRequest, PluginPoint,
             SavedPluginInstance, SettingsPatchInput, SoundLibraryEntry, SoundSource, StatPosition,
             StatType, TabCss, TabNoteSettings,
@@ -3493,6 +3960,7 @@ mod tests {
             base_revision,
             mutation_id: mutation_id.into(),
             gesture_id: None,
+            gesture_ids: Vec::new(),
             changes,
         }
     }
@@ -3512,6 +3980,8 @@ mod tests {
             settings: None,
             measured_size: None,
             tab_id: Some("4key".to_string()),
+            hidden: false,
+            z_index: None,
         }
     }
 
@@ -3550,11 +4020,33 @@ mod tests {
         }
     }
 
-    fn legacy_editor_commit(
+    fn gesture_request(
         store: &AppStore,
-        fields: &[EditorField],
-        updater: impl FnOnce(&mut AppStoreData),
-    ) -> std::result::Result<CommittedEditorChange, EditorCommitError> {
+        gesture_id: String,
+        editor_changes: EditorPatchV1,
+        plugin_id: &str,
+        instances: Vec<SavedPluginInstance>,
+    ) -> GestureCommitRequest {
+        GestureCommitRequest {
+            gesture_id,
+            mutation_id: uuid::Uuid::new_v4().to_string(),
+            editor_base_revision: store.editor_get().revision,
+            plugin_base_revision: store.plugin_model_revision(),
+            observed_history_epoch: Some(store.state.read().history.history_epoch()),
+            authority_generation: 1,
+            editor_changes: Some(editor_changes),
+            plugin_changes: vec![GesturePluginInstancesChange {
+                plugin_id: plugin_id.to_string(),
+                instances,
+            }],
+        }
+    }
+
+    fn legacy_editor_commit(
+        store: &AppStore,
+        fields: &[EditorField],
+        updater: impl FnOnce(&mut AppStoreData),
+    ) -> std::result::Result<CommittedEditorChange, EditorCommitError> {
         store
             .commit_legacy_editor_transaction(
                 EditorCommitOrigin::LegacyAdapter("test_adapter".to_string()),
@@ -3568,194 +4060,1074 @@ mod tests {
     }
 
     #[test]
-    fn plugin_instances_commit_records_merges_and_skips_noop() {
-        let dir = test_directory("plugin-instances-commit-test");
+    fn plugin_instances_commit_records_merges_and_skips_noop() {
+        let dir = test_directory("plugin-instances-commit-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        let initial_revision = store.plugin_model_revision();
+        let gesture_id = uuid::Uuid::new_v4().to_string();
+
+        let first_request = plugin_instances_request(
+            "demo-plugin",
+            vec![saved_plugin_instance(10.0)],
+            uuid::Uuid::new_v4().to_string(),
+            Some(gesture_id.clone()),
+            Some(initial_revision),
+        );
+        let first = store.commit_plugin_instances(first_request).unwrap();
+        let first_revision = first.outcome.model_revision;
+        assert!(first.outcome.changed);
+        assert_eq!(
+            first
+                .outcome
+                .history_status
+                .as_ref()
+                .unwrap()
+                .history_revision,
+            1
+        );
+        drop(first);
+
+        let second_request = plugin_instances_request(
+            "demo-plugin",
+            vec![saved_plugin_instance(30.0)],
+            uuid::Uuid::new_v4().to_string(),
+            Some(gesture_id),
+            Some(first_revision),
+        );
+        let second = store.commit_plugin_instances(second_request).unwrap();
+        let second_revision = second.outcome.model_revision;
+        assert_eq!(
+            second
+                .outcome
+                .history_status
+                .as_ref()
+                .unwrap()
+                .history_revision,
+            1
+        );
+        drop(second);
+
+        let noop = store
+            .commit_plugin_instances(plugin_instances_request(
+                "demo-plugin",
+                vec![saved_plugin_instance(30.0)],
+                uuid::Uuid::new_v4().to_string(),
+                None,
+                Some(second_revision),
+            ))
+            .unwrap();
+        assert!(!noop.outcome.changed);
+        assert!(noop.outcome.history_status.is_none());
+        drop(noop);
+
+        let (instances, revision) = store.plugin_instances_get("demo-plugin").unwrap();
+        assert_eq!(instances, vec![saved_plugin_instance(30.0)]);
+        assert_eq!(revision, second_revision);
+        assert_eq!(store.history_status().history_revision, 1);
+
+        let gate = store.history_gate();
+        let counters = store.snapshot().key_counters;
+        let undo_id = uuid::Uuid::new_v4().to_string();
+        let undo_barrier = gate.close(&undo_id).unwrap();
+        let undo = store
+            .apply_history_operation(HistoryDirection::Undo, &undo_id, &counters, || {})
+            .unwrap();
+        assert!(store
+            .plugin_instances_get("demo-plugin")
+            .unwrap()
+            .0
+            .is_empty());
+        assert!(undo.status.can_redo);
+        drop(undo_barrier);
+
+        let redo_id = uuid::Uuid::new_v4().to_string();
+        let redo_barrier = gate.close(&redo_id).unwrap();
+        let redo = store
+            .apply_history_operation(HistoryDirection::Redo, &redo_id, &counters, || {})
+            .unwrap();
+        assert_eq!(
+            store.plugin_instances_get("demo-plugin").unwrap().0,
+            vec![saved_plugin_instance(30.0)]
+        );
+        assert!(redo.status.can_undo);
+        drop(redo_barrier);
+
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn plugin_instance_visibility_and_z_index_survive_restart() {
+        let dir = test_directory("plugin-instance-layout-restart-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        let mut expected = saved_plugin_instance(15.0);
+        expected.hidden = true;
+        expected.z_index = Some(-12.0);
+        let committed = store
+            .commit_plugin_instances(plugin_instances_request(
+                "demo-plugin",
+                vec![expected.clone()],
+                uuid::Uuid::new_v4().to_string(),
+                None,
+                Some(store.plugin_model_revision()),
+            ))
+            .unwrap();
+        drop(committed);
+        store.flush_and_shutdown().unwrap();
+        drop(store);
+
+        let restored = AppStore::initialize_in_dir(&dir).unwrap();
+        assert_eq!(
+            restored.plugin_instances_get("demo-plugin").unwrap().0,
+            vec![expected]
+        );
+
+        restored.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn plugin_instances_history_budget_truncates_after_successful_commit() {
+        let dir = test_directory("plugin-instances-budget-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        store
+            .state
+            .write()
+            .history
+            .set_limits_for_test(1, 32 * 1024 * 1024, 50);
+        let expected_revision = store.plugin_model_revision();
+
+        let committed = store
+            .commit_plugin_instances(plugin_instances_request(
+                "demo-plugin",
+                vec![saved_plugin_instance(10.0)],
+                uuid::Uuid::new_v4().to_string(),
+                None,
+                Some(expected_revision),
+            ))
+            .unwrap();
+        let status = committed.outcome.history_status.as_ref().unwrap();
+        assert!(committed.outcome.changed);
+        assert!(!status.can_undo);
+        assert!(!status.can_redo);
+        assert_eq!(
+            status.truncated.as_ref().unwrap().reason,
+            HISTORY_ENTRY_TOO_LARGE
+        );
+        drop(committed);
+        assert_eq!(
+            store.plugin_instances_get("demo-plugin").unwrap().0,
+            vec![saved_plugin_instance(10.0)]
+        );
+
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn plugin_instances_undo_redo_restore_backend_without_runtime_projection() {
+        let dir = test_directory("plugin-instances-history-restore-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        let expected_revision = store.plugin_model_revision();
+        let committed = store
+            .commit_plugin_instances(plugin_instances_request(
+                "demo-plugin",
+                vec![saved_plugin_instance(42.0)],
+                uuid::Uuid::new_v4().to_string(),
+                None,
+                Some(expected_revision),
+            ))
+            .unwrap();
+        drop(committed);
+
+        let gate = store.history_gate();
+        let undo_id = uuid::Uuid::new_v4().to_string();
+        let undo_barrier = gate.close(&undo_id).unwrap();
+        let counters = store.snapshot().key_counters;
+        let undo = store
+            .apply_history_operation(HistoryDirection::Undo, &undo_id, &counters, || {})
+            .unwrap();
+        let Some(HistoryAuxChange::PluginElements {
+            plugin_id,
+            revision: undo_revision,
+        }) = undo.aux_change
+        else {
+            panic!("plugin undo must expose its projection payload");
+        };
+        assert_eq!(plugin_id, "demo-plugin");
+        assert_eq!(undo_revision, store.plugin_model_revision());
+        assert!(store
+            .plugin_instances_get("demo-plugin")
+            .unwrap()
+            .0
+            .is_empty());
+        assert!(undo.status.can_redo);
+        drop(undo_barrier);
+
+        let redo_id = uuid::Uuid::new_v4().to_string();
+        let redo_barrier = gate.close(&redo_id).unwrap();
+        let redo = store
+            .apply_history_operation(HistoryDirection::Redo, &redo_id, &counters, || {})
+            .unwrap();
+        assert_eq!(
+            store.plugin_instances_get("demo-plugin").unwrap().0,
+            vec![saved_plugin_instance(42.0)]
+        );
+        assert!(redo.status.can_undo);
+        drop(redo_barrier);
+
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn mixed_editor_plugin_gesture_undoes_and_redoes_atomically() {
+        let dir = test_directory("compound-editor-plugin-history-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        let initial_x = store.editor_get().document.key_positions["4key"][0].dx;
+        let gesture_id = uuid::Uuid::new_v4().to_string();
+
+        let mut editor = editor_request(
+            store.editor_get().revision,
+            uuid::Uuid::new_v4().to_string(),
+            position_patch(&store, initial_x + 40.0),
+        );
+        editor.gesture_id = Some(gesture_id.clone());
+        store.commit_editor_document(editor).unwrap();
+        let plugin = store
+            .commit_plugin_instances(plugin_instances_request(
+                "demo-plugin",
+                vec![saved_plugin_instance(42.0)],
+                uuid::Uuid::new_v4().to_string(),
+                Some(gesture_id.clone()),
+                Some(store.plugin_model_revision()),
+            ))
+            .unwrap();
+        let first_plugin_revision = plugin.outcome.model_revision;
+        assert_eq!(
+            plugin
+                .outcome
+                .history_status
+                .as_ref()
+                .unwrap()
+                .history_revision,
+            1
+        );
+        drop(plugin);
+        let second_plugin = store
+            .commit_plugin_instances(plugin_instances_request(
+                "second-plugin",
+                vec![saved_plugin_instance(84.0)],
+                uuid::Uuid::new_v4().to_string(),
+                Some(gesture_id),
+                Some(first_plugin_revision),
+            ))
+            .unwrap();
+        assert_eq!(
+            second_plugin
+                .outcome
+                .history_status
+                .as_ref()
+                .unwrap()
+                .history_revision,
+            1
+        );
+        drop(second_plugin);
+
+        let gate = store.history_gate();
+        let counters = store.snapshot().key_counters;
+        let undo_id = uuid::Uuid::new_v4().to_string();
+        let undo_barrier = gate.close(&undo_id).unwrap();
+        let undo = store
+            .apply_history_operation(HistoryDirection::Undo, &undo_id, &counters, || {})
+            .unwrap();
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x
+        );
+        assert!(store
+            .plugin_instances_get("demo-plugin")
+            .unwrap()
+            .0
+            .is_empty());
+        assert!(store
+            .plugin_instances_get("second-plugin")
+            .unwrap()
+            .0
+            .is_empty());
+        assert!(!undo.status.can_undo);
+        assert!(undo.status.can_redo);
+        assert!(undo.change.is_some());
+        assert!(matches!(
+            undo.aux_change,
+            Some(HistoryAuxChange::PluginElementsBatch { ref plugin_ids, .. })
+                if plugin_ids == &["demo-plugin".to_string(), "second-plugin".to_string()]
+        ));
+        drop(undo_barrier);
+
+        let redo_id = uuid::Uuid::new_v4().to_string();
+        let redo_barrier = gate.close(&redo_id).unwrap();
+        let redo = store
+            .apply_history_operation(HistoryDirection::Redo, &redo_id, &counters, || {})
+            .unwrap();
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x + 40.0
+        );
+        assert_eq!(
+            store.plugin_instances_get("demo-plugin").unwrap().0,
+            vec![saved_plugin_instance(42.0)]
+        );
+        assert_eq!(
+            store.plugin_instances_get("second-plugin").unwrap().0,
+            vec![saved_plugin_instance(84.0)]
+        );
+        assert!(redo.status.can_undo);
+        drop(redo_barrier);
+
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn gesture_transactions_keep_rejoined_actions_atomic_and_ordered() {
+        let dir = test_directory("gesture-transaction-rejoined-actions-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        let initial_x = store.editor_get().document.key_positions["4key"][0].dx;
+        let persist_count = store.writer.persist_count();
+
+        let first = store
+            .commit_gesture(gesture_request(
+                &store,
+                uuid::Uuid::new_v4().to_string(),
+                position_patch(&store, initial_x + 10.0),
+                "demo-plugin",
+                vec![saved_plugin_instance(10.0)],
+            ))
+            .unwrap();
+        assert_eq!(first.outcome.result.editor_revision, 1);
+        assert_eq!(first.outcome.result.plugin_model_revision, 1);
+        drop(first);
+
+        let second = store
+            .commit_gesture(gesture_request(
+                &store,
+                uuid::Uuid::new_v4().to_string(),
+                position_patch(&store, initial_x + 20.0),
+                "demo-plugin",
+                vec![saved_plugin_instance(20.0)],
+            ))
+            .unwrap();
+        assert_eq!(second.outcome.result.editor_revision, 2);
+        assert_eq!(second.outcome.result.plugin_model_revision, 2);
+        assert_eq!(store.writer.persist_count(), persist_count + 2);
+        assert_eq!(store.history_status().history_revision, 2);
+        drop(second);
+
+        let gate = store.history_gate();
+        let counters = store.snapshot().key_counters;
+        for (expected_editor_x, expected_plugin_x) in
+            [(initial_x + 10.0, Some(10.0)), (initial_x, None)]
+        {
+            let operation_id = uuid::Uuid::new_v4().to_string();
+            let barrier = gate.close(&operation_id).unwrap();
+            store
+                .apply_history_operation(HistoryDirection::Undo, &operation_id, &counters, || {})
+                .unwrap();
+            drop(barrier);
+            assert_eq!(
+                store.editor_get().document.key_positions["4key"][0].dx,
+                expected_editor_x
+            );
+            let plugin = store.plugin_instances_get("demo-plugin").unwrap().0;
+            assert_eq!(
+                plugin.first().map(|instance| instance.position.x),
+                expected_plugin_x
+            );
+        }
+
+        for (expected_editor_x, expected_plugin_x) in
+            [(initial_x + 10.0, 10.0), (initial_x + 20.0, 20.0)]
+        {
+            let operation_id = uuid::Uuid::new_v4().to_string();
+            let barrier = gate.close(&operation_id).unwrap();
+            store
+                .apply_history_operation(HistoryDirection::Redo, &operation_id, &counters, || {})
+                .unwrap();
+            drop(barrier);
+            assert_eq!(
+                store.editor_get().document.key_positions["4key"][0].dx,
+                expected_editor_x
+            );
+            assert_eq!(
+                store.plugin_instances_get("demo-plugin").unwrap().0[0]
+                    .position
+                    .x,
+                expected_plugin_x
+            );
+        }
+
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn gesture_plugin_validation_failure_leaves_editor_and_store_unchanged() {
+        let dir = test_directory("gesture-transaction-validation-failure-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        let before = store.snapshot();
+        let before_plugin_revision = store.plugin_model_revision();
+        let before_history_revision = store.history_status().history_revision;
+        let persist_count = store.writer.persist_count();
+        let mut invalid = saved_plugin_instance(10.0);
+        invalid.position.x = f64::NAN;
+
+        let error = store
+            .commit_gesture(gesture_request(
+                &store,
+                uuid::Uuid::new_v4().to_string(),
+                position_patch(&store, before.key_positions["4key"][0].dx + 25.0),
+                "demo-plugin",
+                vec![invalid],
+            ))
+            .unwrap_err();
+
+        assert_eq!(error.error_code, EditorCommitErrorCode::ValidationFailed);
+        assert_eq!(store.snapshot(), before);
+        assert_eq!(store.plugin_model_revision(), before_plugin_revision);
+        assert_eq!(
+            store.history_status().history_revision,
+            before_history_revision
+        );
+        assert_eq!(store.writer.persist_count(), persist_count);
+
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn gesture_persist_failure_does_not_publish_partial_state() {
+        let dir = test_directory("gesture-transaction-persist-failure-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        let before = store.snapshot();
+        let before_plugin_revision = store.plugin_model_revision();
+        let before_history_revision = store.history_status().history_revision;
+        store.writer.fail_next_persist();
+
+        let error = store
+            .commit_gesture(gesture_request(
+                &store,
+                uuid::Uuid::new_v4().to_string(),
+                position_patch(&store, before.key_positions["4key"][0].dx + 25.0),
+                "demo-plugin",
+                vec![saved_plugin_instance(25.0)],
+            ))
+            .unwrap_err();
+
+        assert_eq!(error.error_code, EditorCommitErrorCode::IoError);
+        assert_eq!(store.snapshot(), before);
+        assert_eq!(store.plugin_model_revision(), before_plugin_revision);
+        assert_eq!(
+            store.history_status().history_revision,
+            before_history_revision
+        );
+
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn gesture_oversized_history_rejects_the_whole_transaction() {
+        let dir = test_directory("gesture-transaction-history-size-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        store
+            .state
+            .write()
+            .history
+            .set_limits_for_test(1, 32 * 1024 * 1024, 50);
+        let before = store.snapshot();
+        let before_plugin_revision = store.plugin_model_revision();
+        let before_history_revision = store.history_status().history_revision;
+        let persist_count = store.writer.persist_count();
+
+        let error = store
+            .commit_gesture(gesture_request(
+                &store,
+                uuid::Uuid::new_v4().to_string(),
+                position_patch(&store, before.key_positions["4key"][0].dx + 25.0),
+                "demo-plugin",
+                vec![saved_plugin_instance(25.0)],
+            ))
+            .unwrap_err();
+
+        assert_eq!(error.error_code, EditorCommitErrorCode::ValidationFailed);
+        assert_eq!(
+            error.details.unwrap().validation_code.as_deref(),
+            Some(HISTORY_ENTRY_TOO_LARGE)
+        );
+        assert_eq!(store.snapshot(), before);
+        assert_eq!(store.plugin_model_revision(), before_plugin_revision);
+        assert_eq!(
+            store.history_status().history_revision,
+            before_history_revision
+        );
+        assert_eq!(store.writer.persist_count(), persist_count);
+
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn merged_editor_gesture_aliases_only_join_the_top_plugin_entry() {
+        let dir = test_directory("merged-editor-gesture-alias-history-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        let initial_x = store.editor_get().document.key_positions["4key"][0].dx;
+        let first_gesture = uuid::Uuid::new_v4().to_string();
+        let second_gesture = uuid::Uuid::new_v4().to_string();
+
+        for (plugin_id, x, gesture_id) in [
+            ("plugin-a", 41.0, first_gesture.clone()),
+            ("plugin-b", 82.0, second_gesture.clone()),
+        ] {
+            let plugin = store
+                .commit_plugin_instances(plugin_instances_request(
+                    plugin_id,
+                    vec![saved_plugin_instance(x)],
+                    uuid::Uuid::new_v4().to_string(),
+                    Some(gesture_id),
+                    Some(store.plugin_model_revision()),
+                ))
+                .unwrap();
+            drop(plugin);
+        }
+
+        let mut editor = editor_request(
+            store.editor_get().revision,
+            uuid::Uuid::new_v4().to_string(),
+            position_patch(&store, initial_x + 60.0),
+        );
+        editor.gesture_id = Some(second_gesture.clone());
+        editor.gesture_ids = vec![first_gesture, second_gesture];
+        store.commit_editor_document(editor).unwrap();
+
+        let gate = store.history_gate();
+        let counters = store.snapshot().key_counters;
+        let first_undo_id = uuid::Uuid::new_v4().to_string();
+        let first_barrier = gate.close(&first_undo_id).unwrap();
+        let first_undo = store
+            .apply_history_operation(HistoryDirection::Undo, &first_undo_id, &counters, || {})
+            .unwrap();
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x
+        );
+        assert_eq!(
+            store.plugin_instances_get("plugin-a").unwrap().0,
+            vec![saved_plugin_instance(41.0)]
+        );
+        assert!(store.plugin_instances_get("plugin-b").unwrap().0.is_empty());
+        assert!(first_undo.status.can_undo);
+        assert!(first_undo.status.can_redo);
+        drop(first_barrier);
+
+        let second_undo_id = uuid::Uuid::new_v4().to_string();
+        let second_barrier = gate.close(&second_undo_id).unwrap();
+        let second_undo = store
+            .apply_history_operation(HistoryDirection::Undo, &second_undo_id, &counters, || {})
+            .unwrap();
+        assert!(store.plugin_instances_get("plugin-a").unwrap().0.is_empty());
+        assert!(store.plugin_instances_get("plugin-b").unwrap().0.is_empty());
+        assert!(!second_undo.status.can_undo);
+        assert!(second_undo.status.can_redo);
+        drop(second_barrier);
+
+        let first_redo_id = uuid::Uuid::new_v4().to_string();
+        let first_redo_barrier = gate.close(&first_redo_id).unwrap();
+        store
+            .apply_history_operation(HistoryDirection::Redo, &first_redo_id, &counters, || {})
+            .unwrap();
+        assert_eq!(
+            store.plugin_instances_get("plugin-a").unwrap().0,
+            vec![saved_plugin_instance(41.0)]
+        );
+        assert!(store.plugin_instances_get("plugin-b").unwrap().0.is_empty());
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x
+        );
+        drop(first_redo_barrier);
+
+        let second_redo_id = uuid::Uuid::new_v4().to_string();
+        let second_redo_barrier = gate.close(&second_redo_id).unwrap();
+        let second_redo = store
+            .apply_history_operation(HistoryDirection::Redo, &second_redo_id, &counters, || {})
+            .unwrap();
+        assert_eq!(
+            store.plugin_instances_get("plugin-a").unwrap().0,
+            vec![saved_plugin_instance(41.0)]
+        );
+        assert_eq!(
+            store.plugin_instances_get("plugin-b").unwrap().0,
+            vec![saved_plugin_instance(82.0)]
+        );
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x + 60.0
+        );
+        assert!(second_redo.status.can_undo);
+        assert!(!second_redo.status.can_redo);
+        drop(second_redo_barrier);
+
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn multi_alias_editor_commit_stays_above_a_later_editor_commit() {
+        let dir = test_directory("multi-alias-editor-order-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        let initial_x = store.editor_get().document.key_positions["4key"][0].dx;
+        let first_gesture = uuid::Uuid::new_v4().to_string();
+        let second_gesture = uuid::Uuid::new_v4().to_string();
+
+        for (plugin_id, x, gesture_id) in [
+            ("plugin-a", 41.0, first_gesture.clone()),
+            ("plugin-b", 82.0, second_gesture.clone()),
+        ] {
+            let plugin = store
+                .commit_plugin_instances(plugin_instances_request(
+                    plugin_id,
+                    vec![saved_plugin_instance(x)],
+                    uuid::Uuid::new_v4().to_string(),
+                    Some(gesture_id),
+                    Some(store.plugin_model_revision()),
+                ))
+                .unwrap();
+            drop(plugin);
+        }
+
+        let mut intervening_editor = editor_request(
+            store.editor_get().revision,
+            uuid::Uuid::new_v4().to_string(),
+            position_patch(&store, initial_x + 20.0),
+        );
+        intervening_editor.gesture_id = Some(uuid::Uuid::new_v4().to_string());
+        store.commit_editor_document(intervening_editor).unwrap();
+
+        let mut latest_editor = editor_request(
+            store.editor_get().revision,
+            uuid::Uuid::new_v4().to_string(),
+            position_patch(&store, initial_x + 40.0),
+        );
+        latest_editor.gesture_id = Some(second_gesture.clone());
+        latest_editor.gesture_ids = vec![first_gesture, second_gesture];
+        store.commit_editor_document(latest_editor).unwrap();
+
+        let gate = store.history_gate();
+        let counters = store.snapshot().key_counters;
+        for (expected_x, expected_a, expected_b) in [
+            (initial_x + 20.0, Some(41.0), Some(82.0)),
+            (initial_x, Some(41.0), Some(82.0)),
+            (initial_x, Some(41.0), None),
+            (initial_x, None, None),
+        ] {
+            let undo_id = uuid::Uuid::new_v4().to_string();
+            let barrier = gate.close(&undo_id).unwrap();
+            store
+                .apply_history_operation(HistoryDirection::Undo, &undo_id, &counters, || {})
+                .unwrap();
+            assert_eq!(
+                store.editor_get().document.key_positions["4key"][0].dx,
+                expected_x
+            );
+            assert_eq!(
+                store.plugin_instances_get("plugin-a").unwrap().0,
+                expected_a
+                    .map(|x| vec![saved_plugin_instance(x)])
+                    .unwrap_or_default()
+            );
+            assert_eq!(
+                store.plugin_instances_get("plugin-b").unwrap().0,
+                expected_b
+                    .map(|x| vec![saved_plugin_instance(x)])
+                    .unwrap_or_default()
+            );
+            drop(barrier);
+        }
+        assert!(!store.history_status().can_undo);
+
+        for (expected_x, expected_a, expected_b) in [
+            (initial_x, Some(41.0), None),
+            (initial_x, Some(41.0), Some(82.0)),
+            (initial_x + 20.0, Some(41.0), Some(82.0)),
+            (initial_x + 40.0, Some(41.0), Some(82.0)),
+        ] {
+            let redo_id = uuid::Uuid::new_v4().to_string();
+            let barrier = gate.close(&redo_id).unwrap();
+            store
+                .apply_history_operation(HistoryDirection::Redo, &redo_id, &counters, || {})
+                .unwrap();
+            assert_eq!(
+                store.editor_get().document.key_positions["4key"][0].dx,
+                expected_x
+            );
+            assert_eq!(
+                store.plugin_instances_get("plugin-a").unwrap().0,
+                expected_a
+                    .map(|x| vec![saved_plugin_instance(x)])
+                    .unwrap_or_default()
+            );
+            assert_eq!(
+                store.plugin_instances_get("plugin-b").unwrap().0,
+                expected_b
+                    .map(|x| vec![saved_plugin_instance(x)])
+                    .unwrap_or_default()
+            );
+            drop(barrier);
+        }
+        assert!(!store.history_status().can_redo);
+
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn merged_aliases_do_not_cross_an_intervening_same_plugin_edit() {
+        let dir = test_directory("intervening-same-plugin-alias-history-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        let initial_x = store.editor_get().document.key_positions["4key"][0].dx;
+        let first_gesture = uuid::Uuid::new_v4().to_string();
+        let intervening_gesture = uuid::Uuid::new_v4().to_string();
+        let last_gesture = uuid::Uuid::new_v4().to_string();
+
+        for (x, gesture_id) in [
+            (10.0, first_gesture.clone()),
+            (20.0, intervening_gesture),
+            (30.0, last_gesture.clone()),
+        ] {
+            let plugin = store
+                .commit_plugin_instances(plugin_instances_request(
+                    "demo-plugin",
+                    vec![saved_plugin_instance(x)],
+                    uuid::Uuid::new_v4().to_string(),
+                    Some(gesture_id),
+                    Some(store.plugin_model_revision()),
+                ))
+                .unwrap();
+            drop(plugin);
+        }
+
+        let mut editor = editor_request(
+            store.editor_get().revision,
+            uuid::Uuid::new_v4().to_string(),
+            position_patch(&store, initial_x + 60.0),
+        );
+        editor.gesture_id = Some(last_gesture.clone());
+        editor.gesture_ids = vec![first_gesture, last_gesture];
+        store.commit_editor_document(editor).unwrap();
+
+        let gate = store.history_gate();
+        let counters = store.snapshot().key_counters;
+        for expected_plugin_x in [Some(20.0), Some(10.0), None] {
+            let undo_id = uuid::Uuid::new_v4().to_string();
+            let barrier = gate.close(&undo_id).unwrap();
+            store
+                .apply_history_operation(HistoryDirection::Undo, &undo_id, &counters, || {})
+                .unwrap();
+            let expected = expected_plugin_x
+                .map(|x| vec![saved_plugin_instance(x)])
+                .unwrap_or_default();
+            assert_eq!(
+                store.plugin_instances_get("demo-plugin").unwrap().0,
+                expected
+            );
+            drop(barrier);
+        }
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x
+        );
+        assert!(!store.history_status().can_undo);
+
+        for expected_plugin_x in [10.0, 20.0, 30.0] {
+            let redo_id = uuid::Uuid::new_v4().to_string();
+            let barrier = gate.close(&redo_id).unwrap();
+            store
+                .apply_history_operation(HistoryDirection::Redo, &redo_id, &counters, || {})
+                .unwrap();
+            assert_eq!(
+                store.plugin_instances_get("demo-plugin").unwrap().0,
+                vec![saved_plugin_instance(expected_plugin_x)]
+            );
+            drop(barrier);
+        }
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x + 60.0
+        );
+        assert!(!store.history_status().can_redo);
+
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn delayed_plugin_commit_preserves_later_editor_undo_order() {
+        let dir = test_directory("delayed-compound-history-order-test");
         std::fs::create_dir_all(&dir).unwrap();
         let store = AppStore::initialize_in_dir(&dir).unwrap();
-        let initial_revision = store.plugin_model_revision();
+        let initial_x = store.editor_get().document.key_positions["4key"][0].dx;
         let gesture_id = uuid::Uuid::new_v4().to_string();
 
-        let first_request = plugin_instances_request(
-            "demo-plugin",
-            vec![saved_plugin_instance(10.0)],
+        let mut mixed_editor = editor_request(
+            store.editor_get().revision,
             uuid::Uuid::new_v4().to_string(),
-            Some(gesture_id.clone()),
-            Some(initial_revision),
-        );
-        let first = store.commit_plugin_instances(first_request).unwrap();
-        let first_revision = first.outcome.model_revision;
-        assert!(first.outcome.changed);
-        assert_eq!(
-            first
-                .outcome
-                .history_status
-                .as_ref()
-                .unwrap()
-                .history_revision,
-            1
+            position_patch(&store, initial_x + 40.0),
         );
-        drop(first);
+        mixed_editor.gesture_id = Some(gesture_id.clone());
+        store.commit_editor_document(mixed_editor).unwrap();
 
-        let second_request = plugin_instances_request(
-            "demo-plugin",
-            vec![saved_plugin_instance(30.0)],
+        let later_editor = editor_request(
+            store.editor_get().revision,
             uuid::Uuid::new_v4().to_string(),
-            Some(gesture_id),
-            Some(first_revision),
-        );
-        let second = store.commit_plugin_instances(second_request).unwrap();
-        let second_revision = second.outcome.model_revision;
-        assert_eq!(
-            second
-                .outcome
-                .history_status
-                .as_ref()
-                .unwrap()
-                .history_revision,
-            1
+            position_patch(&store, initial_x + 80.0),
         );
-        drop(second);
+        store.commit_editor_document(later_editor).unwrap();
 
-        let noop = store
+        let plugin = store
             .commit_plugin_instances(plugin_instances_request(
                 "demo-plugin",
-                vec![saved_plugin_instance(30.0)],
+                vec![saved_plugin_instance(42.0)],
                 uuid::Uuid::new_v4().to_string(),
-                None,
-                Some(second_revision),
+                Some(gesture_id),
+                Some(store.plugin_model_revision()),
             ))
             .unwrap();
-        assert!(!noop.outcome.changed);
-        assert!(noop.outcome.history_status.is_none());
-        drop(noop);
-
-        let (instances, revision) = store.plugin_instances_get("demo-plugin").unwrap();
-        assert_eq!(instances, vec![saved_plugin_instance(30.0)]);
-        assert_eq!(revision, second_revision);
-        assert_eq!(store.history_status().history_revision, 1);
+        drop(plugin);
 
         let gate = store.history_gate();
         let counters = store.snapshot().key_counters;
-        let undo_id = uuid::Uuid::new_v4().to_string();
-        let undo_barrier = gate.close(&undo_id).unwrap();
-        let undo = store
-            .apply_history_operation(HistoryDirection::Undo, &undo_id, &counters, || {})
+        let first_undo_id = uuid::Uuid::new_v4().to_string();
+        let first_barrier = gate.close(&first_undo_id).unwrap();
+        store
+            .apply_history_operation(HistoryDirection::Undo, &first_undo_id, &counters, || {})
+            .unwrap();
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x + 40.0
+        );
+        assert_eq!(
+            store.plugin_instances_get("demo-plugin").unwrap().0,
+            vec![saved_plugin_instance(42.0)]
+        );
+        drop(first_barrier);
+
+        let second_undo_id = uuid::Uuid::new_v4().to_string();
+        let second_barrier = gate.close(&second_undo_id).unwrap();
+        store
+            .apply_history_operation(HistoryDirection::Undo, &second_undo_id, &counters, || {})
             .unwrap();
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x
+        );
         assert!(store
             .plugin_instances_get("demo-plugin")
             .unwrap()
             .0
             .is_empty());
-        assert!(undo.status.can_redo);
-        drop(undo_barrier);
-
-        let redo_id = uuid::Uuid::new_v4().to_string();
-        let redo_barrier = gate.close(&redo_id).unwrap();
-        let redo = store
-            .apply_history_operation(HistoryDirection::Redo, &redo_id, &counters, || {})
-            .unwrap();
-        assert_eq!(
-            store.plugin_instances_get("demo-plugin").unwrap().0,
-            vec![saved_plugin_instance(30.0)]
-        );
-        assert!(redo.status.can_undo);
-        drop(redo_barrier);
+        drop(second_barrier);
 
         store.flush_and_shutdown().unwrap();
         let _ = std::fs::remove_dir_all(dir);
     }
 
     #[test]
-    fn plugin_instances_history_budget_truncates_after_successful_commit() {
-        let dir = test_directory("plugin-instances-budget-test");
+    fn repeated_editor_gesture_keeps_an_intervening_plugin_undo_in_order() {
+        let dir = test_directory("repeated-editor-gesture-order-test");
         std::fs::create_dir_all(&dir).unwrap();
         let store = AppStore::initialize_in_dir(&dir).unwrap();
-        store
-            .state
-            .write()
-            .history
-            .set_limits_for_test(1, 32 * 1024 * 1024, 50);
-        let expected_revision = store.plugin_model_revision();
+        let initial_x = store.editor_get().document.key_positions["4key"][0].dx;
+        let gesture_id = uuid::Uuid::new_v4().to_string();
 
-        let committed = store
+        let mut first_editor = editor_request(
+            store.editor_get().revision,
+            uuid::Uuid::new_v4().to_string(),
+            position_patch(&store, initial_x + 40.0),
+        );
+        first_editor.gesture_id = Some(gesture_id.clone());
+        store.commit_editor_document(first_editor).unwrap();
+        let plugin = store
             .commit_plugin_instances(plugin_instances_request(
                 "demo-plugin",
-                vec![saved_plugin_instance(10.0)],
+                vec![saved_plugin_instance(42.0)],
                 uuid::Uuid::new_v4().to_string(),
                 None,
-                Some(expected_revision),
+                Some(store.plugin_model_revision()),
             ))
             .unwrap();
-        let status = committed.outcome.history_status.as_ref().unwrap();
-        assert!(committed.outcome.changed);
-        assert!(!status.can_undo);
-        assert!(!status.can_redo);
+        drop(plugin);
+        let mut repeated_editor = editor_request(
+            store.editor_get().revision,
+            uuid::Uuid::new_v4().to_string(),
+            position_patch(&store, initial_x + 80.0),
+        );
+        repeated_editor.gesture_id = Some(gesture_id);
+        store.commit_editor_document(repeated_editor).unwrap();
+
+        let gate = store.history_gate();
+        let counters = store.snapshot().key_counters;
+        let first_undo_id = uuid::Uuid::new_v4().to_string();
+        let first_barrier = gate.close(&first_undo_id).unwrap();
+        store
+            .apply_history_operation(HistoryDirection::Undo, &first_undo_id, &counters, || {})
+            .unwrap();
         assert_eq!(
-            status.truncated.as_ref().unwrap().reason,
-            HISTORY_ENTRY_TOO_LARGE
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x + 40.0
         );
-        drop(committed);
         assert_eq!(
             store.plugin_instances_get("demo-plugin").unwrap().0,
-            vec![saved_plugin_instance(10.0)]
+            vec![saved_plugin_instance(42.0)]
+        );
+        drop(first_barrier);
+
+        let second_undo_id = uuid::Uuid::new_v4().to_string();
+        let second_barrier = gate.close(&second_undo_id).unwrap();
+        store
+            .apply_history_operation(HistoryDirection::Undo, &second_undo_id, &counters, || {})
+            .unwrap();
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x + 40.0
+        );
+        assert!(store
+            .plugin_instances_get("demo-plugin")
+            .unwrap()
+            .0
+            .is_empty());
+        drop(second_barrier);
+
+        let third_undo_id = uuid::Uuid::new_v4().to_string();
+        let third_barrier = gate.close(&third_undo_id).unwrap();
+        store
+            .apply_history_operation(HistoryDirection::Undo, &third_undo_id, &counters, || {})
+            .unwrap();
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x
         );
+        drop(third_barrier);
 
         store.flush_and_shutdown().unwrap();
         let _ = std::fs::remove_dir_all(dir);
     }
 
     #[test]
-    fn plugin_instances_undo_redo_restore_backend_without_runtime_projection() {
-        let dir = test_directory("plugin-instances-history-restore-test");
+    fn plugin_first_compound_undo_restores_both_scopes() {
+        let dir = test_directory("plugin-first-compound-history-test");
         std::fs::create_dir_all(&dir).unwrap();
         let store = AppStore::initialize_in_dir(&dir).unwrap();
-        let expected_revision = store.plugin_model_revision();
-        let committed = store
+        let initial_x = store.editor_get().document.key_positions["4key"][0].dx;
+        let gesture_id = uuid::Uuid::new_v4().to_string();
+
+        let plugin = store
             .commit_plugin_instances(plugin_instances_request(
                 "demo-plugin",
-                vec![saved_plugin_instance(42.0)],
+                vec![saved_plugin_instance(91.0)],
                 uuid::Uuid::new_v4().to_string(),
-                None,
-                Some(expected_revision),
+                Some(gesture_id.clone()),
+                Some(store.plugin_model_revision()),
             ))
             .unwrap();
-        drop(committed);
+        drop(plugin);
+        let mut editor = editor_request(
+            store.editor_get().revision,
+            uuid::Uuid::new_v4().to_string(),
+            position_patch(&store, initial_x + 35.0),
+        );
+        editor.gesture_id = Some(gesture_id);
+        store.commit_editor_document(editor).unwrap();
 
         let gate = store.history_gate();
+        let counters = store.snapshot().key_counters;
         let undo_id = uuid::Uuid::new_v4().to_string();
         let undo_barrier = gate.close(&undo_id).unwrap();
-        let counters = store.snapshot().key_counters;
-        let undo = store
+        store
             .apply_history_operation(HistoryDirection::Undo, &undo_id, &counters, || {})
             .unwrap();
-        let Some(HistoryAuxChange::PluginElements {
-            plugin_id,
-            revision: undo_revision,
-        }) = undo.aux_change
-        else {
-            panic!("plugin undo must expose its projection payload");
-        };
-        assert_eq!(plugin_id, "demo-plugin");
-        assert_eq!(undo_revision, store.plugin_model_revision());
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x
+        );
         assert!(store
             .plugin_instances_get("demo-plugin")
             .unwrap()
             .0
             .is_empty());
-        assert!(undo.status.can_redo);
         drop(undo_barrier);
 
-        let redo_id = uuid::Uuid::new_v4().to_string();
-        let redo_barrier = gate.close(&redo_id).unwrap();
-        let redo = store
-            .apply_history_operation(HistoryDirection::Redo, &redo_id, &counters, || {})
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
+    #[test]
+    fn compound_history_persist_failure_changes_neither_scope() {
+        let dir = test_directory("compound-history-persist-failure-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        let initial_x = store.editor_get().document.key_positions["4key"][0].dx;
+        let changed_x = initial_x + 55.0;
+        let gesture_id = uuid::Uuid::new_v4().to_string();
+
+        let mut editor = editor_request(
+            store.editor_get().revision,
+            uuid::Uuid::new_v4().to_string(),
+            position_patch(&store, changed_x),
+        );
+        editor.gesture_id = Some(gesture_id.clone());
+        store.commit_editor_document(editor).unwrap();
+        let plugin = store
+            .commit_plugin_instances(plugin_instances_request(
+                "demo-plugin",
+                vec![saved_plugin_instance(66.0)],
+                uuid::Uuid::new_v4().to_string(),
+                Some(gesture_id),
+                Some(store.plugin_model_revision()),
+            ))
             .unwrap();
+        drop(plugin);
+
+        let gate = store.history_gate();
+        let counters = store.snapshot().key_counters;
+        let undo_id = uuid::Uuid::new_v4().to_string();
+        let undo_barrier = gate.close(&undo_id).unwrap();
+        store.writer.fail_next_persist();
+        assert!(store
+            .apply_history_operation(HistoryDirection::Undo, &undo_id, &counters, || {})
+            .is_err());
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            changed_x
+        );
         assert_eq!(
             store.plugin_instances_get("demo-plugin").unwrap().0,
-            vec![saved_plugin_instance(42.0)]
+            vec![saved_plugin_instance(66.0)]
         );
-        assert!(redo.status.can_undo);
-        drop(redo_barrier);
+        assert!(store.history_status().can_undo);
+        drop(undo_barrier);
 
         store.flush_and_shutdown().unwrap();
         let _ = std::fs::remove_dir_all(dir);
@@ -3860,6 +5232,72 @@ mod tests {
         let _ = std::fs::remove_dir_all(dir);
     }
 
+    #[test]
+    fn mixed_net_zero_gesture_removes_compound_entry() {
+        let dir = test_directory("compound-net-zero-gesture-test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let store = AppStore::initialize_in_dir(&dir).unwrap();
+        let initial_x = store.editor_get().document.key_positions["4key"][0].dx;
+        let gesture_id = uuid::Uuid::new_v4().to_string();
+
+        let mut editor_out = editor_request(
+            store.editor_get().revision,
+            uuid::Uuid::new_v4().to_string(),
+            position_patch(&store, initial_x + 25.0),
+        );
+        editor_out.gesture_id = Some(gesture_id.clone());
+        store.commit_editor_document(editor_out).unwrap();
+        let plugin_out = store
+            .commit_plugin_instances(plugin_instances_request(
+                "demo-plugin",
+                vec![saved_plugin_instance(25.0)],
+                uuid::Uuid::new_v4().to_string(),
+                Some(gesture_id.clone()),
+                Some(store.plugin_model_revision()),
+            ))
+            .unwrap();
+        drop(plugin_out);
+
+        let mut editor_back = editor_request(
+            store.editor_get().revision,
+            uuid::Uuid::new_v4().to_string(),
+            position_patch(&store, initial_x),
+        );
+        editor_back.gesture_id = Some(gesture_id.clone());
+        store.commit_editor_document(editor_back).unwrap();
+        let plugin_back = store
+            .commit_plugin_instances(plugin_instances_request(
+                "demo-plugin",
+                Vec::new(),
+                uuid::Uuid::new_v4().to_string(),
+                Some(gesture_id),
+                Some(store.plugin_model_revision()),
+            ))
+            .unwrap();
+        assert!(
+            !plugin_back
+                .outcome
+                .history_status
+                .as_ref()
+                .unwrap()
+                .can_undo
+        );
+        drop(plugin_back);
+
+        assert_eq!(
+            store.editor_get().document.key_positions["4key"][0].dx,
+            initial_x
+        );
+        assert!(store
+            .plugin_instances_get("demo-plugin")
+            .unwrap()
+            .0
+            .is_empty());
+
+        store.flush_and_shutdown().unwrap();
+        let _ = std::fs::remove_dir_all(dir);
+    }
+
     #[test]
     fn plugin_instances_reconcile_is_noop_when_canonical_tabs_are_valid() {
         let dir = test_directory("plugin-instances-reconcile-noop-test");
@@ -3903,6 +5341,8 @@ mod tests {
         let store = AppStore::initialize_in_dir(&dir).unwrap();
         let mut default_tab = saved_plugin_instance(10.0);
         default_tab.tab_id = None;
+        default_tab.hidden = true;
+        default_tab.z_index = Some(17.0);
         let mut stale_tab = saved_plugin_instance(30.0);
         stale_tab.tab_id = Some("deleted-tab".to_string());
         let before = vec![default_tab, stale_tab];
@@ -3928,6 +5368,8 @@ mod tests {
         drop(reconciled);
         let mut normalized = saved_plugin_instance(10.0);
         normalized.tab_id = Some("4key".to_string());
+        normalized.hidden = true;
+        normalized.z_index = Some(17.0);
         assert_eq!(
             store.plugin_instances_get("demo-plugin").unwrap().0,
             vec![normalized.clone()]
@@ -4240,6 +5682,7 @@ mod tests {
         let old_key = before.keys["4key"][0].clone();
         let mut keys = before.keys.clone();
         keys.get_mut("4key").unwrap()[0] = "StrictKey".to_string();
+        let first_gesture_id = uuid::Uuid::new_v4().to_string();
         let gesture_id = uuid::Uuid::new_v4().to_string();
         let mut request = editor_request(
             0,
@@ -4250,6 +5693,11 @@ mod tests {
             },
         );
         request.gesture_id = Some(gesture_id.clone());
+        request.gesture_ids = vec![
+            first_gesture_id.clone(),
+            first_gesture_id.clone(),
+            gesture_id.clone(),
+        ];
 
         let change = store.commit_editor_document(request).unwrap();
 
@@ -4260,6 +5708,10 @@ mod tests {
             change.event.as_ref().unwrap().gesture_id.as_deref(),
             Some(gesture_id.as_str())
         );
+        assert_eq!(
+            change.event.as_ref().unwrap().gesture_ids,
+            vec![first_gesture_id, gesture_id]
+        );
         assert_eq!(store.writer.persist_count(), persist_count + 1);
         let snapshot = store.snapshot();
         assert_eq!(snapshot.editor_revision, 1);
diff --git a/src/renderer/__tests__/previewOverlaySession.test.ts b/src/renderer/__tests__/previewOverlaySession.test.ts
index d3c440b3..160edb39 100644
--- a/src/renderer/__tests__/previewOverlaySession.test.ts
+++ b/src/renderer/__tests__/previewOverlaySession.test.ts
@@ -7,7 +7,6 @@ import { useStatItemStore } from '@stores/data/useStatItemStore';
 import {
   composePreviewPositions,
   previewOverlay,
-  registerPreviewRevisionProbe,
 } from '@src/renderer/editor/runtime/previewOverlay';
 import { editGestureController } from '@src/renderer/editor/runtime/editGestureController';
 import { previewApi } from '@api/modules/previewApi';
@@ -175,54 +174,32 @@ describe('previewOverlay', () => {
     ).toBeUndefined();
   });
 
-  it('minRevision 게이트에 걸린 cancel은 revision 전진 후에만 처리', () => {
-    let currentRevision: number | null = 3;
-    registerPreviewRevisionProbe(() => currentRevision);
-
-    previewOverlay.applyRemoteEnvelope(remoteEnvelope({ seq: 1 }));
+  it('병합 커밋은 두 창의 세션을 함께 끝내고 늦은 patch를 차단', () => {
+    previewOverlay.applyLocalPatch('main-session', '4key', [0], { width: 90 });
     previewOverlay.applyRemoteEnvelope(
       remoteEnvelope({
-        seq: 2,
-        kind: 'cancel',
-        targets: [],
-        patch: {},
-        minRevision: 5,
+        sessionId: 'panel-session',
+        targets: [1],
+        patch: { width: 95 },
       }),
     );
 
-    // 아직 revision 미도달이라 프리뷰 유지
-    expect(useKeyStore.getState().positions['4key'][0].backgroundColor).toBe(
-      '#ff0000',
-    );
-
-    currentRevision = 5;
-    previewOverlay.flushDeferredCancels(5);
-    expect(
-      useKeyStore.getState().positions['4key'][0].backgroundColor,
-    ).toBeUndefined();
-
-    registerPreviewRevisionProbe(null);
-  });
+    previewOverlay.endSessions(['main-session', 'panel-session']);
 
-  it('revision이 이미 도달한 cancel은 즉시 처리', () => {
-    registerPreviewRevisionProbe(() => 10);
+    expect(useKeyStore.getState().positions['4key'][0].width).toBe(60);
+    expect(useKeyStore.getState().positions['4key'][1].width).toBe(60);
 
-    previewOverlay.applyRemoteEnvelope(remoteEnvelope({ seq: 1 }));
+    previewOverlay.applyLocalPatch('main-session', '4key', [0], { width: 100 });
     previewOverlay.applyRemoteEnvelope(
       remoteEnvelope({
+        sessionId: 'panel-session',
         seq: 2,
-        kind: 'cancel',
-        targets: [],
-        patch: {},
-        minRevision: 5,
+        targets: [1],
+        patch: { width: 105 },
       }),
     );
-
-    expect(
-      useKeyStore.getState().positions['4key'][0].backgroundColor,
-    ).toBeUndefined();
-
-    registerPreviewRevisionProbe(null);
+    expect(useKeyStore.getState().positions['4key'][0].width).toBe(60);
+    expect(useKeyStore.getState().positions['4key'][1].width).toBe(60);
   });
 
   it('프리뷰 활성 중 canonical 편집이 들어와도 오버레이가 재합성됨', () => {
@@ -325,7 +302,7 @@ describe('editGestureController', () => {
     expect(request.patch).toEqual({ backgroundColor: '#111111' });
   });
 
-  it('settleCommit 성공 시 세션 종료 + 수신측 정리 브로드캐스트', async () => {
+  it('settleCommit 성공 시 로컬 세션 종료 + 보조 cancel 브로드캐스트', async () => {
     editGestureController.preview('4key', [
       { index: 0, patch: { width: 100 } },
     ]);
@@ -335,8 +312,10 @@ describe('editGestureController', () => {
     await flushPromises();
 
     expect(editGestureController.hasActiveGesture()).toBe(false);
-    // 커밋 revision 미확정(null) 상태에서는 게이트 없이 보조 cancel 발송
-    expect(previewApi.cancel).toHaveBeenCalledWith(sessionId, undefined);
+    // 배치 간격 커밋처럼 committed echo가 다른 gestureId로 향하면
+    // 원격 창 세션이 잔존하므로 성공 경로에도 보조 cancel이 나가야 함
+    expect(previewApi.cancel).toHaveBeenCalledTimes(1);
+    expect(previewApi.cancel).toHaveBeenCalledWith(sessionId);
     expect(useKeyStore.getState().positions['4key'][0].width).toBe(60);
   });
 
diff --git a/src/renderer/api/modules/editorAdapters.test.ts b/src/renderer/api/modules/editorAdapters.test.ts
index db64ac76..19ee82e2 100644
--- a/src/renderer/api/modules/editorAdapters.test.ts
+++ b/src/renderer/api/modules/editorAdapters.test.ts
@@ -68,10 +68,13 @@ describe('editor API compatibility adapters', () => {
 
     commitPatch.mockClear();
     commitPatch.mockResolvedValue(structuredClone(document));
-    await keysApi.updatePositions(positions, 'gesture-1');
+    await keysApi.updatePositions(
+      positions,
+      '6f9c2f6a-0b1d-4e5f-8a3c-2d7e9b4c1a50',
+    );
     expect(commitPatch).toHaveBeenCalledWith(
       { schemaVersion: 1, keyPositions: positions },
-      { gestureId: 'gesture-1' },
+      { gestureId: '6f9c2f6a-0b1d-4e5f-8a3c-2d7e9b4c1a50' },
     );
   });
 
diff --git a/src/renderer/api/modules/gestureApi.ts b/src/renderer/api/modules/gestureApi.ts
new file mode 100644
index 00000000..44739776
--- /dev/null
+++ b/src/renderer/api/modules/gestureApi.ts
@@ -0,0 +1,53 @@
+import { invoke } from '@tauri-apps/api/core';
+
+import { assertSafeEditorRevision } from '@src/types/editor';
+
+import type { SavedPluginInstanceWire } from './pluginInstancesApi';
+import type { EditorField, EditorPatchV1 } from '@src/types/editor';
+
+export interface GesturePluginInstancesChange {
+  pluginId: string;
+  instances: SavedPluginInstanceWire[];
+}
+
+export interface GestureCommitRequest {
+  gestureId: string;
+  mutationId: string;
+  editorBaseRevision: number;
+  pluginBaseRevision: number;
+  observedHistoryEpoch?: number;
+  authorityGeneration: number;
+  editorChanges?: EditorPatchV1;
+  pluginChanges: GesturePluginInstancesChange[];
+}
+
+export interface GestureCommitResult {
+  editorRevision: number;
+  changedFields: EditorField[];
+  pluginModelRevision: number;
+  changedPluginIds: string[];
+  authorityGeneration: number;
+}
+
+const assertGestureCommitResult = (
+  result: GestureCommitResult,
+): GestureCommitResult => {
+  assertSafeEditorRevision(result.editorRevision, 'editorRevision');
+  assertSafeEditorRevision(result.pluginModelRevision, 'pluginModelRevision');
+  assertSafeEditorRevision(result.authorityGeneration, 'authorityGeneration');
+  if (
+    !Array.isArray(result.changedFields) ||
+    !Array.isArray(result.changedPluginIds) ||
+    result.changedPluginIds.some((pluginId) => typeof pluginId !== 'string')
+  ) {
+    throw new Error('commit_gesture returned an invalid result');
+  }
+  return result;
+};
+
+export const gestureApi = {
+  commit: async (request: GestureCommitRequest): Promise<GestureCommitResult> =>
+    assertGestureCommitResult(
+      await invoke<GestureCommitResult>('commit_gesture', { request }),
+    ),
+};
diff --git a/src/renderer/api/modules/keysApi.ts b/src/renderer/api/modules/keysApi.ts
index 74662978..ba09fd78 100644
--- a/src/renderer/api/modules/keysApi.ts
+++ b/src/renderer/api/modules/keysApi.ts
@@ -3,6 +3,7 @@ import { subscribe } from './shared';
 import { rawKeyEventBus } from '@utils/core/rawKeyEventBus';
 import { enqueueEditorCompatibilityWrite } from '@src/renderer/editor/runtime/editorCompatibilityQueue';
 import { editorCoordinator } from '@src/renderer/editor/runtime/editorStateCoordinator';
+import { runLegacyEditorMutation } from '@src/renderer/editor/runtime/legacyEditorMutation';
 
 import type {
   KeyCounterUpdate,
@@ -24,6 +25,24 @@ import type {
   KeyCounters,
 } from '@src/types/key/keys';
 
+// 백엔드 gestureId UUID 강제와 동형 (canonical hyphenated + 32-hex simple)
+const GESTURE_ID_PATTERN =
+  /^(?:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}|[0-9a-f]{32})$/i;
+
+// 플러그인 표면(dmn.keys.*)이 임의 문자열을 넘길 수 있음 - 비 UUID가 드레인에
+// 섞이면 같은 커밋의 사용자 편집까지 INVALID_GESTURE_ID로 통째 실패하므로
+// 유입 지점에서 걸러내고 커밋은 진행
+const sanitizeGestureId = (gestureId?: string): string | undefined => {
+  if (!gestureId || GESTURE_ID_PATTERN.test(gestureId)) return gestureId;
+  console.warn('[keysApi] Dropped non-UUID gestureId:', gestureId);
+  return undefined;
+};
+
+const gestureMeta = (gestureId?: string): { gestureId: string } | undefined => {
+  const safeId = sanitizeGestureId(gestureId);
+  return safeId ? { gestureId: safeId } : undefined;
+};
+
 export const keysApi = {
   get: () => invoke<KeyMappings>('keys_get'),
   getCounters: () => invoke<KeyCounters>('keys_get_counters'),
@@ -45,7 +64,7 @@ export const keysApi = {
             keys: mappings,
             keyPositions: positions,
           },
-          gestureId ? { gestureId } : undefined,
+          gestureMeta(gestureId),
         ),
       () => ({
         keys: structuredClone(mappings),
@@ -61,15 +80,20 @@ export const keysApi = {
             schemaVersion: 1,
             keyPositions: positions,
           },
-          gestureId ? { gestureId } : undefined,
+          gestureMeta(gestureId),
         ),
       () => structuredClone(positions),
     ),
   setMode: (mode: string) =>
     invoke<KeysModeResponse>('keys_set_mode', { mode }),
-  resetAll: () => invoke<KeysResetAllResponse>('keys_reset_all'),
+  resetAll: () =>
+    runLegacyEditorMutation(() =>
+      invoke<KeysResetAllResponse>('keys_reset_all'),
+    ),
   resetMode: (mode: string) =>
-    invoke<KeysModeResponse>('keys_reset_mode', { mode }),
+    runLegacyEditorMutation(() =>
+      invoke<KeysModeResponse>('keys_reset_mode', { mode }),
+    ),
   setCounters: (counters: KeyCounters) =>
     invoke<KeyCounters>('keys_set_counters', { counters }),
   resetCounters: () => invoke<KeyCounters>('keys_reset_counters'),
@@ -117,9 +141,13 @@ export const keysApi = {
   customTabs: {
     list: () => invoke<CustomTab[]>('custom_tabs_list'),
     create: (name: string) =>
-      invoke<CustomTabResult>('custom_tabs_create', { name }),
+      runLegacyEditorMutation(() =>
+        invoke<CustomTabResult>('custom_tabs_create', { name }),
+      ),
     delete: (id: string) =>
-      invoke<CustomTabDeleteResult>('custom_tabs_delete', { id }),
+      runLegacyEditorMutation(() =>
+        invoke<CustomTabDeleteResult>('custom_tabs_delete', { id }),
+      ),
     select: (id: string) =>
       invoke<CustomTabDeleteResult>('custom_tabs_select', { id }),
     restore: (customTabs: CustomTab[], selectedKeyType: string) =>
diff --git a/src/renderer/api/modules/pluginInstancesApi.ts b/src/renderer/api/modules/pluginInstancesApi.ts
index 0e8c8413..556abaaa 100644
--- a/src/renderer/api/modules/pluginInstancesApi.ts
+++ b/src/renderer/api/modules/pluginInstancesApi.ts
@@ -8,6 +8,8 @@ export interface SavedPluginInstanceWire {
   settings?: Record<string, unknown>;
   measuredSize?: { width: number; height: number };
   tabId?: string;
+  hidden?: boolean;
+  zIndex?: number;
 }
 
 export interface PluginInstancesCommitRequest {
diff --git a/src/renderer/api/modules/presetsApi.ts b/src/renderer/api/modules/presetsApi.ts
index c774e549..f10ad537 100644
--- a/src/renderer/api/modules/presetsApi.ts
+++ b/src/renderer/api/modules/presetsApi.ts
@@ -1,5 +1,6 @@
 import { invoke } from '@tauri-apps/api/core';
 import { subscribe } from './shared';
+import { runLegacyEditorMutation } from '@src/renderer/editor/runtime/legacyEditorMutation';
 
 import type {
   PresetOperationResult,
@@ -8,9 +9,13 @@ import type {
 
 export const presetsApi = {
   save: () => invoke<PresetOperationResult>('preset_save'),
-  load: () => invoke<PresetOperationResult>('preset_load'),
+  load: () =>
+    runLegacyEditorMutation(() => invoke<PresetOperationResult>('preset_load')),
   saveTab: () => invoke<PresetOperationResult>('preset_save_tab'),
-  loadTab: () => invoke<PresetOperationResult>('preset_load_tab'),
+  loadTab: () =>
+    runLegacyEditorMutation(() =>
+      invoke<PresetOperationResult>('preset_load_tab'),
+    ),
   onSnapshot: (listener: (snapshot: PresetSnapshot) => void) =>
     subscribe<PresetSnapshot>('preset:snapshot', listener),
 };
diff --git a/src/renderer/api/modules/previewApi.ts b/src/renderer/api/modules/previewApi.ts
index dd3f6c5f..a5211d5f 100644
--- a/src/renderer/api/modules/previewApi.ts
+++ b/src/renderer/api/modules/previewApi.ts
@@ -26,6 +26,6 @@ export const previewApi = {
   publish: (request: PreviewPublishRequest) =>
     invoke<void>('editor_preview_publish', { request }),
 
-  cancel: (sessionId: string, minRevision?: number) =>
-    invoke<void>('editor_preview_cancel', { sessionId, minRevision }),
+  cancel: (sessionId: string) =>
+    invoke<void>('editor_preview_cancel', { sessionId }),
 };
diff --git a/src/renderer/api/modules/resourceApi.ts b/src/renderer/api/modules/resourceApi.ts
index 7514ae3b..b239ff0f 100644
--- a/src/renderer/api/modules/resourceApi.ts
+++ b/src/renderer/api/modules/resourceApi.ts
@@ -1,5 +1,6 @@
 import { invoke } from '@tauri-apps/api/core';
 import { subscribe } from './shared';
+import { runLegacyEditorMutation } from '@src/renderer/editor/runtime/legacyEditorMutation';
 
 export const fontApi = {
   load: () =>
@@ -8,7 +9,11 @@ export const fontApi = {
 
 export const imageApi = {
   load: () =>
-    invoke<import('@src/types/plugin/api').ImageLoadResult>('image_load'),
+    runLegacyEditorMutation(
+      () =>
+        invoke<import('@src/types/plugin/api').ImageLoadResult>('image_load'),
+      { syncAfter: false },
+    ),
 };
 
 export const soundApi = {
@@ -22,9 +27,14 @@ export const soundApi = {
       displayName,
     }),
   remove: (soundPath: string) =>
-    invoke<import('@src/types/plugin/api').SoundDeleteResult>('sound_delete', {
-      soundPath,
-    }),
+    runLegacyEditorMutation(() =>
+      invoke<import('@src/types/plugin/api').SoundDeleteResult>(
+        'sound_delete',
+        {
+          soundPath,
+        },
+      ),
+    ),
   setHidden: (soundPath: string, hidden: boolean) =>
     invoke<import('@src/types/plugin/api').SoundSetHiddenResult>(
       'sound_set_hidden',
@@ -132,14 +142,18 @@ export const counterAnimationApi = {
   update: (
     request: import('@src/types/plugin/api').CounterAnimationUpdateRequest,
   ) =>
-    invoke<import('@src/types/plugin/api').CounterAnimationUpsertResponse>(
-      'counter_animation_update',
-      { request },
+    runLegacyEditorMutation(() =>
+      invoke<import('@src/types/plugin/api').CounterAnimationUpsertResponse>(
+        'counter_animation_update',
+        { request },
+      ),
     ),
   remove: (id: string) =>
-    invoke<import('@src/types/plugin/api').CounterAnimationDeleteResponse>(
-      'counter_animation_delete',
-      { id },
+    runLegacyEditorMutation(() =>
+      invoke<import('@src/types/plugin/api').CounterAnimationDeleteResponse>(
+        'counter_animation_delete',
+        { id },
+      ),
     ),
   onChanged: (
     listener: (
diff --git a/src/renderer/components/main/Grid/core/Grid.tsx b/src/renderer/components/main/Grid/core/Grid.tsx
index 74cc3933..d113f7ce 100644
--- a/src/renderer/components/main/Grid/core/Grid.tsx
+++ b/src/renderer/components/main/Grid/core/Grid.tsx
@@ -94,6 +94,15 @@ import {
   getPreviewOverlayVersion,
   subscribePreviewOverlay,
 } from '@src/renderer/editor/runtime/previewOverlay';
+import {
+  beginPluginInstancesEditSession,
+  endPluginInstancesEditSession,
+  rotatePluginInstancesEditSession,
+} from '@plugins/runtime/displayElement/instancesCommitQueue';
+import {
+  beginMixedGestureTransaction,
+  cancelUncommittedMixedGestureTransaction,
+} from '@plugins/runtime/displayElement/gestureTransaction';
 
 type ToolbarAddRequest = {
   id: number;
@@ -319,6 +328,64 @@ const Grid = ({
   const pluginElements = usePluginDisplayElementStore(
     (state) => state.elements,
   );
+  const selectedDragGestureIdRef = useRef<string | null>(null);
+
+  const rotatePluginElementSessions = (fullIds: string[]) => {
+    const selectedPluginIds = new Set(fullIds);
+    const pluginIds = new Set(
+      usePluginDisplayElementStore
+        .getState()
+        .elements.filter((element) => selectedPluginIds.has(element.fullId))
+        .map((element) => element.pluginId),
+    );
+    pluginIds.forEach((pluginId) => {
+      rotatePluginInstancesEditSession(pluginId);
+    });
+  };
+
+  const beginSelectedPluginInstancesDrag = () => {
+    const gestureId = crypto.randomUUID();
+    selectedDragGestureIdRef.current = gestureId;
+    const selectedPluginElementIds = new Set(
+      useGridSelectionStore
+        .getState()
+        .selectedElements.filter((element) => element.type === 'plugin')
+        .map((element) => element.id),
+    );
+    const tokens = new Map<string, string>();
+    usePluginDisplayElementStore
+      .getState()
+      .elements.filter((element) =>
+        selectedPluginElementIds.has(element.fullId),
+      )
+      .forEach((element) => {
+        if (!tokens.has(element.pluginId)) {
+          tokens.set(
+            element.pluginId,
+            beginPluginInstancesEditSession(element.pluginId, gestureId),
+          );
+        }
+      });
+    if (
+      tokens.size > 0 &&
+      useGridSelectionStore
+        .getState()
+        .selectedElements.some((element) => element.type !== 'plugin')
+    ) {
+      beginMixedGestureTransaction(gestureId, [...tokens.keys()]);
+    }
+    return () => {
+      tokens.forEach((token, pluginId) => {
+        endPluginInstancesEditSession(pluginId, token);
+      });
+      // 종료 경로가 혼합 커밋을 타지 않은 경우 staged 잔존으로 barrier가
+      // 영구 대기하지 않도록 미커밋 staged만 정산
+      cancelUncommittedMixedGestureTransaction(gestureId);
+      if (selectedDragGestureIdRef.current === gestureId) {
+        selectedDragGestureIdRef.current = null;
+      }
+    };
+  };
 
   // 내장 통계 요소(Stat Items) 위치 정보
   const canonicalStatPositions = useStatItemStore((state) => state.positions);
@@ -355,6 +422,11 @@ const Grid = ({
     keyMappings,
     positions,
   });
+  const commitSelectedElementsDrag = () => {
+    syncSelectedElementsToOverlay(
+      selectedDragGestureIdRef.current ?? undefined,
+    );
+  };
 
   // 마퀴 선택 훅 사용
   const { isMarqueeSelecting: _isMarqueeSelecting, startMarqueeSelection } =
@@ -398,6 +470,7 @@ const Grid = ({
     } else if (selected.type === 'stat') {
       await moveStatForward(selected.index);
     } else if (selected.type === 'plugin') {
+      rotatePluginElementSessions([selected.id]);
       usePluginDisplayElementStore.getState().bringForward(selected.id);
     } else if (selected.type === 'graph') {
       await moveGraphForward(selected.index);
@@ -415,6 +488,7 @@ const Grid = ({
     } else if (selected.type === 'stat') {
       await moveStatBackward(selected.index);
     } else if (selected.type === 'plugin') {
+      rotatePluginElementSessions([selected.id]);
       usePluginDisplayElementStore.getState().sendBackward(selected.id);
     } else if (selected.type === 'graph') {
       await moveGraphBackward(selected.index);
@@ -605,6 +679,12 @@ const Grid = ({
   const moveSelectedToFront = async () => {
     if (selectedElements.length === 0) return;
 
+    rotatePluginElementSessions(
+      selectedElements
+        .filter((element) => element.type === 'plugin')
+        .map((element) => element.id),
+    );
+
     for (const el of selectedElements) {
       if (el.type === 'key' && el.index !== undefined) {
         if (typeof onMoveToFront === 'function') {
@@ -627,6 +707,12 @@ const Grid = ({
   const moveSelectedToBack = async () => {
     if (selectedElements.length === 0) return;
 
+    rotatePluginElementSessions(
+      selectedElements
+        .filter((element) => element.type === 'plugin')
+        .map((element) => element.id),
+    );
+
     for (const el of selectedElements) {
       if (el.type === 'key' && el.index !== undefined) {
         if (typeof onMoveToBack === 'function') {
@@ -1036,9 +1122,10 @@ const Grid = ({
           )}
           selectedElements={selectedElements}
           onMultiDrag={(deltaX, deltaY) =>
-            moveSelectedElements(deltaX, deltaY, false, false)
+            moveSelectedElements(deltaX, deltaY, undefined, false)
           }
-          onMultiDragEnd={syncSelectedElementsToOverlay}
+          onMultiDragStart={beginSelectedPluginInstancesDrag}
+          onMultiDragEnd={commitSelectedElementsDrag}
           activeTool={activeTool}
           onEraserClick={() => {
             const globalKey = keyMappings[selectedKeyType]?.[index] || '';
@@ -1124,9 +1211,10 @@ const Grid = ({
         )}
         selectedElements={selectedElements}
         onMultiDrag={(deltaX, deltaY) =>
-          moveSelectedElements(deltaX, deltaY, false, false)
+          moveSelectedElements(deltaX, deltaY, undefined, false)
         }
-        onMultiDragEnd={syncSelectedElementsToOverlay}
+        onMultiDragStart={beginSelectedPluginInstancesDrag}
+        onMultiDragEnd={commitSelectedElementsDrag}
         activeTool={activeTool}
         onEraserClick={() => {
           const displayName = getStatTypeLabel(position.statType);
@@ -1207,9 +1295,10 @@ const Grid = ({
         )}
         selectedElements={selectedElements}
         onMultiDrag={(deltaX, deltaY) =>
-          moveSelectedElements(deltaX, deltaY, false, false)
+          moveSelectedElements(deltaX, deltaY, undefined, false)
         }
-        onMultiDragEnd={syncSelectedElementsToOverlay}
+        onMultiDragStart={beginSelectedPluginInstancesDrag}
+        onMultiDragEnd={commitSelectedElementsDrag}
         activeTool={activeTool}
         onEraserClick={() => {
           const displayName = getStatTypeLabel(position.statType);
@@ -1288,9 +1377,10 @@ const Grid = ({
         )}
         selectedElements={selectedElements}
         onMultiDrag={(deltaX, deltaY) =>
-          moveSelectedElements(deltaX, deltaY, false, false)
+          moveSelectedElements(deltaX, deltaY, undefined, false)
         }
-        onMultiDragEnd={syncSelectedElementsToOverlay}
+        onMultiDragStart={beginSelectedPluginInstancesDrag}
+        onMultiDragEnd={commitSelectedElementsDrag}
         activeTool={activeTool}
         onEraserClick={() => {
           showConfirm(
@@ -1595,9 +1685,10 @@ const Grid = ({
             return true;
           }}
           onMultiDrag={(deltaX, deltaY) =>
-            moveSelectedElements(deltaX, deltaY, false, false)
+            moveSelectedElements(deltaX, deltaY, undefined, false)
           }
-          onMultiDragEnd={syncSelectedElementsToOverlay}
+          onMultiDragStart={beginSelectedPluginInstancesDrag}
+          onMultiDragEnd={commitSelectedElementsDrag}
         />
       </div>
       {/* 스마트 가이드 오버레이 */}
diff --git a/src/renderer/components/main/Grid/handles/GroupResizeHandles.tsx b/src/renderer/components/main/Grid/handles/GroupResizeHandles.tsx
index cb06fba4..fadcb8b7 100644
--- a/src/renderer/components/main/Grid/handles/GroupResizeHandles.tsx
+++ b/src/renderer/components/main/Grid/handles/GroupResizeHandles.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useState } from 'react';
+import React, { useLayoutEffect, useRef, useState } from 'react';
 import { useSmartGuidesStore } from '@stores/grid/useSmartGuidesStore';
 import { useSettingsStore } from '@stores/useSettingsStore';
 import {
@@ -244,6 +244,11 @@ const GroupResizeHandles = ({
     maxShrinkX: 0,
     maxShrinkY: 0,
   });
+  const activeResizeCleanupRef = useRef<(() => void) | null>(null);
+
+  useLayoutEffect(() => {
+    return () => activeResizeCleanupRef.current?.();
+  }, []);
 
   // 그룹 바운딩 박스 계산
   const groupData = calculateGroupBounds(
@@ -346,7 +351,8 @@ const GroupResizeHandles = ({
       handle,
     };
 
-    onGroupResizeStart?.(handle);
+    let resizeStarted = false;
+    let resizeFinished = false;
 
     const handleMouseMove = (moveEvent: MouseEvent) => {
       if (!resizeRef.current.isResizing) return;
@@ -702,7 +708,7 @@ const GroupResizeHandles = ({
         finalGroupMaxY = Math.max(finalGroupMaxY, bounds.y + bounds.height);
       }
 
-      onGroupResize?.({
+      const result = {
         groupBounds: {
           x: finalGroupMinX,
           y: finalGroupMinY,
@@ -711,23 +717,49 @@ const GroupResizeHandles = ({
         },
         elementBounds: newElementBounds,
         handle,
+      };
+      const changed = newElementBounds.some(({ element, bounds }) => {
+        const initial = startElementBounds.find(
+          (entry) =>
+            entry.element.id === element.id &&
+            entry.element.type === element.type &&
+            entry.element.index === element.index,
+        );
+        return (
+          !initial ||
+          bounds.x !== initial.bounds.x ||
+          bounds.y !== initial.bounds.y ||
+          bounds.width !== initial.bounds.width ||
+          bounds.height !== initial.bounds.height
+        );
       });
+      if (!resizeStarted && changed) {
+        resizeStarted = true;
+        onGroupResizeStart?.(handle);
+      }
+      if (resizeStarted) onGroupResize?.(result);
     };
 
     const handleMouseUp = () => {
+      if (resizeFinished) return;
+      resizeFinished = true;
       resizeRef.current.isResizing = false;
+      activeResizeCleanupRef.current = null;
       // 스마트 가이드 클리어
       useSmartGuidesStore.getState().clearGuides();
       document.removeEventListener('mousemove', handleMouseMove);
       document.removeEventListener('mouseup', handleMouseUp);
       window.removeEventListener('blur', handleMouseUp);
+      window.removeEventListener('pointercancel', handleMouseUp);
       unlockCustomCursor();
-      onGroupResizeEnd?.();
+      if (resizeStarted) onGroupResizeEnd?.();
     };
 
+    activeResizeCleanupRef.current = handleMouseUp;
     document.addEventListener('mousemove', handleMouseMove);
     document.addEventListener('mouseup', handleMouseUp);
     window.addEventListener('blur', handleMouseUp);
+    window.addEventListener('pointercancel', handleMouseUp);
   };
 
   if (!groupData || selectedElements.length < 2) return null;
diff --git a/src/renderer/components/main/Grid/handles/ResizeHandles.tsx b/src/renderer/components/main/Grid/handles/ResizeHandles.tsx
index 83b01b47..fe8ef63c 100644
--- a/src/renderer/components/main/Grid/handles/ResizeHandles.tsx
+++ b/src/renderer/components/main/Grid/handles/ResizeHandles.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useState } from 'react';
+import React, { useLayoutEffect, useRef, useState } from 'react';
 import { useSettingsStore } from '@stores/useSettingsStore';
 import {
   CursorType,
@@ -224,6 +224,11 @@ const ResizeHandles = ({
     startBounds: null,
     startAspectRatio: 1,
   });
+  const activeResizeCleanupRef = useRef<(() => void) | null>(null);
+
+  useLayoutEffect(() => {
+    return () => activeResizeCleanupRef.current?.();
+  }, []);
 
   const handleMouseDown = (e: React.MouseEvent, handle: HandleDef) => {
     e.preventDefault();
@@ -248,7 +253,8 @@ const ResizeHandles = ({
       startAspectRatio,
     };
 
-    onResizeStart?.(handle);
+    let resizeStarted = false;
+    let resizeFinished = false;
 
     const handleMouseMove = (moveEvent: MouseEvent) => {
       if (!resizeRef.current.isResizing) return;
@@ -359,27 +365,43 @@ const ResizeHandles = ({
       }
       // dy === 1: newY = startBounds.y (상단 앵커 유지)
 
-      onResize?.({
+      const result = {
         x: newX,
         y: newY,
         width: newWidth,
         height: newHeight,
         handle: handle!,
-      });
+      };
+      const changed =
+        result.x !== startBounds!.x ||
+        result.y !== startBounds!.y ||
+        result.width !== startBounds!.width ||
+        result.height !== startBounds!.height;
+      if (!resizeStarted && changed) {
+        resizeStarted = true;
+        onResizeStart?.(handle!);
+      }
+      if (resizeStarted) onResize?.(result);
     };
 
     const handleMouseUp = () => {
+      if (resizeFinished) return;
+      resizeFinished = true;
       resizeRef.current.isResizing = false;
+      activeResizeCleanupRef.current = null;
       document.removeEventListener('mousemove', handleMouseMove);
       document.removeEventListener('mouseup', handleMouseUp);
       window.removeEventListener('blur', handleMouseUp);
+      window.removeEventListener('pointercancel', handleMouseUp);
       unlockCustomCursor();
-      onResizeEnd?.();
+      if (resizeStarted) onResizeEnd?.();
     };
 
+    activeResizeCleanupRef.current = handleMouseUp;
     document.addEventListener('mousemove', handleMouseMove);
     document.addEventListener('mouseup', handleMouseUp);
     window.addEventListener('blur', handleMouseUp);
+    window.addEventListener('pointercancel', handleMouseUp);
   };
 
   if (!bounds) return null;
diff --git a/src/renderer/components/main/Grid/layers/GraphItem.tsx b/src/renderer/components/main/Grid/layers/GraphItem.tsx
index 429453c9..1256fdd2 100644
--- a/src/renderer/components/main/Grid/layers/GraphItem.tsx
+++ b/src/renderer/components/main/Grid/layers/GraphItem.tsx
@@ -52,7 +52,7 @@ interface GraphItemProps {
   isSelected?: boolean;
   selectedElements?: SelectedElement[];
   onMultiDrag?: (dx: number, dy: number) => void;
-  onMultiDragStart?: () => void;
+  onMultiDragStart?: () => void | (() => void);
   onMultiDragEnd?: () => void;
   activeTool?: string;
   onEraserClick?: () => void;
diff --git a/src/renderer/components/main/Grid/layers/KnobItem.tsx b/src/renderer/components/main/Grid/layers/KnobItem.tsx
index a32832c5..c8d8ba23 100644
--- a/src/renderer/components/main/Grid/layers/KnobItem.tsx
+++ b/src/renderer/components/main/Grid/layers/KnobItem.tsx
@@ -75,7 +75,7 @@ interface KnobItemProps {
   isSelected?: boolean;
   selectedElements?: SelectedElement[];
   onMultiDrag?: (dx: number, dy: number) => void;
-  onMultiDragStart?: () => void;
+  onMultiDragStart?: () => void | (() => void);
   onMultiDragEnd?: () => void;
   activeTool?: string;
   onEraserClick?: () => void;
diff --git a/src/renderer/components/main/Settings.tsx b/src/renderer/components/main/Settings.tsx
index 9e385355..962259e2 100644
--- a/src/renderer/components/main/Settings.tsx
+++ b/src/renderer/components/main/Settings.tsx
@@ -50,21 +50,21 @@ import { DEFAULT_OBS_PORT } from '@src/types/obs';
 // 설정 미리보기 영상
 const PREVIEW_SOURCES: Record<string, string> = {
   overlayLock:
-    'https://raw.githubusercontent.com/lee-sihun/DmNote/master/docs/assets/webm/overlay-lock.webm',
+    'https://raw.githubusercontent.com/DmNote-App/DmNote/master/docs/assets/webm/overlay-lock.webm',
   alwaysOnTop:
-    'https://raw.githubusercontent.com/lee-sihun/DmNote/master/docs/assets/webm/alwaysontop.webm',
+    'https://raw.githubusercontent.com/DmNote-App/DmNote/master/docs/assets/webm/alwaysontop.webm',
   noteEffect:
-    'https://raw.githubusercontent.com/lee-sihun/DmNote/master/docs/assets/webm/noteeffect.webm',
+    'https://raw.githubusercontent.com/DmNote-App/DmNote/master/docs/assets/webm/noteeffect.webm',
   keyCounter:
-    'https://raw.githubusercontent.com/lee-sihun/DmNote/master/docs/assets/webm/counter.webm',
+    'https://raw.githubusercontent.com/DmNote-App/DmNote/master/docs/assets/webm/counter.webm',
   customCSS:
-    'https://raw.githubusercontent.com/lee-sihun/DmNote/master/docs/assets/webm/css.webm',
+    'https://raw.githubusercontent.com/DmNote-App/DmNote/master/docs/assets/webm/css.webm',
   customJS:
-    'https://raw.githubusercontent.com/lee-sihun/DmNote/master/docs/assets/webm/plugin.webm',
+    'https://raw.githubusercontent.com/DmNote-App/DmNote/master/docs/assets/webm/plugin.webm',
   resizeAnchor:
-    'https://raw.githubusercontent.com/lee-sihun/DmNote/master/docs/assets/webm/resize.webm',
+    'https://raw.githubusercontent.com/DmNote-App/DmNote/master/docs/assets/webm/resize.webm',
   obsMode:
-    'https://raw.githubusercontent.com/lee-sihun/DmNote/master/docs/assets/webm/obs.webm',
+    'https://raw.githubusercontent.com/DmNote-App/DmNote/master/docs/assets/webm/obs.webm',
 };
 
 // ASIO 버퍼 크기 선택지(프레임). 게임 설정값과 맞춰야 ASIO 공존 가능.
diff --git a/src/renderer/components/main/Tool/ToolBar.tsx b/src/renderer/components/main/Tool/ToolBar.tsx
index fd02ab24..1be0370b 100644
--- a/src/renderer/components/main/Tool/ToolBar.tsx
+++ b/src/renderer/components/main/Tool/ToolBar.tsx
@@ -56,7 +56,7 @@ const ToolBar = ({
               <FloatingTooltip content={t('tooltip.github')}>
                 <button
                   onClick={() =>
-                    handleClick('https://github.com/lee-sihun/DmNote')
+                    handleClick('https://github.com/DmNote-App/DmNote')
                   }
                   className="flex items-center justify-center w-[30px] h-[30px] rounded-md text-fg-muted hover:bg-fill hover:text-fg active:bg-fill-hover transition-colors duration-fast"
                 >
@@ -66,7 +66,7 @@ const ToolBar = ({
               <FloatingTooltip content={t('tooltip.issue')}>
                 <button
                   onClick={() =>
-                    handleClick('https://github.com/lee-sihun/DmNote/issues')
+                    handleClick('https://github.com/DmNote-App/DmNote/issues')
                   }
                   className="flex items-center justify-center gap-[8px] h-[30px] px-[12px] rounded-md text-fg-muted hover:bg-fill hover:text-fg active:bg-fill-hover transition-colors duration-fast"
                 >
diff --git a/src/renderer/components/shared/Key.tsx b/src/renderer/components/shared/Key.tsx
index 4baba517..82cbfabc 100644
--- a/src/renderer/components/shared/Key.tsx
+++ b/src/renderer/components/shared/Key.tsx
@@ -47,7 +47,7 @@ interface DraggableKeyProps {
   isSelected?: boolean;
   selectedElements?: SelectedElement[];
   onMultiDrag?: (dx: number, dy: number) => void;
-  onMultiDragStart?: () => void;
+  onMultiDragStart?: () => void | (() => void);
   onMultiDragEnd?: () => void;
   activeTool?: string;
   onEraserClick?: () => void;
diff --git a/src/renderer/components/shared/PluginElement.tsx b/src/renderer/components/shared/PluginElement.tsx
index 36796f43..97356694 100644
--- a/src/renderer/components/shared/PluginElement.tsx
+++ b/src/renderer/components/shared/PluginElement.tsx
@@ -38,6 +38,11 @@ import {
   measureConnectedPluginElement,
   resolveResizablePluginElementSize,
 } from '@utils/plugin/pluginElementMeasurement';
+import {
+  beginPluginInstancesEditSession,
+  endPluginInstancesEditSession,
+  rotatePluginInstancesEditSession,
+} from '@plugins/runtime/displayElement/instancesCommitQueue';
 
 const DEFAULT_POSITION_OFFSET = { x: 0, y: 0 };
 const EMPTY_SELECTED_ELEMENTS: SelectedElement[] = [];
@@ -101,7 +106,7 @@ interface PluginElementProps {
     referenceElement: HTMLDivElement | null;
   }) => boolean;
   onMultiDrag?: (deltaX: number, deltaY: number) => void;
-  onMultiDragStart?: () => void;
+  onMultiDragStart?: () => void | (() => void);
   onMultiDragEnd?: () => void;
 }
 
@@ -426,6 +431,10 @@ const PluginElementImpl: React.FC<PluginElementProps> = ({
     gridSize: gridSnapSize,
     initialX: calculatedPosition.x,
     initialY: calculatedPosition.y,
+    onDragStart: () => {
+      const token = beginPluginInstancesEditSession(element.pluginId);
+      return () => endPluginInstancesEditSession(element.pluginId, token);
+    },
     onPositionChange: (newX, newY) => {
       // 선택 모드가 아닐 때만 개별 이동
       if (windowType === 'main' && element.draggable && !isSelectionMode) {
@@ -1398,12 +1407,16 @@ const PluginElementImpl: React.FC<PluginElementProps> = ({
     if (itemId === 'delete') {
       deletePluginElement();
     } else if (itemId === 'bringToFront') {
+      rotatePluginInstancesEditSession(element.pluginId);
       usePluginDisplayElementStore.getState().bringToFront(element.fullId);
     } else if (itemId === 'bringForward') {
+      rotatePluginInstancesEditSession(element.pluginId);
       usePluginDisplayElementStore.getState().bringForward(element.fullId);
     } else if (itemId === 'sendBackward') {
+      rotatePluginInstancesEditSession(element.pluginId);
       usePluginDisplayElementStore.getState().sendBackward(element.fullId);
     } else if (itemId === 'sendToBack') {
+      rotatePluginInstancesEditSession(element.pluginId);
       usePluginDisplayElementStore.getState().sendToBack(element.fullId);
     } else if (itemId.startsWith('custom-')) {
       const index = parseInt(itemId.replace('custom-', ''), 10);
diff --git a/src/renderer/components/shared/PluginElementsRenderer.tsx b/src/renderer/components/shared/PluginElementsRenderer.tsx
index adf4e112..44894a4d 100644
--- a/src/renderer/components/shared/PluginElementsRenderer.tsx
+++ b/src/renderer/components/shared/PluginElementsRenderer.tsx
@@ -59,7 +59,7 @@ interface PluginElementsRendererProps {
     referenceElement: HTMLDivElement | null;
   }) => boolean;
   onMultiDrag?: (deltaX: number, deltaY: number) => void;
-  onMultiDragStart?: () => void;
+  onMultiDragStart?: () => void | (() => void);
   onMultiDragEnd?: () => void;
 }
 
diff --git a/src/renderer/editor/runtime/editGestureController.ts b/src/renderer/editor/runtime/editGestureController.ts
index 6bd15678..6905c93b 100644
--- a/src/renderer/editor/runtime/editGestureController.ts
+++ b/src/renderer/editor/runtime/editGestureController.ts
@@ -16,6 +16,11 @@ import { PREVIEW_SCHEMA_VERSION, type PreviewDomain } from '@src/types/preview';
 import { previewOverlay } from './previewOverlay';
 import { editorCoordinator } from './editorStateCoordinator';
 import { drainEditorWrites, trackEditorWrite } from './editorWriteBarrier';
+import {
+  registerGestureSession,
+  releaseGestureSession,
+  type GestureSessionLifecycle,
+} from './gestureSessionLifecycle';
 
 interface PreviewEntry {
   index: number;
@@ -28,6 +33,7 @@ interface PreviewOptions {
 
 interface ActiveGesture {
   sessionId: string;
+  lifecycle: GestureSessionLifecycle;
   mode: string;
   seq: number;
   // 도메인 → target index → 게스처 동안 누적된 전체 patch
@@ -105,8 +111,10 @@ export const editGestureController = {
       this.cancel();
     }
     if (!active) {
+      const sessionId = crypto.randomUUID();
       active = {
-        sessionId: crypto.randomUUID(),
+        sessionId,
+        lifecycle: registerGestureSession(sessionId),
         mode,
         seq: 0,
         appliedPatches: new Map(),
@@ -159,10 +167,7 @@ export const editGestureController = {
     return active?.sessionId ?? null;
   },
 
-  /**
-   * 커밋 정산: persist 성공 시 세션 종료 + 수신측 정리 브로드캐스트
-   * 실패 시 세션 유지 (재시도 또는 명시 cancel은 호출자 몫)
-   */
+  /** 커밋 정산: 성공 시 로컬 세션 종료, 실패 시 재시도 상태 복원 */
   settleCommit(persistPromise: Promise<unknown>): void {
     // 게스처 유무와 무관하게 창 전환이 정산 커밋의 성패까지 기다리게 함
     trackEditorWrite(persistPromise);
@@ -173,21 +178,26 @@ export const editGestureController = {
 
     persistPromise
       .then(() => {
+        releaseGestureSession(gesture.lifecycle);
         previewOverlay.endSession(gesture.sessionId);
-        // 1차 정리는 committed 이벤트의 gestureId echo, cancel은 병합 커밋 등
-        // echo가 다른 세션으로 향한 경우를 위한 보조 정리
-        // 커밋 revision을 게이트로 실어 수신측의 선행 제거를 방지
-        const committedRevision = editorCoordinator.getState().revision;
-        previewApi
-          .cancel(gesture.sessionId, committedRevision ?? undefined)
-          .catch(() => {});
+        // 1차 정리는 committed 이벤트의 gestureIds echo - 배치 간격 커밋처럼
+        // echo가 다른 세션 ID로 향하면 원격 창의 이 세션이 잔존하므로 보조 정리
+        // (tombstone이 중복 cancel을 흡수해 정상 경로에선 no-op)
+        previewApi.cancel(gesture.sessionId).catch(() => {});
       })
       .catch((error) => {
+        if (gesture.lifecycle.discarded) {
+          releaseGestureSession(gesture.lifecycle);
+          previewOverlay.endSession(gesture.sessionId);
+          previewApi.cancel(gesture.sessionId).catch(() => {});
+          return;
+        }
         console.error('Commit failed, keeping preview session', error);
         // 새 게스처가 이미 시작됐으면 이전 세션은 오버레이만 정리
         if (active === null) {
           active = gesture;
         } else {
+          releaseGestureSession(gesture.lifecycle);
           previewOverlay.endSession(gesture.sessionId);
           previewApi.cancel(gesture.sessionId).catch(() => {});
         }
@@ -199,6 +209,7 @@ export const editGestureController = {
     const gesture = active;
     if (!gesture) return;
     active = null;
+    releaseGestureSession(gesture.lifecycle);
     gesture.pendingGroups.clear();
     previewOverlay.endSession(gesture.sessionId);
     previewApi.cancel(gesture.sessionId).catch(() => {});
diff --git a/src/renderer/editor/runtime/editorCoordinator.test.ts b/src/renderer/editor/runtime/editorCoordinator.test.ts
index 16e0d5b5..2f906f51 100644
--- a/src/renderer/editor/runtime/editorCoordinator.test.ts
+++ b/src/renderer/editor/runtime/editorCoordinator.test.ts
@@ -5,6 +5,7 @@ import {
   EditorProtocolError,
   assertEditorGetResult,
   assertSafeEditorRevision,
+  isEditorCommitError,
 } from '@src/types/editor';
 
 import {
@@ -153,7 +154,12 @@ const createHarness = (
   options: Partial<
     Pick<
       EditorCoordinatorOptions,
-      'focusTarget' | 'visibilityTarget' | 'readOnly'
+      | 'focusTarget'
+      | 'visibilityTarget'
+      | 'readOnly'
+      | 'onCommittedApplied'
+      | 'onGestureIdsDiscarded'
+      | 'onStartSucceeded'
     >
   > = {},
 ) => {
@@ -176,6 +182,9 @@ const createHarness = (
     focusTarget: options.focusTarget ?? null,
     visibilityTarget: options.visibilityTarget ?? null,
     readOnly: options.readOnly,
+    onCommittedApplied: options.onCommittedApplied,
+    onGestureIdsDiscarded: options.onGestureIdsDiscarded,
+    onStartSucceeded: options.onStartSucceeded,
   });
 
   return {
@@ -268,6 +277,19 @@ describe('editor document helpers', () => {
     expect(() => assertEditorGetResult(result)).not.toThrow();
   });
 
+  it.each(['TOO_MANY_GESTURE_IDS', 'INVALID_GESTURE_ID'] as const)(
+    'recognizes %s as a non-retryable editor commit error',
+    (errorCode) => {
+      expect(
+        isEditorCommitError({
+          errorCode,
+          message: errorCode,
+          retryable: false,
+        }),
+      ).toBe(true);
+    },
+  );
+
   it('still rejects null for required position fields', () => {
     const result = {
       revision: 0,
@@ -327,6 +349,134 @@ describe('editor document helpers', () => {
 });
 
 describe('EditorSaveCoordinator', () => {
+  it('keeps queued mixed gestures as separate ordered transactions', async () => {
+    const base = makeDocument('A');
+    const harness = createHarness(base);
+    await harness.coordinator.start();
+    const firstResponse = deferred<EditorCommitResult>();
+    const contexts: Array<{
+      gestureId: string;
+      editorBaseRevision: number;
+      mutationId: string;
+      keys: string[] | undefined;
+    }> = [];
+
+    const first = harness.coordinator.commitGesture(
+      { schemaVersion: 1, keys: { '4key': ['B'] } },
+      'gesture-a',
+      async (context) => {
+        contexts.push({
+          gestureId: 'gesture-a',
+          editorBaseRevision: context.editorBaseRevision,
+          mutationId: context.mutationId,
+          keys: context.editorChanges?.keys?.['4key'],
+        });
+        return firstResponse.promise;
+      },
+    );
+    const second = harness.coordinator.commitGesture(
+      { schemaVersion: 1, keys: { '4key': ['C'] } },
+      'gesture-b',
+      async (context) => {
+        contexts.push({
+          gestureId: 'gesture-b',
+          editorBaseRevision: context.editorBaseRevision,
+          mutationId: context.mutationId,
+          keys: context.editorChanges?.keys?.['4key'],
+        });
+        return { revision: 2, changedFields: ['keys'] };
+      },
+    );
+
+    await vi.waitFor(() => expect(contexts).toHaveLength(1));
+    expect(contexts[0]).toMatchObject({
+      gestureId: 'gesture-a',
+      editorBaseRevision: 0,
+      keys: ['B'],
+    });
+    firstResponse.resolve({ revision: 1, changedFields: ['keys'] });
+    await expect(first).resolves.toMatchObject({ keys: { '4key': ['B'] } });
+    await expect(second).resolves.toMatchObject({ keys: { '4key': ['C'] } });
+
+    expect(contexts).toHaveLength(2);
+    expect(contexts[1]).toMatchObject({
+      gestureId: 'gesture-b',
+      editorBaseRevision: 1,
+      keys: ['C'],
+    });
+    expect(contexts[0].mutationId).not.toBe(contexts[1].mutationId);
+    expect(harness.coordinator.getState().lastAck).toMatchObject({
+      keys: { '4key': ['C'] },
+    });
+    harness.coordinator.stop();
+  });
+
+  it('resyncs canonical state when a gesture result is outcome-unknown', async () => {
+    const base = makeDocument('A');
+    const target = makeDocument('B');
+    const harness = createHarness(base);
+    await harness.coordinator.start();
+
+    const committing = harness.coordinator.commitGesture(
+      { schemaVersion: 1, keys: target.keys },
+      'gesture-a',
+      async () => {
+        harness.transport.canonical = { revision: 1, document: target };
+        throw ioError();
+      },
+    );
+
+    await expect(committing).rejects.toEqual(ioError());
+    expect(harness.coordinator.getState().revision).toBe(1);
+    expect(harness.coordinator.getState().lastAck).toEqual(target);
+    expect(harness.getLocal()).toEqual(target);
+    harness.coordinator.stop();
+  });
+
+  it('gesture 실패가 이후 진행 중인 낙관 편집을 되돌리지 않는다', async () => {
+    const base = makeDocument('A');
+    const gestureTarget = makeDocument('B');
+    const laterOptimistic = makeDocument('C');
+    const harness = createHarness(base);
+    await harness.coordinator.start();
+    const response = deferred<EditorCommitResult>();
+
+    const committing = harness.coordinator.commitGesture(
+      { schemaVersion: 1, keys: gestureTarget.keys },
+      'gesture-a',
+      () => response.promise,
+    );
+    await vi.waitFor(() =>
+      expect(harness.coordinator.getState().phase).toBe('saving'),
+    );
+    harness.setLocal(laterOptimistic);
+    response.reject(validationError());
+
+    await expect(committing).rejects.toEqual(validationError());
+    expect(harness.coordinator.getState().lastAck).toEqual(base);
+    expect(harness.getLocal()).toEqual(laterOptimistic);
+    harness.coordinator.stop();
+  });
+
+  it('runs the start success hook after initialization recovers lazily', async () => {
+    const initializationError = new Error('initial get failed');
+    const onStartSucceeded = vi.fn(async () => {});
+    const harness = createHarness(makeDocument(), { onStartSucceeded });
+    harness.transport.getMock.mockRejectedValueOnce(initializationError);
+
+    await expect(harness.coordinator.start()).rejects.toBe(initializationError);
+    expect(onStartSucceeded).not.toHaveBeenCalled();
+
+    await expect(harness.coordinator.start()).resolves.toMatchObject({
+      revision: 0,
+    });
+    expect(onStartSucceeded).toHaveBeenCalledOnce();
+
+    await harness.coordinator.start();
+    expect(onStartSucceeded).toHaveBeenCalledTimes(2);
+    harness.coordinator.stop();
+  });
+
   it('buffers events until the initial snapshot closes the subscription race', async () => {
     const base = makeDocument();
     const next = { ...base, keys: { '4key': ['B'] } };
@@ -438,7 +588,7 @@ describe('EditorSaveCoordinator', () => {
     harness.coordinator.stop();
   });
 
-  it('merges same-tick patches without dropping intermediate collections', async () => {
+  it('merges same-tick patches with every gesture ID', async () => {
     const base = makeDocument();
     const keyPositions = structuredClone(base.keyPositions);
     keyPositions['4key'][0].dx = 10;
@@ -461,10 +611,22 @@ describe('EditorSaveCoordinator', () => {
     await harness.coordinator.start();
 
     const commits = [
-      harness.coordinator.commitPatch({ schemaVersion: 1, keyPositions }),
-      harness.coordinator.commitPatch({ schemaVersion: 1, statPositions }),
-      harness.coordinator.commitPatch({ schemaVersion: 1, graphPositions }),
-      harness.coordinator.commitPatch({ schemaVersion: 1, knobPositions }),
+      harness.coordinator.commitPatch(
+        { schemaVersion: 1, keyPositions },
+        { gestureId: 'gesture-key' },
+      ),
+      harness.coordinator.commitPatch(
+        { schemaVersion: 1, statPositions },
+        { gestureId: 'gesture-stat' },
+      ),
+      harness.coordinator.commitPatch(
+        { schemaVersion: 1, graphPositions },
+        { gestureId: 'gesture-graph' },
+      ),
+      harness.coordinator.commitPatch(
+        { schemaVersion: 1, knobPositions },
+        { gestureId: 'gesture-knob' },
+      ),
     ];
     await vi.waitFor(() =>
       expect(harness.transport.commitMock).toHaveBeenCalledOnce(),
@@ -480,6 +642,14 @@ describe('EditorSaveCoordinator', () => {
       graphPositions,
       knobPositions,
     });
+    expect(harness.transport.commitMock.mock.calls[0][0]).toMatchObject({
+      gestureId: 'gesture-key',
+      gestureIds: ['gesture-key'],
+    });
+    expect(harness.transport.commitMock.mock.calls[1][0]).toMatchObject({
+      gestureId: 'gesture-knob',
+      gestureIds: ['gesture-stat', 'gesture-graph', 'gesture-knob'],
+    });
 
     mergedResult.resolve({
       revision: 2,
@@ -496,6 +666,67 @@ describe('EditorSaveCoordinator', () => {
     harness.coordinator.stop();
   });
 
+  it('keeps the newest 32 gesture IDs across an IO failure and retry', async () => {
+    const base = makeDocument();
+    const onGestureIdsDiscarded =
+      vi.fn<(gestureIds: readonly string[]) => void>();
+    const harness = createHarness(base, { onGestureIdsDiscarded });
+    const firstResult = deferred<EditorCommitResult>();
+    harness.transport.commitMock.mockReturnValueOnce(firstResult.promise);
+    const gestureIds = Array.from(
+      { length: 34 },
+      (_, index) =>
+        `00000000-0000-4000-8000-${String(index + 1).padStart(12, '0')}`,
+    );
+    await harness.coordinator.start();
+
+    const commits = [
+      harness.coordinator.commitPatch(
+        { schemaVersion: 1, keys: { '4key': ['value-0'] } },
+        { gestureId: gestureIds[0] },
+      ),
+    ];
+    await vi.waitFor(() =>
+      expect(harness.transport.commitMock).toHaveBeenCalledOnce(),
+    );
+
+    for (let index = 1; index < gestureIds.length; index += 1) {
+      commits.push(
+        harness.coordinator.commitPatch(
+          { schemaVersion: 1, keys: { '4key': [`value-${index}`] } },
+          { gestureId: gestureIds[index] },
+        ),
+      );
+    }
+    await vi.waitFor(() =>
+      expect(onGestureIdsDiscarded).toHaveBeenCalledOnce(),
+    );
+
+    const transientError = ioError();
+    firstResult.reject(transientError);
+    const results = await Promise.allSettled(commits);
+    expect(results.every(({ status }) => status === 'rejected')).toBe(true);
+    expect(harness.coordinator.getState()).toMatchObject({
+      dirty: true,
+      failureKind: 'transient',
+    });
+
+    await expect(harness.coordinator.retryPending()).resolves.toMatchObject({
+      keys: { '4key': ['value-33'] },
+    });
+    expect(harness.transport.commitMock).toHaveBeenCalledTimes(2);
+    const retryRequest = harness.transport.commitMock.mock.calls[1][0];
+    expect(retryRequest.gestureIds).toEqual(gestureIds.slice(-32));
+    expect(retryRequest.gestureIds).toHaveLength(32);
+    expect(retryRequest.gestureId).toBe(gestureIds.at(-1));
+    expect(retryRequest.gestureIds).toContain(retryRequest.gestureId);
+    expect(onGestureIdsDiscarded.mock.calls.flatMap(([ids]) => ids)).toEqual([
+      gestureIds[1],
+      gestureIds[0],
+    ]);
+    harness.coordinator.stop();
+  });
+
   it('does not apply its own event twice when it arrives before the response', async () => {
     const base = makeDocument();
     const target = { ...base, keys: { '4key': ['B'] } };
@@ -524,6 +755,31 @@ describe('EditorSaveCoordinator', () => {
     harness.coordinator.stop();
   });
 
+  it('응답 뒤에 도착한 own event도 병합 gesture ID 정리를 전달', async () => {
+    const base = makeDocument();
+    const target = { ...base, keys: { '4key': ['B'] } };
+    const onCommittedApplied = vi.fn();
+    const harness = createHarness(base, { onCommittedApplied });
+    await harness.coordinator.start();
+
+    await harness.coordinator.commitPatch({
+      schemaVersion: 1,
+      keys: target.keys,
+    });
+    const request = harness.transport.commitMock.mock.calls[0][0];
+    harness.transport.emit({
+      ...eventFor(1, request.mutationId, base, target),
+      gestureIds: ['main-session', 'panel-session'],
+    });
+
+    await vi.waitFor(() => expect(onCommittedApplied).toHaveBeenCalledOnce());
+    expect(onCommittedApplied.mock.calls[0][0].gestureIds).toEqual([
+      'main-session',
+      'panel-session',
+    ]);
+    harness.coordinator.stop();
+  });
+
   it('resynchronizes a revision gap and ignores an older event', async () => {
     const base = makeDocument();
     const remote = withGroups({ ...base, keys: { '4key': ['C'] } }, 'remote');
@@ -545,6 +801,31 @@ describe('EditorSaveCoordinator', () => {
     harness.coordinator.stop();
   });
 
+  it('revision gap 재동기화 실패에도 committed 프리뷰 정리를 전달', async () => {
+    const base = makeDocument();
+    const remote = withGroups({ ...base, keys: { '4key': ['C'] } }, 'remote');
+    const onCommittedApplied = vi.fn();
+    const harness = createHarness(base, { onCommittedApplied });
+    await harness.coordinator.start();
+    const resyncError = new Error('resync unavailable');
+    harness.transport.getMock.mockRejectedValueOnce(resyncError);
+
+    harness.transport.emit({
+      ...eventFor(2, 'external-gap', base, remote),
+      gestureIds: ['00000000-0000-4000-8000-000000000001'],
+    });
+
+    await vi.waitFor(() => expect(onCommittedApplied).toHaveBeenCalledOnce());
+    expect(onCommittedApplied.mock.calls[0][0].gestureIds).toEqual([
+      '00000000-0000-4000-8000-000000000001',
+    ]);
+    await vi.waitFor(() =>
+      expect(harness.coordinator.getState().error).toBe(resyncError),
+    );
+    expect(harness.coordinator.getState().revision).toBe(0);
+    harness.coordinator.stop();
+  });
+
   it('revalidates on focus and visible lifecycle transitions', async () => {
     class VisibilityTarget extends EventTarget {
       visibilityState = 'visible';
diff --git a/src/renderer/editor/runtime/editorCoordinator.ts b/src/renderer/editor/runtime/editorCoordinator.ts
index 31aa0383..a0641d9f 100644
--- a/src/renderer/editor/runtime/editorCoordinator.ts
+++ b/src/renderer/editor/runtime/editorCoordinator.ts
@@ -20,6 +20,7 @@ import type {
   EditorDocumentV1,
   EditorField,
   EditorGetResult,
+  EditorGestureCommitContext,
   EditorPatchV1,
 } from '@src/types/editor';
 
@@ -95,8 +96,8 @@ export interface EditorCoordinatorOptions {
   readOnly?: boolean | (() => boolean);
   // committed 이벤트가 canonical에 반영된 직후 호출 (프리뷰 오버레이 정리용)
   onCommittedApplied?: (event: EditorCommittedV1) => void;
-  // committed·resync 등 canonical revision이 전진한 모든 경로에서 호출
-  onCanonicalRevisionAdvanced?: (revision: number) => void;
+  onGestureIdsDiscarded?: (gestureIds: readonly string[]) => void;
+  onStartSucceeded?: () => void | Promise<void>;
 }
 
 export interface EditorSyncOptions {
@@ -117,11 +118,13 @@ interface InFlightCommit {
   target: EditorDocumentV1;
   localFields: EditorField[];
   requestFields: EditorField[];
-  gestureId?: string;
+  gestureIds: string[];
 }
 
 const MAX_AUTO_REBASE_ATTEMPTS = 2;
 const MAX_TRACKED_MUTATIONS = 64;
+// Rust state/editor.rs의 MAX_GESTURE_IDS와 동일한 IPC 상한
+const MAX_PENDING_GESTURE_IDS = 32;
 
 const clone = <T>(value: T): T => structuredClone(value);
 
@@ -210,9 +213,10 @@ export class EditorSaveCoordinator {
   private readonly onCommittedApplied:
     | ((event: EditorCommittedV1) => void)
     | null;
-  private readonly onCanonicalRevisionAdvanced:
-    | ((revision: number) => void)
+  private readonly onGestureIdsDiscarded:
+    | ((gestureIds: readonly string[]) => void)
     | null;
+  private readonly onStartSucceeded: (() => void | Promise<void>) | null;
 
   private phase: EditorCoordinatorPhase = 'idle';
   private revision: number | null = null;
@@ -221,8 +225,8 @@ export class EditorSaveCoordinator {
   private pendingFields: EditorField[] = [];
   private pendingRequestFields: EditorField[] = [];
   private inFlight: InFlightCommit | null = null;
-  // 커밋 의도 시점에 캡처된 게스처 ID (드레인에서 소비, 실패 시 복원)
-  private pendingGestureId: string | null = null;
+  // 커밋 의도 시점에 캡처된 게스처 ID 집합
+  private pendingGestureIds: string[] = [];
   private conflict: EditorConflictState | null = null;
   private error: unknown = null;
   private failureKind: 'transient' | 'permanent' | null = null;
@@ -233,6 +237,7 @@ export class EditorSaveCoordinator {
   private drainPromise: Promise<void> | null = null;
   private syncPromise: Promise<void> | null = null;
   private eventQueue: Promise<void> = Promise.resolve();
+  private gestureCommitTail: Promise<unknown> = Promise.resolve();
   private unsubscribeCommitted: EditorReadyUnsubscribe | null = null;
   private bufferedEvents: EditorCommittedV1[] = [];
   private ownMutations = new Set<string>();
@@ -253,8 +258,8 @@ export class EditorSaveCoordinator {
     this.readDocument = options.readDocument;
     this.applyDocument = options.applyDocument;
     this.onCommittedApplied = options.onCommittedApplied ?? null;
-    this.onCanonicalRevisionAdvanced =
-      options.onCanonicalRevisionAdvanced ?? null;
+    this.onGestureIdsDiscarded = options.onGestureIdsDiscarded ?? null;
+    this.onStartSucceeded = options.onStartSucceeded ?? null;
     this.createMutationId =
       options.createMutationId ?? (() => crypto.randomUUID());
     this.focusTarget =
@@ -298,26 +303,30 @@ export class EditorSaveCoordinator {
     if (this.stopped) {
       return Promise.reject(new Error('editor coordinator is stopped'));
     }
-    if (this.startPromise) return this.startPromise;
-
-    this.startPromise = this.initialize().catch((error) => {
-      this.startPromise = null;
-      this.initializing = false;
-      this.phase = 'error';
-      this.error = error;
-      this.detachLifecycle();
-      this.unsubscribeCommitted?.();
-      this.unsubscribeCommitted = null;
-      this.notify();
-      throw error;
+    if (!this.startPromise) {
+      this.startPromise = this.initialize().catch((error) => {
+        this.startPromise = null;
+        this.initializing = false;
+        this.phase = 'error';
+        this.error = error;
+        this.detachLifecycle();
+        this.unsubscribeCommitted?.();
+        this.unsubscribeCommitted = null;
+        this.notify();
+        throw error;
+      });
+    }
+    return this.startPromise.then(async (result) => {
+      await this.onStartSucceeded?.();
+      return result;
     });
-    return this.startPromise;
   }
 
   async commitEditorState(
     document?: EditorDocumentV1,
   ): Promise<EditorDocumentV1> {
     this.assertWritable();
+    await this.waitForGestureCommits();
     await this.start();
     // gradient canonical 정규화를 assert 앞에 — 이후 diff·invoke가 같은 값 사용
     const currentDocument = canonicalizeEditorGradients(
@@ -337,8 +346,9 @@ export class EditorSaveCoordinator {
     requestFields: readonly EditorField[],
     gestureId?: string,
   ): Promise<EditorDocumentV1> {
-    // 병합 시 마지막 게스처가 대표 ID, 나머지는 정산 측 cancel 브로드캐스트가 정리
-    if (gestureId) this.pendingGestureId = gestureId;
+    if (gestureId) {
+      this.replacePendingGestureIds([...this.pendingGestureIds, gestureId]);
+    }
     if (this.conflict) {
       const conflict = this.conflict;
       const newlyChangedFields = getChangedEditorFields(
@@ -383,6 +393,7 @@ export class EditorSaveCoordinator {
     meta?: { gestureId?: string },
   ): Promise<EditorDocumentV1> {
     this.assertWritable();
+    await this.waitForGestureCommits();
     await this.start();
     // gradient canonical 정규화를 assert 앞에 — optimistic·diff·invoke가 같은 값 사용
     const canonicalChanges = canonicalizeEditorGradients(changes);
@@ -413,8 +424,37 @@ export class EditorSaveCoordinator {
     );
   }
 
+  commitGesture(
+    changes: EditorPatchV1 | undefined,
+    gestureId: string,
+    commit: (
+      context: EditorGestureCommitContext,
+    ) => Promise<EditorCommitResult>,
+  ): Promise<EditorDocumentV1> {
+    this.assertWritable();
+    const previous = this.gestureCommitTail;
+    // 앞선 gesture 실패가 다음 gesture로 전파되지 않게 양쪽 경로 모두 실행
+    const runInner = () => this.commitGestureInner(changes, gestureId, commit);
+    const run = previous.then(runInner, runInner);
+    this.gestureCommitTail = run;
+    void run.then(
+      () => {
+        if (this.gestureCommitTail === run) {
+          this.gestureCommitTail = Promise.resolve();
+        }
+      },
+      () => {
+        if (this.gestureCommitTail === run) {
+          this.gestureCommitTail = Promise.resolve();
+        }
+      },
+    );
+    return run;
+  }
+
   async retryPending(): Promise<EditorDocumentV1> {
     this.assertWritable();
+    await this.waitForGestureCommits();
     await this.start();
     if (this.conflict) {
       throw this.error ?? new Error('editor conflict pending');
@@ -433,6 +473,7 @@ export class EditorSaveCoordinator {
     resolution: EditorConflictResolution,
   ): Promise<EditorDocumentV1> {
     if (resolution === 'keepLocal') this.assertWritable();
+    await this.waitForGestureCommits();
     if (this.drainPromise) {
       await this.drainPromise.catch(() => undefined);
     }
@@ -450,7 +491,7 @@ export class EditorSaveCoordinator {
       this.pendingLocal = null;
       this.pendingFields = [];
       this.pendingRequestFields = [];
-      this.pendingGestureId = null;
+      this.pendingGestureIds = [];
       this.phase = 'idle';
       this.applyDocument(clone(conflict.canonical), 'acceptCanonical');
       this.notify();
@@ -471,6 +512,7 @@ export class EditorSaveCoordinator {
   }
 
   async sync(options: EditorSyncOptions = {}): Promise<void> {
+    await this.waitForGestureCommits();
     await this.start();
     if (this.syncPromise) {
       await this.syncPromise;
@@ -490,6 +532,7 @@ export class EditorSaveCoordinator {
   }
 
   async flush(): Promise<EditorDocumentV1> {
+    await this.waitForGestureCommits();
     if (this.isReadOnly()) {
       await this.start();
       await this.eventQueue;
@@ -606,8 +649,9 @@ export class EditorSaveCoordinator {
       const baseDocument = clone(this.requireLastAck());
       const baseRevision = this.requireRevision();
       const mutationId = this.createMutationId();
-      const gestureId = this.pendingGestureId ?? undefined;
-      this.pendingGestureId = null;
+      const gestureIds = this.pendingGestureIds;
+      this.pendingGestureIds = [];
+      const gestureId = gestureIds.at(-1);
       const inFlight: InFlightCommit = {
         mutationId,
         baseRevision,
@@ -615,7 +659,7 @@ export class EditorSaveCoordinator {
         target: clone(target),
         localFields,
         requestFields,
-        gestureId,
+        gestureIds,
       };
       this.inFlight = inFlight;
       this.rememberOwnMutation(inFlight);
@@ -627,7 +671,8 @@ export class EditorSaveCoordinator {
           baseRevision,
           mutationId,
           changes: patchForFields(target, requestFields),
-          ...(inFlight.gestureId ? { gestureId: inFlight.gestureId } : {}),
+          ...(gestureId ? { gestureId } : {}),
+          ...(gestureIds.length > 0 ? { gestureIds } : {}),
         });
         assertEditorCommitResult(result);
         await this.applyCommitResult(inFlight, result);
@@ -652,9 +697,7 @@ export class EditorSaveCoordinator {
               inFlight.localFields,
               inFlight.requestFields,
             );
-            if (inFlight.gestureId && this.pendingGestureId === null) {
-              this.pendingGestureId = inFlight.gestureId;
-            }
+            this.restorePendingGestureIds(inFlight.gestureIds);
             this.phase = 'error';
             this.error = syncError;
             this.failureKind = 'transient';
@@ -663,10 +706,7 @@ export class EditorSaveCoordinator {
           }
           if (didRebase) {
             rebaseAttempts += 1;
-            // 더 최신 pending 게스처가 없을 때만 실패분 복원
-            if (inFlight.gestureId && this.pendingGestureId === null) {
-              this.pendingGestureId = inFlight.gestureId;
-            }
+            this.restorePendingGestureIds(inFlight.gestureIds);
             continue;
           }
         } else if (isEditorCommitError(error) && error.retryable) {
@@ -675,9 +715,7 @@ export class EditorSaveCoordinator {
             inFlight.localFields,
             inFlight.requestFields,
           );
-          if (inFlight.gestureId && this.pendingGestureId === null) {
-            this.pendingGestureId = inFlight.gestureId;
-          }
+          this.restorePendingGestureIds(inFlight.gestureIds);
           this.phase = 'error';
           this.error = error;
           this.failureKind = 'transient';
@@ -692,6 +730,115 @@ export class EditorSaveCoordinator {
     }
   }
 
+  private async commitGestureInner(
+    changes: EditorPatchV1 | undefined,
+    gestureId: string,
+    commit: (
+      context: EditorGestureCommitContext,
+    ) => Promise<EditorCommitResult>,
+  ): Promise<EditorDocumentV1> {
+    await this.start();
+    await this.drainUntilSettled();
+    await this.eventQueue;
+    if (this.conflict) {
+      throw this.error ?? new Error('editor conflict pending');
+    }
+
+    const canonicalChanges = changes
+      ? canonicalizeEditorGradients(changes)
+      : undefined;
+    if (canonicalChanges) assertEditorPatch(canonicalChanges);
+    const baseDocument = clone(this.requireLastAck());
+    const target = canonicalChanges
+      ? applyEditorPatch(baseDocument, canonicalChanges)
+      : baseDocument;
+    const requestFields = canonicalChanges
+      ? EDITOR_FIELDS.filter((field) => canonicalChanges[field] !== undefined)
+      : [];
+    const localFields = getChangedEditorFields(baseDocument, target);
+    const mutationId = this.createMutationId();
+    const inFlight: InFlightCommit = {
+      mutationId,
+      baseRevision: this.requireRevision(),
+      baseDocument,
+      target: clone(target),
+      localFields,
+      requestFields,
+      gestureIds: [gestureId],
+    };
+    this.inFlight = inFlight;
+    this.rememberOwnMutation(inFlight);
+    this.phase = 'saving';
+    this.notify();
+
+    try {
+      const result = await commit({
+        editorBaseRevision: inFlight.baseRevision,
+        mutationId,
+        ...(requestFields.length > 0
+          ? { editorChanges: patchForFields(target, requestFields) }
+          : {}),
+      });
+      assertEditorCommitResult(result);
+      await this.applyCommitResult(inFlight, result);
+      this.error = null;
+      this.failureKind = null;
+      this.phase = 'idle';
+      this.notify();
+      return clone(this.requireLastAck());
+    } catch (error) {
+      this.ownMutations.delete(mutationId);
+      if (isEditorCommitError(error) && error.retryable) {
+        try {
+          const canonical = await this.transport.get();
+          assertEditorGetResult(canonical);
+          if (canonical.revision >= this.requireRevision()) {
+            this.revision = canonical.revision;
+            this.lastAck = clone(canonical.document);
+          }
+        } catch {
+          // 원래 transaction 오류를 유지
+        }
+      }
+      this.error = error;
+      this.failureKind =
+        isEditorCommitError(error) && error.retryable
+          ? 'transient'
+          : 'permanent';
+      this.phase = 'error';
+      this.applyRejectedGestureProjection(inFlight);
+      this.notify();
+      throw error;
+    } finally {
+      if (this.inFlight?.mutationId === mutationId) this.inFlight = null;
+    }
+  }
+
+  private applyRejectedGestureProjection(inFlight: InFlightCommit): void {
+    const local = this.readDocument();
+    const changedAfterTarget = new Set(
+      getChangedEditorFields(inFlight.target, local),
+    );
+    const changedAfterBase = new Set(
+      getChangedEditorFields(inFlight.baseDocument, local),
+    );
+    const rollbackFields = inFlight.localFields.filter(
+      (field) => !changedAfterTarget.has(field) || !changedAfterBase.has(field),
+    );
+    if (rollbackFields.length === 0) return;
+
+    // 실패한 transaction 이후의 낙관 편집은 rollback 소유 범위 밖
+    const rejected = applyEditorPatch(
+      local,
+      patchForFields(this.requireLastAck(), rollbackFields),
+    );
+    this.applyDocument(clone(rejected), 'rejected');
+  }
+
+  private async waitForGestureCommits(): Promise<void> {
+    await this.gestureCommitTail.catch(() => undefined);
+  }
+
   private async applyCommitResult(
     inFlight: InFlightCommit,
     result: EditorCommitResult,
@@ -807,9 +954,18 @@ export class EditorSaveCoordinator {
     assertEditorCommittedEvent(event);
     if (this.stopped || this.revision === null || !this.lastAck) return;
 
-    if (event.revision <= this.revision) return;
+    if (event.revision <= this.revision) {
+      this.ownMutations.delete(event.mutationId);
+      this.onCommittedApplied?.(event);
+      return;
+    }
     if (event.revision > this.revision + 1) {
-      await this.fetchAndApplyCanonical('resync');
+      try {
+        await this.fetchAndApplyCanonical('resync');
+      } finally {
+        // 프리뷰 정리는 canonical 재동기화 성공 여부와 독립
+        this.onCommittedApplied?.(event);
+      }
       return;
     }
 
@@ -824,7 +980,6 @@ export class EditorSaveCoordinator {
       this.error = null;
       this.notify();
       this.onCommittedApplied?.(event);
-      this.onCanonicalRevisionAdvanced?.(event.revision);
       return;
     }
 
@@ -836,7 +991,6 @@ export class EditorSaveCoordinator {
       previousCanonical,
     );
     this.onCommittedApplied?.(event);
-    this.onCanonicalRevisionAdvanced?.(event.revision);
   }
 
   private async fetchAndApplyCanonical(
@@ -855,7 +1009,6 @@ export class EditorSaveCoordinator {
     if (!previous) {
       this.applyDocument(clone(result.document), reason);
       this.notify();
-      this.onCanonicalRevisionAdvanced?.(result.revision);
       return;
     }
 
@@ -867,7 +1020,6 @@ export class EditorSaveCoordinator {
       reason,
       previous,
     );
-    this.onCanonicalRevisionAdvanced?.(result.revision);
   }
 
   private applyExternalCanonical(
@@ -977,12 +1129,38 @@ export class EditorSaveCoordinator {
     );
   }
 
+  private restorePendingGestureIds(gestureIds: readonly string[]): void {
+    this.replacePendingGestureIds([...gestureIds, ...this.pendingGestureIds]);
+  }
+
+  private replacePendingGestureIds(gestureIds: readonly string[]): void {
+    const seen = new Set<string>();
+    const retainedNewestFirst: string[] = [];
+    const discardedNewestFirst: string[] = [];
+
+    for (let index = gestureIds.length - 1; index >= 0; index -= 1) {
+      const gestureId = gestureIds[index];
+      if (seen.has(gestureId)) continue;
+      seen.add(gestureId);
+      if (retainedNewestFirst.length < MAX_PENDING_GESTURE_IDS) {
+        retainedNewestFirst.push(gestureId);
+      } else {
+        discardedNewestFirst.push(gestureId);
+      }
+    }
+
+    this.pendingGestureIds = retainedNewestFirst.reverse();
+    if (discardedNewestFirst.length > 0) {
+      this.onGestureIdsDiscarded?.(discardedNewestFirst.reverse());
+    }
+  }
+
   private discardRejectedPending(error: unknown, mutationId: string): void {
     this.ownMutations.delete(mutationId);
     this.pendingLocal = null;
     this.pendingFields = [];
     this.pendingRequestFields = [];
-    this.pendingGestureId = null;
+    this.pendingGestureIds = [];
     this.phase = 'error';
     this.error = error;
     this.failureKind = 'permanent';
diff --git a/src/renderer/editor/runtime/editorGestureDiscardIntegration.test.ts b/src/renderer/editor/runtime/editorGestureDiscardIntegration.test.ts
new file mode 100644
index 00000000..606fcf1f
--- /dev/null
+++ b/src/renderer/editor/runtime/editorGestureDiscardIntegration.test.ts
@@ -0,0 +1,126 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { createDefaultKeyPosition } from '@src/renderer/editor/model/keys';
+
+import type { EditorCommitError, EditorDocumentV1 } from '@src/types/editor';
+
+const runtime = vi.hoisted(() => {
+  let rejectCommit!: (error: EditorCommitError) => void;
+  const pendingCommit = new Promise<never>((_, reject) => {
+    rejectCommit = reject;
+  });
+  const get = vi.fn();
+  const commit = vi.fn(() => pendingCommit);
+  const onCommitted = vi.fn(() =>
+    Object.assign(() => {}, { ready: Promise.resolve() }),
+  );
+  const subscribe = vi.fn(async () => 1);
+  const publish = vi.fn(async () => {});
+  const cancel = vi.fn(async () => {});
+
+  return {
+    cancel,
+    commit,
+    get,
+    onCommitted,
+    publish,
+    rejectCommit: (error: EditorCommitError) => rejectCommit(error),
+    subscribe,
+  };
+});
+
+vi.mock('@api/modules/editorApi', () => ({
+  editorApi: {
+    get: runtime.get,
+    commit: runtime.commit,
+    onCommitted: runtime.onCommitted,
+  },
+}));
+
+vi.mock('@api/modules/previewApi', () => ({
+  previewApi: {
+    cancel: runtime.cancel,
+    publish: runtime.publish,
+    subscribe: runtime.subscribe,
+  },
+}));
+
+import { editGestureController } from './editGestureController';
+import { editorCoordinator } from './editorStateCoordinator';
+import { previewOverlay } from './previewOverlay';
+
+const makeDocument = (): EditorDocumentV1 => ({
+  schemaVersion: 1,
+  keys: { '4key': ['A'] },
+  keyPositions: { '4key': [createDefaultKeyPosition()] },
+  statPositions: {},
+  graphPositions: {},
+  knobPositions: {},
+  layerGroups: {},
+});
+
+const ioError = (): EditorCommitError => ({
+  errorCode: 'IO_ERROR',
+  message: 'disk unavailable',
+  retryable: true,
+});
+
+describe('discarded editor gesture integration', () => {
+  afterEach(() => {
+    editGestureController.cancel();
+    editorCoordinator.stop();
+    previewOverlay.clearAll();
+    vi.unstubAllGlobals();
+    vi.restoreAllMocks();
+  });
+
+  it('keeps truncated sessions terminal after shared IO failure; old code revived the first session', async () => {
+    vi.spyOn(console, 'error').mockImplementation(() => undefined);
+    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
+      callback(0);
+      return 0;
+    });
+    const document = makeDocument();
+    runtime.get.mockResolvedValue({ revision: 0, document });
+    await editorCoordinator.start();
+
+    const sessionIds: string[] = [];
+    const commits: Array<Promise<EditorDocumentV1>> = [];
+    const queueGesture = (index: number) => {
+      const width = 61 + index;
+      editGestureController.preview('4key', [{ index: 0, patch: { width } }]);
+      const sessionId = editGestureController.activeGestureId();
+      expect(sessionId).not.toBeNull();
+      sessionIds.push(sessionId!);
+      const persisted = editorCoordinator.commitPatch(
+        {
+          schemaVersion: 1,
+          keyPositions: {
+            '4key': [{ ...createDefaultKeyPosition(), width }],
+          },
+        },
+        { gestureId: sessionId! },
+      );
+      editGestureController.settleCommit(persisted);
+      commits.push(persisted);
+    };
+
+    queueGesture(0);
+    await vi.waitFor(() => expect(runtime.commit).toHaveBeenCalledOnce());
+    for (let index = 1; index < 34; index += 1) {
+      queueGesture(index);
+    }
+
+    await vi.waitFor(() =>
+      expect(runtime.cancel).toHaveBeenCalledWith(sessionIds[1]),
+    );
+    runtime.rejectCommit(ioError());
+    const results = await Promise.allSettled(commits);
+
+    expect(results.every(({ status }) => status === 'rejected')).toBe(true);
+    expect(runtime.cancel).toHaveBeenCalledWith(sessionIds[0]);
+    expect(runtime.cancel).toHaveBeenCalledWith(sessionIds[1]);
+    expect([sessionIds[0], sessionIds[1]]).not.toContain(
+      editGestureController.activeGestureId(),
+    );
+  });
+});
diff --git a/src/renderer/editor/runtime/editorStateCoordinator.test.ts b/src/renderer/editor/runtime/editorStateCoordinator.test.ts
new file mode 100644
index 00000000..430d1b11
--- /dev/null
+++ b/src/renderer/editor/runtime/editorStateCoordinator.test.ts
@@ -0,0 +1,124 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import type { EditorCommittedV1, EditorDocumentV1 } from '@src/types/editor';
+
+const runtime = vi.hoisted(() => {
+  const document: EditorDocumentV1 = {
+    schemaVersion: 1,
+    keys: {},
+    keyPositions: {},
+    statPositions: {},
+    graphPositions: {},
+    knobPositions: {},
+    layerGroups: {},
+  };
+  let listener: ((event: EditorCommittedV1) => void) | null = null;
+  const endSessions = vi.fn();
+  const applyRemoteEnvelope = vi.fn();
+  const cancel = vi.fn(async () => {});
+  const subscribe = vi.fn(async () => 1);
+  const get = vi.fn(async () => ({ revision: 0, document }));
+  const commit = vi.fn();
+  const onCommitted = vi.fn(
+    (nextListener: (event: EditorCommittedV1) => void) => {
+      listener = nextListener;
+      return Object.assign(
+        () => {
+          listener = null;
+        },
+        { ready: Promise.resolve() },
+      );
+    },
+  );
+
+  return {
+    commit,
+    applyRemoteEnvelope,
+    cancel,
+    endSessions,
+    get,
+    onCommitted,
+    subscribe,
+    emit: (event: EditorCommittedV1) => listener?.(event),
+  };
+});
+
+vi.mock('@api/modules/editorApi', () => ({
+  editorApi: {
+    get: runtime.get,
+    commit: runtime.commit,
+    onCommitted: runtime.onCommitted,
+  },
+}));
+
+vi.mock('@api/modules/previewApi', () => ({
+  previewApi: {
+    cancel: runtime.cancel,
+    subscribe: runtime.subscribe,
+  },
+}));
+
+vi.mock('./previewOverlay', () => ({
+  previewOverlay: {
+    applyRemoteEnvelope: runtime.applyRemoteEnvelope,
+    endSessions: runtime.endSessions,
+  },
+}));
+
+import { editorCoordinator } from './editorStateCoordinator';
+
+const committedEvent = (
+  mutationId: string,
+  gestures: Pick<EditorCommittedV1, 'gestureId' | 'gestureIds'>,
+): EditorCommittedV1 => ({
+  schemaVersion: 1,
+  revision: 0,
+  mutationId,
+  changedFields: [],
+  patch: { schemaVersion: 1 },
+  ...gestures,
+});
+
+describe('editor state coordinator committed preview cleanup', () => {
+  afterEach(() => {
+    editorCoordinator.stop();
+  });
+
+  it('recovers lazy subscription and maps committed gesture cleanup', async () => {
+    const initializationError = new Error('bootstrap get failed');
+    runtime.get.mockRejectedValueOnce(initializationError);
+
+    await expect(editorCoordinator.start()).rejects.toBe(initializationError);
+    expect(runtime.subscribe).not.toHaveBeenCalled();
+
+    await editorCoordinator.start();
+    await editorCoordinator.start();
+    expect(runtime.subscribe).toHaveBeenCalledOnce();
+
+    runtime.emit(
+      committedEvent('merged', {
+        gestureIds: [
+          '00000000-0000-4000-8000-000000000001',
+          '00000000-0000-4000-8000-000000000002',
+        ],
+      }),
+    );
+    await vi.waitFor(() => expect(runtime.endSessions).toHaveBeenCalledOnce());
+    expect(runtime.endSessions).toHaveBeenLastCalledWith([
+      '00000000-0000-4000-8000-000000000001',
+      '00000000-0000-4000-8000-000000000002',
+    ]);
+
+    runtime.emit(
+      committedEvent('legacy', {
+        gestureId: '00000000-0000-4000-8000-000000000003',
+      }),
+    );
+    await vi.waitFor(() =>
+      expect(runtime.endSessions).toHaveBeenCalledTimes(2),
+    );
+    expect(runtime.endSessions).toHaveBeenLastCalledWith([
+      '00000000-0000-4000-8000-000000000003',
+    ]);
+  });
+});
diff --git a/src/renderer/editor/runtime/editorStateCoordinator.ts b/src/renderer/editor/runtime/editorStateCoordinator.ts
index ef0af79a..1f3d2e9e 100644
--- a/src/renderer/editor/runtime/editorStateCoordinator.ts
+++ b/src/renderer/editor/runtime/editorStateCoordinator.ts
@@ -1,4 +1,5 @@
 import { editorApi } from '@api/modules/editorApi';
+import { previewApi } from '@api/modules/previewApi';
 import { unstable_batchedUpdates } from 'react-dom';
 import { useGraphItemStore } from '@stores/data/useGraphItemStore';
 import {
@@ -12,13 +13,38 @@ import { invalidateSelectionForChangedIndexedElementArrays } from '@stores/grid/
 import { stableStringify } from '@utils/core/stableStringify';
 
 import { createEditorCoordinator } from './editorCoordinator';
-import { previewOverlay, registerPreviewRevisionProbe } from './previewOverlay';
+import { markGestureSessionsDiscarded } from './gestureSessionLifecycle';
+import { previewOverlay } from './previewOverlay';
 
 import type { EditorDocumentV1 } from '@src/types/editor';
 
 const hasChanged = (current: unknown, next: unknown) =>
   stableStringify(current) !== stableStringify(next);
 
+let previewSubscribed = false;
+let previewSubscriptionInFlight: Promise<void> | null = null;
+
+const ensurePreviewSubscription = (): Promise<void> => {
+  if (previewSubscribed) return Promise.resolve();
+  if (previewSubscriptionInFlight) return previewSubscriptionInFlight;
+
+  // 채널은 unsubscribe API가 없어 창 단위 coordinator 수명에 맞춰 한 번만 등록
+  previewSubscriptionInFlight = previewApi
+    .subscribe((envelope) => {
+      previewOverlay.applyRemoteEnvelope(envelope);
+    })
+    .then(() => {
+      previewSubscribed = true;
+    })
+    .catch((error) => {
+      console.error('프리뷰 채널 구독 실패', error);
+    })
+    .finally(() => {
+      previewSubscriptionInFlight = null;
+    });
+  return previewSubscriptionInFlight;
+};
+
 export const captureEditorDocument = (): EditorDocumentV1 => {
   const keyState = useKeyStore.getState();
   return {
@@ -109,12 +135,16 @@ export const editorCoordinator = createEditorCoordinator({
   },
   // canonical 반영과 같은 처리 단위에서 해당 게스처의 프리뷰 오버레이 정리
   onCommittedApplied: (event) => {
-    if (event.gestureId) previewOverlay.endSession(event.gestureId);
+    previewOverlay.endSessions(
+      event.gestureIds ?? (event.gestureId ? [event.gestureId] : []),
+    );
   },
-  // committed·resync 등 revision 전진 시 게이트가 풀린 지연 cancel 처리
-  onCanonicalRevisionAdvanced: (revision) => {
-    previewOverlay.flushDeferredCancels(revision);
+  onGestureIdsDiscarded: (gestureIds) => {
+    markGestureSessionsDiscarded(gestureIds);
+    previewOverlay.endSessions(gestureIds);
+    gestureIds.forEach((gestureId) => {
+      previewApi.cancel(gestureId).catch(() => {});
+    });
   },
+  onStartSucceeded: ensurePreviewSubscription,
 });
-
-registerPreviewRevisionProbe(() => editorCoordinator.getState().revision);
diff --git a/src/renderer/editor/runtime/gestureSessionLifecycle.ts b/src/renderer/editor/runtime/gestureSessionLifecycle.ts
new file mode 100644
index 00000000..f2b25a0a
--- /dev/null
+++ b/src/renderer/editor/runtime/gestureSessionLifecycle.ts
@@ -0,0 +1,31 @@
+export interface GestureSessionLifecycle {
+  readonly sessionId: string;
+  discarded: boolean;
+}
+
+const sessions = new Map<string, GestureSessionLifecycle>();
+
+export const registerGestureSession = (
+  sessionId: string,
+): GestureSessionLifecycle => {
+  const lifecycle = { sessionId, discarded: false };
+  sessions.set(sessionId, lifecycle);
+  return lifecycle;
+};
+
+export const markGestureSessionsDiscarded = (
+  sessionIds: readonly string[],
+): void => {
+  sessionIds.forEach((sessionId) => {
+    const lifecycle = sessions.get(sessionId);
+    if (lifecycle) lifecycle.discarded = true;
+  });
+};
+
+export const releaseGestureSession = (
+  lifecycle: GestureSessionLifecycle,
+): void => {
+  if (sessions.get(lifecycle.sessionId) === lifecycle) {
+    sessions.delete(lifecycle.sessionId);
+  }
+};
diff --git a/src/renderer/editor/runtime/legacyEditorMutation.test.ts b/src/renderer/editor/runtime/legacyEditorMutation.test.ts
new file mode 100644
index 00000000..9b2a5d71
--- /dev/null
+++ b/src/renderer/editor/runtime/legacyEditorMutation.test.ts
@@ -0,0 +1,78 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import { runLegacyEditorMutationWith } from './legacyEditorMutation';
+
+describe('legacy editor mutation coordinator gate', () => {
+  it('coordinator 구독 확립 뒤 명령을 실행하고 canonical을 재적용한다', async () => {
+    const order: string[] = [];
+    const coordinator = {
+      start: vi.fn(async () => {
+        order.push('start');
+      }),
+      sync: vi.fn(async () => {
+        order.push('sync');
+      }),
+    };
+
+    const result = await runLegacyEditorMutationWith(coordinator, async () => {
+      order.push('mutation');
+      return 'saved';
+    });
+
+    expect(result).toBe('saved');
+    expect(order).toEqual(['start', 'mutation', 'sync']);
+    expect(coordinator.sync).toHaveBeenCalledWith();
+  });
+
+  it('coordinator 시작 실패 시 백엔드 mutation을 실행하지 않는다', async () => {
+    const failure = new Error('subscribe failed');
+    const mutation = vi.fn(async () => 'unexpected');
+    const coordinator = {
+      start: vi.fn(async () => {
+        throw failure;
+      }),
+      sync: vi.fn(async () => undefined),
+    };
+
+    await expect(
+      runLegacyEditorMutationWith(coordinator, mutation),
+    ).rejects.toBe(failure);
+    expect(mutation).not.toHaveBeenCalled();
+    expect(coordinator.sync).not.toHaveBeenCalled();
+  });
+
+  it('명령 성공 뒤 sync 실패는 성공 결과를 뒤집지 않는다', async () => {
+    const syncError = new Error('temporary read failure');
+    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    const coordinator = {
+      start: vi.fn(async () => undefined),
+      sync: vi.fn(async () => {
+        throw syncError;
+      }),
+    };
+
+    await expect(
+      runLegacyEditorMutationWith(coordinator, async () => 42),
+    ).resolves.toBe(42);
+    expect(errorSpy).toHaveBeenCalledWith(
+      '레거시 편집 상태 재동기화 실패',
+      syncError,
+    );
+    errorSpy.mockRestore();
+  });
+
+  it('구독만 필요한 명령은 mutation 뒤 canonical sync를 생략한다', async () => {
+    const coordinator = {
+      start: vi.fn(async () => undefined),
+      sync: vi.fn(async () => undefined),
+    };
+
+    await expect(
+      runLegacyEditorMutationWith(coordinator, async () => 'selected', {
+        syncAfter: false,
+      }),
+    ).resolves.toBe('selected');
+    expect(coordinator.start).toHaveBeenCalledOnce();
+    expect(coordinator.sync).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/renderer/editor/runtime/legacyEditorMutation.ts b/src/renderer/editor/runtime/legacyEditorMutation.ts
new file mode 100644
index 00000000..9501c6f1
--- /dev/null
+++ b/src/renderer/editor/runtime/legacyEditorMutation.ts
@@ -0,0 +1,37 @@
+import { editorCoordinator } from './editorStateCoordinator';
+
+interface LegacyEditorMutationCoordinator {
+  start: () => Promise<unknown>;
+  sync: (options?: { reapply?: boolean }) => Promise<void>;
+}
+
+interface LegacyEditorMutationOptions {
+  syncAfter?: boolean;
+}
+
+export const runLegacyEditorMutationWith = async <T>(
+  coordinator: LegacyEditorMutationCoordinator,
+  mutation: () => Promise<T>,
+  options: LegacyEditorMutationOptions = {},
+): Promise<T> => {
+  // committed 구독 없이 백엔드만 변경되는 상태를 차단
+  await coordinator.start();
+  const result = await mutation();
+
+  if (options.syncAfter === false) return result;
+
+  try {
+    await coordinator.sync();
+  } catch (error) {
+    // 구독은 이미 살아 있으므로 명령 성공을 실패로 뒤집지 않음
+    console.error('레거시 편집 상태 재동기화 실패', error);
+  }
+
+  return result;
+};
+
+export const runLegacyEditorMutation = <T>(
+  mutation: () => Promise<T>,
+  options?: LegacyEditorMutationOptions,
+): Promise<T> =>
+  runLegacyEditorMutationWith(editorCoordinator, mutation, options);
diff --git a/src/renderer/editor/runtime/previewOverlay.ts b/src/renderer/editor/runtime/previewOverlay.ts
index 7474c663..2b267158 100644
--- a/src/renderer/editor/runtime/previewOverlay.ts
+++ b/src/renderer/editor/runtime/previewOverlay.ts
@@ -34,18 +34,6 @@ export const getPreviewOverlayVersion = () => overlayVersion;
 const TOMBSTONE_LIMIT = 64;
 const tombstones = new Set<string>();
 
-// minRevision 게이트에 걸린 cancel, 해당 revision 반영 후 처리
-const deferredCancels = new Map<string, number>();
-
-// coordinator revision 조회 (editorStateCoordinator가 등록, 순환 import 회피)
-let revisionProbe: (() => number | null) | null = null;
-
-export const registerPreviewRevisionProbe = (
-  probe: (() => number | null) | null,
-) => {
-  revisionProbe = probe;
-};
-
 const addTombstone = (sessionId: string) => {
   tombstones.add(sessionId);
   if (tombstones.size > TOMBSTONE_LIMIT) {
@@ -140,15 +128,6 @@ export const previewOverlay = {
     if (tombstones.has(envelope.sessionId)) return;
 
     if (envelope.kind === 'cancel') {
-      // 커밋 후속 cancel은 해당 revision이 canonical에 반영된 뒤에만 제거
-      const minRevision = envelope.minRevision;
-      if (minRevision != null) {
-        const current = revisionProbe?.() ?? null;
-        if (current === null || current < minRevision) {
-          deferredCancels.set(envelope.sessionId, minRevision);
-          return;
-        }
-      }
       this.endSession(envelope.sessionId);
       return;
     }
@@ -180,31 +159,26 @@ export const previewOverlay = {
    * 오버레이만 제거하며 canonical은 건드리지 않음
    */
   endSession(sessionId: string): void {
-    addTombstone(sessionId);
-    if (!sessions.delete(sessionId)) return;
-    refreshRenderedState();
+    this.endSessions([sessionId]);
   },
 
-  hasSession(sessionId: string): boolean {
-    return sessions.has(sessionId);
+  endSessions(sessionIds: readonly string[]): void {
+    let changed = false;
+    for (const sessionId of sessionIds) {
+      addTombstone(sessionId);
+      changed = sessions.delete(sessionId) || changed;
+    }
+    if (changed) refreshRenderedState();
   },
 
-  /** canonical 반영 후 게이트가 풀린 지연 cancel 처리 */
-  flushDeferredCancels(currentRevision: number): void {
-    if (deferredCancels.size === 0) return;
-    for (const [sessionId, minRevision] of deferredCancels) {
-      if (currentRevision >= minRevision) {
-        deferredCancels.delete(sessionId);
-        this.endSession(sessionId);
-      }
-    }
+  hasSession(sessionId: string): boolean {
+    return sessions.has(sessionId);
   },
 
   /** 테스트·리셋용 전체 정리 */
   clearAll(): void {
     sessions.clear();
     tombstones.clear();
-    deferredCancels.clear();
     refreshRenderedState();
   },
 };
diff --git a/src/renderer/hooks/Grid/useDraggable.test.tsx b/src/renderer/hooks/Grid/useDraggable.test.tsx
index c1548b41..01f3c739 100644
--- a/src/renderer/hooks/Grid/useDraggable.test.tsx
+++ b/src/renderer/hooks/Grid/useDraggable.test.tsx
@@ -54,6 +54,7 @@ interface HarnessProps {
   activeTool?: 'select' | 'eraser';
   onClick: () => void;
   onDoubleClick: () => void;
+  onDragStart: () => void | (() => void);
   onPositionChange: (x: number, y: number) => void;
 }
 
@@ -61,11 +62,13 @@ const Harness = ({
   activeTool = 'select',
   onClick,
   onDoubleClick,
+  onDragStart,
   onPositionChange,
 }: HarnessProps) => {
   const draggable = useDraggable({
     initialX: 0,
     initialY: 0,
+    onDragStart,
     onPositionChange,
   });
 
@@ -93,6 +96,7 @@ describe('useDraggable pointer contract', () => {
   let nextRafId: number;
   let onClick: Mock<() => void>;
   let onDoubleClick: Mock<() => void>;
+  let onDragStart: Mock<() => void | (() => void)>;
   let onPositionChange: Mock<(x: number, y: number) => void>;
 
   const renderHarness = async (activeTool: 'select' | 'eraser' = 'select') => {
@@ -102,6 +106,7 @@ describe('useDraggable pointer contract', () => {
           activeTool={activeTool}
           onClick={onClick}
           onDoubleClick={onDoubleClick}
+          onDragStart={onDragStart}
           onPositionChange={onPositionChange}
         />,
       );
@@ -149,6 +154,7 @@ describe('useDraggable pointer contract', () => {
     });
     onClick = vi.fn();
     onDoubleClick = vi.fn();
+    onDragStart = vi.fn();
     onPositionChange = vi.fn();
     clearGuides.mockClear();
     setDraggingOrResizing.mockClear();
@@ -173,6 +179,7 @@ describe('useDraggable pointer contract', () => {
     });
 
     expect(onClick).toHaveBeenCalledTimes(1);
+    expect(onDragStart).not.toHaveBeenCalled();
     expect(onPositionChange).not.toHaveBeenCalled();
   });
 
@@ -227,6 +234,8 @@ describe('useDraggable pointer contract', () => {
   });
 
   it('commits one drag over 5px and suppresses the following click', async () => {
+    const cleanup = vi.fn();
+    onDragStart.mockReturnValue(cleanup);
     const element = await renderHarness();
 
     await act(async () => {
@@ -241,6 +250,11 @@ describe('useDraggable pointer contract', () => {
 
     expect(onPositionChange).toHaveBeenCalledTimes(1);
     expect(onPositionChange).toHaveBeenCalledWith(10, 0);
+    expect(onDragStart).toHaveBeenCalledOnce();
+    expect(cleanup).toHaveBeenCalledOnce();
+    expect(onPositionChange.mock.invocationCallOrder[0]).toBeLessThan(
+      cleanup.mock.invocationCallOrder[0]!,
+    );
     expect(onClick).not.toHaveBeenCalled();
   });
 
@@ -261,6 +275,8 @@ describe('useDraggable pointer contract', () => {
   });
 
   it('ends on blur and restores both element and body cursors', async () => {
+    const cleanup = vi.fn();
+    onDragStart.mockReturnValue(cleanup);
     const element = await renderHarness();
 
     await act(async () => {
@@ -276,6 +292,23 @@ describe('useDraggable pointer contract', () => {
     expect(element.style.cursor).toBe('');
     expect(document.body.style.cursor).toBe('');
     expect(onPositionChange).toHaveBeenCalledTimes(1);
+    expect(cleanup).toHaveBeenCalledOnce();
+  });
+
+  it('active drag를 unmount할 때 gesture cleanup을 한 번 실행한다', async () => {
+    const cleanup = vi.fn();
+    onDragStart.mockReturnValue(cleanup);
+    const element = await renderHarness();
+
+    await act(async () => {
+      dispatchPointer(element, 'pointerdown');
+      dispatchPointer(element, 'pointermove', { clientX: 11 });
+      flushRaf();
+      root.render(null);
+    });
+
+    expect(onPositionChange).toHaveBeenCalledOnce();
+    expect(cleanup).toHaveBeenCalledOnce();
   });
 
   it('ignores non-primary pointers', async () => {
@@ -320,18 +353,21 @@ describe('useDraggable pointer contract', () => {
   });
 
   it('runs drag completion once across duplicate terminal signals', async () => {
+    const cleanup = vi.fn();
+    onDragStart.mockReturnValue(cleanup);
     const element = await renderHarness();
 
     await act(async () => {
       dispatchPointer(element, 'pointerdown');
       dispatchPointer(element, 'pointermove', { clientX: 11 });
       flushRaf();
-      dispatchPointer(element, 'pointerup', { clientX: 11 });
+      dispatchPointer(element, 'pointercancel', { clientX: 11 });
       dispatchPointer(element, 'lostpointercapture');
       window.dispatchEvent(new Event('blur'));
     });
 
     expect(onPositionChange).toHaveBeenCalledTimes(1);
+    expect(cleanup).toHaveBeenCalledOnce();
     expect(setDraggingOrResizing).toHaveBeenLastCalledWith(false);
     expect(
       setDraggingOrResizing.mock.calls.filter(([value]) => value === false),
diff --git a/src/renderer/hooks/Grid/useDraggable.ts b/src/renderer/hooks/Grid/useDraggable.ts
index 0836572f..e990b4dd 100644
--- a/src/renderer/hooks/Grid/useDraggable.ts
+++ b/src/renderer/hooks/Grid/useDraggable.ts
@@ -27,7 +27,7 @@ interface UseDraggableOptions {
   initialX?: number;
   initialY?: number;
   onPositionChange?: (x: number, y: number) => void;
-  onDragStart?: () => void;
+  onDragStart?: () => void | (() => void);
   zoom?: number;
   panX?: number;
   panY?: number;
@@ -137,7 +137,6 @@ export const useDraggable = ({
 
   // initialX, initialY 변경 시 동기화
   useEffect(() => {
-    // eslint-disable-next-line react-hooks/set-state-in-effect -- 외부 위치 변경 동기화
     setOffset({ dx: initialX, dy: initialY });
     lastSnappedRef.current = { dx: initialX, dy: initialY };
   }, [initialX, initialY]);
@@ -221,6 +220,7 @@ export const useDraggable = ({
     const initialPosition = { dx, dy };
 
     let rafId: number | null = null;
+    let finishGesture: (() => void) | null = null;
     // 드래그 종료 플래그 (rAF 콜백에서 체크)
     let dragEnded = false;
     // Shift 키 드래그 시 축 고정을 위한 변수
@@ -249,7 +249,8 @@ export const useDraggable = ({
         // 드래그 시작 시 애니메이션 비활성화
         useGridSelectionStore.getState().setDraggingOrResizing(true);
         // 드래그 시작 콜백 호출 (히스토리 저장용)
-        onDragStart?.();
+        const cleanup = onDragStart?.();
+        finishGesture = typeof cleanup === 'function' ? cleanup : null;
 
         // Shift 키가 눌려있으면 처음 움직인 방향으로 축 고정
         if (moveEvent.shiftKey && lockedAxis === null) {
@@ -435,7 +436,12 @@ export const useDraggable = ({
 
         // 최종 위치만 부모에 커밋
         const { dx: finalDx, dy: finalDy } = lastSnappedRef.current;
-        onPositionChange?.(finalDx, finalDy);
+        try {
+          onPositionChange?.(finalDx, finalDy);
+        } finally {
+          finishGesture?.();
+          finishGesture = null;
+        }
       } else {
         // 클릭만 했을 경우 커서만 복구
         dragTarget.style.cursor = '';
diff --git a/src/renderer/hooks/Grid/useGridKeyboard.test.tsx b/src/renderer/hooks/Grid/useGridKeyboard.test.tsx
new file mode 100644
index 00000000..f49a11c2
--- /dev/null
+++ b/src/renderer/hooks/Grid/useGridKeyboard.test.tsx
@@ -0,0 +1,202 @@
+import React, { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { useGraphItemStore } from '@stores/data/useGraphItemStore';
+import { useKeyStore } from '@stores/data/useKeyStore';
+import { useKnobItemStore } from '@stores/data/useKnobItemStore';
+import { useStatItemStore } from '@stores/data/useStatItemStore';
+import { usePluginDisplayElementStore } from '@stores/plugin/usePluginDisplayElementStore';
+
+import { useGridKeyboard } from './useGridKeyboard';
+import { useGridSelection } from './useGridSelection';
+
+import type { KeyPosition } from '@src/types/key/keys';
+
+const { commitPatchMock, rotateSessionMock, sendBridgeMessageMock } =
+  vi.hoisted(() => ({
+    commitPatchMock: vi.fn().mockResolvedValue(undefined),
+    rotateSessionMock: vi.fn(),
+    sendBridgeMessageMock: vi.fn(),
+  }));
+
+vi.mock('@src/renderer/editor/runtime/editorStateCoordinator', () => ({
+  editorCoordinator: { commitPatch: commitPatchMock },
+}));
+
+vi.mock('@utils/plugin/bridgeMessages', () => ({
+  sendBridgeMessageBestEffort: sendBridgeMessageMock,
+}));
+
+vi.mock('@plugins/runtime/displayElement/instancesCommitQueue', () => ({
+  rotatePluginInstancesEditSession: rotateSessionMock,
+}));
+
+vi.mock('@utils/core/platform', () => ({ isMac: () => false }));
+
+const firstGestureId = '00000000-0000-4000-8000-000000000001';
+const secondGestureId = '00000000-0000-4000-8000-000000000002';
+
+const position = (): KeyPosition =>
+  ({ dx: 0, dy: 0, width: 40, height: 40 } as KeyPosition);
+
+interface HarnessProps {
+  includePlugin?: boolean;
+  selectedIndex?: number;
+}
+
+const Harness = ({
+  includePlugin = false,
+  selectedIndex = 0,
+}: HarnessProps) => {
+  const selectedElements = [
+    { type: 'key' as const, id: `key-${selectedIndex}`, index: selectedIndex },
+    ...(includePlugin
+      ? [{ type: 'plugin' as const, id: 'plugin-a:element' }]
+      : []),
+  ];
+  const { moveSelectedElements } = useGridSelection({
+    selectedElements,
+    selectedKeyType: '4key',
+    keyMappings: { '4key': ['KeyA', 'KeyB'] },
+    positions: { '4key': [position(), position()] },
+  });
+
+  useGridKeyboard({
+    selectedElements,
+    moveSelectedElements,
+    deleteSelectedElements: vi.fn(),
+    clearSelection: vi.fn(),
+    copySelectedElements: vi.fn(),
+    pasteElements: vi.fn(),
+  });
+
+  return null;
+};
+
+describe('useGridKeyboard arrow history burst', () => {
+  let host: HTMLDivElement;
+  let root: Root;
+  let randomUUIDMock: ReturnType<typeof vi.spyOn>;
+
+  beforeEach(async () => {
+    globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+    vi.useFakeTimers();
+    vi.setSystemTime(1_000);
+    commitPatchMock.mockClear();
+    rotateSessionMock.mockClear();
+    sendBridgeMessageMock.mockClear();
+    randomUUIDMock = vi
+      .spyOn(crypto, 'randomUUID')
+      .mockReturnValueOnce(firstGestureId)
+      .mockReturnValueOnce(secondGestureId);
+
+    useKeyStore.setState({
+      selectedKeyType: '4key',
+      keyMappings: { '4key': ['KeyA', 'KeyB'] },
+      positions: { '4key': [position(), position()] },
+      canonicalPositions: { '4key': [position(), position()] },
+    });
+    useStatItemStore.setState({ positions: {} });
+    useGraphItemStore.setState({ positions: {} });
+    useKnobItemStore.setState({ positions: {} });
+    usePluginDisplayElementStore.setState({ elements: [] });
+
+    host = document.createElement('div');
+    document.body.appendChild(host);
+    root = createRoot(host);
+    await act(async () => {
+      root.render(<Harness />);
+    });
+  });
+
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    host.remove();
+    randomUUIDMock.mockRestore();
+    vi.useRealTimers();
+    globalThis.IS_REACT_ACT_ENVIRONMENT = false;
+  });
+
+  const pressArrow = (key: string) => {
+    act(() => {
+      window.dispatchEvent(
+        new KeyboardEvent('keydown', {
+          key,
+          bubbles: true,
+          cancelable: true,
+        }),
+      );
+    });
+  };
+
+  const committedGestureIds = () =>
+    commitPatchMock.mock.calls.map((call) => call[1]?.gestureId);
+
+  it('500ms 안의 연속 이동을 같은 history gesture로 묶는다', () => {
+    pressArrow('ArrowRight');
+    vi.advanceTimersByTime(500);
+    pressArrow('ArrowRight');
+
+    expect(committedGestureIds()).toEqual([firstGestureId, firstGestureId]);
+    expect(randomUUIDMock).toHaveBeenCalledOnce();
+  });
+
+  it('500ms를 넘긴 이동은 새 history gesture로 분리한다', () => {
+    pressArrow('ArrowRight');
+    vi.advanceTimersByTime(501);
+    pressArrow('ArrowRight');
+
+    expect(committedGestureIds()).toEqual([firstGestureId, secondGestureId]);
+    expect(randomUUIDMock).toHaveBeenCalledTimes(2);
+  });
+
+  it('방향이 섞여도 500ms burst 안에서는 같은 gesture를 사용한다', () => {
+    pressArrow('ArrowLeft');
+    vi.advanceTimersByTime(100);
+    pressArrow('ArrowUp');
+    vi.advanceTimersByTime(100);
+    pressArrow('ArrowDown');
+
+    expect(committedGestureIds()).toEqual([
+      firstGestureId,
+      firstGestureId,
+      firstGestureId,
+    ]);
+    expect(randomUUIDMock).toHaveBeenCalledOnce();
+  });
+
+  it('500ms 안이어도 선택 대상이 바뀌면 새 history gesture를 사용한다', async () => {
+    pressArrow('ArrowRight');
+    vi.advanceTimersByTime(100);
+    await act(async () => {
+      root.render(<Harness selectedIndex={1} />);
+    });
+    pressArrow('ArrowRight');
+
+    expect(committedGestureIds()).toEqual([firstGestureId, secondGestureId]);
+    expect(randomUUIDMock).toHaveBeenCalledTimes(2);
+  });
+
+  it('혼합 선택 방향키 이동은 editor와 plugin에 같은 gesture를 전달한다', async () => {
+    usePluginDisplayElementStore.setState({
+      elements: [
+        {
+          id: 'element',
+          fullId: 'plugin-a:element',
+          pluginId: 'plugin-a',
+          html: '<div />',
+          position: { x: 0, y: 0 },
+        },
+      ],
+    });
+    await act(async () => {
+      root.render(<Harness includePlugin />);
+    });
+
+    pressArrow('ArrowRight');
+
+    expect(committedGestureIds()).toEqual([firstGestureId]);
+    expect(rotateSessionMock).toHaveBeenCalledWith('plugin-a', firstGestureId);
+  });
+});
diff --git a/src/renderer/hooks/Grid/useGridKeyboard.ts b/src/renderer/hooks/Grid/useGridKeyboard.ts
index 5cdff749..010bec7e 100644
--- a/src/renderer/hooks/Grid/useGridKeyboard.ts
+++ b/src/renderer/hooks/Grid/useGridKeyboard.ts
@@ -27,7 +27,8 @@ interface UseGridKeyboardParams {
   moveSelectedElements: (
     deltaX: number,
     deltaY: number,
-    saveHistory?: boolean,
+    gestureId?: string,
+    syncToOverlay?: boolean,
   ) => void;
   deleteSelectedElements: () => void;
   clearSelection: () => void;
@@ -57,6 +58,11 @@ export function useGridKeyboard({
   newGroupLabel = 'New Group',
 }: UseGridKeyboardParams): void {
   const lastArrowKeyTime = useRef(0);
+  const arrowGestureId = useRef<string | null>(null);
+  const lastArrowSelectionSignature = useRef<string | null>(null);
+  const selectionSignature = JSON.stringify(
+    selectedElements.map(({ type, id, index }) => ({ type, id, index })),
+  );
   const macOS = isMac();
 
   useHistoryShortcuts({ onUndo, onRedo });
@@ -145,13 +151,19 @@ export function useGridKeyboard({
             break;
         }
 
-        // 일정 시간 내 연속 입력이면 히스토리 저장 안함
+        // 500ms 내 방향키 입력의 undo 병합
         const now = Date.now();
-        const saveHistory =
-          now - lastArrowKeyTime.current > ARROW_KEY_HISTORY_DELAY;
+        if (
+          lastArrowSelectionSignature.current !== selectionSignature ||
+          !arrowGestureId.current ||
+          now - lastArrowKeyTime.current > ARROW_KEY_HISTORY_DELAY
+        ) {
+          arrowGestureId.current = crypto.randomUUID();
+        }
         lastArrowKeyTime.current = now;
+        lastArrowSelectionSignature.current = selectionSignature;
 
-        moveSelectedElements(deltaX, deltaY, saveHistory);
+        moveSelectedElements(deltaX, deltaY, arrowGestureId.current);
         return;
       }
 
@@ -197,5 +209,6 @@ export function useGridKeyboard({
     onMoveForward,
     onMoveBackward,
     newGroupLabel,
+    selectionSignature,
   ]);
 }
diff --git a/src/renderer/hooks/Grid/useGridResize.test.tsx b/src/renderer/hooks/Grid/useGridResize.test.tsx
new file mode 100644
index 00000000..bfed5776
--- /dev/null
+++ b/src/renderer/hooks/Grid/useGridResize.test.tsx
@@ -0,0 +1,308 @@
+import React, { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import {
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  type Mock,
+  vi,
+} from 'vitest';
+
+import type { SelectedElement } from '@stores/grid/useGridSelectionStore';
+import { useGridResize } from './useGridResize';
+
+const mocks = vi.hoisted(() => ({
+  begin: vi.fn(),
+  end: vi.fn(),
+  updateElement: vi.fn(),
+  setDraggingOrResizing: vi.fn(),
+  clearGuides: vi.fn(),
+  commitPatch: vi.fn(() => Promise.resolve()),
+  beginMixedGesture: vi.fn(),
+  cancelMixedGesture: vi.fn(),
+  elements: [] as Array<{ fullId: string; pluginId: string }>,
+}));
+
+vi.mock('@plugins/runtime/displayElement/instancesCommitQueue', () => ({
+  beginPluginInstancesEditSession: mocks.begin,
+  endPluginInstancesEditSession: mocks.end,
+}));
+
+vi.mock('@plugins/runtime/displayElement/gestureTransaction', () => ({
+  beginMixedGestureTransaction: mocks.beginMixedGesture,
+  cancelMixedGestureTransaction: mocks.cancelMixedGesture,
+  cancelUncommittedMixedGestureTransaction: mocks.cancelMixedGesture,
+}));
+
+vi.mock('@stores/plugin/usePluginDisplayElementStore', () => ({
+  usePluginDisplayElementStore: {
+    getState: () => ({
+      elements: mocks.elements,
+      updateElement: mocks.updateElement,
+    }),
+  },
+}));
+
+vi.mock('@stores/grid/useSmartGuidesStore', () => ({
+  useSmartGuidesStore: {
+    getState: () => ({
+      clearGuides: mocks.clearGuides,
+      setDraggedBounds: vi.fn(),
+      setActiveGuides: vi.fn(),
+      setSpacingGuides: vi.fn(),
+      setSizeMatchGuides: vi.fn(),
+    }),
+  },
+}));
+
+vi.mock('@stores/grid/useGridSelectionStore', () => ({
+  useGridSelectionStore: {
+    getState: () => ({
+      setDraggingOrResizing: mocks.setDraggingOrResizing,
+    }),
+  },
+}));
+
+vi.mock('@stores/useSettingsStore', () => ({
+  useSettingsStore: {
+    getState: () => ({
+      gridSettings: {
+        alignmentGuides: false,
+        spacingGuides: false,
+        sizeMatchGuides: false,
+      },
+    }),
+  },
+}));
+
+vi.mock('@stores/data/useKeyStore', () => ({
+  useKeyStore: {
+    getState: () => ({
+      positions: {
+        '4key': [{ dx: 0, dy: 0, width: 40, height: 40 }],
+      },
+      canonicalPositions: {
+        '4key': [{ dx: 0, dy: 0, width: 40, height: 40 }],
+      },
+      setPositions: vi.fn(),
+    }),
+  },
+}));
+vi.mock('@stores/data/useStatItemStore', () => ({
+  useStatItemStore: {
+    getState: () => ({ positions: { '4key': [] }, setPositions: vi.fn() }),
+  },
+}));
+vi.mock('@stores/data/useGraphItemStore', () => ({
+  useGraphItemStore: {
+    getState: () => ({ positions: { '4key': [] }, setPositions: vi.fn() }),
+  },
+}));
+vi.mock('@stores/data/useKnobItemStore', () => ({
+  useKnobItemStore: {
+    getState: () => ({ positions: { '4key': [] }, setPositions: vi.fn() }),
+  },
+}));
+
+vi.mock('@src/renderer/editor/runtime/editorStateCoordinator', () => ({
+  editorCoordinator: { commitPatch: mocks.commitPatch },
+}));
+
+type ResizeApi = ReturnType<typeof useGridResize>;
+
+interface HarnessProps {
+  selectedElements: SelectedElement[];
+  onResizeEnd: (gestureId?: string) => void;
+  expose: (api: ResizeApi) => void;
+}
+
+const Harness = ({ selectedElements, onResizeEnd, expose }: HarnessProps) => {
+  const api = useGridResize({
+    selectedElements,
+    selectedKeyType: '4key',
+    onResizeEnd,
+  });
+  expose(api);
+  return null;
+};
+
+const pluginSelection = (id: string): SelectedElement => ({
+  id,
+  type: 'plugin',
+});
+
+const keySelection = (): SelectedElement => ({
+  id: 'key-0',
+  type: 'key',
+  index: 0,
+});
+
+describe('useGridResize plugin gesture lifecycle', () => {
+  let host: HTMLDivElement;
+  let root: Root;
+  let api: ResizeApi;
+  let tokenSequence: number;
+  let events: string[];
+  let onResizeEnd: Mock<(gestureId?: string) => void>;
+  let pluginGestureIds: string[];
+
+  const renderHarness = async (selectedElements: SelectedElement[]) => {
+    await act(async () => {
+      root.render(
+        <Harness
+          selectedElements={selectedElements}
+          onResizeEnd={onResizeEnd}
+          expose={(nextApi) => {
+            api = nextApi;
+          }}
+        />,
+      );
+    });
+  };
+
+  beforeEach(() => {
+    globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+    host = document.createElement('div');
+    document.body.appendChild(host);
+    root = createRoot(host);
+    tokenSequence = 0;
+    events = [];
+    pluginGestureIds = [];
+    mocks.begin.mockReset();
+    mocks.end.mockReset();
+    mocks.updateElement.mockReset();
+    mocks.setDraggingOrResizing.mockReset();
+    mocks.clearGuides.mockReset();
+    mocks.commitPatch.mockClear();
+    mocks.beginMixedGesture.mockClear();
+    mocks.cancelMixedGesture.mockClear();
+    mocks.elements = [];
+    mocks.begin.mockImplementation((pluginId: string, gestureId: string) => {
+      const token = `token-${++tokenSequence}`;
+      pluginGestureIds.push(gestureId);
+      events.push(`begin:${pluginId}:${token}`);
+      return token;
+    });
+    mocks.updateElement.mockImplementation((fullId: string) => {
+      events.push(`update:${fullId}`);
+    });
+    mocks.end.mockImplementation((pluginId: string, token: string) => {
+      events.push(`end:${pluginId}:${token}`);
+    });
+    onResizeEnd = vi.fn(() => {
+      events.push('editor-end');
+    });
+  });
+
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    host.remove();
+  });
+
+  it('단일 plugin resize를 update와 editor 종료 뒤 끝내고 다음 resize와 분리한다', async () => {
+    mocks.elements = [{ fullId: 'plugin-a:one', pluginId: 'plugin-a' }];
+    await renderHarness([pluginSelection('plugin-a:one')]);
+
+    for (const width of [120, 140]) {
+      await act(async () => {
+        api.handleResizeStart();
+        api.handleResize({ x: 10, y: 20, width, height: 80 });
+        api.handleResizeComplete();
+      });
+    }
+
+    expect(mocks.begin).toHaveBeenCalledTimes(2);
+    expect(mocks.begin.mock.results[0]?.value).not.toBe(
+      mocks.begin.mock.results[1]?.value,
+    );
+    expect(events).toEqual([
+      'begin:plugin-a:token-1',
+      'update:plugin-a:one',
+      'editor-end',
+      'end:plugin-a:token-1',
+      'begin:plugin-a:token-2',
+      'update:plugin-a:one',
+      'editor-end',
+      'end:plugin-a:token-2',
+    ]);
+  });
+
+  it('그룹 resize의 plugin별 token을 최종 update 뒤 각각 끝낸다', async () => {
+    mocks.elements = [
+      { fullId: 'plugin-a:one', pluginId: 'plugin-a' },
+      { fullId: 'plugin-b:one', pluginId: 'plugin-b' },
+    ];
+    const selected = [
+      pluginSelection('plugin-a:one'),
+      pluginSelection('plugin-b:one'),
+    ];
+    await renderHarness(selected);
+
+    await act(async () => {
+      api.handleResizeStart();
+      api.handleGroupResize({
+        groupBounds: { x: 10, y: 20, width: 240, height: 80 },
+        elementBounds: selected.map((element, index) => ({
+          element,
+          bounds: { x: 10 + index * 120, y: 20, width: 100, height: 80 },
+        })),
+        handle: { id: 'e', dx: 1, dy: 0 },
+      });
+      api.handleGroupResizeComplete();
+    });
+
+    expect(events).toEqual([
+      'begin:plugin-a:token-1',
+      'begin:plugin-b:token-2',
+      'update:plugin-a:one',
+      'update:plugin-b:one',
+      'editor-end',
+      'end:plugin-a:token-1',
+      'end:plugin-b:token-2',
+    ]);
+    expect(new Set(pluginGestureIds).size).toBe(1);
+    expect(onResizeEnd).toHaveBeenCalledWith(pluginGestureIds[0]);
+    expect(mocks.beginMixedGesture).not.toHaveBeenCalled();
+  });
+
+  it('혼합 그룹 resize는 중복 commit 없이 공유 gesture를 종료 callback에 전달한다', async () => {
+    mocks.elements = [{ fullId: 'plugin-a:one', pluginId: 'plugin-a' }];
+    const selected = [keySelection(), pluginSelection('plugin-a:one')];
+    await renderHarness(selected);
+
+    await act(async () => {
+      api.handleResizeStart();
+      api.handleGroupResize({
+        groupBounds: { x: 10, y: 20, width: 200, height: 80 },
+        elementBounds: selected.map((element, index) => ({
+          element,
+          bounds: { x: 10 + index * 100, y: 20, width: 80, height: 80 },
+        })),
+        handle: { id: 'e', dx: 1, dy: 0 },
+      });
+      api.handleGroupResizeComplete();
+    });
+
+    expect(mocks.commitPatch).not.toHaveBeenCalled();
+    expect(onResizeEnd).toHaveBeenCalledTimes(1);
+    expect(onResizeEnd).toHaveBeenCalledWith(pluginGestureIds[0]);
+    expect(mocks.beginMixedGesture).toHaveBeenCalledWith(pluginGestureIds[0], [
+      'plugin-a',
+    ]);
+    expect(mocks.cancelMixedGesture).toHaveBeenCalledWith(pluginGestureIds[0]);
+  });
+
+  it('active resize 중 unmount하면 보관한 token을 종료한다', async () => {
+    mocks.elements = [{ fullId: 'plugin-a:one', pluginId: 'plugin-a' }];
+    await renderHarness([pluginSelection('plugin-a:one')]);
+
+    await act(async () => {
+      api.handleResizeStart();
+      root.render(null);
+    });
+
+    expect(mocks.end).toHaveBeenCalledWith('plugin-a', 'token-1');
+  });
+});
diff --git a/src/renderer/hooks/Grid/useGridResize.ts b/src/renderer/hooks/Grid/useGridResize.ts
index d0709699..9d6faddb 100644
--- a/src/renderer/hooks/Grid/useGridResize.ts
+++ b/src/renderer/hooks/Grid/useGridResize.ts
@@ -1,4 +1,4 @@
-import { useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useKeyStore } from '@stores/data/useKeyStore';
 import { useStatItemStore } from '@stores/data/useStatItemStore';
 import { useGraphItemStore } from '@stores/data/useGraphItemStore';
@@ -18,8 +18,14 @@ import type { StatItemPositions } from '@src/types/key/statItems';
 import type { GraphItemPositions } from '@src/types/key/graphItems';
 import type { KnobItemPositions } from '@src/types/key/knobs';
 import type { ElementBounds } from '@utils/grid/smartGuides';
-import type { EditorPatchV1 } from '@src/types/editor';
-import { editorCoordinator } from '@src/renderer/editor/runtime/editorStateCoordinator';
+import {
+  beginPluginInstancesEditSession,
+  endPluginInstancesEditSession,
+} from '@plugins/runtime/displayElement/instancesCommitQueue';
+import {
+  beginMixedGestureTransaction,
+  cancelUncommittedMixedGestureTransaction,
+} from '@plugins/runtime/displayElement/gestureTransaction';
 
 interface ResizeHandle {
   id: string;
@@ -50,7 +56,7 @@ interface GroupResizeResult {
 interface UseGridResizeOptions {
   selectedElements: SelectedElement[];
   selectedKeyType: string;
-  onResizeEnd?: () => void;
+  onResizeEnd?: (gestureId?: string) => void;
   getOtherElements?: (excludeId: string) => ElementBounds[];
 }
 
@@ -66,6 +72,8 @@ export function useGridResize({
   getOtherElements,
 }: UseGridResizeOptions) {
   const resizeStartRef = useRef(false);
+  const pluginResizeTokensRef = useRef(new Map<string, string>());
+  const resizeGestureIdRef = useRef<string | null>(null);
   // 드래그 중 프리뷰 bounds (드래그 중일 때만 값이 있음)
   const [previewBounds, setPreviewBounds] = useState<ResizeBounds | null>(null);
   // 최종 적용할 bounds를 저장 (드래그 종료 시 사용)
@@ -82,9 +90,60 @@ export function useGridResize({
     elementBounds: GroupElementBounds[];
   } | null>(null);
 
+  const beginPluginResizeSessions = (gestureId: string) => {
+    const pluginElementIds = new Set(
+      selectedElements
+        .filter((element) => element.type === 'plugin')
+        .map((element) => element.id),
+    );
+    usePluginDisplayElementStore
+      .getState()
+      .elements.filter((element) => pluginElementIds.has(element.fullId))
+      .forEach((element) => {
+        if (!pluginResizeTokensRef.current.has(element.pluginId)) {
+          pluginResizeTokensRef.current.set(
+            element.pluginId,
+            beginPluginInstancesEditSession(element.pluginId, gestureId),
+          );
+        }
+      });
+  };
+
+  const endPluginResizeSessions = () => {
+    const tokens = pluginResizeTokensRef.current;
+    pluginResizeTokensRef.current = new Map();
+    tokens.forEach((token, pluginId) => {
+      endPluginInstancesEditSession(pluginId, token);
+    });
+    // 완료 경로가 혼합 커밋을 타지 않은 경우의 staged 잔존 정산
+    const gestureId = resizeGestureIdRef.current;
+    if (gestureId) cancelUncommittedMixedGestureTransaction(gestureId);
+    resizeGestureIdRef.current = null;
+  };
+
+  useEffect(
+    () => () => {
+      const gestureId = resizeGestureIdRef.current;
+      endPluginResizeSessions();
+      if (gestureId) cancelUncommittedMixedGestureTransaction(gestureId);
+    },
+    [],
+  );
+
   const handleResizeStart = (_handle?: ResizeHandle) => {
     if (resizeStartRef.current) return;
     resizeStartRef.current = true;
+    const gestureId = crypto.randomUUID();
+    resizeGestureIdRef.current = gestureId;
+    beginPluginResizeSessions(gestureId);
+    if (
+      pluginResizeTokensRef.current.size > 0 &&
+      selectedElements.some((element) => element.type !== 'plugin')
+    ) {
+      beginMixedGestureTransaction(gestureId, [
+        ...pluginResizeTokensRef.current.keys(),
+      ]);
+    }
 
     // 기존 스마트 가이드 클리어
     useSmartGuidesStore.getState().clearGuides();
@@ -898,7 +957,11 @@ export function useGridResize({
     setPreviewBounds(null);
     finalBoundsRef.current = null;
 
-    onResizeEnd?.();
+    try {
+      onResizeEnd?.(resizeGestureIdRef.current ?? undefined);
+    } finally {
+      endPluginResizeSessions();
+    }
   };
 
   // 그룹 리사이즈 핸들러 - 프리뷰 모드
@@ -937,8 +1000,6 @@ export function useGridResize({
       const knobStore = useKnobItemStore.getState();
       const knobPositions = knobStore.positions;
       const currentKnobs = knobPositions[selectedKeyType] || [];
-      const editorChanges: EditorPatchV1 = { schemaVersion: 1 };
-
       // 프리뷰 값을 그대로 사용 (스냅은 이미 드래그 중에 적용됨)
       // 추가 스냅 적용 시 프리뷰와 최종 위치가 달라지는 문제 발생
 
@@ -967,7 +1028,6 @@ export function useGridResize({
           }),
         };
         setPositions(nextPositions);
-        editorChanges.keyPositions = nextPositions;
       }
 
       // 통계 요소들 업데이트
@@ -996,7 +1056,6 @@ export function useGridResize({
         };
 
         statStore.setPositions(nextStatPositions);
-        editorChanges.statPositions = nextStatPositions;
       }
 
       // 그래프 요소들 업데이트
@@ -1026,7 +1085,6 @@ export function useGridResize({
         };
 
         graphStore.setPositions(nextGraphPositions);
-        editorChanges.graphPositions = nextGraphPositions;
       }
 
       // 노브 요소들 업데이트
@@ -1055,7 +1113,6 @@ export function useGridResize({
         };
 
         knobStore.setPositions(nextKnobPositions);
-        editorChanges.knobPositions = nextKnobPositions;
       }
 
       // 플러그인 요소들 업데이트
@@ -1072,12 +1129,6 @@ export function useGridResize({
           },
         });
       }
-
-      if (Object.keys(editorChanges).length > 1) {
-        void editorCoordinator.commitPatch(editorChanges).catch((error) => {
-          console.error('Failed to persist group resize', error);
-        });
-      }
     }
 
     // 프리뷰 상태 클리어
@@ -1085,7 +1136,11 @@ export function useGridResize({
     setPreviewElementBounds(null);
     finalGroupBoundsRef.current = null;
 
-    onResizeEnd?.();
+    try {
+      onResizeEnd?.(resizeGestureIdRef.current ?? undefined);
+    } finally {
+      endPluginResizeSessions();
+    }
   };
 
   return {
diff --git a/src/renderer/hooks/Grid/useGridSelection.test.tsx b/src/renderer/hooks/Grid/useGridSelection.test.tsx
new file mode 100644
index 00000000..d9a65896
--- /dev/null
+++ b/src/renderer/hooks/Grid/useGridSelection.test.tsx
@@ -0,0 +1,255 @@
+import React, { act, useEffect } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { useGraphItemStore } from '@stores/data/useGraphItemStore';
+import { useKeyStore } from '@stores/data/useKeyStore';
+import { useKnobItemStore } from '@stores/data/useKnobItemStore';
+import { useLayerGroupStore } from '@stores/data/useLayerGroupStore';
+import { useStatItemStore } from '@stores/data/useStatItemStore';
+import { useGridSelectionStore } from '@stores/grid/useGridSelectionStore';
+import { usePluginDisplayElementStore } from '@stores/plugin/usePluginDisplayElementStore';
+import type { KeyPosition } from '@src/types/key/keys';
+import type { PluginDisplayElementInternal } from '@src/types/plugin/api';
+
+import { useGridSelection } from './useGridSelection';
+
+const mocks = vi.hoisted(() => ({
+  commitPatch: vi.fn((_patch: unknown, _options?: { gestureId?: string }) =>
+    Promise.resolve(),
+  ),
+  deletePluginElements: vi.fn(),
+  rotateSession: vi.fn(),
+  beginMixedGesture: vi.fn(),
+  cancelUncommittedMixedGesture: vi.fn(),
+  commitMixedGesture: vi.fn(() => Promise.resolve()),
+  sendBridgeMessage: vi.fn(),
+}));
+
+vi.mock('@src/renderer/editor/runtime/editorStateCoordinator', () => ({
+  editorCoordinator: { commitPatch: mocks.commitPatch },
+}));
+
+vi.mock('@plugins/rpc/pluginElementActions', () => ({
+  deletePluginElements: mocks.deletePluginElements,
+}));
+
+vi.mock('@plugins/runtime/displayElement/instancesCommitQueue', () => ({
+  rotatePluginInstancesEditSession: mocks.rotateSession,
+}));
+
+vi.mock('@plugins/runtime/displayElement/gestureTransaction', () => ({
+  beginMixedGestureTransaction: mocks.beginMixedGesture,
+  cancelUncommittedMixedGestureTransaction: mocks.cancelUncommittedMixedGesture,
+  commitMixedGestureTransaction: mocks.commitMixedGesture,
+}));
+
+vi.mock('@utils/plugin/bridgeMessages', () => ({
+  sendBridgeMessageBestEffort: mocks.sendBridgeMessage,
+}));
+
+const gestureId = '00000000-0000-4000-8000-0000000000f4';
+const keyPosition = {
+  dx: 10,
+  dy: 20,
+  width: 60,
+  height: 60,
+} as KeyPosition;
+const pluginElement = (): PluginDisplayElementInternal => ({
+  id: 'element',
+  fullId: 'plugin-a:element',
+  pluginId: 'plugin-a',
+  html: '<div />',
+  position: { x: 30, y: 40 },
+  tabId: '4key',
+});
+const pluginClipboardElement = () => {
+  const { fullId: _fullId, ...element } = pluginElement();
+  return element;
+};
+
+type SelectionApi = ReturnType<typeof useGridSelection>;
+
+interface HarnessProps {
+  expose: (api: SelectionApi) => void;
+}
+
+const Harness = ({ expose }: HarnessProps) => {
+  const selectedElements = useGridSelectionStore(
+    (state) => state.selectedElements,
+  );
+  const api = useGridSelection({
+    selectedElements,
+    selectedKeyType: '4key',
+    keyMappings: useKeyStore.getState().keyMappings,
+    positions: useKeyStore.getState().canonicalPositions,
+  });
+  useEffect(() => expose(api), [api, expose]);
+  return null;
+};
+
+describe('useGridSelection compound history gesture', () => {
+  let host: HTMLDivElement;
+  let root: Root;
+  let api: SelectionApi;
+  let randomUUID: ReturnType<typeof vi.spyOn>;
+
+  beforeEach(async () => {
+    globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+    mocks.commitPatch.mockClear();
+    mocks.deletePluginElements.mockClear();
+    mocks.rotateSession.mockClear();
+    mocks.beginMixedGesture.mockClear();
+    mocks.cancelUncommittedMixedGesture.mockClear();
+    mocks.commitMixedGesture.mockClear();
+    mocks.sendBridgeMessage.mockClear();
+    randomUUID = vi.spyOn(crypto, 'randomUUID').mockReturnValue(gestureId);
+
+    useKeyStore.setState({
+      selectedKeyType: '4key',
+      keyMappings: { '4key': ['KeyA'] },
+      positions: { '4key': [keyPosition] },
+      canonicalPositions: { '4key': [keyPosition] },
+    });
+    useStatItemStore.setState({ positions: {} });
+    useGraphItemStore.setState({ positions: {} });
+    useKnobItemStore.setState({ positions: {} });
+    useLayerGroupStore.setState({ layerGroups: {} });
+    usePluginDisplayElementStore.setState({ elements: [pluginElement()] });
+    useGridSelectionStore.getState().clearSelection();
+
+    host = document.createElement('div');
+    document.body.appendChild(host);
+    root = createRoot(host);
+    await act(async () => {
+      root.render(
+        <Harness
+          expose={(nextApi) => {
+            api = nextApi;
+          }}
+        />,
+      );
+    });
+  });
+
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    host.remove();
+    randomUUID.mockRestore();
+    globalThis.IS_REACT_ACT_ENVIRONMENT = false;
+  });
+
+  it('혼합 삭제는 editor와 plugin에 같은 gestureId를 전달한다', async () => {
+    await act(async () => {
+      useGridSelectionStore.getState().setSelectedElements([
+        { type: 'key', id: 'key-0', index: 0 },
+        { type: 'plugin', id: 'plugin-a:element' },
+      ]);
+    });
+
+    await act(async () => api.deleteSelectedElements());
+
+    expect(mocks.deletePluginElements).toHaveBeenCalledWith(
+      ['plugin-a:element'],
+      gestureId,
+    );
+    expect(mocks.beginMixedGesture).toHaveBeenCalledWith(gestureId, [
+      'plugin-a',
+    ]);
+    expect(mocks.commitMixedGesture).toHaveBeenCalledWith(
+      gestureId,
+      expect.objectContaining({ schemaVersion: 1 }),
+      ['plugin-a'],
+    );
+    expect(mocks.commitPatch).not.toHaveBeenCalled();
+  });
+
+  it('혼합 삭제 중 동기 예외가 나도 staged transaction을 정산한다', async () => {
+    const error = new Error('delete projection failed');
+    mocks.deletePluginElements.mockImplementationOnce(() => {
+      throw error;
+    });
+    await act(async () => {
+      useGridSelectionStore.getState().setSelectedElements([
+        { type: 'key', id: 'key-0', index: 0 },
+        { type: 'plugin', id: 'plugin-a:element' },
+      ]);
+    });
+
+    let caught: unknown;
+    await act(async () => {
+      try {
+        await api.deleteSelectedElements();
+      } catch (nextError) {
+        caught = nextError;
+      }
+    });
+
+    expect(caught).toBe(error);
+    expect(mocks.cancelUncommittedMixedGesture).toHaveBeenCalledWith(gestureId);
+  });
+
+  it('혼합 붙여넣기는 editor와 plugin에 같은 gestureId를 전달한다', async () => {
+    act(() => {
+      useGridSelectionStore.getState().setClipboard([
+        { type: 'key', keyCode: 'KeyB', position: keyPosition },
+        {
+          type: 'plugin',
+          element: pluginClipboardElement(),
+        },
+      ]);
+    });
+
+    await act(async () => api.pasteElements());
+
+    expect(mocks.rotateSession).toHaveBeenCalledWith('plugin-a', gestureId);
+    expect(mocks.beginMixedGesture).toHaveBeenCalledWith(gestureId, [
+      'plugin-a',
+    ]);
+    expect(mocks.commitMixedGesture).toHaveBeenCalledWith(
+      gestureId,
+      expect.objectContaining({ schemaVersion: 1 }),
+      ['plugin-a'],
+    );
+    expect(mocks.commitPatch).not.toHaveBeenCalled();
+  });
+
+  it('혼합 붙여넣기 중 동기 예외가 나도 staged transaction을 정산한다', async () => {
+    act(() => {
+      useGridSelectionStore.getState().setClipboard([
+        { type: 'key', keyCode: 'KeyB', position: keyPosition },
+        {
+          type: 'plugin',
+          element: pluginClipboardElement(),
+        },
+      ]);
+    });
+    const error = new Error('paste projection failed');
+    const pluginStore = usePluginDisplayElementStore.getState();
+    const setElements = vi
+      .spyOn(pluginStore, 'setElements')
+      .mockImplementationOnce(() => {
+        throw error;
+      });
+
+    let caught: unknown;
+    await act(async () => {
+      try {
+        await api.pasteElements();
+      } catch (nextError) {
+        caught = nextError;
+      }
+    });
+    setElements.mockRestore();
+
+    expect(caught).toBe(error);
+    expect(mocks.cancelUncommittedMixedGesture).toHaveBeenCalledWith(gestureId);
+  });
+
+  it('resize 종료 callback은 전달받은 gestureId로 editor를 저장한다', () => {
+    api.syncSelectedElementsToOverlay(gestureId);
+
+    expect(mocks.commitPatch).toHaveBeenCalledTimes(1);
+    expect(mocks.commitPatch.mock.calls[0]?.[1]).toEqual({ gestureId });
+  });
+});
diff --git a/src/renderer/hooks/Grid/useGridSelection.ts b/src/renderer/hooks/Grid/useGridSelection.ts
index 5eed4a6f..b0c97a56 100644
--- a/src/renderer/hooks/Grid/useGridSelection.ts
+++ b/src/renderer/hooks/Grid/useGridSelection.ts
@@ -41,6 +41,13 @@ import {
 } from '@utils/layerGroupUtils';
 import { editorCoordinator } from '@src/renderer/editor/runtime/editorStateCoordinator';
 import { sendBridgeMessageBestEffort } from '@utils/plugin/bridgeMessages';
+import { deletePluginElements } from '@plugins/rpc/pluginElementActions';
+import { rotatePluginInstancesEditSession } from '@plugins/runtime/displayElement/instancesCommitQueue';
+import {
+  beginMixedGestureTransaction,
+  cancelUncommittedMixedGestureTransaction,
+  commitMixedGestureTransaction,
+} from '@plugins/runtime/displayElement/gestureTransaction';
 
 interface UseGridSelectionParams {
   selectedElements: SelectedElement[];
@@ -53,13 +60,13 @@ interface UseGridSelectionReturn {
   moveSelectedElements: (
     deltaX: number,
     deltaY: number,
-    saveHistory?: boolean,
+    gestureId?: string,
     syncToOverlay?: boolean,
   ) => void;
   deleteSelectedElements: () => Promise<void>;
   copySelectedElements: () => void;
   pasteElements: () => Promise<void>;
-  syncSelectedElementsToOverlay: () => void;
+  syncSelectedElementsToOverlay: (gestureId?: string) => void;
   clipboard: ClipboardItem[];
 }
 
@@ -81,22 +88,47 @@ export function useGridSelection({
 
   // 선택된 요소들의 최종 위치를 한 번에 저장
   // 커밋 base는 canonical - rendered에는 다른 세션의 미커밋 프리뷰가 섞일 수 있음
-  const syncSelectedElementsToOverlay = () => {
+  const syncSelectedElementsToOverlay = (gestureId?: string) => {
     const currentPositions = useKeyStore.getState().canonicalPositions;
     const currentStatPositions = useStatItemStore.getState().positions;
     const currentGraphPositions = useGraphItemStore.getState().positions;
     const currentKnobPositions = useKnobItemStore.getState().positions;
-    void editorCoordinator
-      .commitPatch({
-        schemaVersion: 1,
-        keyPositions: currentPositions,
-        statPositions: currentStatPositions,
-        graphPositions: currentGraphPositions,
-        knobPositions: currentKnobPositions,
-      })
-      .catch((error: Error) => {
-        console.error('Failed to persist selected element positions', error);
-      });
+    const editorChanges = {
+      schemaVersion: 1 as const,
+      keyPositions: currentPositions,
+      statPositions: currentStatPositions,
+      graphPositions: currentGraphPositions,
+      knobPositions: currentKnobPositions,
+    };
+    const currentSelection = useGridSelectionStore.getState().selectedElements;
+    const selectedPluginElementIds = new Set(
+      currentSelection
+        .filter((element) => element.type === 'plugin')
+        .map((element) => element.id),
+    );
+    const pluginIds = [
+      ...new Set(
+        usePluginDisplayElementStore
+          .getState()
+          .elements.filter((element) =>
+            selectedPluginElementIds.has(element.fullId),
+          )
+          .map((element) => element.pluginId),
+      ),
+    ];
+    const isMixed =
+      currentSelection.some((element) => element.type !== 'plugin') &&
+      pluginIds.length > 0;
+    const persisted =
+      gestureId && isMixed
+        ? commitMixedGestureTransaction(gestureId, editorChanges, pluginIds)
+        : editorCoordinator.commitPatch(
+            editorChanges,
+            gestureId ? { gestureId } : undefined,
+          );
+    void persisted.catch((error: Error) => {
+      console.error('Failed to persist selected element positions', error);
+    });
 
     // 플러그인 요소도 명시적으로 동기화 (드래그 종료 시 skipSync로 인해 동기화되지 않았을 수 있음)
     const currentPluginElements =
@@ -110,7 +142,7 @@ export function useGridSelection({
   const moveSelectedElements = (
     deltaX: number,
     deltaY: number,
-    _saveHistory = false,
+    gestureId?: string,
     syncToOverlay = true,
   ) => {
     if (selectedElements.length === 0) return;
@@ -223,6 +255,18 @@ export function useGridSelection({
     // 플러그인 요소 배치 업데이트
     const pluginUpdates = selectedElements.filter((el) => el.type === 'plugin');
     if (pluginUpdates.length > 0) {
+      if (gestureId) {
+        const selectedPluginIds = new Set(
+          pluginUpdates.map((element) => element.id),
+        );
+        new Set(
+          currentPluginElements
+            .filter((element) => selectedPluginIds.has(element.fullId))
+            .map((element) => element.pluginId),
+        ).forEach((pluginId) => {
+          rotatePluginInstancesEditSession(pluginId, gestureId);
+        });
+      }
       const newElements = currentPluginElements.map((pluginEl) => {
         const isSelected = pluginUpdates.some(
           (sel) => sel.id === pluginEl.fullId,
@@ -245,7 +289,7 @@ export function useGridSelection({
     }
 
     if (syncToOverlay) {
-      syncSelectedElementsToOverlay();
+      syncSelectedElementsToOverlay(gestureId);
     }
   };
 
@@ -272,127 +316,165 @@ export function useGridSelection({
     const pluginsToDelete = selectedElements
       .filter((el) => el.type === 'plugin')
       .map((el) => el.id);
+    const gestureId = crypto.randomUUID();
+    const pluginIdsToDelete = [
+      ...new Set(
+        usePluginDisplayElementStore
+          .getState()
+          .elements.filter((element) =>
+            pluginsToDelete.includes(element.fullId),
+          )
+          .map((element) => element.pluginId),
+      ),
+    ];
+    const hasEditorDeletion =
+      keysToDelete.length > 0 ||
+      statsToDelete.length > 0 ||
+      graphsToDelete.length > 0 ||
+      knobsToDelete.length > 0;
+    const isMixedDeletion = hasEditorDeletion && pluginIdsToDelete.length > 0;
+    try {
+      if (isMixedDeletion) {
+        pluginIdsToDelete.forEach((pluginId) => {
+          rotatePluginInstancesEditSession(pluginId, gestureId);
+        });
+        beginMixedGestureTransaction(gestureId, pluginIdsToDelete);
+      }
 
-    // 먼저 선택 해제 (삭제된 인덱스 참조 방지)
-    clearSelection();
+      // 먼저 선택 해제 (삭제된 인덱스 참조 방지)
+      clearSelection();
 
-    // 키 배치 삭제 (atomic update로 한 번의 리렌더링만 발생)
-    if (keysToDelete.length > 0) {
-      const { keyMappings: km, canonicalPositions: pos } =
-        useKeyStore.getState();
-      const mapping = km[selectedKeyType] || [];
-      const posArray = pos[selectedKeyType] || [];
+      // 키 배치 삭제 (atomic update로 한 번의 리렌더링만 발생)
+      if (keysToDelete.length > 0) {
+        const { keyMappings: km, canonicalPositions: pos } =
+          useKeyStore.getState();
+        const mapping = km[selectedKeyType] || [];
+        const posArray = pos[selectedKeyType] || [];
 
-      // 삭제할 인덱스를 Set으로 변환 (O(1) 조회)
-      const deleteSet = new Set(keysToDelete);
+        // 삭제할 인덱스를 Set으로 변환 (O(1) 조회)
+        const deleteSet = new Set(keysToDelete);
 
-      const updatedMappings = {
-        ...km,
-        [selectedKeyType]: mapping.filter((_, index) => !deleteSet.has(index)),
-      };
+        const updatedMappings = {
+          ...km,
+          [selectedKeyType]: mapping.filter(
+            (_, index) => !deleteSet.has(index),
+          ),
+        };
 
-      const updatedPositions = {
-        ...pos,
-        [selectedKeyType]: posArray.filter((_, index) => !deleteSet.has(index)),
-      };
+        const updatedPositions = {
+          ...pos,
+          [selectedKeyType]: posArray.filter(
+            (_, index) => !deleteSet.has(index),
+          ),
+        };
 
-      // Atomic update: mappings, positions 동시 업데이트로 중간 상태 방지
-      useKeyStore
-        .getState()
-        .setKeyMappingsAndPositions(updatedMappings, updatedPositions);
-    }
+        // Atomic update: mappings, positions 동시 업데이트로 중간 상태 방지
+        useKeyStore
+          .getState()
+          .setKeyMappingsAndPositions(updatedMappings, updatedPositions);
+      }
 
-    // 플러그인 요소 배치 삭제
-    if (pluginsToDelete.length > 0) {
-      const currentElements = usePluginDisplayElementStore.getState().elements;
-      const deleteSet = new Set(pluginsToDelete);
-      const newElements = currentElements.filter(
-        (el) => !deleteSet.has(el.fullId),
-      );
-      usePluginDisplayElementStore.getState().setElements(newElements);
-    }
+      // 플러그인 요소 배치 삭제
+      if (pluginsToDelete.length > 0) {
+        deletePluginElements(pluginsToDelete, gestureId);
+      }
 
-    // 통계 요소 배치 삭제
-    if (statsToDelete.length > 0) {
-      const current = useStatItemStore.getState().positions;
-      const tabPositions = current[selectedKeyType] || [];
-      const deleteSet = new Set(statsToDelete);
-      const updatedPositions = {
-        ...current,
-        [selectedKeyType]: tabPositions.filter((_, idx) => !deleteSet.has(idx)),
-      };
+      // 통계 요소 배치 삭제
+      if (statsToDelete.length > 0) {
+        const current = useStatItemStore.getState().positions;
+        const tabPositions = current[selectedKeyType] || [];
+        const deleteSet = new Set(statsToDelete);
+        const updatedPositions = {
+          ...current,
+          [selectedKeyType]: tabPositions.filter(
+            (_, idx) => !deleteSet.has(idx),
+          ),
+        };
 
-      useStatItemStore.getState().setPositions(updatedPositions);
-    }
+        useStatItemStore.getState().setPositions(updatedPositions);
+      }
 
-    // 그래프 요소 배치 삭제
-    if (graphsToDelete.length > 0) {
-      const current = useGraphItemStore.getState().positions;
-      const tabPositions = current[selectedKeyType] || [];
-      const deleteSet = new Set(graphsToDelete);
-      const updatedPositions = {
-        ...current,
-        [selectedKeyType]: tabPositions.filter((_, idx) => !deleteSet.has(idx)),
-      };
+      // 그래프 요소 배치 삭제
+      if (graphsToDelete.length > 0) {
+        const current = useGraphItemStore.getState().positions;
+        const tabPositions = current[selectedKeyType] || [];
+        const deleteSet = new Set(graphsToDelete);
+        const updatedPositions = {
+          ...current,
+          [selectedKeyType]: tabPositions.filter(
+            (_, idx) => !deleteSet.has(idx),
+          ),
+        };
 
-      useGraphItemStore.getState().setPositions(updatedPositions);
-    }
+        useGraphItemStore.getState().setPositions(updatedPositions);
+      }
 
-    // 노브 요소 배치 삭제
-    if (knobsToDelete.length > 0) {
-      const current = useKnobItemStore.getState().positions;
-      const tabPositions = current[selectedKeyType] || [];
-      const deleteSet = new Set(knobsToDelete);
-      const updatedPositions = {
-        ...current,
-        [selectedKeyType]: tabPositions.filter((_, idx) => !deleteSet.has(idx)),
-      };
+      // 노브 요소 배치 삭제
+      if (knobsToDelete.length > 0) {
+        const current = useKnobItemStore.getState().positions;
+        const tabPositions = current[selectedKeyType] || [];
+        const deleteSet = new Set(knobsToDelete);
+        const updatedPositions = {
+          ...current,
+          [selectedKeyType]: tabPositions.filter(
+            (_, idx) => !deleteSet.has(idx),
+          ),
+        };
 
-      useKnobItemStore.getState().setPositions(updatedPositions);
-    }
+        useKnobItemStore.getState().setPositions(updatedPositions);
+      }
 
-    const normalized = normalizeLayerGroupsForMode({
-      mode: selectedKeyType,
-      keyPositions: useKeyStore.getState().canonicalPositions,
-      statPositions: useStatItemStore.getState().positions,
-      graphPositions: useGraphItemStore.getState().positions,
-      knobPositions: useKnobItemStore.getState().positions,
-      layerGroups: useLayerGroupStore.getState().layerGroups,
-    });
+      const normalized = normalizeLayerGroupsForMode({
+        mode: selectedKeyType,
+        keyPositions: useKeyStore.getState().canonicalPositions,
+        statPositions: useStatItemStore.getState().positions,
+        graphPositions: useGraphItemStore.getState().positions,
+        knobPositions: useKnobItemStore.getState().positions,
+        layerGroups: useLayerGroupStore.getState().layerGroups,
+      });
 
-    if (normalized.positionsChanged || normalized.groupsChanged) {
-      useKeyStore.getState().setPositions(normalized.keyPositions);
-      useStatItemStore.getState().setPositions(normalized.statPositions);
-      useGraphItemStore.getState().setPositions(normalized.graphPositions);
-      useKnobItemStore.getState().setPositions(normalized.knobPositions);
-      if (normalized.groupsChanged) {
-        useLayerGroupStore.getState().setLayerGroups(normalized.layerGroups);
+      if (normalized.positionsChanged || normalized.groupsChanged) {
+        useKeyStore.getState().setPositions(normalized.keyPositions);
+        useStatItemStore.getState().setPositions(normalized.statPositions);
+        useGraphItemStore.getState().setPositions(normalized.graphPositions);
+        useKnobItemStore.getState().setPositions(normalized.knobPositions);
+        if (normalized.groupsChanged) {
+          useLayerGroupStore.getState().setLayerGroups(normalized.layerGroups);
+        }
       }
-    }
 
-    const hasEditorDeletion =
-      keysToDelete.length > 0 ||
-      statsToDelete.length > 0 ||
-      graphsToDelete.length > 0 ||
-      knobsToDelete.length > 0;
-    if (
-      hasEditorDeletion ||
-      normalized.positionsChanged ||
-      normalized.groupsChanged
-    ) {
-      const keyState = useKeyStore.getState();
-      try {
-        await editorCoordinator.commitPatch({
-          schemaVersion: 1,
+      if (
+        hasEditorDeletion ||
+        normalized.positionsChanged ||
+        normalized.groupsChanged
+      ) {
+        const keyState = useKeyStore.getState();
+        const editorChanges = {
+          schemaVersion: 1 as const,
           ...(keysToDelete.length > 0 ? { keys: keyState.keyMappings } : {}),
           keyPositions: keyState.canonicalPositions,
           statPositions: useStatItemStore.getState().positions,
           graphPositions: useGraphItemStore.getState().positions,
           knobPositions: useKnobItemStore.getState().positions,
           layerGroups: useLayerGroupStore.getState().layerGroups,
-        });
-      } catch (error) {
-        console.error('Failed to persist selected element deletion', error);
+        };
+        try {
+          if (isMixedDeletion) {
+            await commitMixedGestureTransaction(
+              gestureId,
+              editorChanges,
+              pluginIdsToDelete,
+            );
+          } else {
+            await editorCoordinator.commitPatch(editorChanges, { gestureId });
+          }
+        } catch (error) {
+          console.error('Failed to persist selected element deletion', error);
+        }
+      }
+    } finally {
+      if (isMixedDeletion) {
+        cancelUncommittedMixedGestureTransaction(gestureId);
       }
     }
   };
@@ -503,6 +585,7 @@ export function useGridSelection({
     // 최신 클립보드 상태를 직접 스토어에서 가져오기 (클로저 문제 방지)
     const currentClipboard = useGridSelectionStore.getState().clipboard;
     if (currentClipboard.length === 0) return;
+    const gestureId = crypto.randomUUID();
     const clipboardGroups = useGridSelectionStore.getState().clipboardGroups;
 
     // 최신 상태를 직접 스토어에서 가져오기 (클로저 문제 방지)
@@ -606,219 +689,257 @@ export function useGridSelection({
       }
     }
 
-    // 새로 추가된 요소들의 선택을 위한 인덱스 추적
-    const newSelectedElements: SelectedElement[] = [];
+    const pluginIdsToAdd = [
+      ...new Set(pluginsToAdd.map((element) => element.pluginId)),
+    ];
+    const hasEditorPaste =
+      keysToAdd.length > 0 ||
+      statsToAdd.length > 0 ||
+      graphsToAdd.length > 0 ||
+      knobsToAdd.length > 0 ||
+      clipboardGroups.length > 0;
+    const isMixedPaste = hasEditorPaste && pluginIdsToAdd.length > 0;
+    try {
+      if (isMixedPaste) {
+        pluginIdsToAdd.forEach((pluginId) => {
+          rotatePluginInstancesEditSession(pluginId, gestureId);
+        });
+        beginMixedGestureTransaction(gestureId, pluginIdsToAdd);
+      }
 
-    // 붙여넣은 키 매핑 — 저장은 zIndex 확정 후 마지막에 1회만 (중간 저장은 순서 역전·패딩 위험)
-    let pastedKeyMappings: KeyMappings | null = null;
+      // 새로 추가된 요소들의 선택을 위한 인덱스 추적
+      const newSelectedElements: SelectedElement[] = [];
 
-    // 키 추가
-    if (keysToAdd.length > 0) {
-      const km = useKeyStore.getState().keyMappings;
-      const pos = useKeyStore.getState().canonicalPositions;
-      const mapping = [...(km[selectedKeyType] || [])];
-      const posArray = [...(pos[selectedKeyType] || [])];
+      // 붙여넣은 키 매핑 — 저장은 zIndex 확정 후 마지막에 1회만 (중간 저장은 순서 역전·패딩 위험)
+      let pastedKeyMappings: KeyMappings | null = null;
 
-      const startIndex = mapping.length;
+      // 키 추가
+      if (keysToAdd.length > 0) {
+        const km = useKeyStore.getState().keyMappings;
+        const pos = useKeyStore.getState().canonicalPositions;
+        const mapping = [...(km[selectedKeyType] || [])];
+        const posArray = [...(pos[selectedKeyType] || [])];
 
-      for (let i = 0; i < keysToAdd.length; i++) {
-        mapping.push(keysToAdd[i].keyCode);
-        posArray.push(keysToAdd[i].position);
-        newSelectedElements.push({
-          type: 'key',
-          id: `key-${startIndex + i}`,
-          index: startIndex + i,
-        });
-      }
+        const startIndex = mapping.length;
 
-      const updatedMappings = { ...km, [selectedKeyType]: mapping };
-      const updatedPositions = { ...pos, [selectedKeyType]: posArray };
+        for (let i = 0; i < keysToAdd.length; i++) {
+          mapping.push(keysToAdd[i].keyCode);
+          posArray.push(keysToAdd[i].position);
+          newSelectedElements.push({
+            type: 'key',
+            id: `key-${startIndex + i}`,
+            index: startIndex + i,
+          });
+        }
 
-      useKeyStore
-        .getState()
-        .setKeyMappingsAndPositions(updatedMappings, updatedPositions);
+        const updatedMappings = { ...km, [selectedKeyType]: mapping };
+        const updatedPositions = { ...pos, [selectedKeyType]: posArray };
 
-      pastedKeyMappings = updatedMappings;
-    }
+        useKeyStore
+          .getState()
+          .setKeyMappingsAndPositions(updatedMappings, updatedPositions);
 
-    // 통계 요소 추가
-    if (statsToAdd.length > 0) {
-      const current = useStatItemStore.getState().positions;
-      const posArray = [...(current[selectedKeyType] || [])];
-      const startIndex = posArray.length;
-
-      for (let i = 0; i < statsToAdd.length; i++) {
-        posArray.push(statsToAdd[i].position);
-        newSelectedElements.push({
-          type: 'stat',
-          id: `stat-${startIndex + i}`,
-          index: startIndex + i,
-        });
+        pastedKeyMappings = updatedMappings;
       }
 
-      const updatedPositions: StatItemPositions = {
-        ...current,
-        [selectedKeyType]: posArray,
-      };
-      useStatItemStore.getState().setPositions(updatedPositions);
-    }
+      // 통계 요소 추가
+      if (statsToAdd.length > 0) {
+        const current = useStatItemStore.getState().positions;
+        const posArray = [...(current[selectedKeyType] || [])];
+        const startIndex = posArray.length;
 
-    // 그래프 요소 추가
-    if (graphsToAdd.length > 0) {
-      const current = useGraphItemStore.getState().positions;
-      const posArray = [...(current[selectedKeyType] || [])];
-      const startIndex = posArray.length;
-
-      for (let i = 0; i < graphsToAdd.length; i++) {
-        posArray.push(graphsToAdd[i].position);
-        newSelectedElements.push({
-          type: 'graph',
-          id: `graph-${startIndex + i}`,
-          index: startIndex + i,
-        });
+        for (let i = 0; i < statsToAdd.length; i++) {
+          posArray.push(statsToAdd[i].position);
+          newSelectedElements.push({
+            type: 'stat',
+            id: `stat-${startIndex + i}`,
+            index: startIndex + i,
+          });
+        }
+
+        const updatedPositions: StatItemPositions = {
+          ...current,
+          [selectedKeyType]: posArray,
+        };
+        useStatItemStore.getState().setPositions(updatedPositions);
       }
 
-      const updatedPositions: GraphItemPositions = {
-        ...current,
-        [selectedKeyType]: posArray,
-      };
-      useGraphItemStore.getState().setPositions(updatedPositions);
-    }
+      // 그래프 요소 추가
+      if (graphsToAdd.length > 0) {
+        const current = useGraphItemStore.getState().positions;
+        const posArray = [...(current[selectedKeyType] || [])];
+        const startIndex = posArray.length;
 
-    // 노브 요소 추가 (zIndex 레이어 재배치 대상 외 — 별도 영속/동기화)
-    if (knobsToAdd.length > 0) {
-      const current = useKnobItemStore.getState().positions;
-      const posArray = [...(current[selectedKeyType] || [])];
-      const startIndex = posArray.length;
-
-      for (let i = 0; i < knobsToAdd.length; i++) {
-        posArray.push(knobsToAdd[i].position);
-        newSelectedElements.push({
-          type: 'knob',
-          id: `knob-${startIndex + i}`,
-          index: startIndex + i,
-        });
+        for (let i = 0; i < graphsToAdd.length; i++) {
+          posArray.push(graphsToAdd[i].position);
+          newSelectedElements.push({
+            type: 'graph',
+            id: `graph-${startIndex + i}`,
+            index: startIndex + i,
+          });
+        }
+
+        const updatedPositions: GraphItemPositions = {
+          ...current,
+          [selectedKeyType]: posArray,
+        };
+        useGraphItemStore.getState().setPositions(updatedPositions);
       }
 
-      const updatedPositions: KnobItemPositions = {
-        ...current,
-        [selectedKeyType]: posArray,
-      };
-      useKnobItemStore.getState().setPositions(updatedPositions);
-    }
+      // 노브 요소 추가 (zIndex 레이어 재배치 대상 외 — 별도 영속/동기화)
+      if (knobsToAdd.length > 0) {
+        const current = useKnobItemStore.getState().positions;
+        const posArray = [...(current[selectedKeyType] || [])];
+        const startIndex = posArray.length;
+
+        for (let i = 0; i < knobsToAdd.length; i++) {
+          posArray.push(knobsToAdd[i].position);
+          newSelectedElements.push({
+            type: 'knob',
+            id: `knob-${startIndex + i}`,
+            index: startIndex + i,
+          });
+        }
 
-    // 플러그인 요소 추가
-    if (pluginsToAdd.length > 0) {
-      const currentElements = usePluginDisplayElementStore.getState().elements;
-      const newElements = [...currentElements];
-
-      for (const elementData of pluginsToAdd) {
-        // 새로운 고유 ID 생성
-        const newFullId = `${elementData.pluginId}:${
-          elementData.id
-        }:${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
-        const newElement = {
-          ...elementData,
-          fullId: newFullId,
+        const updatedPositions: KnobItemPositions = {
+          ...current,
+          [selectedKeyType]: posArray,
         };
-        newElements.push(newElement);
-        newSelectedElements.push({
-          type: 'plugin',
-          id: newFullId,
-        });
+        useKnobItemStore.getState().setPositions(updatedPositions);
       }
 
-      usePluginDisplayElementStore.getState().setElements(newElements);
-    }
-
-    // === Phase 2: paste 위치 결정 + zIndex 재계산 ===
-    const freshKeyPos = useKeyStore.getState().canonicalPositions;
-    const freshStatPos = useStatItemStore.getState().positions;
-    const freshGraphPos = useGraphItemStore.getState().positions;
-    const freshKnobPos = useKnobItemStore.getState().positions;
-    const freshPluginEls = usePluginDisplayElementStore.getState().elements;
-
-    // 전체 레이어 목록 구성 (새로 push된 아이템 포함)
-    const allItems = buildLayerItemsForMode(
-      selectedKeyType,
-      freshKeyPos,
-      freshStatPos,
-      freshGraphPos,
-      freshKnobPos,
-      freshPluginEls,
-    );
+      // 플러그인 요소 추가
+      if (pluginsToAdd.length > 0) {
+        new Set(pluginsToAdd.map((element) => element.pluginId)).forEach(
+          (pluginId) => {
+            rotatePluginInstancesEditSession(pluginId, gestureId);
+          },
+        );
+        const currentElements =
+          usePluginDisplayElementStore.getState().elements;
+        const newElements = [...currentElements];
+
+        for (const elementData of pluginsToAdd) {
+          // 새로운 고유 ID 생성
+          const newFullId = `${elementData.pluginId}:${
+            elementData.id
+          }:${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+          const newElement = {
+            ...elementData,
+            fullId: newFullId,
+          };
+          newElements.push(newElement);
+          newSelectedElements.push({
+            type: 'plugin',
+            id: newFullId,
+          });
+        }
 
-    // 새 아이템과 기존 아이템 분리
-    const newIds = new Set(newSelectedElements.map((el) => el.id));
-    const existing = allItems.filter((item) => !newIds.has(item.id));
-    const pasted = allItems.filter((item) => newIds.has(item.id));
+        usePluginDisplayElementStore.getState().setElements(newElements);
+      }
 
-    // 앵커 위치 계산 (paste 전 선택 기준)
-    const anchor = findPasteAnchorIndex(
-      existing,
-      currentSelectedElements,
-      currentSelectedGroupIds,
-    );
+      // === Phase 2: paste 위치 결정 + zIndex 재계산 ===
+      const freshKeyPos = useKeyStore.getState().canonicalPositions;
+      const freshStatPos = useStatItemStore.getState().positions;
+      const freshGraphPos = useGraphItemStore.getState().positions;
+      const freshKnobPos = useKnobItemStore.getState().positions;
+      const freshPluginEls = usePluginDisplayElementStore.getState().elements;
+
+      // 전체 레이어 목록 구성 (새로 push된 아이템 포함)
+      const allItems = buildLayerItemsForMode(
+        selectedKeyType,
+        freshKeyPos,
+        freshStatPos,
+        freshGraphPos,
+        freshKnobPos,
+        freshPluginEls,
+      );
 
-    // 새 아이템을 앵커 위치에 삽입
-    const reordered = [
-      ...existing.slice(0, anchor),
-      ...pasted,
-      ...existing.slice(anchor),
-    ];
+      // 새 아이템과 기존 아이템 분리
+      const newIds = new Set(newSelectedElements.map((el) => el.id));
+      const existing = allItems.filter((item) => !newIds.has(item.id));
+      const pasted = allItems.filter((item) => newIds.has(item.id));
 
-    // zIndex 일괄 재부여
-    const patch = applyZIndexToLayerOrder(
-      reordered,
-      selectedKeyType,
-      freshKeyPos,
-      freshStatPos,
-      freshGraphPos,
-      freshKnobPos,
-    );
+      // 앵커 위치 계산 (paste 전 선택 기준)
+      const anchor = findPasteAnchorIndex(
+        existing,
+        currentSelectedElements,
+        currentSelectedGroupIds,
+      );
 
-    // 스토어 업데이트 (동기 — 배칭으로 한 번에 렌더)
-    useKeyStore.getState().setPositions(patch.keyPositions);
-    useStatItemStore.getState().setPositions(patch.statPositions);
-    useGraphItemStore.getState().setPositions(patch.graphPositions);
-    useKnobItemStore.getState().setPositions(patch.knobPositions);
-    for (const { fullId, zIndex } of patch.pluginUpdates) {
-      usePluginDisplayElementStore
-        .getState()
-        .updateElement(fullId, { zIndex }, { skipSync: true });
-    }
+      // 새 아이템을 앵커 위치에 삽입
+      const reordered = [
+        ...existing.slice(0, anchor),
+        ...pasted,
+        ...existing.slice(anchor),
+      ];
+
+      // zIndex 일괄 재부여
+      const patch = applyZIndexToLayerOrder(
+        reordered,
+        selectedKeyType,
+        freshKeyPos,
+        freshStatPos,
+        freshGraphPos,
+        freshKnobPos,
+      );
 
-    // 선택 업데이트도 동기 구간에서 처리 (await 전에 실행해야 깜빡임 방지)
-    if (newSelectedElements.length > 0) {
-      useGridSelectionStore.getState().setSkipPanelModeSwitch(true);
-      if (groupIdMap.size > 0) {
-        const newGroupIds = Array.from(groupIdMap.values());
-        useGridSelectionStore
+      // 스토어 업데이트 (동기 — 배칭으로 한 번에 렌더)
+      useKeyStore.getState().setPositions(patch.keyPositions);
+      useStatItemStore.getState().setPositions(patch.statPositions);
+      useGraphItemStore.getState().setPositions(patch.graphPositions);
+      useKnobItemStore.getState().setPositions(patch.knobPositions);
+      for (const { fullId, zIndex } of patch.pluginUpdates) {
+        usePluginDisplayElementStore
           .getState()
-          .setFullSelection(newSelectedElements, newGroupIds);
-      } else {
-        setSelectedElements(newSelectedElements);
+          .updateElement(fullId, { zIndex }, { skipSync: true });
       }
-    }
 
-    // 붙여넣기 전체를 한 revision으로 저장
-    try {
-      await editorCoordinator.commitPatch({
-        schemaVersion: 1,
+      // 선택 업데이트도 동기 구간에서 처리 (await 전에 실행해야 깜빡임 방지)
+      if (newSelectedElements.length > 0) {
+        useGridSelectionStore.getState().setSkipPanelModeSwitch(true);
+        if (groupIdMap.size > 0) {
+          const newGroupIds = Array.from(groupIdMap.values());
+          useGridSelectionStore
+            .getState()
+            .setFullSelection(newSelectedElements, newGroupIds);
+        } else {
+          setSelectedElements(newSelectedElements);
+        }
+      }
+
+      // 붙여넣기 전체를 한 revision으로 저장
+      const editorChanges = {
+        schemaVersion: 1 as const,
         ...(pastedKeyMappings ? { keys: pastedKeyMappings } : {}),
         keyPositions: patch.keyPositions,
         statPositions: patch.statPositions,
         graphPositions: patch.graphPositions,
         knobPositions: patch.knobPositions,
         layerGroups: useLayerGroupStore.getState().layerGroups,
+      };
+      try {
+        if (isMixedPaste) {
+          await commitMixedGestureTransaction(
+            gestureId,
+            editorChanges,
+            pluginIdsToAdd,
+          );
+        } else {
+          await editorCoordinator.commitPatch(editorChanges, { gestureId });
+        }
+      } catch (error) {
+        console.error('Failed to persist pasted elements', error);
+      }
+      const pluginEls = usePluginDisplayElementStore.getState().elements;
+      sendBridgeMessageBestEffort('overlay', 'plugin:displayElements:sync', {
+        elements: pluginEls,
       });
-    } catch (error) {
-      console.error('Failed to persist pasted elements', error);
+    } finally {
+      if (isMixedPaste) {
+        cancelUncommittedMixedGestureTransaction(gestureId);
+      }
     }
-    const pluginEls = usePluginDisplayElementStore.getState().elements;
-    sendBridgeMessageBestEffort('overlay', 'plugin:displayElements:sync', {
-      elements: pluginEls,
-    });
   };
 
   return {
diff --git a/src/renderer/hooks/Grid/useSelectionDrag.test.tsx b/src/renderer/hooks/Grid/useSelectionDrag.test.tsx
index d4cd9ce4..600dc6e5 100644
--- a/src/renderer/hooks/Grid/useSelectionDrag.test.tsx
+++ b/src/renderer/hooks/Grid/useSelectionDrag.test.tsx
@@ -61,7 +61,7 @@ vi.mock('@utils/grid/smartGuides', async (importOriginal) => {
 interface HarnessProps {
   onClick: () => void;
   onMovedCheck: (moved: boolean) => void;
-  onMultiDragStart: () => void;
+  onMultiDragStart: () => void | (() => void);
   onMultiDrag: (dx: number, dy: number) => void;
   onMultiDragEnd: () => void;
 }
@@ -140,7 +140,7 @@ describe('useSelectionDrag', () => {
   let nextRafId: number;
   let onClick: Mock<() => void>;
   let onMovedCheck: Mock<(moved: boolean) => void>;
-  let onMultiDragStart: Mock<() => void>;
+  let onMultiDragStart: Mock<() => void | (() => void)>;
   let onMultiDrag: Mock<(dx: number, dy: number) => void>;
   let onMultiDragEnd: Mock<() => void>;
 
@@ -238,6 +238,8 @@ describe('useSelectionDrag', () => {
 
     expect(down.defaultPrevented).toBe(false);
     expect(onClick).toHaveBeenCalledTimes(1);
+    expect(onMultiDragStart).not.toHaveBeenCalled();
+    expect(onMultiDragEnd).not.toHaveBeenCalled();
   });
 
   it('ignores an additional press during the owned pointer session', async () => {
@@ -247,6 +249,10 @@ describe('useSelectionDrag', () => {
     await act(async () => {
       element.dispatchEvent(pointerEvent('pointerdown', { pointerId: 1 }));
       element.dispatchEvent(pointerEvent('pointerdown', { pointerId: 2 }));
+      element.dispatchEvent(
+        pointerEvent('pointermove', { pointerId: 1, clientX: 7 }),
+      );
+      flushRaf();
       element.dispatchEvent(pointerEvent('pointerup', { pointerId: 1 }));
     });
 
@@ -256,21 +262,45 @@ describe('useSelectionDrag', () => {
   });
 
   it('completes once across duplicate terminal signals', async () => {
+    const cleanup = vi.fn();
+    onMultiDragStart.mockReturnValue(cleanup);
     const element = await renderHarness();
 
     await act(async () => {
       element.dispatchEvent(pointerEvent('pointerdown'));
-      element.dispatchEvent(pointerEvent('pointerup'));
+      element.dispatchEvent(pointerEvent('pointermove', { clientX: 7 }));
+      flushRaf();
+      element.dispatchEvent(pointerEvent('pointercancel'));
       element.dispatchEvent(pointerEvent('lostpointercapture'));
       window.dispatchEvent(new Event('blur'));
     });
 
     expect(onMultiDragEnd).toHaveBeenCalledTimes(1);
+    expect(cleanup).toHaveBeenCalledOnce();
+    expect(onMultiDragEnd.mock.invocationCallOrder[0]).toBeLessThan(
+      cleanup.mock.invocationCallOrder[0]!,
+    );
     expect(
       setDraggingOrResizing.mock.calls.filter(([value]) => value === false),
     ).toHaveLength(1);
   });
 
+  it('active drag를 unmount할 때 gesture cleanup을 한 번 실행한다', async () => {
+    const cleanup = vi.fn();
+    onMultiDragStart.mockReturnValue(cleanup);
+    const element = await renderHarness();
+
+    await act(async () => {
+      element.dispatchEvent(pointerEvent('pointerdown'));
+      element.dispatchEvent(pointerEvent('pointermove', { clientX: 7 }));
+      flushRaf();
+      root.render(null);
+    });
+
+    expect(onMultiDragEnd).toHaveBeenCalledOnce();
+    expect(cleanup).toHaveBeenCalledOnce();
+  });
+
   it('keeps the double-click guard across the second stationary press', async () => {
     const element = await renderHarness();
 
@@ -349,6 +379,10 @@ describe('useSelectionDrag', () => {
     await act(async () => {
       element.dispatchEvent(pointerEvent('pointerdown', { pointerId: 1 }));
       element2.dispatchEvent(pointerEvent('pointerdown', { pointerId: 2 }));
+      element.dispatchEvent(
+        pointerEvent('pointermove', { pointerId: 1, clientX: 7 }),
+      );
+      flushRaf();
     });
     expect(onMultiDragStart).toHaveBeenCalledTimes(1);
     expect(onMultiDragStart2).not.toHaveBeenCalled();
@@ -357,6 +391,10 @@ describe('useSelectionDrag', () => {
     await act(async () => {
       element.dispatchEvent(pointerEvent('pointerup', { pointerId: 1 }));
       element2.dispatchEvent(pointerEvent('pointerdown', { pointerId: 3 }));
+      element2.dispatchEvent(
+        pointerEvent('pointermove', { pointerId: 3, clientX: 7 }),
+      );
+      flushRaf();
     });
     expect(onMultiDragStart2).toHaveBeenCalledTimes(1);
 
diff --git a/src/renderer/hooks/Grid/useSelectionDrag.ts b/src/renderer/hooks/Grid/useSelectionDrag.ts
index 4d0dbabb..d0de12d7 100644
--- a/src/renderer/hooks/Grid/useSelectionDrag.ts
+++ b/src/renderer/hooks/Grid/useSelectionDrag.ts
@@ -30,7 +30,7 @@ interface UseSelectionDragOptions {
   selectedElements: SelectedElementLike[];
   getOtherElements: (excludeId: string) => ElementBounds[];
   getSelectedElementIds?: (element: SelectedElementLike) => string[];
-  onMultiDragStart?: () => void;
+  onMultiDragStart?: () => void | (() => void);
   onMultiDrag?: (dx: number, dy: number) => void;
   onMultiDragEnd?: () => void;
 }
@@ -86,6 +86,8 @@ export const useSelectionDrag = ({
     let lastSnappedDeltaY = 0;
     let rafId: number | null = null;
     let dragEnded = false;
+    let actuallyDragging = false;
+    let finishGesture: (() => void) | null = null;
 
     activePointerIdRef.current = pointerId;
     movedDuringPressRef.current = lastPressMovedRef.current;
@@ -94,8 +96,6 @@ export const useSelectionDrag = ({
     dragTarget.style.userSelect = 'none';
 
     useSmartGuidesStore.getState().clearGuides();
-    useGridSelectionStore.getState().setDraggingOrResizing(true);
-    onMultiDragStart?.();
 
     const handlePointerMove = (moveEvent: PointerEvent) => {
       if (dragEnded || moveEvent.pointerId !== activePointerIdRef.current) {
@@ -236,6 +236,12 @@ export const useSelectionDrag = ({
         const moveDeltaX = snappedDeltaX - lastSnappedDeltaX;
         const moveDeltaY = snappedDeltaY - lastSnappedDeltaY;
         if (moveDeltaX !== 0 || moveDeltaY !== 0) {
+          if (!actuallyDragging) {
+            actuallyDragging = true;
+            useGridSelectionStore.getState().setDraggingOrResizing(true);
+            const cleanup = onMultiDragStart?.();
+            finishGesture = typeof cleanup === 'function' ? cleanup : null;
+          }
           lastSnappedDeltaX = snappedDeltaX;
           lastSnappedDeltaY = snappedDeltaY;
           movedDuringPressRef.current = true;
@@ -266,8 +272,15 @@ export const useSelectionDrag = ({
       window.removeEventListener('blur', finishDrag);
       dragTarget.style.userSelect = previousUserSelect;
       useSmartGuidesStore.getState().clearGuides();
-      useGridSelectionStore.getState().setDraggingOrResizing(false);
-      onMultiDragEnd?.();
+      if (actuallyDragging) {
+        useGridSelectionStore.getState().setDraggingOrResizing(false);
+        try {
+          onMultiDragEnd?.();
+        } finally {
+          finishGesture?.();
+          finishGesture = null;
+        }
+      }
     };
 
     const handlePointerEnd = (endEvent: PointerEvent) => {
diff --git a/src/renderer/hooks/app/useAppBootstrap.ts b/src/renderer/hooks/app/useAppBootstrap.ts
index e8c097ab..df3ce718 100644
--- a/src/renderer/hooks/app/useAppBootstrap.ts
+++ b/src/renderer/hooks/app/useAppBootstrap.ts
@@ -27,7 +27,6 @@ import {
 import { stableStringify } from '@utils/core/stableStringify';
 import { useTranslation } from '@contexts/useTranslation';
 import { editorCoordinator } from '@src/renderer/editor/runtime/editorStateCoordinator';
-import { previewApi } from '@api/modules/previewApi';
 import { panelWindowApi } from '@api/modules/selectionSessionApi';
 import {
   initSelectionSync,
@@ -46,7 +45,6 @@ import {
   useHistoryStatusStore,
   syncHistoryStatus,
 } from '@stores/data/useHistoryStatusStore';
-import { previewOverlay } from '@src/renderer/editor/runtime/previewOverlay';
 import { flushFocusedEditorForLifecycle } from '@src/renderer/editor/runtime/lifecycleEditorFlush';
 import {
   acquireHistoryEditorFlushLock,
@@ -143,6 +141,8 @@ export function useAppBootstrap() {
   useEffect(() => {
     let disposed = false;
     let stopSelectionSync: (() => void) | null = null;
+    let editorCoordinatorRetryTimer: ReturnType<typeof setTimeout> | null =
+      null;
     const isOverlayWindow = window.__dmn_window_type === 'overlay';
     let conflictDialogOpen = false;
     let lastShownPermanentEditorError: unknown = null;
@@ -171,6 +171,20 @@ export function useAppBootstrap() {
       counterDelayTimers.clear();
     };
 
+    const scheduleEditorCoordinatorRecovery = () => {
+      if (disposed || editorCoordinatorRetryTimer !== null) return;
+
+      editorCoordinatorRetryTimer = setTimeout(() => {
+        editorCoordinatorRetryTimer = null;
+        if (disposed) return;
+
+        void editorCoordinator
+          .start()
+          .then(() => editorCoordinator.sync())
+          .catch(() => scheduleEditorCoordinatorRecovery());
+      }, 1_000);
+    };
+
     const getCounterDelayMs = () => {
       const { noteSettings } = useSettingsStore.getState();
       const delay = Number(noteSettings?.keyDisplayDelayMs ?? 0);
@@ -521,17 +535,9 @@ export function useAppBootstrap() {
           await editorCoordinator.sync({ reapply: true });
         } catch (error) {
           console.error('편집 상태 초기화 실패', error);
+          scheduleEditorCoordinatorRecovery();
         }
 
-        // 다른 창의 편집 프리뷰 수신 (재구독 시 브로커가 이전 채널 교체)
-        previewApi
-          .subscribe((envelope) => {
-            previewOverlay.applyRemoteEnvelope(envelope);
-          })
-          .catch((error) => {
-            console.error('프리뷰 채널 구독 실패', error);
-          });
-
         // 백엔드 undo authority 상태 초기 조회
         void syncHistoryStatus();
 
@@ -787,6 +793,10 @@ export function useAppBootstrap() {
 
     return () => {
       disposed = true;
+      if (editorCoordinatorRetryTimer !== null) {
+        clearTimeout(editorCoordinatorRetryTimer);
+        editorCoordinatorRetryTimer = null;
+      }
       resetHistoryEditorFlushLock();
       stopSelectionSync?.();
       stopPluginRpcHandler?.();
diff --git a/src/renderer/plugins/rpc/pluginElementActions.test.ts b/src/renderer/plugins/rpc/pluginElementActions.test.ts
index 83604b43..f80882fd 100644
--- a/src/renderer/plugins/rpc/pluginElementActions.test.ts
+++ b/src/renderer/plugins/rpc/pluginElementActions.test.ts
@@ -4,6 +4,12 @@ const mocks = vi.hoisted(() => ({
   sendPluginRpc: vi.fn(),
   sendBridgeMessageBestEffort: vi.fn(),
   updateElement: vi.fn(),
+  setElements: vi.fn(),
+  rotateEditSession: vi.fn(),
+  elements: [] as Array<{
+    fullId: string;
+    pluginId: string;
+  }>,
 }));
 
 vi.mock('./pluginRpcClient', () => ({
@@ -21,10 +27,18 @@ vi.mock('@utils/plugin/panelModelSync', () => ({
 
 vi.mock('@stores/plugin/usePluginDisplayElementStore', () => ({
   usePluginDisplayElementStore: {
-    getState: () => ({ elements: [], updateElement: mocks.updateElement }),
+    getState: () => ({
+      elements: mocks.elements,
+      setElements: mocks.setElements,
+      updateElement: mocks.updateElement,
+    }),
   },
 }));
 
+vi.mock('@plugins/runtime/displayElement/instancesCommitQueue', () => ({
+  rotatePluginInstancesEditSession: mocks.rotateEditSession,
+}));
+
 describe('plugin element panel queue', () => {
   let actions: typeof import('./pluginElementActions');
 
@@ -33,6 +47,9 @@ describe('plugin element panel queue', () => {
     mocks.sendPluginRpc.mockReset();
     mocks.sendBridgeMessageBestEffort.mockReset();
     mocks.updateElement.mockReset();
+    mocks.setElements.mockReset();
+    mocks.rotateEditSession.mockReset();
+    mocks.elements = [];
     window.__dmn_window_type = 'panel';
     actions = await import('./pluginElementActions');
   });
@@ -94,4 +111,71 @@ describe('plugin element panel queue', () => {
       settings: { accent: 'blue', opacity: 0.8 },
     });
   });
+
+  it('main의 discrete 삭제는 대상 플러그인별 세션을 먼저 분리한다', () => {
+    window.__dmn_window_type = 'main';
+    mocks.elements = [
+      { fullId: 'plugin-a:one', pluginId: 'plugin-a' },
+      { fullId: 'plugin-a:two', pluginId: 'plugin-a' },
+      { fullId: 'plugin-b:one', pluginId: 'plugin-b' },
+      { fullId: 'plugin-c:one', pluginId: 'plugin-c' },
+    ];
+
+    actions.deletePluginElements([
+      'plugin-a:one',
+      'plugin-a:two',
+      'plugin-b:one',
+    ]);
+
+    expect(mocks.rotateEditSession).toHaveBeenCalledTimes(2);
+    expect(mocks.rotateEditSession).toHaveBeenCalledWith('plugin-a');
+    expect(mocks.rotateEditSession).toHaveBeenCalledWith('plugin-b');
+    expect(mocks.setElements).toHaveBeenCalledWith([
+      { fullId: 'plugin-c:one', pluginId: 'plugin-c' },
+    ]);
+  });
+
+  it('main의 가시성 변경은 대상 플러그인별 세션을 먼저 분리한다', () => {
+    window.__dmn_window_type = 'main';
+    mocks.elements = [
+      { fullId: 'plugin-a:one', pluginId: 'plugin-a' },
+      { fullId: 'plugin-a:two', pluginId: 'plugin-a' },
+      { fullId: 'plugin-b:one', pluginId: 'plugin-b' },
+    ];
+
+    actions.setPluginElementsHidden([
+      { fullId: 'plugin-a:one', hidden: true },
+      { fullId: 'plugin-a:two', hidden: true },
+      { fullId: 'plugin-b:one', hidden: false },
+    ]);
+
+    expect(mocks.rotateEditSession).toHaveBeenCalledTimes(2);
+    expect(mocks.rotateEditSession).toHaveBeenCalledWith('plugin-a');
+    expect(mocks.rotateEditSession).toHaveBeenCalledWith('plugin-b');
+    expect(mocks.rotateEditSession.mock.invocationCallOrder[0]).toBeLessThan(
+      mocks.updateElement.mock.invocationCallOrder[0]!,
+    );
+    expect(mocks.updateElement).toHaveBeenCalledTimes(3);
+  });
+
+  it('main의 레이어 순서 변경은 대상 플러그인별 세션을 먼저 분리한다', () => {
+    window.__dmn_window_type = 'main';
+    mocks.elements = [
+      { fullId: 'plugin-a:one', pluginId: 'plugin-a' },
+      { fullId: 'plugin-b:one', pluginId: 'plugin-b' },
+    ];
+
+    actions.setPluginElementZIndexes([
+      { fullId: 'plugin-a:one', zIndex: 10 },
+      { fullId: 'plugin-b:one', zIndex: 9 },
+    ]);
+
+    expect(mocks.rotateEditSession).toHaveBeenCalledTimes(2);
+    expect(mocks.rotateEditSession).toHaveBeenCalledWith('plugin-a');
+    expect(mocks.rotateEditSession).toHaveBeenCalledWith('plugin-b');
+    expect(mocks.rotateEditSession.mock.invocationCallOrder[0]).toBeLessThan(
+      mocks.updateElement.mock.invocationCallOrder[0]!,
+    );
+    expect(mocks.updateElement).toHaveBeenCalledTimes(2);
+  });
 });
diff --git a/src/renderer/plugins/rpc/pluginElementActions.ts b/src/renderer/plugins/rpc/pluginElementActions.ts
index 8a24ea4a..2c031698 100644
--- a/src/renderer/plugins/rpc/pluginElementActions.ts
+++ b/src/renderer/plugins/rpc/pluginElementActions.ts
@@ -11,6 +11,7 @@ import {
   PANEL_MODEL_REQUEST_MESSAGE,
   getPluginPanelModelRevision,
 } from '@utils/plugin/panelModelSync';
+import { rotatePluginInstancesEditSession } from '@plugins/runtime/displayElement/instancesCommitQueue';
 
 import { sendPluginRpc } from './pluginRpcClient';
 
@@ -23,6 +24,26 @@ export const PLUGIN_RPC_OPERATIONS = {
 
 const isPanelWindow = () => window.__dmn_window_type === 'panel';
 
+const rotateTargetPluginSessions = (
+  fullIds: string[],
+  gestureId?: string,
+): void => {
+  const targetIds = new Set(fullIds);
+  const pluginIds = new Set(
+    usePluginDisplayElementStore
+      .getState()
+      .elements.filter((element) => targetIds.has(element.fullId))
+      .map((element) => element.pluginId),
+  );
+  pluginIds.forEach((pluginId) => {
+    if (gestureId) {
+      rotatePluginInstancesEditSession(pluginId, gestureId);
+    } else {
+      rotatePluginInstancesEditSession(pluginId);
+    }
+  });
+};
+
 // 패널 미러의 마지막 수신 backend revision - RPC expectedModelRevision 토큰
 let mirrorRevision = 0;
 let revisionWaiters: Array<() => void> = [];
@@ -214,6 +235,7 @@ export const setPluginElementsHidden = (
     delegate(PLUGIN_RPC_OPERATIONS.setHidden, { targets });
     return;
   }
+  rotateTargetPluginSessions(targets.map(({ fullId }) => fullId));
   const store = usePluginDisplayElementStore.getState();
   targets.forEach(({ fullId, hidden }) => {
     store.updateElement(fullId, { hidden });
@@ -221,15 +243,20 @@ export const setPluginElementsHidden = (
 };
 
 /** 요소 삭제 */
-export const deletePluginElements = (fullIds: string[]): void => {
+export const deletePluginElements = (
+  fullIds: string[],
+  gestureId?: string,
+): void => {
   if (fullIds.length === 0) return;
   if (isPanelWindow()) {
     delegate(PLUGIN_RPC_OPERATIONS.remove, { fullIds });
     return;
   }
   const store = usePluginDisplayElementStore.getState();
+  const targetIds = new Set(fullIds);
+  rotateTargetPluginSessions(fullIds, gestureId);
   const remaining = store.elements.filter(
-    (element) => !fullIds.includes(element.fullId),
+    (element) => !targetIds.has(element.fullId),
   );
   store.setElements(remaining);
 };
@@ -260,6 +287,7 @@ export const setPluginElementZIndexes = (
     delegate(PLUGIN_RPC_OPERATIONS.setZIndexes, { entries });
     return;
   }
+  rotateTargetPluginSessions(entries.map(({ fullId }) => fullId));
   const store = usePluginDisplayElementStore.getState();
   entries.forEach(({ fullId, zIndex }) => {
     store.updateElement(fullId, { zIndex });
diff --git a/src/renderer/plugins/rpc/pluginRpcHandler.test.ts b/src/renderer/plugins/rpc/pluginRpcHandler.test.ts
new file mode 100644
index 00000000..8f2dab92
--- /dev/null
+++ b/src/renderer/plugins/rpc/pluginRpcHandler.test.ts
@@ -0,0 +1,230 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const mocks = vi.hoisted(() => ({
+  requestListener: undefined as
+    | ((envelope: Record<string, unknown>) => void)
+    | undefined,
+  respond: vi.fn(
+    (_targetWindowLabel: string, _response: Record<string, unknown>) =>
+      Promise.resolve(),
+  ),
+  commit: vi.fn(),
+  updateElement: vi.fn(),
+  applyProjection: vi.fn((_pluginId: string, apply: () => void) => apply()),
+  rotateEditSession: vi.fn((pluginId: string) => `gesture-${pluginId}`),
+  flushPanelModel: vi.fn(),
+  elements: [] as Array<Record<string, unknown>>,
+}));
+
+vi.mock('@api/modules/pluginRpcApi', () => ({
+  PLUGIN_RPC_PROTOCOL_VERSION: 1,
+  pluginRpcApi: {
+    onRequest: (listener: (envelope: Record<string, unknown>) => void) => {
+      mocks.requestListener = listener;
+      return vi.fn();
+    },
+    respond: mocks.respond,
+  },
+}));
+
+vi.mock('@api/modules/pluginInstancesApi', () => ({
+  pluginInstancesApi: {
+    commit: mocks.commit,
+  },
+}));
+
+vi.mock('@stores/plugin/usePluginDisplayElementStore', () => ({
+  usePluginDisplayElementStore: {
+    getState: () => ({
+      elements: mocks.elements,
+      updateElement: mocks.updateElement,
+    }),
+  },
+}));
+
+vi.mock('@plugins/runtime/displayElement/instancesUndoSync', () => ({
+  applyCommittedPluginInstancesProjection: mocks.applyProjection,
+  notePluginInstancesMutation: vi.fn(),
+}));
+
+vi.mock('@plugins/runtime/displayElement/instancesCommitQueue', () => ({
+  clearPluginInstancesEditSessions: vi.fn(),
+  enqueuePluginInstancesCommit: (
+    _pluginId: string,
+    task: () => Promise<unknown>,
+  ) => task(),
+  rotatePluginInstancesEditSession: mocks.rotateEditSession,
+  touchPluginInstancesEditSession: vi.fn(() => 'touched-gesture'),
+}));
+
+vi.mock('@plugins/runtime/displayElement/instanceLifecycle', () => ({
+  normalizePluginInstanceTabId: (tabId?: string) => tabId ?? '4key',
+}));
+
+vi.mock('@stores/data/useHistoryStatusStore', () => ({
+  useHistoryStatusStore: {
+    getState: () => ({ historyEpoch: 3 }),
+  },
+  syncHistoryStatus: vi.fn(),
+}));
+
+vi.mock('@utils/plugin/panelModelSync', () => ({
+  getPluginPanelModelRevision: () => 11,
+  flushPluginPanelModelSyncNow: mocks.flushPanelModel,
+}));
+
+vi.mock('./pluginRpcClient', () => ({
+  getPluginAuthorityGeneration: () => 7,
+}));
+
+vi.mock('./pluginModelRevision', () => ({
+  noteBackendPluginRevision: vi.fn(),
+}));
+
+vi.mock('./pluginSettingsSession', () => ({
+  handlePluginSettingsOperation: vi.fn(),
+}));
+
+const envelope = (
+  operation: string,
+  payload: Record<string, unknown>,
+): Record<string, unknown> => ({
+  protocolVersion: 1,
+  requestId: crypto.randomUUID(),
+  sourceWindowLabel: 'panel',
+  authorityGeneration: 7,
+  expectedModelRevision: 11,
+  operation,
+  payload,
+});
+
+describe('plugin panel persisted element mutations', () => {
+  beforeEach(async () => {
+    vi.resetModules();
+    mocks.requestListener = undefined;
+    mocks.respond.mockClear();
+    mocks.commit.mockReset();
+    mocks.updateElement.mockReset();
+    mocks.applyProjection.mockClear();
+    mocks.rotateEditSession.mockClear();
+    mocks.flushPanelModel.mockClear();
+    mocks.elements = [
+      {
+        fullId: 'plugin-a:one',
+        definitionId: 'plugin-a',
+        pluginId: 'plugin-a',
+        position: { x: 10, y: 20 },
+        settings: { enabled: true },
+        measuredSize: { width: 100, height: 80 },
+        tabId: '4key',
+        hidden: false,
+        zIndex: 1,
+      },
+    ];
+    mocks.updateElement.mockImplementation(
+      (fullId: string, patch: Record<string, unknown>) => {
+        mocks.elements = mocks.elements.map((element) =>
+          element.fullId === fullId ? { ...element, ...patch } : element,
+        );
+      },
+    );
+
+    const { initPluginRpcHandler } = await import('./pluginRpcHandler');
+    initPluginRpcHandler();
+  });
+
+  it.each([
+    [
+      'elements:setHidden',
+      { targets: [{ fullId: 'plugin-a:one', hidden: true }] },
+      { hidden: true },
+    ],
+    [
+      'elements:setZIndexes',
+      { entries: [{ fullId: 'plugin-a:one', zIndex: 9 }] },
+      { zIndex: 9 },
+    ],
+  ])(
+    '%s는 canonical commit 성공 뒤에만 projection한다',
+    async (operation, payload, expectedPatch) => {
+      let resolveCommit!: (value: Record<string, unknown>) => void;
+      mocks.commit.mockReturnValue(
+        new Promise((resolve) => {
+          resolveCommit = resolve;
+        }),
+      );
+
+      mocks.requestListener?.(envelope(operation, payload));
+
+      await vi.waitFor(() => expect(mocks.commit).toHaveBeenCalledOnce());
+      expect(mocks.updateElement).not.toHaveBeenCalled();
+      expect(mocks.respond).not.toHaveBeenCalled();
+      expect(mocks.rotateEditSession).toHaveBeenCalledWith('plugin-a');
+
+      const request = mocks.commit.mock.calls[0]?.[0];
+      expect(request).toMatchObject({
+        pluginId: 'plugin-a',
+        gestureId: 'gesture-plugin-a',
+        instances: [
+          {
+            hidden: operation === 'elements:setHidden',
+            zIndex: operation === 'elements:setZIndexes' ? 9 : 1,
+          },
+        ],
+      });
+
+      resolveCommit({ modelRevision: 12, changed: true });
+
+      await vi.waitFor(() => expect(mocks.respond).toHaveBeenCalledOnce());
+      expect(mocks.applyProjection).toHaveBeenCalledOnce();
+      expect(mocks.updateElement).toHaveBeenCalledWith(
+        'plugin-a:one',
+        expectedPatch,
+      );
+      expect(mocks.respond.mock.calls[0]?.[1]).toMatchObject({ ok: true });
+    },
+  );
+
+  it.each([
+    [
+      'elements:setHidden',
+      { targets: [{ fullId: 'plugin-a:one', hidden: true }] },
+    ],
+    [
+      'elements:setZIndexes',
+      { entries: [{ fullId: 'plugin-a:one', zIndex: 9 }] },
+    ],
+  ])(
+    '%s commit 실패 시 projection을 적용하지 않는다',
+    async (operation, payload) => {
+      vi.spyOn(console, 'error').mockImplementation(() => undefined);
+      mocks.commit.mockRejectedValue(new Error('disk failure'));
+
+      mocks.requestListener?.(envelope(operation, payload));
+
+      await vi.waitFor(() => expect(mocks.respond).toHaveBeenCalledOnce());
+      expect(mocks.applyProjection).not.toHaveBeenCalled();
+      expect(mocks.updateElement).not.toHaveBeenCalled();
+      expect(mocks.respond.mock.calls[0]?.[1]).toMatchObject({
+        ok: false,
+        error: { code: 'INSTANCES_COMMIT_FAILED' },
+      });
+    },
+  );
+
+  it('유한한 32비트 정수가 아닌 zIndex를 commit 전에 거절한다', async () => {
+    mocks.requestListener?.(
+      envelope('elements:setZIndexes', {
+        entries: [{ fullId: 'plugin-a:one', zIndex: Number.NaN }],
+      }),
+    );
+
+    await vi.waitFor(() => expect(mocks.respond).toHaveBeenCalledOnce());
+    expect(mocks.commit).not.toHaveBeenCalled();
+    expect(mocks.updateElement).not.toHaveBeenCalled();
+    expect(mocks.respond.mock.calls[0]?.[1]).toMatchObject({
+      ok: false,
+      error: { code: 'INVALID_PAYLOAD' },
+    });
+  });
+});
diff --git a/src/renderer/plugins/rpc/pluginRpcHandler.ts b/src/renderer/plugins/rpc/pluginRpcHandler.ts
index ff8f7baa..348abf69 100644
--- a/src/renderer/plugins/rpc/pluginRpcHandler.ts
+++ b/src/renderer/plugins/rpc/pluginRpcHandler.ts
@@ -19,6 +19,7 @@ import {
 import {
   clearPluginInstancesEditSessions,
   enqueuePluginInstancesCommit,
+  rotatePluginInstancesEditSession,
   touchPluginInstancesEditSession,
 } from '@plugins/runtime/displayElement/instancesCommitQueue';
 import { normalizePluginInstanceTabId } from '@plugins/runtime/displayElement/instanceLifecycle';
@@ -71,14 +72,28 @@ const PERSISTED_PATCH_KEYS = new Set([
   'measuredSize',
   'settings',
   'tabId',
+  'hidden',
+  'zIndex',
 ]);
 
+const MIN_PLUGIN_Z_INDEX = -2_147_483_648;
+const MAX_PLUGIN_Z_INDEX = 2_147_483_647;
+
+const isValidPluginZIndex = (value: unknown): value is number =>
+  typeof value === 'number' &&
+  Number.isFinite(value) &&
+  Number.isInteger(value) &&
+  value >= MIN_PLUGIN_Z_INDEX &&
+  value <= MAX_PLUGIN_Z_INDEX;
+
 const toSavedInstances = (elements: PluginDisplayElementInternal[]) =>
   elements.map((el) => ({
     position: el.position,
     settings: el.settings as Record<string, unknown> | undefined,
     measuredSize: el.measuredSize,
     tabId: normalizePluginInstanceTabId(el.tabId),
+    hidden: el.hidden === true,
+    zIndex: el.zIndex,
   }));
 
 /**
@@ -90,6 +105,7 @@ const commitPluginInstances = async (
   instances: ReturnType<typeof toSavedInstances>,
   authorityGeneration: number,
   rpcRequestId: string,
+  gestureId?: string,
 ): Promise<boolean> => {
   const mutationId = crypto.randomUUID();
   notePluginInstancesMutation(mutationId);
@@ -99,7 +115,7 @@ const commitPluginInstances = async (
         pluginId,
         instances,
         mutationId,
-        gestureId: touchPluginInstancesEditSession(pluginId),
+        gestureId: gestureId ?? touchPluginInstancesEditSession(pluginId),
         observedHistoryEpoch: useHistoryStatusStore.getState().historyEpoch,
         // 요청을 접수한 시점의 generation 고정 - 큐 대기 중 reset이 끼어들면
         // Rust admit이 거절해 이전 세대 요청이 새 runtime을 변경하지 못함
@@ -118,6 +134,75 @@ const commitPluginInstances = async (
   }
 };
 
+interface PersistedElementUpdate {
+  fullId: string;
+  patch: Pick<PluginDisplayElementInternal, 'hidden'> | { zIndex: number };
+}
+
+const commitPersistedElementUpdates = async (
+  updates: PersistedElementUpdate[],
+  requestGeneration: number,
+  rpcRequestId: string,
+  generationLive: () => boolean,
+): Promise<string | null> => {
+  const store = usePluginDisplayElementStore.getState();
+  const updatesByPlugin = new Map<string, PersistedElementUpdate[]>();
+  updates.forEach((update) => {
+    const target = store.elements.find((el) => el.fullId === update.fullId);
+    if (!target) return;
+    const pluginUpdates = updatesByPlugin.get(target.pluginId) ?? [];
+    pluginUpdates.push(update);
+    updatesByPlugin.set(target.pluginId, pluginUpdates);
+  });
+
+  const gestureIds = new Map<string, string>();
+  updatesByPlugin.forEach((_, pluginId) => {
+    gestureIds.set(pluginId, rotatePluginInstancesEditSession(pluginId));
+  });
+
+  for (const [pluginId, pluginUpdates] of updatesByPlugin) {
+    const errorCode = await enqueuePluginInstancesCommit(pluginId, async () => {
+      if (!generationLive()) return 'AUTHORITY_GENERATION_STALE';
+      const liveStore = usePluginDisplayElementStore.getState();
+      const patchesById = new Map(
+        pluginUpdates.map(({ fullId, patch }) => [fullId, patch]),
+      );
+      const prospective = liveStore.elements
+        .filter((el) => el.pluginId === pluginId)
+        .map((el) => {
+          const patch = patchesById.get(el.fullId);
+          return patch ? { ...el, ...patch } : el;
+        });
+      const committed = await commitPluginInstances(
+        pluginId,
+        toSavedInstances(prospective),
+        requestGeneration,
+        rpcRequestId,
+        gestureIds.get(pluginId),
+      );
+      if (!committed) return 'INSTANCES_COMMIT_FAILED';
+      if (!generationLive()) return 'AUTHORITY_GENERATION_STALE';
+      applyCommittedPluginInstancesProjection(pluginId, () => {
+        const currentStore = usePluginDisplayElementStore.getState();
+        pluginUpdates.forEach(({ fullId, patch }) => {
+          if (
+            currentStore.elements.some(
+              (element) =>
+                element.pluginId === pluginId && element.fullId === fullId,
+            )
+          ) {
+            currentStore.updateElement(fullId, patch);
+          }
+        });
+      });
+      return null;
+    });
+    if (errorCode) return errorCode;
+  }
+
+  return null;
+};
+
 // commit-first가 필요한 op의 비동기 실행 (update의 영속 patch, delete)
 const executePersistedOperation = async (
   operation: string,
@@ -130,6 +215,54 @@ const executePersistedOperation = async (
   const generationLive = () =>
     requestGeneration === getPluginAuthorityGeneration();
 
+  if (operation === PLUGIN_RPC_OPERATIONS.setHidden) {
+    const targets = payload.targets;
+    if (
+      !Array.isArray(targets) ||
+      !targets.every(
+        (target) =>
+          target !== null &&
+          typeof target === 'object' &&
+          typeof (target as { fullId?: unknown }).fullId === 'string' &&
+          typeof (target as { hidden?: unknown }).hidden === 'boolean',
+      )
+    ) {
+      return 'INVALID_PAYLOAD';
+    }
+    return commitPersistedElementUpdates(
+      (targets as Array<{ fullId: string; hidden: boolean }>).map(
+        ({ fullId, hidden }) => ({ fullId, patch: { hidden } }),
+      ),
+      requestGeneration,
+      rpcRequestId,
+      generationLive,
+    );
+  }
+
+  if (operation === PLUGIN_RPC_OPERATIONS.setZIndexes) {
+    const entries = payload.entries;
+    if (
+      !Array.isArray(entries) ||
+      !entries.every(
+        (entry) =>
+          entry !== null &&
+          typeof entry === 'object' &&
+          typeof (entry as { fullId?: unknown }).fullId === 'string' &&
+          isValidPluginZIndex((entry as { zIndex?: unknown }).zIndex),
+      )
+    ) {
+      return 'INVALID_PAYLOAD';
+    }
+    return commitPersistedElementUpdates(
+      (entries as Array<{ fullId: string; zIndex: number }>).map(
+        ({ fullId, zIndex }) => ({ fullId, patch: { zIndex } }),
+      ),
+      requestGeneration,
+      rpcRequestId,
+      generationLive,
+    );
+  }
+
   if (operation === PLUGIN_RPC_OPERATIONS.update) {
     const fullId = payload.fullId;
     const patch = payload.patch;
@@ -183,6 +316,12 @@ const executePersistedOperation = async (
     const targets = store.elements.filter((el) => fullIds.includes(el.fullId));
     const byDefinition = new Map<string, string>();
     targets.forEach((el) => byDefinition.set(el.definitionId, el.pluginId));
+    const gestureIds = new Map<string, string>();
+    byDefinition.forEach((pluginId) => {
+      if (!gestureIds.has(pluginId)) {
+        gestureIds.set(pluginId, rotatePluginInstancesEditSession(pluginId));
+      }
+    });
 
     // 플러그인 단위로 commit 성공 직후 projection 적용 - 부분 실패도 플러그인별 정합 유지
     for (const [definitionId, pluginId] of byDefinition) {
@@ -200,6 +339,7 @@ const executePersistedOperation = async (
             toSavedInstances(remainingForDef),
             requestGeneration,
             rpcRequestId,
+            gestureIds.get(pluginId),
           );
           if (!committed) return 'INSTANCES_COMMIT_FAILED';
           if (!generationLive()) return 'AUTHORITY_GENERATION_STALE';
@@ -230,7 +370,13 @@ const isPersistedOperation = (
   operation: string,
   payload: Record<string, unknown>,
 ): boolean => {
-  if (operation === PLUGIN_RPC_OPERATIONS.remove) return true;
+  if (
+    operation === PLUGIN_RPC_OPERATIONS.remove ||
+    operation === PLUGIN_RPC_OPERATIONS.setHidden ||
+    operation === PLUGIN_RPC_OPERATIONS.setZIndexes
+  ) {
+    return true;
+  }
   if (operation !== PLUGIN_RPC_OPERATIONS.update) return false;
   const patch = payload.patch;
   if (!patch || typeof patch !== 'object') return false;
@@ -243,27 +389,6 @@ const executeOperation = (
 ): string | null => {
   const store = usePluginDisplayElementStore.getState();
 
-  if (operation === PLUGIN_RPC_OPERATIONS.setHidden) {
-    const targets = payload.targets;
-    if (
-      !Array.isArray(targets) ||
-      !targets.every(
-        (target) =>
-          target &&
-          typeof (target as { fullId?: unknown }).fullId === 'string' &&
-          typeof (target as { hidden?: unknown }).hidden === 'boolean',
-      )
-    ) {
-      return 'INVALID_PAYLOAD';
-    }
-    (targets as Array<{ fullId: string; hidden: boolean }>).forEach(
-      ({ fullId, hidden }) => {
-        store.updateElement(fullId, { hidden });
-      },
-    );
-    return null;
-  }
-
   if (operation === PLUGIN_RPC_OPERATIONS.update) {
     const fullId = payload.fullId;
     const patch = payload.patch;
@@ -289,27 +414,6 @@ const executeOperation = (
     return null;
   }
 
-  if (operation === PLUGIN_RPC_OPERATIONS.setZIndexes) {
-    const entries = payload.entries;
-    if (
-      !Array.isArray(entries) ||
-      !entries.every(
-        (entry) =>
-          entry &&
-          typeof (entry as { fullId?: unknown }).fullId === 'string' &&
-          typeof (entry as { zIndex?: unknown }).zIndex === 'number',
-      )
-    ) {
-      return 'INVALID_PAYLOAD';
-    }
-    (entries as Array<{ fullId: string; zIndex: number }>).forEach(
-      ({ fullId, zIndex }) => {
-        store.updateElement(fullId, { zIndex });
-      },
-    );
-    return null;
-  }
-
   return 'UNSUPPORTED_OPERATION';
 };
 
diff --git a/src/renderer/plugins/runtime/api/defineElement.test.ts b/src/renderer/plugins/runtime/api/defineElement.test.ts
index 2afcf066..9a0202a3 100644
--- a/src/renderer/plugins/runtime/api/defineElement.test.ts
+++ b/src/renderer/plugins/runtime/api/defineElement.test.ts
@@ -24,8 +24,6 @@ describe('plugin instance persistence projection', () => {
     const transientChanges: Array<Partial<PluginElement>> = [
       { state: { frame: 2 } },
       { html: '<div>two</div>' },
-      { hidden: true },
-      { zIndex: 9 },
       { estimatedSize: { width: 120, height: 90 } },
       { onClick: () => undefined },
       { contextMenu: { enableDelete: false } },
@@ -45,6 +43,8 @@ describe('plugin instance persistence projection', () => {
       { settings: { enabled: false } },
       { measuredSize: { width: 101, height: 80 } },
       { tabId: '8key' },
+      { hidden: true },
+      { zIndex: 9 },
     ];
 
     persistentChanges.forEach((change) => {
diff --git a/src/renderer/plugins/runtime/api/defineElement.ts b/src/renderer/plugins/runtime/api/defineElement.ts
index 5de57fdb..9e15febb 100644
--- a/src/renderer/plugins/runtime/api/defineElement.ts
+++ b/src/renderer/plugins/runtime/api/defineElement.ts
@@ -8,7 +8,10 @@ import { useKeyStore } from '@stores/data/useKeyStore';
 import { buildValidTabIdSet } from '@constants/keyModes';
 import { translatePluginMessage } from '@utils/plugin/pluginI18n';
 import { sendBridgeMessageBestEffort } from '@utils/plugin/bridgeMessages';
-import { removeDisplayElementsInternal } from '../displayElement/displayElementApi';
+import {
+  addDisplayElementInternal,
+  removeDisplayElementsInternal,
+} from '../displayElement/displayElementApi';
 import {
   notePluginInstancesMutation,
   registerPluginInstancesReapplier,
@@ -17,6 +20,9 @@ import { pluginInstancesApi } from '@api/modules/pluginInstancesApi';
 import {
   createPluginInstancesSaveDebounce,
   enqueuePluginInstancesCommit,
+  isPluginInstancesGestureStaged,
+  registerPluginInstancesEditSessionFlush,
+  registerPluginInstancesStagedRelease,
   touchPluginInstancesEditSession,
 } from '../displayElement/instancesCommitQueue';
 import { schedulePluginPanelModelSync } from '@utils/plugin/panelModelSync';
@@ -62,6 +68,8 @@ export interface SavedInstance {
   settings?: Record<string, string | number | boolean>;
   measuredSize?: { width: number; height: number };
   tabId?: string;
+  hidden?: boolean;
+  zIndex?: number;
 }
 
 export const buildSavedPluginInstances = (
@@ -75,6 +83,8 @@ export const buildSavedPluginInstances = (
       settings: element.settings as SavedInstance['settings'],
       measuredSize: element.measuredSize,
       tabId: normalizePluginInstanceTabId(element.tabId),
+      hidden: element.hidden === true,
+      zIndex: element.zIndex,
     }));
 
 interface DefineElementDependencies {
@@ -134,10 +144,16 @@ export const createDefineElement = (deps: DefineElementDependencies) => {
     // 패널 RPC commit과의 stale full-snapshot 경합 방지를 위해 플러그인별 큐로 직렬화
     const commitInstances = (instances: SavedInstance[]) =>
       enqueuePluginInstancesCommit(pluginId, () =>
-        commitInstancesInner(instances),
+        commitInstancesInner(
+          instances,
+          touchPluginInstancesEditSession(pluginId),
+        ),
       );
 
-    const commitInstancesInner = async (instances: SavedInstance[]) => {
+    const commitInstancesInner = async (
+      instances: SavedInstance[],
+      gestureId: string,
+    ) => {
       const buildRequest = () => {
         const mutationId = crypto.randomUUID();
         notePluginInstancesMutation(mutationId);
@@ -145,7 +161,7 @@ export const createDefineElement = (deps: DefineElementDependencies) => {
           pluginId,
           instances,
           mutationId,
-          gestureId: touchPluginInstancesEditSession(pluginId),
+          gestureId,
           observedHistoryEpoch: useHistoryStatusStore.getState().historyEpoch,
           authorityGeneration: getPluginAuthorityGeneration(),
         };
@@ -241,7 +257,15 @@ export const createDefineElement = (deps: DefineElementDependencies) => {
     const buildInstancesFromStore = (): SavedInstance[] =>
       buildInstances(usePluginDisplayElementStore.getState().elements);
 
-    const saveInstances = async (waitForReload = false) => {
+    const saveInstances = async ({
+      waitForReload = false,
+      gestureId,
+      captureCurrentSnapshot = false,
+    }: {
+      waitForReload?: boolean;
+      gestureId?: string;
+      captureCurrentSnapshot?: boolean;
+    } = {}) => {
       // 일반 리로드 중 저장은 폐기, 복원 중 생긴 실제 편집만 리로드 종료 뒤 저장
       if (!instanceSaveBarrier.shouldSave()) return;
       if (waitForReload) {
@@ -252,7 +276,17 @@ export const createDefineElement = (deps: DefineElementDependencies) => {
       if (!instanceLifecycle) return;
 
       const generationAtCapture = instanceSaveGeneration;
-      // 스냅샷은 큐 실행 시점에 캡처 - 대기 중 끼어든 commit(패널 RPC 등)을 덮지 않음
+      const capturedInstances = captureCurrentSnapshot
+        ? buildInstancesFromStore().map((instance) => ({
+            ...instance,
+            position: { ...instance.position },
+            settings: instance.settings ? { ...instance.settings } : undefined,
+            measuredSize: instance.measuredSize
+              ? { ...instance.measuredSize }
+              : undefined,
+          }))
+        : null;
+      // 일반 저장은 큐 실행 시점 캡처, 제스처 경계 flush만 이전 상태 고정
       await enqueuePluginInstancesCommit(pluginId, async () => {
         if (waitForReload) {
           while (isReloading()) await waitForReloadEnd();
@@ -261,7 +295,10 @@ export const createDefineElement = (deps: DefineElementDependencies) => {
         }
         if (!instanceSaveBarrier.shouldSave()) return;
         if (generationAtCapture !== instanceSaveGeneration) return;
-        await commitInstancesInner(buildInstancesFromStore());
+        await commitInstancesInner(
+          capturedInstances ?? buildInstancesFromStore(),
+          gestureId ?? touchPluginInstancesEditSession(pluginId),
+        );
       });
     };
 
@@ -270,7 +307,7 @@ export const createDefineElement = (deps: DefineElementDependencies) => {
       if (!pending) return;
       pendingRestorationSave = null;
       try {
-        await saveInstances(true);
+        await saveInstances({ waitForReload: true });
         pending.resolve();
       } catch (error) {
         pending.reject(error);
@@ -295,7 +332,8 @@ export const createDefineElement = (deps: DefineElementDependencies) => {
       const INSTANCE_SAVE_DEBOUNCE_MS = 200;
       const instanceSaveDebounce = createPluginInstancesSaveDebounce({
         delayMs: INSTANCE_SAVE_DEBOUNCE_MS,
-        save: saveInstances,
+        save: ({ gestureId, captureCurrentSnapshot }) =>
+          saveInstances({ gestureId, captureCurrentSnapshot }),
         onError: (error) => {
           console.error(
             `[Plugin ${pluginId}] Failed to save instances:`,
@@ -303,11 +341,27 @@ export const createDefineElement = (deps: DefineElementDependencies) => {
           );
         },
       });
+      let stagedSavePending = false;
       cancelPendingInstanceSave = () => {
+        stagedSavePending = false;
         instanceSaveDebounce.cancel();
         instanceSaveGeneration += 1;
       };
       registerCleanup(cancelPendingInstanceSave);
+      registerCleanup(
+        registerPluginInstancesEditSessionFlush(pluginId, () => {
+          instanceSaveDebounce.flush();
+        }),
+      );
+      registerCleanup(
+        registerPluginInstancesStagedRelease(pluginId, () => {
+          if (!stagedSavePending) return;
+          stagedSavePending = false;
+          instanceSaveDebounce.schedule(
+            touchPluginInstancesEditSession(pluginId),
+          );
+        }),
+      );
 
       const unsubStore = usePluginDisplayElementStore.subscribe(
         (state, prevState) => {
@@ -320,8 +374,12 @@ export const createDefineElement = (deps: DefineElementDependencies) => {
             // 복원 재주입 중 변경은 저장 대상이 아님 (undo 반영 echo 차단)
             if (!instanceSaveBarrier.shouldSave()) return;
             // 변경 시점 기준으로 edit-session TTL 갱신 - debounce가 세션을 쪼개지 않게
-            touchPluginInstancesEditSession(pluginId);
-            instanceSaveDebounce.schedule();
+            const gestureId = touchPluginInstancesEditSession(pluginId);
+            if (isPluginInstancesGestureStaged(pluginId)) {
+              stagedSavePending = true;
+              return;
+            }
+            instanceSaveDebounce.schedule(gestureId);
           }
         },
       );
@@ -887,7 +945,7 @@ export const createDefineElement = (deps: DefineElementDependencies) => {
           // 비동기 복원 중 플러그인 컨텍스트 재설정
           window.__dmn_current_plugin_id = pluginId;
 
-          window.api.ui.displayElement.add({
+          addDisplayElementInternal({
             html: '<!-- plugin-element -->',
             position: instance.position,
             draggable: true,
@@ -899,6 +957,8 @@ export const createDefineElement = (deps: DefineElementDependencies) => {
             state: definition.previewState || {},
             measuredSize: instance.measuredSize,
             tabId: normalizePluginInstanceTabId(instance.tabId),
+            hidden: instance.hidden ?? false,
+            zIndex: instance.zIndex,
             onClick: useModalSettings ? handleElementClick : undefined,
             contextMenu: {
               enableDelete: true,
diff --git a/src/renderer/plugins/runtime/displayElement/displayElementApi.test.ts b/src/renderer/plugins/runtime/displayElement/displayElementApi.test.ts
new file mode 100644
index 00000000..03eb808c
--- /dev/null
+++ b/src/renderer/plugins/runtime/displayElement/displayElementApi.test.ts
@@ -0,0 +1,132 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+interface TestElement {
+  fullId: string;
+  pluginId: string;
+  position: { x: number; y: number };
+}
+
+const mocks = vi.hoisted(() => ({
+  elements: [] as TestElement[],
+  addElement: vi.fn(),
+  removeElement: vi.fn(),
+  rotateEditSession: vi.fn(),
+  unregisterInstance: vi.fn(),
+}));
+
+vi.mock('@stores/plugin/usePluginDisplayElementStore', () => ({
+  usePluginDisplayElementStore: {
+    getState: () => ({
+      elements: mocks.elements,
+      addElement: mocks.addElement,
+      removeElement: mocks.removeElement,
+    }),
+  },
+}));
+
+vi.mock('@stores/data/useKeyStore', () => ({
+  useKeyStore: {
+    getState: () => ({ selectedKeyType: '4key' }),
+  },
+}));
+
+vi.mock('@utils/displayElementInstance', () => ({
+  DisplayElementInstance: class {
+    id: string;
+
+    constructor({ fullId }: { fullId: string }) {
+      this.id = fullId;
+    }
+
+    setState() {}
+  },
+}));
+
+vi.mock('@utils/core/templateEngine', () => ({ html: vi.fn() }));
+vi.mock('@utils/plugin/pluginI18n', () => ({
+  createPluginTranslator: () => vi.fn(),
+}));
+vi.mock('../handlers', () => ({
+  handlerRegistry: {
+    register: vi.fn(),
+    unregister: vi.fn(),
+  },
+}));
+vi.mock('./instanceRegistry', () => ({
+  registerDisplayElementInstance: vi.fn(),
+  unregisterDisplayElementInstance: mocks.unregisterInstance,
+}));
+vi.mock('./targetResolver', () => ({
+  resolveFullId: (target: unknown) =>
+    typeof target === 'string' ? target : null,
+  resolveInstance: vi.fn(),
+  createNoopDisplayElementInstance: vi.fn(),
+}));
+vi.mock('./templateBuilder', () => ({
+  buildDisplayElementTemplate: vi.fn(),
+}));
+vi.mock('./instancesCommitQueue', () => ({
+  rotatePluginInstancesEditSession: mocks.rotateEditSession,
+}));
+
+import {
+  addDisplayElementInternal,
+  displayElementApi,
+} from './displayElementApi';
+
+describe('display element discrete edit boundaries', () => {
+  beforeEach(() => {
+    window.__dmn_window_type = 'main';
+    window.__dmn_current_plugin_id = 'plugin-a';
+    mocks.elements = [];
+    mocks.addElement.mockReset().mockImplementation((element: TestElement) => {
+      mocks.elements = [...mocks.elements, element];
+    });
+    mocks.removeElement.mockReset().mockImplementation((fullId: string) => {
+      mocks.elements = mocks.elements.filter(
+        (element) => element.fullId !== fullId,
+      );
+    });
+    mocks.rotateEditSession.mockReset();
+    mocks.unregisterInstance.mockReset();
+  });
+
+  it('사용자 add는 세션을 분리하고 복원용 internal add는 분리하지 않는다', () => {
+    const element = {
+      html: '<div />',
+      position: { x: 10, y: 20 },
+    } as Parameters<typeof displayElementApi.add>[0];
+
+    displayElementApi.add(element);
+    addDisplayElementInternal(element);
+
+    expect(mocks.rotateEditSession).toHaveBeenCalledOnce();
+    expect(mocks.rotateEditSession).toHaveBeenCalledWith('plugin-a');
+    expect(mocks.addElement).toHaveBeenCalledTimes(2);
+  });
+
+  it('사용자 remove는 mutation 전에 대상 플러그인 세션을 분리한다', () => {
+    mocks.elements = [
+      {
+        fullId: 'plugin-a::element-one',
+        pluginId: 'plugin-a',
+        position: { x: 10, y: 20 },
+      },
+    ];
+
+    displayElementApi.remove('plugin-a::element-one');
+
+    expect(mocks.rotateEditSession).toHaveBeenCalledWith('plugin-a');
+    expect(mocks.rotateEditSession.mock.invocationCallOrder[0]).toBeLessThan(
+      mocks.removeElement.mock.invocationCallOrder[0],
+    );
+  });
+
+  it('store에서 사라진 요소도 stale instance registry를 정리한다', () => {
+    displayElementApi.remove('plugin-a::missing');
+
+    expect(mocks.rotateEditSession).not.toHaveBeenCalled();
+    expect(mocks.unregisterInstance).toHaveBeenCalledWith('plugin-a::missing');
+    expect(mocks.removeElement).toHaveBeenCalledWith('plugin-a::missing');
+  });
+});
diff --git a/src/renderer/plugins/runtime/displayElement/displayElementApi.ts b/src/renderer/plugins/runtime/displayElement/displayElementApi.ts
index f0b02ab7..968074cc 100644
--- a/src/renderer/plugins/runtime/displayElement/displayElementApi.ts
+++ b/src/renderer/plugins/runtime/displayElement/displayElementApi.ts
@@ -13,6 +13,7 @@ import {
   registerDisplayElementInstance,
   unregisterDisplayElementInstance,
 } from './instanceRegistry';
+import { rotatePluginInstancesEditSession } from './instancesCommitQueue';
 import {
   resolveFullId,
   resolveInstance,
@@ -26,6 +27,8 @@ import type {
   PluginDisplayElementInternal,
 } from '@src/types/plugin/api';
 
+let internalAddDepth = 0;
+
 /**
  * 내부용 디스플레이 요소 제거 함수
  */
@@ -91,6 +94,10 @@ export const displayElementApi = {
       return createNoopDisplayElementInstance();
     }
 
+    if (internalAddDepth === 0) {
+      rotatePluginInstancesEditSession(pluginId);
+    }
+
     const id = `element-${Date.now()}-${Math.random()
       .toString(36)
       .substring(7)}`;
@@ -183,6 +190,7 @@ export const displayElementApi = {
           .updateElement(targetId, updates);
       },
       removeElement: (targetId) => {
+        rotatePluginInstancesEditSession(pluginId);
         removeDisplayElementInternal(targetId);
       },
       locale: currentLocale,
@@ -338,6 +346,10 @@ export const displayElementApi = {
     const fullId = resolveFullId(target);
     if (!fullId) return;
 
+    const element = usePluginDisplayElementStore
+      .getState()
+      .elements.find((candidate) => candidate.fullId === fullId);
+    if (element) rotatePluginInstancesEditSession(element.pluginId);
     removeDisplayElementInternal(fullId);
   },
 
@@ -361,10 +373,28 @@ export const displayElementApi = {
     const elements = usePluginDisplayElementStore
       .getState()
       .elements.filter((el) => el.pluginId === pluginId);
+    if (elements.length === 0) return;
+
+    rotatePluginInstancesEditSession(pluginId);
     elements.forEach((element) => {
       removeDisplayElementInternal(element.fullId);
     });
   },
 };
 
-export { removeDisplayElementInternal, removeDisplayElementsInternal };
+const addDisplayElementInternal = (
+  element: PluginDisplayElementConfig,
+): DisplayElementInstance => {
+  internalAddDepth += 1;
+  try {
+    return displayElementApi.add(element);
+  } finally {
+    internalAddDepth -= 1;
+  }
+};
+
+export {
+  addDisplayElementInternal,
+  removeDisplayElementInternal,
+  removeDisplayElementsInternal,
+};
diff --git a/src/renderer/plugins/runtime/displayElement/gestureTransaction.test.ts b/src/renderer/plugins/runtime/displayElement/gestureTransaction.test.ts
new file mode 100644
index 00000000..ce97ad4d
--- /dev/null
+++ b/src/renderer/plugins/runtime/displayElement/gestureTransaction.test.ts
@@ -0,0 +1,350 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import { drainEditorWrites } from '@src/renderer/editor/runtime/editorWriteBarrier';
+import {
+  beginMixedGestureTransaction,
+  cancelMixedGestureTransaction,
+  cancelUncommittedMixedGestureTransaction,
+  commitMixedGestureTransaction,
+} from './gestureTransaction';
+
+const deferred = <T>() => {
+  let resolve!: (value: T) => void;
+  let reject!: (error: unknown) => void;
+  const promise = new Promise<T>((resolvePromise, rejectPromise) => {
+    resolve = resolvePromise;
+    reject = rejectPromise;
+  });
+  return { promise, reject, resolve };
+};
+
+const mocks = vi.hoisted(() => {
+  const stagedOwners = new Map<string, string>();
+  return {
+    commitGesture: vi.fn(),
+    commitApi: vi.fn(),
+    stagedOwners,
+    stage: vi.fn((pluginId: string, gestureId: string) => {
+      stagedOwners.set(pluginId, gestureId);
+    }),
+    unstage: vi.fn((pluginId: string, gestureId: string) => {
+      if (stagedOwners.get(pluginId) === gestureId) {
+        stagedOwners.delete(pluginId);
+      }
+    }),
+    drainQueues: vi.fn(() => Promise.resolve()),
+    hasConflictingGesture: vi.fn(
+      (_pluginId?: string, _gestureId?: string) => false,
+    ),
+    applyCanonical: vi.fn(() => Promise.resolve()),
+    noteMutation: vi.fn(),
+    noteRevision: vi.fn(),
+    buildSaved: vi.fn(
+      (
+        elements: Array<{
+          definitionId: string;
+          position: { x: number; y: number };
+        }>,
+        pluginId: string,
+      ) =>
+        elements
+          .filter((element) => element.definitionId === pluginId)
+          .map((element) => ({ position: { ...element.position } })),
+    ),
+    elements: [] as Array<{
+      definitionId: string;
+      pluginId: string;
+      position: { x: number; y: number };
+    }>,
+    definitions: new Map(),
+    modelRevision: 5,
+    schedulePanel: vi.fn(),
+  };
+});
+
+vi.mock('@src/renderer/editor/runtime/editorStateCoordinator', () => ({
+  editorCoordinator: { commitGesture: mocks.commitGesture },
+}));
+
+vi.mock('@api/modules/gestureApi', () => ({
+  gestureApi: { commit: mocks.commitApi },
+}));
+
+vi.mock('./instancesCommitQueue', () => ({
+  stagePluginInstancesGesture: mocks.stage,
+  unstagePluginInstancesGesture: mocks.unstage,
+  getStagedPluginInstancesGestureId: (pluginId: string) =>
+    mocks.stagedOwners.get(pluginId),
+  drainPluginInstancesCommitQueues: mocks.drainQueues,
+  hasConflictingPluginInstancesGesture: mocks.hasConflictingGesture,
+}));
+
+vi.mock('./instancesUndoSync', () => ({
+  applyCanonicalPluginInstances: mocks.applyCanonical,
+  notePluginInstancesMutation: mocks.noteMutation,
+}));
+
+vi.mock('../api/defineElement', () => ({
+  buildSavedPluginInstances: mocks.buildSaved,
+}));
+
+vi.mock('@stores/plugin/usePluginDisplayElementStore', () => ({
+  usePluginDisplayElementStore: {
+    getState: () => ({
+      elements: mocks.elements,
+      definitions: mocks.definitions,
+    }),
+  },
+}));
+
+vi.mock('@stores/data/useHistoryStatusStore', () => ({
+  useHistoryStatusStore: { getState: () => ({ historyEpoch: 7 }) },
+}));
+
+vi.mock('@plugins/rpc/pluginRpcClient', () => ({
+  getPluginAuthorityGeneration: () => 3,
+}));
+
+vi.mock('@plugins/rpc/pluginModelRevision', () => ({
+  getBackendPluginRevision: () => mocks.modelRevision,
+  noteBackendPluginRevision: mocks.noteRevision,
+}));
+
+vi.mock('@utils/plugin/panelModelSync', () => ({
+  schedulePluginPanelModelSync: mocks.schedulePanel,
+}));
+
+describe('mixed gesture transaction lifecycle', () => {
+  const gestureId = '00000000-0000-4000-8000-0000000000f4';
+  const nextGestureId = '00000000-0000-4000-8000-0000000000f5';
+
+  afterEach(async () => {
+    cancelMixedGestureTransaction(gestureId);
+    cancelMixedGestureTransaction(nextGestureId);
+    await drainEditorWrites();
+    mocks.elements = [];
+    mocks.modelRevision = 5;
+    mocks.stagedOwners.clear();
+    vi.clearAllMocks();
+    mocks.hasConflictingGesture.mockImplementation(() => false);
+  });
+
+  it('keeps history drain pending until an active gesture is finalized or canceled', async () => {
+    beginMixedGestureTransaction(gestureId, ['plugin-a']);
+    let drained = false;
+    const draining = drainEditorWrites().then((result) => {
+      drained = true;
+      return result;
+    });
+
+    await Promise.resolve();
+    expect(drained).toBe(false);
+    expect(mocks.stage).toHaveBeenCalledWith('plugin-a', gestureId);
+
+    cancelMixedGestureTransaction(gestureId);
+    await expect(draining).resolves.toBe(true);
+    expect(mocks.unstage).toHaveBeenCalledWith('plugin-a', gestureId);
+  });
+
+  it('미커밋 cleanup은 selection이 비혼합으로 끝나도 barrier를 해제한다', async () => {
+    beginMixedGestureTransaction(gestureId, ['plugin-a']);
+
+    cancelUncommittedMixedGestureTransaction(gestureId);
+
+    await expect(drainEditorWrites()).resolves.toBe(true);
+    expect(mocks.unstage).toHaveBeenCalledWith('plugin-a', gestureId);
+  });
+
+  it('queue 대기 중 후속 plugin 편집을 실행 시점 스냅샷으로 커밋한다', async () => {
+    const queueDrain = deferred<void>();
+    const apiCommit = deferred<{
+      editorRevision: number;
+      changedFields: [];
+      pluginModelRevision: number;
+      changedPluginIds: string[];
+      authorityGeneration: number;
+    }>();
+    mocks.drainQueues.mockReturnValueOnce(queueDrain.promise);
+    mocks.commitApi.mockReturnValueOnce(apiCommit.promise);
+    mocks.commitGesture.mockImplementationOnce(
+      async (_changes, _gestureId, commit) => {
+        await commit({
+          editorBaseRevision: 2,
+          mutationId: 'mutation-a',
+          editorChanges: { schemaVersion: 1, statPositions: {} },
+        });
+      },
+    );
+    mocks.elements = [
+      {
+        definitionId: 'plugin-a',
+        pluginId: 'plugin-a',
+        position: { x: 10, y: 20 },
+      },
+    ];
+
+    const committing = commitMixedGestureTransaction(
+      gestureId,
+      { schemaVersion: 1, statPositions: {} },
+      ['plugin-a'],
+    );
+    await vi.waitFor(() => expect(mocks.drainQueues).toHaveBeenCalledOnce());
+
+    mocks.elements = [
+      {
+        definitionId: 'plugin-a',
+        pluginId: 'plugin-a',
+        position: { x: 20, y: 20 },
+      },
+    ];
+    mocks.modelRevision = 6;
+    queueDrain.resolve(undefined);
+    await vi.waitFor(() => expect(mocks.commitApi).toHaveBeenCalledOnce());
+    expect(mocks.commitApi.mock.calls[0]?.[0].pluginChanges).toEqual([
+      { pluginId: 'plugin-a', instances: [{ position: { x: 20, y: 20 } }] },
+    ]);
+    expect(mocks.commitApi.mock.calls[0]?.[0].pluginBaseRevision).toBe(6);
+
+    const committedElements = mocks.elements;
+    mocks.elements = [
+      {
+        definitionId: 'plugin-a',
+        pluginId: 'plugin-a',
+        position: { x: 30, y: 20 },
+      },
+    ];
+    apiCommit.resolve({
+      editorRevision: 2,
+      changedFields: [],
+      pluginModelRevision: 7,
+      changedPluginIds: ['plugin-a'],
+      authorityGeneration: 3,
+    });
+    await committing;
+
+    expect(mocks.schedulePanel).toHaveBeenCalledWith(
+      committedElements,
+      mocks.definitions,
+      7,
+    );
+  });
+
+  it('후속 혼합 gesture가 같은 plugin을 넘겨받아도 앞 gesture 스냅샷을 보존한다', async () => {
+    const coordinatorDone = deferred<void>();
+    let executeCommit:
+      | ((context: {
+          editorBaseRevision: number;
+          mutationId: string;
+          editorChanges: { schemaVersion: 1; statPositions: object };
+        }) => Promise<{ revision: number; changedFields: [] }>)
+      | undefined;
+    mocks.commitGesture.mockImplementationOnce(
+      (_changes, _gestureId, commit) => {
+        executeCommit = commit;
+        return coordinatorDone.promise;
+      },
+    );
+    mocks.commitApi.mockResolvedValueOnce({
+      editorRevision: 2,
+      changedFields: [],
+      pluginModelRevision: 6,
+      changedPluginIds: ['plugin-a'],
+      authorityGeneration: 3,
+    });
+    mocks.elements = [
+      {
+        definitionId: 'plugin-a',
+        pluginId: 'plugin-a',
+        position: { x: 10, y: 20 },
+      },
+    ];
+    beginMixedGestureTransaction(gestureId, ['plugin-a']);
+
+    const committing = commitMixedGestureTransaction(
+      gestureId,
+      { schemaVersion: 1, statPositions: {} },
+      ['plugin-a'],
+    );
+    await vi.waitFor(() => expect(executeCommit).toBeDefined());
+
+    beginMixedGestureTransaction(nextGestureId, ['plugin-a']);
+    mocks.elements = [
+      {
+        definitionId: 'plugin-a',
+        pluginId: 'plugin-a',
+        position: { x: 20, y: 20 },
+      },
+    ];
+    await executeCommit?.({
+      editorBaseRevision: 2,
+      mutationId: 'mutation-a',
+      editorChanges: { schemaVersion: 1, statPositions: {} },
+    });
+    coordinatorDone.resolve(undefined);
+    await committing;
+
+    expect(mocks.commitApi.mock.calls[0]?.[0].pluginChanges).toEqual([
+      { pluginId: 'plugin-a', instances: [{ position: { x: 10, y: 20 } }] },
+    ]);
+    expect(mocks.stagedOwners.get('plugin-a')).toBe(nextGestureId);
+  });
+
+  it('reapplies every plugin canonical snapshot when the transaction fails', async () => {
+    const error = new Error('plugin validation failed');
+    mocks.commitGesture.mockRejectedValueOnce(error);
+    beginMixedGestureTransaction(gestureId, ['plugin-a', 'plugin-b']);
+
+    await expect(
+      commitMixedGestureTransaction(
+        gestureId,
+        { schemaVersion: 1, statPositions: {} },
+        ['plugin-a', 'plugin-b'],
+      ),
+    ).rejects.toBe(error);
+
+    expect(mocks.applyCanonical.mock.calls).toEqual([
+      ['plugin-a', true],
+      ['plugin-b', true],
+    ]);
+    await expect(drainEditorWrites()).resolves.toBe(true);
+  });
+
+  it('releases staging when transaction setup throws synchronously', async () => {
+    const error = new Error('editor is read only');
+    mocks.commitGesture.mockImplementationOnce(() => {
+      throw error;
+    });
+
+    await expect(
+      commitMixedGestureTransaction(
+        gestureId,
+        { schemaVersion: 1, statPositions: {} },
+        ['plugin-a'],
+      ),
+    ).rejects.toBe(error);
+
+    expect(mocks.applyCanonical).toHaveBeenCalledWith('plugin-a', true);
+    expect(mocks.unstage).toHaveBeenCalledWith('plugin-a', gestureId);
+    await expect(drainEditorWrites()).resolves.toBe(true);
+  });
+
+  it('실패 복구는 후속 gesture가 소유한 plugin을 재주입하지 않는다', async () => {
+    const error = new Error('plugin revision conflict');
+    mocks.commitGesture.mockRejectedValueOnce(error);
+    mocks.hasConflictingGesture.mockImplementation(
+      (pluginId: string) => pluginId === 'plugin-a',
+    );
+    beginMixedGestureTransaction(gestureId, ['plugin-a', 'plugin-b']);
+
+    await expect(
+      commitMixedGestureTransaction(
+        gestureId,
+        { schemaVersion: 1, statPositions: {} },
+        ['plugin-a', 'plugin-b'],
+      ),
+    ).rejects.toBe(error);
+
+    expect(mocks.applyCanonical).toHaveBeenCalledTimes(1);
+    expect(mocks.applyCanonical).toHaveBeenCalledWith('plugin-b', true);
+  });
+});
diff --git a/src/renderer/plugins/runtime/displayElement/gestureTransaction.ts b/src/renderer/plugins/runtime/displayElement/gestureTransaction.ts
new file mode 100644
index 00000000..d45e5555
--- /dev/null
+++ b/src/renderer/plugins/runtime/displayElement/gestureTransaction.ts
@@ -0,0 +1,230 @@
+import { gestureApi } from '@api/modules/gestureApi';
+import { editorCoordinator } from '@src/renderer/editor/runtime/editorStateCoordinator';
+import { trackEditorWrite } from '@src/renderer/editor/runtime/editorWriteBarrier';
+import { usePluginDisplayElementStore } from '@stores/plugin/usePluginDisplayElementStore';
+import { useHistoryStatusStore } from '@stores/data/useHistoryStatusStore';
+import { getPluginAuthorityGeneration } from '@plugins/rpc/pluginRpcClient';
+import {
+  getBackendPluginRevision,
+  noteBackendPluginRevision,
+} from '@plugins/rpc/pluginModelRevision';
+import {
+  applyCanonicalPluginInstances,
+  notePluginInstancesMutation,
+} from './instancesUndoSync';
+import { buildSavedPluginInstances } from '../api/defineElement';
+import {
+  drainPluginInstancesCommitQueues,
+  getStagedPluginInstancesGestureId,
+  hasConflictingPluginInstancesGesture,
+  stagePluginInstancesGesture,
+  unstagePluginInstancesGesture,
+} from './instancesCommitQueue';
+import { schedulePluginPanelModelSync } from '@utils/plugin/panelModelSync';
+
+import type { EditorPatchV1 } from '@src/types/editor';
+import type {
+  PluginDefinitionInternal,
+  PluginDisplayElementInternal,
+} from '@src/types/plugin/api';
+
+interface StagedGesture {
+  pluginIds: Set<string>;
+  sealedPluginElements: Map<string, PluginDisplayElementInternal[]>;
+  resolve: () => void;
+  // commit이 소유권을 가져간 staged는 취소 안전망이 건드리지 않음
+  committing: boolean;
+}
+
+const stagedGestures = new Map<string, StagedGesture>();
+
+const normalizePluginIds = (pluginIds: readonly string[]): string[] =>
+  [...new Set(pluginIds)].sort();
+
+const buildCommittedElementProjection = (
+  currentElements: readonly PluginDisplayElementInternal[],
+  pluginElements: ReadonlyMap<string, PluginDisplayElementInternal[]>,
+): PluginDisplayElementInternal[] => {
+  const inserted = new Set<string>();
+  const projected: PluginDisplayElementInternal[] = [];
+  for (const element of currentElements) {
+    const pluginId = element.definitionId;
+    if (!pluginId || !pluginElements.has(pluginId)) {
+      projected.push(element);
+      continue;
+    }
+    if (!inserted.has(pluginId)) {
+      projected.push(...(pluginElements.get(pluginId) ?? []));
+      inserted.add(pluginId);
+    }
+  }
+  for (const [pluginId, elements] of pluginElements) {
+    if (!inserted.has(pluginId)) projected.push(...elements);
+  }
+  return projected;
+};
+
+export const beginMixedGestureTransaction = (
+  gestureId: string,
+  pluginIds: readonly string[],
+): void => {
+  const normalized = normalizePluginIds(pluginIds);
+  if (normalized.length === 0) return;
+
+  let staged = stagedGestures.get(gestureId);
+  if (!staged) {
+    let resolve!: () => void;
+    const pending = new Promise<void>((resolvePending) => {
+      resolve = resolvePending;
+    });
+    trackEditorWrite(pending);
+    staged = {
+      pluginIds: new Set(),
+      sealedPluginElements: new Map(),
+      resolve,
+      committing: false,
+    };
+    stagedGestures.set(gestureId, staged);
+  }
+  const currentElements = usePluginDisplayElementStore.getState().elements;
+  normalized.forEach((pluginId) => {
+    const previousGestureId = getStagedPluginInstancesGestureId(pluginId);
+    if (previousGestureId && previousGestureId !== gestureId) {
+      const previous = stagedGestures.get(previousGestureId);
+      if (previous && !previous.sealedPluginElements.has(pluginId)) {
+        previous.sealedPluginElements.set(
+          pluginId,
+          currentElements.filter(
+            (element) => element.definitionId === pluginId,
+          ),
+        );
+      }
+    }
+    staged.pluginIds.add(pluginId);
+    stagePluginInstancesGesture(pluginId, gestureId);
+  });
+};
+
+const settleMixedGestureTransaction = (gestureId: string): void => {
+  const staged = stagedGestures.get(gestureId);
+  if (!staged) return;
+  staged.pluginIds.forEach((pluginId) => {
+    unstagePluginInstancesGesture(pluginId, gestureId);
+  });
+  stagedGestures.delete(gestureId);
+  staged.resolve();
+};
+
+export const cancelMixedGestureTransaction = (gestureId: string): void => {
+  settleMixedGestureTransaction(gestureId);
+};
+
+// 제스처 경계 cleanup용 안전망 - 종료 경로가 혼합 커밋을 타지 않아
+// staged가 남으면 barrier가 영구 대기하므로, 커밋이 시작되지 않은 것만 정산
+export const cancelUncommittedMixedGestureTransaction = (
+  gestureId: string,
+): void => {
+  const staged = stagedGestures.get(gestureId);
+  if (!staged || staged.committing) return;
+  settleMixedGestureTransaction(gestureId);
+};
+
+export const commitMixedGestureTransaction = (
+  gestureId: string,
+  editorChanges: EditorPatchV1,
+  pluginIds: readonly string[],
+): Promise<void> => {
+  const normalizedPluginIds = normalizePluginIds(pluginIds);
+  beginMixedGestureTransaction(gestureId, normalizedPluginIds);
+  const staged = stagedGestures.get(gestureId);
+  if (staged) staged.committing = true;
+  let gestureResult: Awaited<ReturnType<typeof gestureApi.commit>> | null =
+    null;
+  let committedElements: PluginDisplayElementInternal[] | null = null;
+  let committedDefinitions: Map<string, PluginDefinitionInternal> | null = null;
+  let commitWork: Promise<void>;
+
+  try {
+    commitWork = editorCoordinator
+      .commitGesture(editorChanges, gestureId, async (context) => {
+        await drainPluginInstancesCommitQueues(normalizedPluginIds);
+        const { elements, definitions } =
+          usePluginDisplayElementStore.getState();
+        const stagedAtCommit = stagedGestures.get(gestureId);
+        const pluginElements = new Map(
+          normalizedPluginIds.map((pluginId) => [
+            pluginId,
+            stagedAtCommit?.sealedPluginElements.get(pluginId) ??
+              elements.filter((element) => element.definitionId === pluginId),
+          ]),
+        );
+        const pluginChanges = normalizedPluginIds.map((pluginId) => ({
+          pluginId,
+          instances: buildSavedPluginInstances(
+            pluginElements.get(pluginId) ?? [],
+            pluginId,
+          ),
+        }));
+        committedElements = buildCommittedElementProjection(
+          elements,
+          pluginElements,
+        );
+        committedDefinitions = definitions;
+        notePluginInstancesMutation(context.mutationId);
+        const result = await gestureApi.commit({
+          gestureId,
+          mutationId: context.mutationId,
+          editorBaseRevision: context.editorBaseRevision,
+          pluginBaseRevision: getBackendPluginRevision(),
+          observedHistoryEpoch: useHistoryStatusStore.getState().historyEpoch,
+          authorityGeneration: getPluginAuthorityGeneration(),
+          editorChanges: context.editorChanges,
+          pluginChanges,
+        });
+        noteBackendPluginRevision(result.pluginModelRevision);
+        gestureResult = result;
+        return {
+          revision: result.editorRevision,
+          changedFields: result.changedFields,
+        };
+      })
+      .then(() => {
+        if (
+          gestureResult &&
+          committedElements &&
+          committedDefinitions &&
+          gestureResult.changedPluginIds.length > 0
+        ) {
+          try {
+            schedulePluginPanelModelSync(
+              committedElements,
+              committedDefinitions,
+              gestureResult.pluginModelRevision,
+            );
+          } catch (error) {
+            console.error('Failed to publish committed plugin model', error);
+          }
+        }
+      });
+  } catch (error) {
+    commitWork = Promise.reject(error);
+  }
+
+  const committed = commitWork
+    .catch(async (error) => {
+      await Promise.allSettled(
+        normalizedPluginIds.map(async (pluginId) => {
+          if (hasConflictingPluginInstancesGesture(pluginId, gestureId)) {
+            return;
+          }
+          await applyCanonicalPluginInstances(pluginId, true);
+        }),
+      );
+      throw error;
+    })
+    .finally(() => {
+      settleMixedGestureTransaction(gestureId);
+    });
+
+  return trackEditorWrite(committed);
+};
diff --git a/src/renderer/plugins/runtime/displayElement/instancesCommitQueue.test.ts b/src/renderer/plugins/runtime/displayElement/instancesCommitQueue.test.ts
index 9fe0e2eb..84fe16af 100644
--- a/src/renderer/plugins/runtime/displayElement/instancesCommitQueue.test.ts
+++ b/src/renderer/plugins/runtime/displayElement/instancesCommitQueue.test.ts
@@ -2,11 +2,21 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import { drainEditorWrites } from '@src/renderer/editor/runtime/editorWriteBarrier';
 import {
+  beginPluginInstancesEditSession,
   clearPluginInstancesEditSessions,
   createPluginInstancesSaveDebounce,
+  endPluginInstancesEditSession,
   enqueuePluginInstancesCommit,
+  drainPluginInstancesCommitQueues,
   getPendingPluginInstancesCommitCount,
+  hasConflictingPluginInstancesGesture,
+  registerPluginInstancesEditSessionFlush,
+  registerPluginInstancesStagedRelease,
+  rotatePluginInstancesEditSession,
+  stagePluginInstancesGesture,
   touchPluginInstancesEditSession,
+  isPluginInstancesGestureStaged,
+  unstagePluginInstancesGesture,
 } from './instancesCommitQueue';
 
 const deferred = () => {
@@ -20,7 +30,10 @@ const deferred = () => {
 };
 
 describe('plugin instances commit queue lifecycle', () => {
+  const cleanups: Array<() => void> = [];
+
   afterEach(() => {
+    cleanups.splice(0).forEach((cleanup) => cleanup());
     clearPluginInstancesEditSessions();
     vi.useRealTimers();
   });
@@ -39,6 +52,205 @@ describe('plugin instances commit queue lifecycle', () => {
     expect(touchPluginInstancesEditSession('plugin-a')).not.toBe(first);
   });
 
+  it('서로 다른 드래그는 다른 gestureId, 한 드래그의 여러 저장은 같은 gestureId를 사용한다', async () => {
+    vi.useFakeTimers();
+    const committedGestureIds: Array<string | undefined> = [];
+    const debounce = createPluginInstancesSaveDebounce({
+      delayMs: 200,
+      save: vi.fn(async ({ gestureId }) => {
+        committedGestureIds.push(gestureId);
+      }),
+      onError: vi.fn(),
+    });
+    cleanups.push(
+      registerPluginInstancesEditSessionFlush('plugin-drag', () => {
+        debounce.flush();
+      }),
+    );
+
+    const firstDrag = rotatePluginInstancesEditSession('plugin-drag');
+    debounce.schedule(touchPluginInstancesEditSession('plugin-drag'));
+    await vi.advanceTimersByTimeAsync(200);
+    debounce.schedule(touchPluginInstancesEditSession('plugin-drag'));
+    await vi.advanceTimersByTimeAsync(200);
+
+    const secondDrag = rotatePluginInstancesEditSession('plugin-drag');
+    debounce.schedule(touchPluginInstancesEditSession('plugin-drag'));
+    await vi.advanceTimersByTimeAsync(200);
+
+    expect(secondDrag).not.toBe(firstDrag);
+    expect(committedGestureIds).toEqual([firstDrag, firstDrag, secondDrag]);
+  });
+
+  it('active gesture는 TTL보다 오래 멈춰도 같은 gestureId를 유지한다', async () => {
+    vi.useFakeTimers();
+
+    const token = beginPluginInstancesEditSession('plugin-long-drag');
+    await vi.advanceTimersByTimeAsync(10_000);
+
+    expect(touchPluginInstancesEditSession('plugin-long-drag')).toBe(token);
+
+    endPluginInstancesEditSession('plugin-long-drag', token);
+    expect(touchPluginInstancesEditSession('plugin-long-drag')).not.toBe(token);
+  });
+
+  it('명시적으로 끝난 두 resize는 TTL 안에서도 서로 다른 gestureId를 쓴다', () => {
+    const first = beginPluginInstancesEditSession('plugin-resize');
+    endPluginInstancesEditSession('plugin-resize', first);
+    const second = beginPluginInstancesEditSession('plugin-resize');
+    endPluginInstancesEditSession('plugin-resize', second);
+
+    expect(second).not.toBe(first);
+  });
+
+  it('하나의 복합 동작은 여러 plugin session에 같은 gestureId를 주입한다', () => {
+    const sharedGestureId = '00000000-0000-4000-8000-0000000000f4';
+    const first = beginPluginInstancesEditSession('plugin-a', sharedGestureId);
+    const second = beginPluginInstancesEditSession('plugin-b', sharedGestureId);
+    const flush = vi.fn();
+    cleanups.push(registerPluginInstancesEditSessionFlush('plugin-a', flush));
+
+    expect(first).toBe(sharedGestureId);
+    expect(second).toBe(sharedGestureId);
+    expect(rotatePluginInstancesEditSession('plugin-a', sharedGestureId)).toBe(
+      sharedGestureId,
+    );
+    expect(flush).not.toHaveBeenCalled();
+  });
+
+  it('transaction staging은 해당 plugin과 gesture에만 적용된다', () => {
+    const gestureId = '00000000-0000-4000-8000-0000000000f4';
+    stagePluginInstancesGesture('plugin-a', gestureId);
+
+    expect(isPluginInstancesGestureStaged('plugin-a')).toBe(true);
+    expect(isPluginInstancesGestureStaged('plugin-a', gestureId)).toBe(true);
+    expect(isPluginInstancesGestureStaged('plugin-a', 'other')).toBe(false);
+    expect(isPluginInstancesGestureStaged('plugin-b')).toBe(false);
+
+    unstagePluginInstancesGesture('plugin-a', 'other');
+    expect(isPluginInstancesGestureStaged('plugin-a')).toBe(true);
+    unstagePluginInstancesGesture('plugin-a', gestureId);
+    expect(isPluginInstancesGestureStaged('plugin-a')).toBe(false);
+  });
+
+  it('staging 해제는 보류된 저장을 정확한 owner에서만 재개한다', () => {
+    const released = vi.fn();
+    cleanups.push(registerPluginInstancesStagedRelease('plugin-a', released));
+    stagePluginInstancesGesture('plugin-a', 'gesture-a');
+
+    unstagePluginInstancesGesture('plugin-a', 'gesture-b');
+    expect(released).not.toHaveBeenCalled();
+
+    unstagePluginInstancesGesture('plugin-a', 'gesture-a');
+    expect(released).toHaveBeenCalledOnce();
+  });
+
+  it('실패 복구는 같은 plugin의 후속 gesture 소유권을 감지한다', () => {
+    stagePluginInstancesGesture('plugin-a', 'gesture-a');
+    expect(hasConflictingPluginInstancesGesture('plugin-a', 'gesture-a')).toBe(
+      false,
+    );
+
+    beginPluginInstancesEditSession('plugin-a', 'gesture-b');
+    expect(hasConflictingPluginInstancesGesture('plugin-a', 'gesture-a')).toBe(
+      true,
+    );
+  });
+
+  it('명시적 end는 최종 pending 저장을 같은 gestureId로 flush한다', async () => {
+    const committedGestureIds: Array<string | undefined> = [];
+    const debounce = createPluginInstancesSaveDebounce({
+      delayMs: 200,
+      save: vi.fn(async ({ gestureId }) => {
+        committedGestureIds.push(gestureId);
+      }),
+      onError: vi.fn(),
+    });
+    cleanups.push(
+      registerPluginInstancesEditSessionFlush('plugin-end-flush', () => {
+        debounce.flush();
+      }),
+    );
+
+    const token = beginPluginInstancesEditSession('plugin-end-flush');
+    debounce.schedule(touchPluginInstancesEditSession('plugin-end-flush'));
+    endPluginInstancesEditSession('plugin-end-flush', token);
+    await Promise.resolve();
+
+    expect(committedGestureIds).toEqual([token]);
+    expect(touchPluginInstancesEditSession('plugin-end-flush')).not.toBe(token);
+  });
+
+  it('stale end는 현재 active gesture를 종료하지 않는다', async () => {
+    vi.useFakeTimers();
+
+    const stale = beginPluginInstancesEditSession('plugin-stale');
+    const current = beginPluginInstancesEditSession('plugin-stale');
+    endPluginInstancesEditSession('plugin-stale', stale);
+    await vi.advanceTimersByTimeAsync(10_000);
+
+    expect(touchPluginInstancesEditSession('plugin-stale')).toBe(current);
+
+    endPluginInstancesEditSession('plugin-stale', current);
+    await vi.advanceTimersByTimeAsync(1_201);
+    expect(touchPluginInstancesEditSession('plugin-stale')).not.toBe(current);
+  });
+
+  it('rotate 시 pending debounce를 이전 gestureId와 경계 직전 상태로 flush한다', async () => {
+    vi.useFakeTimers();
+    let snapshot = 'before';
+    const commits: Array<{
+      gestureId?: string;
+      snapshot: string;
+      captureCurrentSnapshot: boolean;
+    }> = [];
+    const debounce = createPluginInstancesSaveDebounce({
+      delayMs: 200,
+      save: vi.fn(async ({ gestureId, captureCurrentSnapshot }) => {
+        commits.push({ gestureId, snapshot, captureCurrentSnapshot });
+      }),
+      onError: vi.fn(),
+    });
+    cleanups.push(
+      registerPluginInstancesEditSessionFlush('plugin-pending', () => {
+        debounce.flush();
+      }),
+    );
+
+    const firstDrag = rotatePluginInstancesEditSession('plugin-pending');
+    snapshot = 'drag-a';
+    debounce.schedule(touchPluginInstancesEditSession('plugin-pending'));
+
+    const secondDrag = rotatePluginInstancesEditSession('plugin-pending');
+    snapshot = 'drag-b';
+    debounce.schedule(touchPluginInstancesEditSession('plugin-pending'));
+    await vi.advanceTimersByTimeAsync(200);
+
+    expect(commits).toEqual([
+      {
+        gestureId: firstDrag,
+        snapshot: 'drag-a',
+        captureCurrentSnapshot: true,
+      },
+      {
+        gestureId: secondDrag,
+        snapshot: 'drag-b',
+        captureCurrentSnapshot: false,
+      },
+    ]);
+  });
+
+  it('추가, 삭제, 붙여넣기 경계는 직전 세션과 각각 분리된다', () => {
+    const previous = touchPluginInstancesEditSession('plugin-discrete');
+    const addGesture = rotatePluginInstancesEditSession('plugin-discrete');
+    const deleteGesture = rotatePluginInstancesEditSession('plugin-discrete');
+    const pasteGesture = rotatePluginInstancesEditSession('plugin-discrete');
+
+    expect(
+      new Set([previous, addGesture, deleteGesture, pasteGesture]).size,
+    ).toBe(4);
+  });
+
   it('패널 저장 뒤 170ms에 시작한 drain은 파생 저장을 같은 세션으로 완료한다', async () => {
     vi.useFakeTimers();
     const routedGesture = touchPluginInstancesEditSession('plugin-a');
@@ -81,6 +293,27 @@ describe('plugin instances commit queue lifecycle', () => {
     expect(getPendingPluginInstancesCommitCount()).toBe(0);
   });
 
+  it('transaction drain은 지정한 plugin의 직렬화 tail을 모두 기다린다', async () => {
+    const first = deferred();
+    const second = deferred();
+    void enqueuePluginInstancesCommit('plugin-a', () => first.promise);
+    void enqueuePluginInstancesCommit('plugin-b', () => second.promise);
+
+    let drained = false;
+    const draining = drainPluginInstancesCommitQueues(['plugin-a']).then(() => {
+      drained = true;
+    });
+    await Promise.resolve();
+    expect(drained).toBe(false);
+
+    second.resolve();
+    await Promise.resolve();
+    expect(drained).toBe(false);
+    first.resolve();
+    await draining;
+    expect(drained).toBe(true);
+  });
+
   it('실패한 마지막 tail도 제거한다', async () => {
     await expect(
       enqueuePluginInstancesCommit('plugin-fail', () =>
diff --git a/src/renderer/plugins/runtime/displayElement/instancesCommitQueue.ts b/src/renderer/plugins/runtime/displayElement/instancesCommitQueue.ts
index ea313a44..c252acd5 100644
--- a/src/renderer/plugins/runtime/displayElement/instancesCommitQueue.ts
+++ b/src/renderer/plugins/runtime/displayElement/instancesCommitQueue.ts
@@ -1,7 +1,8 @@
 /**
  * plugin instance canonical commit의 플러그인별 직렬화 큐 (main 전용)
  * defineElement debounce 저장과 패널 RPC commit이 서로 다른 시점의 full snapshot으로
- * 상대를 덮지 않도록, 모든 commit은 이 큐 안에서 실행 시점 상태를 캡처해야 한다
+ * 상대를 덮지 않도록 일반 저장은 큐 실행 시점 상태를 캡처하고,
+ * 제스처 경계 flush는 다음 mutation 전 상태를 고정한다
  */
 
 import { trackEditorWrite } from '@src/renderer/editor/runtime/editorWriteBarrier';
@@ -12,32 +13,135 @@ const EDIT_SESSION_TTL_MS = 1200;
 
 interface PluginEditSession {
   id: string;
+  active: boolean;
   expiresAt: number;
   cleanupTimer: ReturnType<typeof setTimeout> | null;
 }
 
 const editSessions = new Map<string, PluginEditSession>();
+const editSessionFlushers = new Map<string, Set<() => void>>();
+const stagedGestures = new Map<string, string>();
+const stagedReleaseListeners = new Map<string, Set<() => void>>();
 
-export const touchPluginInstancesEditSession = (pluginId: string): string => {
+const schedulePluginInstancesEditSessionCleanup = (
+  pluginId: string,
+  session: PluginEditSession,
+): void => {
+  session.active = false;
+  session.expiresAt = Date.now() + EDIT_SESSION_TTL_MS;
+  if (session.cleanupTimer) clearTimeout(session.cleanupTimer);
+  const sessionId = session.id;
+  session.cleanupTimer = setTimeout(() => {
+    const current = editSessions.get(pluginId);
+    if (current?.id === sessionId && !current.active) {
+      editSessions.delete(pluginId);
+    }
+  }, EDIT_SESSION_TTL_MS);
+};
+
+export const touchPluginInstancesEditSession = (
+  pluginId: string,
+  preferredGestureId?: string,
+): string => {
   const now = Date.now();
   let session = editSessions.get(pluginId);
-  if (!session || now > session.expiresAt) {
+  if (session?.active) return session.id;
+  if (
+    !session ||
+    now > session.expiresAt ||
+    (preferredGestureId !== undefined && session.id !== preferredGestureId)
+  ) {
     if (session?.cleanupTimer) clearTimeout(session.cleanupTimer);
     session = {
-      id: crypto.randomUUID(),
+      id: preferredGestureId ?? crypto.randomUUID(),
+      active: false,
       expiresAt: 0,
       cleanupTimer: null,
     };
     editSessions.set(pluginId, session);
   }
-  session.expiresAt = now + EDIT_SESSION_TTL_MS;
-  if (session.cleanupTimer) clearTimeout(session.cleanupTimer);
-  const sessionId = session.id;
-  session.cleanupTimer = setTimeout(() => {
-    const current = editSessions.get(pluginId);
-    if (current?.id === sessionId) editSessions.delete(pluginId);
-  }, EDIT_SESSION_TTL_MS);
-  return sessionId;
+  schedulePluginInstancesEditSessionCleanup(pluginId, session);
+  return session.id;
+};
+
+export const registerPluginInstancesEditSessionFlush = (
+  pluginId: string,
+  flush: () => void,
+): (() => void) => {
+  const flushers = editSessionFlushers.get(pluginId) ?? new Set<() => void>();
+  flushers.add(flush);
+  editSessionFlushers.set(pluginId, flushers);
+
+  return () => {
+    const current = editSessionFlushers.get(pluginId);
+    if (!current) return;
+    current.delete(flush);
+    if (current.size === 0) editSessionFlushers.delete(pluginId);
+  };
+};
+
+export const registerPluginInstancesStagedRelease = (
+  pluginId: string,
+  listener: () => void,
+): (() => void) => {
+  const listeners =
+    stagedReleaseListeners.get(pluginId) ?? new Set<() => void>();
+  listeners.add(listener);
+  stagedReleaseListeners.set(pluginId, listeners);
+
+  return () => {
+    const current = stagedReleaseListeners.get(pluginId);
+    if (!current) return;
+    current.delete(listener);
+    if (current.size === 0) stagedReleaseListeners.delete(pluginId);
+  };
+};
+
+export const rotatePluginInstancesEditSession = (
+  pluginId: string,
+  preferredGestureId?: string,
+): string => {
+  const current = editSessions.get(pluginId);
+  if (preferredGestureId !== undefined && current?.id === preferredGestureId) {
+    return touchPluginInstancesEditSession(pluginId, preferredGestureId);
+  }
+  editSessionFlushers.get(pluginId)?.forEach((flush) => flush());
+
+  const previous = editSessions.get(pluginId);
+  if (previous?.cleanupTimer) clearTimeout(previous.cleanupTimer);
+  editSessions.delete(pluginId);
+  return touchPluginInstancesEditSession(pluginId, preferredGestureId);
+};
+
+export const beginPluginInstancesEditSession = (
+  pluginId: string,
+  gestureId: string = crypto.randomUUID(),
+): string => {
+  editSessionFlushers.get(pluginId)?.forEach((flush) => flush());
+
+  const previous = editSessions.get(pluginId);
+  if (previous?.cleanupTimer) clearTimeout(previous.cleanupTimer);
+  const session = {
+    id: gestureId,
+    active: true,
+    expiresAt: Number.POSITIVE_INFINITY,
+    cleanupTimer: null,
+  };
+  editSessions.set(pluginId, session);
+  return session.id;
+};
+
+export const endPluginInstancesEditSession = (
+  pluginId: string,
+  token: string,
+): void => {
+  const session = editSessions.get(pluginId);
+  if (!session?.active || session.id !== token) return;
+  editSessionFlushers.get(pluginId)?.forEach((flush) => flush());
+  const current = editSessions.get(pluginId);
+  if (!current?.active || current.id !== token) return;
+  if (current.cleanupTimer) clearTimeout(current.cleanupTimer);
+  editSessions.delete(pluginId);
 };
 
 export const clearPluginInstancesEditSessions = (): void => {
@@ -45,6 +149,50 @@ export const clearPluginInstancesEditSessions = (): void => {
     if (session.cleanupTimer) clearTimeout(session.cleanupTimer);
   });
   editSessions.clear();
+  stagedGestures.clear();
+};
+
+export const stagePluginInstancesGesture = (
+  pluginId: string,
+  gestureId: string,
+): void => {
+  stagedGestures.set(pluginId, gestureId);
+};
+
+export const getStagedPluginInstancesGestureId = (
+  pluginId: string,
+): string | undefined => stagedGestures.get(pluginId);
+
+export const unstagePluginInstancesGesture = (
+  pluginId: string,
+  gestureId: string,
+): void => {
+  if (stagedGestures.get(pluginId) === gestureId) {
+    stagedGestures.delete(pluginId);
+    stagedReleaseListeners.get(pluginId)?.forEach((listener) => listener());
+  }
+};
+
+export const isPluginInstancesGestureStaged = (
+  pluginId: string,
+  gestureId?: string,
+): boolean => {
+  const staged = stagedGestures.get(pluginId);
+  return (
+    staged !== undefined && (gestureId === undefined || staged === gestureId)
+  );
+};
+
+export const hasConflictingPluginInstancesGesture = (
+  pluginId: string,
+  gestureId: string,
+): boolean => {
+  const stagedGestureId = stagedGestures.get(pluginId);
+  if (stagedGestureId !== undefined && stagedGestureId !== gestureId) {
+    return true;
+  }
+  const session = editSessions.get(pluginId);
+  return session !== undefined && session.id !== gestureId;
 };
 
 export const enqueuePluginInstancesCommit = <T>(
@@ -66,9 +214,27 @@ export const enqueuePluginInstancesCommit = <T>(
 
 export const getPendingPluginInstancesCommitCount = (): number => queues.size;
 
+export const drainPluginInstancesCommitQueues = async (
+  pluginIds: readonly string[],
+): Promise<void> => {
+  const uniquePluginIds = [...new Set(pluginIds)];
+  while (true) {
+    const tails = uniquePluginIds
+      .map((pluginId) => queues.get(pluginId))
+      .filter((tail): tail is Promise<unknown> => tail !== undefined);
+    if (tails.length === 0) return;
+    await Promise.all(tails);
+  }
+};
+
+interface PluginInstancesSaveRequest {
+  gestureId?: string;
+  captureCurrentSnapshot: boolean;
+}
+
 interface PluginInstancesSaveDebounceOptions {
   delayMs: number;
-  save: () => Promise<void>;
+  save: (request: PluginInstancesSaveRequest) => Promise<void>;
   onError: (error: unknown) => void;
 }
 
@@ -77,18 +243,47 @@ export const createPluginInstancesSaveDebounce = ({
   save,
   onError,
 }: PluginInstancesSaveDebounceOptions) => {
-  let timer: ReturnType<typeof setTimeout> | null = null;
-  let settleScheduledWrite: (() => void) | null = null;
+  let scheduled:
+    | {
+        gestureId?: string;
+        timer: ReturnType<typeof setTimeout>;
+        resolve: () => void;
+        reject: (error: unknown) => void;
+      }
+    | undefined;
 
   const cancel = () => {
-    if (timer === null) return;
-    clearTimeout(timer);
-    timer = null;
-    settleScheduledWrite?.();
-    settleScheduledWrite = null;
+    if (!scheduled) return;
+    clearTimeout(scheduled.timer);
+    scheduled.resolve();
+    scheduled = undefined;
   };
 
-  const schedule = () => {
+  const runScheduledSave = (captureCurrentSnapshot: boolean): boolean => {
+    const pending = scheduled;
+    if (!pending) return false;
+
+    clearTimeout(pending.timer);
+    scheduled = undefined;
+    let savePromise: Promise<void>;
+    try {
+      savePromise = save({
+        gestureId: pending.gestureId,
+        captureCurrentSnapshot,
+      });
+    } catch (error) {
+      onError(error);
+      pending.reject(error);
+      return true;
+    }
+    void savePromise.then(pending.resolve, (error) => {
+      onError(error);
+      pending.reject(error);
+    });
+    return true;
+  };
+
+  const schedule = (gestureId?: string) => {
     cancel();
 
     let resolveWrite!: () => void;
@@ -98,17 +293,18 @@ export const createPluginInstancesSaveDebounce = ({
       rejectWrite = reject;
     });
     trackEditorWrite(pendingWrite);
-    settleScheduledWrite = resolveWrite;
-
-    timer = setTimeout(() => {
-      timer = null;
-      settleScheduledWrite = null;
-      void save().then(resolveWrite, (error) => {
-        onError(error);
-        rejectWrite(error);
-      });
-    }, delayMs);
+
+    scheduled = {
+      gestureId,
+      resolve: resolveWrite,
+      reject: rejectWrite,
+      timer: setTimeout(() => {
+        runScheduledSave(false);
+      }, delayMs),
+    };
   };
 
-  return { cancel, schedule };
+  const flush = () => runScheduledSave(true);
+
+  return { cancel, flush, schedule };
 };
diff --git a/src/renderer/plugins/runtime/displayElement/instancesUndoSync.ts b/src/renderer/plugins/runtime/displayElement/instancesUndoSync.ts
index 608d5326..b3eb29bc 100644
--- a/src/renderer/plugins/runtime/displayElement/instancesUndoSync.ts
+++ b/src/renderer/plugins/runtime/displayElement/instancesUndoSync.ts
@@ -74,11 +74,12 @@ const appliedRevisions = new Map<string, number>();
 /** canonical pull 후 등록된 정의별 재주입 - undo 재결합과 실패 복구가 공유 */
 export const applyCanonicalPluginInstances = async (
   pluginId: string,
+  force = false,
 ): Promise<void> => {
   const snapshot = await pluginInstancesApi.get(pluginId);
   noteBackendPluginRevision(snapshot.modelRevision);
   const applied = appliedRevisions.get(pluginId) ?? 0;
-  if (snapshot.modelRevision <= applied) return;
+  if (!force && snapshot.modelRevision <= applied) return;
   appliedRevisions.set(pluginId, snapshot.modelRevision);
 
   const byDef = reappliers.get(pluginId);
diff --git a/src/renderer/stores/useUpdateStore.ts b/src/renderer/stores/useUpdateStore.ts
index 4d9a1d9d..7c99ab8a 100644
--- a/src/renderer/stores/useUpdateStore.ts
+++ b/src/renderer/stores/useUpdateStore.ts
@@ -1,6 +1,6 @@
 import { create } from 'zustand';
 
-const GITHUB_REPO = 'lee-sihun/DmNote';
+const GITHUB_REPO = 'DmNote-App/DmNote';
 const STORAGE_KEY = 'dmnote:skipped-version';
 const CACHE_KEY = 'dmnote:update-check-cache';
 const POST_UPDATE_NOTICE_KEY = 'dmnote:post-update-release-notice-version';
diff --git a/src/renderer/utils/plugin/panelModelSync.ts b/src/renderer/utils/plugin/panelModelSync.ts
index 7004b732..450ca4a2 100644
--- a/src/renderer/utils/plugin/panelModelSync.ts
+++ b/src/renderer/utils/plugin/panelModelSync.ts
@@ -26,6 +26,7 @@ let pushSeq = 0;
 let syncScheduled = false;
 let pendingElements: PluginDisplayElementInternal[] | null = null;
 let pendingDefinitions: Map<string, PluginDefinitionInternal> | null = null;
+let pendingModelRevision: number | null = null;
 
 // JSON 직렬화 보장 - 함수 값 필드 제거 (중첩 객체·배열 포함, 순환 참조는 절단)
 // seen은 현재 경로 기준 - 형제가 같은 객체를 공유하는 DAG는 그대로 직렬화
@@ -126,8 +127,10 @@ const buildDefinitionView = (
 const flushPanelModelSync = () => {
   const elements = pendingElements;
   const definitions = pendingDefinitions;
+  const modelRevision = pendingModelRevision;
   pendingElements = null;
   pendingDefinitions = null;
+  pendingModelRevision = null;
   if (!elements || !definitions) return;
 
   // 패널 창이 없으면 push 생략 - 재열림 시 request로 전체 스냅샷 복구
@@ -152,7 +155,7 @@ const flushPanelModelSync = () => {
 
   pushSeq += 1;
   const snapshot: PluginPanelModelSnapshot = {
-    modelRevision: getBackendPluginRevision(),
+    modelRevision: modelRevision ?? getBackendPluginRevision(),
     pushSeq,
     authorityGeneration: getPluginAuthorityGeneration(),
     elements: elements.map(toPluginPanelElementView),
@@ -180,9 +183,11 @@ export const flushPluginPanelModelSyncNow = (): void => {
 export const schedulePluginPanelModelSync = (
   elements: PluginDisplayElementInternal[],
   definitions: Map<string, PluginDefinitionInternal>,
+  modelRevision?: number,
 ): void => {
   pendingElements = elements;
   pendingDefinitions = definitions;
+  pendingModelRevision = modelRevision ?? null;
 
   if (syncScheduled) return;
   syncScheduled = true;
diff --git a/src/renderer/windows/overlay/App.test.tsx b/src/renderer/windows/overlay/App.test.tsx
new file mode 100644
index 00000000..0148ff80
--- /dev/null
+++ b/src/renderer/windows/overlay/App.test.tsx
@@ -0,0 +1,301 @@
+import React, { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { createDefaultKeyPosition } from '@src/renderer/editor/model/keys';
+import { useKeyStore } from '@stores/data/useKeyStore';
+import {
+  getKeySignal,
+  resetAllKeySignals,
+  setKeyActive,
+} from '@stores/signals/keySignals';
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+
+const mocks = vi.hoisted(() => ({
+  bootstrap: vi.fn(),
+  keyEventListener: null as null | ((payload: unknown) => void),
+  unsubscribeKeyEvents: vi.fn(),
+  updateTrackLayouts: vi.fn(),
+}));
+
+vi.mock('@tauri-apps/api/window', () => ({
+  currentMonitor: vi.fn(),
+  getCurrentWindow: () => ({
+    startDragging: vi.fn(() => Promise.resolve()),
+  }),
+  Window: { getByLabel: vi.fn() },
+}));
+vi.mock('@tauri-apps/api/dpi', () => ({
+  LogicalPosition: class LogicalPosition {},
+  PhysicalPosition: class PhysicalPosition {},
+}));
+vi.mock('@tauri-apps/api/menu', () => ({
+  Menu: { new: vi.fn() },
+}));
+vi.mock('@contexts/useTranslation', () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+vi.mock('@hooks/app/useCustomCssInjection', () => ({
+  useCustomCssInjection: vi.fn(),
+}));
+vi.mock('@hooks/app/useCustomJsInjection', () => ({
+  useCustomJsInjection: vi.fn(),
+}));
+vi.mock('@hooks/app/useBlockBrowserShortcuts', () => ({
+  useBlockBrowserShortcuts: vi.fn(),
+}));
+vi.mock('@hooks/app/useAppBootstrap', () => ({ useAppBootstrap: vi.fn() }));
+vi.mock('@hooks/overlay/useBuiltinStatsSubscription', () => ({
+  useBuiltinStatsSubscription: vi.fn(),
+}));
+vi.mock('@hooks/overlay/useNoteSystem', () => ({
+  useNoteSystem: () => ({
+    notesRef: { current: {} },
+    subscribe: vi.fn(() => () => {}),
+    handleKeyDown: vi.fn(),
+    handleKeyUp: vi.fn(),
+    finalizeAllActive: vi.fn(),
+    noteBuffer: {},
+    updateTrackLayouts: mocks.updateTrackLayouts,
+  }),
+}));
+vi.mock('@stores/data/useStatItemStore', () => ({
+  useStatItemStore: <T,>(
+    selector: (state: { positions: Record<string, never[]> }) => T,
+  ) => selector({ positions: {} }),
+}));
+vi.mock('@stores/data/useGraphItemStore', () => ({
+  useGraphItemStore: <T,>(
+    selector: (state: { positions: Record<string, never[]> }) => T,
+  ) => selector({ positions: {} }),
+}));
+vi.mock('@stores/data/useKnobItemStore', () => ({
+  useKnobItemStore: <T,>(
+    selector: (state: { positions: Record<string, never[]> }) => T,
+  ) => selector({ positions: {} }),
+}));
+vi.mock('@stores/useSettingsStore', () => {
+  const state = {
+    developerModeEnabled: false,
+    backgroundColor: 'transparent',
+    alwaysOnTop: false,
+    trayEnabled: true,
+    setAlwaysOnTop: vi.fn(),
+    noteSettings: {
+      frameLimit: 0,
+      speed: 500,
+      trackHeight: 300,
+      reverse: false,
+      fadePosition: 'auto',
+      fadeTopPx: 0,
+      fadeBottomPx: 0,
+      reverseFadeTopPx: 0,
+      reverseFadeBottomPx: 0,
+      delayedNoteEnabled: false,
+      shortNoteThresholdMs: 0,
+      shortNoteMinLengthPx: 0,
+      keyDisplayDelayMs: 0,
+    },
+    tabNoteOverrides: {},
+    noteEffect: false,
+    gridSettings: { overlayPadding: 30 },
+    overlayResizeAnchor: 'center',
+    keyCounterEnabled: false,
+  };
+  return {
+    useSettingsStore: <T,>(selector: (value: typeof state) => T) =>
+      selector(state),
+  };
+});
+vi.mock('@stores/plugin/usePluginDisplayElementStore', () => ({
+  usePluginDisplayElementStore: <T,>(
+    selector: (state: { elements: never[] }) => T,
+  ) => selector({ elements: [] }),
+}));
+vi.mock('@components/shared/OverlayScene', () => ({ default: () => null }));
+vi.mock('@hooks/shared/useLayoutComputation', () => ({
+  computeLayout: () => ({
+    bounds: null,
+    displayPositions: [],
+    displayStatPositions: [],
+    displayGraphPositions: [],
+    displayKnobPositions: [],
+    positionOffset: { x: 0, y: 0 },
+    webglTracks: [],
+  }),
+}));
+vi.mock('@utils/core/axisEventBus', () => ({
+  axisEventBus: { initialize: vi.fn() },
+}));
+vi.mock('@utils/core/keyEventBus', () => ({
+  keyEventBus: {
+    subscribe: vi.fn((listener: (payload: unknown) => void) => {
+      mocks.keyEventListener = listener;
+      return mocks.unsubscribeKeyEvents;
+    }),
+    initialize: vi.fn(() => Promise.resolve()),
+  },
+}));
+
+import App from './App';
+
+interface Deferred<T> {
+  promise: Promise<T>;
+  resolve: (value: T) => void;
+}
+
+const deferred = <T,>(): Deferred<T> => {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((nextResolve) => {
+    resolve = nextResolve;
+  });
+  return { promise, resolve };
+};
+
+const flushAsync = () =>
+  act(async () => {
+    await new Promise((resolve) => setTimeout(resolve, 0));
+  });
+
+describe('overlay active key reconciliation', () => {
+  let container: HTMLDivElement;
+  let root: Root;
+  let originalApi: Window['api'];
+
+  beforeEach(async () => {
+    originalApi = window.api;
+    mocks.bootstrap.mockReset();
+    mocks.bootstrap.mockResolvedValue({ activeKeys: [] });
+    mocks.keyEventListener = null;
+    mocks.unsubscribeKeyEvents.mockClear();
+    mocks.updateTrackLayouts.mockClear();
+    window.api = {
+      app: { bootstrap: mocks.bootstrap },
+    } as unknown as Window['api'];
+    useKeyStore.setState({
+      selectedKeyType: '4key',
+      customTabs: [],
+      keyMappings: {
+        '4key': ['KeyK', 'KeyJ'],
+        '8key': ['KeyQ'],
+      },
+      positions: { '4key': [], '8key': [] },
+      canonicalPositions: { '4key': [], '8key': [] },
+      isBootstrapped: true,
+      isLocalUpdateInProgress: false,
+    });
+    resetAllKeySignals();
+    container = document.createElement('div');
+    document.body.append(container);
+    root = createRoot(container);
+    await act(async () => {
+      root.render(<App />);
+    });
+    await flushAsync();
+    mocks.bootstrap.mockClear();
+  });
+
+  afterEach(() => {
+    act(() => root.unmount());
+    container.remove();
+    resetAllKeySignals();
+    window.api = originalApi;
+    vi.restoreAllMocks();
+  });
+
+  it('positions 변경에는 눌림 상태를 재설정하지 않는다', async () => {
+    setKeyActive('KeyK', true);
+
+    await act(async () => {
+      useKeyStore.setState({
+        positions: {
+          '4key': [createDefaultKeyPosition(10, 20)],
+          '8key': [],
+        },
+      });
+    });
+    await flushAsync();
+
+    expect(getKeySignal('KeyK').value).toBe(true);
+    expect(mocks.bootstrap).not.toHaveBeenCalled();
+  });
+
+  it('현재 매핑에서 제거된 활성 키를 오래된 스냅샷으로 되살리지 않는다', async () => {
+    setKeyActive('KeyK', true);
+    setKeyActive('KeyJ', true);
+    mocks.bootstrap.mockResolvedValue({ activeKeys: ['KeyK', 'KeyJ'] });
+
+    await act(async () => {
+      useKeyStore.setState((state) => ({
+        keyMappings: { ...state.keyMappings, '4key': ['KeyJ'] },
+      }));
+    });
+    await flushAsync();
+
+    expect(getKeySignal('KeyK').value).toBe(false);
+    expect(getKeySignal('KeyJ').value).toBe(true);
+    expect(mocks.bootstrap).toHaveBeenCalledOnce();
+  });
+
+  it('다른 탭의 매핑 변경은 현재 눌림 상태를 건드리지 않는다', async () => {
+    setKeyActive('KeyK', true);
+
+    await act(async () => {
+      useKeyStore.setState((state) => ({
+        keyMappings: { ...state.keyMappings, '8key': ['KeyW'] },
+      }));
+    });
+    await flushAsync();
+
+    expect(getKeySignal('KeyK').value).toBe(true);
+    expect(mocks.bootstrap).not.toHaveBeenCalled();
+  });
+
+  it('키 순서·중복·빈값만 바뀌면 같은 매핑으로 취급한다', async () => {
+    setKeyActive('KeyK', true);
+
+    await act(async () => {
+      useKeyStore.setState((state) => ({
+        keyMappings: {
+          ...state.keyMappings,
+          '4key': ['', 'KeyJ', 'KeyK', 'KeyK'],
+        },
+      }));
+    });
+    await flushAsync();
+
+    expect(getKeySignal('KeyK').value).toBe(true);
+    expect(mocks.bootstrap).not.toHaveBeenCalled();
+  });
+
+  it('다음 매핑 전환 뒤 도착한 이전 hydration을 무시한다', async () => {
+    const first = deferred<{ activeKeys: string[] }>();
+    const second = deferred<{ activeKeys: string[] }>();
+    mocks.bootstrap
+      .mockReturnValueOnce(first.promise)
+      .mockReturnValueOnce(second.promise);
+
+    await act(async () => {
+      useKeyStore.setState((state) => ({
+        keyMappings: { ...state.keyMappings, '4key': ['KeyJ'] },
+      }));
+    });
+    await flushAsync();
+    await act(async () => {
+      useKeyStore.setState((state) => ({
+        keyMappings: { ...state.keyMappings, '4key': ['KeyL'] },
+      }));
+    });
+    await flushAsync();
+    expect(mocks.bootstrap).toHaveBeenCalledTimes(2);
+
+    second.resolve({ activeKeys: ['KeyL'] });
+    await flushAsync();
+    expect(getKeySignal('KeyL').value).toBe(true);
+
+    first.resolve({ activeKeys: ['KeyJ'] });
+    await flushAsync();
+    expect(getKeySignal('KeyJ').value).toBe(false);
+    expect(getKeySignal('KeyL').value).toBe(true);
+  });
+});
diff --git a/src/renderer/windows/overlay/App.tsx b/src/renderer/windows/overlay/App.tsx
index 1b0a9398..b6234104 100644
--- a/src/renderer/windows/overlay/App.tsx
+++ b/src/renderer/windows/overlay/App.tsx
@@ -34,6 +34,12 @@ type KeyDelayTimerEntry = { timers: Set<ReturnType<typeof setTimeout>> };
 // 값이 와도 노트가 화면 위로 튀지 않도록 제한
 const MAX_EVENT_AGE_MS = 250;
 
+const validKeySet = (keys: readonly string[]) =>
+  new Set(keys.filter((key) => key.length > 0));
+
+const validKeySignature = (keys: readonly string[]) =>
+  JSON.stringify([...validKeySet(keys)].sort());
+
 export default function App() {
   const isBootstrapped = useKeyStore((state) => state.isBootstrapped);
   useCustomCssInjection();
@@ -364,6 +370,33 @@ export default function App() {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [selectedKeyType]);
 
+  // 구독 콜백이 읽는 최신 컨텍스트 - 구독 자체는 마운트 1회로 고정
+  // positions·keyMappings가 deps에 있으면 undo의 canonical 복원마다 재구독되고,
+  // cleanup의 resetAllKeySignals가 눌림 표시 중간에 끼어들어 이중 깜빡임 발생
+  const keyEventContextRef = useRef({
+    noteEffect,
+    keyMappings,
+    positions,
+    selectedKeyType,
+    handleKeyDown,
+    handleKeyUp,
+  });
+  useEffect(() => {
+    keyEventContextRef.current = {
+      noteEffect,
+      keyMappings,
+      positions,
+      selectedKeyType,
+      handleKeyDown,
+      handleKeyUp,
+    };
+  });
+
+  // 리셋 이후 이벤트가 도착한 키 추적 - 스냅샷 재수화보다 최신 이벤트가 우선
+  const seenSinceResetRef = useRef<Set<string>>(new Set());
+  // 탭 전환 재수화가 구독 확립을 기다릴 수 있게 구독 준비 promise 보관
+  const keyEventsReadyRef = useRef<Promise<unknown> | null>(null);
+
   useEffect(() => {
     // 키 딜레이 적용된 신호 업데이트
     const updateKeySignalWithDelay = (key: string, isDown: boolean) => {
@@ -395,7 +428,6 @@ export default function App() {
     });
 
     let hydrationCancelled = false;
-    const seenHydrationKeys = new Set<string>();
 
     // 키 이벤트 구독을 먼저 확립한 뒤 눌림 스냅샷 요청
     const unsubscribe = import('@utils/core/keyEventBus').then(
@@ -403,10 +435,18 @@ export default function App() {
         if (hydrationCancelled) return undefined;
         const unsubscribeKeyEvents = keyEventBus.subscribe(
           ({ key, state, eventAgeMs }) => {
-            seenHydrationKeys.add(key);
+            seenSinceResetRef.current.add(key);
             const isDown = state === 'DOWN';
             // 키 UI 업데이트 (딜레이 적용)
             updateKeySignalWithDelay(key, isDown);
+            const {
+              noteEffect,
+              keyMappings,
+              positions,
+              selectedKeyType,
+              handleKeyDown,
+              handleKeyUp,
+            } = keyEventContextRef.current;
             // 노트 이펙트는 즉시 처리 (딜레이 없음)
             if (noteEffect) {
               // 개별 키의 noteEffectEnabled 확인
@@ -446,21 +486,31 @@ export default function App() {
 
         // 지연 생성된 오버레이 hydration — 구독 이후 이벤트가 온 키는
         // 최신 이벤트가 스냅샷보다 우선하며 KPS·노트 통계에는 반영하지 않음
+        const hydrationSeen = seenSinceResetRef.current;
         void window.api.app
           .bootstrap()
           .then(({ activeKeys }) => {
             if (hydrationCancelled || !activeKeys?.length) return;
+            // 탭 전환 리셋이 끼었으면 이 스냅샷은 낡음 - 전환 effect의 재수화가 담당
+            if (seenSinceResetRef.current !== hydrationSeen) return;
+            const { keyMappings, selectedKeyType } = keyEventContextRef.current;
+            const validKeys = validKeySet(keyMappings[selectedKeyType] ?? []);
             for (const key of activeKeys) {
-              if (!seenHydrationKeys.has(key)) {
+              if (validKeys.has(key) && !hydrationSeen.has(key)) {
                 setKeyActiveSignal(key, true);
               }
             }
           })
-          .catch(() => {});
+          .catch((error) => {
+            if (!hydrationCancelled) {
+              console.error('Failed to hydrate active key state', error);
+            }
+          });
 
         return unsubscribeKeyEvents;
       },
     );
+    keyEventsReadyRef.current = unsubscribe;
     void unsubscribe.catch((error) => {
       console.error('Failed to initialize key state listener', error);
     });
@@ -484,19 +534,56 @@ export default function App() {
         timerEntry.timers.clear();
       });
       keyDelayTimers.clear();
-      // 안전하게 모든 키 신호 초기화(선택적)
+      // 창 단위 정리 - 마운트 1회 구독이므로 여기는 실제 언마운트에서만 실행됨
       resetAllKeySignals();
     };
-  }, [
-    handleKeyDown,
-    handleKeyUp,
-    noteEffect,
-    keyMappings,
-    positions,
-    selectedKeyType,
-  ]);
+    // 콜백이 읽는 값은 keyEventContextRef로 공급 - 구독은 창 수명과 동일
+  }, []);
 
   const currentKeys = keyMappings[selectedKeyType] ?? [];
+  const currentValidKeySignature = validKeySignature(currentKeys);
+
+  // 탭·현재 키 집합 전환 시 예약 타이머와 눌림 신호를 권위 상태로 정합
+  // positions와 다른 탭의 매핑 변경은 signature가 같아 이 effect를 건드리지 않음
+  const keySignalResetArmedRef = useRef(false);
+  useEffect(() => {
+    if (!keySignalResetArmedRef.current) {
+      // 초기 마운트 수화는 구독 effect가 담당
+      keySignalResetArmedRef.current = true;
+      return;
+    }
+    let cancelled = false;
+    keyDelayTimersRef.current.forEach((timerEntry) => {
+      timerEntry.timers.forEach((timer) => clearTimeout(timer));
+      timerEntry.timers.clear();
+    });
+    keyDelayTimersRef.current.clear();
+    const seen = new Set<string>();
+    const validKeys = new Set<string>(JSON.parse(currentValidKeySignature));
+    seenSinceResetRef.current = seen;
+    resetAllKeySignals();
+    void Promise.resolve(keyEventsReadyRef.current)
+      .then(() => window.api.app.bootstrap())
+      .then(({ activeKeys }) => {
+        if (cancelled || !activeKeys?.length) return;
+        // 이후 전환의 리셋이 끼었으면 그쪽 재수화가 담당
+        if (seenSinceResetRef.current !== seen) return;
+        for (const key of activeKeys) {
+          if (validKeys.has(key) && !seen.has(key)) {
+            setKeyActiveSignal(key, true);
+          }
+        }
+      })
+      .catch((error) => {
+        if (!cancelled) {
+          console.error('Failed to rehydrate active key state', error);
+        }
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [selectedKeyType, currentValidKeySignature]);
+
   const currentPositions = positions[selectedKeyType] ?? [];
   const currentStatPositions = statPositions[selectedKeyType] ?? [];
   const currentGraphPositions = graphPositions[selectedKeyType] ?? [];
diff --git a/src/types/editor.ts b/src/types/editor.ts
index 20d739f8..c87d1e56 100644
--- a/src/types/editor.ts
+++ b/src/types/editor.ts
@@ -45,6 +45,8 @@ export interface EditorCommitRequest {
   changes: EditorPatchV1;
   // 프리뷰 게스처 커밋 연동용, 성공 시 committed 이벤트로 echo
   gestureId?: string;
+  // 한 요청으로 합쳐진 프리뷰 세션 전체
+  gestureIds?: string[];
 }
 
 export interface EditorCommitResult {
@@ -52,6 +54,12 @@ export interface EditorCommitResult {
   changedFields: EditorField[];
 }
 
+export interface EditorGestureCommitContext {
+  editorBaseRevision: number;
+  mutationId: string;
+  editorChanges?: EditorPatchV1;
+}
+
 export interface EditorGetResult {
   revision: number;
   document: EditorDocumentV1;
@@ -66,11 +74,16 @@ export interface EditorCommittedV1 {
   patch: EditorPatchV1;
   // 커밋 요청의 gestureId echo, 수신 창의 프리뷰 오버레이 정리 신호
   gestureId?: string | null;
+  // 합쳐진 커밋에 포함된 모든 프리뷰 세션 정리 신호
+  gestureIds?: string[];
 }
 
 export type EditorCommitErrorCode =
   | 'REVISION_CONFLICT'
+  | 'PLUGIN_REVISION_CONFLICT'
   | 'VALIDATION_FAILED'
+  | 'TOO_MANY_GESTURE_IDS'
+  | 'INVALID_GESTURE_ID'
   | 'PAIRED_UPDATE_REQUIRED'
   | 'MUTATION_ID_REUSED'
   | 'IO_ERROR'
@@ -94,7 +107,10 @@ export interface EditorCommitError {
 
 const EDITOR_ERROR_CODES = new Set<EditorCommitErrorCode>([
   'REVISION_CONFLICT',
+  'PLUGIN_REVISION_CONFLICT',
   'VALIDATION_FAILED',
+  'TOO_MANY_GESTURE_IDS',
+  'INVALID_GESTURE_ID',
   'PAIRED_UPDATE_REQUIRED',
   'MUTATION_ID_REUSED',
   'IO_ERROR',
@@ -498,6 +514,14 @@ export function assertEditorCommittedEvent(value: EditorCommittedV1): void {
   if (typeof value.mutationId !== 'string' || value.mutationId.length === 0) {
     throw new EditorProtocolError('editor:committed mutationId is invalid');
   }
+  if (
+    value.gestureIds !== undefined &&
+    (!Array.isArray(value.gestureIds) ||
+      value.gestureIds.some((gestureId) => typeof gestureId !== 'string') ||
+      new Set(value.gestureIds).size !== value.gestureIds.length)
+  ) {
+    throw new EditorProtocolError('editor:committed gestureIds is invalid');
+  }
   assertEditorFields(value.changedFields, 'editor:committed changedFields');
   assertEditorPatch(value.patch, 'editor:committed patch');
   const patchFields = EDITOR_FIELDS.filter(
diff --git a/src/types/preview.ts b/src/types/preview.ts
index a5c40b63..5bf6d308 100644
--- a/src/types/preview.ts
+++ b/src/types/preview.ts
@@ -21,8 +21,6 @@ export interface PreviewEnvelope {
   mode: string;
   targets: number[];
   patch: Record<string, unknown>;
-  // cancel 전용: 이 revision 반영 후에만 세션 제거 (순서 게이트)
-  minRevision?: number | null;
 }
 
 export interface PreviewPublishRequest {