@sayknow-cli/coding-agent 0.3.5 → 0.3.7

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

@@ -29,6 +29,7 @@ import {
 	resolveModelRoleValue,
 	type ScopedModelSelection,
 } from "../../config/model-resolver";
+import type { ModelProfileConfig } from "../../config/models-config-schema";
 import type { Settings } from "../../config/settings";
 import { t } from "../../i18n";
 import { type ThemeColor, theme } from "../../modes/theme/theme";
@@ -107,10 +108,9 @@ export type ModelSelectorSelection =
 	  }
 	| {
 			kind: "createProfile";
+			profile: ModelProfileConfig;
 	  }
 	| {
-			// User picked an unauthenticated preset/model — launch OAuth login for
-			// the first missing provider instead of only printing a hint.
 			kind: "login";
 			providerId: string;
 	  };
@@ -163,11 +163,27 @@ interface PresetCreateRow {
 	kind: "create";
 }
 
+interface PresetCreateUnavailableRow {
+	kind: "createUnavailable";
+	label: string;
+}
+
+interface PresetAlreadySavedRow {
+	kind: "alreadySaved";
+	profileName: string;
+}
+
 interface PresetBrowseRow {
 	kind: "browse";
 }
 
-type PresetLandingRow = PresetGroupRow | PresetProfileRow | PresetCreateRow | PresetBrowseRow;
+type PresetLandingRow =
+	| PresetGroupRow
+	| PresetProfileRow
+	| PresetCreateRow
+	| PresetCreateUnavailableRow
+	| PresetAlreadySavedRow
+	| PresetBrowseRow;
 
 // Stable logical identity for a preset landing row, independent of its current
 // list position. Used to relocate the cursor after the expanded group changes so
@@ -182,6 +198,10 @@ function presetRowIdentity(row: PresetLandingRow): string {
 			return "browse";
 		case "create":
 			return "create";
+		case "createUnavailable":
+			return "createUnavailable";
+		case "alreadySaved":
+			return `alreadySaved:${row.profileName}`;
 	}
 }
 
