@gajae-code/coding-agent 0.15.5 → 0.15.6

package/src/lsp/config.ts

@@ -1,7 +1,8 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { $which, isRecord, logger, pathIsWithin } from "@gajae-code/utils";
+import * as piUtils from "@gajae-code/utils";
+import { isRecord, logger, pathIsWithin } from "@gajae-code/utils";
 import { YAML } from "bun";
 import { getConfigDirPaths } from "../config";
 import { type ClaudePluginRoot, getPreloadedPluginRoots } from "../discovery/helpers";
@@ -332,13 +333,13 @@ export function resolveCommand(command: string, cwd: string): string | null {
 	}
 
 	// Fall back to $PATH
-	return $which(command);
+	return piUtils.$which(command);
 }
 
 /** Resolve an LSP executable without consulting project-controlled bin directories. */
 function resolveTrustedLspCommand(command: string, cwd: string): string | null {
 	if (!path.isAbsolute(command) && (command.includes("/") || command.includes("\\"))) return null;
-	const discovered = path.isAbsolute(command) ? command : $which(command);
+	const discovered = path.isAbsolute(command) ? command : piUtils.$which(command);
 	if (!discovered) return null;
 	if (isProjectControlledPath(discovered, cwd)) return null;
 	const canonical = canonicalExistingPath(discovered);

package/src/lsp/path-trust.ts

@@ -63,19 +63,25 @@ export function isProjectControlledPath(candidate: string, cwd: string): boolean
 	const home = os.homedir();
 	const stopPaths = new Set([path.resolve(home), canonicalPath(home)].map(normalizePathForComparison));
 	const lexicalTrustRoot = findProjectTrustRoot(cwd, stopPaths);
-	if (lexicalTrustRoot !== undefined && pathIsLexicallyWithin(lexicalTrustRoot, candidate)) return true;
+	const candidateIsHomeScoped = pathIsLexicallyWithin(home, candidate) || pathIsWithin(home, candidate);
+	if (
+		lexicalTrustRoot !== undefined &&
+		pathIsLexicallyWithin(lexicalTrustRoot, candidate) &&
+		(!candidateIsHomeScoped || pathIsLexicallyWithin(home, lexicalTrustRoot))
+	)
+		return true;
 
 	const canonicalTrustRoots = new Set<string>();
 	if (lexicalTrustRoot !== undefined) canonicalTrustRoots.add(canonicalPath(lexicalTrustRoot));
 	const canonicalTrustRoot = findProjectTrustRoot(canonicalPath(cwd), stopPaths);
-	if (canonicalTrustRoot !== undefined) canonicalTrustRoots.add(canonicalTrustRoot);
+	if (canonicalTrustRoot !== undefined) canonicalTrustRoots.add(canonicalPath(canonicalTrustRoot));
 	for (const trustRoot of canonicalTrustRoots) {
 		if (
-			pathIsLexicallyWithin(trustRoot, canonicalParentPath(candidate)) ||
-			pathIsWithin(trustRoot, canonicalPath(candidate))
-		) {
+			(pathIsLexicallyWithin(trustRoot, canonicalParentPath(candidate)) ||
+				pathIsWithin(trustRoot, canonicalPath(candidate))) &&
+			(!candidateIsHomeScoped || pathIsLexicallyWithin(home, trustRoot) || pathIsWithin(home, trustRoot))
+		)
 			return true;
-		}
 	}
 	return false;
 }

package/src/main.ts

