@gajae-code/coding-agent 0.12.21 → 0.13.0

package/src/modes/components/tool-execution.ts

@@ -17,6 +17,8 @@ import {
 } from "@gajae-code/tui";
 import { getProjectDir, logger, sanitizeText } from "@gajae-code/utils";
 import { EDIT_MODE_STRATEGIES, type EditMode, type PerFileDiffPreview } from "../../edit";
+import { type EditRenderContext, getPerFileEditRenderArgs, getPerFileEditRenderContext } from "../../edit/renderer";
+import { getEditRequestTargetInventory, orderedDistinctPaths } from "../../edit/streaming";
 import type { Theme } from "../../modes/theme/theme";
 import { theme } from "../../modes/theme/theme";
 import { BASH_DEFAULT_PREVIEW_LINES } from "../../tools/bash";
@@ -81,9 +83,10 @@ function argsCanBeSharedWithRenderer(toolName: string, tool: AgentTool | undefin
 	return !tool?.renderCall && !tool?.renderResult && READONLY_ARG_RENDERER_TOOLS.has(toolName);
 }
 
-function partialJsonLength(args: unknown): number {
-	const value = args && typeof args === "object" ? (args as { __partialJson?: unknown }).__partialJson : undefined;
-	return typeof value === "string" ? value.length : -1;
+function previewPayloadKey(args: unknown): string | undefined {
+	const partialJson =
+		args && typeof args === "object" ? (args as { __partialJson?: unknown }).__partialJson : undefined;
+	return typeof partialJson === "string" ? `${partialJson.length}:${partialJson}` : undefined;
 }
 
 /**
@@ -234,6 +237,7 @@ export class ToolExecutionComponent extends Container {
 	#editDiffLastArgsKey?: string;
 	#argsIdentityVersion = 0;
 	#lastArgsReference: any;
+
 	#shareArgsWithRenderer = false;
 	// Cached converted images for Kitty protocol (which requires PNG), keyed by index and source.
 	#convertedImages: Map<number, { data: string; mimeType: string; source: string }> = new Map();
@@ -312,6 +316,7 @@ export class ToolExecutionComponent extends Container {
 	updateArgs(args: any, _toolCallId?: string): void {
 		const argsChanged = !Bun.deepEquals(this.#args, args);
 		if (!argsChanged && !this.#editMode) return;
+
 		if (args !== this.#lastArgsReference) {
 			this.#lastArgsReference = args;
 			this.#argsIdentityVersion += 1;
@@ -352,11 +357,12 @@ export class ToolExecutionComponent extends Container {
 			effectiveArgs = args;
 		}
 
-		// Coalesce duplicate computes without serializing multi-KB streamed args every delta.
+		// The streamed partial JSON is the exact payload snapshot. Its length alone
+		// cannot distinguish same-size replacements. Completed calls lack that
+		// snapshot, so retain identity invalidation for their distinct arg objects.
 		const argsKey = [
 			this.#toolName,
-			this.#argsIdentityVersion,
-			partialJsonLength(args),
+			previewPayloadKey(args) ?? `identity:${this.#argsIdentityVersion}`,
 			this.#argsComplete ? 1 : 0,
 		].join(":");
 		if (argsKey === this.#editDiffLastArgsKey) return;
@@ -498,7 +504,21 @@ export class ToolExecutionComponent extends Container {
 	}
 
 	#captureLogicalVisibleProjection(): string {
-		return this.render(10_000).join("\n");
+		const rendered = this.render(10_000).join("\n");
+		// The sticky-viewport source tracks semantic transcript output, not just
+		// the literal pixels. A result-first collapsed edit card intentionally
+		// hides in-flight diff previews, so preview resolution changes the
+		// rendered text by nothing — yet it is still semantic progress the
+		// viewport must re-anchor on (the preview becomes visible the moment the
+		// user expands, and downstream snapshot/replay keys off this revision).
+		// Fold a compact fingerprint of resolved-preview state into the logical
+		// projection so it advances independently of the sparse collapsed render.
+		const preview = this.#editDiffPreview;
+		if (!preview || preview.length === 0) return rendered;
+		const fingerprint = preview
+			.map(file => `${file.path}:${file.diff ? "1" : "0"}:${file.firstChangedLine ?? ""}:${file.error ? "1" : "0"}`)
+			.join("|");
+		return `${rendered}\u0000preview:${fingerprint}`;
 	}
 
 	#markVisibleMutationIfChanged(notify = false): void {
@@ -697,13 +717,17 @@ export class ToolExecutionComponent extends Container {
 			const perFileResults = this.#result?.details?.perFileResults as
 				| Array<{ path: string; isError?: boolean }>
 				| undefined;
-			if (perFileResults && perFileResults.length > 1) {
+			const requestedEditFiles = isEditLikeToolName(this.#toolName)
+				? getEditRequestTargetInventory(this.#args, this.#editMode, { isPartial: this.#isPartial }).paths.length
+				: 0;
+			if (perFileResults && (perFileResults.length > 1 || (this.#isPartial && requestedEditFiles > 1))) {
 				// Multi-file: render each file as its own Box (identical to separate tool calls)
 				this.#contentBox.setBgFn(undefined);
 				this.#contentBox.clear();
 
 				const renderContext = this.#buildRenderContext();
 				this.#renderState.renderContext = renderContext;
+				const callArgs = this.#getCallArgsForRender();
 
 				for (let i = 0; i < perFileResults.length; i++) {
 					const fileResult = perFileResults[i];
@@ -717,10 +741,17 @@ export class ToolExecutionComponent extends Container {
 						: (text: string) => theme.bg("toolSuccessBg", text);
 					const fileBox = new Box(1, 0, fileBgFn);
 					try {
+						const fileRenderState = {
+							...this.#renderState,
+							renderContext: getPerFileEditRenderContext(renderContext as EditRenderContext, fileResult.path) as
+								| Record<string, unknown>
+								| undefined,
+						};
 						const resultComponent = renderer.renderResult(
 							{ content: [], details: fileResult, isError: fileResult.isError },
-							this.#renderState,
+							fileRenderState,
 							theme,
+							getPerFileEditRenderArgs(callArgs, fileResult.path, this.#editMode),
 						);
 						if (resultComponent) {
 							fileBox.addChild(ensureInvalidate(resultComponent));
@@ -733,10 +764,11 @@ export class ToolExecutionComponent extends Container {
 				}
 
 				// Show pending indicator for remaining files
-				const totalFiles = this.#args?.edits
-					? new Set((this.#args.edits as any[]).map((e: any) => e?.path).filter(Boolean)).size
-					: 0;
-				const remaining = Math.max(0, totalFiles - perFileResults.length);
+				const requestedFiles = getEditRequestTargetInventory(this.#args, this.#editMode, {
+					isPartial: this.#isPartial,
+				}).paths.length;
+				const representedFiles = orderedDistinctPaths(perFileResults.map(file => file.path)).length;
+				const remaining = Math.max(0, requestedFiles - representedFiles);
 				if (remaining > 0 && this.#isPartial) {
 					const pendingSpacer = new Spacer(1);
 					this.#multiFileBoxes.push(pendingSpacer);
@@ -906,11 +938,11 @@ export class ToolExecutionComponent extends Container {
 						? { error: first.error }
 						: { diff: first.diff ?? "", firstChangedLine: first.firstChangedLine };
 				}
-				if (previews.length > 1) {
+				if (previews.some(preview => preview.path.length > 0)) {
 					context.perFileDiffPreview = previews;
 				}
 			}
-			if (!previews?.some(preview => preview.diff)) {
+			if (this.#expanded && !previews?.some(preview => preview.diff)) {
 				const editMode = this.#editMode;
 				const strategy = editMode ? EDIT_MODE_STRATEGIES[editMode] : undefined;
 				const fallback = strategy?.renderStreamingFallback(this.#args, theme);

package/src/modes/controllers/command-controller.ts

@@ -478,9 +478,12 @@ export class CommandController {
 			const retirement = memory.coldRetirementActive ? theme.fg("success", "active") : theme.fg("dim", "inactive");
 			info += `\n${theme.bold("Session Memory")}\n`;
 			info += `${theme.fg("dim", "Cold Retirement:")} ${retirement}\n`;
-			info += `${theme.fg("dim", "Hot Region:")} ${formatBytes(memory.hotRegionBytes)}\n`;
-			info += `${theme.fg("dim", "Metadata:")} ${formatBytes(memory.metaDescriptorBytes)}\n`;
-			info += `${theme.fg("dim", "Accounted:")} ${formatBytes(memory.totalAccountedBytes)}\n`;
+			info += `${theme.fg("dim", "Hot Resident:")} ${formatBytes(memory.hotResidentBytes)}\n`;
+			info += `${theme.fg("dim", "Metadata Resident:")} ${formatBytes(memory.metadataResidentBytes)}\n`;
+			info += `${theme.fg("dim", "Allocated Caches:")} ${formatBytes(memory.allocatedCacheBytes)}\n`;
+			info += `${theme.fg("dim", "Reserved Budget:")} ${formatBytes(memory.reservedBudgetBytes)}\n`;
+			info += `${theme.fg("dim", "Sidecar Files:")} ${formatBytes(memory.sidecarFileBytes)}\n`;
+			info += `${theme.fg("dim", "Budget Accounted:")} ${formatBytes(memory.totalAccountedBytes)}\n`;
 			if (memory.coldIndexBytes > 0 || memory.coldIndexBlockCacheBytes > 0 || memory.coldEntryCacheBytes > 0) {
 				info += `${theme.fg("dim", "Cold Index/Caches:")} ${formatBytes(memory.coldIndexBytes)} / ${formatBytes(memory.coldIndexBlockCacheBytes)} / ${formatBytes(memory.coldEntryCacheBytes)}\n`;
 			}

package/src/modes/controllers/extension-ui-controller.ts

@@ -575,6 +575,7 @@ export class ExtensionUiController {
 		};
 		const contextActions: ExtensionContextActions = {
 			getModel: () => this.ctx.session.model,
+			getCredentialSessionId: () => this.ctx.session.credentialSessionId,
 			isIdle: () => !this.ctx.session.isStreaming,
 			getActivePromptHandle: () => this.ctx.session.activePromptHandle,
 			abort: () => this.ctx.session.abort(),
@@ -892,6 +893,7 @@ export class ExtensionUiController {
 		};
 		const contextActions: ExtensionContextActions = {
 			getModel: () => this.ctx.session.model,
+			getCredentialSessionId: () => this.ctx.session.credentialSessionId,
 			isIdle: () => !this.ctx.session.isStreaming,
 			getActivePromptHandle: () => this.ctx.session.activePromptHandle,
 			abort: () => this.ctx.session.abort(),

package/src/modes/controllers/input-controller.ts

@@ -25,7 +25,11 @@ import { getEditorCommand, openInEditor } from "../../utils/external-editor";
 import { ensureSupportedImageInput, ImageInputTooLargeError } from "../../utils/image-loading";
 import { resizeImage } from "../../utils/image-resize";
 import { loadPastedImageBatch, PastedImageBatchError } from "../../utils/pasted-image-loading";
-import { formatPastedImageReference, parsePastedImagePaths } from "../../utils/pasted-image-path";
+import {
+	formatPastedImageReference,
+	locatePastedImageReferenceAroundCursor,
+	parsePastedImagePaths,
+} from "../../utils/pasted-image-path";
 import { generateSessionTitle, setSessionTerminalTitle } from "../../utils/title-generator";
 import { ActionRegistry, APP_ACTION_METADATA } from "../action-registry";
 import { CommandPalette, type CommandPaletteAction, type CommandPaletteEntry } from "../components/command-palette";
@@ -64,6 +68,11 @@ function isExpandable(obj: unknown): obj is Expandable {
 export class InputController {
 	readonly actionRegistry: ActionRegistry<void>;
 	readonly #loadPastedImageBatch: typeof loadPastedImageBatch;
+	#imagePlaceholderDeletionUndo?: {
+		beforeText: string;
+		afterText: string;
+		pendingImages: InteractiveModeContext["pendingImages"];
+	};
 
 	constructor(
 		private ctx: InteractiveModeContext,
@@ -645,6 +654,12 @@ export class InputController {
 		};
 
 		this.ctx.editor.clearCustomKeyHandlers();
+		for (const key of new Set([
+			...this.ctx.keybindings.getKeys("tui.editor.deleteCharBackward"),
+			"shift+backspace" as const,
+		])) {
+			this.ctx.editor.setCustomKeyHandler(key, () => this.#deleteImagePlaceholderBeforeCursor());
+		}
 		// Wire up extension shortcuts
 		this.registerExtensionShortcuts();
 
@@ -751,6 +766,7 @@ export class InputController {
 		// Tab on an empty composer accepts the pending ghost-text prompt suggestion.
 		this.ctx.editor.onTab = (text: string) => this.ctx.promptSuggestion?.tryAcceptOnTab(text) === true;
 
+		this.ctx.editor.onUndo = text => this.#restorePendingImagesAfterPlaceholderUndo(text);
 		this.ctx.editor.onChange = (text: string) => {
 			this.#resetEscapeGestures();
 			this.ctx.promptSuggestion?.notifyEditorChanged(text);
@@ -777,6 +793,7 @@ export class InputController {
 	}
 
 	async submitText(text: string, composer: ComposerSubmissionOptions): Promise<void> {
+		this.#imagePlaceholderDeletionUndo = undefined;
 		text = text.trim();
 		const submittedBashMode = this.ctx.isBashMode;
 		const submittedBashNoContext = this.ctx.isBashNoContext;
@@ -989,7 +1006,7 @@ export class InputController {
 				text,
 				registry,
 				this.ctx.settings,
-				this.ctx.session.sessionId,
+				this.ctx.session.credentialSessionId,
 				this.ctx.session.model,
 				provider => this.ctx.session.agent.metadataForProvider(provider),
 			)
@@ -1480,6 +1497,21 @@ export class InputController {
 			return;
 		}
 
+		// Foreground bash/eval owns the process fence. Queue all prompt text,
+		// including slash skill input, until the process settles instead of
+		// expanding a skill and starting a competing model turn.
+		if (this.ctx.session.isBashRunning || this.ctx.session.isEvalRunning) {
+			this.ctx.editor.addToHistory(text);
+			this.ctx.editor.setText("");
+			await this.ctx.withLocalSubmission(text, () =>
+				this.ctx.session.followUp(text, undefined, {
+					followUpQueuePolicy: "sequential",
+				}),
+			);
+			this.ctx.updatePendingMessagesDisplay();
+			this.ctx.ui.requestRender();
+			return;
+		}
 		// Skill commands invoke through the custom-message path regardless of
 		// which keybinding submitted them. Enter routes them as `steer`;
 		// explicit queue shortcuts route them as `followUp`.
@@ -1736,6 +1768,45 @@ export class InputController {
 		}
 	}
 
+	#deleteImagePlaceholderBeforeCursor(): boolean {
+		if (this.ctx.pendingImages.length === 0) return false;
+
+		const { line, col } = this.ctx.editor.getCursor();
+		const currentLine = this.ctx.editor.getLines()[line] ?? "";
+		const range = locatePastedImageReferenceAroundCursor(currentLine, col);
+		if (!range) return false;
+		const placeholderNumberText = String(range.imageIndex);
+
+		const imageIndex = Number.parseInt(placeholderNumberText, 10) - 1;
+		if (imageIndex < 0 || imageIndex >= this.ctx.pendingImages.length) return false;
+
+		const beforeText = this.ctx.editor.getText();
+		const pendingImages = this.ctx.pendingImages;
+		const deleted = this.ctx.editor.deleteTextRangeAroundCursor(range.startCol, range.endCol);
+		if (deleted) {
+			this.#imagePlaceholderDeletionUndo = {
+				beforeText,
+				afterText: this.ctx.editor.getText(),
+				pendingImages,
+			};
+		}
+		return deleted;
+	}
+
+	#restorePendingImagesAfterPlaceholderUndo(text: string): void {
+		const deletion = this.#imagePlaceholderDeletionUndo;
+		if (!deletion) return;
+
+		if (text === deletion.beforeText) {
+			if (this.ctx.pendingImages.length === 0) {
+				this.ctx.pendingImages = deletion.pendingImages;
+			}
+			this.#imagePlaceholderDeletionUndo = undefined;
+		} else if (text !== deletion.afterText) {
+			this.#imagePlaceholderDeletionUndo = undefined;
+		}
+	}
+
 	#nextImagePlaceholder(): string {
 		return `[image ${this.ctx.pendingImages.length}]`;
 	}