topchester-ai 0.43.0 → 0.44.0

package/README.md

@@ -117,16 +117,12 @@ Do not commit API keys. Put keys in environment variables, a user config file, o
 
 Topchester reads config in this order, with later entries overriding earlier ones:
 
-1. `~/.config/topchester/config.yaml`
+1. `topchester.jsonc`
 2. `~/.config/topchester/config.jsonc`
-3. `topchester.yaml`
-4. `topchester.jsonc`
-5. `.topchester/config.local.yaml`
-6. `.topchester/config.local.jsonc`
-7. `TOPCHESTER_CONFIG`
-8. `--config <path>`
+3. `TOPCHESTER_CONFIG`
+4. `--config <path>`
 
-Prefer `topchester.jsonc` for new project config. YAML paths are kept for compatibility.
+On first startup, Topchester creates `~/.config/topchester/config.jsonc` with a commented minimal example. Uncomment it to set your personal default model, or keep shared project policy in `topchester.jsonc`.
 
 ## How The Knowledge Base Works
 
@@ -166,11 +162,12 @@ The package name is `topchester-ai`; the installed command is `topchester`.
 ## Read More
 
 - [Onboarding](onboarding.md)
-- [CLI Commands](docs/cli.md)
-- [TUI Guide](docs/tui.md)
-- [Skills](docs/skills.md)
-- [Configuration](docs/config.md)
-- [Model Configuration](docs/MODEL_CONFIG.md)
-- [Knowledge System](docs/KNOWLEDGE.md)
-- [Architecture](docs/ARCHITECTURE.md)
-- [Sessions](docs/SESSIONS.md)
+- [Docs](docs/README.md)
+- [Quickstart](docs/getting-started/quickstart.md)
+- [CLI Commands](docs/reference/cli.md)
+- [TUI](docs/features/tui.md)
+- [Skills](docs/features/skills.md)
+- [Configuration](docs/configuration/config-files.md)
+- [Models and providers](docs/configuration/models-and-providers.md)
+- [Knowledge base](docs/features/knowledge-base.md)
+- [Sessions](docs/features/sessions.md)

package/dist/bin.mjs

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

package/dist/{cli-CVWQPq7z.mjs → cli-Cz5puJBe.mjs}

@@ -7,9 +7,9 @@ import { generateText, stepCountIs, streamText, tool } from "ai";
 import { ZodError, z } from "zod";
 import { access, mkdir, open, readFile, readdir, realpath, rename, rm, stat, truncate, writeFile } from "node:fs/promises";
 import { execFile, spawn } from "node:child_process";
-import { constants, existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
+import { constants, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
-import { parse as parse$1, parseDocument } from "yaml";
+import { parseDocument } from "yaml";
 import { fileURLToPath } from "node:url";
 import { homedir } from "node:os";
 import pino from "pino";
@@ -5668,12 +5668,18 @@ function ensureGlobalTopchesterConfigDir() {
 	});
 	return dir;
 }