@@ -201,6 +221,64 @@ function isPrintableCharacter(keyData: string): boolean {
 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 getDefaultAliasThinkingLevel(value: string | undefined): ThinkingLevel | undefined {
+	const normalized = value?.trim();
+	if (!normalized?.startsWith("pi/default:")) return undefined;
+	return parseThinkingLevel(normalized.slice("pi/default:".length));
+}
+
+function getSelectorProvider(selector: string): string | undefined {
+	const slashIndex = selector.indexOf("/");
+	return slashIndex > 0 ? selector.slice(0, slashIndex) : 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);
+	}
+	return [...providers].sort((a, b) => a.localeCompare(b));
+}
+
+function sameStringRecord(
+	left: Readonly<Record<string, string | undefined>>,
+	right: Readonly<Record<string, string | undefined>>,
+): boolean {
+	const leftEntries = Object.entries(left)
+		.filter((entry): entry is [string, string] => entry[1] !== undefined)
+		.sort(([a], [b]) => a.localeCompare(b));
+	const rightEntries = Object.entries(right)
+		.filter((entry): entry is [string, string] => 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]) {
+			return false;
+		}
+	}
+	return true;
+}
+
+function sameStringArray(left: readonly string[], right: readonly string[]): boolean {
+	if (left.length !== right.length) return false;
+	for (let i = 0; i < left.length; i++) {
+		if (left[i] !== right[i]) return false;
+	}
+	return true;
+}
+
+function hasPersistableProfileSnapshot(snapshot: ModelProfileConfig): boolean {
+	return Object.keys(snapshot.model_mapping).length > 0 && snapshot.required_providers.length > 0;
+}
 /**
  * Component that renders a canonical model selector with provider tabs.
  * - Preset landing Left/Right: Collapse/expand selected provider
@@ -319,7 +397,7 @@ export class ModelSelectorComponent extends Container {
 		// Create search input
 		this.#searchInput = new Input();
 		if (initialSearchInput) {
-			this.#searchInput.setValue(initialSearchInput);
+			this.#setSearchInputValue(initialSearchInput);
 		}
 		this.#searchInput.onSubmit = () => {
 			const selectedItem = this.#getSelectedItem();
@@ -740,6 +818,67 @@ export class ModelSelectorComponent extends Container {
 		return groupModelProfilesForPresetLanding(this.#modelRegistry.getModelProfiles?.() ?? new Map());
 	}
 
+	#formatCurrentModelSelector(
+		thinkingLevel: ThinkingLevel | undefined = this.#currentThinkingLevel,
+	): string | undefined {
+		if (!this.#currentModel) return undefined;
+		return formatModelSelectorValue(`${this.#currentModel.provider}/${this.#currentModel.id}`, thinkingLevel);
+	}
+
+	#resolveProfileModelSelector(value: string | undefined): string | undefined {
+		const normalized = value?.trim();
+		if (isInheritedRoleSelector(normalized)) return undefined;
+
+		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(normalized);
+		if (inheritedDefaultThinkingLevel) return this.#formatCurrentModelSelector(inheritedDefaultThinkingLevel);
+		return undefined;
+	}
+
+	#buildCustomModelProfileSnapshot(): ModelProfileConfig {
+		const modelMapping: ModelProfileConfig["model_mapping"] = {};
+		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");
+		for (const role of SKC_MODEL_ASSIGNMENT_TARGET_IDS) {
+			if (role === "default") continue;
+			const selector = this.#resolveProfileModelSelector(agentOverrides[role]);
+			if (selector) modelMapping[role] = selector;
+		}
+
+		return {
+			required_providers: deriveRequiredProviders(modelMapping),
+			model_mapping: modelMapping,
+		};
+	}
+
+	#findDuplicateGeneratedProfile(snapshot: ModelProfileConfig): ModelProfileDefinition | undefined {
+		for (const profile of this.#modelRegistry.getModelProfiles?.().values() ?? []) {
+			if (
+				sameStringRecord(profile.modelMapping, snapshot.model_mapping) &&
+				sameStringArray(profile.requiredProviders, snapshot.required_providers)
+			) {
+				return profile;
+			}
+		}
+		return undefined;
+	}
+
 	#getPresetRows(): PresetLandingRow[] {
 		const rows: PresetLandingRow[] = [];
 		for (const [groupId, profiles] of this.#getPresetGroups()) {
@@ -748,7 +887,15 @@ export class ModelSelectorComponent extends Container {
 				for (const profile of profiles) rows.push({ kind: "profile", groupId, profile });
 			}
 		}
-		rows.push({ kind: "create" });
+		const snapshot = this.#buildCustomModelProfileSnapshot();
+		if (hasPersistableProfileSnapshot(snapshot)) {
+			const duplicateProfile = this.#findDuplicateGeneratedProfile(snapshot);
+			rows.push(
+				duplicateProfile ? { kind: "alreadySaved", profileName: duplicateProfile.name } : { kind: "create" },
+			);
+		} else {
+			rows.push({ kind: "createUnavailable", label: "Select a model before creating a custom preset" });
+		}
 		rows.push({ kind: "browse" });
 		return rows;
 	}
@@ -835,7 +982,14 @@ export class ModelSelectorComponent extends Container {
 
 	#expandSelectedPresetProvider(): void {
 		const selected = this.#getSelectedPresetRow();
-		if (!selected || selected.kind === "browse" || selected.kind === "create") return;
+		if (
+			!selected ||
+			selected.kind === "browse" ||
+			selected.kind === "create" ||
+			selected.kind === "createUnavailable" ||
+			selected.kind === "alreadySaved"
+		)
+			return;
 		if (this.#expandedPresetProviderId === selected.groupId) return;
 		const targetIdentity = presetRowIdentity(selected);
 		this.#expandedPresetProviderId = selected.groupId;
@@ -844,13 +998,24 @@ export class ModelSelectorComponent extends Container {
 
 	#collapseSelectedPresetProvider(): void {
 		const selected = this.#getSelectedPresetRow();
-		if (!selected || selected.kind === "browse" || selected.kind === "create") return;
+		if (
+			!selected ||
+			selected.kind === "browse" ||
+			selected.kind === "create" ||
+			selected.kind === "createUnavailable" ||
+			selected.kind === "alreadySaved"
+		)
+			return;
 		if (this.#expandedPresetProviderId !== selected.groupId) return;
 		const targetIdentity = selected.kind === "profile" ? `group:${selected.groupId}` : presetRowIdentity(selected);
 		this.#expandedPresetProviderId = undefined;
 		if (!this.#relocatePresetCursor(targetIdentity)) this.#clampPresetCursor();
 	}
 
+	#setSearchInputValue(value: string): void {
+		this.#searchInput.setValue(value);
+	}
+
 	#switchToModelMode(seed?: string): void {
 		this.#viewMode = "models";
 		this.#expandedPresetProviderId = undefined;
@@ -860,16 +1025,56 @@ export class ModelSelectorComponent extends Container {
 		this.#presetLoginHint = undefined;
 		this.#activeTabIndex = 0;
 		this.#selectedIndex = 0;
-		this.#searchInput.setValue(seed ?? this.#searchInput.getValue());
+		this.#setSearchInputValue(seed ?? this.#searchInput.getValue());
 		this.#updateTabBar();
 		this.#filterModels(this.#searchInput.getValue());
 	}
 
+	/**
+	 * "What is this session running right now" summary for the preset landing
+	 * header: active preset (when one is applied), the effective current model
+	 * and thinking level, and one line per assigned role (default, executor,
+	 * planner, critic, architect).
+	 */
+	#formatCurrentSessionLines(): string[] {
+		const lines: string[] = [];
+		const parts: string[] = [];
+		if (this.#activeModelProfile) {
+			const profile = this.#getProfileByName(this.#activeModelProfile);
+			const displayName = profile ? getModelProfilePresentation(profile).displayName : this.#activeModelProfile;
+			parts.push(`preset ${theme.fg("accent", displayName)}`);
+		}
+		if (this.#currentModel) {
+			parts.push(this.#formatAssignedModelLabel(this.#currentModel, this.#currentThinkingLevel));
+		}
+		if (parts.length > 0) lines.push(theme.fg("muted", `Current: ${parts.join(" · ")}`));
+		for (const role of PROFILE_ROLE_PREVIEW_ORDER) {
+			const assigned = this.#roles[role];
+			if (!assigned) continue;
+			const label = SKC_MODEL_ASSIGNMENT_TARGETS[role].tag ?? role.toUpperCase();
+			lines.push(
+				theme.fg("dim", `  ${label}: ${this.#formatAssignedModelLabel(assigned.model, assigned.thinkingLevel)}`),
+			);
+		}
+		return lines;
+	}
+
+	#formatAssignedModelLabel(model: Model, thinkingLevel: ThinkingLevel | undefined): string {
+		let label = `${model.provider}/${model.id}`;
+		if (thinkingLevel && thinkingLevel !== ThinkingLevel.Inherit) {
+			label += ` (${getThinkingLevelMetadata(thinkingLevel).label})`;
+		}
+		return label;
+	}
+
 	#renderPresetLanding(): void {
 		this.#headerContainer.clear();
 		this.#tabBar = null;
 		this.#listContainer.clear();
 		this.#headerContainer.addChild(new Text(theme.fg("accent", t("modelSelector.presets")), 0, 0));
