topchester-ai 0.27.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");
 	},
@@ -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) {
@@ -10487,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",
@@ -11380,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;
@@ -11442,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;
@@ -11505,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;
@@ -11811,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";
@@ -11851,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({
@@ -12111,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) {