xonecas.io
64875
Mc

mini-coder / commit 15646cd

feat: menu system

xonecas2026-04-28 15646cdf8ab6b3802d7d113670ad6c350f2e23c2 parent 789e20b

4 files changed

src/prompt.ts+19−8
@@ -1,10 +1,10 @@
1+import { promises } from "node:fs";
12 import { readdir } from "node:fs/promises";
23 import { homedir, platform } from "node:os";
34 import { join } from "node:path";
45 import type { Message, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
56 import simpleGit, { type StatusResult } from "simple-git";
67 import { parseSkillFrontmatter } from "./shared";
7-import { promises } from "node:fs";
88
99 const IDENTITY_PROMPT = `# You are "mini-coder", an efficient, elite coding agent.
1010
@@ -68,16 +68,16 @@ export const TASK_PROMPT = `${IDENTITY_PROMPT}
6868 `;
6969
7070 async function getDir() {
71- const ignoreFile = Bun.file(".gitignore")
72- let ignoreContent = ""
71+ const ignoreFile = Bun.file(".gitignore");
72+ let ignoreContent = "";
7373 if (await ignoreFile.exists()) {
74- ignoreContent = await ignoreFile.text()
74+ ignoreContent = await ignoreFile.text();
7575 }
76- const ignored = ignoreContent.split("\n")
77- let dir = []
78- const glob = promises.glob(["*", "*/*"], {exclude: ignored})
76+ const ignored = ignoreContent.split("\n");
77+ const dir = [];
78+ const glob = promises.glob(["*", "*/*"], { exclude: ignored });
7979 for await (const file of glob) {
80- dir.push(file)
80+ dir.push(file);
8181 }
8282 return dir;
8383 }
@@ -90,9 +90,20 @@ async function getEnvPrompt() {
9090 } catch (_) {
9191 gitStatus = { nogit: "No git repo in this folder." };
9292 }
93+ const envKeys = ["PATH", "USER", "LANG", "HOME", "SHELL", "BUN_INSTALL"];
94+ const env: Record<string, string> = {};
95+ for (const key of envKeys) {
96+ const v = Bun.env[key];
97+
98+ if (v !== undefined) {
99+ env[key] = v;
100+ }
101+ }
102+
93103 const envStatus = JSON.stringify(
94104 {
95105 os: platform(),
106+ env,
96107 cwd: process.cwd(),
97108 dir: await getDir(),
98109 git: gitStatus,
src/tui-overlay.ts+266−46
@@ -1,49 +1,28 @@
1-import { cel, HStack, Text, TextInput, VStack } from "@cel-tui/core";
1+import { HStack, Text, TextInput, VStack } from "@cel-tui/core";
2+import {
3+ getModels,
4+ type KnownProvider,
5+ type ThinkingLevel,
6+} from "@mariozechner/pi-ai";
7+import { getOAuthProviders } from "@mariozechner/pi-ai/oauth";
28 import { TextPill, theme } from "./tui-components";
3-import type { TUIState } from "./types";
9+import type { SelectOptions, SelectState, TUIState } from "./types";
410
5-function onOverlayKeyPress(state: TUIState) {
6- return (key: string) => {
7- if (key === "escape" || key === "ctrl+p") {
8- state.overlay = false;
9- }
10- };
11-}
12-
13-function onChange() {}
14-function onEditorKeyPress(_key: string) {}
15-
16-export function SelectEditor(value: string) {
11+export function SelectOverlay(
12+ value: string,
13+ selected: string,
14+ list: { label: string; value: string }[],
15+ label: string,
16+ onOverlayKeyPress: (key: string) => boolean | undefined,
17+ onChange: (newValue: string) => void,
18+ onKeyPress: (key: string) => boolean | undefined,
19+) {
1720 let isEditorFocused = true;
18- return TextInput({
19- value,
20- minHeight: 3,
21- maxHeight: 10,
22- padding: { x: 1 },
23- placeholder: Text("Search...", { fgColor: theme.bblack, italic: true }),
24- fgColor: theme.bblack,
25- bgColor: theme.white,
26- onChange,
27- onKeyPress: onEditorKeyPress,
28- // TODO: Update `cel-tui` with an autofocus prop to fix this pattern
29- focused: isEditorFocused,
30- onFocus: () => {
31- isEditorFocused = true;
32- cel.render();
33- },
34- onBlur: () => {
35- isEditorFocused = false;
36- cel.render();
37- },
38- });
39-}
40-
41-export function SelectOverlay(state: TUIState, filter: string, list: string[]) {
4221 return VStack(
4322 {
4423 height: "100%",
4524 justifyContent: "end",
46- onKeyPress: onOverlayKeyPress(state),
25+ onKeyPress: onOverlayKeyPress,
4726 },
4827 [
4928 VStack(
@@ -55,17 +34,258 @@ export function SelectOverlay(state: TUIState, filter: string, list: string[]) {
5534 },
5635 [
5736 VStack(
58- { flex: 1, minHeight: 5, maxHeight: 20, padding: {x: 1} },
59- list.map((i) => {
60- return Text(i);
61- }),
62- ), // list
37+ { flex: 1, minHeight: 5, maxHeight: 20, padding: { x: 1 } },
38+ list.map((i) =>
39+ i.value === selected
40+ ? Text(i.label, { fgColor: theme.black })
41+ : Text(i.label, { fgColor: theme.bblack }),
42+ ),
43+ ),
44+
6345 HStack({ width: "100%" }, [
64- TextPill("SELECT", theme.bwhite, theme.bblack),
46+ TextPill(label, theme.bwhite, theme.bblack),
6547 ]),
66- SelectEditor(filter),
48+
49+ TextInput({
50+ value,
51+ minHeight: 3,
52+ maxHeight: 10,
53+ padding: { x: 1 },
54+ placeholder: Text("Search...", {
55+ fgColor: theme.bblack,
56+ italic: true,
57+ }),
58+ fgColor: theme.bblack,
59+ bgColor: theme.white,
60+ onChange,
61+ onKeyPress,
62+ focused: isEditorFocused,
63+ onFocus: () => {
64+ isEditorFocused = true;
65+ },
66+ onBlur: () => {
67+ isEditorFocused = false;
68+ },
69+ }),
6770 ],
6871 ),
6972 ],
7073 );
7174 }
75+
76+export function useSelectOverlay(initialOptions: SelectOptions) {
77+ // Inner state
78+ const s: SelectState = {
79+ value: "",
80+ selected: "",
81+ label: "SELECT",
82+ list: [],
83+ };
84+ let baseList: SelectOptions["list"] = [];
85+
86+ const applyOptions = (
87+ options: Pick<SelectOptions, "filter" | "label" | "list">,
88+ ) => {
89+ baseList = options.list;
90+ s.value = options.filter ?? "";
91+ s.label = options.label ? options.label.toUpperCase() : "SELECT";
92+ s.list = s.value
93+ ? baseList.filter((i) => i.label.includes(s.value))
94+ : baseList;
95+ s.selected = s.list.length ? s.list[0].value : "";
96+ };
97+
98+ applyOptions(initialOptions);
99+
100+ const onChange = (newValue: string) => {
101+ s.value = newValue;
102+ s.list = s.value
103+ ? baseList.filter((i) => i.label.includes(s.value))
104+ : baseList;
105+ s.selected = s.list.length ? s.list[0].value : "";
106+ };
107+
108+ const moveSelected = (direction: -1 | 1) => {
109+ if (!s.list.length) return;
110+
111+ const currentIndex = s.list.findIndex((i) => i.value === s.selected);
112+ const nextIndex =
113+ currentIndex === -1
114+ ? direction === 1
115+ ? 0
116+ : s.list.length - 1
117+ : (currentIndex + direction + s.list.length) % s.list.length;
118+
119+ s.selected = s.list[nextIndex].value;
120+ };
121+
122+ const onMoveKeyPress = (key: string) => {
123+ if (key !== "up" && key !== "down") return;
124+
125+ moveSelected(key === "up" ? -1 : 1);
126+ return false;
127+ };
128+
129+ const onEditorKeyPress = (key: string) => {
130+ const didMove = onMoveKeyPress(key);
131+ if (didMove === false) return false;
132+
133+ if (key === "enter") {
134+ const previousList = s.list;
135+ const previousBaseList = baseList;
136+ s.value = "";
137+ initialOptions.onSelect(s);
138+ if (s.list !== previousList) {
139+ baseList = s.list;
140+ } else {
141+ s.list = previousBaseList;
142+ s.selected = s.list.length ? s.list[0].value : "";
143+ }
144+ return false;
145+ }
146+ };
147+
148+ const onOverlayKeyPress = (key: string) => {
149+ const didMove = onMoveKeyPress(key);
150+ if (didMove === false) return false;
151+
152+ if (key === "escape" || key === "ctrl+p") {
153+ applyOptions(initialOptions);
154+ initialOptions.onCancel();
155+ }
156+ return false;
157+ };
158+
159+ return () =>
160+ SelectOverlay(
161+ s.value,
162+ s.selected,
163+ s.list,
164+ s.label,
165+ onOverlayKeyPress,
166+ onChange,
167+ onEditorKeyPress,
168+ );
169+}
170+
171+export function mainMenu(state: TUIState) {
172+ type MenuPane = Omit<SelectOptions, "onCancel" | "onSelect">;
173+
174+ const oauthProviders = getOAuthProviders();
175+ const providers = oauthProviders.map((v) => ({
176+ label: v.name,
177+ value: v.id,
178+ }));
179+ const reasoningEfforts: ThinkingLevel[] = [
180+ "minimal",
181+ "low",
182+ "medium",
183+ "high",
184+ "xhigh",
185+ ];
186+ const efforts = reasoningEfforts.map((v) => ({ label: v, value: v }));
187+ const getProviderModels = (provider: KnownProvider) =>
188+ getModels(provider).map((v) => ({
189+ label: v.name,
190+ value: v.id,
191+ }));
192+
193+ const mainPane: MenuPane = {
194+ label: "main",
195+ filter: state.prompt.length ? state.prompt : "",
196+ list: [
197+ { label: "models and providers", value: "providers" },
198+ { label: "reasoning effort", value: "effort" },
199+ ],
200+ };
201+ const providersPane: MenuPane = {
202+ label: "providers",
203+ filter: "",
204+ list: providers,
205+ };
206+ const effortPane: MenuPane = {
207+ label: "effort",
208+ filter: "",
209+ list: efforts,
210+ };
211+ const panes: MenuPane[] = [mainPane, providersPane, effortPane];
212+ let currentPane = mainPane;
213+ let selectedProvider: KnownProvider | undefined;
214+
215+ const openPane = (s: SelectState, pane: MenuPane) => {
216+ currentPane = pane;
217+ s.value = pane.filter;
218+ s.label = pane.label ? pane.label.toUpperCase() : "SELECT";
219+ s.list = pane.list;
220+ s.selected = s.list.length ? s.list[0].value : "";
221+ };
222+
223+ const resetMenu = (s: SelectState) => {
224+ currentPane = mainPane;
225+ selectedProvider = undefined;
226+ s.value = "";
227+ s.label = mainPane.label ? mainPane.label.toUpperCase() : "SELECT";
228+ s.list = mainPane.list;
229+ s.selected = s.list.length ? s.list[0].value : "";
230+ };
231+
232+ const closeMenu = (s: SelectState) => {
233+ resetMenu(s);
234+ state.overlay = false;
235+ };
236+
237+ const select = useSelectOverlay({
238+ ...mainPane,
239+ onSelect: (s) => {
240+ if (!s.selected) return;
241+
242+ if (currentPane.label === "main") {
243+ const nextPane = panes.find((pane) => pane.label === s.selected);
244+ if (nextPane) openPane(s, nextPane);
245+ return;
246+ }
247+
248+ if (currentPane.label === "providers") {
249+ const provider = oauthProviders.find((v) => v.id === s.selected);
250+ if (!provider) return;
251+
252+ selectedProvider = provider.id as KnownProvider;
253+ openPane(s, {
254+ label: "models",
255+ filter: "",
256+ list: getProviderModels(selectedProvider),
257+ });
258+ return;
259+ }
260+
261+ if (currentPane.label === "models") {
262+ if (!selectedProvider) return;
263+
264+ const model = getModels(selectedProvider).find(
265+ (v) => v.id === s.selected,
266+ );
267+ if (!model) return;
268+
269+ state.options.provider = selectedProvider;
270+ state.options.model = model;
271+ closeMenu(s);
272+ return;
273+ }
274+
275+ if (currentPane.label === "effort") {
276+ const effort = reasoningEfforts.find((v) => v === s.selected);
277+ if (!effort) return;
278+
279+ state.options.effort = effort;
280+ closeMenu(s);
281+ }
282+ },
283+ onCancel: () => {
284+ currentPane = mainPane;
285+ selectedProvider = undefined;
286+ state.overlay = false;
287+ },
288+ });
289+
290+ return select;
291+}
src/tui.ts+6−7
@@ -21,9 +21,10 @@ import {
2121 } from "./tui-components";
2222 import { Conversation, emptyState } from "./tui-conversation";
2323 import { Editor } from "./tui-editor";
24-import { SelectOverlay } from "./tui-overlay";
24+import { mainMenu } from "./tui-overlay";
2525 import type { AgentContex, ToolAndRunner, TUIState } from "./types";
2626
27+// TODO: move all git things to `git.ts`
2728 const git = simpleGit();
2829
2930 function clearOrAbort(state: TUIState) {
@@ -54,8 +55,6 @@ export function initTUI(state: TUIState, leave: (s: string) => void) {
5455 cel.render();
5556 }, 1000 / fps);
5657
57- cel.init(new ProcessTerminal());
58-
5958 const onWindowKeyPress = (key: string) => {
6059 if (key === "ctrl+q" || key === "ctrl+c" || key === "ctrl+d") {
6160 // Quit
@@ -91,6 +90,9 @@ export function initTUI(state: TUIState, leave: (s: string) => void) {
9190 }
9291 };
9392
93+ const menu = mainMenu(state);
94+
95+ cel.init(new ProcessTerminal());
9496 cel.viewport(() => {
9597 const layers = [
9698 VStack(
@@ -116,10 +118,7 @@ export function initTUI(state: TUIState, leave: (s: string) => void) {
116118 ),
117119 ];
118120 if (state.overlay) {
119- // TODO: Use the new select overlay for menus
120- layers.push(SelectOverlay(state, state.prompt, [
121- "> Models", "Effort"
122- ]));
121+ layers.push(menu());
123122 }
124123
125124 return layers;
src/types.ts+20−0
@@ -132,3 +132,23 @@ export type ToolAndRunner = {
132132 signal?: AbortSignal,
133133 ) => AsyncGenerator<ToolRunnerEvent>;
134134 };
135+
136+export type SelectListItem = {
137+ label: string;
138+ value: string;
139+};
140+
141+export type SelectState = {
142+ value: string;
143+ selected: string;
144+ label: string;
145+ list: SelectListItem[];
146+};
147+
148+export type SelectOptions = {
149+ filter: string;
150+ list: { label: string; value: string }[];
151+ label?: string | undefined;
152+ onSelect: (s: SelectState) => void;
153+ onCancel: () => void;
154+};