@gajae-code/coding-agent 0.9.5 → 0.10.0

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

@@ -8,6 +8,7 @@ import {
 	Image,
 	ImageProtocol,
 	imageFallback,
+	isTerminalGraphicsFallbackActive,
 	registerAnimationCallback,
 	Spacer,
 	TERMINAL,
@@ -33,7 +34,7 @@ import {
 import { formatExpandHint, replaceTabs, resolveImageOptions, truncateToWidth } from "../../tools/render-utils";
 import { toolRenderers } from "../../tools/renderers";
 import { renderStatusLine } from "../../tui";
-import { sanitizeWithOptionalSixelPassthrough } from "../../utils/sixel";
+import { containsSixelSequence, getSixelLineMask, sanitizeWithOptionalSixelPassthrough } from "../../utils/sixel";
 import { renderDiff } from "./diff";
 
 function ensureInvalidate(component: unknown): Component {
@@ -44,6 +45,23 @@ function ensureInvalidate(component: unknown): Component {
 	return c as Component;
 }
 
+const SIXEL_FALLBACK_PLACEHOLDER = "[SIXEL image hidden while IRC sidebar is visible]";
+
+function replaceSixelOutputForGraphicsFallback(text: string): string {
+	const lines = text.split("\n");
+	const sixelLineMask = getSixelLineMask(lines);
+	if (!sixelLineMask.some(Boolean)) return text;
+
+	return lines
+		.flatMap((line, index) => {
+			if (!sixelLineMask[index]) return [line];
+			return index === 0 || !sixelLineMask[index - 1] || containsSixelSequence(line)
+				? [SIXEL_FALLBACK_PLACEHOLDER]
+				: [];
+		})
+		.join("\n");
+}
+
 function cloneToolArgs<T>(args: T): T {
 	if (args === null || args === undefined) return args;
 	try {
@@ -169,7 +187,14 @@ export class ToolExecutionComponent extends Container {
 		isError?: boolean;
 		details?: any;
 	};
-	#textOutputCache?: { content: unknown; showImages: boolean; terminalImageProtocol: unknown; output: string };
+	#textOutputCache?: {
+		content: unknown;
+		showImages: boolean;
+		terminalImageProtocol: unknown;
+		graphicsFallbackActive: boolean;
+		output: string;
+	};
+	#displayBuiltWithGraphicsFallback: boolean | undefined;
 	// Edit preview state
 	#editMode?: EditMode;
 	#editDiffPreview?: PerFileDiffPreview[];
@@ -441,6 +466,13 @@ export class ToolExecutionComponent extends Container {
 		this.#updateDisplay();
 	}
 
+	override render(width: number): string[] {
+		if (this.#displayBuiltWithGraphicsFallback !== isTerminalGraphicsFallbackActive()) {
+			this.#updateDisplay();
+		}
+		return super.render(width);
+	}
+
 	#updateDisplay(): void {
 		// Set background based on state
 		const bgFn = this.#isPartial
@@ -685,6 +717,7 @@ export class ToolExecutionComponent extends Container {
 				}
 			}
 		}
+		this.#displayBuiltWithGraphicsFallback = isTerminalGraphicsFallbackActive();
 	}
 
 	#getCallArgsForRender(): any {
@@ -761,11 +794,13 @@ export class ToolExecutionComponent extends Container {
 
 		const content = this.#result.content;
 		const terminalImageProtocol = TERMINAL.imageProtocol;
+		const graphicsFallbackActive = isTerminalGraphicsFallbackActive();
 		const cached = this.#textOutputCache;
 		if (
 			cached?.content === content &&
 			cached.showImages === this.#showImages &&
-			cached.terminalImageProtocol === terminalImageProtocol
+			cached.terminalImageProtocol === terminalImageProtocol &&
+			cached.graphicsFallbackActive === graphicsFallbackActive
 		) {
 			return cached.output;
 		}
@@ -773,8 +808,8 @@ export class ToolExecutionComponent extends Container {
 		const textParts: string[] = [];
 		for (const block of content ?? []) {
 			if (block.type !== "text") continue;
-			const text = block.text || "";
-			textParts.push(sanitizeWithOptionalSixelPassthrough(text, sanitizeText));
+			const text = sanitizeWithOptionalSixelPassthrough(block.text || "", sanitizeText);
+			textParts.push(graphicsFallbackActive ? replaceSixelOutputForGraphicsFallback(text) : text);
 		}
 		let output = textParts.join("\n");
 
@@ -789,7 +824,13 @@ export class ToolExecutionComponent extends Container {
 			output = output ? `${output}\n${imageIndicators}` : imageIndicators;
 		}
 
-		this.#textOutputCache = { content, showImages: this.#showImages, terminalImageProtocol, output };
+		this.#textOutputCache = {
+			content,
+			showImages: this.#showImages,
+			terminalImageProtocol,
+			graphicsFallbackActive,
+			output,
+		};
 		return output;
 	}
 

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

@@ -1,4 +1,12 @@
-import { type Component, Container, Markdown, Spacer, Text } from "@gajae-code/tui";
+import {
+	type Component,
+	Container,
+	Markdown,
+	Spacer,
+	Text,
+	type ViewportAnchorRender,
+	type ViewportAnchorSource,
+} from "@gajae-code/tui";
 import { getMarkdownTheme, theme } from "../../modes/theme/theme";
 
 // OSC 133 shell integration: marks prompt zones for terminal multiplexers
@@ -10,8 +18,11 @@ const OSC133_ZONE_FINAL = "\x1b]133;C\x07";
  * Component that renders a user message
  */
 export class UserMessageComponent extends Container {
-	constructor(text: string, synthetic = false) {
+	#viewportAnchorSource?: ViewportAnchorSource;
+
+	constructor(text: string, synthetic = false, viewportAnchorId?: string) {
 		super();
+		if (viewportAnchorId) this.#viewportAnchorSource = { id: viewportAnchorId };
 		const bgColor = (value: string) => theme.bg("userMessageBg", value);
 		const color = synthetic
 			? (value: string) => theme.fg("dim", value)
@@ -19,7 +30,9 @@ export class UserMessageComponent extends Container {
 		this.addChild(new Spacer(1));
 		const label = synthetic ? "replay" : "user";
 		this.addChild(new Text(theme.bold(theme.fg("accent", label)), 1, 0));
-		this.addChild(new PromptZoneMarkdown(text, bgColor, color));
+		const prompt = new PromptZoneMarkdown(text, bgColor, color);
+		this.addChild(prompt);
+		if (this.#viewportAnchorSource) this.setViewportAnchorSource(prompt, this.#viewportAnchorSource);
 	}
 }
 
@@ -37,15 +50,19 @@ class PromptZoneMarkdown implements Component {
 		this.#markdown.invalidate();
 	}
 
-	render(width: number): string[] {
-		const lines = this.#markdown.render(width);
-		if (lines.length === 0) {
-			return lines;
-		}
-
+	#withPromptZone(lines: string[]): string[] {
+		if (lines.length === 0) return lines;
 		const zoned = [...lines];
 		zoned[0] = OSC133_ZONE_START + zoned[0];
 		zoned[zoned.length - 1] = `${zoned[zoned.length - 1]}${OSC133_ZONE_END}${OSC133_ZONE_FINAL}`;
 		return zoned;
 	}
+
+	renderWithViewportAnchorSource(width: number, source: ViewportAnchorSource): ViewportAnchorRender {
+		const rendered = this.#markdown.renderWithViewportAnchorSource(width, source);
+		return { lines: this.#withPromptZone(rendered.lines), anchors: rendered.anchors };
+	}
+	render(width: number): string[] {
+		return this.#withPromptZone(this.#markdown.render(width));
+	}
 }

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

@@ -40,6 +40,7 @@ import { buildHotkeysMarkdown } from "../../modes/utils/hotkeys-markdown";
 import { buildToolsMarkdown } from "../../modes/utils/tools-markdown";
 import type { AsyncJobSnapshotItem } from "../../session/agent-session";
 import type { AuthStorage } from "../../session/auth-storage";
+import { computeCacheMissCostSummary, formatCacheMissSummaryLines } from "../../session/cache-economics";
 import type { NewSessionOptions } from "../../session/session-manager";
 import { outputMeta } from "../../tools/output-meta";
 import { resolveToCwd, stripOuterDoubleQuotes } from "../../tools/path-utils";
@@ -48,6 +49,7 @@ import { getDisplayChangelogEntries } from "../../utils/changelog";
 import { copyToClipboard } from "../../utils/clipboard";
 import { openPath } from "../../utils/open";
 import { setSessionTerminalTitle } from "../../utils/title-generator";
+import { prepareTranscriptRebuild } from "../utils/ui-helpers";
 
 function showMarkdownPanel(ctx: InteractiveModeContext, title: string, markdown: string): void {
 	ctx.chatContainer.addChild(new Spacer(1));
@@ -426,6 +428,24 @@ export class CommandController {
 				info += `${theme.fg("dim", "Premium Requests:")} ${normalizedPremiumRequests.toLocaleString()}\n`;
 			}
 		}
+		const cacheMissSummary = stats.costBreakdown
+			? computeCacheMissCostSummary(stats.tokens, {
+					kind: "persisted-aggregate",
+					costBreakdown: stats.costBreakdown,
+				})
+			: undefined;
+		if (cacheMissSummary) {
+			info += `\n${theme.bold("Cache Miss Cost")}`;
+			for (const line of formatCacheMissSummaryLines(cacheMissSummary)) {
+				const separator = line.indexOf(":");
+				if (separator === -1) {
+					info += `\n${line}`;
+				} else {
+					info += `\n${theme.fg("dim", `${line.slice(0, separator)}:`)}${line.slice(separator + 1)}`;
+				}
+			}
+			info += `\n`;
+		}
 
 		if (this.ctx.lspServers && this.ctx.lspServers.length > 0) {
 			info += `\n${theme.bold("LSP Servers")}\n`;
@@ -911,6 +931,8 @@ export class CommandController {
 			}
 		}
 		if (!(await this.ctx.session.newSession(options))) return;
+		this.ctx.resetIrcSidebarSession();
+
 		this.ctx.resetObserverRegistry();
 		setSessionTerminalTitle(this.ctx.sessionManager.getSessionName(), this.ctx.sessionManager.getCwd());
 
@@ -920,6 +942,7 @@ export class CommandController {
 		this.ctx.updateEditorBorderColor();
 		this.ctx.ui.requestRender();
 
+		prepareTranscriptRebuild(this.ctx.ui, "replace-identity");
 		this.ctx.chatContainer.clear();
 		this.ctx.pendingMessagesContainer.clear();
 		this.ctx.compactionQueuedMessages = [];
@@ -958,6 +981,7 @@ export class CommandController {
 		this.ctx.updateEditorBorderColor();
 		this.ctx.ui.requestRender();
 
+		prepareTranscriptRebuild(this.ctx.ui, "replace-identity");
 		this.ctx.chatContainer.clear();
 		this.ctx.pendingMessagesContainer.clear();
 		this.ctx.compactionQueuedMessages = [];
@@ -996,6 +1020,7 @@ export class CommandController {
 			this.ctx.showError("Fork failed (session not persisted or cancelled)");
 			return;
 		}
+		this.ctx.resetIrcSidebarSession();
 
 		this.ctx.statusLine.invalidate();
 		this.ctx.updateEditorTopBorder();
@@ -1219,7 +1244,7 @@ export class CommandController {
 					: undefined;
 			await this.ctx.session.compact(instructions, options);
 
-			this.ctx.rebuildChatFromMessages();
+			this.ctx.rebuildChatFromMessages("reconcile-same-transcript");
 
 			this.ctx.statusLine.invalidate();
 			this.ctx.updateEditorTopBorder();
@@ -1279,9 +1304,10 @@ export class CommandController {
 				this.ctx.showError("Handoff cancelled");
 				return;
 			}
+			this.ctx.resetIrcSidebarSession();
 
 			// Rebuild chat from the new session (which now contains the handoff document)
-			this.ctx.rebuildChatFromMessages();
+			this.ctx.rebuildChatFromMessages("replace-identity");
 
 			this.ctx.statusLine.invalidate();
 			this.ctx.updateEditorTopBorder();

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

@@ -20,18 +20,20 @@ import { completionNotifyDisabledByEnv } from "../../notifications/config";
 import { summaryFromMessage } from "../../notifications/helpers";
 import type { PlanApprovalDetails } from "../../plan-mode/approved-plan";
 import type { AgentSessionEvent } from "../../session/agent-session";
-import { isSilentAbort, readPendingDisplayTag } from "../../session/messages";
+import { type CustomMessage, isSilentAbort, readPendingDisplayTag } from "../../session/messages";
+import { transferSessionMessageIdentity } from "../../session/session-manager";
 import type { ResolveToolDetails } from "../../tools/resolve";
+import type { IrcObservationRecord } from "../irc-observation-ledger";
 import { interruptHint } from "../shared";
 import { buildAbortDisplayMessage } from "../utils/abort-message";
 import { consumeInjectedOptimisticSignature } from "../utils/injected-user-submission";
+import { parseIrcMessage } from "../utils/irc-message";
 import { ringTerminalBell } from "../utils/terminal-bell";
+
 import { addChatChild, argsWithPartialJson } from "../utils/ui-helpers";
 
 type AgentSessionEventKind = AgentSessionEvent["type"];
 
-const IRC_MESSAGE_VISIBLE_TTL_MS = 10_000;
-
 /** Test-only performance counters for advisory baseline tests. */
 export const __eventControllerPerfCounters = {
 	messageUpdateContentVisits: 0,
@@ -112,6 +114,7 @@ export class EventController {
 	#lastAssistantComponent: AssistantMessageComponent | undefined = undefined;
 	#idleCompactionTimer?: NodeJS.Timeout;
 	#ircExpiryTimers = new Map<string, NodeJS.Timeout>();
+	#renderedIrcComponents = new Map<string, readonly Component[]>();
 	#toolIntentCache = new Map<string, { args: unknown; intent: string | undefined }>();
 	#thinkingContentIndices = new Set<number>();
 	#handlers: AgentSessionEventHandlers;
@@ -157,10 +160,7 @@ export class EventController {
 			this.ctx.retryLoader.stop();
 			this.ctx.retryLoader = undefined;
 		}
-		for (const timer of this.#ircExpiryTimers.values()) {
-			clearTimeout(timer);
-		}
-		this.#ircExpiryTimers.clear();
+		this.clearIrcExpiryTimers();
 	}
 
 	#resetReadGroup(): void {
@@ -263,8 +263,61 @@ export class EventController {
 		this.ctx.ui.requestRender();
 	}
 
+	#observeIrcMessage(message: CustomMessage): void {
+		const parsed = parseIrcMessage(message);
+		if (!parsed) return;
+		const arrival = this.ctx.captureIrcArrivalSnapshot();
+		const record = this.ctx.ircLedger.observe(parsed, arrival.panelVisible);
+		this.#cleanupEvictedIrcObservations();
+		if (!record) return;
+		const signature = `irc:${record.observationId}`;
+		if (this.#renderedCustomMessages.has(signature)) return;
+		this.#renderedCustomMessages.add(signature);
+		this.#resetReadGroup();
+		const components = this.ctx.addLiveIrcObservationToChat(record, arrival);
+		this.#renderedIrcComponents.set(record.observationId, components);
+		this.#scheduleIrcExpiry(record, components);
+		this.ctx.ui.requestRender();
+	}
+
+	#cleanupIrcObservationIds(observationIds: readonly string[]): void {
+		const removedComponents = new Set<Component>();
+		for (const observationId of observationIds) {
+			const timer = this.#ircExpiryTimers.get(observationId);
+			if (timer) clearTimeout(timer);
+			this.#ircExpiryTimers.delete(observationId);
+			for (const component of this.#renderedIrcComponents.get(observationId) ?? []) {
+				removedComponents.add(component);
+			}
+			this.#renderedIrcComponents.delete(observationId);
+			for (const component of this.ctx.removeRenderedIrcInlineComponents(observationId) ?? []) {
+				removedComponents.add(component);
+			}
+
+			this.#renderedCustomMessages.delete(`irc:${observationId}`);
+		}
+		for (const component of removedComponents) this.ctx.chatContainer.removeChild(component);
+	}
+
+	#cleanupEvictedIrcObservations(): void {
+		this.#cleanupIrcObservationIds(this.ctx.ircLedger.drainEvictedObservationIds());
+	}
+
+	#cleanupExpiredIrcInlineComponents(observationId: string): void {
+		const removedComponents = new Set<Component>(this.#renderedIrcComponents.get(observationId));
+		this.#renderedIrcComponents.delete(observationId);
+		for (const component of this.ctx.removeRenderedIrcInlineComponents(observationId) ?? []) {
+			removedComponents.add(component);
+		}
+		for (const component of removedComponents) this.ctx.chatContainer.removeChild(component);
+	}
+
 	async #handleMessageStart(event: Extract<AgentSessionEvent, { type: "message_start" }>): Promise<void> {
 		if (event.message.role === "hookMessage" || event.message.role === "custom") {
+			if (event.message.role === "custom" && parseIrcMessage(event.message)) {
+				this.#observeIrcMessage(event.message);
+				return;
+			}
 			const signature = `${event.message.role}:${event.message.customType}:${event.message.timestamp}`;
 			if (this.#renderedCustomMessages.has(signature)) {
 				return;
@@ -328,8 +381,11 @@ export class EventController {
 			this.#resetReadGroup();
 			this.#toolIntentCache.clear();
 			this.#thinkingContentIndices.clear();
-			this.ctx.streamingComponent = new AssistantMessageComponent(undefined, this.ctx.hideThinkingBlock, () =>
-				this.ctx.ui.requestRender(),
+			this.ctx.streamingComponent = new AssistantMessageComponent(
+				undefined,
+				this.ctx.hideThinkingBlock,
+				() => this.ctx.ui.requestRender(),
+				this.ctx.getAssistantViewportAnchorId?.(event.message),
 			);
 			this.ctx.streamingMessage = event.message;
 			addChatChild(this.ctx, this.ctx.streamingComponent);
@@ -339,15 +395,89 @@ export class EventController {
 	}
 
 	async #handleIrcMessage(event: Extract<AgentSessionEvent, { type: "irc_message" }>): Promise<void> {
-		const signature = `${event.message.role}:${event.message.customType}:${event.message.timestamp}`;
-		if (this.#renderedCustomMessages.has(signature)) {
-			return;
+		this.#observeIrcMessage(event.message);
+	}
+
+	clearIrcExpiryTimers(): void {
+		for (const timer of this.#ircExpiryTimers.values()) {
+			clearTimeout(timer);
+		}
+		this.#ircExpiryTimers.clear();
+	}
+
+	resetIrcObservations(): void {
+		this.clearIrcExpiryTimers();
+		const observationIds = new Set<string>(this.#renderedIrcComponents.keys());
+		for (const observationId of this.ctx.ircLedger.drainEvictedObservationIds()) observationIds.add(observationId);
+		this.#cleanupIrcObservationIds([...observationIds]);
+		for (const components of this.ctx.resetRenderedIrcInlineComponents()) {
+			for (const component of components) this.ctx.chatContainer.removeChild(component);
+		}
+		this.#renderedIrcComponents.clear();
+		for (const signature of this.#renderedCustomMessages) {
+			if (signature.startsWith("irc:")) this.#renderedCustomMessages.delete(signature);
+		}
+	}
+
+	reconcileIrcExpiryTimers(componentsByObservationId: Map<string, readonly Component[]>): void {
+		this.clearIrcExpiryTimers();
+		this.#renderedIrcComponents.clear();
+		const now = Date.now();
+		const inlineProjection = this.ctx.ircLedger.getInlineProjection(now);
+
+		this.#cleanupEvictedIrcObservations();
+		const projectedObservationIds = new Set(inlineProjection.map(record => record.observationId));
+		for (const [observationId, components] of componentsByObservationId) {
+			const record = this.ctx.ircLedger.getRecord(observationId);
+			if (
+				!projectedObservationIds.has(observationId) ||
+				(record?.mode === "ephemeral" && record.expiresAt! - now <= 0)
+			) {
+				for (const component of components) {
+					this.ctx.chatContainer.removeChild(component);
+				}
+				this.#renderedIrcComponents.delete(observationId);
+				componentsByObservationId.delete(observationId);
+			}
+		}
+		for (const record of inlineProjection) {
+			const components = componentsByObservationId.get(record.observationId);
+			if (!components) continue;
+			this.#renderedIrcComponents.set(record.observationId, components);
+			// #scheduleIrcExpiry owns the single expiry clock read: a record that
+			// crossed its deadline while projection/reconciliation ran above is
+			// cleaned up there (old timers were already cleared, so silently
+			// skipping the timer would leave the row inline indefinitely).
+			if (!this.#scheduleIrcExpiry(record, components)) {
+				componentsByObservationId.delete(record.observationId);
+			}
 		}
-		this.#renderedCustomMessages.add(signature);
-		this.#resetReadGroup();
-		const components = this.ctx.addMessageToChat(event.message);
-		this.#scheduleIrcExpiry(signature, components);
-		this.ctx.ui.requestRender();
+	}
+
+	/**
+	 * Arms the removal timer for an ephemeral record using a single clock read.
+	 * Returns false when the record's deadline has already elapsed — in that
+	 * case the rendered components are removed from the chat container and
+	 * {@link #renderedIrcComponents} here, and the caller must drop its own
+	 * bookkeeping entry. Persistent records always return true (no timer).
+	 */
+	#scheduleIrcExpiry(record: IrcObservationRecord, components: readonly Component[]): boolean {
+		if (record.mode !== "ephemeral" || components.length === 0 || this.#ircExpiryTimers.has(record.observationId)) {
+			return true;
+		}
+		const remainingMs = record.expiresAt! - Date.now();
+		if (remainingMs <= 0) {
+			this.#cleanupExpiredIrcInlineComponents(record.observationId);
+			return false;
+		}
+		const timer = setTimeout(() => {
+			this.#ircExpiryTimers.delete(record.observationId);
+			this.#cleanupExpiredIrcInlineComponents(record.observationId);
+			this.ctx.ui.requestRender();
+		}, remainingMs);
+		timer.unref?.();
+		this.#ircExpiryTimers.set(record.observationId, timer);
+		return true;
 	}
 
 	async #handleSubagentSteerMessage(
@@ -360,28 +490,13 @@ export class EventController {
 		const signature = obsId
 			? `steer:${obsId}`
 			: `${event.message.role}:${event.message.customType}:${event.message.timestamp}:${details?.from}:${details?.to}:${details?.state}:${details?.body}`;
-		if (this.#renderedCustomMessages.has(signature)) {
-			return;
-		}
+		if (this.#renderedCustomMessages.has(signature)) return;
 		this.#renderedCustomMessages.add(signature);
 		this.#resetReadGroup();
 		this.ctx.addMessageToChat(event.message);
 		this.ctx.ui.requestRender();
 	}
 
-	#scheduleIrcExpiry(signature: string, components: Component[]): void {
-		if (components.length === 0 || this.#ircExpiryTimers.has(signature)) return;
-		const timer = setTimeout(() => {
-			this.#ircExpiryTimers.delete(signature);
-			for (const component of components) {
-				this.ctx.chatContainer.removeChild(component);
-			}
-			this.ctx.ui.requestRender();
-		}, IRC_MESSAGE_VISIBLE_TTL_MS);
-		timer.unref?.();
-		this.#ircExpiryTimers.set(signature, timer);
-	}
-
 	async #handleNotice(event: Extract<AgentSessionEvent, { type: "notice" }>): Promise<void> {
 		const message = event.source ? `${event.source}: ${event.message}` : event.message;
 		if (event.level === "error") {
@@ -395,6 +510,9 @@ export class EventController {
 
 	async #handleMessageUpdate(event: Extract<AgentSessionEvent, { type: "message_update" }>): Promise<void> {
 		if (this.ctx.streamingComponent && event.message.role === "assistant") {
+			if (this.ctx.streamingMessage?.role === "assistant") {
+				transferSessionMessageIdentity([this.ctx.streamingMessage], [event.message]);
+			}
 			this.ctx.streamingMessage = event.message;
 			this.ctx.streamingComponent.updateContent(this.ctx.streamingMessage, { streaming: true });
 			const contentIndex = event.assistantMessageEvent?.contentIndex;
@@ -498,6 +616,9 @@ export class EventController {
 	async #handleMessageEnd(event: Extract<AgentSessionEvent, { type: "message_end" }>): Promise<void> {
 		if (event.message.role === "user") return;
 		if (this.ctx.streamingComponent && event.message.role === "assistant") {
+			if (this.ctx.streamingMessage?.role === "assistant") {
+				transferSessionMessageIdentity([this.ctx.streamingMessage], [event.message]);
+			}
 			this.ctx.streamingMessage = event.message;
 			let errorMessage: string | undefined;
 			const aborted = this.ctx.streamingMessage.stopReason === "aborted";
@@ -750,7 +871,7 @@ export class EventController {
 		if (event.aborted) {
 			this.ctx.showStatus(isHandoffAction ? "Auto-handoff cancelled" : "Auto context-full maintenance cancelled");
 		} else if (event.result) {
-			this.ctx.rebuildChatFromMessages();
+			this.ctx.rebuildChatFromMessages("reconcile-same-transcript");
 			this.ctx.statusLine.invalidate();
 			this.ctx.updateEditorTopBorder();
 			if (continuationDisabled && !isHandoffAction) {
@@ -761,8 +882,10 @@ export class EventController {
 		} else if (event.errorMessage) {
 			this.ctx.showWarning(event.errorMessage);
 		} else if (isHandoffAction) {
-			this.ctx.chatContainer.clear();
-			this.ctx.rebuildChatFromMessages();
+			// Reset BEFORE rebuild so the new session's transcript is not replayed
+			// from the old ledger and then cleared out from under its timers.
+			this.ctx.resetIrcSidebarSession();
+			this.ctx.rebuildChatFromMessages("replace-identity");
 			this.ctx.statusLine.invalidate();
 			this.ctx.updateEditorTopBorder();
 			await this.ctx.reloadTodos();