@gajae-code/coding-agent 0.7.9 → 0.7.10

package/src/tools/ask.ts

@@ -91,6 +91,7 @@ export interface QuestionResult {
 	multi: boolean;
 	selectedOptions: string[];
 	customInput?: string;
+	clarificationQuestion?: string;
 }
 
 export interface AskToolDetails {
@@ -99,6 +100,7 @@ export interface AskToolDetails {
 	multi?: boolean;
 	selectedOptions?: string[];
 	customInput?: string;
+	clarificationQuestion?: string;
 	/** Multi-part question mode */
 	results?: QuestionResult[];
 }
@@ -108,6 +110,7 @@ export interface AskToolDetails {
 // =============================================================================
 
 const OTHER_OPTION = "Other (type your own)";
+const ASK_CLARIFICATION_OPTION = "Ask about these choices";
 const RECOMMENDED_SUFFIX = " (Recommended)";
 const DEEP_INTERVIEW_SELECTOR_SCROLL_TITLE_ROWS = Number.MAX_SAFE_INTEGER;
 const DEEP_INTERVIEW_RECORDER_AWAIT_TIMEOUT_MS = 250;
@@ -183,6 +186,7 @@ function numberOptionLabels(labels: string[]): string[] {
 interface SelectionResult {
 	selectedOptions: string[];
 	customInput?: string;
+	clarificationQuestion?: string;
 	timedOut: boolean;
 	navigation?: "back" | "forward";
 	cancelled?: boolean;
@@ -201,6 +205,7 @@ interface AskSingleQuestionOptions {
 	navigation?: NavigationControls;
 	scrollTitleRows?: number;
 	otherOptionLabel?: string;
+	clarificationOptionLabel?: string;
 }
 
 interface UIContext {
@@ -219,6 +224,7 @@ interface UIContext {
 			onRight?: () => void;
 			helpText?: string;
 			customInput?: { optionLabel: string; onSubmit: (text: string) => void };
+			clarificationInput?: { optionLabel: string; onSubmit: (text: string) => void; allowEmpty?: boolean };
 		},
 	): Promise<string | undefined>;
 	editor(
@@ -239,6 +245,7 @@ async function askSingleQuestion(
 	const { recommended, timeout, signal, initialSelection, navigation, scrollTitleRows } = options;
 	const doneLabel = getDoneOptionLabel();
 	const otherOptionLabel = options.otherOptionLabel ?? OTHER_OPTION;
+	const clarificationOptionLabel = options.clarificationOptionLabel;
 	let selectedOptions = [...(initialSelection?.selectedOptions ?? [])];
 	let customInput = initialSelection?.customInput;
 	let timedOut = false;
@@ -252,15 +259,17 @@ async function askSingleQuestion(
 		timedOut: boolean;
 		navigation?: "back" | "forward";
 		inlineInput?: string;
+		inlineClarification?: string;
 	}> => {
 		let timeoutTriggered = false;
 		const onTimeout = () => {
 			timeoutTriggered = true;
 		};
-		// Inline custom input: the TUI selector keeps the question and option
-		// list on screen and collects the "Other" text below the list, instead
-		// of swapping to a separate editor screen that hides the question.
+		// Inline custom/clarification input: the TUI selector keeps the question
+		// and option list on screen and collects text below the list, instead of
+		// swapping to a separate editor screen that hides the question.
 		let inlineInput: string | undefined;
+		let inlineClarification: string | undefined;
 		let navigationAction: "back" | "forward" | undefined;
 		const baseHelpText = navigation
 			? "up/down navigate  enter select  ←/→ question  esc cancel"
@@ -286,6 +295,15 @@ async function askSingleQuestion(
 					inlineInput = text;
 				},
 			},
+			clarificationInput: clarificationOptionLabel
+				? {
+						optionLabel: clarificationOptionLabel,
+						allowEmpty: false,
+						onSubmit: (text: string) => {
+							inlineClarification = text;
+						},
+					}
+				: undefined,
 			onLeft: navigation?.allowBack
 				? () => {
 						navigationAction = "back";
@@ -304,7 +322,7 @@ async function askSingleQuestion(
 		if (!timeoutTriggered && choice === undefined && typeof timeout === "number") {
 			timeoutTriggered = Date.now() - startMs >= timeout;
 		}
-		return { choice, timedOut: timeoutTriggered, navigation: navigationAction, inlineInput };
+		return { choice, timedOut: timeoutTriggered, navigation: navigationAction, inlineInput, inlineClarification };
 	};
 
 	// Fallback for UI contexts that don't support inline custom input (they
@@ -315,6 +333,13 @@ async function askSingleQuestion(
 		const input = signal ? await untilAborted(signal, showCustomInput) : await showCustomInput();
 		return { input };
 	};
+	const promptForClarificationInput = async (): Promise<{ input: string | undefined }> => {
+		const dialogOptions = signal ? { signal } : undefined;
+		const showClarificationInput = () =>
+			ui.editor("Ask a clarification question:", undefined, dialogOptions, { promptStyle: true });
+		const input = signal ? await untilAborted(signal, showClarificationInput) : await showClarificationInput();
+		return { input: input !== undefined && input.trim() === "" ? undefined : input };
+	};
 
 	const promptWithProgress = navigation?.progressText ? `${question} (${navigation.progressText})` : question;
 	if (multi) {
@@ -337,6 +362,9 @@ async function askSingleQuestion(
 				opts.push(doneLabel);
 			}
 			opts.push(otherOptionLabel);
+			if (clarificationOptionLabel) {
+				opts.push(clarificationOptionLabel);
+			}
 
 			const prefix = selected.size > 0 ? `(${selected.size} selected) ` : "";
 			const {
@@ -344,6 +372,7 @@ async function askSingleQuestion(
 				timedOut: selectTimedOut,
 				navigation: arrowNavigation,
 				inlineInput,
+				inlineClarification,
 			} = await selectOption(`${prefix}${promptWithProgress}`, opts, cursorIndex);
 
 			if (arrowNavigation) {
@@ -370,6 +399,18 @@ async function askSingleQuestion(
 				customInput = input;
 				break;
 			}
+			if (clarificationOptionLabel && choice === clarificationOptionLabel) {
+				if (selectTimedOut) {
+					timedOut = true;
+					break;
+				}
+				const input =
+					inlineClarification !== undefined ? inlineClarification : (await promptForClarificationInput()).input;
+				if (input === undefined) {
+					break;
+				}
+				return { selectedOptions: [], clarificationQuestion: input, timedOut };
+			}
 
 			const selectedIdx = opts.indexOf(choice);
 			if (selectedIdx >= 0) {
@@ -400,7 +441,9 @@ async function askSingleQuestion(
 		selectedOptions = Array.from(selected);
 	} else {
 		const displayLabels = addRecommendedSuffix(optionLabels, recommended);
-		const optionsWithNavigation = [...displayLabels, otherOptionLabel];
+		const optionsWithNavigation = clarificationOptionLabel
+			? [...displayLabels, otherOptionLabel, clarificationOptionLabel]
+			: [...displayLabels, otherOptionLabel];
 
 		let initialIndex = recommended;
 		const previouslySelected = selectedOptions[0];
@@ -420,6 +463,7 @@ async function askSingleQuestion(
 			timedOut: selectTimedOut,
 			navigation: arrowNavigation,
 			inlineInput,
+			inlineClarification,
 		} = await selectOption(promptWithProgress, optionsWithNavigation, initialIndex);
 		timedOut = selectTimedOut;
 
@@ -439,6 +483,15 @@ async function askSingleQuestion(
 				}
 				// If input was dismissed (undefined), keep prior selectedOptions/customInput intact
 			}
+		} else if (clarificationOptionLabel && choice === clarificationOptionLabel) {
+			if (!selectTimedOut) {
+				const input =
+					inlineClarification !== undefined ? inlineClarification : (await promptForClarificationInput()).input;
+				if (input !== undefined) {
+					return { selectedOptions: [], clarificationQuestion: input, timedOut };
+				}
+				// If input was dismissed (undefined), keep prior selectedOptions/customInput intact
+			}
 		} else {
 			const stripped = stripRecommendedSuffix(choice);
 			if (optionLabels.includes(stripped)) {
@@ -466,6 +519,9 @@ async function askSingleQuestion(
 }
 
 function formatQuestionResult(result: QuestionResult): string {
+	if (result.clarificationQuestion !== undefined) {
+		return `${result.id}: clarification requested: ${result.clarificationQuestion}`;
+	}
 	if (result.customInput !== undefined) {
 		return `${result.id}: "${result.customInput}"`;
 	}
@@ -682,6 +738,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 					optionLabels: rawOptionLabels,
 					selectedOptions: decoded.selectedOptions,
 					customInput: decoded.customInput,
+					clarificationQuestion: decoded.clarificationQuestion,
 					navigation: undefined as NavigationControls | undefined,
 					cancelled: false,
 					timedOut: false,
@@ -693,6 +750,9 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 				const displayQuestion = deepInterviewPrompt ?? q.question;
 				const shouldNumberOptions = isDeepInterviewQuestion || isDeepInterviewAskQuestion(q.question);
 				const optionLabels = shouldNumberOptions ? numberOptionLabels(rawOptionLabels) : rawOptionLabels;
+				const clarificationOptionLabel = shouldNumberOptions
+					? formatNumberedOptionLabel(ASK_CLARIFICATION_OPTION, optionLabels.length + 1)
+					: undefined;
 				const initialSelection =
 					shouldNumberOptions && options?.previous
 						? {
@@ -706,6 +766,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 				const {
 					selectedOptions: displaySelectedOptions,
 					customInput,
+					clarificationQuestion,
 					navigation,
 					cancelled,
 					timedOut,
@@ -719,6 +780,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 					otherOptionLabel: shouldNumberOptions
 						? formatNumberedOptionLabel(OTHER_OPTION, optionLabels.length)
 						: undefined,
+					clarificationOptionLabel,
 				});
 				const selectedOptions = shouldNumberOptions
 					? displaySelectedOptions.map(selected => {
@@ -726,7 +788,15 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 							return displayIndex >= 0 ? (rawOptionLabels[displayIndex] ?? selected) : selected;
 						})
 					: displaySelectedOptions;
-				return { optionLabels: rawOptionLabels, selectedOptions, customInput, navigation, cancelled, timedOut };
+				return {
+					optionLabels: rawOptionLabels,
+					selectedOptions,
+					customInput,
+					clarificationQuestion,
+					navigation,
+					cancelled,
+					timedOut,
+				};
 			} catch (error) {
 				if (error instanceof Error && error.name === "AbortError") {
 					throw new ToolAbortError("Ask input was cancelled");
@@ -737,22 +807,40 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 
 		if (params.questions.length === 1) {
 			const [q] = params.questions;
-			const { optionLabels, selectedOptions, customInput, cancelled, timedOut } = await askQuestion(q);
-
-			if (!timedOut && (cancelled || (selectedOptions.length === 0 && customInput === undefined))) {
+			const { optionLabels, selectedOptions, customInput, clarificationQuestion, cancelled, timedOut } =
+				await askQuestion(q);
+
+			if (
+				!timedOut &&
+				(cancelled ||
+					(selectedOptions.length === 0 && customInput === undefined && clarificationQuestion === undefined))
+			) {
 				context?.abort();
 				throw new ToolAbortError("Ask tool was cancelled by the user");
 			}
-			await this.#recordDeepInterviewRound(q, selectedOptions, customInput);
+			if (clarificationQuestion === undefined) {
+				await this.#recordDeepInterviewRound(q, selectedOptions, customInput);
+			}
 			const details: AskToolDetails = {
 				question: q.question,
 				options: optionLabels,
 				multi: q.multi ?? false,
 				selectedOptions,
 				customInput,
+				clarificationQuestion,
 			};
 
 			const responseParts: string[] = [];
+			if (clarificationQuestion !== undefined) {
+				responseParts.push(
+					clarificationQuestion.includes("\n")
+						? `User asked a clarification question about the choices:\n${clarificationQuestion
+								.split("\n")
+								.map(line => `  ${line}`)
+								.join("\n")}`
+						: `User asked a clarification question about the choices: ${clarificationQuestion}`,
+				);
+			}
 			if (selectedOptions.length > 0) {
 				responseParts.push(
 					q.multi ? `User selected: ${selectedOptions.join(", ")}` : `User selected: ${selectedOptions[0]}`,
@@ -787,6 +875,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 				optionLabels,
 				selectedOptions,
 				customInput,
+				clarificationQuestion,
 				navigation: navAction,
 				cancelled,
 				timedOut,
@@ -804,9 +893,12 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 				multi: q.multi ?? false,
 				selectedOptions,
 				customInput,
+				clarificationQuestion,
 			};
 
-			await this.#recordDeepInterviewRound(q, selectedOptions, customInput);
+			if (clarificationQuestion === undefined) {
+				await this.#recordDeepInterviewRound(q, selectedOptions, customInput);
+			}
 
 			if (navAction === "back") {
 				questionIndex = Math.max(0, questionIndex - 1);
@@ -995,7 +1087,10 @@ export const askToolRenderer = {
 		// Multi-part results
 		if (details.results && details.results.length > 0) {
 			const hasAnySelection = details.results.some(
-				r => r.customInput !== undefined || (r.selectedOptions && r.selectedOptions.length > 0),
+				r =>
+					r.clarificationQuestion !== undefined ||
+					r.customInput !== undefined ||
+					(r.selectedOptions && r.selectedOptions.length > 0),
 			);
 			const header = renderStatusLine(
 				{
@@ -1013,7 +1108,8 @@ export const askToolRenderer = {
 				const isLastQuestion = i === details.results.length - 1;
 				const branch = isLastQuestion ? uiTheme.tree.last : uiTheme.tree.branch;
 				const continuation = isLastQuestion ? "   " : `${uiTheme.fg("dim", uiTheme.tree.vertical)}  `;
-				const hasSelection = r.customInput !== undefined || r.selectedOptions.length > 0;
+				const hasSelection =
+					r.clarificationQuestion !== undefined || r.customInput !== undefined || r.selectedOptions.length > 0;
 				const statusIcon = hasSelection
 					? uiTheme.styledSymbol("status.success", "success")
 					: uiTheme.styledSymbol("status.warning", "warning");
@@ -1028,7 +1124,10 @@ export const askToolRenderer = {
 
 				const answerLines: string[] = [];
 				for (let j = 0; j < r.selectedOptions.length; j++) {
-					const isLast = j === r.selectedOptions.length - 1 && r.customInput === undefined;
+					const isLast =
+						j === r.selectedOptions.length - 1 &&
+						r.customInput === undefined &&
+						r.clarificationQuestion === undefined;
 					const optBranch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
 					const selectedLabel = renderInlineMarkdown(r.selectedOptions[j], mdTheme, t =>
 						uiTheme.fg("toolOutput", t),
@@ -1042,6 +1141,14 @@ export const askToolRenderer = {
 				}
 				if (r.customInput !== undefined) {
 					container.addChild(new Text(renderCustomInput(uiTheme, continuation, r.customInput, true, false), 0, 0));
+				} else if (r.clarificationQuestion !== undefined) {
+					container.addChild(
+						new Text(
+							renderCustomInput(uiTheme, continuation, `Clarification: ${r.clarificationQuestion}`, true, false),
+							0,
+							0,
+						),
+					);
 				} else if (r.selectedOptions.length === 0) {
 					container.addChild(
 						new Text(
@@ -1063,7 +1170,9 @@ export const askToolRenderer = {
 		}
 
 		const hasSelection =
-			details.customInput !== undefined || (details.selectedOptions && details.selectedOptions.length > 0);
+			details.clarificationQuestion !== undefined ||
+			details.customInput !== undefined ||
+			(details.selectedOptions && details.selectedOptions.length > 0);
 		const header = renderStatusLine({ icon: hasSelection ? "success" : "warning", title: "Ask" }, uiTheme);
 		const container = new Container();
 		container.addChild(new Text(header, 0, 0));
@@ -1075,7 +1184,10 @@ export const askToolRenderer = {
 		const answerLines: string[] = [];
 		if (details.selectedOptions && details.selectedOptions.length > 0) {
 			for (let i = 0; i < details.selectedOptions.length; i++) {
-				const isLast = i === details.selectedOptions.length - 1 && details.customInput === undefined;
+				const isLast =
+					i === details.selectedOptions.length - 1 &&
+					details.customInput === undefined &&
+					details.clarificationQuestion === undefined;
 				const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
 				const selectedLabel = renderInlineMarkdown(details.selectedOptions[i], mdTheme, t =>
 					uiTheme.fg("toolOutput", t),
@@ -1090,6 +1202,14 @@ export const askToolRenderer = {
 		}
 		if (details.customInput !== undefined) {
 			container.addChild(new Text(renderCustomInput(uiTheme, " ", details.customInput, true, false), 0, 0));
+		} else if (details.clarificationQuestion !== undefined) {
+			container.addChild(
+				new Text(
+					renderCustomInput(uiTheme, " ", `Clarification: ${details.clarificationQuestion}`, true, false),
+					0,
+					0,
+				),
+			);
 		} else if (!details.selectedOptions || details.selectedOptions.length === 0) {
 			container.addChild(
 				new Text(

package/src/utils/cmux-workspace.ts

@@ -0,0 +1,106 @@
+import { logger } from "@gajae-code/utils";
+
+const CMUX_COMMAND = "cmux";
+const CMUX_WORKSPACE_ID_ENV = "CMUX_WORKSPACE_ID";
+const CONTROL_CHARS = /[\u0000-\u001f\u007f-\u009f]/g;
+const CMUX_WORKSPACE_RENAME_TIMEOUT_MS = 1500;
+
+export interface CmuxWorkspaceRenameCommand {
+	command: string;
+	args: string[];
+}
+
+export interface CmuxWorkspaceRenameProcess {
+	exited: Promise<number>;
+	kill(): void;
+	unref(): void;
+}
+
+export interface CmuxWorkspaceTitleSyncOptions {
+	env?: NodeJS.ProcessEnv;
+	isTty?: boolean;
+	which?: (command: string) => string | null;
+	spawn?: (
+		command: string[],
+		options: { env: NodeJS.ProcessEnv; stdin: "ignore"; stdout: "ignore"; stderr: "ignore" },
+	) => CmuxWorkspaceRenameProcess;
+}
+
+function defaultSpawn(
+	command: string[],
+	options: { env: NodeJS.ProcessEnv; stdin: "ignore"; stdout: "ignore"; stderr: "ignore" },
+): CmuxWorkspaceRenameProcess {
+	return Bun.spawn(command, options);
+}
+
+export function sanitizeCmuxWorkspaceTitle(title: string | undefined): string | undefined {
+	if (!title) return undefined;
+	const sanitized = title.replace(CONTROL_CHARS, " ").replace(/\s+/g, " ").trim();
+	return sanitized || undefined;
+}
+
+export function buildCmuxWorkspaceRenameCommand(
+	sessionName: string | undefined,
+	env: NodeJS.ProcessEnv = process.env,
+): CmuxWorkspaceRenameCommand | null {
+	const workspaceId = env[CMUX_WORKSPACE_ID_ENV]?.trim();
+	if (!workspaceId) return null;
+
+	const title = sanitizeCmuxWorkspaceTitle(sessionName);
+	if (!title) return null;
+
+	return {
+		command: CMUX_COMMAND,
+		args: ["workspace", "rename", workspaceId, "--title", title],
+	};
+}
+
+export function syncCmuxWorkspaceTitle(
+	sessionName: string | undefined,
+	options: CmuxWorkspaceTitleSyncOptions = {},
+): void {
+	const isTty = options.isTty ?? process.stdout.isTTY === true;
+	if (!isTty) return;
+
+	const env = options.env ?? process.env;
+	const plan = buildCmuxWorkspaceRenameCommand(sessionName, env);
+	if (!plan) return;
+
+	const which = options.which ?? Bun.which;
+	let resolvedCommand: string | null;
+	try {
+		resolvedCommand = which(plan.command);
+	} catch (error) {
+		logger.debug("cmux workspace rename command lookup failed", { error: String(error) });
+		return;
+	}
+	if (!resolvedCommand) return;
+
+	const spawn = options.spawn ?? defaultSpawn;
+	try {
+		const proc = spawn([resolvedCommand, ...plan.args], {
+			env,
+			stdin: "ignore",
+			stdout: "ignore",
+			stderr: "ignore",
+		});
+		proc.unref();
+		const timer = setTimeout(() => {
+			try {
+				proc.kill();
+			} catch {}
+		}, CMUX_WORKSPACE_RENAME_TIMEOUT_MS);
+		timer.unref?.();
+		void proc.exited
+			.then(exitCode => {
+				clearTimeout(timer);
+				if (exitCode !== 0) logger.debug("cmux workspace rename exited non-zero", { exitCode });
+			})
+			.catch(error => {
+				clearTimeout(timer);
+				logger.debug("cmux workspace rename failed", { error: String(error) });
+			});
+	} catch (error) {
+		logger.debug("cmux workspace rename failed to start", { error: String(error) });
+	}
+}

package/src/utils/title-generator.ts

@@ -9,6 +9,7 @@ import type { ModelRegistry } from "../config/model-registry";
 import { resolveRoleSelection } from "../config/model-resolver";
 import type { Settings } from "../config/settings";
 import titleSystemPrompt from "../prompts/system/title-system.md" with { type: "text" };
+import { syncCmuxWorkspaceTitle } from "./cmux-workspace";
 
 const TITLE_SYSTEM_PROMPT = prompt.render(titleSystemPrompt);
 
@@ -218,6 +219,7 @@ export function setTerminalTitle(title: string): void {
 
 export function setSessionTerminalTitle(sessionName: string | undefined, cwd?: string): void {
 	setTerminalTitle(formatSessionTerminalTitle(sessionName, cwd));
+	syncCmuxWorkspaceTitle(sessionName);
 }
 
 /**

package/src/web/search/index.ts

@@ -68,6 +68,18 @@ function formatProviderError(error: unknown, provider: SearchProvider): string {
 	return `Unknown error from ${provider.label}`;
 }
 
+function formatProviderFailure(error: unknown, provider: SearchProvider): string {
+	if (error instanceof SearchProviderError) return error.message;
+	return `${provider.id}: ${formatProviderError(error, provider)}`;
+}
+
+function formatFallbackWarning(
+	failures: Array<{ provider: SearchProvider; error: unknown }>,
+	provider: SearchProvider,
+): string {
+	return `Web search provider fallback: ${failures.map(f => formatProviderFailure(f.error, f.provider)).join("; ")}; using ${provider.label}.`;
+}
+
 /** Truncate text for tool output */
 function truncateText(text: string, maxLen: number): string {
 	if (text.length <= maxLen) return text;
@@ -185,10 +197,11 @@ async function executeSearch(
 			});
 
 			const text = formatForLLM(response);
+			const warning = failures.length > 0 ? formatFallbackWarning(failures, provider) : undefined;
 
 			return {
-				content: [{ type: "text" as const, text }],
-				details: { response },
+				content: [{ type: "text" as const, text: warning ? `Warning: ${warning}\n\n${text}` : text }],
+				details: { response, ...(warning ? { warning } : {}) },
 			};
 		} catch (error) {
 			// Surface user-initiated cancellation immediately so the session sees
@@ -207,13 +220,7 @@ async function executeSearch(
 		: `Unknown error from ${lastProvider.label}`;
 	const message =
 		providers.length > 1
-			? `All web search providers failed: ${failures
-					.map(f =>
-						f.error instanceof SearchProviderError
-							? f.error.message
-							: `${f.provider.id}: ${formatProviderError(f.error, f.provider)}`,
-					)
-					.join("; ")}`
+			? `All web search providers failed: ${failures.map(f => formatProviderFailure(f.error, f.provider)).join("; ")}`
 			: baseMessage;
 
 	return {
@@ -321,7 +328,12 @@ export function getSearchTools(): CustomTool<any, any>[] {
 	return [webSearchCustomTool];
 }
 
-export { getSearchProvider, setPreferredSearchProvider, setSearchFallbackProviders } from "./provider";
+export {
+	getConfiguredSearchProviderPreference,
+	getSearchProvider,
+	setPreferredSearchProvider,
+	setSearchFallbackProviders,
+} from "./provider";
 export { setSearchHardTimeoutMs } from "./providers/utils";
 export type { SearchProviderId as SearchProvider, SearchResponse } from "./types";
 export { isConfigurableSearchProviderId, isSearchProviderPreference } from "./types";

package/src/web/search/provider.ts

@@ -149,6 +149,21 @@ export function setSearchFallbackProviders(ids: readonly string[]): void {
 	fallbackProvIds = ids.filter(isConfigurableSearchProviderId);
 }
 
+export interface SearchProviderPreferenceSource {
+	get(path: "providers.webSearch" | "web_search.provider"): SearchProviderId | "auto";
+	has(path: "providers.webSearch" | "web_search.provider"): boolean;
+}
+
+export function getConfiguredSearchProviderPreference(
+	settings: SearchProviderPreferenceSource,
+): SearchProviderId | "auto" {
+	const providerPreference = settings.get("providers.webSearch");
+	if (settings.has("providers.webSearch") || providerPreference !== "auto") return providerPreference;
+
+	const legacyProviderPreference = settings.get("web_search.provider");
+	return legacyProviderPreference;
+}
+
 export interface ResolveProviderChainOptions {
 	authStorage: AuthStorage;
 	sessionId?: string;

package/src/web/search/render.ts

@@ -66,6 +66,7 @@ function renderFallbackText(contentText: string, expanded: boolean, theme: Theme
 export interface SearchRenderDetails {
 	response: SearchResponse;
 	error?: string;
+	warning?: string;
 }
 
 /** Render web search result with tree-based layout */
@@ -130,6 +131,8 @@ export function renderSearchResult(
 
 	const metaLines: string[] = [];
 	metaLines.push(`${theme.fg("muted", "Provider:")} ${theme.fg("text", providerLabel)}`);
+	if (details.warning)
+		metaLines.push(`${theme.fg("muted", "Fallback:")} ${theme.fg("warning", truncateToWidth(details.warning, 110))}`);
 	if (response.authMode)
 		metaLines.push(
 			`${theme.fg("muted", "Auth:")} ${theme.fg("text", response.authMode === "oauth" ? "OAuth" : response.authMode === "api_key" ? "API key" : response.authMode)}`,