topchester-ai 0.52.0 → 0.54.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-D1d-I3Fi.mjs";
 //#region src/bin.ts
 await runTopchesterCli();
 //#endregion

package/dist/{cli-yf0DNAUH.mjs → cli-D1d-I3Fi.mjs}

@@ -127,13 +127,13 @@ function extractAccountIdFromClaims(claims) {
 	const flatClaim = getStringProperty(claims, "chatgpt_account_id");
 	if (flatClaim) return flatClaim;
 	const authClaims = claims["https://api.openai.com/auth"];
-	if (isPlainObject$2(authClaims)) {
+	if (isPlainObject$3(authClaims)) {
 		const namespacedClaim = getStringProperty(authClaims, "chatgpt_account_id");
 		if (namespacedClaim) return namespacedClaim;
 	}
 	const organizations = claims.organizations;
 	if (Array.isArray(organizations)) {
-		const firstOrganization = organizations.find(isPlainObject$2);
+		const firstOrganization = organizations.find(isPlainObject$3);
 		const organizationId = firstOrganization ? getStringProperty(firstOrganization, "id") : void 0;
 		if (organizationId) return organizationId;
 	}
@@ -143,7 +143,7 @@ function parseJwtClaims(token) {
 	if (!parts || parts.length !== 3 || !parts[1]) return;
 	try {
 		const parsed = JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8"));
-		return isPlainObject$2(parsed) ? parsed : void 0;
+		return isPlainObject$3(parsed) ? parsed : void 0;
 	} catch {
 		return;
 	}
@@ -190,7 +190,7 @@ async function readJsonObject(response, label) {
 	} catch (error) {
 		throw new CodexAuthError("invalid_response", `Invalid Codex ${label}: ${formatErrorMessage$4(error)}.`);
 	}
-	if (!isPlainObject$2(parsed)) throw new CodexAuthError("invalid_response", `Invalid Codex ${label}: expected an object.`);
+	if (!isPlainObject$3(parsed)) throw new CodexAuthError("invalid_response", `Invalid Codex ${label}: expected an object.`);
 	return parsed;
 }
 function isPendingDeviceAuthResponse(response) {
@@ -214,7 +214,7 @@ function optionalPositiveNumber(value) {
 	const parsed = typeof value === "number" ? value : typeof value === "string" ? Number(value) : NaN;
 	return Number.isFinite(parsed) && parsed > 0 ? parsed : void 0;
 }
-function isPlainObject$2(value) {
+function isPlainObject$3(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function formatErrorMessage$4(error) {
@@ -325,13 +325,13 @@ async function getAuthStoreStatus(options = {}) {
 	}
 }
 function parseAuthStore(path, value) {
-	if (!isPlainObject$1(value)) throw new AuthStoreError(path, "<root>: expected an object");
+	if (!isPlainObject$2(value)) throw new AuthStoreError(path, "<root>: expected an object");
 	if (value.version !== 1) throw new AuthStoreError(path, "version: expected 1");
-	if (!isPlainObject$1(value.providers)) throw new AuthStoreError(path, "providers: expected an object");
+	if (!isPlainObject$2(value.providers)) throw new AuthStoreError(path, "providers: expected an object");
 	const providers = {};
 	for (const [providerId, providerRecord] of Object.entries(value.providers)) {
 		if (!providerId) throw new AuthStoreError(path, "providers: provider id must not be empty");
-		if (!isPlainObject$1(providerRecord)) throw new AuthStoreError(path, `providers.${providerId}: expected an object`);
+		if (!isPlainObject$2(providerRecord)) throw new AuthStoreError(path, `providers.${providerId}: expected an object`);
 		providers[providerId] = parseProviderRecord(path, providerId, providerRecord);
 	}
 	return {
@@ -392,7 +392,7 @@ async function setModeIfSupported(path, mode) {
 		throw error;
 	});
 }
-function isPlainObject$1(value) {
+function isPlainObject$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isNodeError$4(error) {
@@ -5335,6 +5335,7 @@ function createCodexProviderFetch(options = {}) {
 	const providerId = options.providerId ?? "codex";
 	const upstreamFetch = options.fetch ?? fetch;
 	return (async (input, init) => {
+		const request = await rewriteCodexRequest(input, init);
 		const auth = await resolveCodexAuth({
 			...options,
 			providerId,
@@ -5344,10 +5345,13 @@ function createCodexProviderFetch(options = {}) {
 		headers.delete("authorization");
 		headers.set("Authorization", `Bearer ${auth.accessToken}`);
 		if (auth.accountId) headers.set("ChatGPT-Account-Id", auth.accountId);
-		return upstreamFetch(rewriteCodexRequestUrl(input), {
-			...init,
+		const response = await upstreamFetch(request.input, {
+			...request.init,
 			headers
 		});
+		if (request.responseMode === "chat-json") return codexResponsesSseToChatJson(response);
+		if (request.responseMode === "chat-sse") return codexResponsesSseToChatSse(response);
+		return response;
 	});
 }
 function rewriteCodexRequestUrl(input) {
@@ -5360,6 +5364,193 @@ function rewriteCodexRequestUrl(input) {
 	}
 	return input;
 }
+async function rewriteCodexRequest(input, init) {
+	const rewrittenUrl = rewriteCodexRequestUrl(input);
+	const body = await readJsonBody(init?.body);
+	if (!isChatCompletionsBody(body)) return {
+		input: rewrittenUrl,
+		...init ? { init } : {}
+	};
+	const stream = body.stream === true;
+	const codexBody = chatCompletionsBodyToCodexResponsesBody(body);
+	const headers = new Headers(init?.headers);
+	headers.set("Content-Type", "application/json");
+	return {
+		input: rewrittenUrl,
+		init: {
+			...init,
+			headers,
+			body: JSON.stringify(codexBody)
+		},
+		responseMode: stream ? "chat-sse" : "chat-json"
+	};
+}
+function chatCompletionsBodyToCodexResponsesBody(body) {
+	const instructions = body.messages.filter((message) => message.role === "system" || message.role === "developer").map((message) => messageContentToText(message.content)).filter((text) => text.trim().length > 0).join("\n\n");
+	const input = body.messages.filter((message) => message.role !== "system" && message.role !== "developer").map(chatMessageToResponseInputItem).filter((item) => item !== void 0);
+	return {
+		model: body.model,
+		instructions: instructions || "You are a helpful assistant.",
+		input,
+		store: false,
+		stream: true,
+		...typeof body.temperature === "number" ? { temperature: body.temperature } : {},
+		...typeof body.top_p === "number" ? { top_p: body.top_p } : {},
+		...typeof body.max_tokens === "number" ? { max_output_tokens: body.max_tokens } : {}
+	};
+}
+function chatMessageToResponseInputItem(message) {
+	const text = messageContentToText(message.content);
+	if (!text.trim()) return;
+	return {
+		type: "message",
+		role: message.role === "assistant" ? "assistant" : "user",
+		content: [{
+			type: message.role === "assistant" ? "output_text" : "input_text",
+			text
+		}]
+	};
+}
+async function codexResponsesSseToChatJson(response) {
+	if (!response.ok) return response;
+	const parsed = parseCodexResponsesSse(await response.text());
+	const headers = new Headers(response.headers);
+	headers.set("Content-Type", "application/json");
+	return new Response(JSON.stringify({
+		id: parsed.id ?? "codex-response",
+		object: "chat.completion",
+		created: parsed.created ?? Math.floor(Date.now() / 1e3),
+		model: parsed.model ?? "codex",
+		choices: [{
+			index: 0,
+			finish_reason: "stop",
+			message: {
+				role: "assistant",
+				content: parsed.text
+			}
+		}],
+		...parsed.usage ? { usage: parsed.usage } : {}
+	}), {
+		status: response.status,
+		statusText: response.statusText,
+		headers
+	});
+}
+async function codexResponsesSseToChatSse(response) {
+	if (!response.ok) return response;
+	const parsed = parseCodexResponsesSse(await response.text());
+	const encoder = new TextEncoder();
+	const id = parsed.id ?? "codex-response";
+	const created = parsed.created ?? Math.floor(Date.now() / 1e3);
+	const model = parsed.model ?? "codex";
+	const chunks = [
+		{
+			id,
+			object: "chat.completion.chunk",
+			created,
+			model,
+			choices: [{
+				index: 0,
+				delta: { role: "assistant" },
+				finish_reason: null
+			}]
+		},
+		...(parsed.text.match(/[\s\S]{1,2048}/gu) ?? []).map((delta) => ({
+			id,
+			object: "chat.completion.chunk",
+			created,
+			model,
+			choices: [{
+				index: 0,
+				delta: { content: delta },
+				finish_reason: null
+			}]
+		})),
+		{
+			id,
+			object: "chat.completion.chunk",
+			created,
+			model,
+			choices: [{
+				index: 0,
+				delta: {},
+				finish_reason: "stop"
+			}],
+			...parsed.usage ? { usage: parsed.usage } : {}
+		}
+	];
+	const stream = new ReadableStream({ start(controller) {
+		for (const chunk of chunks) controller.enqueue(encoder.encode(`data: ${JSON.stringify(chunk)}\n\n`));
+		controller.enqueue(encoder.encode("data: [DONE]\n\n"));
+		controller.close();
+	} });
+	const headers = new Headers(response.headers);
+	headers.set("Content-Type", "text/event-stream");
+	return new Response(stream, {
+		status: response.status,
+		statusText: response.statusText,
+		headers
+	});
+}
+function parseCodexResponsesSse(source) {
+	let text = "";
+	let response;
+	for (const event of source.split(/\n\n/u)) {
+		const dataLines = event.split(/\r?\n/u).filter((line) => line.startsWith("data:")).map((line) => line.slice(5).trimStart());
+		if (dataLines.length === 0) continue;
+		const data = dataLines.join("\n");
+		if (data === "[DONE]") continue;
+		const parsed = safeJsonParse(data);
+		if (!isPlainObject$1(parsed)) continue;
+		if (parsed.type === "response.output_text.delta" && typeof parsed.delta === "string") text += parsed.delta;
+		if (parsed.type === "response.completed" && isPlainObject$1(parsed.response)) response = parsed.response;
+	}
+	return {
+		...typeof response?.id === "string" ? { id: response.id } : {},
+		...typeof response?.created_at === "number" ? { created: response.created_at } : {},
+		...typeof response?.model === "string" ? { model: response.model } : {},
+		text,
+		...normalizeCodexUsage(response?.usage)
+	};
+}
+function normalizeCodexUsage(usage) {
+	if (!isPlainObject$1(usage)) return {};
+	const promptTokens = typeof usage.input_tokens === "number" ? usage.input_tokens : void 0;
+	const completionTokens = typeof usage.output_tokens === "number" ? usage.output_tokens : void 0;
+	const totalTokens = typeof usage.total_tokens === "number" ? usage.total_tokens : void 0;
+	return { usage: {
+		...promptTokens === void 0 ? {} : { prompt_tokens: promptTokens },
+		...completionTokens === void 0 ? {} : { completion_tokens: completionTokens },
+		...totalTokens === void 0 ? {} : { total_tokens: totalTokens }
+	} };
+}
+async function readJsonBody(body) {
+	if (typeof body !== "string") return;
+	return safeJsonParse(body);
+}
+function safeJsonParse(source) {
+	try {
+		return JSON.parse(source);
+	} catch {
+		return;
+	}
+}
+function isChatCompletionsBody(value) {
+	return isPlainObject$1(value) && typeof value.model === "string" && Array.isArray(value.messages) && value.messages.every((message) => isPlainObject$1(message) && typeof message.role === "string");
+}
+function messageContentToText(content) {
+	if (typeof content === "string") return content;
+	if (!Array.isArray(content)) return "";
+	return content.map((part) => {
+		if (!isPlainObject$1(part)) return "";
+		if (typeof part.text === "string") return part.text;
+		if (typeof part.content === "string") return part.content;
+		return "";
+	}).filter(Boolean).join("\n");
+}
+function isPlainObject$1(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 async function resolveCodexAuth(options = {}) {
 	const providerId = options.providerId ?? "codex";
 	const record = (await readAuthStore({ path: options.authStorePath })).providers[providerId];
@@ -5972,8 +6163,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 +6303,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 +6314,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(),
@@ -6197,7 +6388,8 @@ const openRouterProviderDefaults = {
 };
 const codexProviderDefaults = {
 	type: "openai-compatible",
-	baseURL: CODEX_BACKEND_BASE_URL
+	baseURL: CODEX_BACKEND_BASE_URL,
+	toolProtocol: "text-json"
 };
 const codexStarterModelChoices = [
 	"codex/gpt-5.5",
@@ -6209,7 +6401,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 +6418,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 +6477,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 +6646,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 +6692,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 +6713,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 +6729,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 +6752,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 +6894,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 +10283,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 +10320,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 +10390,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 +15412,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 +15659,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 +15842,4 @@ function formatDryRunSyncStatus(status) {
 //#endregion
 export { runTopchesterCli as t };
 
-//# sourceMappingURL=cli-yf0DNAUH.mjs.map
+//# sourceMappingURL=cli-D1d-I3Fi.mjs.map