topchester-ai 0.30.0 → 0.32.0

package/dist/bin.mjs

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

package/dist/{cli-B28k9Fn0.mjs → cli-lwrowwaC.mjs}

@@ -952,8 +952,8 @@ function summarizeDiff(diff) {
 	let removed = 0;
 	for (const line of diff.split("\n")) {
 		if (line.startsWith("+++") || line.startsWith("---")) continue;
-		if (line.startsWith("+")) added += 1;
-		else if (line.startsWith("-")) removed += 1;
+		if (line.startsWith("+") || /^\+\s*\d+ \|/.test(line)) added += 1;
+		else if (line.startsWith("-") || /^-\s*\d+ \|/.test(line)) removed += 1;
 	}
 	return `+${added}/-${removed}`;
 }
@@ -1047,12 +1047,17 @@ function createUnifiedDiff(path, oldContent, newContent) {
 		`+++ b/${path}`,
 		`@@ -${formatHunkRange(hunkOldStart, hunkOldEnd)} +${formatHunkRange(hunkNewStart, hunkNewEnd)} @@`
 	];
-	for (let index = hunkOldStart; index < prefixLength; index += 1) lines.push(` ${oldLines[index]}`);
-	for (let index = prefixLength; index < oldChangedEnd; index += 1) lines.push(`-${oldLines[index]}`);
-	for (let index = prefixLength; index < newChangedEnd; index += 1) lines.push(`+${newLines[index]}`);
-	for (let index = newChangedEnd; index < hunkNewEnd; index += 1) lines.push(` ${newLines[index]}`);
+	const oldLineNumberWidth = String(Math.max(1, hunkOldEnd)).length;
+	const newLineNumberWidth = String(Math.max(1, hunkNewEnd)).length;
+	for (let index = hunkOldStart; index < prefixLength; index += 1) lines.push(formatDiffLine(" ", index + 1, oldLineNumberWidth, oldLines[index]));
+	for (let index = prefixLength; index < oldChangedEnd; index += 1) lines.push(formatDiffLine("-", index + 1, oldLineNumberWidth, oldLines[index]));
+	for (let index = prefixLength; index < newChangedEnd; index += 1) lines.push(formatDiffLine("+", index + 1, newLineNumberWidth, newLines[index]));
+	for (let index = newChangedEnd; index < hunkNewEnd; index += 1) lines.push(formatDiffLine(" ", index + 1, newLineNumberWidth, newLines[index]));
 	return lines.join("\n");
 }
