@gajae-code/coding-agent 0.4.4 → 0.5.0

package/src/main.ts

@@ -33,7 +33,7 @@ import { getDefault, type SettingPath, Settings, settings } from "./config/setti
 import { initializeWithSettings } from "./discovery";
 import { exportFromFile } from "./export/html";
 import type { ExtensionUIContext } from "./extensibility/extensions/types";
-import { InteractiveMode, runAcpMode, runBridgeMode, runPrintMode, runRpcMode } from "./modes";
+import type { InteractiveMode } from "./modes/interactive-mode";
 import { initTheme, stopThemeWatcher } from "./modes/theme/theme";
 import type { SubmittedUserInput } from "./modes/types";
 import type { MCPManager } from "./runtime-mcp";
@@ -304,6 +304,7 @@ async function runInteractiveMode(
 	initialMessage?: string,
 	initialImages?: ImageContent[],
 ): Promise<void> {
+	const { InteractiveMode } = await import("./modes/interactive-mode");
 	const mode = new InteractiveMode(
 		session,
 		version,
@@ -706,7 +707,7 @@ async function buildSessionOptions(
 interface RunRootCommandDependencies {
 	createAgentSession?: typeof createAgentSession;
 	discoverAuthStorage?: typeof discoverAuthStorage;
-	runAcpMode?: typeof runAcpMode;
+	runAcpMode?: (createSession: AcpSessionFactory) => Promise<void>;
 	settings?: Settings;
 }
 
@@ -927,7 +928,7 @@ export async function runRootCommand(
 			rawArgs,
 			createSession,
 		});
-		await (deps.runAcpMode ?? runAcpMode)(createAcpSession);
+		await (deps.runAcpMode ?? (await import("./modes/acp")).runAcpMode)(createAcpSession);
 	} else {
 		const { session, setToolUIContext, modelFallbackMessage, lspServers, mcpManager, eventBus } =
 			await createSession(sessionOptions);
@@ -973,8 +974,10 @@ export async function runRootCommand(
 		}
 
 		if (mode === "rpc" || mode === "rpc-ui") {
+			const { runRpcMode } = await import("./modes/rpc/rpc-mode");
 			await runRpcMode(session, mode === "rpc-ui" ? setToolUIContext : undefined);
 		} else if (mode === "bridge") {
+			const { runBridgeMode } = await import("./modes/bridge/bridge-mode");
 			await runBridgeMode(session, setToolUIContext);
 		} else if (isInteractive) {
 			const versionCheckPromise = checkForNewVersion(VERSION).catch(() => undefined);
@@ -1014,6 +1017,7 @@ export async function runRootCommand(
 				initialImages,
 			);
 		} else {
+			const { runPrintMode } = await import("./modes/print-mode");
 			await runPrintMode(session, {
 				mode,
 				messages: parsedArgs.messages,

package/src/modes/components/assistant-message.ts

@@ -1,5 +1,5 @@
 import type { AssistantMessage, ImageContent, Usage } from "@gajae-code/ai";
-import { Container, Image, ImageProtocol, Markdown, Spacer, TERMINAL, Text } from "@gajae-code/tui";
+import { type Component, Container, Image, ImageProtocol, Markdown, Spacer, TERMINAL, Text } from "@gajae-code/tui";
 import { formatNumber } from "@gajae-code/utils";
 import { settings } from "../../config/settings";
 import { renderDeepInterviewAssistantText } from "../../deep-interview/render-middleware";
@@ -18,6 +18,7 @@ export class AssistantMessageComponent extends Container {
 	#convertedKittyImages = new Map<string, ImageContent>();
 	#kittyConversionsInFlight = new Set<string>();
 	#responseHeader = new Text(theme.bold(theme.fg("statusLineModel", "gajae")), 1, 0);
+	#contentBlocksCache = new WeakMap<object, { source: string; component: Component }>();
 
 	constructor(
 		message?: AssistantMessage,
@@ -106,6 +107,28 @@ export class AssistantMessageComponent extends Container {
 		}
 	}
 
+	#renderTextBlock(content: { text: string }): Component {
+		const cached = this.#contentBlocksCache.get(content);
+		if (cached?.source === content.text) return cached.component;
+		const trimmed = content.text.trim();
+		const component =
+			renderDeepInterviewAssistantText(trimmed, theme) ?? new Markdown(trimmed, 1, 0, getMarkdownTheme());
+		this.#contentBlocksCache.set(content, { source: content.text, component });
+		return component;
+	}
+
+	#renderThinkingBlock(content: { thinking: string }): Markdown {
+		const cached = this.#contentBlocksCache.get(content);
+		if (cached?.source === content.thinking) return cached.component as Markdown;
+		const trimmed = content.thinking.trim();
+		const component = new Markdown(trimmed, 1, 0, getMarkdownTheme(), {
+			color: (text: string) => theme.fg("thinkingText", text),
+			italic: true,
+		});
+		this.#contentBlocksCache.set(content, { source: content.thinking, component });
+		return component;
+	}
+
 	#renderToolImages(): void {
 		const imageEntries = Array.from(this.#toolImagesByCallId.entries()).flatMap(([toolCallId, images]) =>
 			images.map((image, index) => ({ image, key: `${toolCallId}:${index}` })),
@@ -152,12 +175,7 @@ export class AssistantMessageComponent extends Container {
 		for (let i = 0; i < message.content.length; i++) {
 			const content = message.content[i];
 			if (content.type === "text" && content.text.trim()) {
-				// Assistant text messages with no background - trim the text
-				// Set paddingY=0 to avoid extra spacing before tool executions
-				const text = content.text.trim();
-				this.#contentContainer.addChild(
-					renderDeepInterviewAssistantText(text, theme) ?? new Markdown(text, 1, 0, getMarkdownTheme()),
-				);
+				this.#contentContainer.addChild(this.#renderTextBlock(content));
 			} else if (content.type === "thinking" && content.thinking.trim()) {
 				// Add spacing only when another visible assistant content block follows.
 				// This avoids a superfluous blank line before separately-rendered tool execution blocks.
@@ -172,13 +190,7 @@ export class AssistantMessageComponent extends Container {
 						this.#contentContainer.addChild(new Spacer(1));
 					}
 				} else {
-					// Thinking traces in thinkingText color, italic
-					this.#contentContainer.addChild(
-						new Markdown(content.thinking.trim(), 1, 0, getMarkdownTheme(), {
-							color: (text: string) => theme.fg("thinkingText", text),
-							italic: true,
-						}),
-					);
+					this.#contentContainer.addChild(this.#renderThinkingBlock(content));
 					if (hasVisibleContentAfter) {
 						this.#contentContainer.addChild(new Spacer(1));
 					}

package/src/modes/components/diff.ts

@@ -6,6 +6,9 @@ import { type CodeFrameMarker, formatCodeFrameLine, replaceTabs } from "../../to
 /** SGR dim on / normal intensity — additive, preserves fg/bg colors. */
 const DIM = "\x1b[2m";
 const DIM_OFF = "\x1b[22m";
+// Single-span fast path is tuned for rendered code lines; ~500 chars covers typical terminal widths
+// while avoiding duplicate prefix/suffix scans before diffWords on pathological long lines.
+const LONG_LINE_FAST_PATH_LIMIT = 500;
 
 /**
  * Visualize leading whitespace (indentation) with dim glyphs.
@@ -53,6 +56,15 @@ function parseDiffLine(line: string): { prefix: CodeFrameMarker; lineNum: string
  * Strips leading whitespace from inverse to avoid highlighting indentation.
  */
 function renderIntraLineDiff(oldContent: string, newContent: string): { removedLine: string; addedLine: string } {
+	const fastPath = renderIntraLineDiffFastPath(oldContent, newContent);
+	if (fastPath) return fastPath;
+	return renderIntraLineDiffWithDiffWords(oldContent, newContent);
+}
+
+function renderIntraLineDiffWithDiffWords(
+	oldContent: string,
+	newContent: string,
+): { removedLine: string; addedLine: string } {
 	const wordDiff = Diff.diffWords(oldContent, newContent);
 
 	let removedLine = "";
@@ -94,6 +106,91 @@ function renderIntraLineDiff(oldContent: string, newContent: string): { removedL
 	return { removedLine, addedLine };
 }
 
+function renderIntraLineDiffFastPath(
+	oldContent: string,
+	newContent: string,
+): { removedLine: string; addedLine: string } | null {
+	if (oldContent === newContent) return { removedLine: oldContent, addedLine: newContent };
+	if (Math.min(oldContent.length, newContent.length) > LONG_LINE_FAST_PATH_LIMIT) return null;
+
+	if (isWhitespaceOnlyChange(oldContent, newContent)) return null;
+	return renderSingleSpanIntraLineDiff(oldContent, newContent);
+}
+
+function isWhitespaceOnlyChange(oldContent: string, newContent: string): boolean {
+	return oldContent.replace(/\s+/g, "") === newContent.replace(/\s+/g, "");
+}
+
+function renderSingleSpanIntraLineDiff(
+	oldContent: string,
+	newContent: string,
+): { removedLine: string; addedLine: string } | null {
+	let prefixLength = 0;
+	const maxPrefixLength = Math.min(oldContent.length, newContent.length);
+	while (
+		prefixLength < maxPrefixLength &&
+		oldContent.charCodeAt(prefixLength) === newContent.charCodeAt(prefixLength)
+	) {
+		prefixLength++;
+		if (prefixLength > LONG_LINE_FAST_PATH_LIMIT) return null;
+	}
+	let suffixLength = 0;
+	const maxSuffixLength = maxPrefixLength - prefixLength;
+	while (
+		suffixLength < maxSuffixLength &&
+		oldContent.charCodeAt(oldContent.length - 1 - suffixLength) ===
+			newContent.charCodeAt(newContent.length - 1 - suffixLength)
+	) {
+		suffixLength++;
+		if (prefixLength + suffixLength > LONG_LINE_FAST_PATH_LIMIT) return null;
+	}
+
+	const oldMiddle = oldContent.slice(prefixLength, oldContent.length - suffixLength);
+	const newMiddle = newContent.slice(prefixLength, newContent.length - suffixLength);
+	if (oldMiddle.length === 0 || newMiddle.length === 0) return null;
+	if (!isSingleDiffWordsReplacement(oldContent, newContent, prefixLength, suffixLength)) return null;
+
+	const prefix = oldContent.slice(0, prefixLength);
+	const oldLeadingWs = oldMiddle.match(/^(\s*)/)?.[1] || "";
+	const newLeadingWs = newMiddle.match(/^(\s*)/)?.[1] || "";
+	return {
+		removedLine: `${prefix}${oldLeadingWs}${theme.inverse(oldMiddle.slice(oldLeadingWs.length))}${oldContent.slice(oldContent.length - suffixLength)}`,
+		addedLine: `${prefix}${newLeadingWs}${theme.inverse(newMiddle.slice(newLeadingWs.length))}${newContent.slice(newContent.length - suffixLength)}`,
+	};
+}
+
+function isSingleDiffWordsReplacement(
+	oldContent: string,
+	newContent: string,
+	prefixLength: number,
+	suffixLength: number,
+): boolean {
+	if (prefixLength === 0 && suffixLength === 0) return false;
+	const oldEnd = oldContent.length - suffixLength;
+	const newEnd = newContent.length - suffixLength;
+	const snappedPrefixLength = snapPrefixToWhitespaceBoundary(oldContent, newContent, prefixLength);
+	const snappedOldEnd = snapEndToWhitespaceBoundary(oldContent, oldEnd);
+	const snappedNewEnd = snapEndToWhitespaceBoundary(newContent, newEnd);
+	return snappedPrefixLength === prefixLength && snappedOldEnd === oldEnd && snappedNewEnd === newEnd;
+}
+
+function snapPrefixToWhitespaceBoundary(oldContent: string, newContent: string, prefixLength: number): number {
+	let snapped = prefixLength;
+	while (snapped > 0 && !(isWhitespaceBoundary(oldContent, snapped) && isWhitespaceBoundary(newContent, snapped)))
+		snapped--;
+	return snapped;
+}
+
+function snapEndToWhitespaceBoundary(content: string, end: number): number {
+	let snapped = end;
+	while (snapped < content.length && !isWhitespaceBoundary(content, snapped)) snapped++;
+	return snapped;
+}
+
+function isWhitespaceBoundary(content: string, index: number): boolean {
+	return index <= 0 || index >= content.length || /\s/.test(content[index - 1]!) || /\s/.test(content[index]!);
+}
+
 export interface RenderDiffOptions {
 	/** File path used to resolve indentation (.editorconfig + defaults) */
 	filePath?: string;