99dfbbde58
* feat(plugins): add keybindings and modal window capabilities
Add two independent plugin UI capabilities.
Keybindings: plugins declare keybindings in the manifest under
ui.keybindings ({id, default, description}), validated backend-side
(combo grammar + unique ids, requires a UI bundle) and exposed to the
frontend. Plugin JS binds a handler via registry.registerKeybinding(id,
handler); a global dispatcher fires it. Combos are user-overridable in
Settings > Keyboard Shortcuts (namespaced plugin:{pluginId}:{id}) with
conflict detection against core and other plugins.
Modals: host.openModal({title?, content, size?, dismissible?}) returns a
{ close() } handle and renders in a single host-owned Dialog isolated by
PluginErrorBoundary, cleaned up on plugin unload.
Fixture plugin, PLUGIN-API.md / spec, and a Playwright e2e demonstrate a
keybinding handler opening a modal.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* fix(plugins): address review feedback on keybinding dispatch and validation
Core shortcuts now take precedence over plugin keybindings on a colliding
combo (defaultPrevented cooperation between the two capture-phase
dispatchers), a throwing plugin handler no longer aborts dispatch to other
plugins, and the keybinding combo grammar is tightened: the backend validator
and frontend parser both drop the undocumented control/super modifier
aliases and reject shift+digit/symbol combos that can never actually fire
(KeyboardEvent.key reports the shifted character, not the token).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* fix(plugins): stop conflicting core shortcut from double-firing with plugin keybindings
The earlier defaultPrevented guard only covered the central useAppShortcuts
dispatcher. Per-component core shortcuts registered via useKeyboardShortcut
run in the bubble phase, after the capture-phase plugin keybinding dispatcher,
so a plugin-handled-and-prevented combo still triggered the core action too.
Guard useKeyboardShortcut (and use-editor-keybinds, another capture-phase core
listener) on event.defaultPrevented so exactly one action fires per combo.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* fix(plugins): make core shortcuts always win over plugin keybindings
Panel-search, task-switcher, and other core listeners never checked
event.defaultPrevented, so a plugin bound to the same combo (e.g. Cmd/Ctrl+F)
could still fire alongside them. Instead of patching every core listener,
usePluginShortcuts now computes the set of effective core shortcut combos
(registry, resolved through user overrides, plus FIND_IN_PANEL/SAVE) and
skips invoking any plugin handler whose combo is in that set, so the
matching core listener always handles the event exactly once.
Also adds a hook-level regression test for useEditorKeybinds' existing
defaultPrevented guard, and fixes a leaked capture-phase window listener in
use-keyboard-shortcut.test.ts that could bleed into later tests.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* fix(web): keep Cmd+K closing the command panel after shortcut-precedence guard
cmdk's built-in vim bindings intercept Ctrl/Cmd+K and +P as list-navigation
shortcuts and call preventDefault() before the event reaches our window-level
useKeyboardShortcut listeners. Once that hook started bailing on
event.defaultPrevented (added to fix core/plugin shortcut double-firing), the
palette's own Cmd+K close/reopen toggle got silently suppressed whenever focus
was inside the open panel. Disable cmdk's vim bindings on the command palette
so its Ctrl/Cmd+K and +P always reach the app-level toggle.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* docs(plugins): document keybindings and modal window plugin APIs
Fill in the public author-facing docs that the internal plugin-keybindings
and modal-window contract (PLUGIN-API.md, spec.md) already covers: the
registry.registerKeybinding / host.openModal JS surface, the ui.keybindings
manifest field with its combo grammar, and a capability mention on the
Plugins overview page.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Kandev Agent <agent@kandev.dev>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
110 lines
4.1 KiB
TypeScript
110 lines
4.1 KiB
TypeScript
/**
|
|
* Dynamic layer over `CONFIGURABLE_SHORTCUTS`: builds the same
|
|
* label/default shape for plugin-declared keybindings (`ui.keybindings` on a
|
|
* `PluginRecord`), so Settings > Keyboard Shortcuts can render and
|
|
* user-override plugin shortcuts alongside the static core list without
|
|
* widening `ConfigurableShortcutId` to an open string type.
|
|
*
|
|
* Namespacing: a plugin keybinding's effective override id is
|
|
* `plugin:{pluginId}:{keybindingId}` — this is what gets stored under
|
|
* `userSettings.keyboardShortcuts` (the same `StoredShortcutOverrides` map
|
|
* core shortcuts already use).
|
|
*/
|
|
import type { PluginRecord } from "@/lib/types/plugins";
|
|
import type { KeyboardShortcut } from "./constants";
|
|
import { parseCombo } from "./parse-combo";
|
|
import {
|
|
CONFIGURABLE_SHORTCUTS,
|
|
type ConfigurableShortcutId,
|
|
type StoredShortcutOverrides,
|
|
} from "./shortcut-overrides";
|
|
|
|
/** Prefix marking a namespaced id as belonging to a plugin, not core. */
|
|
export const PLUGIN_SHORTCUT_PREFIX = "plugin:";
|
|
|
|
export function pluginShortcutId(pluginId: string, keybindingId: string): string {
|
|
return `${PLUGIN_SHORTCUT_PREFIX}${pluginId}:${keybindingId}`;
|
|
}
|
|
|
|
/** One configurable shortcut entry, from either the core static list or a plugin manifest. */
|
|
export type ShortcutEntry =
|
|
| { source: "core"; id: ConfigurableShortcutId; label: string; default: KeyboardShortcut }
|
|
| {
|
|
source: "plugin";
|
|
id: string;
|
|
label: string;
|
|
default: KeyboardShortcut;
|
|
pluginId: string;
|
|
keybindingId: string;
|
|
};
|
|
|
|
/**
|
|
* The static core shortcuts, in `ShortcutEntry` shape — exported so callers
|
|
* that already hold a `ShortcutEntry[]` for plugins (e.g.
|
|
* `KeyboardShortcutsCard`, which receives plugin entries as a prop rather
|
|
* than raw `PluginRecord[]`) can merge core + plugin entries without
|
|
* re-deriving the core list themselves.
|
|
*/
|
|
export function coreShortcutEntries(): ShortcutEntry[] {
|
|
return (Object.keys(CONFIGURABLE_SHORTCUTS) as ConfigurableShortcutId[]).map((id) => ({
|
|
source: "core",
|
|
id,
|
|
label: CONFIGURABLE_SHORTCUTS[id].label,
|
|
default: CONFIGURABLE_SHORTCUTS[id].default,
|
|
}));
|
|
}
|
|
|
|
/**
|
|
* Builds the plugin-sourced configurable shortcut entries for every active
|
|
* plugin's declared `ui.keybindings`. A combo that fails to parse (should
|
|
* never happen — the backend validates manifests at registration) is
|
|
* skipped with a console warning rather than throwing.
|
|
*/
|
|
function buildPluginEntries(plugins: PluginRecord[]): ShortcutEntry[] {
|
|
const entries: ShortcutEntry[] = [];
|
|
for (const plugin of plugins) {
|
|
for (const keybinding of plugin.ui?.keybindings ?? []) {
|
|
const shortcut = parseCombo(keybinding.default);
|
|
if (!shortcut) {
|
|
console.warn(
|
|
`[plugins] "${plugin.id}" keybinding "${keybinding.id}" has an unparseable default combo "${keybinding.default}"`,
|
|
);
|
|
continue;
|
|
}
|
|
entries.push({
|
|
source: "plugin",
|
|
id: pluginShortcutId(plugin.id, keybinding.id),
|
|
label: `${plugin.display_name}: ${keybinding.description}`,
|
|
default: shortcut,
|
|
pluginId: plugin.id,
|
|
keybindingId: keybinding.id,
|
|
});
|
|
}
|
|
}
|
|
return entries;
|
|
}
|
|
|
|
/**
|
|
* The full list of configurable shortcuts — core (static) entries followed
|
|
* by plugin (dynamic) entries — for rendering in Settings > Keyboard
|
|
* Shortcuts. Core behavior/order is unchanged from `CONFIGURABLE_SHORTCUTS`.
|
|
*/
|
|
export function buildConfigurableShortcutEntries(plugins: PluginRecord[]): ShortcutEntry[] {
|
|
return [...coreShortcutEntries(), ...buildPluginEntries(plugins)];
|
|
}
|
|
|
|
/** Builds only the plugin-sourced entries — used by callers that already have core entries. */
|
|
export function buildPluginShortcutEntries(plugins: PluginRecord[]): ShortcutEntry[] {
|
|
return buildPluginEntries(plugins);
|
|
}
|
|
|
|
/** Resolves an entry's effective shortcut: the user override if set, else its default. */
|
|
export function resolveShortcutEntry(
|
|
entry: ShortcutEntry,
|
|
overrides?: StoredShortcutOverrides,
|
|
): KeyboardShortcut {
|
|
const override = overrides?.[entry.id];
|
|
if (override) return override as KeyboardShortcut;
|
|
return entry.default;
|
|
}
|