topchester-ai 0.26.0 → 0.28.0

package/dist/cli.mjs

@@ -17,6 +17,7 @@ import pino from "pino";
 import picomatch from "picomatch";
 import { uuidv7 } from "uuidv7";
 import { CURSOR_MARKER, Markdown, ProcessTerminal, TUI, decodeKittyPrintable, isKeyRelease, isKeyRepeat, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
+import { diffWords } from "diff";
 import { highlight, supportsLanguage } from "cli-highlight";
 //#region src/agent/tools/ai-sdk-tools.ts
 function toAiSdkToolSet(definitions) {
@@ -3088,6 +3089,10 @@ const ui = {
 	error(text) {
 		return color(text, "red");
 	},
+	inverse(text) {
+		if (!shouldUseColor()) return text;
+		return `\u001b[7m${text}\u001b[27m`;
+	},
 	softBackground(text) {
 		return color(text, "bgSoftGray");
 	},
@@ -3258,7 +3263,7 @@ function formatTaskPlanNotice(change, state) {
 }
 function formatTaskPlanForTui(state, width, visibleLimit = 6) {
 	if (state.items.length === 0) return [];
-	const itemWidth = Math.max(1, Math.max(12, width) - 6);
+	const itemWidth = Math.max(1, Math.max(12, width) - 4);
 	const visibleItems = state.items.slice(0, visibleLimit);
 	const lines = visibleItems.map((item) => formatTaskPlanTuiLine(item, truncateText(item.text, itemWidth)));
 	const remaining = state.items.length - visibleItems.length;
@@ -3267,9 +3272,9 @@ function formatTaskPlanForTui(state, width, visibleLimit = 6) {
 }
 function formatTaskPlanTuiLine(item, text) {
 	switch (item.status) {
-		case "completed": return `  ${ui.ok("[x]")} ${ui.muted(text)}`;
-		case "in_progress": return `  ${ui.ok("[>]")} ${ui.ok(text)}`;
-		case "pending": return `  ${ui.muted("[ ]")} ${text}`;
+		case "completed": return `  ${ui.ok("●")} ${ui.muted(text)}`;
+		case "in_progress": return `  ${ui.ok("◐")} ${ui.ok(text)}`;
+		case "pending": return `  ${ui.muted("○")} ${text}`;
 	}
 }
 function truncateText(text, width) {
@@ -7556,6 +7561,85 @@ const queryStopWords = new Set([
 	"when"
 ]);
 //#endregion
+//#region src/tui/diff.ts
+function renderUnifiedDiff(diffText, options = {}) {
+	const indent = options.indent ?? "";
+	const wrapWidth = options.width === void 0 ? void 0 : Math.max(1, options.width - indent.length);
+	const rawLines = diffText.split("\n");
+	const rendered = [];
+	let index = 0;
+	while (index < rawLines.length) {
+		const line = rawLines[index];
+		if (isRemovedBodyLine(line)) {
+			const removed = [];
+			while (index < rawLines.length && isRemovedBodyLine(rawLines[index])) {
+				removed.push({
+					kind: "removed",
+					content: rawLines[index].slice(1)
+				});
+				index += 1;
+			}
+			const added = [];
+			while (index < rawLines.length && isAddedBodyLine(rawLines[index])) {
+				added.push({
+					kind: "added",
+					content: rawLines[index].slice(1)
+				});
+				index += 1;
+			}
+			rendered.push(...renderChangedLines(removed, added, indent, wrapWidth));
+			continue;
+		}
+		if (isAddedBodyLine(line)) rendered.push(...renderWrappedLine(ui.ok(`+${expandTabs$1(line.slice(1))}`), indent, wrapWidth));
+		else if (line.startsWith("@@")) rendered.push(...renderWrappedLine(ui.model(line), indent, wrapWidth));
+		else if (line.startsWith("diff --git ") || line.startsWith("--- ") || line.startsWith("+++ ")) rendered.push(...renderWrappedLine(ui.muted(line), indent, wrapWidth));
+		else if (line.startsWith(" ")) rendered.push(...renderWrappedLine(ui.label(` ${expandTabs$1(line.slice(1))}`), indent, wrapWidth));
+		else if (line.length > 0) rendered.push(...renderWrappedLine(ui.label(line), indent, wrapWidth));
+		index += 1;
+	}
+	return rendered;
+}
+function renderChangedLines(removedLines, addedLines, indent, wrapWidth) {
+	if (removedLines.length === 1 && addedLines.length === 1) {
+		const { removed, added } = renderIntraLineDiff(expandTabs$1(removedLines[0].content), expandTabs$1(addedLines[0].content));
+		return [...renderWrappedLine(ui.error(`-${removed}`), indent, wrapWidth), ...renderWrappedLine(ui.ok(`+${added}`), indent, wrapWidth)];
+	}
+	return [...removedLines.flatMap((line) => renderWrappedLine(ui.error(`-${expandTabs$1(line.content)}`), indent, wrapWidth)), ...addedLines.flatMap((line) => renderWrappedLine(ui.ok(`+${expandTabs$1(line.content)}`), indent, wrapWidth))];
+}
+function renderIntraLineDiff(oldContent, newContent) {
+	const parts = diffWords(oldContent, newContent);
+	let removed = "";
+	let added = "";
+	for (const part of parts) if (part.removed) removed += highlightChangedPart(part.value);
+	else if (part.added) added += highlightChangedPart(part.value);
+	else {
+		removed += part.value;
+		added += part.value;
+	}
+	return {
+		removed,
+		added
+	};
+}
+function highlightChangedPart(value) {
+	const leading = value.match(/^\s*/u)?.[0] ?? "";
+	const trailing = value.match(/\s*$/u)?.[0] ?? "";
+	const body = value.slice(leading.length, value.length - trailing.length);
+	return body.length === 0 ? value : `${leading}${ui.inverse(body)}${trailing}`;
+}
+function renderWrappedLine(line, indent, width) {
+	return (width === void 0 ? [line] : wrapTextWithAnsi(line, width)).map((part) => `${indent}${part}`);
+}
+function isRemovedBodyLine(line) {
+	return line.startsWith("-") && !line.startsWith("--- ");
+}
+function isAddedBodyLine(line) {
+	return line.startsWith("+") && !line.startsWith("+++ ");
+}
+function expandTabs$1(text) {
+	return text.replace(/\t/gu, "    ");
+}
+//#endregion
 //#region src/tui/markdown.ts
 const codeFenceSentinel = "topchester-code-fence";
 function renderMarkdown(text, width) {
@@ -7647,16 +7731,13 @@ function thinkingMessage(text) {
 		text
 	};
 }
-function toolCallMessage(call, label, resultSummary) {
-	return resultSummary === void 0 ? {
-		kind: "tool_call",
-		call,
-		label
-	} : {
+function toolCallMessage(call, label, resultSummary, diff) {
+	return {
 		kind: "tool_call",
 		call,
 		label,
-		resultSummary
+		...resultSummary === void 0 ? {} : { resultSummary },
+		...diff === void 0 ? {} : { diff }
 	};
 }
 function hookStatusMessage(label, eventName, statusMessage) {
@@ -7682,7 +7763,7 @@ function modalMessage(message) {
 const DEFAULT_MODAL_VISIBLE_ACTION_LIMIT = 16;
 function renderChatMessage(message, options = {}) {
 	if (message.kind === "modal") return renderChatModal(message, options.selectedActionIndex, options.maxModalHeight, options.width);
-	if (message.kind === "tool_call") return renderToolCallMessage(message);
+	if (message.kind === "tool_call") return renderToolCallMessage(message, options.width);
 	if (message.kind === "hook_status") return renderHookStatusMessage(message);
 	if (message.kind === "subagent") return renderSubagentMessage(message);
 	if (message.kind === "thinking") return message.text.split("\n").map((line) => ui.muted(line));
@@ -7714,9 +7795,14 @@ function renderSystemMessage(lines) {
 function formatSystemBodyLine(line) {
 	return expandTabs(line).replace(/\(changed \+\d+\/-\d+\)$/u, (summary) => ui.muted(summary)).replace(/\(created \+\d+\)$/u, (summary) => ui.muted(summary));
 }
-function renderToolCallMessage(message) {
+function renderToolCallMessage(message, width) {
 	const visibleLabel = message.resultSummary && !message.label.includes(message.resultSummary) ? `${message.label} ${message.resultSummary}` : message.label;
-	return [`   ${ui.muted(expandTabs(visibleLabel))}`];
+	const label = `   ${ui.muted(expandTabs(visibleLabel))}`;
+	if (!message.diff) return [label];
+	return [label, ...renderUnifiedDiff(message.diff, {
+		indent: "     ",
+		width
+	})];
 }
 function renderHookStatusMessage(message) {
 	return [` ${ui.muted(expandTabs(message.label))}`];
@@ -7888,7 +7974,8 @@ const messagePayloadSchema = z.object({
 const toolCallPayloadSchema = z.object({
 	kind: z.literal("tool_call"),
 	label: z.string(),
-	call: z.record(z.string(), jsonValueSchema)
+	call: z.record(z.string(), jsonValueSchema),
+	diff: z.string().optional()
 });
 const hookStatusPayloadSchema = z.object({
 	kind: z.literal("hook_status"),
@@ -8133,7 +8220,7 @@ function rehydrateSession(events) {
 			if (event.role === "user") visibleOnlyActionValues = /* @__PURE__ */ new Set();
 			break;
 		case "tool_call":
-			messages.push(toolCallMessage(event.call, event.label));
+			messages.push(toolCallMessage(event.call, event.label, void 0, event.diff));
 			break;
 		case "hook_status":
 			messages.push(hookStatusMessage(event.label, event.eventName, event.statusMessage));
@@ -8757,11 +8844,16 @@ const agentEvent = {
 			meta
 		};
 	},
-	toolCall(call, label) {
-		return {
+	toolCall(call, label, diff) {
+		return diff === void 0 ? {
 			type: "tool_call",
 			call,
 			label
+		} : {
+			type: "tool_call",
+			call,
+			label,
+			diff
 		};
 	},
 	hookStatus(eventName, statusMessage) {
@@ -9060,6 +9152,7 @@ function stripAnsi(text) {
 //#endregion
 //#region src/tui/layout.ts
 const PROMPT_VISIBLE_CONTENT_LINES = 5;
+const SLASH_SUGGESTION_VISIBLE_ROWS = 6;
 const PASTE_PREVIEW_MIN_LINES = 6;
 const PASTE_PREVIEW_MIN_CHARS = 500;
 const BRACKETED_PASTE_START = "\x1B[200~";
@@ -9076,6 +9169,7 @@ var ChatLayout = class {
 	knowledgeStatus;
 	startupHintLine;
 	ephemeralLine;
+	temporaryLine;
 	taskPlanNoticeLine;
 	noticeLine;
 	promptHint;
@@ -9092,13 +9186,16 @@ var ChatLayout = class {
 	pastedContent = /* @__PURE__ */ new Map();
 	promptHistory = new PromptHistory();
 	exitAgent;
+	requestRender;
 	transcriptMode;
+	temporaryLineExpireTimer;
 	constructor(terminal, messages, folderName, modelLabel, options = {}) {
 		this.terminal = terminal;
 		this.messages = messages;
 		this.folderName = folderName;
 		this.modelLabel = modelLabel;
 		this.exitAgent = typeof options === "function" ? options : options.exitAgent ?? (() => {});
+		this.requestRender = typeof options === "function" ? () => {} : options.requestRender ?? (() => {});
 		this.transcriptMode = typeof options === "function" ? "viewport" : options.transcriptMode ?? "viewport";
 	}
 	addMessage(message) {
@@ -9142,6 +9239,18 @@ var ChatLayout = class {
 	setEphemeralLine(line) {
 		this.ephemeralLine = line;
 	}
+	setTemporaryLine(line, options = {}) {
+		this.clearTemporaryLineExpireTimer();
+		this.temporaryLine = line;
+		const expireAfterMs = options.expireAfterMs;
+		if (line && expireAfterMs !== void 0 && expireAfterMs > 0) this.temporaryLineExpireTimer = setTimeout(() => {
+			this.temporaryLineExpireTimer = void 0;
+			if (this.temporaryLine === line) {
+				this.temporaryLine = void 0;
+				this.requestRender();
+			}
+		}, expireAfterMs);
+	}
 	setNoticeLine(line) {
 		this.noticeLine = line;
 	}
@@ -9173,7 +9282,9 @@ var ChatLayout = class {
 		this.status = "ready";
 		this.knowledgeStatus = void 0;
 		this.startupHintLine = void 0;
+		this.clearTemporaryLineExpireTimer();
 		this.ephemeralLine = void 0;
+		this.temporaryLine = void 0;
 		this.taskPlanNoticeLine = void 0;
 		this.noticeLine = void 0;
 		this.promptHint = void 0;
@@ -9246,6 +9357,12 @@ var ChatLayout = class {
 		const start = Math.max(0, end - threadHeight);
 		return [...padLines(allThreadLines.slice(start, end), threadHeight, safeWidth), ...footerLines];
 	}
+	clearTemporaryLineExpireTimer() {
+		if (this.temporaryLineExpireTimer) {
+			clearTimeout(this.temporaryLineExpireTimer);
+			this.temporaryLineExpireTimer = void 0;
+		}
+	}
 	renderThread(width, threadHeight) {
 		const innerWidth = Math.max(1, width);
 		const activeModalIndex = this.getActiveModalIndex();
@@ -9260,6 +9377,7 @@ var ChatLayout = class {
 		});
 		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.temporaryLine) lines.push(...this.renderThreadMessageLines([` ${ui.muted(this.temporaryLine)}`], 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));
 		return lines;
@@ -9344,11 +9462,12 @@ var ChatLayout = class {
 		if (suggestions.length === 0 || this.promptHint) return [];
 		this.activeSlashSuggestionIndex = Math.min(this.activeSlashSuggestionIndex, suggestions.length - 1);
 		const innerWidth = Math.max(1, width - 4);
-		const visibleSuggestions = suggestions.slice(0, 6);
+		const windowStart = getVisibleSuggestionWindowStart(suggestions.length, this.activeSlashSuggestionIndex, SLASH_SUGGESTION_VISIBLE_ROWS);
+		const visibleSuggestions = suggestions.slice(windowStart, windowStart + SLASH_SUGGESTION_VISIBLE_ROWS);
 		const lines = [
 			ui.label("slash commands"),
 			...visibleSuggestions.map((suggestion, index) => {
-				return truncateToWidth(`${index === this.activeSlashSuggestionIndex ? ">" : " "} ${suggestion.value} — ${suggestion.description}`, innerWidth, "…", true);
+				return truncateToWidth(`${windowStart + index === this.activeSlashSuggestionIndex ? ">" : " "} ${suggestion.value} — ${suggestion.description}`, innerWidth, "…", true);
 			}),
 			ui.label("Tab complete · ↑↓ choose")
 		];
@@ -9698,6 +9817,10 @@ var ChatLayout = class {
 		else this.submitMessage?.(message);
 	}
 };
+function getVisibleSuggestionWindowStart(total, activeIndex, visibleRows) {
+	if (total <= visibleRows) return 0;
+	return Math.max(0, Math.min(activeIndex - visibleRows + 1, total - visibleRows));
+}
 function colorUserMessageBorder(line) {
 	return line.replace("▌", ui.modelInline("▌"));
 }
@@ -10456,7 +10579,8 @@ function runtimeEventToSessionPayload(event) {
 		case "tool_call": return {
 			kind: "tool_call",
 			label: event.label,
-			call: event.call
+			call: event.call,
+			...event.diff === void 0 ? {} : { diff: event.diff }
 		};
 		case "hook_status": return {
 			kind: "hook_status",
@@ -11349,7 +11473,7 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 					const call = taskCalls[index];
 					const toolResult = taskResults[index];
 					for (const event of createInstructionContextEventsFromToolResult(toolResult, persistedProjectInstructionKeys)) yield event;
-					yield agentEvent.toolCall(call, formatToolCallMessage(call, toolResult));
+					yield agentEvent.toolCall(call, formatToolCallMessage(call, toolResult), getToolCallDisplayDiff(toolResult));
 					const postHookRun = this.startPostToolUseHook(call, modelToolCalls[index]?.id, toolResult, session, abortSignal);
 					for await (const event of postHookRun.statusEvents) yield event;
 					const postHook = await postHookRun.result;
@@ -11411,7 +11535,7 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 					const call = parallelCalls[index];
 					const toolResult = parallelResults[index];
 					for (const event of createInstructionContextEventsFromToolResult(toolResult, persistedProjectInstructionKeys)) yield event;
-					yield agentEvent.toolCall(call, formatToolCallMessage(call, toolResult));
+					yield agentEvent.toolCall(call, formatToolCallMessage(call, toolResult), getToolCallDisplayDiff(toolResult));
 					const postHookRun = this.startPostToolUseHook(call, modelToolCalls[index]?.id, toolResult, session, abortSignal);
 					for await (const event of postHookRun.statusEvents) yield event;
 					const postHook = await postHookRun.result;
@@ -11474,7 +11598,7 @@ var TopchesterAgentRuntime = class TopchesterAgentRuntime {
 				}
 			}
 			for (const event of createInstructionContextEventsFromToolResult(toolResult, persistedProjectInstructionKeys)) yield event;
-			yield agentEvent.toolCall(executableToolCall, formatToolCallMessage(executableToolCall, toolResult));
+			yield agentEvent.toolCall(executableToolCall, formatToolCallMessage(executableToolCall, toolResult), getToolCallDisplayDiff(toolResult));
 			if (!isToolErrorResult(toolResult) && toolResult.tool === "plan_todo") yield agentEvent.taskPlan(toolResult.plan);
 			const postHookRun = this.startPostToolUseHook(executableToolCall, toolCall.id, toolResult, session, abortSignal);
 			for await (const event of postHookRun.statusEvents) yield event;
@@ -11780,6 +11904,9 @@ function createToolErrorResult(tool, message) {
 		warning: message
 	};
 }
+function getToolCallDisplayDiff(result) {
+	if (result.tool === "edit_file" && !isToolErrorResult(result) && "diff" in result) return result.diff;
+}
 function isL1ContextDisabledByEnv() {
 	const value = process.env.TOPCHESTER_DISABLE_L1_CONTEXT?.trim().toLowerCase();
 	return value === "1" || value === "true" || value === "yes" || value === "on";
@@ -11820,7 +11947,7 @@ function createInstructionContextEvents(sources, persistedKeys) {
 function renderRuntimeEvent(event) {
 	switch (event.type) {
 		case "message": return [event.role === "assistant" ? agentMessage(event.text, event.meta) : systemMessage(event.text)];
-		case "tool_call": return [toolCallMessage(event.call, event.label)];
+		case "tool_call": return [toolCallMessage(event.call, event.label, void 0, event.diff)];
 		case "hook_status": return [hookStatusMessage(event.label, event.eventName, event.statusMessage)];
 		case "knowledge_status": return [systemMessage([`KB status: ${formatKnowledgePathStatus(event.status)}${formatKbPathSource(event.status)}`, event.guidance].filter(Boolean).join("\n"))];
 		case "choice": return [modalMessage({
@@ -12080,7 +12207,8 @@ function chatMessageToSessionPayload(message) {
 	if (message.kind === "tool_call") return {
 		kind: "tool_call",
 		label: message.label,
-		call: message.call
+		call: message.call,
+		...message.diff === void 0 ? {} : { diff: message.diff }
 	};
 }
 function slashCommandToSessionPayload(command) {
@@ -12265,6 +12393,7 @@ function formatSkillSource(skill) {
 }
 //#endregion
 //#region src/tui/shell.ts
+const HOOK_STATUS_EXPIRE_AFTER_MS = 2e3;
 function formatBashApprovalBody(request) {
 	const reason = request.reason.includes(request.command) ? "This bash command is not allowed yet." : request.reason;
 	return [
@@ -12324,6 +12453,9 @@ var TopchesterTuiShell = class {
 		};
 		const app = new ChatLayout(terminal, messages, folderName, modelLabel, {
 			transcriptMode: "inline",
+			requestRender: () => {
+				tui.requestRender();
+			},
 			exitAgent: () => {
 				exit();
 				process.exit(0);
@@ -12968,7 +13100,8 @@ var TopchesterTuiShell = class {
 				app.setTaskPlanNotice(formatTaskPlanNotice(change, event.plan));
 				this.scheduleTaskPlanNoticeClear(app, renderRequester);
 			}
-			for (const message of renderRuntimeEvent(event)) app.addMessage(message);
+			if (event.type === "hook_status") app.setTemporaryLine(event.label, { expireAfterMs: HOOK_STATUS_EXPIRE_AFTER_MS });
+			else for (const message of renderRuntimeEvent(event)) app.addMessage(message);
 			await this.persistPayloadWithWarning(app, runtimeEventToSessionPayload(event));
 		}
 	}