@gajae-code/coding-agent 0.13.3 → 0.14.0

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

@@ -1,7 +1,17 @@
 import { type RunGh, runGhDefault } from "../../../utils/gh";
 
 const STATUS_LINE_GH_TIMEOUT_MS = 5_000;
+const STATUS_LINE_PR_CACHE_TTL_MS = 60_000;
 const C0_C1_CONTROL_CHARACTERS = /[\u0000-\u001f\u007f-\u009f]/;
+type CurrentPr = { number: number; url: string } | null;
+
+interface PrCacheEntry {
+	value: CurrentPr;
+	expiresAt: number;
+}
+
+const prCache = new Map<string, PrCacheEntry>();
+const prLookupsInFlight = new Map<string, Promise<CurrentPr>>();
 
 function canonicalPrUrl(value: unknown, number: number): string | null {
 	if (typeof value !== "string" || C0_C1_CONTROL_CHARACTERS.test(value)) return null;
@@ -22,7 +32,7 @@ function canonicalPrUrl(value: unknown, number: number): string | null {
 	}
 }
 
-export async function lookupCurrentPr(runGh: RunGh = runGhDefault): Promise<{ number: number; url: string } | null> {
+export async function lookupCurrentPr(runGh: RunGh = runGhDefault): Promise<CurrentPr> {
 	try {
 		const result = await runGh(["pr", "view", "--json", "number,url"], { timeoutMs: STATUS_LINE_GH_TIMEOUT_MS });
 		if (result.exitCode !== 0 || result.timedOut) return null;
@@ -35,3 +45,37 @@ export async function lookupCurrentPr(runGh: RunGh = runGhDefault): Promise<{ nu
 		return null;
 	}
 }
+
+export function lookupCurrentPrCached(
+	cacheKey: string,
+	runGh: RunGh = runGhDefault,
+	now: () => number = Date.now,
+): Promise<CurrentPr> {
+	const cached = prCache.get(cacheKey);
+	if (cached && cached.expiresAt > now()) return Promise.resolve(cached.value);
+
+	const inFlight = prLookupsInFlight.get(cacheKey);
+	if (inFlight) return inFlight;
+
+	const lookup = lookupCurrentPr(runGh)
+		.then(value => {
+			// Bound process-lifetime memory: drop every expired entry on insert so
+			// the map holds only keys seen within one TTL window.
+			const timestamp = now();
+			for (const [key, entry] of prCache) {
+				if (entry.expiresAt <= timestamp) prCache.delete(key);
+			}
+			prCache.set(cacheKey, { value, expiresAt: timestamp + STATUS_LINE_PR_CACHE_TTL_MS });
+			return value;
+		})
+		.finally(() => {
+			if (prLookupsInFlight.get(cacheKey) === lookup) prLookupsInFlight.delete(cacheKey);
+		});
+	prLookupsInFlight.set(cacheKey, lookup);
+	return lookup;
+}
+
+export function clearCurrentPrCache(): void {
+	prCache.clear();
+	prLookupsInFlight.clear();
+}

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

@@ -21,7 +21,7 @@ function withIcon(icon: string, text: string): string {
 }
 
 function stripDisplayRoot(pwd: string): string {
-	for (const root of ["/work", path.join(os.homedir(), "Projects")]) {
+	for (const root of displayRoots()) {
 		const relative = relativePathWithinRoot(root, pwd);
 		if (relative) return relative;
 	}
@@ -32,6 +32,14 @@ function normalizePremiumRequests(value: number): number {
 	return Math.round((value + Number.EPSILON) * 100) / 100;
 }
 
+// Display roots take precedence over scratch classification: ~/Projects and
+// /work are deliberate workspaces, never scratch, even when the home directory
+// itself sits under a temp/scratch root (CI harnesses and containers redirect
+// HOME beneath the OS temp dir). Resolved at render time so a preload-rewritten
+// HOME is honored, matching scratchRoots().
+function displayRoots(): readonly string[] {
+	return ["/work", path.join(os.homedir(), "Projects")];
+}
 function scratchRoots(): readonly string[] {
 	const roots = new Set<string>([os.tmpdir(), path.join(os.homedir(), "tmp")]);
 	if (process.platform === "win32") {
@@ -51,6 +59,13 @@ function scratchRoots(): readonly string[] {
 }
 
 function classifyProjectDir(pwd: string): { scratch: boolean; relative: string | null } {
+	// A deliberate display root wins over scratch ancestry: ~/Projects is a
+	// workspace even when HOME itself sits under the OS temp dir (CI and test
+	// harnesses redirect HOME beneath the scratch root). This is more precise
+	// than exempting all of HOME: ~/tmp stays scratch (it is in scratchRoots).
+	for (const root of displayRoots()) {
+		if (pathIsWithin(root, pwd)) return { scratch: false, relative: null };
+	}
 	for (const root of scratchRoots()) {
 		if (pathIsWithin(root, pwd)) {
 			return { scratch: true, relative: relativePathWithinRoot(root, pwd) };

package/src/modes/components/tool-status-header.ts

@@ -19,7 +19,7 @@ import type { ActionRegistry, FocusDomain } from "../action-registry";
 import { EMPTY_JOBS_SNAPSHOT, type JobsSnapshot } from "../jobs-observer";
 import { sanitizeStatusText } from "../shared";
 import { renderSkillHudBar } from "./skill-hud/render";
-import { lookupCurrentPr } from "./status-line/gh";
+import { lookupCurrentPrCached } from "./status-line/gh";
 import {
 	canReuseCachedPr,
 	createPrCacheContext,
@@ -399,6 +399,10 @@ export class StatusLineComponent implements Component {
 
 		this.#prLookupInFlight = true;
 		const lookupContext = currentContext;
+		if (!lookupContext) {
+			this.#prLookupInFlight = false;
+			return stalePr ?? null;
+		}
 
 		// Fire async lookup, keep stale value visible until resolved
 		(async () => {
@@ -415,7 +419,7 @@ export class StatusLineComponent implements Component {
 			};
 			try {
 				// Requires `gh repo set-default` to be configured; fails gracefully if not
-				const pr = await lookupCurrentPr();
+				const pr = await lookupCurrentPrCached(`${lookupContext.repoId ?? ""}\0${lookupContext.branch}`);
 				setCachedPr(pr);
 			} finally {
 				this.#prLookupInFlight = false;
@@ -579,6 +583,8 @@ export class StatusLineComponent implements Component {
 					pushWindow(`${providerId ?? "provider"}:5h`, "5h", fraction, resetsAt, "m");
 				} else if (windowId === "7d" && !tier) {
 					pushWindow(`${providerId ?? "provider"}:7d`, "7d", fraction, resetsAt, "h");
+				} else if (providerId === "grok-build" && windowId === "weekly" && !tier) {
+					pushWindow("grok-build:weekly", "weekly", fraction, resetsAt, "h");
 				}
 			}
 		}
@@ -620,6 +626,10 @@ export class StatusLineComponent implements Component {
 		const contextPctSegmentActive =
 			effectiveSettings.leftSegments.includes("context_pct") ||
 			effectiveSettings.rightSegments.includes("context_pct");
+		// Never spawn a gh lookup when no pr segment is rendered; the pr segment
+		// treats a null value as hidden, so gating here is behavior-identical.
+		const prSegmentActive =
+			effectiveSettings.leftSegments.includes("pr") || effectiveSettings.rightSegments.includes("pr");
 
 		return {
 			session: this.session,
@@ -638,7 +648,7 @@ export class StatusLineComponent implements Component {
 			git: {
 				branch: this.#getCurrentBranch(),
 				status: this.#getGitStatus(),
-				pr: this.#lookupPr(),
+				pr: prSegmentActive ? this.#lookupPr() : null,
 			},
 			usage: this.#cachedUsage,
 		};

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

@@ -1588,20 +1588,20 @@ function formatWindowSuffix(label: string, windowLabel: string, uiTheme: typeof
 	return uiTheme.fg("dim", `(${windowLabel})`);
 }
 
-function formatAccountLabel(limit: UsageLimit, report: UsageReport, index: number): string {
+function formatAccountLabel(limit: UsageLimit, report: UsageReport, reportIndex: number): string {
 	const email = (report.metadata?.email as string | undefined) ?? limit.scope.accountId;
 	if (email) return email;
 	const accountId = (report.metadata?.accountId as string | undefined) ?? limit.scope.accountId;
 	if (accountId) return accountId;
-	return `account ${index + 1}`;
+	return `account ${reportIndex + 1}`;
 }
 
-function formatUnlimitedReportLabel(report: UsageReport, index: number): string {
+function formatUnlimitedReportLabel(report: UsageReport, reportIndex: number): string {
 	const email = report.metadata?.email as string | undefined;
 	if (email) return email;
 	const accountId = report.metadata?.accountId as string | undefined;
 	if (accountId) return accountId;
-	return `account ${index + 1}`;
+	return `account ${reportIndex + 1}`;
 }
 
 function formatResetShort(limit: UsageLimit, nowMs: number): string | undefined {
@@ -1614,6 +1614,7 @@ function formatResetShort(limit: UsageLimit, nowMs: number): string | undefined
 function formatAccountHeaderRow(
 	limits: UsageLimit[],
 	reports: UsageReport[],
+	reportIndexes: ReadonlyMap<UsageReport, number>,
 	nowMs: number,
 	columnWidth: number,
 	uiTheme: typeof theme,
@@ -1621,7 +1622,7 @@ function formatAccountHeaderRow(
 	const parts = limits.map((limit, index) => {
 		const reset = formatResetShort(limit, nowMs);
 		return {
-			label: formatAccountLabel(limit, reports[index], index),
+			label: formatAccountLabel(limit, reports[index], reportIndexes.get(reports[index]) ?? index),
 			suffix: reset ? `(${reset})` : "",
 		};
 	});
@@ -1780,6 +1781,7 @@ export function renderUsageReports(
 	for (const { provider, providerReports } of providerEntries) {
 		lines.push("");
 		const providerName = formatProviderName(provider);
+		const reportIndexes = new Map(providerReports.map((report, index) => [report, index]));
 
 		const limitGroups = new Map<
 			string,
@@ -1811,10 +1813,13 @@ export function renderUsageReports(
 		const rankedAccounts = providerReports
 			.map(report => {
 				const [firstLimit] = report.limits;
+				const reportIndex = reportIndexes.get(report) ?? 0;
 				return {
 					report,
 					total: report.limits.reduce((sum, limit) => sum + (resolveFraction(limit) ?? 0), 0),
-					label: firstLimit ? formatAccountLabel(firstLimit, report, 0) : formatUnlimitedReportLabel(report, 0),
+					label: firstLimit
+						? formatAccountLabel(firstLimit, report, reportIndex)
+						: formatUnlimitedReportLabel(report, reportIndex),
 				};
 			})
 			.sort((a, b) => (a.total !== b.total ? b.total - a.total : a.label.localeCompare(b.label)));
@@ -1850,7 +1855,14 @@ export function renderUsageReports(
 
 			const windowSuffix = formatWindowSuffix(group.label, group.windowLabel, uiTheme);
 			lines.push(`${statusIcon} ${uiTheme.bold(group.label)} ${windowSuffix}`.trim());
-			const accountLabels = formatAccountHeaderRow(sortedLimits, sortedReports, nowMs, sectionColumnWidth, uiTheme);
+			const accountLabels = formatAccountHeaderRow(
+				sortedLimits,
+				sortedReports,
+				reportIndexes,
+				nowMs,
+				sectionColumnWidth,
+				uiTheme,
+			);
 			lines.push(`  ${accountLabels.join(" ")}`.trimEnd());
 			const bars = sortedLimits.map(limit =>
 				padColumn(renderUsageBar(limit, uiTheme, sectionColumnWidth), sectionColumnWidth),
@@ -1869,7 +1881,7 @@ export function renderUsageReports(
 		// Render accounts with no rate limits (e.g. business/enterprise plans).
 		const unlimitedReports = providerReports.filter(report => report.limits.length === 0);
 		for (const report of unlimitedReports) {
-			const label = formatUnlimitedReportLabel(report, 0);
+			const label = formatUnlimitedReportLabel(report, reportIndexes.get(report) ?? 0);
 			const tier = report.metadata?.planType as string | undefined;
 			const tierSuffix = tier ? ` ${uiTheme.fg("dim", `(${tier})`)}` : "";
 			lines.push(

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

@@ -31,12 +31,7 @@ import { HookEditorComponent } from "../../modes/components/hook-editor";
 import { HookInputComponent } from "../../modes/components/hook-input";
 import { HookSelectorComponent } from "../../modes/components/hook-selector";
 import { getAvailableThemesWithPaths, getThemeByName, setTheme, type Theme, theme } from "../../modes/theme/theme";
-import {
-	clearInteractiveActivityLoaders,
-	type InteractiveModeContext,
-	stopInteractiveActivityIndicator,
-	syncInteractiveActivityIndicator,
-} from "../../modes/types";
+import type { InteractiveModeContext } from "../../modes/types";
 import {
 	parseSyntheticModelId,
 	resolveSyntheticModelSelection,
@@ -48,9 +43,8 @@ import { parseThinkingLevel } from "../../thinking";
 import type { TodoPhase } from "../../tools/todo-write";
 import { setSessionTerminalTitle, setTerminalTitle } from "../../utils/title-generator";
 import { emitHostStatus } from "../utils/host-status";
-import { applyInjectedUserSubmission } from "../utils/injected-user-submission";
+import { applyInjectedUserSubmission, extensionUserMessageContentError } from "../utils/injected-user-submission";
 import { classifyHookSelectorBellEvent, ringTerminalBell } from "../utils/terminal-bell";
-import { prepareTranscriptRebuild } from "../utils/ui-helpers";
 
 const MAX_WIDGET_LINES = 10;
 const HOOK_SELECTOR_CHROME_ROWS = 7;
@@ -106,6 +100,23 @@ const EXTENSION_COMMAND_MUTATIONS: ReadonlySet<PropertyKey> = new Set([
 	"switchSession",
 ]);
 
+const BROKER_LIFECYCLE_OPERATIONS = new Set([
+	"session.new",
+	"session.fork",
+	"session.resume",
+	"session.close",
+	"session.switch",
+	"session.branch",
+	"session.handoff",
+	"session.delete",
+]);
+
+function prohibitBrokerLifecycleOperation(operation: string): never {
+	throw Object.assign(new Error(`${operation} is available only through the Broker lifecycle service.`), {
+		code: "operation_prohibited",
+	});
+}
+
 export class ExtensionUiController {
 	#extensionTerminalInputUnsubscribers = new Set<() => void>();
 	#extensionErrorUnsubscribe?: () => void;
@@ -314,52 +325,8 @@ export class ExtensionUiController {
 			case "retry.abort":
 				session.abortRetry();
 				return { aborted: true };
-			case "session.new":
-				return { created: await session.newSession() };
-			case "session.fork":
-				return { session: await session.fork() };
-			case "session.resume":
-				return { resumed: await session.switchSession(String(input.id)) };
-			case "session.close":
-				await session.sessionManager.flush();
-				return { closed: true };
-			case "session.switch":
-				return { switched: await session.switchSession(String(input.id)) };
-			case "session.branch":
-				try {
-					return await session.branch(String(input.entryId));
-				} catch (error) {
-					throw Object.assign(new Error(error instanceof Error ? error.message : "Branch entry was not found."), {
-						code: "resource_gone",
-					});
-				}
 			case "session.rename":
 				return { renamed: await session.setSessionName(String(input.name), "user") };
-			case "session.handoff":
-				try {
-					return {
-						handoff: await session.handoff(
-							typeof input.target === "string"
-								? input.target
-								: typeof input.instructions === "string"
-									? input.instructions
-									: undefined,
-						),
-					};
-				} catch (error) {
-					const typed = error as { code?: unknown; handoffDocument?: unknown };
-					const handoffDocument =
-						typeof typed?.handoffDocument === "string" ? { handoffDocument: typed.handoffDocument } : undefined;
-					// Preserve a safe typed code (e.g. transient `busy`) so clients keep
-					// correct retry/backoff semantics; only synthesize invalid_request for
-					// otherwise-untyped failures.
-					const code = typed?.code === "busy" ? "busy" : "invalid_request";
-					throw Object.assign(
-						new Error(error instanceof Error ? error.message : "Handoff is unavailable for the current state."),
-						{ code },
-						handoffDocument,
-					);
-				}
 			case "session.export_html":
 				try {
 					return { path: await session.exportToHtml(typeof input.path === "string" ? input.path : undefined) };
@@ -426,13 +393,11 @@ export class ExtensionUiController {
 				}
 				return { changed: true, enabled: on };
 			}
-			case "session.delete":
-				await session.sessionManager.dropSession(String(input.id));
-				return { deleted: true };
 			case "session.cwd.move":
 				await session.sessionManager.moveTo(String(input.path));
 				return { moved: true, cwd: session.sessionManager.getCwd() };
 			default:
+				if (BROKER_LIFECYCLE_OPERATIONS.has(operation)) prohibitBrokerLifecycleOperation(operation);
 				throw Object.assign(new Error(`${operation} has no AgentSession implementation.`), { code: "unavailable" });
 		}
 	};
@@ -531,7 +496,13 @@ export class ExtensionUiController {
 			sendMessage: (message, options) => {
 				const wasStreaming = this.ctx.session.isStreaming;
 				this.ctx.session
-					.sendCustomMessage(message, options)
+					// The extension seam is the trusted runtime boundary: extension
+					// producers are external to the turn's model/tool runtime, so
+					// nextTurn messages are classified "external" here (survive a
+					// terminal abort) instead of letting the extension label its
+					// own origin — caller-controlled origin defeats source-based
+					// continuation fencing (review thread P2).
+					.sendCustomMessage(message, { ...options, origin: "external" })
 					.then(() => {
 						if (!this.#isStopped()) this.#applyCustomMessageDisplay(wasStreaming, message.display);
 					})
@@ -640,6 +611,13 @@ export class ExtensionUiController {
 		const commandActions: ExtensionCommandContextActions = {
 			getContextUsage: () => this.ctx.session.getContextUsage(),
 			waitForIdle: () => this.ctx.session.agent.waitForIdle(),
+			newSession: async () => prohibitBrokerLifecycleOperation("session.new"),
+			branch: async () => prohibitBrokerLifecycleOperation("session.branch"),
+			navigateTree: async (targetId, navOptions) => {
+				const result = await this.ctx.session.navigateTree(targetId, { summarize: navOptions?.summarize });
+				return { cancelled: result.cancelled };
+			},
+			switchSession: async () => prohibitBrokerLifecycleOperation("session.switch"),
 			reload: async () => {
 				const previousSessionId = this.ctx.sessionManager.getSessionId();
 				await this.ctx.session.reload();
@@ -651,105 +629,7 @@ export class ExtensionUiController {
 				if (this.#isStopped()) return;
 				this.ctx.showStatus("Reloaded session");
 			},
-			newSession: async options => {
-				const cleanupPreviousSessionUi = this.captureSessionUiCleanup();
-				const success = await this.ctx.session.newSession({ parentSession: options?.parentSession });
-				if (!success) {
-					return { cancelled: true };
-				}
-				if (this.#isStopped()) return { cancelled: true };
-				clearInteractiveActivityLoaders(this.ctx);
-				cleanupPreviousSessionUi();
-
-				stopInteractiveActivityIndicator(this.ctx);
-				this.ctx.resetIrcSidebarSession();
-				setSessionTerminalTitle(this.ctx.sessionManager.getSessionName(), this.ctx.sessionManager.getCwd());
-
-				if (options?.setup) {
-					await options.setup(this.ctx.sessionManager);
-					if (this.#isStopped()) return { cancelled: true };
-				}
-
-				this.ctx.statusLine.invalidate();
-				this.ctx.statusLine.setSessionStartTime(Date.now());
-				this.ctx.updateEditorTopBorder();
-				this.ctx.ui.requestRender();
-
-				prepareTranscriptRebuild(this.ctx.ui, "replace-identity");
-				this.ctx.chatContainer.clear();
-				this.ctx.pendingMessagesContainer.clear();
-				this.ctx.compactionQueuedMessages = [];
-				this.ctx.streamingComponent = undefined;
-				this.ctx.streamingMessage = undefined;
-				this.ctx.pendingTools.clear();
-
-				this.ctx.chatContainer.addChild(
-					new Text(`${theme.fg("accent", `${theme.status.success} New session started`)}`, 1, 0),
-				);
-				await this.ctx.reloadTodos();
-				if (this.#isStopped()) return { cancelled: true };
-				this.ctx.ui.requestRender();
-
-				return { cancelled: false };
-			},
-			branch: async entryId => {
-				const result = await this.ctx.session.branch(entryId);
-				if (this.#isStopped()) return { cancelled: true };
-				if (result.cancelled) {
-					return { cancelled: true };
-				}
-				this.ctx.resetIrcSidebarSession();
-
-				// Update UI
-				this.ctx.rebuildInitialMessages("replace-identity");
-				await this.ctx.reloadTodos();
-				if (this.#isStopped()) return { cancelled: true };
-				this.ctx.editor.setText(result.selectedText);
-				this.ctx.showStatus("Branched to new session");
-
-				return { cancelled: false };
-			},
-			navigateTree: async (targetId, options) => {
-				const result = await this.ctx.session.navigateTree(targetId, { summarize: options?.summarize });
-				if (this.#isStopped()) return { cancelled: true };
-				if (result.cancelled) {
-					return { cancelled: true };
-				}
-
-				// Update UI
-				this.ctx.rebuildInitialMessages("reconcile-same-transcript");
-				await this.ctx.reloadTodos();
-				if (this.#isStopped()) return { cancelled: true };
-				if (result.editorText && !this.ctx.editor.getText().trim()) {
-					this.ctx.editor.setText(result.editorText);
-				}
-				this.ctx.showStatus("Navigated to selected point");
-
-				return { cancelled: false };
-			},
 			compact: async instructionsOrOptions => this.#handleInteractiveCompact(instructionsOrOptions),
-			switchSession: async sessionPath => {
-				const previousSessionId = this.ctx.sessionManager.getSessionId();
-
-				this.clearHookWidgets();
-				const result = await this.ctx.session.switchSession(sessionPath);
-				if (this.#isStopped()) return { cancelled: true };
-				if (!result) {
-					return { cancelled: true };
-				}
-				clearInteractiveActivityLoaders(this.ctx);
-				const switchingToDifferentSession = previousSessionId !== this.ctx.sessionManager.getSessionId();
-				if (switchingToDifferentSession) this.ctx.resetIrcSidebarSession();
-
-				setSessionTerminalTitle(this.ctx.sessionManager.getSessionName(), this.ctx.sessionManager.getCwd());
-				this.ctx.rebuildInitialMessages(
-					switchingToDifferentSession ? "replace-identity" : "reconcile-same-transcript",
-				);
-				await this.ctx.reloadTodos();
-				if (this.#isStopped()) return { cancelled: true };
-				syncInteractiveActivityIndicator(this.ctx);
-				return { cancelled: false };
-			},
 		};
 
 		extensionRunner.initialize(
@@ -849,7 +729,10 @@ export class ExtensionUiController {
 			sendMessage: (message, options) => {
 				const wasStreaming = this.ctx.session.isStreaming;
 				this.ctx.session
-					.sendCustomMessage(message, options)
+					// Trusted seam: extension producers are external to the turn
+					// runtime, so classify nextTurn messages "external" here
+					// instead of accepting a caller-supplied origin (review P2).
+					.sendCustomMessage(message, { ...options, origin: "external" })
 					.then(() => this.#applyCustomMessageDisplay(wasStreaming, message.display))
 					.catch((err: unknown) => {
 						const errorText = `Extension sendMessage failed: ${err instanceof Error ? err.message : String(err)}`;
@@ -955,6 +838,13 @@ export class ExtensionUiController {
 		const commandActions: ExtensionCommandContextActions = {
 			getContextUsage: () => this.ctx.session.getContextUsage(),
 			waitForIdle: () => this.ctx.session.agent.waitForIdle(),
+			newSession: async () => prohibitBrokerLifecycleOperation("session.new"),
+			branch: async () => prohibitBrokerLifecycleOperation("session.branch"),
+			navigateTree: async (targetId, navOptions) => {
+				const result = await this.ctx.session.navigateTree(targetId, { summarize: navOptions?.summarize });
+				return { cancelled: result.cancelled };
+			},
+			switchSession: async () => prohibitBrokerLifecycleOperation("session.switch"),
 			reload: async () => {
 				if (this.ctx.isBackgrounded) {
 					return;
@@ -969,109 +859,7 @@ export class ExtensionUiController {
 				if (this.#isStopped()) return;
 				this.ctx.showStatus("Reloaded session");
 			},
-			newSession: async options => {
-				if (this.ctx.isBackgrounded) {
-					return { cancelled: true };
-				}
-				const cleanupPreviousSessionUi = this.captureSessionUiCleanup();
-				const success = await this.ctx.session.newSession({ parentSession: options?.parentSession });
-				if (!success) {
-					return { cancelled: true };
-				}
-				if (this.#isStopped()) return { cancelled: true };
-				clearInteractiveActivityLoaders(this.ctx);
-				cleanupPreviousSessionUi();
-
-				stopInteractiveActivityIndicator(this.ctx);
-				this.ctx.resetIrcSidebarSession();
-
-				if (options?.setup) {
-					await options.setup(this.ctx.sessionManager);
-					if (this.#isStopped()) return { cancelled: true };
-				}
-
-				prepareTranscriptRebuild(this.ctx.ui, "replace-identity");
-				this.ctx.chatContainer.clear();
-				this.ctx.pendingMessagesContainer.clear();
-				this.ctx.compactionQueuedMessages = [];
-				this.ctx.streamingComponent = undefined;
-				this.ctx.streamingMessage = undefined;
-				this.ctx.pendingTools.clear();
-
-				this.ctx.chatContainer.addChild(
-					new Text(`${theme.fg("accent", `${theme.status.success} New session started`)}`, 1, 0),
-				);
-				await this.ctx.reloadTodos();
-				if (this.#isStopped()) return { cancelled: true };
-				this.ctx.ui.requestRender();
-
-				return { cancelled: false };
-			},
-			branch: async entryId => {
-				if (this.ctx.isBackgrounded) {
-					return { cancelled: true };
-				}
-				const result = await this.ctx.session.branch(entryId);
-				if (this.#isStopped()) return { cancelled: true };
-				if (result.cancelled) {
-					return { cancelled: true };
-				}
-				this.ctx.resetIrcSidebarSession();
-
-				// Update UI
-				this.ctx.rebuildInitialMessages("replace-identity");
-				await this.ctx.reloadTodos();
-				if (this.#isStopped()) return { cancelled: true };
-				this.ctx.editor.setText(result.selectedText);
-				this.ctx.showStatus("Branched to new session");
-
-				return { cancelled: false };
-			},
-			navigateTree: async (targetId, options) => {
-				if (this.ctx.isBackgrounded) {
-					return { cancelled: true };
-				}
-				const result = await this.ctx.session.navigateTree(targetId, { summarize: options?.summarize });
-				if (this.#isStopped()) return { cancelled: true };
-				if (result.cancelled) {
-					return { cancelled: true };
-				}
-
-				// Update UI
-				this.ctx.rebuildInitialMessages("reconcile-same-transcript");
-				await this.ctx.reloadTodos();
-				if (this.#isStopped()) return { cancelled: true };
-				if (result.editorText && !this.ctx.editor.getText().trim()) {
-					this.ctx.editor.setText(result.editorText);
-				}
-				this.ctx.showStatus("Navigated to selected point");
-
-				return { cancelled: false };
-			},
 			compact: async instructionsOrOptions => this.#handleInteractiveCompact(instructionsOrOptions),
-			switchSession: async sessionPath => {
-				if (this.ctx.isBackgrounded) {
-					return { cancelled: true };
-				}
-				const previousSessionId = this.ctx.sessionManager.getSessionId();
-
-				this.clearHookWidgets();
-				const result = await this.ctx.session.switchSession(sessionPath);
-				if (this.#isStopped()) return { cancelled: true };
-				if (!result) {
-					return { cancelled: true };
-				}
-				clearInteractiveActivityLoaders(this.ctx);
-				const switchingToDifferentSession = previousSessionId !== this.ctx.sessionManager.getSessionId();
-				if (switchingToDifferentSession) this.ctx.resetIrcSidebarSession();
-				this.ctx.rebuildInitialMessages(
-					switchingToDifferentSession ? "replace-identity" : "reconcile-same-transcript",
-				);
-				await this.ctx.reloadTodos();
-				if (this.#isStopped()) return { cancelled: true };
-				syncInteractiveActivityIndicator(this.ctx);
-				return { cancelled: false };
-			},
 		};
 
 		extensionRunner.initialize(
@@ -1703,6 +1491,17 @@ export class ExtensionUiController {
 
 	#sendExtensionUserMessage: SendUserMessageHandler = (content, options) => {
 		if (this.#isStopped()) return Promise.resolve();
+		// Validate at the owning boundary BEFORE session delivery and UI bookkeeping:
+		// applyInjectedUserSubmission → normalizeInjectedUserContent iterates content
+		// and dereferences part.type synchronously. Absent/null content (the
+		// container) OR null/undefined/non-object array elements throw an untyped
+		// TypeError synchronously — before the send.catch handler below is attached,
+		// leaving the typed invalid_input rejection from AgentSession unobserved
+		// (unhandled rejection) and crashing the resident process. Reject as a typed
+		// nonfatal control error so callers can surface it without losing session
+		// continuity.
+		const invalidContentError = extensionUserMessageContentError(content);
+		if (invalidContentError) return Promise.reject(invalidContentError);
 		// Compute queued BEFORE send: prompt() may flip session.isStreaming synchronously.
 		const queued = Boolean(options?.deliverAs) || this.ctx.session.isStreaming;
 		// Call send first so the busy/queued path finds the session queue populated

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

@@ -26,6 +26,7 @@ import { ensureSupportedImageInput, ImageInputTooLargeError } from "../../utils/
 import { resizeImage } from "../../utils/image-resize";
 import { loadPastedImageBatch, PastedImageBatchError } from "../../utils/pasted-image-loading";
 import {
+	decodePastedPathCandidate,
 	formatPastedImageReference,
 	locatePastedImageReferenceAroundCursor,
 	parsePastedImagePaths,
@@ -55,8 +56,13 @@ export const BACKGROUND_FOLD_DOUBLE_PRESS_MS = 750;
 const DRAFT_CLEAR_DOUBLE_ESCAPE_WINDOW_MS = 800;
 const EMPTY_EDITOR_DOUBLE_ESCAPE_WINDOW_MS = 500;
 const IMAGE_PLACEHOLDER_PATTERN = /\[image ([1-9]\d*)\]/g;
+const ITERM_PET_DRAG_PATH_PATTERN = /^\/var\/folders\/[^/]+\/[^/]+\/T\/iTerm2\.[A-Za-z0-9]+\.gajae-pet\.(?:png|gif)$/;
 const IMAGE_PLACEHOLDER_PRESENT_PATTERN = /\[image [1-9]\d*\]/;
 
+function isItermPetDragPaste(text: string): boolean {
+	return ITERM_PET_DRAG_PATH_PATTERN.test(decodePastedPathCandidate(text) ?? "");
+}
+
 interface InputControllerDependencies {
 	loadPastedImageBatch?: typeof loadPastedImageBatch;
 }
@@ -1675,6 +1681,10 @@ export class InputController {
 	}
 
 	handleTextPaste(text: string, context: PasteTextContext): boolean | Promise<boolean> {
+		if (isItermPetDragPaste(text)) {
+			this.ctx.showStatus("Ignored dragged Gajae Pet image.", { dim: true });
+			return true;
+		}
 		if (this.ctx.isBashMode || this.ctx.isPythonMode) return false;
 		const parsed = parsePastedImagePaths(text, { cwd: this.ctx.sessionManager.getCwd() });
 		if (!parsed) return false;