getcompanion-ai/co-mono
1
0
Fork 0
mirror of https://github.com/getcompanion-ai/co-mono.git synced 2026-04-17 10:02:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(coding-agent): show hook shortcuts in /hotkeys command

Browse source
This commit is contained in:
Helmut Januschka 2026-01-03 15:34:19 +01:00
parent db312d2eed
commit f808047564
1 changed files with 23 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

67
packages/coding-agent/src/modes/interactive/interactive-mode.ts
View file

@ -10,7 +10,7 @@ import * as path from "node:path";
import Clipboard from "@crosscopy/clipboard"; import Clipboard from "@crosscopy/clipboard";
import type { AgentMessage } from "@mariozechner/pi-agent-core"; import type { AgentMessage } from "@mariozechner/pi-agent-core";
import type { AssistantMessage, Message, OAuthProvider } from "@mariozechner/pi-ai"; import type { AssistantMessage, Message, OAuthProvider } from "@mariozechner/pi-ai";
import type { SlashCommand } from "@mariozechner/pi-tui"; import type { KeyId, SlashCommand } from "@mariozechner/pi-tui";
import { import {
CombinedAutocompleteProvider, CombinedAutocompleteProvider,
type Component, type Component,
@ -19,6 +19,7 @@ import {
Input, Input,
Loader, Loader,
Markdown, Markdown,
matchesKey,
ProcessTerminal, ProcessTerminal,
Spacer, Spacer,
Text, Text,
@ -596,7 +597,8 @@ export class InteractiveMode {
// Set up the hook shortcut handler on the editor // Set up the hook shortcut handler on the editor
this.editor.onHookShortcut = (data: string) => { this.editor.onHookShortcut = (data: string) => {
for (const [shortcutStr, shortcut] of shortcuts) { for (const [shortcutStr, shortcut] of shortcuts) {
if (this.matchShortcut(data, shortcutStr)) { // Cast to KeyId - hook shortcuts use the same format
if (matchesKey(data, shortcutStr as KeyId)) {
// Run handler async, don't block input // Run handler async, don't block input
Promise.resolve(shortcut.handler(createContext())).catch((err) => { Promise.resolve(shortcut.handler(createContext())).catch((err) => {
this.showError(`Shortcut handler error: ${err instanceof Error ? err.message : String(err)}`); this.showError(`Shortcut handler error: ${err instanceof Error ? err.message : String(err)}`);
@ -608,47 +610,6 @@ export class InteractiveMode {
}; };
} }
/**
* Match a key input against a shortcut string like "shift+p" or "ctrl+shift+x".
*/
private matchShortcut(data: string, shortcut: string): boolean {
const parts = shortcut.toLowerCase().split("+");
const key = parts.pop() ?? "";
const modifiers = new Set(parts);
const hasShift = modifiers.has("shift");
const hasCtrl = modifiers.has("ctrl");
const hasAlt = modifiers.has("alt");
// Get the key codepoint
const keyCode = key.length === 1 ? key.charCodeAt(0) : 0;
if (keyCode === 0) return false;
// Calculate expected modifier bits for Kitty protocol
// Kitty modifier bits: 1=shift, 2=alt, 4=ctrl
let expectedMod = 0;
if (hasShift) expectedMod |= 1;
if (hasAlt) expectedMod |= 2;
if (hasCtrl) expectedMod |= 4;
// Try to match Kitty protocol: \x1b[<code>;<mod>u
// With modifier offset: mod in sequence = expectedMod + 1
const kittyPattern = new RegExp(`^\x1b\\[${keyCode};(\\d+)u$`);
const kittyMatch = data.match(kittyPattern);
if (kittyMatch) {
const actualMod = parseInt(kittyMatch[1], 10) - 1; // Subtract 1 for the offset
// Mask out lock bits (8=capslock, 16=numlock)
return (actualMod & 0x7) === expectedMod;
}
// Try uppercase letter for shift+letter (legacy terminals)
if (hasShift && !hasCtrl && !hasAlt && key.length === 1) {
return data === key.toUpperCase();
}
return false;
}
/** /**
* Set hook status text in the footer. * Set hook status text in the footer.
*/ */
@ -2493,7 +2454,7 @@ export class InteractiveMode {
const externalEditor = this.getAppKeyDisplay("externalEditor"); const externalEditor = this.getAppKeyDisplay("externalEditor");
const followUp = this.getAppKeyDisplay("followUp"); const followUp = this.getAppKeyDisplay("followUp");
const hotkeys = ` let hotkeys = `
**Navigation** **Navigation**
| Key | Action | | Key | Action |
|-----|--------| |-----|--------|
@ -2529,6 +2490,24 @@ export class InteractiveMode {
| \`/\` | Slash commands | | \`/\` | Slash commands |
| \`!\` | Run bash command | | \`!\` | Run bash command |
`; `;
// Add hook-registered shortcuts
const hookRunner = this.session.hookRunner;
if (hookRunner) {
const shortcuts = hookRunner.getShortcuts();
if (shortcuts.size > 0) {
hotkeys += `
**Hooks**
| Key | Action |
|-----|--------|
`;
for (const [key, shortcut] of shortcuts) {
const description = shortcut.description ?? shortcut.hookPath;
hotkeys += `| \`${key}\` | ${description} |\n`;
}
}
}
this.chatContainer.addChild(new Spacer(1)); this.chatContainer.addChild(new Spacer(1));
this.chatContainer.addChild(new DynamicBorder()); this.chatContainer.addChild(new DynamicBorder());
this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "Keyboard Shortcuts")), 1, 0)); this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "Keyboard Shortcuts")), 1, 0));