@gajae-code/coding-agent 0.13.1 → 0.13.3

package/src/main.ts

@@ -1255,6 +1255,7 @@ export interface RunRootCommandDependencies {
 	getChangelogForDisplay?: typeof getChangelogForDisplay;
 	createInteractiveMode?: CreateInteractiveMode;
 	runPrintMode?: RunPrintMode;
+	quit?: (code: number) => Promise<void>;
 	isResumePickerTerminal?: ResumePickerTerminalCheck;
 	listForResumePickerReadOnly?: ListForResumePickerReadOnly;
 	listManagedForResumePickerReadOnly?: ListManagedForResumePickerReadOnly;
@@ -1961,6 +1962,9 @@ export async function runRootCommand(
 				authStorage.close();
 				if (!deps.suppressProcessExit) await postmortem.cleanup();
 			}
+			if (!deps.suppressProcessExit) {
+				await (deps.quit ?? postmortem.quit)(typeof process.exitCode === "number" ? process.exitCode : 0);
+			}
 		}
 	}
 }

package/src/modes/components/chrome.ts

@@ -1,6 +1,7 @@
-import { Container, type SelectItem, SelectList, Text } from "@gajae-code/tui";
+import { Container, type SelectItem, SelectList } from "@gajae-code/tui";
 import { getSelectListTheme, theme } from "../../modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
