From e980db9a04c7d319245b9c9398baefb5db55b894 Mon Sep 17 00:00:00 2001
From: AliceJump <2630923991@qq.com>
Date: Tue, 6 Oct 2026 22:36:45 +0800
Subject: [PATCH 1/6] feat: cycle unified annotation modes with one shortcut

---
 media/annotationPanel/index.html | 61 ++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/media/annotationPanel/index.html b/media/annotationPanel/index.html
index 691ea8c..546dda7 100644
--- a/media/annotationPanel/index.html
+++ b/media/annotationPanel/index.html
@@ -85,6 +85,67 @@ <h3 id="bboxTitle">Bounding Box</h3>
       window.acquireVsCodeApi = () => sharedApi || (sharedApi = nativeAcquire());
     })();
   </script>
+  <script nonce="__CSP_NONCE__">
+    (() => {
+      const MODE_BUTTON_IDS = ['templateModeBtn', 'rectModeBtn', 'pointModeBtn'];
+      let cycleMode = 'm';
+      let legacyModeBindings = ['1', '2', '3'];
+
+      function parseKeybinding(binding) {
+        const parts = String(binding || '').toLowerCase().split('+').filter(Boolean);
+        const key = parts.pop() || '';
+        return {
+          key,
+          needPrimary: parts.includes('ctrl') || parts.includes('meta') || parts.includes('cmd'),
+          needShift: parts.includes('shift'),
+          needAlt: parts.includes('alt'),
+        };
+      }
+
+      function matchesKeybinding(event, binding) {
+        if (!binding) return false;
+        const parsed = parseKeybinding(binding);
+        const keyMatches = event.key.toLowerCase() === parsed.key || event.code.toLowerCase() === parsed.key;
+        return keyMatches
+          && !!(event.ctrlKey || event.metaKey) === parsed.needPrimary
+          && !!event.shiftKey === parsed.needShift
+          && !!event.altKey === parsed.needAlt;
+      }
+
+      function cycleAnnotationMode() {
+        const buttons = MODE_BUTTON_IDS.map(id => document.getElementById(id));
+        const currentIndex = buttons.findIndex(button => button?.classList.contains('active'));
+        const nextIndex = currentIndex < 0 ? 0 : (currentIndex + 1) % buttons.length;
+        buttons[nextIndex]?.click();
+      }
+
+      window.addEventListener('message', event => {
+        if (event.data?.type !== 'config' || !event.data.keybindings) return;
+        const incoming = event.data.keybindings;
+        if (typeof incoming.cycleMode === 'string') cycleMode = incoming.cycleMode;
+        legacyModeBindings = [
+          '1', '2', '3',
+          incoming.modeTemplate,
+          incoming.modeRect,
+          incoming.modePoint,
+        ].filter(binding => typeof binding === 'string' && binding.length > 0);
+      });
+
+      document.addEventListener('keydown', event => {
+        if (document.getElementById('bboxModal')?.classList.contains('visible')) return;
+        if (matchesKeybinding(event, cycleMode)) {
+          event.preventDefault();
+          event.stopImmediatePropagation();
+          cycleAnnotationMode();
+          return;
+        }
+        if (legacyModeBindings.some(binding => matchesKeybinding(event, binding))) {
+          event.preventDefault();
+          event.stopImmediatePropagation();
+        }
+      }, true);
+    })();
+  </script>
   <script src="__EXTERNAL_SYNC_SCRIPT_URI__"></script>
   <script src="__CONFLICT_SCRIPT_URI__"></script>
   <script src="__APP_SCRIPT_URI__"></script>

From 2e6501e40c56216f3b79021f3b244f041ec816e1 Mon Sep 17 00:00:00 2001
From: AliceJump <2630923991@qq.com>
Date: Tue, 6 Oct 2026 22:38:12 +0800
Subject: [PATCH 2/6] feat: expose one annotation mode cycle binding

---
 package.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 166d42e..4554e94 100644
