@@ -1,4 +1,5 @@
1-import { cel, HStack, Text, TextInput, VStack } from "@cel-tui/core";
1+import { Select, type SelectInstance } from "@cel-tui/components";
2+import { cel, HStack, Text, VStack } from "@cel-tui/core";
23 import type { Message, ThinkingLevel } from "@earendil-works/pi-ai";
34 import { getOAuthProviders } from "@earendil-works/pi-ai/oauth";
45 import { saveSettings } from "./args";
@@ -8,171 +9,26 @@ import { listSessionsForCwd } from "./session";
89 import { estimateContextTokens, formatTimestamp } from "./shared";
910 import { getTUITheme, TUI_THEME_IDS } from "./themes";
1011 import { TextPill, theme } from "./tui-components";
11-import type { SelectOptions, SelectState, Session, TUIState } from "./types";
12-
13-export function SelectOverlay(
14- value: string,
15- selected: string,
16- list: { label: string; value: string }[],
17- label: string,
18- onOverlayKeyPress: (key: string) => boolean | undefined,
19- onChange: (newValue: string) => void,
20- onKeyPress: (key: string) => boolean | undefined,
21-) {
22- return VStack(
23- {
24- height: "100%",
25- justifyContent: "end",
26- onKeyPress: onOverlayKeyPress,
27- },
28- [
29- VStack(
30- {
31- bgColor: theme.white,
32- fgColor: theme.bblack,
33- gap: 1,
34- padding: { x: 1, y: 1 },
35- },
36- [
37- VStack(
38- { flex: 1, minHeight: 5, maxHeight: 20, padding: { x: 1 } },
39- list.map((i) =>
40- i.value === selected
41- ? Text(i.label, { fgColor: theme.black })
42- : Text(i.label, { fgColor: theme.bblack }),
43- ),
44- ),
45-
46- HStack({ width: "100%" }, [
47- TextPill(label, theme.bwhite, theme.bblack),
48- ]),
49-
50- TextInput({
51- stateKey: "menu-filter-input",
52- value,
53- minHeight: 3,
54- maxHeight: 10,
55- padding: { x: 1 },
56- placeholder: Text("Search...", {
57- fgColor: theme.bblack,
58- italic: true,
59- }),
60- fgColor: theme.bblack,
61- bgColor: theme.white,
62- onChange,
63- onKeyPress,
64- autoFocus: true,
65- }),
66- ],
67- ),
68- ],
69- );
70-}
71-
72-export function useSelectOverlay(initialOptions: SelectOptions) {
73- // Inner state
74- const s: SelectState = {
75- value: "",
76- selected: "",
77- label: "SELECT",
78- list: [],
79- };
80- let baseList: SelectOptions["list"] = [];
81-
82- const applyOptions = (
83- options: Pick<SelectOptions, "filter" | "label" | "list">,
84- ) => {
85- baseList = options.list;
86- s.value = options.filter ?? "";
87- s.label = options.label ? options.label.toUpperCase() : "SELECT";
88- s.list = s.value
89- ? baseList.filter((i) => i.label.includes(s.value))
90- : baseList;
91- s.selected = s.list.length ? s.list[0].value : "";
92- };
93-
94- applyOptions(initialOptions);
95-
96- const onChange = (newValue: string) => {
97- s.value = newValue;
98- s.list = s.value
99- ? baseList.filter((i) => i.label.includes(s.value))
100- : baseList;
101- s.selected = s.list.length ? s.list[0].value : "";
102- };
103-
104- const moveSelected = (direction: -1 | 1) => {
105- if (!s.list.length) return;
106-
107- const currentIndex = s.list.findIndex((i) => i.value === s.selected);
108- const nextIndex =
109- currentIndex === -1
110- ? direction === 1
111- ? 0
112- : s.list.length - 1
113- : (currentIndex + direction + s.list.length) % s.list.length;
114-
115- s.selected = s.list[nextIndex].value;
116- };
117-
118- const onMoveKeyPress = (key: string) => {
119- if (key !== "up" && key !== "down") return;
120-
121- moveSelected(key === "up" ? -1 : 1);
122- return false;
123- };
124-
125- const onEditorKeyPress = (key: string) => {
126- const didMove = onMoveKeyPress(key);
127- if (didMove === false) return false;
128-
129- if (key === "enter") {
130- const previousList = s.list;
131- const previousBaseList = baseList;
132- const applySelectionResult = () => {
133- if (s.list !== previousList) {
134- baseList = s.list;
135- } else {
136- s.list = previousBaseList;
137- s.selected = s.list.length ? s.list[0].value : "";
138- }
139- };
140-
141- s.value = "";
142- const result = initialOptions.onSelect(s);
143- if (result instanceof Promise) {
144- result.then(applySelectionResult).catch(() => {
145- s.list = previousBaseList;
146- s.selected = s.list.length ? s.list[0].value : "";
147- });
148- } else {
149- applySelectionResult();
150- }
151- return false;
152- }
153- };
154-
155- const onOverlayKeyPress = (key: string) => {
156- const didMove = onMoveKeyPress(key);
157- if (didMove === false) return false;
158-
159- if (key === "escape" || key === "ctrl+p") {
160- applyOptions(initialOptions);
161- initialOptions.onCancel();
162- }
163- return false;
164- };
165-
166- return () =>
167- SelectOverlay(
168- s.value,
169- s.selected,
170- s.list,
171- s.label,
172- onOverlayKeyPress,
173- onChange,
174- onEditorKeyPress,
175- );
12+import type { Session, TUIState } from "./types";
13+
14+function SelectOverlay(label: string, select: SelectInstance) {
15+ return VStack({ height: "100%", justifyContent: "end" }, [
16+ VStack(
17+ {
18+ width: "100%",
19+ bgColor: theme.white,
20+ fgColor: theme.bblack,
21+ gap: 1,
22+ padding: { x: 1, y: 1 },
23+ },
24+ [
25+ HStack({ width: "100%" }, [
26+ TextPill(label.toUpperCase(), theme.bwhite, theme.bblack),
27+ ]),
28+ select(),
29+ ],
30+ ),
31+ ]);
17632 }
17733
17834 function cleanSnippet(text: string): string {
@@ -268,7 +124,11 @@ function forkMessages(messages: Message[], selectedIndex: number): Message[] {
268124 }
269125
270126 export function mainMenu(state: TUIState, initialPane = "main") {
271- type MenuPane = Omit<SelectOptions, "onCancel" | "onSelect">;
127+ type MenuPane = {
128+ label: string;
129+ filter: string;
130+ list: { label: string; value: string }[];
131+ };
272132
273133 const oauthProviders = getOAuthProviders();
274134 const getProviderLabel = (provider: string) =>
@@ -361,28 +221,27 @@ export function mainMenu(state: TUIState, initialPane = "main") {
361221 const panes: MenuPane[] = [effortPane, themesPane()];
362222 let currentPane = initialPane === "fork" ? forkPane() : mainPane;
363223 let selectedProvider: string | undefined;
224+ let select: SelectInstance;
364225
365- const openPane = (s: SelectState, pane: MenuPane) => {
226+ const openPane = (pane: MenuPane) => {
366227 currentPane = pane;
367- s.value = pane.filter;
368- s.label = pane.label ? pane.label.toUpperCase() : "SELECT";
369- s.list = pane.list;
370- s.selected = s.list.length ? s.list[0].value : "";
228+ select.update({
229+ items: pane.list,
230+ query: pane.filter,
231+ cursor: pane.filter.length,
232+ highlightIndex: 0,
233+ });
371234 };
372235
373- const resetMenu = (s: SelectState) => {
236+ const resetMenu = () => {
374237 currentPane = mainPane;
375238 selectedProvider = undefined;
376239 currentProviders = [];
377240 currentSessions = [];
378- s.value = "";
379- s.label = mainPane.label ? mainPane.label.toUpperCase() : "SELECT";
380- s.list = mainPane.list;
381- s.selected = s.list.length ? s.list[0].value : "";
382241 };
383242
384- const closeMenu = (s: SelectState) => {
385- resetMenu(s);
243+ const closeMenu = () => {
244+ resetMenu();
386245 state.overlay = false;
387246 };
388247
@@ -441,36 +300,53 @@ export function mainMenu(state: TUIState, initialPane = "main") {
441300 }
442301 };
443302
444- const select = useSelectOverlay({
445- ...currentPane,
446- onSelect: (s) => {
447- if (!s.selected) return;
448-
303+ select = Select({
304+ items: currentPane.list,
305+ initialQuery: currentPane.filter,
306+ stateKey: "menu-filter-input",
307+ maxVisible: 20,
308+ searchLabel: "",
309+ placeholder: "Search...",
310+ highlightColor: theme.black,
311+ fgColor: theme.bblack,
312+ bgColor: theme.white,
313+ autoFocus: true,
314+ filter: (items, query) =>
315+ query ? items.filter((item) => item.filterText.includes(query)) : items,
316+ renderRow: (item, { highlighted }) =>
317+ Text(item.label, {
318+ fgColor: highlighted ? theme.black : theme.bblack,
319+ }),
320+ onSelect: (selected) => {
449321 if (currentPane.label === "main") {
450- if (s.selected === "providers") {
451- return providersPane().then((pane) => {
452- openPane(s, pane);
453- });
322+ if (selected === "providers") {
323+ select.update({ query: "", cursor: 0, highlightIndex: 0 });
324+ void providersPane()
325+ .then(openPane)
326+ .catch(() => openPane(mainPane));
327+ return;
454328 }
455329
456- if (s.selected === "sessions") {
457- return sessionsPane().then((pane) => {
458- openPane(s, pane);
459- });
330+ if (selected === "sessions") {
331+ select.update({ query: "", cursor: 0, highlightIndex: 0 });
332+ void sessionsPane()
333+ .then(openPane)
334+ .catch(() => openPane(mainPane));
335+ return;
460336 }
461337
462- if (s.selected === "fork") {
463- openPane(s, forkPane());
338+ if (selected === "fork") {
339+ openPane(forkPane());
464340 return;
465341 }
466342
467- const nextPane = panes.find((pane) => pane.label === s.selected);
468- if (nextPane) openPane(s, nextPane);
343+ const nextPane = panes.find((pane) => pane.label === selected);
344+ if (nextPane) openPane(nextPane);
469345 return;
470346 }
471347
472348 if (currentPane.label === "sessions") {
473- const session = currentSessions.find((v) => v.id === s.selected);
349+ const session = currentSessions.find((v) => v.id === selected);
474350 if (!session) return;
475351
476352 state.sessionId = session.id;
@@ -482,12 +358,12 @@ export function mainMenu(state: TUIState, initialPane = "main") {
482358 state.contextSize = estimateContextTokens(state.messages);
483359 state.scrollOffset = 0;
484360 state.stickToBottom = true;
485- closeMenu(s);
361+ closeMenu();
486362 return;
487363 }
488364
489365 if (currentPane.label === "fork") {
490- const selectedIndex = Number(s.selected);
366+ const selectedIndex = Number(selected);
491367 if (
492368 !Number.isInteger(selectedIndex) ||
493369 !state.messages[selectedIndex]
@@ -504,12 +380,12 @@ export function mainMenu(state: TUIState, initialPane = "main") {
504380 state.contextSize = estimateContextTokens(state.messages);
505381 state.scrollOffset = 0;
506382 state.stickToBottom = true;
507- closeMenu(s);
383+ closeMenu();
508384 return;
509385 }
510386
511387 if (currentPane.label === "themes") {
512- const nextTheme = TUI_THEME_IDS.find((id) => id === s.selected);
388+ const nextTheme = TUI_THEME_IDS.find((id) => id === selected);
513389 if (!nextTheme) return;
514390
515391 state.options.theme = nextTheme;
@@ -521,16 +397,16 @@ export function mainMenu(state: TUIState, initialPane = "main") {
521397 customProviders: state.options.customProviders,
522398 theme: nextTheme,
523399 });
524- closeMenu(s);
400+ closeMenu();
525401 return;
526402 }
527403
528404 if (currentPane.label === "providers") {
529- const provider = currentProviders.find((v) => v === s.selected);
405+ const provider = currentProviders.find((v) => v === selected);
530406 if (!provider) return;
531407
532408 selectedProvider = provider;
533- openPane(s, {
409+ openPane({
534410 label: "models",
535411 filter: "",
536412 list: getProviderModelOptions(selectedProvider),
@@ -542,7 +418,7 @@ export function mainMenu(state: TUIState, initialPane = "main") {
542418 if (!selectedProvider) return;
543419
544420 const model = findModelConfig(
545- s.selected,
421+ selected,
546422 selectedProvider,
547423 state.options.customProviders,
548424 );
@@ -557,12 +433,12 @@ export function mainMenu(state: TUIState, initialPane = "main") {
557433 customProviders: state.options.customProviders,
558434 theme: state.options.theme,
559435 });
560- closeMenu(s);
436+ closeMenu();
561437 return;
562438 }
563439
564440 if (currentPane.label === "effort") {
565- const effort = reasoningEfforts.find((v) => v === s.selected);
441+ const effort = reasoningEfforts.find((v) => v === selected);
566442 if (!effort) return;
567443
568444 state.options.effort = effort;
@@ -573,17 +449,23 @@ export function mainMenu(state: TUIState, initialPane = "main") {
573449 customProviders: state.options.customProviders,
574450 theme: state.options.theme,
575451 });
576- closeMenu(s);
452+ closeMenu();
577453 }
578454 },
579455 onCancel: () => {
580- currentPane = mainPane;
581- selectedProvider = undefined;
582- currentProviders = [];
583- currentSessions = [];
456+ resetMenu();
584457 state.overlay = false;
585458 },
459+ onKeyPress: (key) => {
460+ if (key === "ctrl+p") {
461+ resetMenu();
462+ state.overlay = false;
463+ return;
464+ }
465+
466+ return false;
467+ },
586468 });
587469
588- return select;
470+ return () => SelectOverlay(currentPane.label, select);
589471 }