@gajae-code/coding-agent 0.10.1 → 0.11.0

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

@@ -25,9 +25,11 @@ import {
 } from "../../config/model-registry";
 import {
 	formatModelSelectorValue,
+	resolveConfiguredModelPatterns,
 	resolveModelRoleValue,
 	type ScopedModelSelection,
 } from "../../config/model-resolver";
+import { type ModelSelectorValue, normalizeModelSelectorValue, selectorHead } from "../../config/model-selector-value";
 import type { ModelProfileConfig } from "../../config/models-config-schema";
 import type { Settings } from "../../config/settings";
 import { type ThemeColor, theme } from "../../modes/theme/theme";
@@ -227,9 +229,8 @@ function profileRequiredProviders(profile: ModelProfileDefinition): string[] {
 	return [...new Set(profile.requiredProviders)].sort((a, b) => a.localeCompare(b));
 }
 
-function isInheritedRoleSelector(value: string | undefined): boolean {
-	const normalized = value?.trim();
-	return !normalized || normalized === "default" || normalized === "pi/default";
+function isInheritedRoleSelector(value: string): boolean {
+	return value === "default" || value === "pi/default";
 }
 
 function getDefaultAliasThinkingLevel(value: string | undefined): ThinkingLevel | undefined {
@@ -245,28 +246,35 @@ function getSelectorProvider(selector: string): string | undefined {
 
 function deriveRequiredProviders(modelMapping: ModelProfileConfig["model_mapping"]): string[] {
 	const providers = new Set<string>();
-	for (const selector of Object.values(modelMapping)) {
-		const provider = getSelectorProvider(selector);
-		if (provider) providers.add(provider);
+	for (const selectorValue of Object.values(modelMapping)) {
+		for (const selector of normalizeModelSelectorValue(selectorValue)) {
+			const provider = getSelectorProvider(selector);
+			if (provider) providers.add(provider);
+		}
 	}
 	return [...providers].sort((a, b) => a.localeCompare(b));
 }
 
-function sameStringRecord(
-	left: Readonly<Record<string, string | undefined>>,
-	right: Readonly<Record<string, string | undefined>>,
+function sameModelSelectorRecord(
+	left: Readonly<Record<string, ModelSelectorValue | undefined>>,
+	right: Readonly<Record<string, ModelSelectorValue | undefined>>,
 ): boolean {
 	const leftEntries = Object.entries(left)
-		.filter((entry): entry is [string, string] => entry[1] !== undefined)
+		.filter((entry): entry is [string, ModelSelectorValue] => entry[1] !== undefined)
 		.sort(([a], [b]) => a.localeCompare(b));
 	const rightEntries = Object.entries(right)
-		.filter((entry): entry is [string, string] => entry[1] !== undefined)
+		.filter((entry): entry is [string, ModelSelectorValue] => entry[1] !== undefined)
 		.sort(([a], [b]) => a.localeCompare(b));
 	if (leftEntries.length !== rightEntries.length) return false;
 	for (let i = 0; i < leftEntries.length; i++) {
 		const leftEntry = leftEntries[i];
 		const rightEntry = rightEntries[i];
-		if (!leftEntry || !rightEntry || leftEntry[0] !== rightEntry[0] || leftEntry[1] !== rightEntry[1]) {
+		if (
+			!leftEntry ||
+			!rightEntry ||
+			leftEntry[0] !== rightEntry[0] ||
+			!sameStringArray(normalizeModelSelectorValue(leftEntry[1]), normalizeModelSelectorValue(rightEntry[1]))
+		) {
 			return false;
 		}
 	}
@@ -318,6 +326,7 @@ export class ModelSelectorComponent extends Container {
 	#currentModel?: Model;
 	#currentThinkingLevel?: ThinkingLevel;
 	#activeModelProfile?: string;
+	#configuredDefaultChain?: readonly string[];
 	#isFastForProvider: (provider?: string) => boolean = () => false;
 	#isFastForSubagentProvider: (provider?: string) => boolean = () => false;
 	#isCurrentModelFastModeActive: () => boolean = () => false;
@@ -359,6 +368,7 @@ export class ModelSelectorComponent extends Container {
 			isCurrentModelFastModeActive?: () => boolean;
 			currentThinkingLevel?: ThinkingLevel;
 			activeModelProfile?: string;
+			configuredDefaultChain?: readonly string[];
 		},
 	) {
 		super();
@@ -374,6 +384,7 @@ export class ModelSelectorComponent extends Container {
 		this.#currentModel = _currentModel;
 		this.#currentThinkingLevel = options?.currentThinkingLevel;
 		this.#activeModelProfile = options?.activeModelProfile;
+		this.#configuredDefaultChain = options?.configuredDefaultChain;
 		this.#isFastForProvider = options?.isFastForProvider ?? (() => false);
 		this.#isFastForSubagentProvider = options?.isFastForSubagentProvider ?? (() => false);
 		// Current-model EFFECTIVE fast state. Defaults to intent for the current
@@ -451,6 +462,24 @@ export class ModelSelectorComponent extends Container {
 		});
 	}
 
+	#isActiveDefaultFallback(): boolean {
+		if (!this.#currentModel) return false;
+		const configuredChain =
+			this.#configuredDefaultChain ?? normalizeModelSelectorValue(this.#settings.getModelRole("default"));
+		if (configuredChain.length < 2) return false;
+
+		const allModels = this.#modelRegistry.getAll();
+		const matchPreferences = { usageOrder: this.#settings.getStorage()?.getModelUsageOrder() };
+		return configuredChain.slice(1).some(selector => {
+			const resolved = resolveModelRoleValue(selector, allModels, {
+				settings: this.#settings,
+				matchPreferences,
+				modelRegistry: this.#modelRegistry,
+			});
+			return resolved.model !== undefined && modelsAreEqual(resolved.model, this.#currentModel);
+		});
+	}
+
 	#loadRoleModels(): void {
 		const allModels = this.#modelRegistry.getAll();
 		const matchPreferences = { usageOrder: this.#settings.getStorage()?.getModelUsageOrder() };
@@ -476,7 +505,12 @@ export class ModelSelectorComponent extends Container {
 				};
 			}
 		}
-		if (this.#activeModelProfile && this.#currentModel) {
+		if (
+			((this.#configuredDefaultChain?.length ?? 0) > 0 ||
+				this.#activeModelProfile ||
+				this.#isActiveDefaultFallback()) &&
+			this.#currentModel
+		) {
 			this.#roles.default = {
 				model: this.#currentModel,
 				thinkingLevel: this.#currentThinkingLevel ?? ThinkingLevel.Inherit,
@@ -835,33 +869,57 @@ export class ModelSelectorComponent extends Container {
 		return formatModelSelectorValue(`${this.#currentModel.provider}/${this.#currentModel.id}`, thinkingLevel);
 	}
 
-	#resolveProfileModelSelector(value: string | undefined): string | undefined {
-		const normalized = value?.trim();
-		if (isInheritedRoleSelector(normalized)) return undefined;
+	#resolveProfileModelSelector(value: ModelSelectorValue | undefined): string | string[] | undefined {
+		const resolvedSelectors: string[] = [];
+		for (const configuredSelector of normalizeModelSelectorValue(value)) {
+			if (isInheritedRoleSelector(configuredSelector)) continue;
+			const selectors = resolveConfiguredModelPatterns(configuredSelector, this.#settings);
+			for (const selector of selectors.length > 0 ? selectors : [configuredSelector]) {
+				const resolved = resolveModelRoleValue(selector, this.#modelRegistry.getAll(), {
+					settings: this.#settings,
+					matchPreferences: { usageOrder: this.#settings.getStorage()?.getModelUsageOrder() },
+					modelRegistry: this.#modelRegistry,
+				});
+				if (resolved.model) {
+					resolvedSelectors.push(
+						formatModelSelectorValue(`${resolved.model.provider}/${resolved.model.id}`, resolved.thinkingLevel),
+					);
+					continue;
+				}
 
-		const resolved = resolveModelRoleValue(normalized, this.#modelRegistry.getAll(), {
-			settings: this.#settings,
-			matchPreferences: { usageOrder: this.#settings.getStorage()?.getModelUsageOrder() },
-			modelRegistry: this.#modelRegistry,
-		});
-		if (resolved.model) {
-			return formatModelSelectorValue(`${resolved.model.provider}/${resolved.model.id}`, resolved.thinkingLevel);
-		}
+				const inheritedDefaultThinkingLevel = getDefaultAliasThinkingLevel(selector);
+				if (inheritedDefaultThinkingLevel) {
+					const currentSelector = this.#formatCurrentModelSelector(inheritedDefaultThinkingLevel);
+					if (currentSelector) resolvedSelectors.push(currentSelector);
+					continue;
+				}
 
-		const inheritedDefaultThinkingLevel = getDefaultAliasThinkingLevel(normalized);
-		if (inheritedDefaultThinkingLevel) return this.#formatCurrentModelSelector(inheritedDefaultThinkingLevel);
-		return undefined;
+				// Preserve unresolved chain members verbatim instead of silently
+				// truncating configured fallback tails.
+				resolvedSelectors.push(selector);
+			}
+		}
+		if (resolvedSelectors.length === 0) return undefined;
+		return resolvedSelectors.length === 1 ? resolvedSelectors[0] : resolvedSelectors;
 	}
 
 	#buildCustomModelProfileSnapshot(): ModelProfileConfig {
 		const modelMapping: ModelProfileConfig["model_mapping"] = {};
-		const currentModelSelector = this.#formatCurrentModelSelector();
-		if (currentModelSelector) {
-			modelMapping.default = currentModelSelector;
+		// Prefer the session's configured default chain so fallback tails are
+		// never dropped from the snapshot; the live model only replaces the head.
+		if (this.#configuredDefaultChain && this.#configuredDefaultChain.length > 0) {
+			const head = this.#formatCurrentModelSelector() ?? this.#configuredDefaultChain[0]!;
+			const tail = this.#configuredDefaultChain.slice(1);
+			modelMapping.default = tail.length > 0 ? [head, ...tail] : head;
 		} else {
-			const defaultRole = this.#settings.getModelRole("default");
-			const defaultSelector = this.#resolveProfileModelSelector(defaultRole);
-			if (defaultSelector) modelMapping.default = defaultSelector;
+			const currentModelSelector = this.#formatCurrentModelSelector();
+			if (currentModelSelector) {
+				modelMapping.default = currentModelSelector;
+			} else {
+				const defaultRole = this.#settings.getModelRole("default");
+				const defaultSelector = this.#resolveProfileModelSelector(defaultRole);
+				if (defaultSelector) modelMapping.default = defaultSelector;
+			}
 		}
 
 		const agentOverrides = this.#settings.get("task.agentModelOverrides");
@@ -880,7 +938,7 @@ export class ModelSelectorComponent extends Container {
 	#findDuplicateGeneratedProfile(snapshot: ModelProfileConfig): ModelProfileDefinition | undefined {
 		for (const profile of this.#modelRegistry.getModelProfiles?.().values() ?? []) {
 			if (
-				sameStringRecord(profile.modelMapping, snapshot.model_mapping) &&
+				sameModelSelectorRecord(profile.modelMapping, snapshot.model_mapping) &&
 				sameStringArray(profile.requiredProviders, snapshot.required_providers)
 			) {
 				return profile;
@@ -1148,7 +1206,7 @@ export class ModelSelectorComponent extends Container {
 			});
 			const label = GJC_MODEL_ASSIGNMENT_TARGETS[role].tag ?? role.toUpperCase();
 			this.#listContainer.addChild(
-				new Text(`  ${label}: ${formatClampedModelSelector(selector, resolved.model)}`, 0, 0),
+				new Text(`  ${label}: ${formatClampedModelSelector(selectorHead(selector) ?? "", resolved.model)}`, 0, 0),
 			);
 		}
 		this.#listContainer.addChild(new Spacer(1));