--- a/package.json
+++ b/package.json
@@ -325,9 +325,7 @@
             "deleteSelected": "Delete",
             "prevImage": "ArrowLeft",
             "nextImage": "ArrowRight",
-            "modeTemplate": "1",
-            "modeRect": "2",
-            "modePoint": "3"
+            "cycleMode": "m"
           },
           "additionalProperties": {
             "type": "string"
@@ -350,7 +348,7 @@
     "verify:version": "node scripts/release/verify-version.js",
     "verify:l10n": "node scripts/release/verify-l10n.js",
     "release": "sh scripts/release.sh",
-    "test": "npm run verify:version && npm run verify:l10n && npm run compile && npm run test:webview-html && npm run test:design-system && npm run test:thumbnail-actions && npm run test:task-launcher && npm run test:console-accountseg && npm run test:task-launcher-executor && npm run test:task-reconcile && npm run test:temp-screenshots && npm run test:annotation-coords && npm run test:annotation-clipboard && npm run test:annotation-swap && npm run test:annotation-merge && npm run test:annotation-history && npm run test:position-resource && npm run test:point-resource && npm run test:asset-swap-picker && npm run test:thumb-content-hash && npm run test:list-editor && npm run test:project-config && npm run test:project-config-schema && npm run test:convention-sources && npm run test:label-enum-guard && npm run test:save-to-assets-flow && npm run test:save-to-assets && npm run test:asset-pack-worker && npm run test:coco-feature-path && npm run test:box-resource && npm run test:probe-schemas && npm run test:probe-gui-group-names && npm run test:probe-qt-layer && npm run test:probe-multi-account-path && npm run test:probe-window-config && npm run test:run-sandbox && npm run test:startup-patches && npm run test:executor-runtime && npm run test:executor-project-config && npm run test:executor-gconfig && npm run test:project-store && npm run test:project-runtime",
+    "test": "npm run verify:version && npm run verify:l10n && npm run compile && npm run test:webview-html && npm run test:design-system && npm run test:thumbnail-actions && npm run test:task-launcher && npm run test:console-accountseg && npm run test:task-launcher-executor && npm run test:task-reconcile && npm run test:temp-screenshots && npm run test:annotation-coords && npm run test:annotation-clipboard && npm run test:annotation-swap && npm run test:annotation-merge && npm run test:annotation-history && npm run test:annotation-mode-cycle && npm run test:position-resource && npm run test:point-resource && npm run test:asset-swap-picker && npm run test:thumb-content-hash && npm run test:list-editor && npm run test:project-config && npm run test:project-config-schema && npm run test:convention-sources && npm run test:label-enum-guard && npm run test:save-to-assets-flow && npm run test:save-to-assets && npm run test:asset-pack-worker && npm run test:coco-feature-path && npm run test:box-resource && npm run test:probe-schemas && npm run test:probe-gui-group-names && npm run test:probe-qt-layer && npm run test:probe-multi-account-path && npm run test:probe-window-config && npm run test:run-sandbox && npm run test:startup-patches && npm run test:executor-runtime && npm run test:executor-project-config && npm run test:executor-gconfig && npm run test:project-store && npm run test:project-runtime",
     "test:webview-html": "node scripts/test_webview_html.js",
     "test:design-system": "node scripts/test_design_system.js",
     "test:thumbnail-actions": "node scripts/test_thumbnail_actions.js",
@@ -364,6 +362,7 @@
     "test:annotation-swap": "node scripts/test_annotation_swap.js",
     "test:annotation-merge": "node scripts/test_annotation_merge.js",
     "test:annotation-history": "node scripts/test_annotation_history.js",
+    "test:annotation-mode-cycle": "node scripts/test_annotation_mode_cycle.js",
     "test:position-resource": "node scripts/test_position_resource.js",
     "test:point-resource": "node scripts/test_point_resource.js",
     "test:asset-swap-picker": "node scripts/test_asset_swap_picker.js",

From e12551d7c8aa492e925045f153d2f4b4143bb5d4 Mon Sep 17 00:00:00 2001
From: AliceJump <2630923991@qq.com>
Date: Tue, 6 Oct 2026 22:38:59 +0800
Subject: [PATCH 3/6] test: cover annotation mode cycling shortcut

---
 scripts/test_annotation_mode_cycle.js | 91 +++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 scripts/test_annotation_mode_cycle.js

diff --git a/scripts/test_annotation_mode_cycle.js b/scripts/test_annotation_mode_cycle.js
new file mode 100644
index 0000000..c353552
--- /dev/null
+++ b/scripts/test_annotation_mode_cycle.js
@@ -0,0 +1,91 @@
+const fs = require('fs');
+const path = require('path');
+const assert = require('assert');
+const { JSDOM } = require('jsdom');
+
+const root = path.join(__dirname, '..');
+const indexPath = path.join(root, 'media', 'annotationPanel', 'index.html');
+const indexHtml = fs.readFileSync(indexPath, 'utf8');
+const inlineScripts = [...indexHtml.matchAll(/<script nonce="__CSP_NONCE__">([\s\S]*?)<\/script>/g)];
+const cycleScript = inlineScripts.find(match => match[1].includes('MODE_BUTTON_IDS'))?.[1];
+assert(cycleScript, 'annotation mode cycle script should remain embedded in the annotation panel resource');
+
+const dom = new JSDOM(`<!doctype html><body>
+  <div id="bboxModal"></div>
+  <button id="templateModeBtn" class="active"></button>
+  <button id="rectModeBtn"></button>
+  <button id="pointModeBtn"></button>
+</body>`, { runScripts: 'outside-only' });
+const { window } = dom;
+const { document } = window;
+const modeIds = ['templateModeBtn', 'rectModeBtn', 'pointModeBtn'];
+
+for (const id of modeIds) {
+  document.getElementById(id).addEventListener('click', () => {
+    for (const otherId of modeIds) document.getElementById(otherId).classList.remove('active');
+    document.getElementById(id).classList.add('active');
+  });
+}
+
+window.eval(cycleScript);
+
+function activeMode() {
+  return modeIds.find(id => document.getElementById(id).classList.contains('active'));
+}
+
+function configure(keybindings) {
+  window.dispatchEvent(new window.MessageEvent('message', {
+    data: { type: 'config', keybindings },
+  }));
+}
+
+function press(key, init = {}) {
+  const event = new window.KeyboardEvent('keydown', {
+    key,
+    code: key.length === 1 ? `Key${key.toUpperCase()}` : key,
+    bubbles: true,
+    cancelable: true,
+    ...init,
+  });
+  document.dispatchEvent(event);
+  return event;
+}
+
+configure({ cycleMode: 'm' });
+assert.strictEqual(activeMode(), 'templateModeBtn');
+press('m');
+assert.strictEqual(activeMode(), 'rectModeBtn', 'first cycle should move Template -> Box');
+press('m');
+assert.strictEqual(activeMode(), 'pointModeBtn', 'second cycle should move Box -> Point');
+press('m');
+assert.strictEqual(activeMode(), 'templateModeBtn', 'third cycle should wrap Point -> Template');
+
+let propagatedLegacyKeys = 0;
+document.addEventListener('keydown', event => {
+  if (['1', '2', '3', 'x'].includes(event.key)) propagatedLegacyKeys += 1;
+});
+press('1');
+assert.strictEqual(activeMode(), 'templateModeBtn', 'legacy number shortcuts must no longer switch modes');
+assert.strictEqual(propagatedLegacyKeys, 0, 'legacy mode shortcut must be consumed before the old app handler sees it');
+
+configure({ cycleMode: 'q', modeRect: 'x' });
+press('m');
+assert.strictEqual(activeMode(), 'templateModeBtn', 'previous cycle key must stop working after reconfiguration');
+press('q');
+assert.strictEqual(activeMode(), 'rectModeBtn', 'configured cycle key should switch modes');
+press('x');
+assert.strictEqual(activeMode(), 'rectModeBtn', 'persisted legacy per-mode bindings must not switch modes');
+assert.strictEqual(propagatedLegacyKeys, 0, 'persisted legacy per-mode bindings must also be consumed');
+
+document.getElementById('bboxModal').classList.add('visible');
+press('q');
+assert.strictEqual(activeMode(), 'rectModeBtn', 'mode switching must stay disabled while the edit dialog is open');
+
+const pkg = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'));
+const defaults = pkg.contributes.configuration.properties['okScriptToolkit.annotationKeybindings'].default;
+assert.strictEqual(defaults.cycleMode, 'm', 'default cycle shortcut should be M');
+assert(!Object.prototype.hasOwnProperty.call(defaults, 'modeTemplate'));
+assert(!Object.prototype.hasOwnProperty.call(defaults, 'modeRect'));
+assert(!Object.prototype.hasOwnProperty.call(defaults, 'modePoint'));
+
+console.log('annotation mode cycle shortcut tests passed');

From 58d43147a81fb9926c4eeeecaf2aea46b636daca Mon Sep 17 00:00:00 2001
From: AliceJump <2630923991@qq.com>
Date: Tue, 6 Oct 2026 22:51:56 +0800
Subject: [PATCH 4/6] fix: release legacy annotation mode shortcuts

---
 media/annotationPanel/index.html | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/media/annotationPanel/index.html b/media/annotationPanel/index.html
index 546dda7..d568420 100644
--- a/media/annotationPanel/index.html
+++ b/media/annotationPanel/index.html
@@ -89,7 +89,6 @@ <h3 id="bboxTitle">Bounding Box</h3>
     (() => {
       const MODE_BUTTON_IDS = ['templateModeBtn', 'rectModeBtn', 'pointModeBtn'];
       let cycleMode = 'm';
-      let legacyModeBindings = ['1', '2', '3'];
 
       function parseKeybinding(binding) {
         const parts = String(binding || '').toLowerCase().split('+').filter(Boolean);
@@ -123,12 +122,13 @@ <h3 id="bboxTitle">Bounding Box</h3>
         if (event.data?.type !== 'config' || !event.data.keybindings) return;
         const incoming = event.data.keybindings;
         if (typeof incoming.cycleMode === 'string') cycleMode = incoming.cycleMode;
-        legacyModeBindings = [
-          '1', '2', '3',
-          incoming.modeTemplate,
-          incoming.modeRect,
-          incoming.modePoint,
-        ].filter(binding => typeof binding === 'string' && binding.length > 0);
+        // This listener is registered before app.js. Blank the retired bindings on the
+        // shared config message so app.js cannot keep its historical 1/2/3 defaults or
+        // revive stale per-mode user settings. The released keys remain available to
+        // every other configurable command.
+        incoming.modeTemplate = '';
+        incoming.modeRect = '';
+        incoming.modePoint = '';
       });
 
       document.addEventListener('keydown', event => {
@@ -137,11 +137,6 @@ <h3 id="bboxTitle">Bounding Box</h3>
           event.preventDefault();
           event.stopImmediatePropagation();
           cycleAnnotationMode();
-          return;
-        }
-        if (legacyModeBindings.some(binding => matchesKeybinding(event, binding))) {
-          event.preventDefault();
-          event.stopImmediatePropagation();
         }
       }, true);
     })();