@@ -349,7 +349,9 @@ export async function submitInteractiveInput(
 		| "checkShutdownRequested"
 		| "waitForAgentEnd"
 	>,
-	session: Pick<AgentSession, "prompt" | "promptCustomMessage">,
+	session: Pick<AgentSession, "prompt" | "promptCustomMessage"> & {
+		continuePersistedHistory?: AgentSession["continuePersistedHistory"];
+	},
 	input: SubmittedUserInput,
 ): Promise<void> {
 	if (input.cancelled) {
@@ -357,8 +359,13 @@ export async function submitInteractiveInput(
 	}
 
 	try {
+		if (input.started) {
+			if (!session.continuePersistedHistory) throw new Error("Session continuation is unavailable.");
+			await session.continuePersistedHistory();
+			return;
+		}
 		// Continue shortcuts submit an already-started empty prompt with no optimistic user message.
-		if (!input.started && !mode.markPendingSubmissionStarted(input)) {
+		if (!mode.markPendingSubmissionStarted(input)) {
 			return;
 		}
 		const agentEnd = mode.waitForAgentEnd();

package/src/modes/acp/acp-agent.ts

@@ -54,6 +54,7 @@ import type { AbortScope } from "../../sdk/host/control/operations";
 import { SYNTHETIC_PROVIDER_ID } from "../../sdk/model-profile-namespace";
 import type { SdkPromptTerminalOutcome } from "../../sdk/prompt-status";
 import { PromptActivity, type PromptWatchdogClock, systemPromptWatchdogClock } from "../../sdk/prompt-watchdog";
+import { validateRequiredPromptText } from "../../sdk/protocol/adapter-validation";
 import { type SessionAttachment, SessionRouter, type SessionRouterFrame } from "../../sdk/router";
 import { SessionListTraversalError, sessionListPageFromResponse, traverseSessionList } from "../../sdk/session-list";
 import { resolveAcpAbortScope } from "./abort-scope";
@@ -994,7 +995,6 @@ export function acpPromptPayload(blocks: PromptRequest["prompt"]): {
 				text.push(block.text);
 				break;
 			case "image":
-				if (block.uri) text.push(`[Image URI: ${block.uri}]`);
 				images.push({ data: block.data, mimeType: block.mimeType });
 				break;
 			case "resource_link":
@@ -1027,7 +1027,6 @@ export function acpPromptPayload(blocks: PromptRequest["prompt"]): {
 						"unsupported_content",
 						`Unsupported embedded resource MIME type: ${mimeType}`,
 					);
-				text.push(`[Resource: ${resource.uri}]\nMIME: ${mimeType}`);
 				images.push({ data: resource.blob, mimeType });
 				break;
 			}
@@ -1038,7 +1037,7 @@ export function acpPromptPayload(blocks: PromptRequest["prompt"]): {
 		}
 	}
 	if (text.length === 0 && images.length === 0)
-		throw new AcpSdkAdapterError("invalid_input", "ACP prompt must contain at least one supported content block.");
+		throw new AcpSdkAdapterError("invalid_input", "Prompt must not be empty.");
 	return { text: text.join("\n"), images };
 }
 
@@ -1576,10 +1575,17 @@ export class AcpAgent implements Agent {
 		if (!record) throw new AcpSdkAdapterError("not_found", `Unknown session, not found: ${params.sessionId}`);
 		if (record.activePrompt) throw new AcpSdkAdapterError("conflict", "ACP session already has an active prompt.");
 		if (record.authFailure) throw new AcpSdkAdapterError("authentication_failed", record.authFailure);
-		// A new turn starts uncancelled; a stale flag must never settle it as `cancelled`.
-		record.cancelRequested = false;
 		const payload = acpPromptPayload(params.prompt);
 		const skillInvocation = acpSkillInvocation(params.prompt);
+		if (!skillInvocation) {
+			const promptError = validateRequiredPromptText("turn.prompt", {
+				text: payload.text,
+				images: payload.images,
+			});
+			if (promptError) throw new AcpSdkAdapterError(promptError.code, promptError.message);
+		}
+		// A new turn starts uncancelled; a stale flag must never settle it as `cancelled`.
+		record.cancelRequested = false;
 		if (isAcpUnavailableSlashCommand(payload.text)) {
 			await this.#publishSessionUpdate(
 				params.sessionId,

package/src/modes/components/jobs-overlay-model.ts

@@ -6,20 +6,41 @@
  * SelectItem lists into nested SelectLists (list -> detail -> confirm).
  */
 import type { SelectItem } from "@gajae-code/tui";
+import { replaceTabs, shortenPath, TRUNCATE_LENGTHS, truncateToWidth } from "../../tools/render-utils";
 import type { JobsSnapshot } from "../jobs-observer";
+import { sanitizeStatusText } from "../shared";
 
-export type JobRefKind = "monitor" | "cron";
+export type JobRefKind = "monitor" | "cron" | "folded";
 
 export interface JobRef {
 	kind: JobRefKind;
 	id: string;
+	generation?: string;
 }
 
-const PROMPT_PREVIEW_MAX = 60;
+function encodeJobRefPart(value: string): string {
+	return encodeURIComponent(value);
+}
+
+function decodeJobRefPart(value: string): string | undefined {
+	try {
+		return decodeURIComponent(value);
+	} catch {
+		return undefined;
+	}
+}
+
+function displayText(text: string, max: number = TRUNCATE_LENGTHS.CONTENT): string {
+	const sanitized = shortenPath(replaceTabs(sanitizeStatusText(text)));
+	return truncateToWidth(sanitized, max);
+}
+
+function preview(text: string, max: number = TRUNCATE_LENGTHS.TITLE): string {
+	return displayText(text, max);
+}
 
-function preview(text: string, max = PROMPT_PREVIEW_MAX): string {
-	const oneLine = text.replace(/\s+/g, " ").trim();
-	return oneLine.length > max ? `${oneLine.slice(0, max - 1)}…` : oneLine;
+function snapshotJobKey(id: string, generation: string | undefined): string {
+	return `${id}\u0000${generation ?? ""}`;
 }
 
 /** Compact relative time, e.g. "in 5m", "2m ago", "now". */
@@ -42,30 +63,71 @@ export function parseJobRef(value: string): JobRef | null {
 	if ((kind === "monitor" || kind === "cron") && id.length > 0) {
 		return { kind, id };
 	}
+	if (kind === "folded") {
+		const generationSep = id.indexOf(":");
+		if (generationSep > 0 && generationSep < id.length - 1) {
+			const decodedId = decodeJobRefPart(id.slice(0, generationSep));
+			const generation = decodeJobRefPart(id.slice(generationSep + 1));
+			if (decodedId && generation) return { kind, id: decodedId, generation };
+		}
+	}
 	return null;
 }
 
 /**
  * Build the grouped jobs list: monitors first (newest-first), then crons
- * (newest-first). The snapshot arrays are already sorted newest-first.
+ * (newest-first), then read-only folded jobs. The snapshot arrays are already
+ * sorted newest-first where a source has a timestamp.
  */
 export function buildJobsListItems(snapshot: JobsSnapshot): SelectItem[] {
 	const items: SelectItem[] = [];
+	const foldedJobs = snapshot.foldedJobs ?? [];
+	const foldedKeys = new Set(foldedJobs.map(job => snapshotJobKey(job.id, job.generation)));
 	for (const monitor of snapshot.monitors) {
+		// A monitor can also be backgrounded; render it only in the folded section
+		// so a public job state has exactly one row.
+		if (monitor.backgrounded || foldedKeys.has(snapshotJobKey(monitor.id, monitor.generation))) continue;
 		items.push({
 			value: `monitor:${monitor.id}`,
-			label: `monitor · ${preview(monitor.label, 40)}`,
-			description: monitor.status,
-			hint: monitor.status === "failed" ? "failed" : undefined,
+			label: `monitor · ${preview(monitor.label, TRUNCATE_LENGTHS.SHORT)}`,
+			description: displayText(monitor.status, TRUNCATE_LENGTHS.SHORT),
+			hint: monitor.status === "failed" || monitor.deliveryState === "failed-visible" ? "failed" : undefined,
 		});
 	}
 	for (const cron of snapshot.crons) {
 		items.push({
 			value: `cron:${cron.id}`,
-			label: `cron · ${cron.humanSchedule}`,
+			label: `cron · ${preview(cron.humanSchedule, TRUNCATE_LENGTHS.SHORT)}`,
 			description: preview(cron.prompt),
 		});
 	}
+	for (const job of foldedJobs) {
+		const state = displayText(job.deliveryState, TRUNCATE_LENGTHS.SHORT);
+		const kind = preview(job.kind, TRUNCATE_LENGTHS.SHORT);
+		const deadLetter = (snapshot.deadLettered ?? []).find(
+			entry => snapshotJobKey(entry.jobId, entry.generation) === snapshotJobKey(job.id, job.generation),
+		);
+		const errorText = job.errorText ?? deadLetter?.lastError;
+		const description =
+			deadLetter || errorText
+				? displayText(
+						[
+							state,
+							deadLetter ? `attempt ${deadLetter.attempt}` : undefined,
+							errorText ? `error: ${errorText}` : undefined,
+						]
+							.filter((part): part is string => part !== undefined)
+							.join(" · "),
+						TRUNCATE_LENGTHS.CONTENT,
+					)
+				: state;
+		items.push({
+			value: `folded:${encodeJobRefPart(job.id)}:${encodeJobRefPart(job.generation)}`,
+			label: `${kind} · ${preview(job.label, TRUNCATE_LENGTHS.SHORT)}`,
+			description,
+			hint: job.status === "failed" || job.deliveryState === "failed-visible" ? "failed" : "read-only",
+		});
+	}
 	return items;
 }
 
@@ -80,21 +142,41 @@ export function buildJobDetailItems(snapshot: JobsSnapshot, ref: JobRef, output
 		if (!monitor) return [{ value: "back", label: "Back (job no longer present)" }];
 		const lastOutput = output.trim().split("\n").filter(Boolean).slice(-1)[0] ?? "(no output captured)";
 		return [
-			{ value: "noop", label: "Status", description: monitor.status },
+			{ value: "noop", label: "Status", description: displayText(monitor.status, TRUNCATE_LENGTHS.SHORT) },
 			{ value: "noop", label: "Label", description: preview(monitor.label) },
 			{ value: "noop", label: "Started", description: formatRelative(monitor.startTime) },
-			{ value: "noop", label: "Output", description: preview(lastOutput, 80) },
+			{ value: "noop", label: "Output", description: preview(lastOutput, TRUNCATE_LENGTHS.CONTENT) },
 			{ value: "action:cancel", label: "Cancel this monitor", hint: "stops the running job" },
 			{ value: "back", label: "Back" },
 		];
 	}
+	if (ref.kind === "folded") {
+		const job = snapshot.foldedJobs?.find(
+			entry => entry.id === ref.id && (ref.generation === undefined || entry.generation === ref.generation),
+		);
+		if (!job) return [{ value: "back", label: "Back (job no longer present)" }];
+		return [
+			{ value: "noop", label: "Status", description: displayText(job.status, TRUNCATE_LENGTHS.SHORT) },
+			{ value: "noop", label: "Kind", description: preview(job.kind, TRUNCATE_LENGTHS.SHORT) },
+			{ value: "noop", label: "Label", description: preview(job.label) },
+			{ value: "noop", label: "Generation", description: preview(job.generation, TRUNCATE_LENGTHS.CONTENT) },
+			...(job.errorText
+				? [{ value: "noop", label: "Error", description: preview(job.errorText, TRUNCATE_LENGTHS.CONTENT) }]
+				: []),
+			{ value: "back", label: "Back" },
+		];
+	}
 	const cron = snapshot.crons.find(c => c.id === ref.id);
 	if (!cron) return [{ value: "back", label: "Back (job no longer present)" }];
 	return [
-		{ value: "noop", label: "Schedule", description: `${cron.humanSchedule} (${cron.cronExpression})` },
+		{
+			value: "noop",
+			label: "Schedule",
+			description: `${preview(cron.humanSchedule, TRUNCATE_LENGTHS.SHORT)} (${preview(cron.cronExpression, TRUNCATE_LENGTHS.SHORT)})`,
+		},
 		{ value: "noop", label: "Recurring", description: cron.recurring ? "yes" : "no" },
 		{ value: "noop", label: "Next fire", description: formatRelative(cron.nextFireAt) },
-		{ value: "noop", label: "Prompt", description: preview(cron.prompt, 80) },
+		{ value: "noop", label: "Prompt", description: preview(cron.prompt, TRUNCATE_LENGTHS.CONTENT) },
 		{ value: "action:delete", label: "Delete this cron", hint: "removes the schedule" },
 		{ value: "back", label: "Back" },
 	];
@@ -102,8 +184,9 @@ export function buildJobDetailItems(snapshot: JobsSnapshot, ref: JobRef, output
 
 /** Yes/No confirm items for a destructive action. */
 export function buildConfirmItems(actionLabel: string): SelectItem[] {
+	const safeActionLabel = displayText(actionLabel, TRUNCATE_LENGTHS.TITLE);
 	return [
-		{ value: "no", label: `No, keep it` },
-		{ value: "yes", label: `Yes, ${actionLabel}` },
+		{ value: "no", label: "No, keep it" },
+		{ value: "yes", label: `Yes, ${safeActionLabel}` },
 	];
 }

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

@@ -22,9 +22,18 @@ import {
 	normalizeTierMap,
 	validateAutoroutingSetup,
 } from "../../config/autorouting-contract";
+import {
+	getProxyRoutableProviders,
+	inspectProxyProviderId,
+	requiresQualifiedModelProfileRoleResolution,
+	resolveProxyMode,
+	rewriteSelectorForProxy,
+	tryResolveProxyProviderId,
+} from "../../config/model-profile-activation";
 
 import { isModelProfileProviderAvailable } from "../../config/model-profile-contract";
 import {
+	deriveModelProfileMappedProviders,
 	getModelProfilePresentation,
 	groupModelProfilesForPresetLanding,
 	type ModelProfileDefinition,
@@ -399,6 +408,7 @@ export class ModelSelectorComponent extends Container {
 	#closeAfterAssignment = false;
 	#unsubscribeCatalogChanged: () => void = () => {};
 	#unsubscribeProviderOrderChanged: () => void = () => {};
+	#unsubscribeAuthGeneration: () => void = () => {};
 	#disposed = false;
 	/** Standalone smart-routing entry: cancel closes the selector instead of falling back to the preset landing. */
 	#smartRoutingOnly = false;
@@ -413,6 +423,7 @@ export class ModelSelectorComponent extends Container {
 	#providerAuthById = new Map<string, boolean>();
 	#bareProfileAuthByName = new Map<string, boolean>();
 	#providerAuthPending: boolean = false;
+	#providerAuthRefreshGeneration = 0;
 	#presetLoginHint?: string;
 	#authSessionId?: string;
 	#imageRoleFilter: boolean = false;
@@ -524,6 +535,14 @@ export class ModelSelectorComponent extends Container {
 		if (typeof this.#modelRegistry.onCatalogChanged === "function") {
 			this.#unsubscribeCatalogChanged = this.#modelRegistry.onCatalogChanged(() => {
 				if (this.#disposed) return;
+				if (this.#viewMode === "presets") {
+					this.#refreshCatalogView();
+					this.#clampPresetCursor();
+					void this.#refreshProviderAuth();
+					this.#renderPresetLanding();
+					this.#tui.requestRender();
+					return;
+				}
 				if (this.#refreshCatalogView()) this.#tui.requestRender();
 			});
 		}
@@ -538,6 +557,11 @@ export class ModelSelectorComponent extends Container {
 			panel.updateProviderOrderHint(this.#providerOrderHintFor(panel.getProviderOrder()));
 			this.#tui.requestRender();
 		});
+		this.#unsubscribeAuthGeneration =
+			this.#modelRegistry.authStorage?.onGenerationChanged?.(() => {
+				if (this.#disposed || this.#viewMode !== "presets") return;
+				void this.#refreshProviderAuth();
+			}) ?? (() => {});
 
 		// Load models and do initial render
 		this.#loadModels().then(() => {
@@ -572,8 +596,10 @@ export class ModelSelectorComponent extends Container {
 	override dispose(): void {
 		if (this.#disposed) return;
 		this.#disposed = true;
+		this.#providerAuthRefreshGeneration++;
 		this.#unsubscribeCatalogChanged();
 		this.#unsubscribeProviderOrderChanged();
+		this.#unsubscribeAuthGeneration();
 		super.dispose();
 	}
 
@@ -1301,13 +1327,61 @@ export class ModelSelectorComponent extends Container {
 		return this.#providerAuthById.get(providerId);
 	}
 
+	#getProfileAvailableModels(): Model[] {
+		const getAvailableForProfileActivation = this.#modelRegistry.getAvailableForProfileActivation;
+		return typeof getAvailableForProfileActivation === "function"
+			? getAvailableForProfileActivation.call(this.#modelRegistry)
+			: this.#modelRegistry.getAvailable();
+	}
+
+	#createProfileResolutionRegistry(availableModels: readonly Model[]) {
+		return {
+			getAvailable: () => availableModels as Model[],
+			getApiKey: this.#modelRegistry.getApiKey?.bind(this.#modelRegistry) ?? (async () => undefined),
+			resolveCanonicalModel: this.#modelRegistry.resolveCanonicalModel?.bind(this.#modelRegistry),
+			getCanonicalVariants: this.#modelRegistry.getCanonicalVariants?.bind(this.#modelRegistry),
+			getCanonicalId: this.#modelRegistry.getCanonicalId?.bind(this.#modelRegistry),
+			resolveModelByLookupAlias: this.#modelRegistry.resolveModelByLookupAlias?.bind(this.#modelRegistry),
+			lookupAliasExists: this.#modelRegistry.lookupAliasExists?.bind(this.#modelRegistry),
+			clearCanonicalVariant: this.#modelRegistry.clearCanonicalVariant?.bind(this.#modelRegistry),
+		};
+	}
+
+	#getProfileAuthenticatedProviders(profile: ModelProfileDefinition): Set<string> {
+		if (profile.source !== "user" && inspectProxyProviderId(this.#settings).status === "invalid") return new Set();
+		const authenticated = new Set(
+			[...this.#providerAuthById]
+				.filter(([, providerAuthenticated]) => providerAuthenticated)
+				.map(([provider]) => provider),
+		);
+		const proxyProvider = profile.source === "user" ? undefined : tryResolveProxyProviderId(this.#settings);
+		if (proxyProvider !== undefined && this.#isProviderAuthenticated(proxyProvider) === true) {
+			for (const provider of getProxyRoutableProviders(profile)) authenticated.add(provider);
+		}
+		return authenticated;
+	}
+
+	#rewriteProfileSelectorForProxy(profile: ModelProfileDefinition, selector: string): string {
+		if (profile.source === "user") return selector;
+		const proxyProvider = tryResolveProxyProviderId(this.#settings);
+		if (proxyProvider === undefined || this.#isProviderAuthenticated(proxyProvider) !== true) return selector;
+		return rewriteSelectorForProxy(
+			selector,
+			proxyProvider,
+			resolveProxyMode(this.#settings),
+			this.#getProfileAvailableModels(),
+			new Set(
+				[...this.#providerAuthById].filter(([, authenticated]) => authenticated).map(([provider]) => provider),
+			),
+			getProxyRoutableProviders(profile),
+		);
+	}
+
 	#getMissingProviders(profileOrProfiles: ModelProfileDefinition | ModelProfileDefinition[]): string[] {
 		const profiles = Array.isArray(profileOrProfiles) ? profileOrProfiles : [profileOrProfiles];
 		const missing = new Set<string>();
 		for (const profile of profiles) {
-			const authenticated = new Set(
-				profileRequiredProviders(profile).filter(provider => this.#isProviderAuthenticated(provider) === true),
-			);
+			const authenticated = this.#getProfileAuthenticatedProviders(profile);
 			if (isModelProfileProviderAvailable(profile, authenticated)) continue;
 			const alternativeGroups = profile.alternativeProviderGroups ?? [];
 			const alternativeProviders = new Set(alternativeGroups.flat());
@@ -1325,18 +1399,52 @@ export class ModelSelectorComponent extends Container {
 	#isPresetAuthenticated(profileOrProfiles: ModelProfileDefinition | ModelProfileDefinition[]): boolean {
 		const profiles = Array.isArray(profileOrProfiles) ? profileOrProfiles : [profileOrProfiles];
 		return profiles.every(profile => {
+			if (profile.source !== "user") {
+				if (inspectProxyProviderId(this.#settings).status === "invalid") return false;
+				const proxyProvider = tryResolveProxyProviderId(this.#settings);
+				if (
+					proxyProvider !== undefined &&
+					!(this.#modelRegistry.getConfiguredProviderIds?.() ?? []).includes(proxyProvider)
+				)
+					return false;
+				try {
+					if (resolveProxyMode(this.#settings) === "always") {
+						const configuredProviders = this.#modelRegistry.getConfiguredProviderIds?.() ?? [];
+						if (
+							proxyProvider === undefined ||
+							this.#isProviderAuthenticated(proxyProvider) !== true ||
+							!configuredProviders.includes(proxyProvider)
+						)
+							return false;
+					}
+				} catch {
+					return false;
+				}
+			}
 			if (this.#getMissingProviders(profile).length > 0) return false;
 			const bindings = resolveProfileBindings(profile);
-			const values = [
-				...(bindings.defaultSelector ? [bindings.defaultSelector] : []),
-				...Object.values(bindings.modelRoles),
-				...Object.values(bindings.agentModelOverrides),
+			const assignments = [
+				...(bindings.defaultSelector !== undefined ? [{ value: bindings.defaultSelector, isDefault: true }] : []),
+				...Object.values(bindings.modelRoles).map(value => ({ value, isDefault: false })),
+				...Object.values(bindings.agentModelOverrides).map(value => ({ value, isDefault: false })),
 			];
 			const bareAssignmentsAvailable = this.#bareProfileAuthByName.get(profile.name) ?? true;
-			return values.every(value =>
-				normalizeModelSelectorValue(value).some(selector => {
+			const availableModels = this.#getProfileAvailableModels();
+			return assignments.every(assignment => {
+				let selectors: string[];
+				try {
+					selectors = normalizeModelSelectorValue(assignment.value).map(selector =>
+						this.#rewriteProfileSelectorForProxy(profile, selector),
+					);
+				} catch {
+					return false;
+				}
+				const hasBareSelector = selectors.some(selector => !selector.includes("/"));
+				if (!assignment.isDefault && !requiresQualifiedModelProfileRoleResolution(profile) && !hasBareSelector)
+					return true;
+				return selectors.some(selector => {
 					if (!selector.includes("/")) return bareAssignmentsAvailable;
-					const resolved = resolveModelRoleValue(selector, this.#modelRegistry.getAvailable(), {
+					const resolved = resolveModelRoleValue(selector, availableModels, {
 						settings: this.#settings,
 						modelRegistry: this.#modelRegistry,
 						aliasIntent: "preset-equivalent",
@@ -1357,7 +1465,7 @@ export class ModelSelectorComponent extends Container {
 							return (
 								resolveModelRoleValue(
 									replacementSelector,
-									this.#modelRegistry.getAvailable().filter(model => model.provider === provider),
+									availableModels.filter(model => model.provider === provider),
 									{
 										settings: this.#settings,
 										modelRegistry: this.#modelRegistry,
@@ -1368,8 +1476,8 @@ export class ModelSelectorComponent extends Container {
 							);
 						}) ?? false
 					);
-				}),
-			);
+				});
+			});
 		});
 	}
 
@@ -1383,10 +1491,23 @@ export class ModelSelectorComponent extends Container {
 	}
 
 	async #refreshProviderAuth(): Promise<void> {
+		const refreshGeneration = ++this.#providerAuthRefreshGeneration;
+		this.#providerAuthById = new Map();
+		this.#bareProfileAuthByName = new Map();
+		const availableModels = this.#getProfileAvailableModels();
+		const resolutionRegistry = this.#createProfileResolutionRegistry(availableModels);
 		const providers = new Set<string>();
 		for (const profiles of this.#getPresetGroups().values()) {
 			for (const profile of profiles) {
 				for (const provider of profileRequiredProviders(profile)) providers.add(provider);
+				for (const group of profile.alternativeProviderGroups ?? []) {
+					for (const provider of group) providers.add(provider);
+				}
+				for (const provider of deriveModelProfileMappedProviders(profile)) providers.add(provider);
+				if (profile.source !== "user") {
+					const proxyProvider = tryResolveProxyProviderId(this.#settings);
+					if (proxyProvider !== undefined) providers.add(proxyProvider);
+				}
 				const bindings = resolveProfileBindings(profile);
 				const values = [
 					...(bindings.defaultSelector ? [bindings.defaultSelector] : []),
@@ -1395,7 +1516,7 @@ export class ModelSelectorComponent extends Container {
 				];
 				for (const value of values) {
 					for (const selector of normalizeModelSelectorValue(value)) {
-						const resolved = resolveModelRoleValue(selector, this.#modelRegistry.getAvailable(), {
+						const resolved = resolveModelRoleValue(selector, availableModels, {
 							settings: this.#settings,
 							modelRegistry: this.#modelRegistry,
 							aliasIntent: "preset-equivalent",
@@ -1419,6 +1540,12 @@ export class ModelSelectorComponent extends Container {
 					}
 				}),
 			);
+			if (
+				this.#disposed ||
+				this.#viewMode !== "presets" ||
+				refreshGeneration !== this.#providerAuthRefreshGeneration
+			)
+				return;
 			this.#providerAuthById = new Map(entries);
 			const profileAuthEntries = await Promise.all(
 				[...this.#getPresetGroups().values()].flat().map(async profile => {
@@ -1436,7 +1563,7 @@ export class ModelSelectorComponent extends Container {
 							try {
 								const resolution = await resolveModelChainWithAuth(
 									normalizeModelSelectorValue(value),
-									this.#modelRegistry,
+									resolutionRegistry,
 									this.#settings,
 									this.#authSessionId,
 									{
@@ -1455,11 +1582,23 @@ export class ModelSelectorComponent extends Container {
 					return [profile.name, available.every(Boolean)] as const;
 				}),
 			);
+			if (
+				this.#disposed ||
+				this.#viewMode !== "presets" ||
+				refreshGeneration !== this.#providerAuthRefreshGeneration
+			)
+				return;
 			this.#bareProfileAuthByName = new Map(profileAuthEntries);
 		} finally {
-			this.#providerAuthPending = false;
-			this.#renderPresetLanding();
-			this.#tui.requestRender();
+			if (
+				!this.#disposed &&
+				this.#viewMode === "presets" &&
+				refreshGeneration === this.#providerAuthRefreshGeneration
+			) {
+				this.#providerAuthPending = false;
+				this.#renderPresetLanding();
+				this.#tui.requestRender();
+			}
 		}
 	}
 
@@ -1676,6 +1815,7 @@ export class ModelSelectorComponent extends Container {
 		this.#smartRoutingPanel = undefined;
 		this.#viewMode = "presets";
 		this.#presetCursor = Math.min(this.#presetCursor, Math.max(0, this.#getPresetRows().length - 1));
+		void this.#refreshProviderAuth();
 		this.#renderPresetLanding();
 		this.#tui.requestRender();
 	}

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

@@ -307,7 +307,9 @@ const jobsSegment: StatusLineSegment = {
 	id: "jobs",
 	render(ctx) {
 		const { jobs } = ctx;
-		const visible = jobs.activeMonitorCount > 0 || jobs.activeCronCount > 0 || jobs.worstState === "failed";
+		const foldedJobCount = jobs.foldedJobs?.filter(job => job.backgrounded).length ?? 0;
+		const visible =
+			jobs.activeMonitorCount > 0 || jobs.activeCronCount > 0 || foldedJobCount > 0 || jobs.worstState === "failed";
 		if (!visible) {
 			return { content: "", visible: false };
 		}
@@ -318,6 +320,9 @@ const jobsSegment: StatusLineSegment = {
 		if (jobs.activeCronCount > 0) {
 			parts.push(withIcon(theme.icon.time, `${jobs.activeCronCount}`));
 		}
+		if (foldedJobCount > 0) {
+			parts.push(withIcon(theme.icon.pause || theme.icon.agents, `${foldedJobCount} folded`));
+		}
 		if (parts.length === 0) {
 			// Nothing active but a failure is unacknowledged — keep a drill-in marker.
 			parts.push(withIcon(theme.icon.warning, "jobs"));

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

@@ -312,7 +312,7 @@ export class ExtensionUiController {
 				session.retryNow();
 				return { retried: true, immediate: true };
 			case "bash.background":
-				if (!session.requestForegroundBashBackground())
+				if (!(await session.requestForegroundBashBackground()))
 					throw Object.assign(new Error("The active bash command cannot be moved to a managed background job."), {
 						code: "not_foldable",
 					});