@gajae-code/coding-agent 0.17.1 → 0.17.4

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

@@ -1,5 +1,11 @@
 import { ThinkingLevel } from "@gajae-code/agent-core";
-import { getSupportedEfforts, type Model, modelSupportsServiceTier, modelsAreEqual } from "@gajae-code/ai/core";
+import {
+	getMiniMaxThinkingMode,
+	getSupportedEfforts,
+	type Model,
+	modelSupportsServiceTier,
+	modelsAreEqual,
+} from "@gajae-code/ai/core";
 import {
 	Container,
 	fuzzyFilter,
@@ -26,6 +32,7 @@ import type { BillingPath } from "../../config/billing-path";
 import {
 	getProxyRoutableProviders,
 	inspectProxyProviderId,
+	isModelProfileProxyConfigured,
 	requiresQualifiedModelProfileRoleResolution,
 	resolveProxyMode,
 	rewriteSelectorForProxy,
@@ -426,6 +433,7 @@ export class ModelSelectorComponent extends Container {
 	#presetScopeMenuOpen: boolean = false;
 	#presetScopeIndex: number = 0;
 	#providerAuthById = new Map<string, boolean>();
+	#credentiallessProviders = new Set<string>();
 	#bareProfileAuthByName = new Map<string, boolean>();
 	// Rebuilt with the provider and bare-selector snapshots on every catalog or credential refresh.
 	#profileAuthByName = new Map<string, boolean>();
@@ -1441,17 +1449,16 @@ export class ModelSelectorComponent extends Container {
 				const proxyProvider = tryResolveProxyProviderId(this.#settings);
 				if (
 					proxyProvider !== undefined &&
-					!(this.#modelRegistry.getConfiguredProviderIds?.() ?? []).includes(proxyProvider)
+					!isModelProfileProxyConfigured(
+						proxyProvider,
+						this.#modelRegistry.getConfiguredProviderIds?.(),
+						this.#credentiallessProviders.has(proxyProvider),
+					)
 				)
 					return false;
 				try {
 					if (resolveProxyMode(this.#settings) === "always") {
-						const configuredProviders = this.#modelRegistry.getConfiguredProviderIds?.() ?? [];
-						if (
-							proxyProvider === undefined ||
-							this.#isProviderAuthenticated(proxyProvider) !== true ||
-							!configuredProviders.includes(proxyProvider)
-						)
+						if (proxyProvider === undefined || this.#isProviderAuthenticated(proxyProvider) !== true)
 							return false;
 					}
 				} catch {
@@ -1530,6 +1537,7 @@ export class ModelSelectorComponent extends Container {
 	async #refreshProviderAuth(): Promise<void> {
 		const refreshGeneration = ++this.#providerAuthRefreshGeneration;
 		this.#providerAuthById = new Map();
+		this.#credentiallessProviders = new Set();
 		this.#bareProfileAuthByName = new Map();
 		this.#profileAuthByName = new Map();
 		const availableModels = this.#getProfileAvailableModels();
@@ -1586,9 +1594,9 @@ export class ModelSelectorComponent extends Container {
 				[...providers].map(async provider => {
 					try {
 						const apiKey = await this.#modelRegistry.getApiKeyForProvider(provider, this.#authSessionId);
-						return [provider, apiKey === kNoAuth || isAuthenticated(apiKey)] as const;
+						return [provider, apiKey === kNoAuth || isAuthenticated(apiKey), apiKey === kNoAuth] as const;
 					} catch {
-						return [provider, false] as const;
+						return [provider, false, false] as const;
 					}
 				}),
 			);
@@ -1598,7 +1606,10 @@ export class ModelSelectorComponent extends Container {
 				refreshGeneration !== this.#providerAuthRefreshGeneration
 			)
 				return;
-			this.#providerAuthById = new Map(entries);
+			this.#providerAuthById = new Map(entries.map(([provider, authenticated]) => [provider, authenticated]));
+			this.#credentiallessProviders = new Set(
+				entries.filter(([, , keyless]) => keyless).map(([provider]) => provider),
+			);
 			const profileAuthEntries = await Promise.all(
 				[...this.#getPresetGroups().values()].flat().map(async profile => {
 					const bindings = resolveProfileBindings(profile);
@@ -1853,7 +1864,7 @@ export class ModelSelectorComponent extends Container {
 		const modelLabel = sanitizeText(`${model.provider}/${model.id}`).replace(/\s+/g, " ").trim();
 		let label = modelLabel;
 		if (thinkingLevel && thinkingLevel !== ThinkingLevel.Inherit) {
-			label += ` (${getThinkingLevelMetadata(thinkingLevel).label})`;
+			label += ` (${getThinkingLevelMetadata(thinkingLevel, model).label})`;
 		}
 		const billing = this.#billingPathForModel(model)?.label;
 		if (billing) label += ` [${billing}]`;
@@ -2214,7 +2225,7 @@ export class ModelSelectorComponent extends Container {
 				const assigned = this.#roles[role];
 				if (roleInfo.tag && assigned && modelsAreEqual(assigned.model, item.model)) {
 					const badge = makeInvertedBadge(roleInfo.tag, roleInfo.color ?? "muted");
-					const thinkingLabel = getThinkingLevelMetadata(assigned.thinkingLevel).label;
+					const thinkingLabel = getThinkingLevelMetadata(assigned.thinkingLevel, item.model).label;
 
 					// Subagent roles (task.agentModelOverrides) run under task.serviceTier,
 					// so their ⚡ uses the effective subagent tier. A non-subagent
@@ -2326,6 +2337,11 @@ export class ModelSelectorComponent extends Container {
 	#renderActionMenu(item: ModelItem | CanonicalModelItem): void {
 		this.#listContainer.addChild(new Spacer(1));
 		this.#listContainer.addChild(new Text(theme.fg("muted", `  Action for: ${item.model.id}`), 0, 0));
+		if (getMiniMaxThinkingMode(item.model) === "always-on") {
+			this.#listContainer.addChild(
+				new Text(theme.fg("muted", "  Reasoning: always on; effort control is unsupported"), 0, 0),
+			);
+		}
 		this.#listContainer.addChild(new Spacer(1));
 		const actionCount = this.#getActionCount(item.model);
 		for (let i = 0; i < actionCount; i++) {
@@ -2390,7 +2406,7 @@ export class ModelSelectorComponent extends Container {
 		// Show the highlighted reasoning level — never the model id (that mislabel
 		// made "Reasoning for Default: gpt-5.6-luna" look like a level).
 		const selectedLevel = choice.levels[this.#selectedThinkingIndex];
-		const selectedLevelLabel = selectedLevel ? getThinkingLevelMetadata(selectedLevel).label : "—";
+		const selectedLevelLabel = selectedLevel ? getThinkingLevelMetadata(selectedLevel, choice.item.model).label : "—";
 		this.#listContainer.addChild(new Spacer(1));
 		this.#listContainer.addChild(
 			new Text(theme.fg("muted", `  Reasoning for ${targetLabel}: ${selectedLevelLabel}`), 0, 0),
@@ -2398,7 +2414,7 @@ export class ModelSelectorComponent extends Container {
 		this.#listContainer.addChild(new Spacer(1));
 		for (let i = 0; i < choice.levels.length; i++) {
 			const level = choice.levels[i];
-			const metadata = getThinkingLevelMetadata(level);
+			const metadata = getThinkingLevelMetadata(level, choice.item.model);
 			const prefix = i === this.#selectedThinkingIndex ? theme.fg("accent", `${theme.nav.cursor} `) : "  ";
 			const label = `${metadata.label} — ${metadata.description}`;
 			this.#listContainer.addChild(

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

@@ -164,6 +164,15 @@ export class OAuthSelectorComponent extends Container {
 				{ kind: "auto", selectable: true },
 				{ kind: "add", selectable: this.#onAddAccount !== undefined },
 			);
+			const firstAccount = this.#accountEntries.find(entry => entry.kind === "account");
+			if (firstAccount && !firstAccount.selectable) {
+				const addAccountIndex =
+					firstAccount.row.disabled && this.#onAddAccount !== undefined
+						? this.#accountEntries.findIndex(entry => entry.kind === "add" && entry.selectable)
+						: -1;
+				this.#selectedIndex =
+					addAccountIndex >= 0 ? addAccountIndex : this.#accountEntries.findIndex(entry => entry.selectable);
+			}
 		} else if (this.#accountEntries.some(entry => entry.kind === "account" && entry.selectable)) {
 			this.#accountEntries.push({ kind: "all", selectable: this.#onAccountRemove !== undefined });
 		}

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

@@ -39,6 +39,7 @@ export type SessionInspector = (sessionPath: string) => Promise<ResumeTailInspec
 
 type SelectorState =
 	| { kind: "browsing" }
+	| { kind: "starring"; token: number }
 	| { kind: "checking"; session: SessionInfo; token: number }
 	| { kind: "confirming"; session: SessionInfo; token: number; identity: ResumeSessionIdentity }
 	| { kind: "settled" };
@@ -52,12 +53,13 @@ class SessionList implements Component {
 	onCancel?: () => void;
 	onExit: () => void = () => {};
 	onDeleteRequest?: (session: SessionInfo) => void;
+	onToggleStarRequest?: (session: SessionInfo) => void;
 
 	constructor(
 		private readonly allSessions: SessionInfo[],
 		private readonly showCwd = false,
 	) {
-		this.#filteredSessions = allSessions;
+		this.#filteredSessions = prioritizeStarredSessions(allSessions);
 		this.#searchInput.onSubmit = () => {
 			const selected = this.#filteredSessions[this.#selectedIndex];
 			if (selected) this.onSelect?.(selected);
@@ -100,6 +102,17 @@ class SessionList implements Component {
 		this.#filterSessions(this.#searchInput.getValue());
 	}
 
+	setSessionStarred(sessionPath: string, starred: boolean): void {
+		const session = this.allSessions.find(session => session.path === sessionPath);
+		if (!session) return;
+		session.starred = starred;
+		this.#filterSessions(this.#searchInput.getValue());
+		this.#selectedIndex = Math.max(
+			0,
+			this.#filteredSessions.findIndex(session => session.path === sessionPath),
+		);
+	}
+
 	invalidate(): void {}
 
 	render(width: number): string[] {
@@ -155,6 +168,8 @@ class SessionList implements Component {
 		}
 		if (start > 0 || end < this.#filteredSessions.length)
 			lines.push(theme.fg("muted", `  (${this.#selectedIndex + 1}/${this.#filteredSessions.length})`));
+		if (this.onToggleStarRequest)
+			lines.push(theme.fg("muted", truncateToWidth("  [Ctrl+S to star/unstar selected session]", width)));
 		lines.push(
 			"",
 			theme.fg("muted", "  [Del to delete selected transcript/artifacts, Enter to select, Esc to cancel]"),
@@ -177,7 +192,10 @@ class SessionList implements Component {
 			this.#selectedIndex += delta;
 			this.#clampSelectedIndex();
 		};
-		if (matchesKey(keyData, "delete")) {
+		if (matchesKey(keyData, "ctrl+s")) {
+			const selected = this.#filteredSessions[this.#selectedIndex];
+			if (selected) this.onToggleStarRequest?.(selected);
+		} else if (matchesKey(keyData, "delete")) {
 			const selected = this.#filteredSessions[this.#selectedIndex];
 			if (selected) this.onDeleteRequest?.(selected);
 		} else if (matchesKey(keyData, "up")) move(-1);
@@ -194,7 +212,7 @@ class SessionList implements Component {
 	}
 }
 
-/** A one-shot resume consent selector. It never opens or mutates sessions. */
+/** A one-shot resume consent selector with host-owned deletion and star persistence. */
 export class SessionSelectorComponent extends Container {
 	#sessionList: SessionList;
 	#confirmationDialog: HookSelectorComponent | null = null;
@@ -211,6 +229,7 @@ export class SessionSelectorComponent extends Container {
 		private readonly onDelete?: (session: SessionInfo) => Promise<boolean>,
 		private readonly inspector?: SessionInspector,
 		private readonly onSelection?: (selection: SessionSelectionResult) => void,
+		private readonly onSetStarred?: (session: SessionInfo, starred: boolean) => Promise<void>,
 	) {
 		super();
 		this.addChild(new Spacer(1));
@@ -219,7 +238,7 @@ export class SessionSelectorComponent extends Container {
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
 		this.addChild(this.#messageContainer);
-		this.#sessionList = new SessionList(prioritizeStarredSessions(sessions));
+		this.#sessionList = new SessionList([...sessions]);
 		this.#sessionList.onSelect = session => {
 			if (this.inspector) void this.#inspect(session);
 			else this.#dispatchSelect(session.path);
@@ -227,6 +246,7 @@ export class SessionSelectorComponent extends Container {
 		this.#sessionList.onCancel = () => this.#cancel();
 		this.#sessionList.onExit = () => this.#exit();
 		this.#sessionList.onDeleteRequest = session => this.#showDeleteConfirmation(session);
+		if (this.onSetStarred) this.#sessionList.onToggleStarRequest = session => void this.#toggleStar(session);
 		this.addChild(this.#sessionList);
 		this.addChild(new Spacer(1));
 		this.addChild(new DynamicBorder());
@@ -294,6 +314,29 @@ export class SessionSelectorComponent extends Container {
 		this.#sessionList.setInputFrozen(true);
 		this.onExit();
 	}
+	async #toggleStar(session: SessionInfo): Promise<void> {
+		if (!this.onSetStarred || this.#state.kind !== "browsing" || this.#confirmationDialog) return;
+		const token = ++this.#nextToken;
+		const starred = !session.starred;
+		this.#state = { kind: "starring", token };
+		this.#sessionList.setInputFrozen(true);
+		this.#clearError();
+		this.#requestRender();
+		try {
+			await this.onSetStarred(session, starred);
+			if (this.#state.kind !== "starring" || this.#state.token !== token) return;
+			this.#sessionList.setSessionStarred(session.path, starred);
+		} catch (error) {
+			if (this.#state.kind !== "starring" || this.#state.token !== token) return;
+			this.#showError(error instanceof Error ? error.message : String(error));
+		} finally {
+			if (this.#state.kind === "starring" && this.#state.token === token) {
+				this.#state = { kind: "browsing" };
+				this.#sessionList.setInputFrozen(false);
+				this.#requestRender();
+			}
+		}
+	}
 	async #inspect(session: SessionInfo): Promise<void> {
 		const inspector = this.inspector;
 		if (!inspector || this.#state.kind !== "browsing") return;

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

@@ -1,9 +1,11 @@
 import * as os from "node:os";
 import * as path from "node:path";
 import { ThinkingLevel } from "@gajae-code/agent-core";
+import { getMiniMaxThinkingMode } from "@gajae-code/ai/model-thinking";
 import { TERMINAL, truncateToWidth } from "@gajae-code/tui";
 import { formatDuration, formatNumber, getProjectDir, pathIsWithin, relativePathWithinRoot } from "@gajae-code/utils";
 import { type ThemeColor, theme } from "../../../modes/theme/theme";
+import { getThinkingLevelMetadata } from "../../../thinking";
 import { shortenPath } from "../../../tools/render-utils";
 import { getSessionAccentAnsi, getSessionAccentHex } from "../../../utils/session-color";
 import { sanitizeStatusText } from "../../shared";
@@ -113,7 +115,10 @@ const modelSegment: StatusLineSegment = {
 		}
 
 		// Add thinking level with dot separator
-		if (opts.showThinkingLevel !== false && state.model?.thinking) {
+		const miniMaxMode = state.model && getMiniMaxThinkingMode(state.model);
+		if (opts.showThinkingLevel !== false && miniMaxMode) {
+			content += `${theme.sep.dot}${getThinkingLevelMetadata(state.thinkingLevel ?? ThinkingLevel.Off, state.model).label}`;
+		} else if (opts.showThinkingLevel !== false && state.model?.thinking) {
 			const level = state.thinkingLevel ?? ThinkingLevel.Off;
 			if (level !== ThinkingLevel.Off) {
 				const thinkingText = theme.thinking[level as keyof typeof theme.thinking];

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

@@ -1,7 +1,8 @@
 import { ThinkingLevel, type ThinkingLevel as ThinkingLevelValue } from "@gajae-code/agent-core";
+import type { Model } from "@gajae-code/ai/types";
 import { Container, type SelectItem, SelectList, Text } from "@gajae-code/tui";
 import { getSelectListTheme, theme } from "../../modes/theme/theme";
-import { getThinkingLevelMetadata, type ThinkingLevelValue as ThinkingMetadataValue } from "../../thinking-metadata";
+import { getThinkingLevelMetadata } from "../../thinking";
 import { DynamicBorder } from "./dynamic-border";
 
 const SCOPE_ITEMS = [
@@ -31,21 +32,24 @@ export class ThinkingSelectorComponent extends Container {
 	#selectedLevel: ThinkingLevelValue | undefined;
 	readonly #onSelect: (selection: ThinkingSelectorSelection) => void;
 	readonly #onCancel: () => void;
+	readonly #model: Model | undefined;
 
 	constructor(
 		currentLevel: ThinkingLevelValue | undefined,
 		availableLevels: ThinkingLevelValue[],
 		onSelect: (selection: ThinkingSelectorSelection) => void,
 		onCancel: () => void,
+		model?: Model,
 	) {
 		super();
 
 		this.#onSelect = onSelect;
 		this.#onCancel = onCancel;
+		this.#model = model;
 
 		const currentValue = currentLevel ?? ThinkingLevel.Off;
 		const thinkingLevels: SelectItem[] = availableLevels.map(level => {
-			const metadata = getThinkingLevelMetadata(level as ThinkingMetadataValue);
+			const metadata = getThinkingLevelMetadata(level, model);
 			return level === currentValue
 				? { ...metadata, label: metadata.label + theme.fg("muted", " (current)") }
 				: metadata;
@@ -96,7 +100,7 @@ export class ThinkingSelectorComponent extends Container {
 			this.#renderLevelList();
 		};
 
-		const metadata = getThinkingLevelMetadata(level as ThinkingMetadataValue);
+		const metadata = getThinkingLevelMetadata(level, this.#model);
 		this.detachAll();
 		this.#selectList = scopeList;
 		this.addChild(new DynamicBorder());

package/src/modes/components/user-message-selector.ts

@@ -14,9 +14,10 @@ interface UserMessageItem {
  */
 class UserMessageList implements Component {
 	#selectedIndex: number = 0;
+	#selectionInFlight = false;
 	onSelect?: (entryId: string) => void;
 	onCancel?: () => void;
-	#maxVisible: number = 10; // Max messages visible
+	#availableRows = Number.POSITIVE_INFINITY;
 
 	constructor(private readonly messages: UserMessageItem[]) {
 		// Store messages in chronological order (oldest to newest)
@@ -24,6 +25,10 @@ class UserMessageList implements Component {
 		this.#selectedIndex = Math.max(0, this.messages.length - 1);
 	}
 
+	setAvailableRows(rows: number): void {
+		this.#availableRows = Math.max(3, rows);
+	}
+
 	invalidate(): void {
 		// No cached state to invalidate currently
 	}
@@ -36,12 +41,15 @@ class UserMessageList implements Component {
 			return lines;
 		}
 
-		// Calculate visible range with scrolling
+		// Each entry uses two content rows plus a separator. Leave one row for
+		// the scroll position whenever the full history does not fit.
+		const needsScrollIndicator = this.messages.length * 3 > this.#availableRows;
+		const maxVisible = Math.max(1, Math.floor((this.#availableRows - (needsScrollIndicator ? 1 : 0)) / 3));
 		const startIndex = Math.max(
 			0,
-			Math.min(this.#selectedIndex - Math.floor(this.#maxVisible / 2), this.messages.length - this.#maxVisible),
+			Math.min(this.#selectedIndex - Math.floor(maxVisible / 2), this.messages.length - maxVisible),
 		);
-		const endIndex = Math.min(startIndex + this.#maxVisible, this.messages.length);
+		const endIndex = Math.min(startIndex + maxVisible, this.messages.length);
 
 		// Render visible messages (2 lines per message + blank line)
 		for (let i = startIndex; i < endIndex; i++) {
@@ -77,6 +85,7 @@ class UserMessageList implements Component {
 	}
 
 	handleInput(keyData: string): void {
+		if (this.#selectionInFlight) return;
 		// Up arrow - go to previous (older) message, wrap to bottom when at top
 		if (matchesKey(keyData, "up")) {
 			this.#selectedIndex = this.#selectedIndex === 0 ? this.messages.length - 1 : this.#selectedIndex - 1;
@@ -89,6 +98,7 @@ class UserMessageList implements Component {
 		else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const selected = this.messages[this.#selectedIndex];
 			if (selected && this.onSelect) {
+				this.#selectionInFlight = true;
 				this.onSelect(selected.id);
 			}
 		}
@@ -102,21 +112,43 @@ class UserMessageList implements Component {
 }
 
 /**
- * Component that renders a user message selector for branching
+ * Component that renders a prompt selector for creating a new session
  */
 export class UserMessageSelectorComponent extends Container {
 	#messageList: UserMessageList;
-
-	constructor(messages: UserMessageItem[], onSelect: (entryId: string) => void, onCancel: () => void) {
+	#header: Container;
+	#footer: Container;
+
+	constructor(
+		messages: UserMessageItem[],
+		onSelect: (entryId: string) => void,
+		onCancel: () => void,
+		private readonly getViewportRows: () => number,
+	) {
 		super();
 
 		// Add header
-		this.addChild(new Spacer(1));
-		this.addChild(new Text(theme.bold("Branch from Message"), 1, 0));
-		this.addChild(new Text(theme.fg("muted", "Select a message to create a new branch from that point"), 1, 0));
-		this.addChild(new Spacer(1));
-		this.addChild(new DynamicBorder());
-		this.addChild(new Spacer(1));
+		this.#header = new Container();
+		this.#header.addChild(new Spacer(1));
+		this.#header.addChild(new Text(theme.bold("Fork from Prompt"), 1, 0));
+		this.#header.addChild(
+			new Text(
+				theme.fg(
+					"muted",
+					"Creates a new session with history before the prompt; shared files stay in the same cwd.",
+				),
+				1,
+				0,
+			),
+		);
+		this.#header.addChild(
+			new Text(theme.fg("muted", "The selected prompt is restored for editing, not submitted."), 1, 0),
+		);
+		this.#header.addChild(new Text(theme.fg("muted", "↑/↓ move · Enter select · Esc cancel"), 1, 0));
+		this.#header.addChild(new Spacer(1));
+		this.#header.addChild(new DynamicBorder());
+		this.#header.addChild(new Spacer(1));
+		this.addChild(this.#header);
 
 		// Create message list
 		this.#messageList = new UserMessageList(messages);
@@ -126,8 +158,10 @@ export class UserMessageSelectorComponent extends Container {
 		this.addChild(this.#messageList);
 
 		// Add bottom border
-		this.addChild(new Spacer(1));
-		this.addChild(new DynamicBorder());
+		this.#footer = new Container();
+		this.#footer.addChild(new Spacer(1));
+		this.#footer.addChild(new DynamicBorder());
+		this.addChild(this.#footer);
 
 		// Auto-cancel if no messages
 		if (messages.length === 0) {
@@ -135,6 +169,14 @@ export class UserMessageSelectorComponent extends Container {
 		}
 	}
 
+	render(width: number): string[] {
+		const chromeRows = this.#header.render(width).length + this.#footer.render(width).length;
+		// Reserve the pinned status/composer rows outside the overlay. Recompute
+		// against current terminal rows and wrapped header height on every render.
+		this.#messageList.setAvailableRows(this.getViewportRows() - chromeRows - 2);
+		return super.render(width);
+	}
+
 	getMessageList(): UserMessageList {
 		return this.#messageList;
 	}

package/src/modes/controllers/command-controller.ts

@@ -38,7 +38,16 @@ import { replaceTabs } from "../../tools/render-utils";
 import { getDisplayChangelogEntries } from "../../utils/changelog";
 import { copyToClipboard } from "../../utils/clipboard";
 import { openPath } from "../../utils/open";
-import { setSessionTerminalTitle } from "../../utils/title-generator";
+import {
+	beginSessionTitleGeneration,
+	invalidateSessionTitleGeneration,
+	isSessionTitleGenerationCurrent,
+} from "../../utils/session-title-generation";
+import {
+	buildConversationTitleInput,
+	generateSessionTitle,
+	setSessionTerminalTitle,
+} from "../../utils/title-generator";
 import { addChatChild, prepareTranscriptRebuild, syncPendingExecutionComponents } from "../utils/ui-helpers";
 
 type HindsightModule = typeof import("../../hindsight");
@@ -84,6 +93,7 @@ export function buildHelpMarkdown(keybindings: Pick<KeybindingsManager, "getAcce
 		"| Resume another session | `/resume` |",
 		"| Show session details | `/session info` |",
 		"| Delete current session transcript/artifacts | `/session delete` |",
+		"| Fork from an earlier prompt into a new session | `/fork` |",
 		`| Select a model | \`/model\` or ${selectModelKey} |`,
 		`| Queue a message for the next turn | ${queueMessageKey} |`,
 		`| Select or edit a queued message | ${dequeueMessageKey} |`,
@@ -1109,31 +1119,7 @@ export class CommandController {
 	}
 
 	async handleForkCommand(): Promise<void> {
-		if (this.ctx.session.isStreaming) {
-			this.ctx.showWarning("Wait for the current response to finish or abort it before forking.");
-			return;
-		}
-
-		const success = await this.ctx.session.fork();
-		if (this.ctx.isStopped?.()) return;
-		if (!success) {
-			this.ctx.showError("Fork failed (session not persisted or cancelled)");
-			return;
-		}
-		clearInteractiveActivityLoaders(this.ctx);
-		stopInteractiveActivityIndicator(this.ctx, { foregroundSettled: true });
-		this.ctx.resetIrcSidebarSession();
-
-		this.ctx.statusLine.invalidate();
-		this.ctx.updateEditorTopBorder();
-
-		const sessionFile = this.ctx.session.sessionFile;
-		const shortPath = sessionFile ? sessionFile.split("/").pop() : "new session";
-		this.ctx.chatContainer.addChild(new Spacer(1));
-		this.ctx.chatContainer.addChild(
-			new Text(`${theme.fg("accent", `${theme.status.success} Session forked to ${shortPath}`)}`, 1, 1),
-		);
-		this.ctx.ui.requestRender();
+		this.ctx.showUserMessageSelector();
 	}
 
 	async handleMoveCommand(targetPath: string): Promise<void> {
@@ -1186,23 +1172,63 @@ export class CommandController {
 		}
 	}
 
-	async handleRenameCommand(title: string): Promise<void> {
+	async handleRenameCommand(title?: string): Promise<void> {
 		try {
+			if (!title?.trim()) {
+				const generation = beginSessionTitleGeneration(this.ctx.sessionManager);
+				const input = buildConversationTitleInput(this.ctx.session.messages);
+				if (!input) {
+					this.ctx.showError("Nothing to summarize yet — pass a title: /rename <title>");
+					return;
+				}
+
+				const generated = await generateSessionTitle(
+					input,
+					this.ctx.session.modelRegistry,
+					this.ctx.settings,
+					this.ctx.session.credentialSessionId,
+					this.ctx.session.model,
+					provider => this.ctx.session.agent.metadataForProvider(provider),
+				);
+				if (
+					!isSessionTitleGenerationCurrent(this.ctx.sessionManager, generation) ||
+					buildConversationTitleInput(this.ctx.session.messages) !== input
+				)
+					return;
+				if (!generated) {
+					this.ctx.showError("Could not generate a session title — pass one: /rename <title>");
+					return;
+				}
+
+				const stored = await this.ctx.sessionManager.setSessionName(generated, "user");
+				if (!stored) {
+					this.ctx.showError("Session name cannot be empty.");
+					return;
+				}
+				this.#finishRename();
+				return;
+			}
+
+			invalidateSessionTitleGeneration(this.ctx.sessionManager);
 			const stored = await this.ctx.sessionManager.setSessionName(title, "user");
 			if (!stored) {
 				this.ctx.showError("Session name cannot be empty.");
 				return;
 			}
-			const name = this.ctx.sessionManager.getSessionName()!;
-			setSessionTerminalTitle(name, this.ctx.sessionManager.getCwd());
-			this.ctx.statusLine.invalidate();
-			this.ctx.updateEditorBorderColor();
-			this.ctx.showStatus(`Session renamed to "${name}".`);
+			this.#finishRename();
 		} catch (err) {
 			this.ctx.showError(`Rename failed: ${err instanceof Error ? err.message : String(err)}`);
 		}
 	}
 
+	#finishRename(): void {
+		const name = this.ctx.sessionManager.getSessionName()!;
+		setSessionTerminalTitle(name, this.ctx.sessionManager.getCwd());
+		this.ctx.statusLine.invalidate();
+		this.ctx.updateEditorBorderColor();
+		this.ctx.showStatus(`Session renamed to "${name}".`);
+	}
+
 	async handleBashCommand(command: string, excludeFromContext = false): Promise<void> {
 		const isDeferred = this.ctx.session.isStreaming;
 		const component = new BashExecutionComponent(command, this.ctx.ui, excludeFromContext);