From 32c0735378e0536d54853cc5497969f37b1c6ecc Mon Sep 17 00:00:00 2001
From: AliceJump <2630923991@qq.com>
Date: Tue, 6 Oct 2026 22:52:32 +0800
Subject: [PATCH 5/6] test: allow reused legacy annotation shortcut keys

---
 scripts/test_annotation_mode_cycle.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/scripts/test_annotation_mode_cycle.js b/scripts/test_annotation_mode_cycle.js
index c353552..d2bcafb 100644
--- a/scripts/test_annotation_mode_cycle.js
+++ b/scripts/test_annotation_mode_cycle.js
@@ -51,7 +51,11 @@ function press(key, init = {}) {
   return event;
 }
 
-configure({ cycleMode: 'm' });
+const defaultConfig = { cycleMode: 'm' };
+configure(defaultConfig);
+assert.strictEqual(defaultConfig.modeTemplate, '', 'retired Template binding should be blanked before app.js receives config');
+assert.strictEqual(defaultConfig.modeRect, '', 'retired Box binding should be blanked before app.js receives config');
+assert.strictEqual(defaultConfig.modePoint, '', 'retired Point binding should be blanked before app.js receives config');
 assert.strictEqual(activeMode(), 'templateModeBtn');
 press('m');
 assert.strictEqual(activeMode(), 'rectModeBtn', 'first cycle should move Template -> Box');
