@oh-my-pi/pi-coding-agent 13.9.11 → 13.9.13

package/src/modes/components/status-line.ts

@@ -149,7 +149,6 @@ export class StatusLineComponent implements Component {
 	#invalidateGitCaches(): void {
 		this.#cachedBranch = undefined;
 		this.#cachedBranchRepoId = undefined;
-		this.#cachedPr = undefined;
 		this.#cachedPrContext = undefined;
 	}
 	#getCurrentBranch(): string | null {
@@ -261,20 +260,17 @@ export class StatusLineComponent implements Component {
 			return this.#cachedPr ?? null;
 		}
 
-		if (this.#cachedPr !== undefined) {
-			this.#cachedPr = undefined;
-			this.#cachedPrContext = undefined;
-		}
+		const stalePr = this.#cachedPr;
 
 		// Don't look up if no branch, detached HEAD, default branch, or already in flight
 		if (!branch || branch === "detached" || this.#isDefaultBranch(branch) || this.#prLookupInFlight) {
-			return null;
+			return stalePr ?? null;
 		}
 
 		this.#prLookupInFlight = true;
 		const lookupContext = currentContext;
 
-		// Fire async lookup, return null until resolved
+		// Fire async lookup, keep stale value visible until resolved
 		(async () => {
 			// Helper: only write cache if branch/repo context hasn't changed since launch
 			const setCachedPr = (value: { number: number; url: string } | null) => {
@@ -304,13 +300,13 @@ export class StatusLineComponent implements Component {
 				setCachedPr(null);
 			} finally {
 				this.#prLookupInFlight = false;
-				if (this.#cachedPr && this.#onBranchChange) {
+				if (this.#onBranchChange) {
 					this.#onBranchChange();
 				}
 			}
 		})();
 
-		return null;
+		return stalePr ?? null;
 	}
 
 	#getTokensPerSecond(): number | null {

package/src/modes/components/tree-selector.ts

@@ -2,6 +2,7 @@ import { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import {
 	type Component,
 	Container,
+	extractPrintableText,
 	Input,
 	matchesKey,
 	Spacer,
@@ -745,12 +746,9 @@ class TreeList implements Component {
 				this.onLabelEdit(selected.node.entry.id, selected.node.label);
 			}
 		} else {
-			const hasControlChars = [...keyData].some(ch => {
-				const code = ch.charCodeAt(0);
-				return code < 32 || code === 0x7f || (code >= 0x80 && code <= 0x9f);
-			});
-			if (!hasControlChars && keyData.length > 0) {
-				this.#searchQuery += keyData;
+			const printableText = extractPrintableText(keyData);
+			if (printableText) {
+				this.#searchQuery += printableText;
 				this.#applyFilter();
 			}
 		}

package/src/modes/components/welcome.ts

@@ -122,6 +122,7 @@ export class WelcomeComponent implements Component {
 		const rightLines = [
 			` ${theme.bold(theme.fg("accent", "Tips"))}`,
 			` ${theme.fg("dim", "?")}${theme.fg("muted", " for keyboard shortcuts")}`,
+			` ${theme.fg("dim", "#")}${theme.fg("muted", " for prompt actions")}`,
 			` ${theme.fg("dim", "/")}${theme.fg("muted", " for commands")}`,
 			` ${theme.fg("dim", "!")}${theme.fg("muted", " to run bash")}`,
 			` ${theme.fg("dim", "$")}${theme.fg("muted", " to run python")}`,

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

@@ -435,49 +435,54 @@ export class CommandController {
 		const expandToolsKey = this.ctx.keybindings.getDisplayString("expandTools") || "Ctrl+O";
 		const planModeKey = this.ctx.keybindings.getDisplayString("togglePlanMode") || "Alt+Shift+P";
 		const sttKey = this.ctx.keybindings.getDisplayString("toggleSTT") || "Alt+H";
+		const copyLineKey = this.ctx.keybindings.getDisplayString("copyLine") || "Alt+Shift+L";
+		const copyPromptKey = this.ctx.keybindings.getDisplayString("copyPrompt") || "Alt+Shift+C";
 		const hotkeys = `
-**Navigation**
-| Key | Action |
-|-----|--------|
-| \`Arrow keys\` | Move cursor / browse history (Up when empty) |
-| \`Option+Left/Right\` | Move by word |
-| \`Ctrl+A\` / \`Home\` / \`Cmd+Left\` | Start of line |
-| \`Ctrl+E\` / \`End\` / \`Cmd+Right\` | End of line |
-
-**Editing**
-| Key | Action |
-|-----|--------|
-| \`Enter\` | Send message |
-| \`Shift+Enter\` / \`Alt+Enter\` | New line |
-| \`Ctrl+W\` / \`Option+Backspace\` | Delete word backwards |
-| \`Ctrl+U\` | Delete to start of line |
-| \`Ctrl+K\` | Delete to end of line |
-
-**Other**
-| Key | Action |
-|-----|--------|
-| \`Tab\` | Path completion / accept autocomplete |
-| \`Escape\` | Cancel autocomplete / abort streaming |
-| \`Ctrl+C\` | Clear editor (first) / exit (second) |
-| \`Ctrl+D\` | Exit (when editor is empty) |
-| \`Ctrl+Z\` | Suspend to background |
-| \`Shift+Tab\` | Cycle thinking level |
-| \`Ctrl+P\` | Cycle role models (slow/default/smol) |
-| \`Shift+Ctrl+P\` | Cycle role models (temporary) |
-| \`Alt+P\` | Select model (temporary) |
-| \`Ctrl+L\` | Select model (set roles) |
-| \`${planModeKey}\` | Toggle plan mode |
-| \`Ctrl+R\` | Search prompt history |
-| \`${expandToolsKey}\` | Toggle tool output expansion |
-| \`Ctrl+T\` | Toggle todo list expansion |
-| \`Ctrl+G\` | Edit message in external editor |
-| \`${sttKey}\` | Toggle speech-to-text recording |
-| \`/\` | Slash commands |
-| \`!\` | Run bash command |
-| \`!!\` | Run bash command (excluded from context) |
-| \`$\` | Run Python in shared kernel |
-| \`$$\` | Run Python (excluded from context) |
-`;
+		**Navigation**
+		| Key | Action |
+		|-----|--------|
+		| \`Arrow keys\` | Move cursor / browse history (Up when empty) |
+		| \`Option+Left/Right\` | Move by word |
+		| \`Ctrl+A\` / \`Home\` / \`Cmd+Left\` | Start of line |
+		| \`Ctrl+E\` / \`End\` / \`Cmd+Right\` | End of line |
+		
+		**Editing**
+		| Key | Action |
+		|-----|--------|
+		| \`Enter\` | Send message |
+		| \`Shift+Enter\` / \`Alt+Enter\` | New line |
+		| \`Ctrl+W\` / \`Option+Backspace\` | Delete word backwards |
+		| \`Ctrl+U\` | Delete to start of line |
+		| \`Ctrl+K\` | Delete to end of line |
+		| \`${copyLineKey}\` | Copy current line |
+		| \`${copyPromptKey}\` | Copy whole prompt |
+		
+		**Other**
+		| Key | Action |
+		|-----|--------|
+		| \`Tab\` | Path completion / accept autocomplete |
+		| \`Escape\` | Cancel autocomplete / abort streaming |
+		| \`Ctrl+C\` | Clear editor (first) / exit (second) |
+		| \`Ctrl+D\` | Exit (when editor is empty) |
+		| \`Ctrl+Z\` | Suspend to background |
+		| \`Shift+Tab\` | Cycle thinking level |
+		| \`Ctrl+P\` | Cycle role models (slow/default/smol) |
+		| \`Shift+Ctrl+P\` | Cycle role models (temporary) |
+		| \`Alt+P\` | Select model (temporary) |
+		| \`Ctrl+L\` | Select model (set roles) |
+		| \`${planModeKey}\` | Toggle plan mode |
+		| \`Ctrl+R\` | Search prompt history |
+		| \`${expandToolsKey}\` | Toggle tool output expansion |
+		| \`Ctrl+T\` | Toggle todo list expansion |
+		| \`Ctrl+G\` | Edit message in external editor |
+		| \`${sttKey}\` | Toggle speech-to-text recording |
+		| \`#\` | Open prompt actions |
+		| \`/\` | Slash commands |
+		| \`!\` | Run bash command |
+		| \`!!\` | Run bash command (excluded from context) |
+		| \`$\` | Run Python in shared kernel |
+		| \`$$\` | Run Python (excluded from context) |
+		`;
 		this.ctx.chatContainer.addChild(new Spacer(1));
 		this.ctx.chatContainer.addChild(new DynamicBorder());
 		this.ctx.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "Keyboard Shortcuts")), 1, 0));

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

@@ -134,8 +134,19 @@ export class EventController {
 					this.ctx.addMessageToChat(event.message);
 					this.ctx.ui.requestRender();
 				} else if (event.message.role === "user") {
+					const textContent = this.ctx.getUserMessageText(event.message);
+					const imageCount =
+						typeof event.message.content === "string"
+							? 0
+							: event.message.content.filter(content => content.type === "image").length;
+					const signature = `${textContent}\u0000${imageCount}`;
+
 					this.#resetReadGroup();
-					this.ctx.addMessageToChat(event.message);
+					if (this.ctx.optimisticUserMessageSignature !== signature) {
+						this.ctx.addMessageToChat(event.message);
+					}
+					this.ctx.optimisticUserMessageSignature = undefined;
+
 					if (!event.message.synthetic) {
 						this.ctx.editor.setText("");
 						this.ctx.updatePendingMessagesDisplay();
@@ -473,15 +484,7 @@ export class EventController {
 						isHandoffAction ? "Auto-handoff cancelled" : "Auto context-full maintenance cancelled",
 					);
 				} else if (event.result) {
-					this.ctx.chatContainer.clear();
 					this.ctx.rebuildChatFromMessages();
-					this.ctx.addMessageToChat({
-						role: "compactionSummary",
-						tokensBefore: event.result.tokensBefore,
-						summary: event.result.summary,
-						shortSummary: event.result.shortSummary,
-						timestamp: Date.now(),
-					});
 					this.ctx.statusLine.invalidate();
 					this.ctx.updateEditorTopBorder();
 				} else if (event.errorMessage) {

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

@@ -1,8 +1,10 @@
 import * as fs from "node:fs/promises";
 import { type AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { copyToClipboard, readImageFromClipboard, sanitizeText } from "@oh-my-pi/pi-natives";
+import type { AutocompleteProvider, SlashCommand } from "@oh-my-pi/pi-tui";
 import { $env } from "@oh-my-pi/pi-utils";
 import { settings } from "../../config/settings";
+import { createPromptActionAutocompleteProvider } from "../../modes/prompt-action-autocomplete";
 import { theme } from "../../modes/theme/theme";
 import type { InteractiveModeContext } from "../../modes/types";
 import type { AgentSessionEvent } from "../../session/agent-session";
@@ -87,7 +89,8 @@ export class InputController {
 		this.ctx.editor.onCtrlG = () => void this.openExternalEditor();
 		this.ctx.editor.onQuestionMark = () => this.ctx.handleHotkeysCommand();
 		this.ctx.editor.onCtrlV = () => this.handleImagePaste();
-		this.ctx.editor.onCopyPrompt = () => this.handleCopyPrompt();
+		const copyPromptKeys = this.ctx.keybindings.getKeys("copyPrompt");
+		this.ctx.editor.onCopyPrompt = copyPromptKeys.includes("alt+shift+c") ? () => this.handleCopyPrompt() : undefined;
 
 		// Wire up extension shortcuts
 		this.registerExtensionShortcuts();
@@ -129,6 +132,13 @@ export class InputController {
 		for (const key of this.ctx.keybindings.getKeys("toggleSTT")) {
 			this.ctx.editor.setCustomKeyHandler(key, () => void this.ctx.handleSTTToggle());
 		}
+		for (const key of this.ctx.keybindings.getKeys("copyLine")) {
+			this.ctx.editor.setCustomKeyHandler(key, () => this.handleCopyCurrentLine());
+		}
+		for (const key of copyPromptKeys) {
+			if (key === "alt+shift+c") continue;
+			this.ctx.editor.setCustomKeyHandler(key, () => this.handleCopyPrompt());
+		}
 
 		this.ctx.editor.onChange = (text: string) => {
 			const wasBashMode = this.ctx.isBashMode;
@@ -318,6 +328,19 @@ export class InputController {
 				// Include any pending images from clipboard paste
 				const images = inputImages && inputImages.length > 0 ? [...inputImages] : undefined;
 				this.ctx.pendingImages = [];
+
+				// Render user message immediately, then let session events catch up
+				this.ctx.optimisticUserMessageSignature = `${text}\u0000${images?.length ?? 0}`;
+				const optimisticMessage: AgentMessage = {
+					role: "user",
+					content: [{ type: "text", text }, ...(images ?? [])],
+					attribution: "user",
+					timestamp: Date.now(),
+				};
+				this.ctx.addMessageToChat(optimisticMessage);
+				this.ctx.editor.setText("");
+				this.ctx.ui.requestRender();
+
 				this.ctx.onInputCallback({ text, images });
 			}
 			this.ctx.editor.addToHistory(text);
@@ -503,6 +526,36 @@ export class InputController {
 		}
 	}
 
+	createAutocompleteProvider(commands: SlashCommand[], basePath: string): AutocompleteProvider {
+		return createPromptActionAutocompleteProvider({
+			commands,
+			basePath,
+			keybindings: this.ctx.keybindings,
+			copyCurrentLine: () => this.handleCopyCurrentLine(),
+			copyPrompt: () => this.handleCopyPrompt(),
+			moveCursorToLineStart: () => this.ctx.editor.moveToLineStart(),
+			moveCursorToLineEnd: () => this.ctx.editor.moveToLineEnd(),
+		});
+	}
+
+	/** Copy the current editor line to the system clipboard. */
+	handleCopyCurrentLine(): void {
+		const { line } = this.ctx.editor.getCursor();
+		const text = this.ctx.editor.getLines()[line] || "";
+		if (!text) {
+			this.ctx.showStatus("Nothing to copy");
+			return;
+		}
+		try {
+			copyToClipboard(text);
+			const sanitized = sanitizeText(text);
+			const preview = sanitized.length > 30 ? `${sanitized.slice(0, 30)}...` : sanitized;
+			this.ctx.showStatus(`Copied line: ${preview}`);
+		} catch {
+			this.ctx.showWarning("Failed to copy to clipboard");
+		}
+	}
+
 	/** Copy current prompt text to system clipboard. */
 	handleCopyPrompt(): void {
 		const text = this.ctx.editor.getText();

package/src/modes/interactive-mode.ts

@@ -6,15 +6,7 @@ import * as path from "node:path";
 import { type Agent, type AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent, Message, Model, UsageReport } from "@oh-my-pi/pi-ai";
 import type { Component, Loader, SlashCommand } from "@oh-my-pi/pi-tui";
-import {
-	CombinedAutocompleteProvider,
-	Container,
-	Markdown,
-	ProcessTerminal,
-	Spacer,
-	Text,
-	TUI,
-} from "@oh-my-pi/pi-tui";
+import { Container, Markdown, ProcessTerminal, Spacer, Text, TUI } from "@oh-my-pi/pi-tui";
 import { APP_NAME, getProjectDir, hsvToRgb, isEnoent, logger, postmortem } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
 import { KeybindingsManager } from "../config/keybindings";
@@ -123,6 +115,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	retryEscapeHandler?: () => void;
 	unsubscribe?: () => void;
 	onInputCallback?: (input: { text: string; images?: ImageContent[] }) => void;
+	optimisticUserMessageSignature: string | undefined = undefined;
 	lastSigintTime = 0;
 	lastEscapeTime = 0;
 	shutdownRequested = false;
@@ -389,7 +382,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			name: cmd.name,
 			description: cmd.description,
 		}));
-		const autocompleteProvider = new CombinedAutocompleteProvider(
+		const autocompleteProvider = this.#inputController.createAutocompleteProvider(
 			[...this.#pendingSlashCommands, ...fileSlashCommands],
 			basePath,
 		);
@@ -855,6 +848,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 
 	showError(message: string): void {
+		this.optimisticUserMessageSignature = undefined;
 		this.#uiHelpers.showError(message);
 	}
 

package/src/modes/prompt-action-autocomplete.ts

@@ -0,0 +1,201 @@
+import {
+	type AutocompleteItem,
+	type AutocompleteProvider,
+	CombinedAutocompleteProvider,
+	getEditorKeybindings,
+	type SlashCommand,
+} from "@oh-my-pi/pi-tui";
+import { formatKeyHints, type KeybindingsManager } from "../config/keybindings";
+
+interface PromptActionDefinition {
+	id: string;
+	label: string;
+	description: string;
+	keywords: string[];
+	execute: () => void;
+}
+
+interface PromptActionAutocompleteItem extends AutocompleteItem {
+	actionId: string;
+	execute: () => void;
+}
+
+interface PromptActionAutocompleteOptions {
+	commands: SlashCommand[];
+	basePath: string;
+	keybindings: KeybindingsManager;
+	copyCurrentLine: () => void;
+	copyPrompt: () => void;
+	moveCursorToLineStart: () => void;
+	moveCursorToLineEnd: () => void;
+}
+
+function fuzzyMatch(query: string, target: string): boolean {
+	if (query.length === 0) return true;
+	if (query.length > target.length) return false;
+
+	let queryIndex = 0;
+	for (let targetIndex = 0; targetIndex < target.length && queryIndex < query.length; targetIndex += 1) {
+		if (query[queryIndex] === target[targetIndex]) {
+			queryIndex += 1;
+		}
+	}
+
+	return queryIndex === query.length;
+}
+
+function fuzzyScore(query: string, target: string): number {
+	if (query.length === 0) return 1;
+	if (target === query) return 100;
+	if (target.startsWith(query)) return 80;
+	if (target.includes(query)) return 60;
+
+	let queryIndex = 0;
+	let gaps = 0;
+	let lastMatchIndex = -1;
+	for (let targetIndex = 0; targetIndex < target.length && queryIndex < query.length; targetIndex += 1) {
+		if (query[queryIndex] === target[targetIndex]) {
+			if (lastMatchIndex >= 0 && targetIndex - lastMatchIndex > 1) {
+				gaps += 1;
+			}
+			lastMatchIndex = targetIndex;
+			queryIndex += 1;
+		}
+	}
+
+	if (queryIndex !== query.length) return 0;
+	return Math.max(1, 40 - gaps * 5);
+}
+
+function isPromptActionItem(item: AutocompleteItem): item is PromptActionAutocompleteItem {
+	return (
+		"actionId" in item && "execute" in item && typeof (item as PromptActionAutocompleteItem).execute === "function"
+	);
+}
+
+function getPromptActionPrefix(textBeforeCursor: string): string | null {
+	const hashIndex = textBeforeCursor.lastIndexOf("#");
+	if (hashIndex === -1) return null;
+
+	const query = textBeforeCursor.slice(hashIndex + 1);
+	if (/[\s]/.test(query)) {
+		return null;
+	}
+
+	return textBeforeCursor.slice(hashIndex);
+}
+
+export class PromptActionAutocompleteProvider implements AutocompleteProvider {
+	#baseProvider: CombinedAutocompleteProvider;
+	#actions: PromptActionDefinition[];
+
+	constructor(commands: SlashCommand[], basePath: string, actions: PromptActionDefinition[]) {
+		this.#baseProvider = new CombinedAutocompleteProvider(commands, basePath);
+		this.#actions = actions;
+	}
+
+	async getSuggestions(
+		lines: string[],
+		cursorLine: number,
+		cursorCol: number,
+	): Promise<{ items: AutocompleteItem[]; prefix: string } | null> {
+		const currentLine = lines[cursorLine] || "";
+		const textBeforeCursor = currentLine.slice(0, cursorCol);
+		const promptActionPrefix = getPromptActionPrefix(textBeforeCursor);
+		if (promptActionPrefix) {
+			const query = promptActionPrefix.slice(1).toLowerCase();
+			const items = this.#actions
+				.map(action => {
+					const searchable = [action.label, action.description, ...action.keywords].join(" ").toLowerCase();
+					if (!fuzzyMatch(query, searchable)) return null;
+					return {
+						value: action.label,
+						label: action.label,
+						description: action.description,
+						actionId: action.id,
+						execute: action.execute,
+						score: fuzzyScore(query, searchable),
+					} satisfies PromptActionAutocompleteItem & { score: number };
+				})
+				.filter(item => item !== null)
+				.sort((a, b) => b.score - a.score)
+				.map(({ score: _score, ...item }) => item);
+			if (items.length > 0) {
+				return { items, prefix: promptActionPrefix };
+			}
+		}
+
+		return this.#baseProvider.getSuggestions(lines, cursorLine, cursorCol);
+	}
+
+	applyCompletion(
+		lines: string[],
+		cursorLine: number,
+		cursorCol: number,
+		item: AutocompleteItem,
+		prefix: string,
+	): {
+		lines: string[];
+		cursorLine: number;
+		cursorCol: number;
+		onApplied?: () => void;
+	} {
+		if (prefix.startsWith("#") && isPromptActionItem(item)) {
+			const currentLine = lines[cursorLine] || "";
+			const beforePrefix = currentLine.slice(0, cursorCol - prefix.length);
+			const afterCursor = currentLine.slice(cursorCol);
+			const newLines = [...lines];
+			newLines[cursorLine] = beforePrefix + afterCursor;
+			return {
+				lines: newLines,
+				cursorLine,
+				cursorCol: beforePrefix.length,
+				onApplied: item.execute,
+			};
+		}
+
+		return this.#baseProvider.applyCompletion(lines, cursorLine, cursorCol, item, prefix);
+	}
+
+	getInlineHint(lines: string[], cursorLine: number, cursorCol: number): string | null {
+		return this.#baseProvider.getInlineHint?.(lines, cursorLine, cursorCol) ?? null;
+	}
+}
+
+export function createPromptActionAutocompleteProvider(
+	options: PromptActionAutocompleteOptions,
+): PromptActionAutocompleteProvider {
+	const editorKeybindings = getEditorKeybindings();
+	const actions: PromptActionDefinition[] = [
+		{
+			id: "copy-line",
+			label: "Copy current line",
+			description: formatKeyHints(options.keybindings.getKeys("copyLine")),
+			keywords: ["copy", "line", "clipboard", "current"],
+			execute: options.copyCurrentLine,
+		},
+		{
+			id: "copy-prompt",
+			label: "Copy whole prompt",
+			description: formatKeyHints(options.keybindings.getKeys("copyPrompt")),
+			keywords: ["copy", "prompt", "clipboard", "message"],
+			execute: options.copyPrompt,
+		},
+		{
+			id: "cursor-line-start",
+			label: "Move cursor to beginning of line",
+			description: formatKeyHints(editorKeybindings.getKeys("cursorLineStart")),
+			keywords: ["move", "cursor", "line", "start", "beginning", "home"],
+			execute: options.moveCursorToLineStart,
+		},
+		{
+			id: "cursor-line-end",
+			label: "Move cursor to end of line",
+			description: formatKeyHints(editorKeybindings.getKeys("cursorLineEnd")),
+			keywords: ["move", "cursor", "line", "end"],
+			execute: options.moveCursorToLineEnd,
+		},
+	];
+
+	return new PromptActionAutocompleteProvider(options.commands, options.basePath, actions);
+}

package/src/modes/types.ts

@@ -88,6 +88,7 @@ export interface InteractiveModeContext {
 	retryEscapeHandler?: () => void;
 	unsubscribe?: () => void;
 	onInputCallback?: (input: { text: string; images?: ImageContent[] }) => void;
+	optimisticUserMessageSignature: string | undefined;
 	lastSigintTime: number;
 	lastEscapeTime: number;
 	shutdownRequested: boolean;

package/src/modes/utils/ui-helpers.ts

@@ -209,6 +209,7 @@ export class UiHelpers {
 		sessionContext: SessionContext,
 		options: { updateFooter?: boolean; populateHistory?: boolean } = {},
 	): void {
+		this.ctx.optimisticUserMessageSignature = undefined;
 		this.ctx.pendingTools.clear();
 
 		if (options.updateFooter) {
@@ -219,7 +220,13 @@ export class UiHelpers {
 		let readGroup: ReadToolGroupComponent | null = null;
 		const readToolCallArgs = new Map<string, Record<string, unknown>>();
 		const readToolCallAssistantComponents = new Map<string, AssistantMessageComponent>();
+		const deferredMessages: AgentMessage[] = [];
 		for (const message of sessionContext.messages) {
+			// Defer compaction summaries so they render at the bottom (visible after scroll)
+			if (message.role === "compactionSummary") {
+				deferredMessages.push(message);
+				continue;
+			}
 			// Assistant messages need special handling for tool calls
 			if (message.role === "assistant") {
 				this.ctx.addMessageToChat(message);
@@ -349,6 +356,11 @@ export class UiHelpers {
 			}
 		}
 
+		// Render deferred messages (compaction summaries) at the bottom so they're visible
+		for (const message of deferredMessages) {
+			this.ctx.addMessageToChat(message, options);
+		}
+
 		this.ctx.pendingTools.clear();
 		this.ctx.ui.requestRender();
 	}

package/src/patch/index.ts

@@ -96,7 +96,7 @@ export type ReplaceParams = Static<typeof replaceEditSchema>;
 export type PatchParams = Static<typeof patchEditSchema>;
 
 /** Pattern matching hashline display format prefixes: `LINE#ID:CONTENT` and `#ID:CONTENT` */
-const HASHLINE_PREFIX_RE = /^\s*(?:>>>|>>)?\s*(?:\d+\s*#\s*|#)\s*[0-9a-zA-Z]{1,16}:/;
+const HASHLINE_PREFIX_RE = /^\s*(?:>>>|>>)?\s*(?:\d+\s*#\s*|#\s*)[ZPMQVRWSNKTXJBYH]{2}:/;
 
 /** Pattern matching a unified-diff added-line `+` prefix (but not `++`). Does NOT match `-` to avoid corrupting Markdown list items. */
 const DIFF_PLUS_RE = /^[+](?![+])/;