+function formatDiffLine(prefix, lineNumber, width, content) {
+	return `${prefix}${String(lineNumber).padStart(width, " ")} │ ${content}`;
+}
 function formatHunkRange(startIndex, endIndex) {
 	const lineCount = endIndex - startIndex;
 	return `${lineCount === 0 ? startIndex : startIndex + 1},${lineCount}`;
@@ -10777,7 +10782,7 @@ function formatToolResultForPrompt(result) {
 		`bytes_changed: ${result.bytesChanged}`,
 		`first_changed_line: ${result.firstChangedLine}`,
 		"```diff",
-		result.diff,
+		formatDiffForPrompt(result.diff),
 		"```"
 	].join("\n");
 	if (result.tool === "write_file" && "hash" in result) return [
@@ -11020,6 +11025,9 @@ function formatWriteFileChangeSummary(result) {
 	if (result?.tool !== "write_file" || isToolErrorResult(result) || !("writeEvent" in result)) return "";
 	return ` (${result.writeEvent.writeSummary})`;
 }
+function formatDiffForPrompt(diff) {
+	return diff.split("\n").map((line) => line.replace(/^([ +-])\s*\d+\s+│\s?/u, "$1")).join("\n");
+}
 function isProjectInstructionRetryResult(result) {
 	return Boolean(!isToolErrorResult(result) && result.projectInstructions && (result.tool === "edit_file" || result.tool === "write_file"));
 }
@@ -11310,7 +11318,6 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 		for (let toolCalls = 0; toolCalls <= MAX_TOOL_CALLS_PER_TURN; toolCalls += 1) {
 			const startedAt = Date.now();
 			const projectInstructions = await this.resolveBaseProjectInstructions();
-			for (const sourceKey of projectInstructions.sourceKeys) projectInstructionToolState.shownSourceKeys.add(sourceKey);
 			for (const event of createInstructionContextEventsFromProjectInstructions(projectInstructions, persistedProjectInstructionKeys)) yield event;
 			const system = this.buildSystemPromptWithProjectInstructions({
 				profile,
@@ -13385,12 +13392,37 @@ async function runSelfUpdate(options = {}) {
 	if (code !== 0) throw new Error(`Update command failed with exit code ${code ?? "unknown"}: ${updateCommand.display}`);
 	return updateCommand;
 }
+async function checkSelfUpdate(options) {
+	const updateCommand = createSelfUpdateCommand(options);
+	if (!updateCommand) throw new Error(formatSelfUpdateUnsupportedMessage());
+	const args = [
+		"view",
+		`${TOPCHESTER_PACKAGE_NAME}@${updateCommand.target}`,
+		"version"
+	];
+	const result = await (options.runner ?? defaultSelfUpdateCheckRunner)(updateCommand.command, args);
+	if (result.code !== 0) throw new Error(`Update check failed with exit code ${result.code ?? "unknown"}: ${[updateCommand.command, ...args].map(quoteDisplayArg).join(" ")}`);
+	const availableVersion = result.stdout.trim().split(/\s+/).at(-1) ?? "";
+	if (!availableVersion) throw new Error("Update check did not return an available version.");
+	return {
+		command: updateCommand,
+		currentVersion: normalizeTarget(options.currentVersion),
+		availableVersion: normalizeTarget(availableVersion),
+		updateAvailable: normalizeTarget(options.currentVersion) !== normalizeTarget(availableVersion)
+	};
+}
 function formatSelfUpdateUnsupportedMessage() {
 	return ["Could not detect whether Topchester was installed with npm, pnpm, or bun.", `Update it with the package manager that installed it, for example: npm install -g ${TOPCHESTER_PACKAGE_NAME}@latest`].join("\n");
 }
 function formatSelfUpdateSuccess(command) {
 	return [`Updated Topchester with ${command.display}.`, "Restart Topchester to use the new version."];
 }
+function formatSelfUpdateCheckResult(result) {
+	const lines = [`Current Topchester version: ${result.currentVersion}`, `Available Topchester version: ${result.availableVersion}`];
+	if (result.updateAvailable) lines.push(`Update available. Run ${result.command.display} to install it.`);
+	else lines.push("Topchester is already up to date.");
+	return lines;
+}
 function normalizeTarget(target = "latest") {
 	const trimmed = target.trim();
 	if (!trimmed) return "latest";
@@ -13410,6 +13442,28 @@ function defaultSelfUpdateRunner(command, args) {
 		child.on("close", resolve);
 	});
 }
+function defaultSelfUpdateCheckRunner(command, args) {
+	return new Promise((resolve, reject) => {
+		let stdout = "";
+		const child = spawn(command, args, {
+			stdio: [
+				"ignore",
+				"pipe",
+				"inherit"
+			],
+			shell: process.platform === "win32"
+		});
+		child.stdout?.setEncoding("utf8");
+		child.stdout?.on("data", (chunk) => {
+			stdout += chunk;
+		});
+		child.on("error", reject);
+		child.on("close", (code) => resolve({
+			code,
+			stdout
+		}));
+	});
+}
 //#endregion
 //#region src/cli.ts
 async function runTopchesterCli(argv = process.argv, options = {}) {
@@ -13419,7 +13473,7 @@ async function runTopchesterCli(argv = process.argv, options = {}) {
 }
 function createTopchesterProgram() {
 	const program = new Command();
-	program.name("topchester").description("KB-first terminal coding agent").version(getTopchesterVersion());
+	program.name("topchester").description("KB-first terminal coding agent").version(getTopchesterVersion()).configureHelp({ helpWidth: 120 });
 	program.option("-c, --config <path>", "explicit config file path").option("--workspace <path>", "workspace root", cwd()).option("--resume <session>", "resume a project session: latest or an exact session id").option("--dev <flag>", "enable a development flag", collectDevFlag, []);
 	program.action(async () => {
 		const context = createContextFromOptions(program);
@@ -13506,8 +13560,16 @@ function createTopchesterProgram() {
 		const result = await ui.spinner("Checking KB file status...", async () => filterNonCleanKnowledgeCompileResult(await dryRunKnowledgeCompile(context.workspaceRoot, { config: context.config })));
 		console.log(formatKnowledgeCompileStatusResult(result, { formatSyncStatus: formatDryRunSyncStatus }).join("\n"));
 	});
-	program.command("update").alias("upgrade").description("update Topchester with the package manager that installed it").argument("[target]", "version or npm dist tag to install", "latest").action(async (target) => {
+	program.command("update").alias("upgrade").description("update Topchester with the package manager that installed it").argument("[target]", "version or npm dist tag to install", "latest").option("--check", "check the available version without updating").action(async (target, options) => {
 		try {
+			if (options.check) {
+				const result = await checkSelfUpdate({
+					target,
+					currentVersion: getTopchesterVersion()
+				});
+				console.log(formatSelfUpdateCheckResult(result).join("\n"));
+				return;
+			}
 			const command = await runSelfUpdate({ target });
 			console.log(formatSelfUpdateSuccess(command).join("\n"));
 		} catch (error) {
@@ -13603,4 +13665,4 @@ function formatDryRunSyncStatus(status) {
 //#endregion
 export { runTopchesterCli as t };
 
-//# sourceMappingURL=cli-B28k9Fn0.mjs.map
+//# sourceMappingURL=cli-lwrowwaC.mjs.map