@@ -60,22 +64,30 @@ assert.strictEqual(activeMode(), 'pointModeBtn', 'second cycle should move Box -
 press('m');
 assert.strictEqual(activeMode(), 'templateModeBtn', 'third cycle should wrap Point -> Template');
 
-let propagatedLegacyKeys = 0;
+let releasedKeyEvents = 0;
 document.addEventListener('keydown', event => {
-  if (['1', '2', '3', 'x'].includes(event.key)) propagatedLegacyKeys += 1;
+  if (['1', '2', '3', 'x'].includes(event.key)) releasedKeyEvents += 1;
 });
 press('1');
 assert.strictEqual(activeMode(), 'templateModeBtn', 'legacy number shortcuts must no longer switch modes');
-assert.strictEqual(propagatedLegacyKeys, 0, 'legacy mode shortcut must be consumed before the old app handler sees it');
+assert.strictEqual(releasedKeyEvents, 1, 'released number shortcut must remain available to other commands');
 
-configure({ cycleMode: 'q', modeRect: 'x' });
+const customConfig = { cycleMode: 'q', modeTemplate: '3', modeRect: 'x', modePoint: '2', nextImage: '1' };
+configure(customConfig);
+assert.strictEqual(customConfig.modeTemplate, '', 'persisted Template shortcut must be retired');
+assert.strictEqual(customConfig.modeRect, '', 'persisted Box shortcut must be retired');
+assert.strictEqual(customConfig.modePoint, '', 'persisted Point shortcut must be retired');
+assert.strictEqual(customConfig.nextImage, '1', 'unrelated shortcut reuse must be preserved');
 press('m');
 assert.strictEqual(activeMode(), 'templateModeBtn', 'previous cycle key must stop working after reconfiguration');
 press('q');
 assert.strictEqual(activeMode(), 'rectModeBtn', 'configured cycle key should switch modes');
 press('x');
-assert.strictEqual(activeMode(), 'rectModeBtn', 'persisted legacy per-mode bindings must not switch modes');
-assert.strictEqual(propagatedLegacyKeys, 0, 'persisted legacy per-mode bindings must also be consumed');
+assert.strictEqual(activeMode(), 'rectModeBtn', 'persisted legacy per-mode binding must not switch modes');
+assert.strictEqual(releasedKeyEvents, 2, 'retired custom shortcut must remain available to other commands');
+press('1');
+assert.strictEqual(activeMode(), 'rectModeBtn', 'reused legacy number key must not switch annotation mode');
+assert.strictEqual(releasedKeyEvents, 3, 'reused number key must propagate to the configured command handler');
 
 document.getElementById('bboxModal').classList.add('visible');
 press('q');

From 1d2edf775da35ed89fbe133c4cd21232abe79d3d Mon Sep 17 00:00:00 2001
From: AliceJump <2630923991@qq.com>
Date: Wed, 7 Oct 2026 00:25:13 +0800
Subject: [PATCH 6/6] chore: align JetBrains annotation shortcut behavior

---
 jetbrains | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetbrains b/jetbrains
index 8830e7c..f42e1cf 160000
--- a/jetbrains
+++ b/jetbrains
@@ -1 +1 @@
-Subproject commit 8830e7c7e6c9139578c2d37403f4c69fa899ef8e
+Subproject commit f42e1cf676c5c18e7a6990fed7d84ff4b41ae3cc