topchester-ai 0.22.0 → 0.23.0

package/dist/cli.mjs

@@ -98,7 +98,7 @@ async function enqueueFileMutation(path, mutate) {
 }
 //#endregion
 //#region src/agent/instructions.ts
-const PROJECT_INSTRUCTION_FILENAMES = ["AGENTS.override.md", "AGENTS.md"];
+const PROJECT_INSTRUCTION_FILENAMES = ["AGENTS.md", "AGENTS.override.md"];
 async function resolveProjectInstructions(workspaceRoot, options = {}) {
 	const filenames = getProjectInstructionFilenames(options);
 	if (filenames.length === 0) return {
@@ -114,21 +114,23 @@ async function resolveProjectInstructions(workspaceRoot, options = {}) {
 	const sources = [];
 	let remainingBytes = Math.max(0, maxTotalBytes);
 	for (const directory of directories) {
-		const candidate = await readFirstInstructionCandidate(resolvedWorkspace, directory, filenames, options.logger);
-		if (!candidate) continue;
-		const scopedContentLimit = Math.min(Math.max(0, maxBytesPerFile), remainingBytes);
-		const content = truncateUtf8(candidate.content, scopedContentLimit);
-		const truncated = content !== candidate.content;
-		remainingBytes -= Buffer.byteLength(content, "utf8");
-		sources.push({
-			path: candidate.absolutePath,
-			relativePath: candidate.relativePath,
-			scopePath: formatScopePath(relative(resolvedWorkspace, directory)),
-			depth: getScopeDepth(relative(resolvedWorkspace, directory)),
-			bytes: candidate.bytes,
-			truncated,
-			content
-		});
+		const candidates = await readInstructionCandidates(resolvedWorkspace, directory, filenames, options.logger);
+		if (candidates.length === 0) continue;
+		for (const candidate of candidates) {
+			const scopedContentLimit = Math.min(Math.max(0, maxBytesPerFile), remainingBytes);
+			const content = truncateUtf8(candidate.content, scopedContentLimit);
+			const truncated = content !== candidate.content;
+			remainingBytes -= Buffer.byteLength(content, "utf8");
+			sources.push({
+				path: candidate.absolutePath,
+				relativePath: candidate.relativePath,
+				scopePath: formatScopePath(relative(resolvedWorkspace, directory)),
+				depth: getScopeDepth(relative(resolvedWorkspace, directory)),
+				bytes: candidate.bytes,
+				truncated,
+				content
+			});
+		}
 	}
 	options.logger?.debug({
 		event: "project_instructions_resolved",
@@ -212,7 +214,8 @@ function getInstructionDirectories(resolvedWorkspace, targetDirectory) {
 	}
 	return directories;
 }
-async function readFirstInstructionCandidate(resolvedWorkspace, directory, filenames, logger) {
+async function readInstructionCandidates(resolvedWorkspace, directory, filenames, logger) {
+	const candidates = [];
 	for (const filename of filenames) {
 		const absolutePath = resolve(directory, filename);
 		const relativePath = formatRelativePath(relative(resolvedWorkspace, absolutePath));
@@ -235,12 +238,12 @@ async function readFirstInstructionCandidate(resolvedWorkspace, directory, filen
 				}, "project instruction skipped");
 				continue;
 			}
-			return {
+			candidates.push({
 				absolutePath,
 				relativePath,
 				content,
 				bytes: bytes.byteLength
-			};
+			});
 		} catch (error) {
 			const code = typeof error === "object" && error && "code" in error ? String(error.code) : void 0;
 			if (code === "ENOENT" || code === "ENOTDIR") continue;
@@ -252,6 +255,7 @@ async function readFirstInstructionCandidate(resolvedWorkspace, directory, filen
 			}, "project instruction skipped");
 		}
 	}
+	return candidates;
 }
 function truncateUtf8(content, maxBytes) {
 	if (maxBytes <= 0) return "";
@@ -8783,6 +8787,7 @@ var PromptHistory = class {
 };
 //#endregion
 //#region src/tui/status.ts
+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 ?? {};
@@ -8932,6 +8937,7 @@ var ChatLayout = class {
 	promptCursor = 0;
 	status = "ready";
 	knowledgeStatus;
+	startupHintLine;
 	ephemeralLine;
 	taskPlanNoticeLine;
 	noticeLine;
@@ -8993,6 +8999,9 @@ var ChatLayout = class {
 	isReady() {
 		return this.status === "ready";
 	}
+	setStartupHintLine(line) {
+		this.startupHintLine = line;
+	}
 	setEphemeralLine(line) {
 		this.ephemeralLine = line;
 	}
@@ -9026,6 +9035,7 @@ var ChatLayout = class {
 		this.promptCursor = 0;
 		this.status = "ready";
 		this.knowledgeStatus = void 0;
+		this.startupHintLine = void 0;
 		this.ephemeralLine = void 0;
 		this.taskPlanNoticeLine = void 0;
 		this.noticeLine = void 0;
@@ -9110,6 +9120,7 @@ var ChatLayout = class {
 			const spacer = index === this.messages.length - 1 ? [] : [padThreadLine("", width)];
 			return [...this.renderThreadMessageLines(messageLines, innerWidth, width, message.kind === "user"), ...spacer];
 		});
+		if (this.startupHintLine) lines.push(...this.renderThreadMessageLines([` ${ui.muted(this.startupHintLine)}`], innerWidth, width, false));
 		if (this.ephemeralLine) lines.push(...this.renderThreadMessageLines([` ${this.ephemeralLine}`], innerWidth, width, false));
 		if (this.taskPlanNoticeLine) lines.push(...this.renderThreadMessageLines([` ${this.taskPlanNoticeLine}`], innerWidth, width, false));
 		if (this.noticeLine) lines.push(...this.renderThreadMessageLines([` ${this.noticeLine}`], innerWidth, width, false));
@@ -9123,6 +9134,7 @@ var ChatLayout = class {
 		});
 	}
 	renderPrompt(width) {
+		const slashSuggestions = this.getSlashSuggestions();
 		const top = `┌${"─".repeat(Math.max(0, width - 2))}┐`;
 		const bottom = `└${"─".repeat(Math.max(0, width - 2))}┘`;
 		const prefix = "> ";
@@ -9131,7 +9143,7 @@ var ChatLayout = class {
 		const statusInnerWidth = Math.max(1, width - 2);
 		const status = truncateToWidth(` ${formatStatusLine(this.folderName, this.modelLabel, this.status, this.knowledgeStatus, statusInnerWidth)} `, width, "…", true);
 		return [
-			...this.renderSlashSuggestions(width),
+			...this.renderSlashSuggestions(width, slashSuggestions),
 			...this.renderTaskPlan(width),
 			top,
 			...inputLines.map((line, index) => `│ ${index === 0 ? prefix : "  "}${padPromptInputLine(line, innerWidth)} │`),
@@ -9190,8 +9202,7 @@ var ChatLayout = class {
 		if (!this.taskPlan) return [];
 		return formatTaskPlanForTui(this.taskPlan, Math.max(1, width));
 	}
-	renderSlashSuggestions(width) {
-		const suggestions = this.getSlashSuggestions();
+	renderSlashSuggestions(width, suggestions = this.getSlashSuggestions()) {
 		if (suggestions.length === 0 || this.promptHint) return [];
 		this.activeSlashSuggestionIndex = Math.min(this.activeSlashSuggestionIndex, suggestions.length - 1);
 		const innerWidth = Math.max(1, width - 4);
@@ -9542,6 +9553,8 @@ var ChatLayout = class {
 	}
 	submitUserInput(message) {
 		this.setTaskPlanNotice(void 0);
+		this.setStartupHintLine(void 0);
+		this.setEphemeralLine(void 0);
 		this.promptHistory.add(message);
 		if (message.startsWith("/")) this.submitCommand?.(message);
 		else this.submitMessage?.(message);
@@ -11969,6 +11982,7 @@ var TopchesterTuiShell = class {
 			}
 		});
 		app.setTaskPlan(this.options.initialTaskPlan);
+		if (!isResumed) app.setStartupHintLine(STARTUP_PROMPT_HINT);
 		app.setSubmitMessage((message) => {
 			this.startBackgroundTask(app, tui, "Chat", () => this.submitChatMessage(app, tui, message));
 		});
@@ -12580,6 +12594,7 @@ var TopchesterTuiShell = class {
 		await this.appendStartupRuntimeEvents(session, messages, await this.runtime.runSessionStartHooks?.(session, { isResumed: false }) ?? []);
 		await this.appendStartupRuntimeEvents(session, messages, await this.runtime.checkProjectInstructions?.() ?? []);
 		app.resetForNewSession(messages);
+		app.setStartupHintLine(STARTUP_PROMPT_HINT);
 		tui.requestRender();
 		await this.checkAgent(app, tui);
 	}