+function ensureGlobalTopchesterConfigFile() {
+	const configPath = getGlobalTopchesterConfigPath();
+	if (!existsSync(configPath)) {
+		ensureGlobalTopchesterConfigDir();
+		writeFileSync(configPath, getCommentedStarterConfig(), { mode: 384 });
+	}
+	return configPath;
+}
 function loadTopchesterConfig(options) {
 	const globalConfigDir = getGlobalTopchesterConfigDir();
 	const paths = [
-		join(options.workspaceRoot, "topchester.yaml"),
 		join(options.workspaceRoot, "topchester.jsonc"),
-		join(globalConfigDir, "config.yaml"),
 		join(globalConfigDir, "config.jsonc"),
 		process.env.TOPCHESTER_CONFIG,
 		options.configPath
@@ -5821,11 +5827,100 @@ function ensureStringArrayProperty(parent, key) {
 }
 function readConfigFile(path) {
 	try {
-		return parse$1(readFileSync(path, "utf8"));
+		return parseJsonc(readFileSync(path, "utf8"));
 	} catch (error) {
 		throw new Error(`Invalid Topchester config at ${path}: ${formatErrorMessage$1(error)}`);
 	}
 }
+function parseJsonc(source) {
+	const stripped = stripJsoncSyntax(source);
+	return stripped.trim() ? JSON.parse(stripped) : {};
+}
+function getCommentedStarterConfig() {
+	return [
+		"// Uncomment and edit this minimal config to choose a default model.",
+		"// {",
+		"//   \"models\": {",
+		"//     \"default\": \"openrouter/google/gemini-3.1-flash-lite\",",
+		"//   },",
+		"// }",
+		""
+	].join("\n");
+}
+function stripJsoncSyntax(source) {
+	let output = "";
+	let inString = false;
+	let escaped = false;
+	for (let index = 0; index < source.length; index += 1) {
+		const char = source[index];
+		const next = source[index + 1];
+		if (inString) {
+			output += char;
+			if (escaped) escaped = false;
+			else if (char === "\\") escaped = true;
+			else if (char === "\"") inString = false;
+			continue;
+		}
+		if (char === "\"") {
+			inString = true;
+			output += char;
+			continue;
+		}
+		if (char === "/" && next === "/") {
+			output += "  ";
+			index += 2;
+			while (index < source.length && source[index] !== "\n" && source[index] !== "\r") {
+				output += " ";
+				index += 1;
+			}
+			index -= 1;
+			continue;
+		}
+		if (char === "/" && next === "*") {
+			output += "  ";
+			index += 2;
+			while (index < source.length && !(source[index] === "*" && source[index + 1] === "/")) {
+				output += source[index] === "\n" || source[index] === "\r" ? source[index] : " ";
+				index += 1;
+			}
+			if (index < source.length) {
+				output += "  ";
+				index += 1;
+			}
+			continue;
+		}
+		if (char === "," && isTrailingJsonComma(source, index + 1)) {
+			output += " ";
+			continue;
+		}
+		output += char;
+	}
+	return output;
+}
+function isTrailingJsonComma(source, startIndex) {
+	let index = startIndex;
+	while (index < source.length) {
+		const char = source[index];
+		const next = source[index + 1];
+		if (/\s/u.test(char)) {
+			index += 1;
+			continue;
+		}
+		if (char === "/" && next === "/") {
+			index += 2;
+			while (index < source.length && source[index] !== "\n" && source[index] !== "\r") index += 1;
+			continue;
+		}
+		if (char === "/" && next === "*") {
+			index += 2;
+			while (index < source.length && !(source[index] === "*" && source[index + 1] === "/")) index += 1;
+			index += 2;
+			continue;
+		}
+		return char === "}" || char === "]";
+	}
+	return false;
+}
 function parseConfigFile(path, value) {
 	const raw = rawTopchesterConfigSchema.safeParse(value ?? {});
 	if (!raw.success) throw new Error(`Invalid Topchester config at ${path}: ${raw.error.issues.map(formatZodIssue).join("; ")}`);
@@ -6041,7 +6136,7 @@ function normalizeLogLevel(level) {
 //#endregion
 //#region src/app/context.ts
 function createAppContext(options) {
-	ensureGlobalTopchesterConfigDir();
+	ensureGlobalTopchesterConfigFile();
 	const config = loadTopchesterConfig(options);
 	const modelGateway = createModelGatewayFromConfig(config);
 	const loggerInfo = createTopchesterLogger(options.workspaceRoot);
@@ -12050,6 +12145,11 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 				else {
 					const approval = await this.resolveBashApproval(executableToolCall, toolCall.id, options, session, abortSignal);
 					for (const event of approval.events) yield event;
+					if (approval.cancelled && approval.stopped) {
+						if (!approval.events.some((event) => event.type === "message" && event.text === approval.reason)) yield agentEvent.systemMessage(approval.reason);
+						yield agentEvent.status("ready");
+						return;
+					}
 					if (approval.cancelled) toolResult = createToolErrorResult(executableToolCall.tool, approval.reason);
 					else {
 						const toolEventQueue = createRuntimeEventQueue();
@@ -12293,9 +12393,15 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 			abortSignal
 		});
 		const events = this.hookResultToEvents(actionRequiredHook);
-		if (actionRequiredHook.blocked || actionRequiredHook.stopped) return {
+		if (actionRequiredHook.stopped) return {
+			cancelled: true,
+			stopped: true,
+			reason: actionRequiredHook.stopped.message,
+			events
+		};
+		if (actionRequiredHook.blocked) return {
 			cancelled: true,
-			reason: (actionRequiredHook.blocked ?? actionRequiredHook.stopped).message,
+			reason: actionRequiredHook.blocked.message,
 			events
 		};
 		const approval = await options.requestBashApproval({
@@ -14163,4 +14269,4 @@ function formatDryRunSyncStatus(status) {
 //#endregion
 export { runTopchesterCli as t };
 
-//# sourceMappingURL=cli-CVWQPq7z.mjs.map
+//# sourceMappingURL=cli-Cz5puJBe.mjs.map