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
3.3 KiB
TypeScript
110 lines
3.3 KiB
TypeScript
import { describe, it, expect, vi, afterEach } from "vitest";
|
|
import type { PluginRecord } from "@/lib/types/plugins";
|
|
import {
|
|
buildConfigurableShortcutEntries,
|
|
pluginShortcutId,
|
|
resolveShortcutEntry,
|
|
type ShortcutEntry,
|
|
} from "./plugin-shortcuts";
|
|
|
|
const PLUGIN_ID = "session-cost";
|
|
const KEYBINDING_ID = "toggle-panel";
|
|
const NAMESPACED_ID = pluginShortcutId(PLUGIN_ID, KEYBINDING_ID);
|
|
|
|
function makePlugin(overrides: Partial<PluginRecord> = {}): PluginRecord {
|
|
return {
|
|
id: PLUGIN_ID,
|
|
api_version: 1,
|
|
version: "1.0.0",
|
|
display_name: "Session Cost",
|
|
description: "",
|
|
author: "",
|
|
categories: [],
|
|
capabilities: {},
|
|
status: "active",
|
|
install_path: "",
|
|
signed: true,
|
|
installed_at: "",
|
|
restart_count: 0,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function makeTogglePanelEntry(): ShortcutEntry {
|
|
return {
|
|
source: "plugin",
|
|
id: NAMESPACED_ID,
|
|
label: "Session Cost: Toggle panel",
|
|
default: { key: "k", modifiers: { ctrlOrCmd: true } },
|
|
pluginId: PLUGIN_ID,
|
|
keybindingId: KEYBINDING_ID,
|
|
};
|
|
}
|
|
|
|
describe("pluginShortcutId", () => {
|
|
it("namespaces the id with the plugin id", () => {
|
|
expect(pluginShortcutId(PLUGIN_ID, KEYBINDING_ID)).toBe(NAMESPACED_ID);
|
|
});
|
|
});
|
|
|
|
describe("buildConfigurableShortcutEntries", () => {
|
|
afterEach(() => {
|
|
vi.restoreAllMocks();
|
|
});
|
|
|
|
it("includes core entries followed by plugin entries", () => {
|
|
const plugin = makePlugin({
|
|
ui: {
|
|
keybindings: [{ id: KEYBINDING_ID, default: "mod+shift+k", description: "Toggle panel" }],
|
|
},
|
|
});
|
|
|
|
const entries = buildConfigurableShortcutEntries([plugin]);
|
|
const coreEntry = entries.find((e) => e.source === "core" && e.id === "SEARCH");
|
|
const pluginEntry = entries.find((e) => e.source === "plugin" && e.id === NAMESPACED_ID);
|
|
|
|
expect(coreEntry).toBeDefined();
|
|
expect(pluginEntry).toMatchObject({
|
|
source: "plugin",
|
|
id: NAMESPACED_ID,
|
|
label: "Session Cost: Toggle panel",
|
|
default: { key: "k", modifiers: { ctrlOrCmd: true, shift: true } },
|
|
pluginId: PLUGIN_ID,
|
|
keybindingId: KEYBINDING_ID,
|
|
});
|
|
});
|
|
|
|
it("skips a plugin with no declared keybindings", () => {
|
|
const plugin = makePlugin({ ui: { bundle: "ui/bundle.js" } });
|
|
const entries = buildConfigurableShortcutEntries([plugin]);
|
|
expect(entries.some((e) => e.source === "plugin")).toBe(false);
|
|
});
|
|
|
|
it("warns and skips a keybinding with an unparseable default combo", () => {
|
|
const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
|
|
const plugin = makePlugin({
|
|
ui: { keybindings: [{ id: "bad", default: "banana", description: "Bad" }] },
|
|
});
|
|
|
|
const entries = buildConfigurableShortcutEntries([plugin]);
|
|
|
|
expect(entries.some((e) => e.source === "plugin")).toBe(false);
|
|
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining("bad"));
|
|
});
|
|
});
|
|
|
|
describe("resolveShortcutEntry", () => {
|
|
it("returns the default when no override is set", () => {
|
|
const entry = makeTogglePanelEntry();
|
|
|
|
expect(resolveShortcutEntry(entry)).toEqual(entry.default);
|
|
});
|
|
|
|
it("returns the user override when set", () => {
|
|
const entry = makeTogglePanelEntry();
|
|
const override = { key: "j", modifiers: { shift: true } };
|
|
|
|
expect(resolveShortcutEntry(entry, { [entry.id]: override })).toEqual(override);
|
|
});
|
|
});
|