@gajae-code/coding-agent 0.3.1 → 0.3.2

package/src/main.ts

@@ -26,6 +26,7 @@ import { buildInitialMessage } from "./cli/initial-message";
 import { runListModelsCommand } from "./cli/list-models";
 import { selectSession } from "./cli/session-picker";
 import { findConfigFile } from "./config";
+import { activateModelProfile } from "./config/model-profile-activation";
 import { ModelRegistry, ModelsConfigFile } from "./config/model-registry";
 import { resolveCliModel, resolveModelRoleValue, resolveModelScope, type ScopedModel } from "./config/model-resolver";
 import { getDefault, type SettingPath, Settings, settings } from "./config/settings";
@@ -194,11 +195,59 @@ export interface AcpSessionFactoryOptions {
 	sessionDir?: string;
 	authStorage: AuthStorage;
 	modelRegistry: ModelRegistry;
-	parsedArgs: Pick<Args, "apiKey">;
+	parsedArgs: Pick<Args, "apiKey" | "default" | "model" | "mpreset" | "thinking">;
 	rawArgs: string[];
 	createSession: (options: CreateAgentSessionOptions) => Promise<CreateAgentSessionResult>;
 }
 
+export async function applyStartupModelProfiles(args: {
+	session: AgentSession;
+	settings: Settings;
+	modelRegistry: ModelRegistry;
+	parsedArgs: Pick<Args, "default" | "model" | "mpreset" | "thinking">;
+	startupModel?: CreateAgentSessionOptions["model"];
+	startupThinkingLevel?: CreateAgentSessionOptions["thinkingLevel"];
+}): Promise<void> {
+	const applyProfile = async (profileName: string, persistDefault: boolean): Promise<void> => {
+		await activateModelProfile(
+			{ session: args.session, modelRegistry: args.modelRegistry, settings: args.settings, profileName },
+			{ persistDefault },
+		);
+	};
+
+	// Capture the explicitly-selected startup model BEFORE profile activation can
+	// override it. startupModel covers the eager path; session.model covers the
+	// deferred `--model <pattern>` path resolved inside createAgentSession.
+	const explicitModel = args.parsedArgs.model ? (args.startupModel ?? args.session.model) : undefined;
+
+	const defaultProfile = args.settings.get("modelProfile.default");
+	if (defaultProfile) {
+		await applyProfile(defaultProfile, false);
+	}
+	if (args.parsedArgs.mpreset) {
+		await applyProfile(args.parsedArgs.mpreset, args.parsedArgs.default === true);
+	}
+
+	// Explicit CLI --model/--thinking must win over any activated profile.
+	if (explicitModel) {
+		await args.session.setModelTemporary(explicitModel, args.startupThinkingLevel ?? args.parsedArgs.thinking);
+	} else if (args.parsedArgs.thinking && args.session.model) {
+		await args.session.setModelTemporary(args.session.model, args.parsedArgs.thinking);
+	}
+}
+
+export async function applyStartupModelProfilesOrExit(
+	args: Parameters<typeof applyStartupModelProfiles>[0],
+): Promise<void> {
+	try {
+		await applyStartupModelProfiles(args);
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		process.stderr.write(`${chalk.red(`Error: ${message}`)}\n`);
+		process.exit(1);
+	}
+}
+
 /**
  * Build the per-`session/new` factory used by ACP mode.
  *
@@ -225,6 +274,14 @@ export function createAcpSessionFactory(args: AcpSessionFactoryOptions): AcpSess
 			hasUI: false,
 			enableMCP: false,
 		});
+		await applyStartupModelProfilesOrExit({
+			session: nextSession,
+			settings: nextSettings,
+			modelRegistry: args.modelRegistry,
+			parsedArgs: args.parsedArgs,
+			startupModel: args.baseOptions.model,
+			startupThinkingLevel: args.baseOptions.thinkingLevel,
+		});
 		if (args.parsedArgs.apiKey && !args.baseOptions.model && nextSession.model) {
 			args.authStorage.setRuntimeApiKey(nextSession.model.provider, args.parsedArgs.apiKey);
 		}
@@ -878,6 +935,15 @@ export async function runRootCommand(
 			authStorage.setRuntimeApiKey(session.model.provider, parsedArgs.apiKey);
 		}
 
+		await applyStartupModelProfilesOrExit({
+			session,
+			settings: settingsInstance,
+			modelRegistry,
+			parsedArgs,
+			startupModel: sessionOptions.model,
+			startupThinkingLevel: sessionOptions.thinkingLevel,
+		});
+
 		if (modelFallbackMessage) {
 			notifs.push({ kind: "warn", message: modelFallbackMessage });
 		}

package/src/modes/components/custom-provider-wizard.ts

@@ -0,0 +1,318 @@
+import { Container, Input, matchesKey, Spacer, Text, TruncatedText } from "@gajae-code/tui";
+import type { ProviderCompatibility, ProviderSetupInput } from "../../setup/provider-onboarding";
+import { theme } from "../theme/theme";
+import { matchesAppInterrupt } from "../utils/keybinding-matchers";
+import { DynamicBorder } from "./dynamic-border";
+
+export type CustomProviderCredentialSource = "env" | "literal";
+
+type WizardStep =
+	| "compatibility"
+	| "provider-id"
+	| "base-url"
+	| "credential-source"
+	| "credential"
+	| "models"
+	| "confirm"
+	| "force-confirm";
+
+interface WizardState {
+	compatibility: ProviderCompatibility;
+	providerId: string;
+	baseUrl: string;
+	credentialSource: CustomProviderCredentialSource;
+	credential: string;
+	models: string;
+}
+
+export type CustomProviderWizardSubmit = ProviderSetupInput;
+
+export class CustomProviderWizardComponent extends Container {
+	#contentContainer: Container;
+	#input: Input | null = null;
+	#step: WizardStep = "compatibility";
+	#selectedIndex = 0;
+	#lastSubmitError: string | null = null;
+	#state: WizardState = {
+		compatibility: "openai",
+		providerId: "",
+		baseUrl: "",
+		credentialSource: "env",
+		credential: "",
+		models: "",
+	};
+	#onSubmit: (input: CustomProviderWizardSubmit) => void;
+	#onCancel: () => void;
+	#onRender: () => void;
+
+	constructor(
+		onSubmit: (input: CustomProviderWizardSubmit) => void,
+		onCancel: () => void,
+		onRender: () => void = () => {},
+	) {
+		super();
+		this.#onSubmit = onSubmit;
+		this.#onCancel = onCancel;
+		this.#onRender = onRender;
+
+		this.addChild(new DynamicBorder());
+		this.addChild(new Spacer(1));
+		this.addChild(new TruncatedText(theme.bold("Add custom provider")));
+		this.addChild(
+			new TruncatedText(theme.fg("muted", "  Configure an OpenAI- or Anthropic-compatible API provider."), 0, 0),
+		);
+		this.addChild(new Spacer(1));
+		this.#contentContainer = new Container();
+		this.addChild(this.#contentContainer);
+		this.addChild(new Spacer(1));
+		this.addChild(new DynamicBorder());
+		this.#renderStep();
+	}
+
+	setSubmitError(error: string): void {
+		this.#lastSubmitError = error;
+		if (error.includes("already exists")) {
+			this.#step = "force-confirm";
+			this.#selectedIndex = 1;
+		}
+		this.#renderStep();
+		this.#onRender();
+	}
+
+	handleInput(keyData: string): void {
+		if (matchesAppInterrupt(keyData)) {
+			if (this.#step === "compatibility") {
+				this.#onCancel();
+				return;
+			}
+			this.#goBack();
+			return;
+		}
+
+		if (this.#input) {
+			if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
+				this.#saveInputAndProceed();
+				return;
+			}
+			this.#input.handleInput(keyData);
+			return;
+		}
+
+		if (matchesKey(keyData, "up")) {
+			this.#moveSelection(-1);
+			return;
+		}
+		if (matchesKey(keyData, "down")) {
+			this.#moveSelection(1);
+			return;
+		}
+		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
+			this.#selectCurrentOption();
+		}
+	}
+
+	#renderStep(): void {
+		this.#contentContainer.clear();
+		this.#input = null;
+		switch (this.#step) {
+			case "compatibility":
+				this.#renderCompatibilityStep();
+				break;
+			case "provider-id":
+				this.#renderInputStep(
+					"Step 2: Provider id",
+					"Enter a provider id:",
+					this.#state.providerId,
+					"e.g. my-openai-proxy",
+				);
+				break;
+			case "base-url":
+				this.#renderInputStep(
+					"Step 3: Base URL",
+					"Enter the API base URL:",
+					this.#state.baseUrl,
+					"e.g. https://api.example.com/v1",
+				);
+				break;
+			case "credential-source":
+				this.#renderCredentialSourceStep();
+				break;
+			case "credential":
+				this.#renderInputStep(
+					"Step 5: Credential",
+					this.#state.credentialSource === "env"
+						? "Enter the API key environment variable name:"
+						: "Paste the API key:",
+					this.#state.credential,
+					this.#state.credentialSource === "env"
+						? "e.g. OPENAI_API_KEY"
+						: "The key will be stored in models.yml and redacted in output.",
+				);
+				break;
+			case "models":
+				this.#renderInputStep(
+					"Step 6: Model id(s)",
+					"Enter model ids, comma-separated:",
+					this.#state.models,
+					"e.g. gpt-5, claude-sonnet-4-5",
+				);
+				break;
+			case "confirm":
+				this.#renderConfirmStep(false);
+				break;
+			case "force-confirm":
+				this.#renderConfirmStep(true);
+				break;
+		}
+	}
+
+	#renderCompatibilityStep(): void {
+		this.#contentContainer.addChild(new Text(theme.fg("accent", "Step 1: Compatibility")));
+		this.#contentContainer.addChild(new Spacer(1));
+		const options: Array<{ value: ProviderCompatibility; label: string }> = [
+			{ value: "openai", label: "OpenAI-compatible" },
+			{ value: "anthropic", label: "Anthropic-compatible" },
+		];
+		for (let i = 0; i < options.length; i++) this.#addOption(i, options[i]?.label ?? "");
+		this.#addHelp("[↑↓ to navigate, Enter to select, Esc to cancel]");
+	}
+
+	#renderCredentialSourceStep(): void {
+		this.#contentContainer.addChild(new Text(theme.fg("accent", "Step 4: Credential source")));
+		this.#contentContainer.addChild(new Spacer(1));
+		this.#addOption(0, "Environment variable");
+		this.#addOption(1, "Paste API key");
+		this.#addHelp("[↑↓ to navigate, Enter to select, Esc to go back]");
+	}
+
+	#renderInputStep(title: string, prompt: string, value: string, hint: string): void {
+		this.#contentContainer.addChild(new Text(theme.fg("accent", title)));
+		this.#contentContainer.addChild(new Spacer(1));
+		this.#contentContainer.addChild(new Text(prompt, 0, 0));
+		this.#contentContainer.addChild(new Spacer(1));
+		this.#input = new Input();
+		this.#input.setValue(value);
+		this.#contentContainer.addChild(this.#input);
+		this.#contentContainer.addChild(new Spacer(1));
+		this.#addHelp(hint);
+		this.#addHelp("[Enter to continue, Esc to go back]");
+	}
+
+	#renderConfirmStep(force: boolean): void {
+		this.#contentContainer.addChild(
+			new Text(theme.fg("accent", force ? "Provider exists — replace it?" : "Confirm custom provider")),
+		);
+		this.#contentContainer.addChild(new Spacer(1));
+		if (this.#lastSubmitError) {
+			this.#contentContainer.addChild(new Text(theme.fg(force ? "warning" : "error", this.#lastSubmitError), 0, 0));
+			this.#contentContainer.addChild(new Spacer(1));
+		}
+		this.#contentContainer.addChild(new Text(`Compatibility: ${this.#state.compatibility}`, 0, 0));
+		this.#contentContainer.addChild(new Text(`Provider: ${this.#state.providerId}`, 0, 0));
+		this.#contentContainer.addChild(new Text(`Base URL: ${this.#state.baseUrl}`, 0, 0));
+		this.#contentContainer.addChild(
+			new Text(
+				`Credential: ${this.#state.credentialSource === "env" ? this.#state.credential : "pasted API key"}`,
+				0,
+				0,
+			),
+		);
+		this.#contentContainer.addChild(new Text(`Models: ${this.#state.models}`, 0, 0));
+		this.#contentContainer.addChild(new Spacer(1));
+		this.#addOption(0, force ? "Replace existing provider" : "Add provider");
+		this.#addOption(1, "Go back");
+		this.#addHelp("[↑↓ to navigate, Enter to select, Esc to go back]");
+	}
+
+	#addOption(index: number, label: string): void {
+		const selected = index === this.#selectedIndex;
+		const prefix = selected ? theme.fg("accent", `${theme.nav.cursor} `) : "  ";
+		this.#contentContainer.addChild(new Text(`${prefix}${selected ? theme.fg("accent", label) : label}`, 0, 0));
+	}
+
+	#addHelp(text: string): void {
+		this.#contentContainer.addChild(new Text(theme.fg("muted", text), 0, 0));
+	}
+
+	#saveInputAndProceed(): void {
+		const value = this.#input?.getValue().trim() ?? "";
+		if (!value) return;
+		if (this.#step === "provider-id") {
+			this.#state.providerId = value;
+			this.#step = "base-url";
+		} else if (this.#step === "base-url") {
+			this.#state.baseUrl = value;
+			this.#step = "credential-source";
+			this.#selectedIndex = 0;
+		} else if (this.#step === "credential") {
+			this.#state.credential = value;
+			this.#step = "models";
+		} else if (this.#step === "models") {
+			this.#state.models = value;
+			this.#step = "confirm";
+			this.#selectedIndex = 0;
+			this.#lastSubmitError = null;
+		}
+		this.#renderStep();
+		this.#onRender();
+	}
+
+	#selectCurrentOption(): void {
+		if (this.#step === "compatibility") {
+			this.#state.compatibility = this.#selectedIndex === 0 ? "openai" : "anthropic";
+			this.#step = "provider-id";
+		} else if (this.#step === "credential-source") {
+			this.#state.credentialSource = this.#selectedIndex === 0 ? "env" : "literal";
+			this.#state.credential = "";
+			this.#step = "credential";
+		} else if (this.#step === "confirm" || this.#step === "force-confirm") {
+			if (this.#selectedIndex === 0) {
+				this.#onSubmit(this.#buildInput(this.#step === "force-confirm"));
+				return;
+			}
+			this.#step = "models";
+		}
+		this.#renderStep();
+		this.#onRender();
+	}
+
+	#buildInput(force: boolean): CustomProviderWizardSubmit {
+		return {
+			compatibility: this.#state.compatibility,
+			providerId: this.#state.providerId,
+			baseUrl: this.#state.baseUrl,
+			apiKeyEnv: this.#state.credentialSource === "env" ? this.#state.credential : undefined,
+			apiKey: this.#state.credentialSource === "literal" ? this.#state.credential : undefined,
+			models: this.#state.models
+				.split(",")
+				.map(model => model.trim())
+				.filter(Boolean),
+			force,
+		};
+	}
+
+	#moveSelection(delta: number): void {
+		const maxIndex =
+			this.#step === "confirm" ||
+			this.#step === "force-confirm" ||
+			this.#step === "compatibility" ||
+			this.#step === "credential-source"
+				? 1
+				: 0;
+		this.#selectedIndex = (this.#selectedIndex + delta + maxIndex + 1) % (maxIndex + 1);
+		this.#renderStep();
+		this.#onRender();
+	}
+
+	#goBack(): void {
+		if (this.#step === "provider-id") this.#step = "compatibility";
+		else if (this.#step === "base-url") this.#step = "provider-id";
+		else if (this.#step === "credential-source") this.#step = "base-url";
+		else if (this.#step === "credential") this.#step = "credential-source";
+		else if (this.#step === "models") this.#step = "credential";
+		else if (this.#step === "confirm" || this.#step === "force-confirm") this.#step = "models";
+		this.#selectedIndex = 0;
+		this.#renderStep();
+		this.#onRender();
+	}
+}

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

@@ -12,6 +12,7 @@ import {
 	Text,
 	type TUI,
 } from "@gajae-code/tui";
+import type { ModelProfileDefinition } from "../../config/model-profiles";
 import type { GjcModelAssignmentTargetId, ModelRegistry } from "../../config/model-registry";
 import { GJC_MODEL_ASSIGNMENT_TARGET_IDS, GJC_MODEL_ASSIGNMENT_TARGETS } from "../../config/model-registry";
 import {
@@ -74,6 +75,12 @@ interface CanonicalModelItem {
 	explicitThinkingLevel?: boolean;
 }
 
+interface ProfileItem {
+	kind: "profile";
+	name: string;
+	profile: ModelProfileDefinition;
+}
+
 type ScopedModelItem = ScopedModelSelection;
 
 interface RoleAssignment {
@@ -102,6 +109,11 @@ export type ModelSelectorSelection =
 			selector: string;
 			preset: ModelAssignmentPreset;
 			assignments: Record<GjcModelAssignmentTargetId, ThinkingLevel>;
+	  }
+	| {
+			kind: "profile";
+			profileName: string;
+			setDefault: boolean;
 	  };
 
 interface PendingThinkingChoice {
@@ -110,7 +122,7 @@ interface PendingThinkingChoice {
 	levels: ThinkingLevel[];
 }
 
-type RoleSelectCallback = (selection: ModelSelectorSelection) => void;
+type RoleSelectCallback = (selection: ModelSelectorSelection) => void | Promise<void>;
 type CancelCallback = () => void;
 
 interface ProviderTabState {
@@ -161,6 +173,7 @@ export class ModelSelectorComponent extends Container {
 	#filteredModels: ModelItem[] = [];
 	#canonicalModels: CanonicalModelItem[] = [];
 	#filteredCanonicalModels: CanonicalModelItem[] = [];
+	#profileItems: ProfileItem[] = [];
 	#selectedIndex: number = 0;
 	#roles = {} as Record<string, RoleAssignment | undefined>;
 	#settings = null as unknown as Settings;
@@ -228,7 +241,11 @@ export class ModelSelectorComponent extends Container {
 		this.#searchInput.onSubmit = () => {
 			const selectedItem = this.#getSelectedItem();
 			if (selectedItem) {
-				this.#beginActionMenuOrSelect(selectedItem);
+				if (selectedItem.kind === "profile") {
+					this.#beginProfileActionMenu(selectedItem);
+				} else {
+					this.#beginActionMenuOrSelect(selectedItem);
+				}
 			}
 		};
 		this.addChild(this.#searchInput);
@@ -465,11 +482,18 @@ export class ModelSelectorComponent extends Container {
 
 		this.#sortModels(models);
 		this.#sortCanonicalModels(canonicalModels);
+		const profiles = this.#modelRegistry.getModelProfiles?.() ?? new Map();
+		const profileItems = this.#temporaryOnly
+			? []
+			: [...profiles.values()]
+					.sort((a, b) => a.name.localeCompare(b.name))
+					.map(profile => ({ kind: "profile" as const, name: profile.name, profile }));
 
 		this.#allModels = models;
 		this.#filteredModels = models;
 		this.#canonicalModels = canonicalModels;
 		this.#filteredCanonicalModels = canonicalModels;
+		this.#profileItems = profileItems;
 		this.#selectedIndex = Math.min(this.#selectedIndex, Math.max(0, models.length - 1));
 	}
 
@@ -664,20 +688,40 @@ export class ModelSelectorComponent extends Container {
 		}
 	}
 
+	#getVisibleProfiles(): ProfileItem[] {
+		return !this.#temporaryOnly && !this.#isCanonicalTab() && this.#getActiveTabId() === ALL_TAB
+			? this.#profileItems
+			: [];
+	}
+
 	#updateList(): void {
 		this.#listContainer.clear();
 		const isCanonicalTab = this.#isCanonicalTab();
+		const visibleProfiles = this.#getVisibleProfiles();
+		const modelSelectedIndex = Math.max(0, this.#selectedIndex - visibleProfiles.length);
 		const visibleItems = isCanonicalTab ? this.#filteredCanonicalModels : this.#filteredModels;
 
 		const maxVisible = 10;
 		const startIndex = Math.max(
 			0,
-			Math.min(this.#selectedIndex - Math.floor(maxVisible / 2), visibleItems.length - maxVisible),
+			Math.min(modelSelectedIndex - Math.floor(maxVisible / 2), visibleItems.length - maxVisible),
 		);
 		const endIndex = Math.min(startIndex + maxVisible, visibleItems.length);
 
 		const showProvider = this.#getActiveTabId() === ALL_TAB;
 
+		if (visibleProfiles.length > 0) {
+			this.#listContainer.addChild(new Text(theme.fg("muted", "Profiles"), 0, 0));
+			for (let i = 0; i < visibleProfiles.length; i++) {
+				const profile = visibleProfiles[i];
+				if (!profile) continue;
+				const isSelected = i === this.#selectedIndex;
+				const prefix = isSelected ? theme.fg("accent", `${theme.nav.cursor} `) : "  ";
+				const label = isSelected ? theme.fg("accent", profile.name) : profile.name;
+				this.#listContainer.addChild(new Text(`${prefix}${label}`, 0, 0));
+			}
+			this.#listContainer.addChild(new Spacer(1));
+		}
 		// Show visible slice of filtered models
 		for (let i = startIndex; i < endIndex; i++) {
 			const item = visibleItems[i];
@@ -685,7 +729,7 @@ export class ModelSelectorComponent extends Container {
 			const canonicalItem = isCanonicalTab ? (item as CanonicalModelItem) : undefined;
 			const providerItem = isCanonicalTab ? undefined : (item as ModelItem);
 
-			const isSelected = i === this.#selectedIndex;
+			const isSelected = i + visibleProfiles.length === this.#selectedIndex;
 
 			// Build role badges (inverted: color as background, black text)
 			const roleBadgeTokens: string[] = [];
@@ -742,7 +786,7 @@ export class ModelSelectorComponent extends Container {
 			for (const line of errorLines) {
 				this.#listContainer.addChild(new Text(theme.fg("error", line), 0, 0));
 			}
-		} else if (visibleItems.length === 0) {
+		} else if (visibleItems.length === 0 && visibleProfiles.length === 0) {
 			const statusMessage = this.#getProviderEmptyStateMessage();
 			this.#listContainer.addChild(
 				new Text(
@@ -751,8 +795,13 @@ export class ModelSelectorComponent extends Container {
 					0,
 				),
 			);
+		} else if (this.#selectedIndex < visibleProfiles.length) {
+			const selectedProfile = visibleProfiles[this.#selectedIndex];
+			if (selectedProfile && this.#pendingActionItem) {
+				this.#renderProfileActionMenu(selectedProfile);
+			}
 		} else {
-			const selected = visibleItems[this.#selectedIndex];
+			const selected = visibleItems[modelSelectedIndex];
 			if (!selected) {
 				return;
 			}
@@ -806,6 +855,20 @@ export class ModelSelectorComponent extends Container {
 		}
 	}
 
+	#renderProfileActionMenu(profile: ProfileItem): void {
+		this.#listContainer.addChild(new Spacer(1));
+		this.#listContainer.addChild(new Text(theme.fg("muted", `  Action for profile: ${profile.name}`), 0, 0));
+		this.#listContainer.addChild(new Spacer(1));
+		const labels = ["Apply for this session", "Set as default"];
+		for (let i = 0; i < labels.length; i++) {
+			const label = labels[i] ?? "";
+			const prefix = i === this.#selectedActionIndex ? theme.fg("accent", `${theme.nav.cursor} `) : "  ";
+			this.#listContainer.addChild(
+				new Text(`${prefix}${i === this.#selectedActionIndex ? theme.fg("accent", label) : label}`, 0, 0),
+			);
+		}
+	}
+
 	#getCurrentRoleThinkingLevel(role: string): ThinkingLevel {
 		return this.#roles[role]?.thinkingLevel ?? ThinkingLevel.Inherit;
 	}
@@ -813,10 +876,11 @@ export class ModelSelectorComponent extends Container {
 		return GJC_MODEL_ASSIGNMENT_TARGET_IDS.length + (supportsOpenAICodexPreset(model) ? 1 : 0);
 	}
 
-	#getSelectedItem(): ModelItem | CanonicalModelItem | undefined {
-		return this.#isCanonicalTab()
-			? this.#filteredCanonicalModels[this.#selectedIndex]
-			: this.#filteredModels[this.#selectedIndex];
+	#getSelectedItem(): ModelItem | CanonicalModelItem | ProfileItem | undefined {
+		const visibleProfiles = this.#getVisibleProfiles();
+		if (this.#selectedIndex < visibleProfiles.length) return visibleProfiles[this.#selectedIndex];
+		const modelIndex = this.#selectedIndex - visibleProfiles.length;
+		return this.#isCanonicalTab() ? this.#filteredCanonicalModels[modelIndex] : this.#filteredModels[modelIndex];
 	}
 
 	handleInput(keyData: string): void {
@@ -836,7 +900,9 @@ export class ModelSelectorComponent extends Container {
 
 		// Up arrow - navigate list (wrap to bottom when at top)
 		if (matchesKey(keyData, "up")) {
-			const itemCount = this.#isCanonicalTab() ? this.#filteredCanonicalModels.length : this.#filteredModels.length;
+			const itemCount =
+				this.#getVisibleProfiles().length +
+				(this.#isCanonicalTab() ? this.#filteredCanonicalModels.length : this.#filteredModels.length);
 			if (itemCount === 0) return;
 			this.#selectedIndex = this.#selectedIndex === 0 ? itemCount - 1 : this.#selectedIndex - 1;
 			this.#updateList();
@@ -845,7 +911,9 @@ export class ModelSelectorComponent extends Container {
 
 		// Down arrow - navigate list (wrap to top when at bottom)
 		if (matchesKey(keyData, "down")) {
-			const itemCount = this.#isCanonicalTab() ? this.#filteredCanonicalModels.length : this.#filteredModels.length;
+			const itemCount =
+				this.#getVisibleProfiles().length +
+				(this.#isCanonicalTab() ? this.#filteredCanonicalModels.length : this.#filteredModels.length);
 			if (itemCount === 0) return;
 			this.#selectedIndex = this.#selectedIndex === itemCount - 1 ? 0 : this.#selectedIndex + 1;
 			this.#updateList();
@@ -857,7 +925,11 @@ export class ModelSelectorComponent extends Container {
 		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const selectedItem = this.#getSelectedItem();
 			if (selectedItem) {
-				this.#beginActionMenuOrSelect(selectedItem);
+				if (selectedItem.kind === "profile") {
+					this.#beginProfileActionMenu(selectedItem);
+				} else {
+					this.#beginActionMenuOrSelect(selectedItem);
+				}
 			}
 			return;
 		}
@@ -872,6 +944,12 @@ export class ModelSelectorComponent extends Container {
 		this.#searchInput.handleInput(keyData);
 		this.#filterModels(this.#searchInput.getValue());
 	}
+	#beginProfileActionMenu(profile: ProfileItem): void {
+		this.#pendingActionItem = profile as unknown as ModelItem;
+		this.#selectedActionIndex = 0;
+		this.#updateList();
+	}
+
 	#beginActionMenuOrSelect(item: ModelItem | CanonicalModelItem): void {
 		if (this.#temporaryOnly) {
 			this.#handleSelect(item, null);
@@ -885,7 +963,7 @@ export class ModelSelectorComponent extends Container {
 	#handleActionMenuInput(keyData: string): void {
 		const item = this.#pendingActionItem;
 		if (!item) return;
-		const actionCount = this.#getActionCount(item.model);
+		const actionCount = (item as unknown as ProfileItem).kind === "profile" ? 2 : this.#getActionCount(item.model);
 		if (matchesKey(keyData, "up")) {
 			this.#selectedActionIndex = this.#selectedActionIndex === 0 ? actionCount - 1 : this.#selectedActionIndex - 1;
 			this.#updateList();
@@ -898,11 +976,20 @@ export class ModelSelectorComponent extends Container {
 		}
 		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			this.#pendingActionItem = undefined;
-			const role = GJC_MODEL_ASSIGNMENT_TARGET_IDS[this.#selectedActionIndex];
-			if (role) {
-				this.#handleSelect(item, role);
+			if ((item as unknown as ProfileItem).kind === "profile") {
+				const profile = item as unknown as ProfileItem;
+				this.#onSelectCallback({
+					kind: "profile",
+					profileName: profile.name,
+					setDefault: this.#selectedActionIndex === 1,
+				});
 			} else {
-				this.#handlePresetSelect(item, OPENAI_CODE_PROFILE_PRESET);
+				const role = GJC_MODEL_ASSIGNMENT_TARGET_IDS[this.#selectedActionIndex];
+				if (role) {
+					this.#handleSelect(item, role);
+				} else {
+					this.#handlePresetSelect(item, OPENAI_CODE_PROFILE_PRESET);
+				}
 			}
 			return;
 		}
@@ -1004,6 +1091,9 @@ export class ModelSelectorComponent extends Container {
 	getSearchInput(): Input {
 		return this.#searchInput;
 	}
+	async __testSelectProfile(profileName: string, setDefault: boolean): Promise<void> {
+		await this.#onSelectCallback({ kind: "profile", profileName, setDefault });
+	}
 }
 
 function requiresExplicitThinkingChoice(model: Model): boolean {