xonecas.io
64875
Mc

mini-coder / commit 1f02864

fix: cleanup settings/cli validation with TypeBox

xonecas2026-04-27 1f0286432a8618ed691d5903af92673cf4fb8bd0 parent 37bef45

2 files changed

src/args.ts+88−47
@@ -2,25 +2,58 @@ import { mkdir } from "node:fs/promises";
22 import {
33 type Api,
44 getModels,
5- getProviders,
65 type KnownProvider,
76 type Model,
87 type ThinkingLevel,
98 } from "@mariozechner/pi-ai";
9+import { Value } from "typebox/value";
1010 import { loginOAuth } from "./oauth";
1111 import { DATA_DIR, SETTINGS_PATH } from "./shared.ts";
12-import type { CliOptions, Settings } from "./types.ts";
12+import {
13+ type CliOptions,
14+ CliOptionsSchema,
15+ type Settings,
16+ SettingsSchema,
17+} from "./types.ts";
1318
1419 const DEFAULT_PROVIDER: KnownProvider = "openai-codex";
1520 const DEFAULT_MODEL_ID = "gpt-5.5";
1621 const DEFAULT_EFFORT: ThinkingLevel = "xhigh";
17-const VALID_EFFORTS: ThinkingLevel[] = [
18- "low",
19- "medium",
20- "minimal",
21- "high",
22- "xhigh",
23-];
22+
23+function formatValidationError(
24+ label: string,
25+ error: ReturnType<typeof Value.Errors>[number] | undefined,
26+) {
27+ if (!error) {
28+ return `Invalid ${label}`;
29+ }
30+
31+ const path = error.instancePath || "/";
32+ return `Invalid ${label}: ${path} ${error.message}`;
33+}
34+
35+function parseSettings(value: unknown, label: string): Settings {
36+ if (Value.Check(SettingsSchema, value)) {
37+ return value;
38+ }
39+
40+ throw new Error(
41+ formatValidationError(label, Value.Errors(SettingsSchema, value)[0]),
42+ );
43+}
44+
45+function parseCliOptions(value: unknown): CliOptions {
46+ if (Value.Check(CliOptionsSchema, value)) {
47+ return value;
48+ }
49+
50+ throw new Error(
51+ formatValidationError(
52+ "CLI options",
53+ Value.Errors(CliOptionsSchema, value)[0],
54+ ),
55+ );
56+}
2457
2558 async function getSettings(): Promise<Settings | undefined> {
2659 const file = Bun.file(SETTINGS_PATH);
@@ -30,9 +63,9 @@ async function getSettings(): Promise<Settings | undefined> {
3063 }
3164
3265 const jsonText = await file.text();
33- const settings: Settings = JSON.parse(jsonText);
66+ const settings = JSON.parse(jsonText) as unknown;
3467
35- return settings;
68+ return parseSettings(settings, "settings");
3669 }
3770
3871 async function saveSettings(s: Settings) {
@@ -51,27 +84,6 @@ function requireValue(argv: string[], index: number, flag: string) {
5184 return value;
5285 }
5386
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-
7587 function findModelConfig(modelId: string, provider: KnownProvider) {
7688 const models = getModels(provider);
7789 if (models.length === 0) throw new Error("Provider has no models");
@@ -107,9 +119,9 @@ export async function handleArgv(argv: string[]): Promise<CliOptions> {
107119 const settingsProvider = settings?.provider ?? DEFAULT_PROVIDER;
108120 const settingsModelId = settings?.model ?? DEFAULT_MODEL_ID;
109121 const settingsEffort = settings?.effort ?? DEFAULT_EFFORT;
110- let provider = settingsProvider;
122+ let provider: string = settingsProvider;
111123 let modelId = settingsModelId;
112- let effort = settingsEffort;
124+ let effort: string = settingsEffort;
113125 let prompt: string | undefined;
114126 let providerChanged = false;
115127 let explicitModel = false;
@@ -119,7 +131,14 @@ export async function handleArgv(argv: string[]): Promise<CliOptions> {
119131
120132 // Settings
121133 if (flag === "--provider") {
122- provider = getKnownProvider(requireValue(argv, i, flag));
134+ provider = parseSettings(
135+ {
136+ provider: requireValue(argv, i, flag),
137+ model: modelId,
138+ effort,
139+ },
140+ "CLI settings",
141+ ).provider;
123142 providerChanged = provider !== settingsProvider;
124143 i++;
125144 continue;
@@ -133,7 +152,14 @@ export async function handleArgv(argv: string[]): Promise<CliOptions> {
133152 }
134153
135154 if (flag === "--effort") {
136- effort = getThinkingLevel(requireValue(argv, i, flag));
155+ effort = parseSettings(
156+ {
157+ provider,
158+ model: modelId,
159+ effort: requireValue(argv, i, flag),
160+ },
161+ "CLI settings",
162+ ).effort;
137163 i++;
138164 continue;
139165 }
@@ -151,21 +177,36 @@ export async function handleArgv(argv: string[]): Promise<CliOptions> {
151177 }
152178 }
153179
154- const selectedModel = findModelConfig(modelId, provider);
180+ const cliSettings = parseSettings(
181+ {
182+ provider,
183+ model: modelId,
184+ effort,
185+ },
186+ "CLI settings",
187+ );
188+ const selectedModel = findModelConfig(
189+ cliSettings.model,
190+ cliSettings.provider,
191+ );
155192 const model =
156- selectedModel ?? getFallbackModel(provider, explicitModel, providerChanged);
193+ selectedModel ??
194+ getFallbackModel(cliSettings.provider, explicitModel, providerChanged);
157195
158- const options: CliOptions = {
159- provider,
196+ const options = parseCliOptions({
197+ provider: cliSettings.provider,
160198 model,
161- effort,
199+ effort: cliSettings.effort,
162200 prompt,
163- };
164- const nextSettings: Settings = {
165- provider,
166- model: model.id,
167- effort,
168- };
201+ });
202+ const nextSettings = parseSettings(
203+ {
204+ provider: options.provider,
205+ model: options.model.id,
206+ effort: options.effort,
207+ },
208+ "settings",
209+ );
169210
170211 await saveSettings(nextSettings);
171212 return options;
src/types.ts+63−20
@@ -1,27 +1,70 @@
1-import type {
2- Api,
3- AssistantMessage,
4- KnownProvider,
5- Message,
6- Model,
7- ThinkingLevel,
8- Tool,
9- ToolResultMessage,
1+import {
2+ type Api,
3+ type AssistantMessage,
4+ getProviders,
5+ type KnownProvider,
6+ type Message,
7+ type Model,
8+ type Static,
9+ type ThinkingLevel,
10+ type Tool,
11+ type ToolResultMessage,
12+ Type,
1013 } from "@mariozechner/pi-ai";
1114 import type { OAuthCredentials } from "@mariozechner/pi-ai/oauth";
1215
13-export type Settings = {
14- provider: KnownProvider;
15- model: string;
16- effort: ThinkingLevel;
17-};
16+const KnownProviderSchema = Type.Unsafe<KnownProvider>(
17+ Type.Union(getProviders().map((provider) => Type.Literal(provider))),
18+);
1819
19-export type CliOptions = {
20- provider: KnownProvider;
21- model: Model<Api>;
22- effort: ThinkingLevel;
23- prompt?: string;
24-};
20+const ThinkingLevelSchema = Type.Unsafe<ThinkingLevel>(
21+ Type.Union([
22+ Type.Literal("minimal"),
23+ Type.Literal("low"),
24+ Type.Literal("medium"),
25+ Type.Literal("high"),
26+ Type.Literal("xhigh"),
27+ ]),
28+);
29+
30+const ModelSchema = Type.Unsafe<Model<Api>>(
31+ Type.Object({
32+ id: Type.String(),
33+ name: Type.String(),
34+ api: Type.String(),
35+ provider: Type.String(),
36+ baseUrl: Type.String(),
37+ reasoning: Type.Boolean(),
38+ input: Type.Array(
39+ Type.Union([Type.Literal("text"), Type.Literal("image")]),
40+ ),
41+ cost: Type.Object({
42+ input: Type.Number(),
43+ output: Type.Number(),
44+ cacheRead: Type.Number(),
45+ cacheWrite: Type.Number(),
46+ }),
47+ contextWindow: Type.Number(),
48+ maxTokens: Type.Number(),
49+ headers: Type.Optional(Type.Record(Type.String(), Type.String())),
50+ compat: Type.Optional(Type.Unknown()),
51+ }),
52+);
53+
54+export const SettingsSchema = Type.Object({
55+ provider: KnownProviderSchema,
56+ model: Type.String(),
57+ effort: ThinkingLevelSchema,
58+});
59+export type Settings = Static<typeof SettingsSchema>;
60+
61+export const CliOptionsSchema = Type.Object({
62+ provider: KnownProviderSchema,
63+ model: ModelSchema,
64+ effort: ThinkingLevelSchema,
65+ prompt: Type.Optional(Type.String()),
66+});
67+export type CliOptions = Static<typeof CliOptionsSchema>;
2568
2669 type SavedOAuthAuth = OAuthCredentials & {
2770 type: "oauth";