+		for (const line of this.#formatCurrentSessionLines()) {
+			this.#headerContainer.addChild(new Text(line, 0, 0));
+		}
 		const rows = this.#getPresetRows();
 		for (let i = 0; i < rows.length; i++) {
 			const row = rows[i];
@@ -880,6 +1085,17 @@ export class ModelSelectorComponent extends Container {
 				this.#listContainer.addChild(new Text(`${prefix}${selected ? theme.fg("accent", label) : label}`, 0, 0));
 				continue;
 			}
+			if (row.kind === "createUnavailable") {
+				const renderedLabel = selected ? theme.fg("accent", row.label) : theme.fg("dim", row.label);
+				this.#listContainer.addChild(new Text(`${prefix}${renderedLabel}`, 0, 0));
+				continue;
+			}
+			if (row.kind === "alreadySaved") {
+				const label = `Already saved as ${row.profileName}`;
+				const renderedLabel = selected ? theme.fg("accent", label) : theme.fg("dim", label);
+				this.#listContainer.addChild(new Text(`${prefix}${renderedLabel}`, 0, 0));
+				continue;
+			}
 			if (row.kind === "browse") {
 				const label = t("modelSelector.browseAll");
 				this.#listContainer.addChild(new Text(`${prefix}${selected ? theme.fg("accent", label) : label}`, 0, 0));
@@ -888,17 +1104,23 @@ export class ModelSelectorComponent extends Container {
 			if (row.kind === "group") {
 				const authenticated = this.#isPresetGroupUsable(row.profiles);
 				const mark = this.#providerAuthPending ? "…" : authenticated ? "✓" : "✗";
+				const containsActive =
+					this.#activeModelProfile !== undefined &&
+					row.profiles.some(profile => profile.name === this.#activeModelProfile);
 				const label = `${mark} ${row.groupId}`;
 				const renderedLabel = selected ? theme.fg("accent", label) : authenticated ? label : theme.fg("dim", label);
-				this.#listContainer.addChild(new Text(`${prefix}${renderedLabel}`, 0, 0));
+				const activeSuffix = containsActive ? theme.fg("muted", " (current)") : "";
+				this.#listContainer.addChild(new Text(`${prefix}${renderedLabel}${activeSuffix}`, 0, 0));
 				continue;
 			}
 			const presentation = getModelProfilePresentation(row.profile);
 			const authenticated = this.#isPresetAuthenticated(row.profile);
 			const mark = this.#providerAuthPending ? "…" : authenticated ? "✓" : "✗";
+			const isActive = row.profile.name === this.#activeModelProfile;
 			const label = `  ${mark} ${presentation.displayName}`;
 			const renderedLabel = selected ? theme.fg("accent", label) : authenticated ? label : theme.fg("dim", label);
-			this.#listContainer.addChild(new Text(`${prefix}${renderedLabel}`, 0, 0));
+			const activeSuffix = isActive ? theme.fg("muted", " (current)") : "";
+			this.#listContainer.addChild(new Text(`${prefix}${renderedLabel}${activeSuffix}`, 0, 0));
 		}
 		if (this.#presetLoginHint) {
 			this.#listContainer.addChild(new Spacer(1));
@@ -1350,7 +1572,10 @@ export class ModelSelectorComponent extends Container {
 		const row = this.#getSelectedPresetRow();
 		if (!row) return;
 		if (row.kind === "create") {
-			this.#onSelectCallback({ kind: "createProfile" });
+			this.#onSelectCallback({ kind: "createProfile", profile: this.#buildCustomModelProfileSnapshot() });
+			return;
+		}
+		if (row.kind === "alreadySaved" || row.kind === "createUnavailable") {
 			return;
 		}
 		if (row.kind === "browse") {
@@ -1366,7 +1591,17 @@ export class ModelSelectorComponent extends Container {
 				if (this.#startLoginForMissing(missing)) return;
 				this.#presetLoginHint = `Run ${missing.map(provider => `/login ${provider}`).join(", ")}`;
 				this.#renderPresetLanding();
+				return;
 			}
+			// Enter toggles a usable group's expansion so drilling into presets
+			// works without reaching for the arrow keys (right/left still work).
+			if (this.#expandedPresetProviderId === row.groupId) {
+				this.#collapseSelectedPresetProvider();
+			} else {
+				this.#expandSelectedPresetProvider();
+			}
+			this.#presetLoginHint = undefined;
+			this.#renderPresetLanding();
 			return;
 		}
 		const missing = this.#getMissingProviders(row.profile);

package/src/modes/components/session-observer-overlay.ts

@@ -15,7 +15,7 @@
  *   - Enter on main session -> close overlay (jump back)
  */
 import type { ToolResultMessage } from "@sayknow-cli/ai";
-import { Container, Markdown, type MarkdownTheme, matchesKey } from "@sayknow-cli/tui";
+import { Container, Markdown, type MarkdownTheme, matchesKey, resolveTerminalColumns } from "@sayknow-cli/tui";
 import { formatDuration, formatNumber, logger } from "@sayknow-cli/utils";
 import type { KeyId } from "../../config/keybindings";
 import { isSilentAbort } from "../../session/messages";
@@ -39,7 +39,7 @@ const INDENT = "    ";
 
 /** Compute the max content width for the current terminal, accounting for indent and chrome. */
 function contentWidth(indent = INDENT): number {
-	return Math.max(TRUNCATE_LENGTHS.SHORT, (process.stdout.columns || 80) - indent.length - 2);
+	return Math.max(TRUNCATE_LENGTHS.SHORT, resolveTerminalColumns() - indent.length - 2);
 }
 
 /** Sanitize a line for TUI display: replace tabs, then truncate to viewport width. */
@@ -390,7 +390,7 @@ export class SessionObserverOverlayComponent extends Container {
 
 	/** Render markdown text into indented lines using the theme's markdown renderer */
 	#renderMarkdownToLines(text: string, indent: string = INDENT): string[] {
-		const width = Math.max(40, (process.stdout.columns || 80) - indent.length - 4);
+		const width = Math.max(40, resolveTerminalColumns() - indent.length - 4);
 		const md = new Markdown(text, 0, 0, this.#mdTheme);
 		const rendered = md.render(width);
 		return rendered.map(line => `${indent}${line.trimEnd()}`);

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

@@ -50,6 +50,14 @@ class SessionList implements Component {
 		};
 	}
 
+	#clampSelectedIndex(): void {
+		if (this.#filteredSessions.length === 0) {
+			this.#selectedIndex = 0;
+			return;
+		}
+		this.#selectedIndex = Math.max(0, Math.min(this.#selectedIndex, this.#filteredSessions.length - 1));
+	}
+
 	#filterSessions(query: string): void {
 		this.#filteredSessions = fuzzyFilter(this.allSessions, query, session => {
 			const parts = [
@@ -62,7 +70,7 @@ class SessionList implements Component {
 			];
 			return parts.filter(Boolean).join(" ");
 		});
-		this.#selectedIndex = Math.min(this.#selectedIndex, Math.max(0, this.#filteredSessions.length - 1));
+		this.#clampSelectedIndex();
 	}
 
 	removeSession(sessionPath: string): void {
@@ -71,10 +79,6 @@ class SessionList implements Component {
 		this.allSessions.splice(index, 1);
 		// Re-filter to update filteredSessions
 		this.#filterSessions(this.#searchInput.getValue());
-		// Adjust selectedIndex if we deleted the last item or beyond
-		if (this.#selectedIndex >= this.#filteredSessions.length) {
-			this.#selectedIndex = Math.max(0, this.#filteredSessions.length - 1);
-		}
 	}
 
 	invalidate(): void {
@@ -182,6 +186,12 @@ class SessionList implements Component {
 	}
 
 	handleInput(keyData: string): void {
+		const moveSelection = (delta: number): void => {
+			if (this.#filteredSessions.length === 0) return;
+			this.#selectedIndex += delta;
+			this.#clampSelectedIndex();
+		};
+
 		// Delete key - request delete confirmation from parent
 		if (matchesKey(keyData, "delete")) {
 			const selected = this.#filteredSessions[this.#selectedIndex];
@@ -193,22 +203,22 @@ class SessionList implements Component {
 
 		// Up arrow
 		if (matchesKey(keyData, "up")) {
-			this.#selectedIndex = Math.max(0, this.#selectedIndex - 1);
+			moveSelection(-1);
 			return;
 		}
 		// Down arrow
 		if (matchesKey(keyData, "down")) {
-			this.#selectedIndex = Math.min(this.#filteredSessions.length - 1, this.#selectedIndex + 1);
+			moveSelection(1);
 			return;
 		}
 		// Page up - jump up by maxVisible items
 		if (matchesKey(keyData, "pageUp")) {
-			this.#selectedIndex = Math.max(0, this.#selectedIndex - this.#maxVisible);
+			moveSelection(-this.#maxVisible);
 			return;
 		}
 		// Page down - jump down by maxVisible items
 		if (matchesKey(keyData, "pageDown")) {
-			this.#selectedIndex = Math.min(this.#filteredSessions.length - 1, this.#selectedIndex + this.#maxVisible);
+			moveSelection(this.#maxVisible);
 			return;
 		}
 		// Enter