@gajae-code/coding-agent 0.18.11 → 0.18.12

package/src/migrate/report.ts

@@ -27,7 +27,12 @@ export interface BuildReportInput {
 
 export function buildReport(input: BuildReportInput): MigrateReport {
 	const total = emptyStatusCounts();
-	const byType = { mcp: emptyStatusCounts(), skill: emptyStatusCounts(), source: emptyStatusCounts() };
+	const byType = {
+		mcp: emptyStatusCounts(),
+		skill: emptyStatusCounts(),
+		instruction: emptyStatusCounts(),
+		source: emptyStatusCounts(),
+	};
 	const bySource = {} as Record<MigrateSource, StatusCounts>;
 	for (const source of input.sources) bySource[source] = emptyStatusCounts();
 
@@ -75,10 +80,22 @@ export function renderHuman(report: MigrateReport): string {
 	const mode = report.dryRun ? " (dry-run)" : "";
 	lines.push(`gjc migrate${mode}: ${report.ok ? "ok" : "completed with failures"}`);
 	lines.push(`Sources: ${report.sources.join(", ") || "none"}`);
-	lines.push(`Destination: mcp=${report.destinations.mcpConfigPath} skills=${report.destinations.skillsDir}`);
+	lines.push(
+		`Destination: mcp=${report.destinations.mcpConfigPath} skills=${report.destinations.skillsDir} instructions=${report.destinations.instructionsPath}`,
+	);
 	lines.push("");
 	lines.push(`MCP:    ${summarizeCounts(report.summary.byType.mcp)}`);
 	lines.push(`Skills: ${summarizeCounts(report.summary.byType.skill)}`);
+	lines.push(`Instructions: ${summarizeCounts(report.summary.byType.instruction)}`);
+	const instructionActions = report.actions.filter(action => action.type === "instruction");
+	if (instructionActions.length > 0) {
+		lines.push("Instruction files:");
+		for (const action of instructionActions) {
+			lines.push(
+				`  - [${action.source}] ${action.name ?? "AGENTS.md"}: ${action.status}${action.reason ? ` (${action.reason})` : ""}`,
+			);
+		}
+	}
 	if (Object.values(report.summary.byType.source).some(n => n > 0)) {
 		lines.push(`Source: ${summarizeCounts(report.summary.byType.source)}`);
 	}

package/src/migrate/types.ts

@@ -1,8 +1,8 @@
 /**
  * Shared types for `gjc migrate`.
  *
- * Imports MCP servers and skills from other coding agents (Claude Code, Codex,
- * OpenCode) into native GJC config. See the consensus plan under
+ * Imports MCP servers, skills, and instruction files from other coding agents
+ * (Claude Code, Codex, OpenCode) into native GJC config. See the consensus plan under
  * `.gjc/plans/ralplan/` for the full taxonomy and force/collision semantics.
  */
 import type { MCPServerConfig } from "../runtime-mcp/types";
@@ -16,7 +16,7 @@ export const MIGRATE_SOURCES: readonly MigrateSource[] = ["claude-code", "codex"
 export const CANONICAL_SOURCE_ORDER: readonly MigrateSource[] = MIGRATE_SOURCES;
 
 /** What kind of thing an action/coverage row is about. */
-export type MigrateItemType = "mcp" | "skill" | "source";
+export type MigrateItemType = "mcp" | "skill" | "instruction" | "source";
 
 /**
  * Per-item outcome taxonomy.
@@ -77,6 +77,13 @@ export interface SkillCandidate {
 	warnings: string[];
 }
 
+/** An instructions file imported as the active GJC AGENTS.md for its scope. */
+export interface InstructionCandidate {
+	source: MigrateSource;
+	name: string;
+	content: string;
+}
+
 /**
  * Source-level diagnostic for a single source/type pair (e.g. "codex mcp config
  * was malformed"). Distinct from per-item actions so absent/unreadable sources
@@ -93,6 +100,7 @@ export interface SourceDiagnostic {
 export interface AdapterResult {
 	mcpCandidates: McpCandidate[];
 	skillCandidates: SkillCandidate[];
+	instructionCandidates: InstructionCandidate[];
 	diagnostics: SourceDiagnostic[];
 }
 
@@ -112,6 +120,7 @@ export interface MigrateAction {
 	/** Resolved payload the executor needs; never serialized to the report. */
 	mcp?: { config: MCPServerConfig; force: boolean };
 	skill?: { content: string };
+	instruction?: { content: string };
 }
 
 export interface MigrateWarning {
@@ -126,6 +135,7 @@ export type StatusCounts = Record<MigrationStatus, number>;
 export interface MigrateDestinations {
 	mcpConfigPath: string;
 	skillsDir: string;
+	instructionsPath: string;
 }
 
 /** The full machine-readable report emitted with `--json`. */
@@ -138,7 +148,7 @@ export interface MigrateReport {
 	destinations: MigrateDestinations;
 	summary: {
 		total: StatusCounts;
-		byType: { mcp: StatusCounts; skill: StatusCounts; source: StatusCounts };
+		byType: { mcp: StatusCounts; skill: StatusCounts; instruction: StatusCounts; source: StatusCounts };
 		bySource: Record<MigrateSource, StatusCounts>;
 	};
 	actions: Array<{

package/src/modes/DESIGN.md

@@ -112,6 +112,11 @@ condition in prose. Error guidance states the safe recovery action without
 showing credentials. Confirmations are explicit focused choices; destructive
 remove/disable actions are never the default side effect of navigation.
 
+Guidance the user must act on (for example the subagent await-timeout
+"inspect before cancelling" instruction) wraps to the terminal width instead of
+being clipped to one preview line, so the action survives narrow terminals. It
+stays bounded: at most 12 wrapped rows, the last ending in `…` if cut.
+
 A non-cancellable action visibly locks navigation and names the reason. A
 cancellable action names cancellation while it is pending, aborts on exit, and
 must not render a late completion after disposal. This follows the selector's
@@ -469,3 +474,49 @@ differently named bundles, and a stored `uri#ref` differs from a bare `uri`, so
 locator-based refusal would refuse installs that should proceed. Refusing on a
 guess is worse than reporting the real failure, so identity must be readable for
 refusal to apply.
+
+## Subagent compact await panel
+
+Source: `tools/subagent-render.ts` (the `subagent` await panel), behind the
+`task.compactSubagentPanel` setting (default off). This section extends the
+existing tool-panel grammar; it adds no tokens.
+
+- **Scope:** live await progress only. A final result (timeout guidance,
+  failure and completion receipts, status/steer/resume replies) always keeps the
+  full per-subagent rendering, so nothing the user must act on is summarized.
+- **Anatomy (collapsed, setting on):** a height independent of the number of
+  subagents — the existing status header, one `dim` summary row of group counts
+  joined by ` · `, at most one `warning` row naming the most-degraded provider and
+  how many more providers degrade (the expanded view keeps one row per provider), and one `dim` hint row in parentheses
+  naming the effective `app.tools.expand` key and, while anything runs, the
+  existing `ctrl+s to observe sessions` hint.
+- **Count order:** `N subagents running`, then `failed`, `retrying`,
+  `idle >30s`, `queued`, `paused`, `done`, `cancelled`. Zero counts are omitted.
+  Attention states come first because a narrow terminal truncates the row end;
+  truncation shows `…` so a dropped count is visible.
+- **States:** collapsed → summary; expanded (the existing tool-output toggle)
+  → the unchanged per-subagent list. With the setting off the panel is the
+  unchanged per-subagent list in both states. Status is carried by words and
+  counts, never by color or the spinner alone; ASCII/no-color keeps the same
+  text.
+- **Motion:** no new animation. With the setting on, await progress re-emits
+  only when the summary counts or per-provider retry counts change (plus the
+  existing liveness interval).
+- **International text:** the summary and hint are fixed English labels and
+  numbers; subagent descriptions (which may be CJK) appear only in the expanded
+  list, whose layout is unchanged.
+
+Capture command (fixture-backed, real renderer, fixed clock):
+
+```sh
+bun packages/coding-agent/scripts/capture-subagent-compact-panel-showcase.ts --out .gjc/qa/subagent-compact-panel-<run>
+```
+
+The matrix is every state at `80x24`, `120x36`, and `160x48` in
+`unicode-color` (including `compact-final-timeout`, a final timeout receipt
+with the setting on), plus `compact-collapsed-15-live` and `compact-collapsed-mixed`
+at `80x24/ascii-no-color`, `compact-collapsed-mixed/48x36/unicode-color`, and
+`narrow-cjk/48x36` in both render modes: 26 entries. An entry whose panel fits
+the viewport is captured once (`top`); an overflowing entry is captured at
+`top`, `middle`, and `bottom` so no tail is hidden. Every capture has
+`terminal.txt`, `terminal-ansi.txt`, `terminal.html`, and `metadata.json`.

package/src/modes/acp/permission-mode.ts

@@ -1,4 +1,6 @@
 import type { ClientCapabilities } from "@agentclientprotocol/sdk";
+import { startupProjectEnvSnapshot } from "@gajae-code/utils/env";
+import { canonicalEnvKey } from "@gajae-code/utils/env-file";
 
 export type AcpPermissionMode = "auto" | "prompt" | "always-allow";
 
@@ -9,6 +11,21 @@ function parseAcpPermissionMode(value: unknown): AcpPermissionMode {
 	return "prompt";
 }
 
+/**
+ * The default process environment includes the cwd `.env` merge. A live value
+ * equal to that startup declaration is the overlay and fails safe. A different
+ * live value is the launching environment, including when the declaration is
+ * dynamic (`$` or backticks) and is not that value. An explicit env map is
+ * the caller's value. The raw string is parsed so padding still fails safe.
+ */
+function permissionModeFromEnv(env: NodeJS.ProcessEnv): unknown {
+	const raw = env[ACP_PERMISSION_MODE_ENV];
+	if (env !== process.env || typeof raw !== "string") return raw;
+	const declared = startupProjectEnvSnapshot().values[canonicalEnvKey(ACP_PERMISSION_MODE_ENV)];
+	if (declared !== undefined && raw.trim() === declared.trim()) return undefined;
+	return raw;
+}
+
 /** Client metadata is authoritative; the process environment is only a fallback when that field is absent. */
 export function resolveAcpPermissionMode(
 	clientCapabilities: ClientCapabilities | undefined,
@@ -21,5 +38,5 @@ export function resolveAcpPermissionMode(
 			return parseAcpPermissionMode((gjc as { permissionHandling?: unknown }).permissionHandling);
 		}
 	}
-	return parseAcpPermissionMode(env[ACP_PERMISSION_MODE_ENV]);
+	return parseAcpPermissionMode(permissionModeFromEnv(env));
 }

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

@@ -4,13 +4,17 @@ import {
 	Container,
 	Image,
 	ImageProtocol,
+	isCursorNeutralImagePermittedInFallback,
+	isTerminalGraphicsFallbackActive,
 	isViewportAnchorSourceRenderer,
 	Markdown,
+	type MarkdownTheme,
 	Spacer,
 	TERMINAL,
 	Text,
 	type ViewportAnchorSource,
 } from "@gajae-code/tui";
+import { SvgFigure } from "@gajae-code/tui/chat/svg-figure";
 import { formatNumber } from "@gajae-code/utils";
 import { settings } from "../../config/settings";
 import { renderDeepInterviewAssistantText } from "../../deep-interview/render-middleware";
@@ -27,6 +31,44 @@ const THINKING_REPETITION_ELIDE_MIN_RUN = 24;
 const THINKING_REPETITION_VISIBLE_TOKENS = 3;
 const THINKING_REPETITION_TOKEN_PATTERN = /[\p{L}\p{N}_'-]{1,32}/gu;
 
+let assistantMarkdownThemeBase: MarkdownTheme | undefined;
+let cachedAssistantMarkdownTheme: MarkdownTheme | undefined;
+
+function getAssistantMarkdownTheme(): MarkdownTheme {
+	const base = getMarkdownTheme();
+	if (base === assistantMarkdownThemeBase && cachedAssistantMarkdownTheme) return cachedAssistantMarkdownTheme;
+	assistantMarkdownThemeBase = base;
+	cachedAssistantMarkdownTheme = {
+		...base,
+		resolveSvgFigure: (source, context) => {
+			if (!settings.get("terminal.showImages")) return null;
+			const graphicsSuppressed =
+				isTerminalGraphicsFallbackActive() &&
+				!(TERMINAL.imageProtocol === ImageProtocol.Kitty && isCursorNeutralImagePermittedInFallback());
+			if (!TERMINAL.imageProtocol) return null; // Stable environment: cache the code fallback.
+			if (graphicsSuppressed) return undefined; // The suppression scope can end; retry on repaint.
+			const palette = theme.getSvgPalette();
+			const previous = context.previous instanceof SvgFigure ? context.previous : undefined;
+			const figure =
+				previous ??
+				new SvgFigure({
+					theme: { fallbackColor: (text: string) => theme.fg("toolOutput", text) },
+					palette,
+					onChange: context.onChange,
+				});
+			figure.update(source, context.closed || !context.streaming, context.closed, palette);
+			if (figure.retryable) {
+				// A failed preview remains a code block, but must observe layout changes
+				// so a smaller terminal canvas can retry the same source.
+				figure.render(context.width);
+				return undefined;
+			}
+			return figure.failed ? null : figure;
+		},
+	};
+	return cachedAssistantMarkdownTheme;
+}
+
 interface ThinkingRepetitionToken {
 	text: string;
 	normalized: string;
@@ -92,6 +134,7 @@ export class AssistantMessageComponent extends Container {
 	#convertedKittyImages = new Map<string, ImageContent & { source: string }>();
 	#kittyConversionsInFlight = new Map<string, string>();
 	#toolImageGenerations = new Map<string, number>();
+	#unsubscribeSettings?: () => void;
 
 	#responseHeader = new Text(theme.bold(theme.fg("statusLineModel", "gajae")), 1, 0);
 	#contentBlocksCache = new WeakMap<object, { source: string; component: Component }>();
@@ -133,6 +176,15 @@ export class AssistantMessageComponent extends Container {
 		}
 		this.#visibleSignature = this.#visibleContentSignature();
 		this.#visibleSignatureInitialized = true;
+		this.#unsubscribeSettings = settings.onChanged(path => {
+			if (path !== "terminal.showImages") return;
+			for (const block of this.#lastMessage?.content ?? []) {
+				if (block.type !== "text") continue;
+				const cached = this.#contentBlocksCache.get(block);
+				if (cached?.component instanceof Markdown) cached.component.invalidate();
+			}
+			this.#requestRepaint?.();
+		});
 	}
 
 	#visibleContentSignature(): string {
@@ -339,7 +391,7 @@ export class AssistantMessageComponent extends Container {
 			cached.source = content.text;
 			return cached.component;
 		}
-		const component = deepInterview ?? new Markdown(trimmed, 1, 0, getMarkdownTheme());
+		const component = deepInterview ?? new Markdown(trimmed, 1, 0, getAssistantMarkdownTheme());
 		if (component instanceof Markdown) {
 			component.setOnStaleThrottle(this.#requestRepaint);
 			component.setStreaming(streaming);
@@ -626,6 +678,8 @@ export class AssistantMessageComponent extends Container {
 	override dispose(): void {
 		if (this.#disposed) return;
 		this.#disposed = true;
+		this.#unsubscribeSettings?.();
+		this.#unsubscribeSettings = undefined;
 		this.#toolImageGenerations.clear();
 		this.#kittyConversionsInFlight.clear();
 		this.#convertedKittyImages.clear();

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

@@ -108,9 +108,9 @@ class SelectSubmenu extends Container {
 		description: string,
 		options: ReadonlyArray<SelectItem>,
 		currentValue: string,
-		onSelect: (value: string) => void,
-		onCancel: () => void,
-		onSelectionChange?: (value: string) => void | Promise<void>,
+		private readonly onSelect: (value: string) => void,
+		private readonly onCancel: () => void,
+		private readonly onSelectionChange?: (value: string) => void | Promise<void>,
 		private readonly getPreview?: () => string,
 	) {
 		super();
@@ -137,46 +137,54 @@ class SelectSubmenu extends Container {
 		// Spacer
 		this.addChild(new Spacer(1));
 
-		// Select list
-		this.#selectList = new SelectList(options, Math.min(options.length, 10), () => getSelectListTheme());
-
-		// Pre-select current value
-		const currentIndex = options.findIndex(o => o.value === currentValue);
-		if (currentIndex !== -1) {
-			this.#selectList.setSelectedIndex(currentIndex);
-		}
-
-		this.#selectList.onSelect = item => {
-			onSelect(item.value);
-		};
+		this.#selectList = this.#createSelectList(options, currentValue);
+		this.addChild(this.#selectList);
 
-		this.#selectList.onCancel = onCancel;
+		// Hint
+		this.addChild(new Spacer(1));
+		this.addChild(
+			new DynamicThemeText(() => theme.fg("dim", uiString(settings.get("ui.language"), "settings.selectHint"))),
+		);
+	}
 
-		if (onSelectionChange) {
-			this.#selectList.onSelectionChange = item => {
+	#createSelectList(options: ReadonlyArray<SelectItem>, selectedValue?: string): SelectList {
+		const selectList = new SelectList(options, Math.min(options.length, 10), () => getSelectListTheme());
+		const selectedIndex = options.findIndex(option => option.value === selectedValue);
+		if (selectedIndex !== -1) selectList.setSelectedIndex(selectedIndex);
+		selectList.onSelect = item => this.onSelect(item.value);
+		selectList.onCancel = this.onCancel;
+		if (this.onSelectionChange) {
+			selectList.onSelectionChange = item => {
 				const requestId = ++this.#previewUpdateRequestId;
-				const result = onSelectionChange(item.value);
+				const result = this.onSelectionChange?.(item.value);
 				if (result && typeof (result as Promise<void>).then === "function") {
 					void (result as Promise<void>).finally(() => {
-						if (requestId === this.#previewUpdateRequestId) {
-							this.#updatePreview();
-						}
+						if (requestId === this.#previewUpdateRequestId) this.#updatePreview();
 					});
 					return;
 				}
-				if (requestId === this.#previewUpdateRequestId) {
-					this.#updatePreview();
-				}
+				if (requestId === this.#previewUpdateRequestId) this.#updatePreview();
 			};
 		}
+		return selectList;
+	}
 
-		this.addChild(this.#selectList);
+	refreshOptions(options: ReadonlyArray<SelectItem>, retainMissingSelection = false): void {
+		const previous = this.#selectList;
+		const selectedItem = previous.getSelectedItem();
+		if (retainMissingSelection && selectedItem && !options.some(option => option.value === selectedItem.value)) {
+			const label = selectedItem.label.endsWith(" (unavailable)")
+				? selectedItem.label
+				: `${selectedItem.label} (unavailable)`;
+			options = [...options, { ...selectedItem, label }];
+		}
+		const selectedValue = selectedItem?.value;
+		this.#selectList = this.#createSelectList(options, selectedValue);
+		this.replaceChildren(this.children.map(child => (child === previous ? this.#selectList : child)));
+	}
 
-		// Hint
-		this.addChild(new Spacer(1));
-		this.addChild(
-			new DynamicThemeText(() => theme.fg("dim", uiString(settings.get("ui.language"), "settings.selectHint"))),
-		);
+	refreshPreview(): void {
+		this.#updatePreview();
 	}
 
 	#updatePreview(): void {
@@ -1528,6 +1536,10 @@ export interface SettingsCallbacks {
 	onPetCommit?: (mode: string) => boolean;
 	/** Called for status line preview while configuring */
 	onStatusLinePreview?: (settings: StatusLinePreviewSettings) => void;
+	/** Called when a status-line submenu begins an uncommitted preview. */
+	onStatusLinePreviewStart?: () => void;
+	/** Called when a status-line preview is committed, cancelled, or disposed. */
+	onStatusLinePreviewEnd?: () => void;
 	/** Get current rendered status line for inline preview */
 	getStatusLinePreview?: (width?: number) => string;
 	/** Render a status-line preview for supplied draft settings without mutating the live status line. */
@@ -1582,6 +1594,8 @@ export class SettingsSelectorComponent extends Container {
 	#currentTabId: SettingTab | "plugins" | "gjc-bundles" = "appearance";
 	#textInputActive = false;
 	#activeProviderOrderEditor: Container | null = null;
+	#activeSelectSubmenu: SelectSubmenu | null = null;
+	#activeModelProfileSubmenu: SelectSubmenu | null = null;
 
 	constructor(
 		private readonly context: SettingsRuntimeContext,
@@ -1634,9 +1648,15 @@ export class SettingsSelectorComponent extends Container {
 	}
 
 	#switchToTab(tabId: SettingTab | "plugins" | "gjc-bundles"): void {
+		if (this.#currentTabId === "appearance" && tabId !== "appearance") {
+			this.callbacks.onStatusLinePreviewEnd?.();
+		}
 		if (this.#currentTabId === "notifications" && tabId !== "notifications" && !this.#disposeNotificationsEditor()) {
 			return;
 		}
+		this.#activeSelectSubmenu?.dispose();
+		this.#activeSelectSubmenu = null;
+		this.#activeModelProfileSubmenu = null;
 		// Release an open provider-order editor (and its context subscriptions)
 		// before switching tabs; the submenu's done() never runs on tab change,
 		// so without this the abandoned editor's listeners would survive.
@@ -1833,6 +1853,18 @@ export class SettingsSelectorComponent extends Container {
 		// Preview handlers
 		let onPreview: ((value: string) => void | Promise<void>) | undefined;
 		let onPreviewCancel: (() => void) | undefined;
+		let onPreviewEnd: (() => void) | undefined;
+		let statusLinePreviewStarted = false;
+		const startStatusLinePreview = (): void => {
+			if (statusLinePreviewStarted) return;
+			statusLinePreviewStarted = true;
+			this.callbacks.onStatusLinePreviewStart?.();
+		};
+		const endStatusLinePreview = (): void => {
+			if (!statusLinePreviewStarted) return;
+			statusLinePreviewStarted = false;
+			this.callbacks.onStatusLinePreviewEnd?.();
+		};
 
 		if (def.path === "theme.dark" || def.path === "theme.light") {
 			const activeThemeBeforePreview = getCurrentThemeName() ?? currentValue;
@@ -1844,6 +1876,7 @@ export class SettingsSelectorComponent extends Container {
 			};
 		} else if (def.path === "statusLine.preset") {
 			onPreview = value => {
+				startStatusLinePreview();
 				const presetDef = getPreset(value as StatusLinePreset);
 				this.callbacks.onStatusLinePreview?.({
 					preset: value as StatusLinePreset,
@@ -1854,6 +1887,7 @@ export class SettingsSelectorComponent extends Container {
 				});
 				this.#updateStatusPreview();
 			};
+			onPreviewEnd = endStatusLinePreview;
 			onPreviewCancel = () => {
 				const currentPreset = settings.get("statusLine.preset");
 				const presetDef = getPreset(currentPreset);
@@ -1880,9 +1914,11 @@ export class SettingsSelectorComponent extends Container {
 			};
 		} else if (def.path === "statusLine.separator") {
 			onPreview = value => {
+				startStatusLinePreview();
 				this.callbacks.onStatusLinePreview?.({ separator: value as StatusLineSeparatorStyle });
 				this.#updateStatusPreview();
 			};
+			onPreviewEnd = endStatusLinePreview;
 			onPreviewCancel = () => {
 				const separator = settings.get("statusLine.separator");
 				this.callbacks.onStatusLinePreview?.({ separator, previewHighlightSegment: undefined });
@@ -1890,9 +1926,11 @@ export class SettingsSelectorComponent extends Container {
 			};
 		} else if (def.path === "statusLine.maxRows") {
 			onPreview = value => {
+				startStatusLinePreview();
 				this.callbacks.onStatusLinePreview?.({ maxRows: Number(value) });
 				this.#updateStatusPreview();
 			};
+			onPreviewEnd = endStatusLinePreview;
 			onPreviewCancel = () => {
 				this.callbacks.onStatusLinePreview?.({
 					maxRows: settings.get("statusLine.maxRows"),
@@ -1914,7 +1952,14 @@ export class SettingsSelectorComponent extends Container {
 		const isThemeSetting = def.path === "theme.dark" || def.path === "theme.light";
 		const getPreview = isThemeSetting ? this.callbacks.getStatusLinePreview : undefined;
 
-		return new SelectSubmenu(
+		let submenu: SelectSubmenu;
+		const finish = (value?: string): void => {
+			if (this.#activeSelectSubmenu === submenu) this.#activeSelectSubmenu = null;
+			if (this.#activeModelProfileSubmenu === submenu) this.#activeModelProfileSubmenu = null;
+			submenu.dispose();
+			done(value);
+		};
+		submenu = new SelectSubmenu(
 			title,
 			description,
 			options,
@@ -1922,7 +1967,7 @@ export class SettingsSelectorComponent extends Container {
 			value => {
 				if (def.path === "modelProfile.default") {
 					this.callbacks.onChange(def.path, value);
-					done(value);
+					finish(value);
 					return;
 				}
 				if (def.path === "theme.dark" || def.path === "theme.light") {
@@ -1937,7 +1982,7 @@ export class SettingsSelectorComponent extends Container {
 					}
 					if (!this.callbacks.onThemeCommit) return;
 					void this.callbacks.onThemeCommit(def.path, value, currentValue).then(accepted => {
-						if (accepted) done(value);
+						if (accepted) finish(value);
 					});
 					return;
 				}
@@ -1953,21 +1998,26 @@ export class SettingsSelectorComponent extends Container {
 					) {
 						return;
 					}
-					done(accepted ? value : undefined);
+					finish(accepted ? value : undefined);
 					return;
 				}
 				if (!commitInteractiveSettings(this.callbacks, () => this.#setSettingValue(def.path, value))) return;
 				this.callbacks.onChange(def.path, value);
 				if (def.path === "ui.language") this.#refreshTabBarLanguage();
-				done(value);
+				onPreviewEnd?.();
+				finish(value);
 			},
 			() => {
 				onPreviewCancel?.();
-				done();
+				onPreviewEnd?.();
+				finish();
 			},
 			onPreview,
 			getPreview,
 		);
+		this.#activeSelectSubmenu = submenu;
+		if (def.path === "modelProfile.default") this.#activeModelProfileSubmenu = submenu;
+		return submenu;
 	}
 
 	/**
@@ -2277,8 +2327,24 @@ export class SettingsSelectorComponent extends Container {
 		return (this.#currentList || this.#pluginComponent || this.#gjcBundleComponent || this.#notificationsEditor)!;
 	}
 
+	/** Refresh saved rows and model-profile choices without replacing active editors. */
+	refreshFromConfiguration(availableModelProfiles: readonly string[]): void {
+		this.context.availableModelProfiles = [...availableModelProfiles];
+		this.#refreshCurrentTabItems();
+		this.#activeModelProfileSubmenu?.refreshOptions(
+			this.context.availableModelProfiles.map(profile => ({ value: profile, label: profile })),
+			true,
+		);
+		this.#activeSelectSubmenu?.refreshPreview();
+		this.#updateStatusPreview();
+	}
+
 	override dispose(): void {
 		if (this.#notificationsEditor?.navigationLocked) return;
+		this.callbacks.onStatusLinePreviewEnd?.();
+		this.#activeSelectSubmenu?.dispose();
+		this.#activeSelectSubmenu = null;
+		this.#activeModelProfileSubmenu = null;
 		// Release an open provider-order editor (and its context subscriptions)
 		// when the whole selector is torn down without a normal close.
 		this.#activeProviderOrderEditor?.dispose();

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

@@ -6,6 +6,7 @@ import { getEnvApiKey, type ToolCall, type UsageLimit, type UsageReport } from "
 import type { ProviderDetails } from "@gajae-code/ai/provider-details";
 import { type Keybinding, Loader, Markdown, padding, Spacer, Text, visibleWidth } from "@gajae-code/tui";
 import { formatBytes, formatDuration, Snowflake, setProjectDir } from "@gajae-code/utils";
+import { canonicalEnvKey, projectEnvSnapshot } from "@gajae-code/utils/env-file";
 import { resolveAppendOnlyMode } from "../../append-only-mode";
 import { jobElapsedMs } from "../../async";
 import { reset as resetCapabilities } from "../../capability";
@@ -107,6 +108,40 @@ export function buildHelpMarkdown(keybindings: Pick<KeybindingsManager, "getAcce
 	].join("\n");
 }
 
+const GH_SHARE_DESTINATION_KEYS = ["GH_HOST", "GH_CONFIG_DIR"] as const;
+
+/**
+ * Project dotenv at import, before `/move` changes cwd. Those declarations are
+ * already in the process environment, and a later `setProjectDir` does not
+ * remove them.
+ */
+const ghShareProjectSnapshot = projectEnvSnapshot();
+
+/**
+ * Environment for the default `/share` `gh` children. A `GH_HOST` or
+ * `GH_CONFIG_DIR` that matches the project dotenv is omitted so the repository
+ * cannot retarget gist upload or point `gh` at a config directory it shipped.
+ * An operator value the project does not declare is kept.
+ */
+function ghShareChildEnv(env: NodeJS.ProcessEnv = process.env): NodeJS.ProcessEnv {
+	const child: NodeJS.ProcessEnv = { ...env };
+	for (const name of GH_SHARE_DESTINATION_KEYS) {
+		const raw = child[name];
+		if (typeof raw !== "string") continue;
+		const key = canonicalEnvKey(name);
+		const declared = ghShareProjectSnapshot.values[key];
+		if (declared === undefined) continue;
+		if (!(ghShareProjectSnapshot.dynamic.has(key) || declared === raw || declared === raw.trim())) continue;
+		delete child[name];
+		if (process.platform === "win32") {
+			for (const present of Object.keys(child)) {
+				if (canonicalEnvKey(present) === key) delete child[present];
+			}
+		}
+	}
+	return child;
+}
+
 export class CommandController {
 	constructor(private readonly ctx: InteractiveModeContext) {}
 
@@ -242,9 +277,10 @@ export class CommandController {
 			return;
 		}
 
+		const ghEnv = ghShareChildEnv();
 		try {
 			const authProcess = Bun.spawn(["gh", "auth", "status"], {
-				env: process.env,
+				env: ghEnv,
 				stdin: "ignore",
 				stdout: "ignore",
 				stderr: "ignore",
@@ -278,7 +314,7 @@ export class CommandController {
 		let cancellationRequested = false;
 		try {
 			const gistProcess = Bun.spawn(["gh", "gist", "create", "--public=false", tmpFile], {
-				env: process.env,
+				env: ghEnv,
 				stdin: "ignore",
 				stdout: "pipe",
 				stderr: "pipe",