+import { DynamicThemeText } from "./dynamic-theme-text";
 
 export interface FramedSelectOptions {
 	maxVisible?: number;
@@ -24,10 +25,10 @@ export function FramedSelect(
 	const container = new Container();
 	container.addChild(new DynamicBorder());
 	if (title) {
-		container.addChild(new Text(theme.bold(theme.fg("accent", title)), 0, 0));
+		container.addChild(new DynamicThemeText(() => theme.bold(theme.fg("accent", title))));
 	}
 
-	const selectList = new SelectList(items, opts.maxVisible ?? Math.min(items.length, 10), getSelectListTheme());
+	const selectList = new SelectList(items, opts.maxVisible ?? Math.min(items.length, 10), () => getSelectListTheme());
 	const selectedIndex =
 		opts.selectedValue === undefined ? -1 : items.findIndex(item => item.value === opts.selectedValue);
 	if (selectedIndex !== -1) selectList.setSelectedIndex(selectedIndex);

package/src/modes/components/dynamic-theme-text.ts

@@ -0,0 +1,22 @@
+import { type Component, Text } from "@gajae-code/tui";
+
+/** Text whose styling is resolved at render time so live theme previews recolor open overlays. */
+export class DynamicThemeText implements Component {
+	#text = new Text("", 0, 0);
+	#rendered = "";
+
+	constructor(private readonly getText: () => string) {}
+
+	invalidate(): void {
+		this.#text.invalidate();
+	}
+
+	render(width: number): string[] {
+		const rendered = this.getText();
+		if (rendered !== this.#rendered) {
+			this.#rendered = rendered;
+			this.#text.setText(rendered);
+		}
+		return this.#text.render(width);
+	}
+}

package/src/modes/components/gajae-pet-widget.ts

@@ -3,16 +3,17 @@ import {
 	buildGajaePixelFrames,
 	type Component,
 	type Container,
-	type GajaePixelFrameName,
 	type GajaePixelFrames,
 	getCellDimensions,
-	PARA_PARA_STEPS,
 	PET_SKINS,
+	type PetBurst,
+	type PetFrameName,
 	type PetMode,
 	type PetSkinId,
 	petBurstDurationMs,
 	petBurstFrame,
 	registerAnimationCallback,
+	resolvePetMode,
 	type TUI,
 } from "@gajae-code/tui";
 import type { CustomEditor } from "./custom-editor";
@@ -66,21 +67,48 @@ function sameFootprint(left: SixelFootprint, right: SixelFootprint): boolean {
  */
 const petOverlayEmitterOwners = new WeakMap<TUI, GajaePetWidget>();
 
-/** Working animation: the shared para-para beats looped end to end. */
-const WORK_LOOP_TOTAL = PARA_PARA_STEPS.reduce((sum, [, ms]) => sum + ms, 0);
 /** Random gap between automatic claw flexes (fires while idle AND working). */
 const AUTO_FLEX_MIN_GAP_MS = 12_000;
 const AUTO_FLEX_MAX_GAP_MS = 40_000;
-// Deterministic idle loop: gaze around with a rare visor flicker.
-const IDLE_LOOP: Array<[GajaePixelFrameName, number]> = [
-	["base", 1100],
-	["gazeL", 350],
-	["base", 500],
-	["gazeR", 350],
-	["base", 800],
-	["flicker", 150],
-];
-const IDLE_LOOP_TOTAL = IDLE_LOOP.reduce((sum, [, ms]) => sum + ms, 0);
+
+function animationFrameAt(
+	steps: ReadonlyArray<readonly [PetFrameName, number]>,
+	now: number,
+	fallback: PetFrameName,
+): PetFrameName {
+	const total = steps.reduce((sum, [, ms]) => sum + ms, 0);
+	if (total <= 0) return fallback;
+	let elapsed = now % total;
+	for (const [frame, ms] of steps) {
+		if (elapsed < ms) return frame;
+		elapsed -= ms;
+	}
+	return fallback;
+}
+
+function animationFrameAtElapsed(
+	steps: ReadonlyArray<readonly [PetFrameName, number]>,
+	elapsed: number,
+	fallback: PetFrameName,
+): PetFrameName {
+	for (const [frame, ms] of steps) {
+		if (elapsed < ms) return frame;
+		elapsed -= ms;
+	}
+	return fallback;
+}
+
+function animationDuration(steps: ReadonlyArray<readonly [PetFrameName, number]>): number {
+	return steps.reduce((sum, [, ms]) => sum + ms, 0);
+}
+
+interface WorkTransition {
+	startedAt: number;
+	steps: ReadonlyArray<readonly [PetFrameName, number]>;
+}
+
+const OUROBOROS_WORK_BURST_MIN_GAP_MS = 14_000;
+const OUROBOROS_WORK_BURST_MAX_GAP_MS = 30_000;
 
 /**
  * Selector preview: fire the first burst this soon after a skin is previewed, so the
@@ -123,8 +151,8 @@ export class PetFramedEditor implements Component {
 }
 
 /**
- * The gajae pet: a 16x16 real-pixel sprite living in a reserved area beside
- * the composer. It is nearest-neighbor scaled to the two terminal rows occupied
+ * The gajae pet: a real-pixel sprite living in a reserved area beside the
+ * composer. It is nearest-neighbor scaled to the two terminal rows occupied
  * by an empty one-line composer and lifted one row so its feet meet the input
  * box's bottom edge.
  *
@@ -146,12 +174,17 @@ export class GajaePetWidget {
 	#getComposerBottomOffset: () => number;
 	#mode: PetMode = "off";
 	#pixel: GajaePixelFrames | undefined;
-	#frame: GajaePixelFrameName = "base";
+	#frame: PetFrameName = "base";
 	#animation: AnimationRegistration | undefined;
 	#flexUntil = 0;
+	#activeBurst: PetBurst | undefined;
 	#nextAutoFlexAt = 0;
+	#working = false;
+	#workTransition: WorkTransition | undefined;
+	#nextWorkBurstAt = 0;
+	#workBurstIndex = 0;
 	#autoFlexGapMs: [number, number] | null;
-	#forcedProtocol: "sixel" | "kitty" | undefined;
+	#forcedProtocol: "sixel" | "kitty" | "iterm2" | undefined;
 	/** Cell metrics the current frames were built for; a change triggers a rebuild. */
 	#builtCellW = 0;
 	#builtCellH = 0;
@@ -178,7 +211,7 @@ export class GajaePetWidget {
 		isWorking: () => boolean;
 		/** Rows rendered below the composer box (pet floor + hook widgets). */
 		getComposerBottomOffset: () => number;
-		forcePixelProtocol?: "sixel" | "kitty";
+		forcePixelProtocol?: "sixel" | "kitty" | "iterm2";
 		/** Random [min, max] ms between auto-flexes; null disables. */
 		autoFlexGapMs?: [number, number] | null;
 	}) {
@@ -195,7 +228,7 @@ export class GajaePetWidget {
 	}
 
 	/** Protocol available for the real-pixel pet, if any. */
-	static pixelProtocol(): "sixel" | "kitty" | null {
+	static pixelProtocol(): "sixel" | "kitty" | "iterm2" | null {
 		return getPetPixelProtocol();
 	}
 
@@ -207,8 +240,8 @@ export class GajaePetWidget {
 		return performance.now() < this.#flexUntil;
 	}
 
-	setMode(mode: PetMode): void {
-		this.#applyMode(mode, true);
+	setMode(mode: string): void {
+		this.#applyMode(resolvePetMode(mode), true);
 	}
 
 	/** Live preview during a selector: change the sprite without re-mounting the
@@ -237,6 +270,9 @@ export class GajaePetWidget {
 			this.#releaseOverlayEmitter();
 			this.#floorContainer.clear();
 			this.#pixel = undefined;
+			this.#workTransition = undefined;
+			this.#nextWorkBurstAt = 0;
+			this.#activeBurst = undefined;
 			this.#framedEditor.setReserve(0);
 			if (mountComposer) this.#mountEditor(false);
 			this.#ui.requestRender(true);
@@ -247,9 +283,14 @@ export class GajaePetWidget {
 		if (!protocol) return;
 		if (this.#mode !== "off") this.#writeImageCleanup();
 		this.#mode = mode;
-		this.#frame = "base";
+		this.#frame = PET_SKINS[mode].baseFrame;
 		this.#flexUntil = 0;
+		this.#activeBurst = undefined;
 		this.#nextAutoFlexAt = 0;
+		this.#working = this.#isWorking();
+		this.#workTransition = undefined;
+		this.#nextWorkBurstAt = 0;
+		this.#workBurstIndex = 0;
 		this.#buildPixel(protocol);
 		if (mountComposer) this.#mountEditor(true);
 		// The pet overlays the composer's bottom rows; no floor row is reserved, so
@@ -262,7 +303,7 @@ export class GajaePetWidget {
 	}
 
 	/** (Re)build the encoded frames for the current terminal cell metrics. */
-	#buildPixel(protocol: "sixel" | "kitty"): void {
+	#buildPixel(protocol: "sixel" | "kitty" | "iterm2"): void {
 		const cell = getCellDimensions();
 		this.#builtCellW = cell.widthPx;
 		this.#builtCellH = cell.heightPx;
@@ -276,10 +317,17 @@ export class GajaePetWidget {
 			skin,
 			cellWidthPx: cell.widthPx,
 			cellHeightPx: cell.heightPx,
+			// Encode iTerm2 at the same two-row pixel size as Kitty/Sixel. The
+			// iTerm2 protocol receives explicit pixel dimensions below, so it must
+			// not be reduced to a fractional cell canvas or it becomes undersized.
 			targetRows: 2,
 			sixelTopPaddingPx: protocol === "sixel" ? PET_SIXEL_DROP_PX : 0,
 			kittyCellYOffsetPx: protocol === "kitty" ? petKittyDropPx(cell.heightPx) : 0,
 			kittyImageId: protocol === "kitty" ? this.#kittyImageId : undefined,
+			// iTerm2 receives an explicit 1:1 pixel size; keep its raster inside the
+			// same two-row footprint reserved for Kitty and Sixel.
+			iterm2TopPaddingPx: 0,
+			iterm2BottomPaddingPx: 0,
 		});
 		this.#framedEditor.setReserve(this.#pixel.columns + PET_SIDE_MARGIN);
 	}
@@ -306,6 +354,9 @@ export class GajaePetWidget {
 			this.#releaseOverlayEmitter();
 			this.#mode = "off";
 			this.#pixel = undefined;
+			this.#workTransition = undefined;
+			this.#nextWorkBurstAt = 0;
+			this.#activeBurst = undefined;
 			this.#floorContainer.clear();
 			this.#framedEditor.setReserve(0);
 			// Restore the plain composer only while our framed wrapper is still
@@ -334,31 +385,46 @@ export class GajaePetWidget {
 		this.#mountEditor(this.#mode !== "off");
 	}
 
-	#pickFrame(now: number): GajaePixelFrameName {
+	#pickFrame(now: number): PetFrameName {
 		const mode = this.#mode;
 		if (mode === "off") return "base";
+		const skin = PET_SKINS[mode];
+		const working = this.#isWorking();
+		if (working !== this.#working) {
+			this.#working = working;
+			this.#flexUntil = 0;
+			this.#activeBurst = undefined;
+			this.#nextWorkBurstAt = 0;
+			const steps = working ? skin.workEnter : skin.workExit;
+			this.#workTransition = steps?.length ? { startedAt: now, steps } : undefined;
+		}
+		if (this.#workTransition) {
+			const elapsed = now - this.#workTransition.startedAt;
+			const duration = animationDuration(this.#workTransition.steps);
+			if (elapsed < duration) {
+				return animationFrameAtElapsed(this.#workTransition.steps, elapsed, skin.baseFrame);
+			}
+			this.#workTransition = undefined;
+		}
 		// Random idle burst → the skin's own animation, driven by its burst descriptor
 		// (RedGajae holds a flex; BlueGajae dances the para-para then sobs).
 		if (now < this.#flexUntil) {
-			const burst = PET_SKINS[mode].burst;
+			const burst = this.#activeBurst ?? skin.burst;
 			const elapsed = now - (this.#flexUntil - petBurstDurationMs(burst));
 			return petBurstFrame(burst, elapsed, now);
 		}
-		// Working → loop the shared para-para beats.
+		// Working → loop the selected skin's activity animation.
 		if (this.#isWorking()) {
-			let d = now % WORK_LOOP_TOTAL;
-			for (const [frame, ms] of PARA_PARA_STEPS) {
-				if (d < ms) return frame;
-				d -= ms;
-			}
-			return "base";
+			return animationFrameAt(skin.work, now, skin.baseFrame);
 		}
-		let t = now % IDLE_LOOP_TOTAL;
-		for (const [frame, ms] of IDLE_LOOP) {
-			if (t < ms) return frame;
-			t -= ms;
-		}
-		return "base";
+		return animationFrameAt(skin.idle, now, skin.baseFrame);
+	}
+
+	#scheduleWorkBurst(now: number): void {
+		this.#nextWorkBurstAt =
+			now +
+			OUROBOROS_WORK_BURST_MIN_GAP_MS +
+			Math.random() * (OUROBOROS_WORK_BURST_MAX_GAP_MS - OUROBOROS_WORK_BURST_MIN_GAP_MS);
 	}
 
 	#scheduleAutoFlex(now: number): void {
@@ -382,15 +448,29 @@ export class GajaePetWidget {
 		}
 		// Random show-off, both while idle and while working. Each skin's burst runs for
 		// its own length (RedGajae a brief flex; BlueGajae a para-para cycle plus sob).
-		if (this.#autoFlexGapMs && now >= this.#flexUntil) {
+		const skin = PET_SKINS[this.#mode];
+		const usesWorkBursts = this.#isWorking() && Boolean(skin.workBursts?.length);
+		if (this.#autoFlexGapMs && !usesWorkBursts && now >= this.#flexUntil) {
 			if (this.#nextAutoFlexAt === 0) {
 				this.#scheduleAutoFlex(now);
 			} else if (now >= this.#nextAutoFlexAt) {
 				const burstMs = petBurstDurationMs(PET_SKINS[this.#mode].burst);
+				this.#activeBurst = skin.burst;
 				this.#flexUntil = now + burstMs;
 				this.#scheduleAutoFlex(now + burstMs);
 			}
 		}
+		if (this.#isWorking() && !this.#workTransition && now >= this.#flexUntil && skin.workBursts?.length) {
+			if (this.#nextWorkBurstAt === 0) {
+				this.#scheduleWorkBurst(now);
+			} else if (now >= this.#nextWorkBurstAt) {
+				const burst = skin.workBursts[this.#workBurstIndex % skin.workBursts.length];
+				this.#workBurstIndex++;
+				this.#activeBurst = burst;
+				this.#flexUntil = now + petBurstDurationMs(burst);
+				this.#scheduleWorkBurst(this.#flexUntil);
+			}
+		}
 		const frame = this.#pickFrame(now);
 		if (frame === this.#frame) return;
 		this.#frame = frame;
@@ -412,7 +492,15 @@ export class GajaePetWidget {
 		// back onto the composer's bottom border per protocol (sixel via transparent
 		// top padding, kitty via a sub-cell Y offset baked into the frames).
 		const composerBottom = rows - this.#getComposerBottomOffset();
-		const y = composerBottom - pixel.rows - PET_RAISE_ROWS;
+		// iTerm2 anchors an inline image at the current cursor row. Keep the full
+		// sprite inside the composer rows and leave the HUD boundary below it.
+		// Keep the full-size iTerm2 sprite aligned with the composer like the
+		// cursor-neutral Kitty/Sixel overlays; only the protocol encoding differs.
+		// Nudge the iTerm2 image one terminal row upward while preserving its
+		// explicit 36px size and aspect ratio. Kitty/Sixel keep their established
+		// safety lift.
+		const safetyLift = PET_RAISE_ROWS;
+		const y = composerBottom - pixel.rows - safetyLift;
 		const x = columns - pixel.columns - PET_SIDE_MARGIN;
 		if (y < 0 || x < 0) return null;
 		return { x, y };
@@ -490,7 +578,7 @@ export class GajaePetWidget {
 		const { x, y } = pos;
 		let out = "";
 
-		if (pixel.protocol === "sixel") {
+		if (pixel.protocol === "sixel" || pixel.protocol === "iterm2") {
 			const footprint = { x, y, columns: pixel.columns, rows: pixel.rasterRows };
 			if (this.#lastSixelFootprint && !sameFootprint(this.#lastSixelFootprint, footprint)) {
 				out += this.#clearSixelFootprint(this.#lastSixelFootprint);

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

@@ -27,6 +27,7 @@ import {
 	GJC_MODEL_ASSIGNMENT_TARGETS,
 	isAuthenticated,
 	kNoAuth,
+	requiresExplicitThinkingChoice,
 } from "../../config/model-registry";
 import {
 	formatModelSelectorValue,
@@ -2432,12 +2433,6 @@ export class ModelSelectorComponent extends Container {
 	}
 }
 
-function requiresExplicitThinkingChoice(model: Model, role: GjcModelAssignmentTargetId | null): boolean {
-	if (model.reasoning !== true) return false;
-	if (model.provider === "openai" || model.provider === "openai-codex") return true;
-	return role !== null && GJC_MODEL_ASSIGNMENT_TARGETS[role].settingsPath === "task.agentModelOverrides";
-}
-
 function getSelectableThinkingLevels(model: Model): ThinkingLevel[] {
 	const levels: ThinkingLevel[] = [ThinkingLevel.Off];
 	let efforts: readonly string[];

package/src/modes/components/pet-capability.ts

@@ -7,13 +7,13 @@ import {
 	TERMINAL,
 } from "@gajae-code/tui";
 
-export type PetPixelProtocol = "sixel" | "kitty";
+export type PetPixelProtocol = "sixel" | "kitty" | "iterm2";
 
-export const PET_UNAVAILABLE_DESCRIPTION = "Unavailable: requires compatible Kitty or Sixel overlay rendering";
+export const PET_UNAVAILABLE_DESCRIPTION = "Unavailable: requires compatible Kitty, iTerm2, or Sixel overlay rendering";
 export const PET_SAVED_UNAVAILABLE_DESCRIPTION =
-	"Saved, unavailable — requires compatible Kitty or Sixel overlay rendering";
+	"Saved, unavailable — requires compatible Kitty, iTerm2, or Sixel overlay rendering";
 export const PET_UNAVAILABLE_WARNING =
-	"⚠ Pets aren’t available in this terminal. Its image support isn’t compatible with Gajae Pet’s overlay rendering yet. Try Kitty, Ghostty, WezTerm, or a terminal with compatible Sixel support.";
+	"⚠ Pets aren’t available in this terminal. Its image support isn’t compatible with Gajae Pet’s overlay rendering yet. Try Kitty, Ghostty, WezTerm, iTerm2, or a terminal with compatible Sixel support.";
 const PET_MULTIPLEXER_UNAVAILABLE_WARNING =
 	"⚠ Gajae Pet graphics are unavailable inside tmux, screen, or zellij because image escapes are not forwarded end to end. Run gjc outside the multiplexer, or set PI_FORCE_IMAGE_PROTOCOL=sixel only when the full terminal chain supports Sixel.";
 
@@ -21,9 +21,14 @@ export function getPetUnavailableWarning(env: NodeJS.ProcessEnv = Bun.env): stri
 	return isUnderTerminalMultiplexer(env) ? PET_MULTIPLEXER_UNAVAILABLE_WARNING : PET_UNAVAILABLE_WARNING;
 }
 
-export function getPetPixelProtocol(): PetPixelProtocol | null {
+export function getPetPixelProtocol(env: NodeJS.ProcessEnv = Bun.env): PetPixelProtocol | null {
+	if (isUnderTerminalMultiplexer(env)) {
+		const forced = env.PI_FORCE_IMAGE_PROTOCOL?.trim().toLowerCase();
+		return TERMINAL.imageProtocol === ImageProtocol.Sixel && forced === "sixel" ? "sixel" : null;
+	}
 	if (TERMINAL.imageProtocol === ImageProtocol.Kitty) return "kitty";
 	if (TERMINAL.imageProtocol === ImageProtocol.Sixel) return "sixel";
+	if (TERMINAL.imageProtocol === ImageProtocol.Iterm2) return "iterm2";
 	return null;
 }
 

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

@@ -5,6 +5,7 @@ import {
 	Container,
 	Input,
 	matchesKey,
+	resolvePetMode,
 	type SelectItem,
 	SelectList,
 	type SettingItem,
@@ -27,6 +28,7 @@ import { getCurrentThemeName, getSelectListTheme, getSettingsListTheme, theme }
 import { matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
 import { getTabBarTheme } from "../shared";
 import { DynamicBorder } from "./dynamic-border";
+import { DynamicThemeText } from "./dynamic-theme-text";
 import { GjcBundleSettingsComponent } from "./gjc-bundle-settings";
 import {
 	type NotificationsEditorOperations,
@@ -101,18 +103,18 @@ class SelectSubmenu extends Container {
 		super();
 
 		// Title
-		this.addChild(new Text(theme.bold(theme.fg("accent", title)), 0, 0));
+		this.addChild(new DynamicThemeText(() => theme.bold(theme.fg("accent", title))));
 
 		// Description
 		if (description) {
 			this.addChild(new Spacer(1));
-			this.addChild(new Text(theme.fg("muted", description), 0, 0));
+			this.addChild(new DynamicThemeText(() => theme.fg("muted", description)));
 		}
 
 		// Preview (if provided)
 		if (getPreview) {
 			this.addChild(new Spacer(1));
-			this.addChild(new Text(theme.fg("muted", "Preview:"), 0, 0));
+			this.addChild(new DynamicThemeText(() => theme.fg("muted", "Preview:")));
 			this.#previewText = new Text(getPreview(), 0, 0);
 			this.addChild(this.#previewText);
 		}
@@ -121,7 +123,7 @@ class SelectSubmenu extends Container {
 		this.addChild(new Spacer(1));
 
 		// Select list
-		this.#selectList = new SelectList(options, Math.min(options.length, 10), getSelectListTheme());
+		this.#selectList = new SelectList(options, Math.min(options.length, 10), () => getSelectListTheme());
 
 		// Pre-select current value
 		const currentIndex = options.findIndex(o => o.value === currentValue);
@@ -157,7 +159,7 @@ class SelectSubmenu extends Container {
 
 		// Hint
 		this.addChild(new Spacer(1));
-		this.addChild(new Text(theme.fg("dim", "  Enter to select · Esc to go back"), 0, 0));
+		this.addChild(new DynamicThemeText(() => theme.fg("dim", "  Enter to select · Esc to go back")));
 	}
 
 	#updatePreview(): void {
@@ -708,6 +710,11 @@ export interface SettingsCallbacks {
 	onThemePreview?: (theme: string) => void | Promise<void>;
 	/** Called to restore the rendered theme when theme settings preview is cancelled */
 	onThemePreviewCancel?: (theme: string) => void | Promise<void>;
+	/**
+	 * Atomically apply and persist a theme selection. Returns false when the
+	 * candidate could not be loaded, leaving the submenu open.
+	 */
+	onThemeCommit?: (path: "theme.dark" | "theme.light", theme: string, previousTheme: string) => Promise<boolean>;
 	/** Called to live-preview the gajae pet skin while browsing the pet setting. */
 	onPetPreview?: (mode: string) => void;
 	/**
@@ -971,6 +978,7 @@ export class SettingsSelectorComponent extends Container {
 		}
 		let description = def.description;
 		if (def.path === "pet.mode") {
+			currentValue = resolvePetMode(currentValue);
 			const petAvailable = this.context.petAvailable ?? isPetAvailable();
 			options = createPetSelectItems(options, currentValue, petAvailable);
 			// Unsupported terminals must see the same actionable guidance the
@@ -1072,6 +1080,13 @@ export class SettingsSelectorComponent extends Container {
 					done(value);
 					return;
 				}
+				if (def.path === "theme.dark" || def.path === "theme.light") {
+					if (!this.callbacks.onThemeCommit) return;
+					void this.callbacks.onThemeCommit(def.path, value, currentValue).then(accepted => {
+						if (accepted) done(value);
+					});
+					return;
+				}
 				if (def.path === "pet.mode") {
 					// The shared pet commit policy rechecks capability immediately
 					// before mutation and persists only on acceptance; the settings

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

@@ -32,7 +32,7 @@ function normalizePremiumRequests(value: number): number {
 	return Math.round((value + Number.EPSILON) * 100) / 100;
 }
 
-const SCRATCH_ROOTS: readonly string[] = (() => {
+function scratchRoots(): readonly string[] {
 	const roots = new Set<string>([os.tmpdir(), path.join(os.homedir(), "tmp")]);
 	if (process.platform === "win32") {
 		const { TEMP, TMP, SystemRoot } = process.env;
@@ -48,10 +48,10 @@ const SCRATCH_ROOTS: readonly string[] = (() => {
 		}
 	}
 	return [...roots];
-})();
+}
 
 function classifyProjectDir(pwd: string): { scratch: boolean; relative: string | null } {
-	for (const root of SCRATCH_ROOTS) {
+	for (const root of scratchRoots()) {
 		if (pathIsWithin(root, pwd)) {
 			return { scratch: true, relative: relativePathWithinRoot(root, pwd) };
 		}

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

@@ -4,7 +4,7 @@ import type { Api, Model } from "@gajae-code/ai/core";
 import { getOAuthProviders } from "@gajae-code/ai/utils/oauth";
 import type { OAuthProvider } from "@gajae-code/ai/utils/oauth/types";
 import type { Component, OverlayHandle, SlashCommand } from "@gajae-code/tui";
-import { Input, isPetMode, Loader, Spacer, Text } from "@gajae-code/tui";
+import { Input, Loader, resolvePetMode, Spacer, Text } from "@gajae-code/tui";
 import { getAgentDbPath, getProjectDir, logger, VERSION } from "@gajae-code/utils";
 import type { AppKeybinding } from "../../config/keybindings";
 import {
@@ -1772,6 +1772,36 @@ export class SelectorController {
 								this.#refreshThemeUi();
 							});
 						},
+						onThemeCommit: async (path, themeName, previousTheme) => {
+							if (!settings.canWriteDurableConfig()) {
+								this.ctx.showError(
+									"Cannot change settings while config.yml has invalid YAML syntax. Repair config.yml and reload settings.",
+								);
+								return false;
+							}
+							const applied = await restoreThemePreview(themeName);
+							if (!applied.success) {
+								if (applied.error && !isThemePreviewSuperseded(applied)) {
+									this.ctx.showError(`Failed to apply theme "${themeName}": ${applied.error}`);
+								}
+								const restored = await restoreThemePreview(previousTheme);
+								if (!restored.success && restored.error && !isThemePreviewSuperseded(restored)) {
+									this.ctx.showError(`Failed to restore theme preview: ${restored.error}`);
+								}
+								this.#refreshThemeUi();
+								return false;
+							}
+							try {
+								settings.set(path, themeName);
+							} catch (error) {
+								await restoreThemePreview(previousTheme);
+								this.ctx.showError(error instanceof Error ? error.message : String(error));
+								this.#refreshThemeUi();
+								return false;
+							}
+							this.#refreshThemeUi();
+							return true;
+						},
 						onPetPreview: mode => {
 							this.ctx.previewPetMode(mode as PetMode);
 						},
@@ -1853,6 +1883,8 @@ export class SelectorController {
 	showThemeSelector(): void {
 		getAvailableThemes().then(availableThemes => {
 			const initialTheme = getCurrentThemeName() ?? "red-claw";
+			const settingsPath = getDetectedThemeSettingsPath();
+			const savedTheme = settings.get(settingsPath);
 			this.showSelector(done => {
 				const restoreAndClose = () => {
 					void restoreThemePreview(initialTheme).then(result => {
@@ -1875,7 +1907,7 @@ export class SelectorController {
 							return;
 						}
 						try {
-							settings.set(getDetectedThemeSettingsPath(), themeName);
+							settings.set(settingsPath, themeName);
 						} catch (error) {
 							if (!settings.canWriteDurableConfig()) {
 								this.ctx.showError(error instanceof Error ? error.message : String(error));
@@ -1884,8 +1916,21 @@ export class SelectorController {
 							}
 							throw error;
 						}
-						this.#refreshThemeUi();
-						done();
+						void restoreThemePreview(themeName).then(result => {
+							if (!result.success && result.error && !isThemePreviewSuperseded(result)) {
+								this.ctx.showError(`Failed to apply theme: ${result.error}`);
+								settings.set(settingsPath, savedTheme);
+								void restoreThemePreview(initialTheme).then(recovery => {
+									if (!recovery.success && recovery.error && !isThemePreviewSuperseded(recovery)) {
+										this.ctx.showError(`Failed to restore theme preview: ${recovery.error}`);
+									}
+									this.#refreshThemeUi();
+								});
+								return;
+							}
+							this.#refreshThemeUi();
+							done();
+						});
 					},
 					restoreAndClose,
 					themeName => {
@@ -1904,7 +1949,7 @@ export class SelectorController {
 
 	showPetSelector(): void {
 		const stored = settings.get("pet.mode");
-		const initial: PetMode = isPetMode(stored) ? stored : "off";
+		const initial: PetMode = resolvePetMode(stored);
 		this.showSelector(done => {
 			// Live-preview via previewMode (no editor re-mount, so the overlay stays);
 			// Enter commits + persists, Esc restores the initial skin.
@@ -2091,6 +2136,17 @@ export class SelectorController {
 				});
 				break;
 			}
+			case "theme.dark":
+			case "theme.light": {
+				restoreThemePreview(value as string).then(result => {
+					if (this.ctx.isStopped?.()) return;
+					this.#refreshThemeUi();
+					if (!result.success && result.error && !isThemePreviewSuperseded(result)) {
+						this.ctx.showError(`Failed to apply theme "${value}": ${result.error}`);
+					}
+				});
+				break;
+			}
 			case "pet.mode":
 				// The settings submenu already persisted the value; apply it to the live
 				// widget via previewMode (the settings overlay is still open, so a full

package/src/modes/interactive-mode.ts

@@ -1345,7 +1345,11 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.editorContainer.clear();
 			this.editorContainer.addChild(this.editor);
 		}
+		// Re-mounting after a cancelled action must invalidate the editor so the
+		// inline prompt suggestion is rendered again on the restored composer.
+		this.editor.invalidate();
 		this.ui.setFocus(this.editor);
+		this.ui.requestRender();
 	}
 
 	#createPetWidget(editor: CustomEditor): GajaePetWidget {