feat(maestro): serve the configured leader to the web client
The TUI read its leader from `[tui].leader`; the web used `DEFAULT_LEADER`, a module constant. Rebinding one left the other on `ctrl-a`, so the two escape hatches hanging off the leader (`leader ctrl-k`, `leader leader`) moved on one client and not the other. `GET /api/info` now carries `leader`. The web binds that when it arrives and rebuilds the leader-owning `CommandSet`, so the `?` overlay and the command bar render the configured chord; an absent or empty field — an older daemon, or an unreachable `/api/info` — leaves it on `ctrl-a`. Chose the existing `[tui].leader` served as-is over a new shared key: one knob, no precedence rules between two spellings, and no migration for operators who already set it. The name is a wart — it is the leader for every client now, not the TUI's — and `docs/COMMAND-BAR.md` and `docs/INSTALL.md` say so.
This commit is contained in:
+54
-28
@@ -87,9 +87,15 @@ const store = new CatalogStore();
|
||||
// Absolute paths are a fine fallback until it lands.
|
||||
let homeDir: string | undefined;
|
||||
void getDaemonInfo()
|
||||
.then((info) => (homeDir = info.home_dir))
|
||||
.then((info) => {
|
||||
homeDir = info.home_dir;
|
||||
// The leader is the operator's, not this module's (#159): a daemon that
|
||||
// names one rebinds the chords hanging off it, and the `?` overlay and the
|
||||
// command bar re-render from the rebuilt set.
|
||||
if (info.leader) useLeader(info.leader);
|
||||
})
|
||||
.catch(() => {
|
||||
/* absolute paths are a fine fallback */
|
||||
/* absolute paths and the default leader are fine fallbacks */
|
||||
});
|
||||
|
||||
// The daemon's identity and liveness: names the release in the sidebar's status
|
||||
@@ -439,32 +445,52 @@ const spawnKeys = new CommandSet(
|
||||
// terminal owns every plain keystroke, so nothing unmodified could ever get
|
||||
// the focus back out of it.
|
||||
//
|
||||
// This set also owns the leader (`ctrl-a`, the TUI's default): it holds the
|
||||
// key as a partial chord and takes select-all off it, so the escape hatch
|
||||
// docs/COMMAND-BAR.md describes has somewhere to land (#149).
|
||||
const focusKeys = new CommandSet(
|
||||
defineCommands({
|
||||
"focus.toggle": () => {
|
||||
if (sidebar.hasListFocus()) {
|
||||
pool.focusTerminal();
|
||||
} else {
|
||||
drawer.open(); // no-op on desktop; on mobile the list is off-canvas
|
||||
sidebar.focusList();
|
||||
}
|
||||
},
|
||||
// The escape hatch: binding ctrl-k takes readline's kill-to-end-of-line
|
||||
// away from every pane, and leader ctrl-k gives it back as the literal
|
||||
// 0x0B byte (docs/COMMAND-BAR.md). It resolves in this set, ahead of the
|
||||
// bar's, so the chord never opens the bar.
|
||||
"pane.literalCtrlK": () => pool.sendToFocused("\x0b"),
|
||||
// The leader itself, pressed twice, tmux-style: sends one literal leader
|
||||
// byte and clears the pending chord instead of resolving as a dead chord
|
||||
// (docs/COMMAND-BAR.md, #158). Built from `DEFAULT_LEADER`, not a
|
||||
// hardcoded byte, so a different leader would send its own.
|
||||
"pane.literalLeader": () => pool.sendToFocused(controlByte(DEFAULT_LEADER)),
|
||||
}),
|
||||
{ leader: DEFAULT_LEADER },
|
||||
);
|
||||
// This set also owns the leader (`[tui].leader`, `ctrl-a` by default, served
|
||||
// on `/api/info`): it holds the key as a partial chord and takes select-all off
|
||||
// it, so the escape hatch docs/COMMAND-BAR.md describes has somewhere to land
|
||||
// (#149).
|
||||
let currentLeader = DEFAULT_LEADER;
|
||||
|
||||
function buildFocusKeys(leader: string): CommandSet {
|
||||
return new CommandSet(
|
||||
defineCommands(
|
||||
{
|
||||
"focus.toggle": () => {
|
||||
if (sidebar.hasListFocus()) {
|
||||
pool.focusTerminal();
|
||||
} else {
|
||||
drawer.open(); // no-op on desktop; on mobile the list is off-canvas
|
||||
sidebar.focusList();
|
||||
}
|
||||
},
|
||||
// The escape hatch: binding ctrl-k takes readline's
|
||||
// kill-to-end-of-line away from every pane, and leader ctrl-k gives it
|
||||
// back as the literal 0x0B byte (docs/COMMAND-BAR.md). It resolves in
|
||||
// this set, ahead of the bar's, so the chord never opens the bar.
|
||||
"pane.literalCtrlK": () => pool.sendToFocused("\x0b"),
|
||||
// The leader itself, pressed twice, tmux-style: sends one literal
|
||||
// leader byte and clears the pending chord instead of resolving as a
|
||||
// dead chord (docs/COMMAND-BAR.md, #158). Built from the leader, not a
|
||||
// hardcoded byte, so a rebound leader sends its own.
|
||||
"pane.literalLeader": () => pool.sendToFocused(controlByte(leader)),
|
||||
},
|
||||
leader,
|
||||
),
|
||||
{ leader },
|
||||
);
|
||||
}
|
||||
|
||||
let focusKeys = buildFocusKeys(DEFAULT_LEADER);
|
||||
|
||||
/** Rebind the leader-owning set to the daemon's leader. Re-registering the
|
||||
* same command ids replaces them, so the help overlay and the command bar —
|
||||
* both of which render the published registry when they open — show the
|
||||
* configured chord rather than the default. */
|
||||
function useLeader(leader: string): void {
|
||||
if (leader === currentLeader) return;
|
||||
currentLeader = leader;
|
||||
focusKeys = buildFocusKeys(leader);
|
||||
}
|
||||
|
||||
// Ctrl+K opens the command bar (docs/COMMAND-BAR.md). It is a registry command
|
||||
// like any other, so the `?` overlay lists it without a second list.
|
||||
|
||||
Reference in New Issue
Block a user