xonecas.io
64875
Mc

mini-coder / commit bac5039

feat: settings file and Git status

xonecas2026-04-26 bac5039432fc2eeaae9d327693960f18c8c1d755 parent 433a825

7 files changed

src/args.ts+147−17
@@ -1,49 +1,179 @@
1+import { mkdir } from "node:fs/promises";
12 import {
3+ type Api,
24 getModels,
5+ getProviders,
36 type KnownProvider,
7+ type Model,
48 type ThinkingLevel,
59 } from "@mariozechner/pi-ai";
610 import { loginOAuth } from "./oauth";
7-import type { CliOptions } from "./types.ts";
11+import { DATA_DIR, SETTINGS_PATH } from "./shared.ts";
12+import type { CliOptions, Settings } from "./types.ts";
813
9-function getModelConfig(modelName: string, provider: KnownProvider) {
14+const DEFAULT_PROVIDER: KnownProvider = "openai-codex";
15+const DEFAULT_MODEL_ID = "gpt-5.5";
16+const DEFAULT_EFFORT: ThinkingLevel = "xhigh";
17+const VALID_EFFORTS: ThinkingLevel[] = [
18+ "low",
19+ "medium",
20+ "minimal",
21+ "high",
22+ "xhigh",
23+];
24+
25+async function getSettings(): Promise<Settings | undefined> {
26+ const file = Bun.file(SETTINGS_PATH);
27+
28+ if (!(await file.exists())) {
29+ return;
30+ }
31+
32+ const jsonText = await file.text();
33+ const settings: Settings = JSON.parse(jsonText);
34+
35+ return settings;
36+}
37+
38+async function saveSettings(s: Settings) {
39+ await mkdir(DATA_DIR, { recursive: true });
40+ const file = Bun.file(SETTINGS_PATH);
41+ await Bun.write(file, JSON.stringify(s, null, 4));
42+}
43+
44+function requireValue(argv: string[], index: number, flag: string) {
45+ const value = argv[index + 1];
46+
47+ if (!value || value.startsWith("-")) {
48+ throw new Error(`${flag} requires a value`);
49+ }
50+
51+ return value;
52+}
53+
54+function getKnownProvider(provider: string): KnownProvider {
55+ const providers = getProviders();
56+ const knownProvider = providers.find((p) => p === provider);
57+
58+ if (!knownProvider) {
59+ throw new Error(`Unknown provider: ${provider}`);
60+ }
61+
62+ return knownProvider;
63+}
64+
65+function getThinkingLevel(effort: string): ThinkingLevel {
66+ const thinkingLevel = VALID_EFFORTS.find((level) => level === effort);
67+
68+ if (!thinkingLevel) {
69+ throw new Error(`Invalid effort: ${effort}`);
70+ }
71+
72+ return thinkingLevel;
73+}
74+
75+function findModelConfig(modelId: string, provider: KnownProvider) {
1076 const models = getModels(provider);
1177 if (models.length === 0) throw new Error("Provider has no models");
1278
13- const model = models.find((m) => m.id === modelName);
14- if (!model) throw new Error("Model not found");
79+ return models.find((m) => m.id === modelId);
80+}
81+
82+function getFirstModelConfig(provider: KnownProvider): Model<Api> {
83+ const model = getModels(provider)[0];
84+ if (!model) throw new Error("Provider has no models");
1585
1686 return model;
1787 }
1888
19-// TODO: For when the user sets thinking value.
20-// function _isThinkingLevel(value: string): value is ThinkingLevel {
21-// const THINKING_LEVELS = ["low", "medium", "minimal", "high", "xhigh"]
22-// return (THINKING_LEVELS as readonly string[]).includes(value);
23-// }
89+function getFallbackModel(
90+ provider: KnownProvider,
91+ explicitModel: boolean,
92+ providerChanged: boolean,
93+): Model<Api> {
94+ if (explicitModel) {
95+ throw new Error("Model not found");
96+ }
97+
98+ if (!providerChanged) {
99+ throw new Error("Model not found");
100+ }
101+
102+ return getFirstModelConfig(provider);
103+}
24104
25105 export async function handleArgv(argv: string[]): Promise<CliOptions> {
26- // TODO: Fetch defaults from settings file
27- let options: CliOptions = {
28- model: getModelConfig("gpt-5.5", "openai-codex"),
29- effort: "xhigh" as ThinkingLevel,
30- };
106+ const settings = await getSettings();
107+ const settingsProvider = settings?.provider ?? DEFAULT_PROVIDER;
108+ const settingsModelId = settings?.model ?? DEFAULT_MODEL_ID;
109+ const settingsEffort = settings?.effort ?? DEFAULT_EFFORT;
110+ let provider = settingsProvider;
111+ let modelId = settingsModelId;
112+ let effort = settingsEffort;
113+ let prompt: string | undefined;
114+ let jsonOutput: boolean | undefined;
115+ let providerChanged = false;
116+ let explicitModel = false;
31117
32118 for (let i = 0; i < argv.length; i++) {
33119 const flag = argv[i];
34120
121+ // Settings
122+ if (flag === "--provider") {
123+ provider = getKnownProvider(requireValue(argv, i, flag));
124+ providerChanged = provider !== settingsProvider;
125+ i++;
126+ continue;
127+ }
128+
129+ if (flag === "--model") {
130+ modelId = requireValue(argv, i, flag);
131+ explicitModel = true;
132+ i++;
133+ continue;
134+ }
135+
136+ if (flag === "--effort") {
137+ effort = getThinkingLevel(requireValue(argv, i, flag));
138+ i++;
139+ continue;
140+ }
141+
142+ // headless api
35143 if (flag === "--prompt" || flag === "-p") {
36- options = { ...options, prompt: argv[i + 1] };
144+ prompt = requireValue(argv, i, flag);
145+ i++;
146+ continue;
37147 }
38148
39149 if (flag === "--json" || flag === "-j") {
40- options = { ...options, jsonOutput: true };
150+ jsonOutput = true;
151+ continue;
41152 }
42153
43154 if (flag === "--login" || flag === "-l") {
44- await loginOAuth(argv[i + 1]);
155+ await loginOAuth(requireValue(argv, i, flag));
156+ i++;
45157 }
46158 }
47159
160+ const selectedModel = findModelConfig(modelId, provider);
161+ const model =
162+ selectedModel ?? getFallbackModel(provider, explicitModel, providerChanged);
163+
164+ const options: CliOptions = {
165+ provider,
166+ model,
167+ effort,
168+ prompt,
169+ jsonOutput,
170+ };
171+ const nextSettings: Settings = {
172+ provider,
173+ model: model.id,
174+ effort,
175+ };
176+
177+ await saveSettings(nextSettings);
48178 return options;
49179 }
src/index.ts+11−0
@@ -1,9 +1,12 @@
1+import { basename } from "node:path";
2+import simpleGit from "simple-git";
13 import { handleArgv } from "./args.ts";
24 import { streamHeadless } from "./headless.ts";
35 import { initTUI } from "./tui.ts";
46 import type { TUIState } from "./types.ts";
57
68 export async function main(): Promise<void> {
9+ const cwd = basename(process.cwd());
710 const options = await handleArgv(process.argv.slice(2));
811
912 function leave(msg?: string) {
@@ -23,7 +26,15 @@ export async function main(): Promise<void> {
2326 streaming: false,
2427 stickToBottom: true,
2528 scrollOffset: 0,
29+ cwd,
2630 };
2731
32+ const git = simpleGit();
33+ try {
34+ const gitStatus = (await git.status()).isClean() ? "" : "*";
35+ const gitBranch = (await git.branch()).current;
36+ state.gitBranch = `${gitBranch}${gitStatus}`;
37+ } catch (_) {} // No git
38+
2839 initTUI(state, leave);
2940 }
src/tool-task.ts+2−2
@@ -85,8 +85,8 @@ export async function* runTaskTool(
8585 }
8686
8787 if (ev.type === "tool_result") {
88- const estimate = estimateTokens(JSON.stringify(ev.message.content))
89- const elapsed = elapsedTime(Date.now() - ev.message.timestamp)
88+ const estimate = estimateTokens(JSON.stringify(ev.message.content));
89+ const elapsed = elapsedTime(Date.now() - ev.message.timestamp);
9090 const text = `Called ${ev.message.toolName}. ~(${estimate} tokens). ${elapsed} ago`;
9191 output += text;
9292 yield {
src/tui-components.ts+48−44
@@ -1,4 +1,4 @@
1-import { type Color, HStack, type Node, Text } from "@cel-tui/core";
1+import { type Color, HStack, Text } from "@cel-tui/core";
22 import { onceEvery } from "./shared";
33 import type { TUIState } from "./types";
44
@@ -29,49 +29,49 @@ export const theme = {
2929 };
3030
3131 // Momoization helper for cel-tui
32-type NodeMemoKey = string | number | symbol;
33-
34-type MemoizedNodeRenderer<T> = ((value: T) => Node) & {
35- clear: () => void;
36- delete: (value: T) => boolean;
37-};
38-
39-export function memoNodeByKey<T>(
40- keyOf: (value: T) => NodeMemoKey,
41- render: (value: T) => Node,
42- options: { maxEntries?: number } = {},
43-): MemoizedNodeRenderer<T> {
44- const maxEntries = options.maxEntries ?? 1000;
45- const cache = new Map<NodeMemoKey, Node>();
46-
47- const memoized = ((value: T): Node => {
48- const key = keyOf(value);
49- const cached = cache.get(key);
50-
51- if (cached) {
52- // Move to the end: simple LRU-ish behavior.
53- cache.delete(key);
54- cache.set(key, cached);
55- return cached;
56- }
57-
58- const node = render(value);
59- cache.set(key, node);
60-
61- while (cache.size > maxEntries) {
62- const oldest = cache.keys().next();
63- if (oldest.done) break;
64- cache.delete(oldest.value);
65- }
66-
67- return node;
68- }) as MemoizedNodeRenderer<T>;
69-
70- memoized.clear = () => cache.clear();
71- memoized.delete = (value: T) => cache.delete(keyOf(value));
72-
73- return memoized;
74-}
32+// type NodeMemoKey = string | number | symbol;
33+
34+// type MemoizedNodeRenderer<T> = ((value: T) => Node) & {
35+// clear: () => void;
36+// delete: (value: T) => boolean;
37+// };
38+
39+// export function memoNodeByKey<T>(
40+// keyOf: (value: T) => NodeMemoKey,
41+// render: (value: T) => Node,
42+// options: { maxEntries?: number } = {},
43+// ): MemoizedNodeRenderer<T> {
44+// const maxEntries = options.maxEntries ?? 1000;
45+// const cache = new Map<NodeMemoKey, Node>();
46+
47+// const memoized = ((value: T): Node => {
48+// const key = keyOf(value);
49+// const cached = cache.get(key);
50+
51+// if (cached) {
52+// // Move to the end: simple LRU-ish behavior.
53+// cache.delete(key);
54+// cache.set(key, cached);
55+// return cached;
56+// }
57+
58+// const node = render(value);
59+// cache.set(key, node);
60+
61+// while (cache.size > maxEntries) {
62+// const oldest = cache.keys().next();
63+// if (oldest.done) break;
64+// cache.delete(oldest.value);
65+// }
66+
67+// return node;
68+// }) as MemoizedNodeRenderer<T>;
69+
70+// memoized.clear = () => cache.clear();
71+// memoized.delete = (value: T) => cache.delete(keyOf(value));
72+
73+// return memoized;
74+// }
7575
7676 // TextPill("mini-coder", theme.bblack, theme.black),
7777 // TextPill("mini-coder", theme.bred, theme.red),
@@ -158,3 +158,7 @@ export function ContextPill(state: TUIState) {
158158
159159 return TextPill(text, theme.bblack, theme.bwhite);
160160 }
161+
162+export function GitPill(state: TUIState) {
163+ return TextPill(state.gitBranch ?? "No git.", theme.bwhite, theme.bblack);
164+}
src/tui-conversation.ts+2−2
@@ -42,7 +42,7 @@ function agentMessageNode(msg: AssistantMessage): Node {
4242 node = Text(text);
4343 }
4444
45- return VStack({ padding: { x: 4 } }, [
45+ return VStack({ padding: { x: 4 }, gap: 1 }, [
4646 TextPill(block.name, theme.white, theme.bblack),
4747 node,
4848 ]);
@@ -77,7 +77,7 @@ function toolMessageNode(msg: ToolResultMessage): Node {
7777 return VStack(
7878 {
7979 height: 10,
80- padding: { x:4 },
80+ padding: { x: 4 },
8181 overflow: "scroll",
8282 scrollOffset: Infinity,
8383 onScroll: () => false,
src/tui.ts+12−4
@@ -1,4 +1,3 @@
1-import { basename } from "node:path";
21 import { cel, HStack, ProcessTerminal, VStack } from "@cel-tui/core";
32 import type {
43 AssistantMessage,
@@ -7,6 +6,7 @@ import type {
76 Message,
87 ToolResultMessage,
98 } from "@mariozechner/pi-ai";
9+import simpleGit from "simple-git";
1010 import { insertToolUsageReminder, MAIN_PROMPT, streamAgent } from "./agent";
1111 import { getApiKey } from "./oauth";
1212 import { estimateTokens } from "./shared";
@@ -16,6 +16,7 @@ import { runTaskTool, task } from "./tool-task";
1616 import {
1717 ActivityPill,
1818 ContextPill,
19+ GitPill,
1920 Spinner,
2021 TextPill,
2122 theme,
@@ -37,7 +38,6 @@ function clearOrAbort(state: TUIState) {
3738 }
3839
3940 export function initTUI(state: TUIState, leave: (s: string) => void) {
40- const cwd = basename(process.cwd());
4141 const { spinnerEvery, currentSpinner } = Spinner();
4242
4343 // Stable 60fps rendering.
@@ -47,11 +47,13 @@ export function initTUI(state: TUIState, leave: (s: string) => void) {
4747 if (state.streaming) {
4848 spinnerEvery();
4949 }
50+ cel.setTitle(
51+ `mc ${state.streaming ? currentSpinner() : ">"} ../${state.cwd}`,
52+ );
5053 cel.render();
5154 }, 1000 / fps);
5255
5356 cel.init(new ProcessTerminal());
54- cel.setTitle(`mc | ${cwd}`);
5557
5658 cel.viewport(() =>
5759 VStack(
@@ -76,7 +78,8 @@ export function initTUI(state: TUIState, leave: (s: string) => void) {
7678
7779 HStack({ gap: 1 }, [
7880 TextPill(state.options.model.name, theme.bblack, theme.bwhite),
79- TextPill(`../${cwd}`, theme.bwhite, theme.bblack),
81+ TextPill(`../${state.cwd}`, theme.bwhite, theme.bblack),
82+ GitPill(state),
8083 VStack({ flex: 1 }, []),
8184 ActivityPill(state, currentSpinner()),
8285 ContextPill(state),
@@ -145,6 +148,8 @@ export async function streamTUI(state: TUIState) {
145148 state.prompt = "";
146149 cel.render();
147150
151+ const git = simpleGit();
152+
148153 let partial: AssistantMessage | null = null;
149154
150155 const onStream = (ev: AssistantMessageEvent, ctx: Context) => {
@@ -250,5 +255,8 @@ export async function streamTUI(state: TUIState) {
250255 }
251256 } finally {
252257 state.streaming = false;
258+ const gitStatus = (await git.status()).isClean() ? "" : "*";
259+ const gitBranch = (await git.branch()).current;
260+ state.gitBranch = `${gitBranch}${gitStatus}`;
253261 }
254262 }
src/types.ts+12−1
@@ -1,7 +1,9 @@
11 import type {
2+ Api,
23 AssistantMessage,
34 AssistantMessageEvent,
45 Context,
6+ KnownProvider,
57 Message,
68 Model,
79 ThinkingLevel,
@@ -10,8 +12,15 @@ import type {
1012 } from "@mariozechner/pi-ai";
1113 import type { OAuthCredentials } from "@mariozechner/pi-ai/oauth";
1214
15+export type Settings = {
16+ provider: KnownProvider;
17+ model: string;
18+ effort: ThinkingLevel;
19+};
20+
1321 export type CliOptions = {
14- model: Model<never>;
22+ provider: KnownProvider;
23+ model: Model<Api>;
1524 effort: ThinkingLevel;
1625 prompt?: string;
1726 jsonOutput?: boolean;
@@ -26,6 +35,8 @@ export type TUIState = {
2635 scrollOffset: number;
2736 streaming: boolean;
2837 abortController?: AbortController;
38+ cwd: string;
39+ gitBranch?: string;
2940 };
3041
3142 export type SavedOAuthAuth = OAuthCredentials & {