@gajae-code/coding-agent 0.7.6 → 0.7.8

package/src/modes/components/agent-dashboard.ts

@@ -25,6 +25,7 @@ import {
 	matchesKey,
 	padding,
 	replaceTabs,
+	resolveTerminalColumns,
 	Spacer,
 	Text,
 	truncateToWidth,
@@ -870,7 +871,7 @@ export class AgentDashboard extends Container {
 	}
 
 	#uiWidth(): number {
-		return Math.max(40, process.stdout.columns ?? 100);
+		return Math.max(40, resolveTerminalColumns());
 	}
 
 	/** Rebuild layout and request a TUI render pass (for use after async state changes). */

package/src/modes/components/custom-model-preset-wizard.ts

@@ -6,15 +6,6 @@ import { DynamicBorder } from "./dynamic-border";
 
 const PROFILE_NAME_PATTERN = /^[a-z0-9][a-z0-9._-]*$/;
 
-type WizardStep = "name" | "display-name" | "provider" | "model" | "confirm";
-
-interface WizardState {
-	name: string;
-	displayName: string;
-	provider: string;
-	model: string;
-}
-
 export interface CustomModelPresetWizardSubmit {
 	name: string;
 	profile: ModelProfileConfig;
@@ -23,25 +14,21 @@ export interface CustomModelPresetWizardSubmit {
 export class CustomModelPresetWizardComponent extends Container {
 	#contentContainer: Container;
 	#input: Input | null = null;
-	#step: WizardStep = "name";
-	#selectedIndex = 0;
 	#lastError: string | null = null;
-	#state: WizardState = {
-		name: "",
-		displayName: "",
-		provider: "",
-		model: "",
-	};
+	#name = "";
+	#snapshot: ModelProfileConfig;
 	#onSubmit: (input: CustomModelPresetWizardSubmit) => void;
 	#onCancel: () => void;
 	#onRender: () => void;
 
 	constructor(
+		snapshot: ModelProfileConfig,
 		onSubmit: (input: CustomModelPresetWizardSubmit) => void,
 		onCancel: () => void,
 		onRender: () => void = () => {},
 	) {
 		super();
+		this.#snapshot = snapshot;
 		this.#onSubmit = onSubmit;
 		this.#onCancel = onCancel;
 		this.#onRender = onRender;
@@ -51,7 +38,7 @@ export class CustomModelPresetWizardComponent extends Container {
 		this.addChild(new TruncatedText(theme.bold("Create custom model preset")));
 		this.addChild(
 			new TruncatedText(
-				theme.fg("muted", "  Save provider/model as a selectable profile. Secrets are not requested."),
+				theme.fg("muted", "  Save the current default and explicit role models as a selectable profile."),
 				0,
 				0,
 			),
@@ -72,222 +59,76 @@ export class CustomModelPresetWizardComponent extends Container {
 
 	handleInput(keyData: string): void {
 		if (matchesAppInterrupt(keyData)) {
-			if (this.#step === "name") {
-				this.#onCancel();
-				return;
-			}
-			this.#goBack();
+			this.#onCancel();
 			return;
 		}
 
 		if (this.#input) {
 			if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
-				this.#saveInputAndProceed();
+				this.#saveInputAndSubmit();
 				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 "name":
-				this.#renderInputStep(
-					"Step 1: Preset id",
-					"Enter a unique preset id:",
-					this.#state.name,
-					"e.g. my-fast-coder",
-				);
-				break;
-			case "display-name":
-				this.#renderInputStep(
-					"Step 2: Display name",
-					"Enter a display name:",
-					this.#state.displayName,
-					"e.g. My Fast Coder",
-				);
-				break;
-			case "provider":
-				this.#renderInputStep(
-					"Step 3: Provider",
-					"Enter the provider id:",
-					this.#state.provider,
-					"e.g. openai-codex, anthropic, my-oai",
-				);
-				break;
-			case "model":
-				this.#renderInputStep(
-					"Step 4: Model",
-					"Enter the model id or provider/model selector:",
-					this.#state.model,
-					"e.g. gpt-5.5:medium or my-oai/gpt-example:low",
-				);
-				break;
-			case "confirm":
-				this.#renderConfirmStep();
-				break;
-		}
-	}
-
-	#renderInputStep(title: string, prompt: string, value: string, hint: string): void {
-		this.#contentContainer.addChild(new Text(theme.fg("accent", title)));
+		this.#contentContainer.addChild(new Text(theme.fg("accent", "Preset id")));
 		this.#contentContainer.addChild(new Spacer(1));
 		if (this.#lastError) {
 			this.#contentContainer.addChild(new Text(theme.fg("error", this.#lastError), 0, 0));
 			this.#contentContainer.addChild(new Spacer(1));
 		}
-		this.#contentContainer.addChild(new Text(prompt, 0, 0));
+		this.#contentContainer.addChild(new Text("Enter a unique preset id:", 0, 0));
 		this.#contentContainer.addChild(new Spacer(1));
 		this.#input = new Input();
-		this.#input.setValue(value);
+		this.#input.setValue(this.#name);
 		this.#contentContainer.addChild(this.#input);
 		this.#contentContainer.addChild(new Spacer(1));
-		this.#addHelp(hint);
-		this.#addHelp("[Enter to continue, Esc to go back]");
+		this.#addSnapshotPreview();
+		this.#addHelp("e.g. my-fast-coder");
+		this.#addHelp("[Enter to create, Esc to cancel]");
 	}
 
-	#renderConfirmStep(): void {
-		this.#contentContainer.addChild(new Text(theme.fg("accent", "Confirm custom preset")));
-		this.#contentContainer.addChild(new Spacer(1));
-		if (this.#lastError) {
-			this.#contentContainer.addChild(new Text(theme.fg("error", this.#lastError), 0, 0));
-			this.#contentContainer.addChild(new Spacer(1));
+	#addSnapshotPreview(): void {
+		this.#contentContainer.addChild(new Text(theme.fg("muted", "Snapshot:"), 0, 0));
+		for (const [role, selector] of Object.entries(this.#snapshot.model_mapping)) {
+			this.#contentContainer.addChild(new Text(`  ${role}: ${selector}`, 0, 0));
 		}
-		this.#contentContainer.addChild(new Text(`Preset id: ${this.#state.name}`, 0, 0));
-		this.#contentContainer.addChild(new Text(`Display name: ${this.#state.displayName}`, 0, 0));
-		this.#contentContainer.addChild(new Text(`Provider: ${this.#state.provider}`, 0, 0));
-		this.#contentContainer.addChild(new Text(`Default model: ${this.#selector()}`, 0, 0));
+		this.#contentContainer.addChild(new Text(`  providers: ${this.#snapshot.required_providers.join(", ")}`, 0, 0));
 		this.#contentContainer.addChild(new Spacer(1));
-		this.#addOption(0, "Create preset");
-		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 {
+	#saveInputAndSubmit(): void {
 		const value = this.#input?.getValue().trim() ?? "";
 		if (!value) {
-			this.#lastError = this.#emptyFieldMessage();
+			this.#lastError = "Preset id is required.";
 			this.#renderStep();
 			this.#onRender();
 			return;
 		}
-		const validationError = this.#validateCurrentInput(value);
-		if (validationError) {
-			this.#lastError = validationError;
+		if (!PROFILE_NAME_PATTERN.test(value)) {
+			this.#lastError = "Preset id must use lowercase letters, numbers, dots, underscores, or hyphens.";
 			this.#renderStep();
 			this.#onRender();
 			return;
 		}
+		this.#name = value;
 		this.#lastError = null;
-		if (this.#step === "name") {
-			this.#state.name = value;
-			this.#step = "display-name";
-		} else if (this.#step === "display-name") {
-			this.#state.displayName = value;
-			this.#step = "provider";
-		} else if (this.#step === "provider") {
-			this.#state.provider = value;
-			this.#step = "model";
-		} else if (this.#step === "model") {
-			this.#state.model = value;
-			this.#step = "confirm";
-			this.#selectedIndex = 0;
-		}
-		this.#renderStep();
-		this.#onRender();
-	}
-
-	#emptyFieldMessage(): string {
-		switch (this.#step) {
-			case "name":
-				return "Preset id is required.";
-			case "display-name":
-				return "Display name is required.";
-			case "provider":
-				return "Provider is required.";
-			case "model":
-				return "Model is required.";
-			case "confirm":
-				return "Value is required.";
-		}
-	}
-
-	#validateCurrentInput(value: string): string | undefined {
-		if (this.#step === "name" && !PROFILE_NAME_PATTERN.test(value)) {
-			return "Preset id must use lowercase letters, numbers, dots, underscores, or hyphens.";
-		}
-		if (this.#step === "provider" && !PROFILE_NAME_PATTERN.test(value)) {
-			return "Provider id must use lowercase letters, numbers, dots, underscores, or hyphens.";
-		}
-		if (this.#step === "model" && value.includes(",")) {
-			return "Model must be one selector, not a comma-separated list.";
-		}
-		return undefined;
-	}
-
-	#selectCurrentOption(): void {
-		if (this.#step !== "confirm") return;
-		if (this.#selectedIndex === 0) {
-			this.#onSubmit(this.#buildInput());
-			return;
-		}
-		this.#goBack();
-	}
-
-	#buildInput(): CustomModelPresetWizardSubmit {
-		return {
-			name: this.#state.name,
+		this.#onSubmit({
+			name: value,
 			profile: {
-				required_providers: [this.#state.provider],
-				display_name: this.#state.displayName,
-				model_mapping: { default: this.#selector() },
+				...this.#snapshot,
+				display_name: value,
+				model_mapping: { ...this.#snapshot.model_mapping },
+				required_providers: [...this.#snapshot.required_providers],
 			},
-		};
-	}
-
-	#selector(): string {
-		return this.#state.model.includes("/") ? this.#state.model : `${this.#state.provider}/${this.#state.model}`;
-	}
-
-	#moveSelection(delta: number): void {
-		this.#selectedIndex = (this.#selectedIndex + delta + 2) % 2;
-		this.#renderStep();
-		this.#onRender();
-	}
-
-	#goBack(): void {
-		if (this.#step === "display-name") this.#step = "name";
-		else if (this.#step === "provider") this.#step = "display-name";
-		else if (this.#step === "model") this.#step = "provider";
-		else if (this.#step === "confirm") this.#step = "model";
-		this.#selectedIndex = 0;
-		this.#lastError = null;
-		this.#renderStep();
-		this.#onRender();
+		});
 	}
 }

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

@@ -28,6 +28,7 @@ import {
 	resolveModelRoleValue,
 	type ScopedModelSelection,
 } from "../../config/model-resolver";
+import type { ModelProfileConfig } from "../../config/models-config-schema";
 import type { Settings } from "../../config/settings";
 import { type ThemeColor, theme } from "../../modes/theme/theme";
 import { formatModelOnboardingInlineHint } from "../../setup/model-onboarding-guidance";
@@ -105,6 +106,7 @@ export type ModelSelectorSelection =
 	  }
 	| {
 			kind: "createProfile";
+			profile: ModelProfileConfig;
 	  };
 
 interface PendingThinkingChoice {
@@ -155,11 +157,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
@@ -174,6 +192,10 @@ function presetRowIdentity(row: PresetLandingRow): string {
 			return "browse";
 		case "create":
 			return "create";
+		case "createUnavailable":
+			return "createUnavailable";
+		case "alreadySaved":
+			return `alreadySaved:${row.profileName}`;
 	}
 }
 
@@ -193,6 +215,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
@@ -733,6 +813,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 GJC_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()) {
@@ -741,7 +882,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;
 	}
@@ -815,7 +964,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;
@@ -824,7 +980,14 @@ 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;
@@ -860,6 +1023,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 = "Browse all models";
 				this.#listContainer.addChild(new Text(`${prefix}${selected ? theme.fg("accent", label) : label}`, 0, 0));
@@ -1306,7 +1480,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") {

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

@@ -15,7 +15,7 @@
  *   - Enter on main session -> close overlay (jump back)
  */
 import type { ToolResultMessage } from "@gajae-code/ai";
-import { Container, Markdown, type MarkdownTheme, matchesKey } from "@gajae-code/tui";
+import { Container, Markdown, type MarkdownTheme, matchesKey, resolveTerminalColumns } from "@gajae-code/tui";
 import { formatDuration, formatNumber, logger } from "@gajae-code/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()}`);