refactor: remove when from keybindings, fix import paths

Remove the when field from DevToolsCommandKeybinding type and the
keybinding-level when check from the shortcut listener. When clauses
are now only on commands and dock entries.

Fix import paths to use @vitejs/devtools-kit/utils/when subpath
export. Add utils/when to kit package.json exports map.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: antfu

packages/core/src/client/webcomponents/state/commands.ts

@@ -1,10 +1,10 @@
-import type { DevToolsClientCommand, DevToolsCommandEntry, DevToolsCommandKeybinding, DevToolsServerCommandEntry } from '@vitejs/devtools-kit'
+import type { DevToolsClientCommand, DevToolsCommandEntry, DevToolsCommandKeybinding, DevToolsServerCommandEntry, WhenContext } from '@vitejs/devtools-kit'
 import type { CommandsContext, DevToolsRpcClient } from '@vitejs/devtools-kit/client'
 import type { ShallowRef } from 'vue'
-import type { WhenContext } from './keybindings'
+import { evaluateWhen } from '@vitejs/devtools-kit/utils/when'
 import { computed, markRaw, reactive, ref } from 'vue'
 import { sharedStateToRef } from './docks'
-import { collectAllKeybindings, evaluateWhen, normalizeKeyEvent } from './keybindings'
+import { collectAllKeybindings, normalizeKeyEvent } from './keybindings'
 
 export { formatKeybinding, isMac, normalizeKeyEvent } from './keybindings'
 
@@ -162,12 +162,10 @@ function setupShortcutListener(
     for (const { id, keybinding } of allBindings) {
       if (keybinding.key !== pressed)
         continue
-      // Check keybinding-level when clause
-      if (keybinding.when && !evaluateWhen(keybinding.when, whenCtx))
-        continue
       // Check command-level when clause
-      const cmd = commands.value.find(c => c.id === id)
-        ?? commands.value.flatMap(c => c.children ?? []).find(c => c.id === id)
+      const cmd: DevToolsCommandEntry | undefined
+        = commands.value.find(c => c.id === id)
+          ?? commands.value.flatMap(c => c.children as DevToolsCommandEntry[] ?? []).find(c => c.id === id)
       if (cmd?.when && !evaluateWhen(cmd.when, whenCtx))
         continue
 

packages/core/src/client/webcomponents/state/keybindings.ts

@@ -2,7 +2,7 @@ import type { DevToolsCommandEntry, DevToolsCommandKeybinding } from '@vitejs/de
 
 // Re-export when utilities from kit
 export type { WhenContext } from '@vitejs/devtools-kit'
-export { evaluateWhen, getContextValue } from '@vitejs/devtools-kit'
+export { evaluateWhen, getContextValue } from '@vitejs/devtools-kit/utils/when'
 
 export const isMac = typeof navigator !== 'undefined' && /Mac|iPhone|iPad/.test(navigator.platform ?? '')
 

packages/kit/package.json

@@ -26,6 +26,7 @@
     "./utils/human-id": "./dist/utils/human-id.js",
     "./utils/nanoid": "./dist/utils/nanoid.js",
     "./utils/shared-state": "./dist/utils/shared-state.js",
+    "./utils/when": "./dist/utils/when.js",
     "./package.json": "./package.json"
   },
   "types": "./dist/index.d.mts",

packages/kit/src/types/commands.ts

@@ -9,12 +9,6 @@ export interface DevToolsCommandKeybinding {
    * Examples: "Mod+K", "Mod+Shift+P", "Alt+N"
    */
   key: string
-  /**
-   * Optional context expression for conditional activation.
-   * Examples: "clientType == embedded", "dockOpen", "!dockOpen"
-   * Supports: ==, !=, &&, ||, bare truthy, ! negation
-   */
-  when?: string
 }
 
 // --- Command Entry ---