topchester-ai 0.52.0 → 0.53.0

package/dist/bin.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as runTopchesterCli } from "./cli-yf0DNAUH.mjs";
+import { t as runTopchesterCli } from "./cli-CqFhOvlt.mjs";
 //#region src/bin.ts
 await runTopchesterCli();
 //#endregion

package/dist/{cli-yf0DNAUH.mjs → cli-CqFhOvlt.mjs}

@@ -5972,8 +5972,7 @@ const rawModelsSchema = z.object({
 	"default": modelRefSchema.optional(),
 	"fast": modelRefSchema.optional(),
 	"kb.summarize": modelRefSchema.optional(),
-	"choices": z.array(modelRefSchema).optional(),
-	"providers": providersSchema.optional()
+	"choices": z.array(modelRefSchema).optional()
 }).strict();
 const ignorePathSchema = z.string().min(1).superRefine((value, context) => {
 	const pattern = value.startsWith("!") ? value.slice(1) : value;
@@ -6113,9 +6112,9 @@ const topchesterConfigSchema = z.object({
 	models: z.object({
 		defaultPurpose: modelPurposeSchema.optional(),
 		assignments: z.partialRecord(modelPurposeSchema, modelAssignmentSchema).optional(),
-		choices: z.array(modelChoiceAssignmentSchema).optional(),
-		providers: providersSchema.optional()
+		choices: z.array(modelChoiceAssignmentSchema).optional()
 	}).strict().optional(),
+	providers: providersSchema.optional(),
 	ignore: z.object({ paths: z.array(ignorePathSchema).optional() }).optional(),
 	tools: z.object({ bash: bashPermissionPolicySchema.optional() }).strict().optional(),
 	mcp: mcpConfigSchema.optional(),
@@ -6124,6 +6123,7 @@ const topchesterConfigSchema = z.object({
 });
 const rawTopchesterConfigSchema = z.object({
 	models: rawModelsSchema.optional(),
+	providers: providersSchema.optional(),
 	ignore: z.object({ paths: z.array(ignorePathSchema).optional() }).optional(),
 	tools: z.object({ bash: bashPermissionPolicySchema.optional() }).strict().optional(),
 	mcp: rawMcpConfigSchema.optional(),
@@ -6209,7 +6209,7 @@ async function configureOpenRouterGlobalProvider() {
 	const configPath = getGlobalTopchesterConfigPath();
 	const config = readConfigObject(configPath);
 	const models = ensurePlainObjectProperty(config, "models");
-	const providers = ensurePlainObjectProperty(models, "providers");
+	const providers = ensurePlainObjectProperty(config, "providers");
 	providers.default ??= "openrouter";
 	providers.openrouter = {
 		...openRouterProviderDefaults,
@@ -6226,7 +6226,7 @@ async function configureCodexGlobalProvider() {
 	const configPath = getGlobalTopchesterConfigPath();
 	const config = readConfigObject(configPath);
 	const models = ensurePlainObjectProperty(config, "models");
-	const providers = ensurePlainObjectProperty(models, "providers");
+	const providers = ensurePlainObjectProperty(config, "providers");
 	const existingChoices = ensureStringArrayProperty(models, "choices");
 	const prioritizedChoices = new Set(codexStarterModelChoices);
 	providers.default ??= "codex";
@@ -6285,7 +6285,7 @@ function getConfiguredModelChoices(config) {
 	const seen = /* @__PURE__ */ new Set();
 	const fallbackChoices = [];
 	for (const assignment of assignments) {
-		const provider = assignment.provider ?? config.models?.providers?.default;
+		const provider = assignment.provider ?? config.providers?.default;
 		if (typeof provider !== "string") continue;
 		const choice = {
 			...assignment,
@@ -6454,18 +6454,27 @@ function parseConfigFile(path, value) {
 	return parsed.data;
 }
 function normalizeConfigInput(value) {
-	return normalizeHooksConfigInput(normalizeModelsConfigInput(value));
-}
-function normalizeModelsConfigInput(value) {
-	if (!isPlainObject(value) || !isPlainObject(value.models)) return value;
+	return normalizeHooksConfigInput(normalizeModelsAndProvidersConfigInput(value));
+}
+function normalizeModelsAndProvidersConfigInput(value) {
+	if (!isPlainObject(value)) return value;
+	const providers = isPlainObject(value.providers) ? { ...value.providers } : {};
+	if (!isPlainObject(value.models)) {
+		if (Object.keys(providers).length === 0) return value;
+		applyKnownProviderDefaults(providers);
+		return {
+			...value,
+			providers
+		};
+	}
 	const models = { ...value.models };
-	const providers = isPlainObject(models.providers) ? { ...models.providers } : {};
+	const knownProviders = getKnownModelProviders(providers);
 	const assignments = {};
-	const defaultModelRef = normalizeModelRef(models.default, typeof providers.default === "string" ? providers.default : void 0);
+	const defaultModelRef = normalizeModelRef(models.default, typeof providers.default === "string" ? providers.default : void 0, knownProviders);
 	const defaultProvider = typeof providers.default === "string" ? providers.default : defaultModelRef?.provider;
-	const fastModelRef = normalizeModelRef(models.fast, defaultProvider);
-	const kbSummarizeModelRef = normalizeModelRef(models["kb.summarize"], defaultProvider);
-	const modelChoices = Array.isArray(models.choices) ? models.choices.map((choice) => modelRefToAssignment(normalizeModelRef(choice, void 0) ?? { model: "" })) : void 0;
+	const fastModelRef = normalizeModelRef(models.fast, defaultProvider, knownProviders);
+	const kbSummarizeModelRef = normalizeModelRef(models["kb.summarize"], defaultProvider, knownProviders);
+	const modelChoices = Array.isArray(models.choices) ? models.choices.map((choice) => modelRefToAssignment(normalizeModelRef(choice, void 0, knownProviders) ?? { model: "" })) : void 0;
 	if (defaultModelRef) {
 		const assignment = modelRefToAssignment(defaultModelRef);
 		assignments["agent.primary"] = assignment;
@@ -6491,9 +6500,9 @@ function normalizeModelsConfigInput(value) {
 		models: {
 			...models,
 			assignments,
-			...modelChoices ? { choices: modelChoices } : {},
-			providers
-		}
+			...modelChoices ? { choices: modelChoices } : {}
+		},
+		...Object.keys(providers).length > 0 ? { providers } : {}
 	};
 }
 function normalizeHooksConfigInput(value) {
@@ -6512,8 +6521,8 @@ function normalizeHooksConfigInput(value) {
 		hooks
 	};
 }
-function normalizeModelRef(ref, defaultProvider) {
-	if (typeof ref === "string") return parseModelRef(ref, defaultProvider);
+function normalizeModelRef(ref, defaultProvider, knownProviders = getKnownModelProviders()) {
+	if (typeof ref === "string") return parseModelRef(ref, defaultProvider, knownProviders);
 	if (!isPlainObject(ref) || typeof ref.name !== "string") return;
 	return {
 		model: ref.name,
@@ -6528,7 +6537,12 @@ function modelRefToAssignment(ref) {
 		...ref.toolProtocol ? { toolProtocol: ref.toolProtocol } : {}
 	};
 }
-function parseModelRef(ref, defaultProvider) {
+function parseModelRef(ref, defaultProvider, knownProviders) {
+	const [explicitProvider, ...explicitModelParts] = ref.split("/");
+	if (explicitProvider && explicitModelParts.length > 0 && knownProviders.has(explicitProvider)) return {
+		provider: explicitProvider,
+		model: explicitModelParts.join("/")
+	};
 	if (defaultProvider) {
 		const providerPrefix = `${defaultProvider}/`;
 		return ref.startsWith(providerPrefix) ? {
@@ -6546,6 +6560,13 @@ function parseModelRef(ref, defaultProvider) {
 	};
 	return { model: ref };
 }
+function getKnownModelProviders(providers = {}) {
+	return new Set([
+		"openrouter",
+		"codex",
+		...Object.keys(providers).filter((provider) => provider !== "default")
+	]);
+}
 function ensureKnownProvider(providers, provider) {
 	if (provider === "openrouter" && providers.openrouter === void 0) {
 		providers.openrouter = { ...openRouterProviderDefaults };
@@ -6681,7 +6702,7 @@ function createModelGatewayFromConfig(config) {
 	return new ModelGateway(normalizeModelGatewayConfig(config));
 }
 function normalizeModelGatewayConfig(config) {
-	const { default: defaultProvider, ...namedProviders } = config.models?.providers ?? {};
+	const { default: defaultProvider, ...namedProviders } = config.providers ?? {};
 	return {
 		defaultPurpose: config.models?.defaultPurpose ?? "agent.primary",
 		models: config.models?.assignments ?? {},
@@ -10070,7 +10091,7 @@ var PromptHistory = class {
 const STARTUP_PROMPT_HINT = "Prompt hint: Enter sends, Shift+Enter adds a line, / opens commands, ↑↓ browse history.";
 function getStartupThreadMessages(context) {
 	const assignments = context.config.models?.assignments ?? {};
-	const providers = context.config.models?.providers ?? {};
+	const providers = context.config.providers ?? {};
 	const banner = getRandomAsciiBanner();
 	const lines = banner ? [
 		"",
@@ -10107,7 +10128,7 @@ function getStartupThreadMessages(context) {
 }
 function getModelSetupHint(context) {
 	const assignments = context.config.models?.assignments ?? {};
-	const providers = context.config.models?.providers ?? {};
+	const providers = context.config.providers ?? {};
 	const hasAssignments = Object.keys(assignments).length > 0;
 	const hasProviders = Object.entries(providers).some(([providerId]) => providerId !== "default");
 	if (hasAssignments && hasProviders) return;
@@ -10177,7 +10198,7 @@ function getModelLabel(context) {
 	const purpose = context.config.models?.defaultPurpose ?? "agent.primary";
 	const model = context.config.models?.assignments?.[purpose] ?? context.config.models?.assignments?.fallback;
 	if (!model) return "not set";
-	const provider = model.provider ?? context.config.models?.providers?.default;
+	const provider = model.provider ?? context.config.providers?.default;
 	return typeof provider === "string" ? `${model.name} [${provider}]` : model.name;
 }
 //#endregion
@@ -15199,7 +15220,7 @@ function formatModelHints(config) {
 	];
 }
 function formatProviderHints(config, authStoreStatus) {
-	const providers = config.models?.providers ?? {};
+	const providers = config.providers ?? {};
 	const namedProviders = Object.entries(providers).filter(([providerId]) => providerId !== "default");
 	if (namedProviders.length === 0) return [section("providers"), row("configured", status("none", "muted"))];
 	const lines = [section("providers")];
@@ -15446,7 +15467,7 @@ function createTopchesterProgram() {
 }
 function printStartupSummary(context) {
 	const assignments = context.config.models?.assignments ?? {};
-	const providers = context.config.models?.providers ?? {};
+	const providers = context.config.providers ?? {};
 	console.log(`workspace: ${context.workspaceRoot}`);
 	console.log(`default model purpose: ${context.config.models?.defaultPurpose ?? "agent.primary"}`);
 	if (context.devFlags.size > 0) console.log(`dev flags: ${[...context.devFlags].join(", ")}`);
@@ -15629,4 +15650,4 @@ function formatDryRunSyncStatus(status) {
 //#endregion
 export { runTopchesterCli as t };
 
-//# sourceMappingURL=cli-yf0DNAUH.mjs.map
+//# sourceMappingURL=cli-CqFhOvlt.mjs.map