@f5-sales-demo/xcsh 22.2.1 → 22.3.3

package/src/internal-urls/build-info.generated.ts

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "22.2.1",
-	"commit": "36bd12837ef237223ef118e02b72b46534defe70",
-	"shortCommit": "36bd128",
+	"version": "22.3.3",
+	"commit": "82917afa08ee15956c363dacfb1c0f4511c74d3e",
+	"shortCommit": "82917af",
 	"branch": "main",
-	"tag": "v22.2.1",
-	"commitDate": "2026-09-28T02:56:41Z",
-	"buildDate": "2026-09-28T03:32:41.148Z",
+	"tag": "v22.3.3",
+	"commitDate": "2026-09-28T13:54:02Z",
+	"buildDate": "2026-09-28T14:30:23.798Z",
 	"dirty": true,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5-sales-demo/xcsh",
 	"repoSlug": "f5-sales-demo/xcsh",
-	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/36bd12837ef237223ef118e02b72b46534defe70",
-	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v22.2.1"
+	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/82917afa08ee15956c363dacfb1c0f4511c74d3e",
+	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v22.3.3"
 };

package/src/internal-urls/documentation-repository.ts

@@ -6,12 +6,13 @@ import os from "node:os";
 import path from "node:path";
 import { gunzipSync } from "node:zlib";
 import { createStore } from "@tobilu/qmd";
-import type {
-	DocumentationAsset,
-	DocumentationDocument,
-	DocumentationRepository,
-	DocumentationSearchResult,
-	DocumentationSource,
+import {
+	DOCUMENTATION_SOURCES,
+	type DocumentationAsset,
+	type DocumentationDocument,
+	type DocumentationRepository,
+	type DocumentationSearchResult,
+	type DocumentationSource,
 } from "./documentation-resolve";
 import { extractVerifiedDocumentationAsset, type VerifiedDocumentationAsset } from "./documentation-snapshot";
 
@@ -259,6 +260,23 @@ function boundedSnippet(markdown: string, query: string): string {
 	return `${prefix}${body.slice(start, start + 598 - prefix.length - suffix.length)}${suffix}`;
 }
 
+function lexicalDocumentationQuery(query: string): string {
+	return query.replace(/^\s*(?:what|who)\s+(?:is|are)\s+/i, "").trim() || query;
+}
+
+const SUPPORT_QUERY = /\b(?:troubleshoot|support|knowledge[- ]base|error|failure|issue|K[0-9]{6,})\b/i;
+const CONFIGURATION_QUERY = /\b(?:configure|configuration|set\s*up|procedure|instructions?|how\s+(?:do|can|to))\b/i;
+const CONCEPTUAL_QUERY = /\b(?:what\s+(?:is|are)|overview|product|solution|capabilities|benefits)\b/i;
+const MARKETING_TOPIC =
+	/\b(?:client[- ]side defense|distributed cloud|web (?:app|application) and api protection|multi[- ]cloud networking|dns load balancer|bot defense|api security|app connect|appstack|content delivery network|cdn|mobile app shield|synthetic monitoring|web app scanning)\b/i;
+
+function preferredDocumentationSource(query: string): DocumentationSource | undefined {
+	if (SUPPORT_QUERY.test(query)) return "my-f5-com";
+	if (CONFIGURATION_QUERY.test(query)) return "docs-cloud-f5-com";
+	if (CONCEPTUAL_QUERY.test(query) || MARKETING_TOPIC.test(query)) return "www-f5-com";
+	return undefined;
+}
+
 export function createEmbeddedDocumentationRepository(
 	assets: EmbeddedDocumentationAssets,
 	options: EmbeddedDocumentationRepositoryOptions = {},
@@ -297,7 +315,27 @@ export function createEmbeddedDocumentationRepository(
 		},
 		search: async (query, source, limit): Promise<readonly DocumentationSearchResult[]> => {
 			const current = await state();
-			const results = await current.store.searchLex(query, { limit, collection: source });
+			const lexicalQuery = lexicalDocumentationQuery(query);
+			const preferredSource = source ? undefined : preferredDocumentationSource(query);
+			const results = source
+				? await current.store.searchLex(lexicalQuery, { limit, collection: source })
+				: (
+						await Promise.all(
+							DOCUMENTATION_SOURCES.map(collection =>
+								current.store.searchLex(lexicalQuery, { limit, collection }),
+							),
+						)
+					).flat();
+			results.sort((left, right) => {
+				const sourceOrder =
+					Number(right.collectionName === preferredSource) - Number(left.collectionName === preferredSource);
+				return (
+					sourceOrder ||
+					right.score - left.score ||
+					left.collectionName.localeCompare(right.collectionName) ||
+					left.displayPath.localeCompare(right.displayPath)
+				);
+			});
 			const rows: DocumentationSearchResult[] = [];
 			const lookup = current.database.query(
 				"SELECT source, stable_path, title, original_url, markdown FROM documentation_documents WHERE source = ? AND stable_path = ?",

package/src/internal-urls/documentation-resolve.ts

@@ -1,6 +1,6 @@
 import type { InternalResource, InternalUrl } from "./types";
 
-export const DOCUMENTATION_SOURCES = ["docs-cloud-f5-com", "my-f5-com"] as const;
+export const DOCUMENTATION_SOURCES = ["docs-cloud-f5-com", "my-f5-com", "www-f5-com"] as const;
 export type DocumentationSource = (typeof DOCUMENTATION_SOURCES)[number];
 
 export interface DocumentationProvenance {

package/src/internal-urls/documentation-snapshot.ts

@@ -68,7 +68,13 @@ const DOCUMENT_PROVENANCE_KEYS = [
 const SOURCE_ROOT_URLS: Readonly<Record<DocumentationSource, string>> = {
 	"docs-cloud-f5-com": "https://docs.cloud.f5.com/docs-v2",
 	"my-f5-com": "https://my.f5.com/manage/s",
+	"www-f5-com": "https://www.f5.com/products/distributed-cloud-services",
 };
+const MARKETING_SOLUTION_URLS = new Set([
+	"https://www.f5.com/solutions/use-cases/hybrid-multicloud-application-delivery",
+	"https://www.f5.com/solutions/use-cases/multi-cloud-networking",
+	"https://www.f5.com/solutions/web-app-and-api-protection",
+]);
 
 export interface DocumentationReleaseAssetPin {
 	readonly sha256: string;
@@ -182,7 +188,11 @@ function validateTimestamp(value: unknown, field: string): string {
 function validateOriginalUrl(value: unknown, source: DocumentationSource, field: string): string {
 	const result = string(value, field);
 	const root = SOURCE_ROOT_URLS[source];
-	if (result !== root && !result.startsWith(`${root}/`) && !result.startsWith(`${root}?`)) {
+	const allowed =
+		source === "www-f5-com"
+			? result === root || result.startsWith(`${root}/`) || MARKETING_SOLUTION_URLS.has(result)
+			: result === root || result.startsWith(`${root}/`) || result.startsWith(`${root}?`);
+	if (!allowed) {
 		throw new Error(`${field} is outside the declared source root`);
 	}
 	return result;
@@ -598,6 +608,12 @@ export async function verifyDocumentationRelease(
 		const markdown = entry.data.toString("utf8");
 		const parsed = splitDocument(markdown);
 		const originalUrl = validateOriginalUrl(item.url, source, "manifest document URL");
+		if (
+			source === "www-f5-com" &&
+			archiveMemberPath !== `content/www-f5-com${new URL(originalUrl).pathname}/index.md`
+		) {
+			throw new Error(`marketing document path does not match its reviewed URL: ${archiveMemberPath}`);
+		}
 		if (parsed.metadata.sourceId !== source || parsed.metadata.url !== originalUrl)
 			throw new Error(`manifest document frontmatter mismatch: ${archiveMemberPath}`);
 		const bodySha256 = string(item.body_sha256, "manifest document body hash");
@@ -620,6 +636,9 @@ export async function verifyDocumentationRelease(
 		};
 	});
 
+	const marketingDocumentPaths = new Set(
+		documents.filter(document => document.source === "www-f5-com").map(document => document.stablePath),
+	);
 	const assets = manifest.assets.map((value, position): VerifiedDocumentationAsset => {
 		const item = object(value, `manifest asset ${position}`);
 		exactKeys(item, MANIFEST_ASSET_KEYS, `manifest asset ${position}`);
@@ -631,6 +650,9 @@ export async function verifyDocumentationRelease(
 		const source = archiveMemberPath.split("/")[1] as DocumentationSource;
 		if (!DOCUMENTATION_SOURCES.includes(source)) throw new Error(`unknown manifest asset source: ${source}`);
 		const parsed = stableAssetPath(archiveMemberPath, source);
+		if (source === "www-f5-com" && !marketingDocumentPaths.has(parsed.stablePath)) {
+			throw new Error(`marketing asset is not attached to a reviewed document: ${archiveMemberPath}`);
+		}
 		const digest = string(item.sha256, "manifest asset hash");
 		if (!SHA256.test(digest) || !parsed.filename.startsWith(`${digest}.`)) {
 			throw new Error(`manifest asset digest filename mismatch: ${archiveMemberPath}`);
@@ -843,6 +865,11 @@ export async function buildDocumentationIndex(
 						pattern: "**/*.md",
 						context: { "/": "MyF5 support and knowledge-base documentation" },
 					},
+					"www-f5-com": {
+						path: path.join(documentsRoot, "www-f5-com"),
+						pattern: "**/*.md",
+						context: { "/": "F5 Distributed Cloud product and solution overviews" },
+					},
 				},
 			},
 		});

package/src/internal-urls/knowledge-classifier.ts

@@ -1,5 +1,5 @@
 export type KnowledgeRoute = "api" | "documentation" | "direct-uri" | "none";
-export type DocumentationKnowledgeSource = "docs-cloud-f5-com" | "my-f5-com";
+export type DocumentationKnowledgeSource = "docs-cloud-f5-com" | "my-f5-com" | "www-f5-com";
 
 export interface KnowledgeClassifierResource {
 	readonly name: string;
@@ -46,7 +46,11 @@ const ANAPHORIC = /\b(?:its|it|that|this|those|them|the same)\b/i;
 const API_METADATA =
 	/\b(?:api|endpoint|operation\s*id|api\s+path|http\s+method|method|payload|request\s+body|required\s+fields?|enum|allowed\s+values?|constraints?|limits?|maximum|max(?:imum)?|minimum|min(?:imum)?|how\s+many|create|creates|creating|get|gets|list|lists|update|updates|replace|replaces|delete|deletes|clone|import)\b/i;
 const DOCUMENTATION_INTENT =
-	/\b(?:documentation|docs?|guide|tutorial|how\s+(?:do|can|to)|configure|configuration|set\s*up|troubleshoot|procedure|instructions?)\b/i;
+	/\b(?:documentation|docs?|guide|tutorial|how\s+(?:do|can|to)|configure|configuration|set\s*up|troubleshoot|procedure|instructions?|what\s+(?:is|are)|overview|product|solution|capabilities|benefits)\b/i;
+const CONFIGURATION_INTENT = /\b(?:configure|configuration|set\s*up|procedure|instructions?|how\s+(?:do|can|to))\b/i;
+const SUPPORT_INTENT = /\b(?:troubleshoot|support|knowledge[- ]base|error|failure|issue|K[0-9]{6,})\b/i;
+const MARKETING_TOPIC =
+	/\b(?:client[- ]side defense|distributed cloud|web (?:app|application) and api protection|multi[- ]cloud networking|dns load balancer|bot defense|api security|app connect|appstack|content delivery network|cdn|mobile app shield|synthetic monitoring|web app scanning)\b/i;
 const EXCLUDED_API_INTENT = /\b(?:pricing|price|quote|licen[cs]ing|sales)\b/i;
 const DIRECT_URI = /\bxcsh:\/\/(?:api-catalog|api-spec|documentation)\/[^\s)>\]}]*/i;
 
@@ -130,7 +134,9 @@ function direct(prompt: string): KnowledgeClassification | null {
 		}
 		if (parsed.hostname === "documentation") {
 			const source = parsed.pathname.split("/").filter(Boolean)[0];
-			if (source === "docs-cloud-f5-com" || source === "my-f5-com") Object.assign(constraints, { source });
+			if (source === "docs-cloud-f5-com" || source === "my-f5-com" || source === "www-f5-com") {
+				Object.assign(constraints, { source });
+			}
 		}
 		return { route: "direct-uri", confidence: 1, directUri, constraints, query: EMPTY_QUERY };
 	} catch {
@@ -191,9 +197,17 @@ export function classifyKnowledgeRequest(prompt: string, options: KnowledgeClass
 	if (
 		!thirdPartyOnly &&
 		(DOCUMENTATION_INTENT.test(prompt) || (ANAPHORIC.test(prompt) && previousDocumentation)) &&
-		(F5_SCOPE.test(prompt) || /\b(?:documentation|docs?)\b/i.test(prompt) || previousDocumentation)
+		(F5_SCOPE.test(prompt) ||
+			/\b(?:documentation|docs?)\b/i.test(prompt) ||
+			MARKETING_TOPIC.test(prompt) ||
+			previousDocumentation)
 	) {
-		const source = options.documentationSource ?? previousDocumentation?.source;
+		const inferredSource = SUPPORT_INTENT.test(prompt)
+			? "my-f5-com"
+			: CONFIGURATION_INTENT.test(prompt)
+				? "docs-cloud-f5-com"
+				: "www-f5-com";
+		const source = options.documentationSource ?? previousDocumentation?.source ?? inferredSource;
 		const subject = documentationSubject(prompt);
 		return {
 			route: "documentation",

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

@@ -1,5 +1,11 @@
 import { ThinkingLevel } from "@f5-sales-demo/pi-agent-core";
-import { getSupportedReasoningEfforts, type Model, modelsAreEqual, ReasoningEffort } from "@f5-sales-demo/pi-ai";
+import {
+	type CodexContextTier,
+	getSupportedReasoningEfforts,
+	type Model,
+	modelsAreEqual,
+	ReasoningEffort,
+} from "@f5-sales-demo/pi-ai";
 import {
 	Container,
 	getKeybindings,
@@ -58,6 +64,10 @@ export function reasoningLabel(level: ThinkingLevel): string {
 		}[level] ?? level
 	);
 }
+
+function formatContextSize(tokens: number): string {
+	return `${Math.round(tokens / 1_000)}K`;
+}
 export interface ModelNavigationContext {
 	initialSearchInput?: string;
 	initialProvider?: string;
@@ -312,6 +322,8 @@ export interface ModelSelection {
 	model: Model;
 	selector: string;
 	thinkingLevel: ThinkingLevel;
+	/** Provider-wide context policy, present only for supported OpenAI routes. */
+	contextTier?: CodexContextTier;
 	role?: string;
 }
 type RoleSelectCallback = (selection: ModelSelection) => boolean | undefined | Promise<boolean | undefined>;
@@ -398,19 +410,28 @@ export class ModelSelectorComponent extends Container {
 		];
 		if (this.#isMenuOpen && selected) {
 			details.push(...wrapTextWithAnsi(selected.selector, inner));
-			title = getModelDisplayName(selected.model);
+			title =
+				this.#menuStep === "thinking"
+					? "Reasoning"
+					: this.#menuStep === "context"
+						? "Context window"
+						: getModelDisplayName(selected.model);
 			const labels =
-				this.#menuStep === "scope"
-					? this.#scopeActions()
-					: this.#menuStep === "role"
-						? this.#menuRoleActions.map(action => action.label)
-						: this.#getThinkingLevelsForModel(selected.model).map(reasoningLabel);
+				this.#menuStep === "context"
+					? this.#contextActions(selected.model).map(action => action.label)
+					: this.#menuStep === "scope"
+						? this.#scopeActions()
+						: this.#menuStep === "role"
+							? this.#menuRoleActions.map(action => action.label)
+							: this.#getThinkingLevelsForModel(selected.model).map(reasoningLabel);
 			purpose =
 				this.#menuStep === "thinking"
-					? `Reasoning · ${this.#menuScope === "conversation" ? "This conversation" : this.#menuScope === "default" ? "Saved default" : `Role: ${this.#menuSelectedRole}`}`
-					: this.#menuStep === "scope"
-						? "Choose where this model applies."
-						: "Choose a specialist role.";
+					? "Choose reasoning for this model."
+					: this.#menuStep === "context"
+						? "This provider-wide setting controls the usable context window. Scope controls only the model and reasoning assignment."
+						: this.#menuStep === "scope"
+							? "Choose where this model applies."
+							: "Choose a specialist role.";
 			body = labels.map((label, i) => selectorRow([label], [inner - 2], i === this.#menuSelectedIndex));
 			selectedBodyIndex = this.#menuSelectedIndex;
 			if (this.#menuStep === "scope")
@@ -422,10 +443,17 @@ export class ModelSelectorComponent extends Container {
 					][this.#menuSelectedIndex],
 				);
 			else if (this.#menuStep === "thinking") details.push(`Reasoning: ${labels[this.#menuSelectedIndex]}`);
+			else if (this.#menuStep === "context") {
+				const context = this.#contextActions(selected.model)[this.#menuSelectedIndex];
+				if (context) {
+					details.push(`Usable window: ${formatContextSize(context.effectiveContextWindow)}.`);
+					details.push(`Automatic compaction begins at ${formatContextSize(context.autoCompactTokenLimit)}.`);
+				}
+			}
 			if (this.#errorMessage)
 				details.push(`Could not apply: ${String(this.#errorMessage)}. ${selectorKeys("confirm")} to retry.`);
 			footer = [
-				selectorNavigationHint(this.#menuStep === "thinking" ? "confirm" : "continue"),
+				selectorNavigationHint(this.#menuStep === "scope" || this.#menuStep === "role" ? "continue" : "confirm"),
 				selectorCancelHint(),
 			];
 		} else {
@@ -585,13 +613,15 @@ export class ModelSelectorComponent extends Container {
 	// Context menu state
 	#isMenuOpen: boolean = false;
 	#menuSelectedIndex: number = 0;
-	#menuStep: "scope" | "role" | "thinking" = "scope";
+	#menuStep: "thinking" | "context" | "scope" | "role" = "thinking";
 	#menuScope: ModelSelection["scope"] = "conversation";
 	#menuItem?: ModelItem | CanonicalModelItem;
 	#applying = false;
 	#onLogin?: () => void;
 	#currentThinkingLevel: ThinkingLevel = ThinkingLevel.Inherit;
 	#menuSelectedRole: string | null = null;
+	#menuThinkingLevel: ThinkingLevel = ThinkingLevel.Inherit;
+	#menuContextTier?: CodexContextTier;
 
 	constructor(
 		tui: TUI,
@@ -1197,6 +1227,47 @@ export class ModelSelectorComponent extends Container {
 		return foundIndex >= 0 ? foundIndex : 0;
 	}
 
+	#contextSettingFor(model: Model): "providers.openaiContextTier" | "providers.litellmContextTier" | undefined {
+		if (model.provider === "openai-codex") return "providers.openaiContextTier";
+		if (model.provider === "litellm") return "providers.litellmContextTier";
+		return undefined;
+	}
+
+	#contextActions(model: Model): Array<{
+		tier: CodexContextTier;
+		label: string;
+		effectiveContextWindow: number;
+		autoCompactTokenLimit: number;
+	}> {
+		const setting = this.#contextSettingFor(model);
+		if (!setting || !model.maxContextWindow) return [];
+		// The registry has already clamped this to the safe advertised provider limit.
+		const providerMaximum = model.providerContextWindow ?? model.maxContextWindow;
+		const standard = Math.min(272_000, providerMaximum);
+		const codexMaximum = Math.min(model.maxContextWindow, providerMaximum);
+		const effectivePercent = model.effectiveContextWindowPercent ?? 95;
+		const compactPercent = model.autoCompactThresholdPercent ?? 90;
+		const current = this.#settings.get(setting) as CodexContextTier;
+		return [
+			["standard", "Standard", standard],
+			["codex-max", "Codex maximum", codexMaximum],
+			["provider-max", "Provider maximum", providerMaximum],
+		].map(([tier, label, size]) => ({
+			tier: tier as CodexContextTier,
+			label: `${label} — ${formatContextSize(size as number)}${tier === current ? " (current/default)" : ""}`,
+			effectiveContextWindow: Math.floor(((size as number) * effectivePercent) / 100),
+			autoCompactTokenLimit: Math.floor(((size as number) * compactPercent) / 100),
+		}));
+	}
+
+	#contextPreselectIndex(model: Model): number {
+		const setting = this.#contextSettingFor(model);
+		if (!setting) return 0;
+		const current = this.#settings.get(setting) as CodexContextTier;
+		const index = this.#contextActions(model).findIndex(action => action.tier === current);
+		return index >= 0 ? index : 0;
+	}
+
 	#getSelectedItem(): ModelItem | CanonicalModelItem | undefined {
 		return this.#isCanonicalTab()
 			? this.#filteredCanonicalModels[this.#selectedIndex]
@@ -1214,29 +1285,31 @@ export class ModelSelectorComponent extends Container {
 		if (!this.#menuItem || this.#isItemDisabled(this.#menuItem)) return;
 		this.#isMenuOpen = true;
 		this.#menuScope = "conversation";
-		this.#menuStep = "scope";
+		this.#menuStep = "thinking";
 		this.#menuSelectedRole = null;
-		this.#menuSelectedIndex = 0;
+		this.#menuThinkingLevel = this.#getThinkingLevelsForModel(this.#menuItem.model)[0] ?? ThinkingLevel.Inherit;
+		this.#menuContextTier = undefined;
+		this.#menuSelectedIndex = this.#getThinkingPreselectIndex("default", this.#menuItem.model);
 		this.#updateMenu();
 	}
 
-	#openThinkingMenu(role: string): void {
+	#openScopeMenu(): void {
 		const selected = this.#menuItem ?? this.#getSelectedItem();
 		if (!selected) return;
 		this.#menuItem = selected;
 		this.#isMenuOpen = true;
-		this.#menuStep = "thinking";
-		this.#menuSelectedRole = role;
-		this.#menuSelectedIndex = this.#getThinkingPreselectIndex(role, selected.model);
+		this.#menuStep = "scope";
+		this.#menuSelectedIndex = 0;
 		this.#updateMenu();
 	}
 
 	#closeMenu(): void {
 		this.#resetDetailPage();
 		this.#isMenuOpen = false;
-		this.#menuStep = "role";
+		this.#menuStep = "thinking";
 		this.#menuSelectedRole = null;
 		this.#menuItem = undefined;
+		this.#menuContextTier = undefined;
 		this.#updateList();
 	}
 
@@ -1336,11 +1409,13 @@ export class ModelSelectorComponent extends Container {
 		if (!selectedItem) return;
 
 		const optionCount =
-			this.#menuStep === "thinking" && this.#menuSelectedRole !== null
+			this.#menuStep === "thinking"
 				? this.#getThinkingLevelsForModel(selectedItem.model).length
-				: this.#menuStep === "scope"
-					? this.#scopeActions().length
-					: this.#menuRoleActions.length;
+				: this.#menuStep === "context"
+					? this.#contextActions(selectedItem.model).length
+					: this.#menuStep === "scope"
+						? this.#scopeActions().length
+						: this.#menuRoleActions.length;
 		if (optionCount === 0) return;
 
 		if (matchesSelectorKey(keyData, "up")) {
@@ -1356,13 +1431,31 @@ export class ModelSelectorComponent extends Container {
 		}
 
 		if (matchesSelectorKey(keyData, "confirm")) {
+			if (this.#menuStep === "thinking") {
+				const thinking = this.#getThinkingLevelsForModel(selectedItem.model)[this.#menuSelectedIndex];
+				if (!thinking) return;
+				this.#menuThinkingLevel = thinking;
+				if (this.#contextActions(selectedItem.model).length > 0) {
+					this.#menuStep = "context";
+					this.#menuSelectedIndex = this.#contextPreselectIndex(selectedItem.model);
+					this.#updateMenu();
+				} else this.#openScopeMenu();
+				return;
+			}
+			if (this.#menuStep === "context") {
+				const context = this.#contextActions(selectedItem.model)[this.#menuSelectedIndex];
+				if (!context) return;
+				this.#menuContextTier = context.tier;
+				this.#openScopeMenu();
+				return;
+			}
 			if (this.#menuStep === "scope") {
 				this.#menuScope = (["conversation", "default", "role"] as const)[this.#menuSelectedIndex];
 				if (this.#menuScope === "role") {
 					this.#menuStep = "role";
 					this.#menuSelectedIndex = 0;
 					this.#updateMenu();
-				} else this.#openThinkingMenu("default");
+				} else void this.#handleSelect(selectedItem, this.#menuThinkingLevel);
 				return;
 			}
 			if (this.#menuStep === "role") {
@@ -1370,27 +1463,41 @@ export class ModelSelectorComponent extends Container {
 				const action = this.#menuRoleActions[this.#menuSelectedIndex];
 				if (!action) return;
 				this.#menuSelectedRole = action.role;
-				this.#menuStep = "thinking";
-				this.#menuSelectedIndex = this.#getThinkingPreselectIndex(action.role, selectedItem.model);
-				this.#updateMenu();
+				void this.#handleSelect(selectedItem, this.#menuThinkingLevel);
 				return;
 			}
-
-			if (!this.#menuSelectedRole) return;
-			const thinkingOptions = this.#getThinkingLevelsForModel(selectedItem.model);
-			const thinkingLevel = thinkingOptions[this.#menuSelectedIndex];
-			if (!thinkingLevel) return;
-			void this.#handleSelect(selectedItem, thinkingLevel);
-			return;
 		}
 
 		if (getKeybindings().matches(keyData, "tui.select.cancel")) {
-			if (this.#menuStep === "thinking" && this.#menuSelectedRole !== null) {
-				this.#menuStep = this.#menuScope === "role" ? "role" : "scope";
-				const roleIndex = this.#menuRoleActions.findIndex(action => action.role === this.#menuSelectedRole);
+			if (this.#menuStep === "role") {
+				this.#menuStep = "scope";
 				this.#menuSelectedRole = null;
-				this.#menuSelectedIndex =
-					this.#menuScope === "role" ? Math.max(0, roleIndex) : this.#menuScope === "default" ? 1 : 0;
+				this.#menuSelectedIndex = 2;
+				this.#updateMenu();
+				return;
+			}
+			if (this.#menuStep === "scope") {
+				if (this.#contextActions(selectedItem.model).length > 0) {
+					this.#menuStep = "context";
+					this.#menuSelectedIndex = this.#contextActions(selectedItem.model).findIndex(
+						action => action.tier === this.#menuContextTier,
+					);
+					if (this.#menuSelectedIndex < 0)
+						this.#menuSelectedIndex = this.#contextPreselectIndex(selectedItem.model);
+				} else {
+					this.#menuStep = "thinking";
+					this.#menuSelectedIndex = this.#getThinkingLevelsForModel(selectedItem.model).indexOf(
+						this.#menuThinkingLevel,
+					);
+				}
+				this.#updateMenu();
+				return;
+			}
+			if (this.#menuStep === "context") {
+				this.#menuStep = "thinking";
+				this.#menuSelectedIndex = this.#getThinkingLevelsForModel(selectedItem.model).indexOf(
+					this.#menuThinkingLevel,
+				);
 				this.#updateMenu();
 				return;
 			}
@@ -1411,6 +1518,7 @@ export class ModelSelectorComponent extends Container {
 			model: item.model,
 			selector: item.selector,
 			thinkingLevel,
+			...(this.#menuContextTier ? { contextTier: this.#menuContextTier } : {}),
 			...(this.#menuScope === "role" ? { role: this.#menuSelectedRole! } : {}),
 		};
 		this.#applying = true;

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

@@ -281,6 +281,19 @@ export class InputController {
 				return;
 			}
 
+			// Handle built-in slash commands
+			const slashResult = await executeBuiltinSlashCommand(text, {
+				ctx: this.ctx,
+				handleBackgroundCommand: () => this.handleBackgroundCommand(),
+			});
+			if (slashResult === true) {
+				return;
+			}
+			if (typeof slashResult === "string") {
+				// Command handled but returned remaining text to use as prompt
+				text = slashResult;
+			}
+
 			const runner = this.ctx.session.extensionRunner;
 			let inputImages = this.ctx.pendingImages.length > 0 ? [...this.ctx.pendingImages] : undefined;
 
@@ -301,19 +314,6 @@ export class InputController {
 
 			if (!text) return;
 
-			// Handle built-in slash commands
-			const slashResult = await executeBuiltinSlashCommand(text, {
-				ctx: this.ctx,
-				handleBackgroundCommand: () => this.handleBackgroundCommand(),
-			});
-			if (slashResult === true) {
-				return;
-			}
-			if (typeof slashResult === "string") {
-				// Command handled but returned remaining text to use as prompt
-				text = slashResult;
-			}
-
 			// Handle skill commands (/skill:name [args])
 			if (text.startsWith("/skill:")) {
 				const spaceIndex = text.indexOf(" ");

package/src/modes/controllers/model-selection.ts

@@ -17,8 +17,21 @@ export function prepareModelSelection(session: AgentSession, selection: ModelSel
 		: "None";
 	const selectedModel = formatModelSelectorValue(selection.selector, selection.thinkingLevel);
 	const role = selection.scope === "default" ? "default" : selection.role;
+	const contextSetting =
+		selection.contextTier && model.provider === "openai-codex"
+			? "providers.openaiContextTier"
+			: selection.contextTier && model.provider === "litellm"
+				? "providers.litellmContextTier"
+				: undefined;
 	const routingState = session.getRoutingState();
 	const changes: Array<{ field: string; before: string; after: string }> = [];
+	if (contextSetting) {
+		changes.push({
+			field: "Provider-wide context tier",
+			before: String(session.settings.get(contextSetting)),
+			after: selection.contextTier!,
+		});
+	}
 	if (selection.scope !== "conversation") {
 		if (!role) return undefined;
 		changes.push({
@@ -56,7 +69,7 @@ export function prepareModelSelection(session: AgentSession, selection: ModelSel
 			changes: changed,
 			consequence:
 				selection.scope === "conversation"
-					? "Switches this conversation and records a manual routing pin; user model defaults are unchanged."
+					? "Switches this conversation and records a manual routing pin; the selected provider-wide context tier is saved."
 					: selection.scope === "default"
 						? "Saves the user default role, then switches this conversation and records a manual routing pin."
 						: `Saves the ${role} role for future routed work; the active conversation model is unchanged.`,
@@ -71,6 +84,13 @@ export async function applyModelSelection(session: AgentSession, selection: Mode
 	const previousModel = session.model;
 	const previousThinking = session.thinkingLevel;
 	const previousRoles = { ...session.settings.get("modelRoles") };
+	const contextSetting =
+		selection.contextTier && model.provider === "openai-codex"
+			? "providers.openaiContextTier"
+			: selection.contextTier && model.provider === "litellm"
+				? "providers.litellmContextTier"
+				: undefined;
+	const previousContextTier = contextSetting ? session.settings.get(contextSetting) : undefined;
 	const previousRouting = session.getRoutingState();
 	let switched = false;
 	const role = scope === "default" ? "default" : selection.role;
@@ -80,10 +100,16 @@ export async function applyModelSelection(session: AgentSession, selection: Mode
 		throw new Error(`No API key for ${selector}`);
 	}
 	try {
-		if (scope !== "conversation") {
-			session.settings.setModelRole(role!, formatModelSelectorValue(selector, thinkingLevel));
+		if (scope !== "conversation" || contextSetting) {
+			if (scope !== "conversation")
+				session.settings.setModelRole(role!, formatModelSelectorValue(selector, thinkingLevel));
+			if (contextSetting) session.settings.set(contextSetting, selection.contextTier!);
 			await session.settings.flush({ throwOnError: true });
 		}
+		if (contextSetting) {
+			if (model.provider === "openai-codex") session.modelRegistry.setOpenAIContextTier(selection.contextTier!);
+			else session.modelRegistry.setLiteLLMContextTier(selection.contextTier!);
+		}
 		if (scope !== "role") {
 			switched = true;
 			await session.setModelTemporary(model, thinkingLevel);
@@ -101,10 +127,15 @@ export async function applyModelSelection(session: AgentSession, selection: Mode
 			await session.sessionManager.flush();
 		}
 	} catch (error) {
-		if (scope !== "conversation") {
+		if (scope !== "conversation" || contextSetting) {
 			session.settings.set("modelRoles", previousRoles);
+			if (contextSetting) session.settings.set(contextSetting, previousContextTier!);
 			await session.settings.flush({ throwOnError: true }).catch(() => {});
 		}
+		if (contextSetting) {
+			if (model.provider === "openai-codex") session.modelRegistry.setOpenAIContextTier(previousContextTier!);
+			else session.modelRegistry.setLiteLLMContextTier(previousContextTier!);
+		}
 		if (switched && previousModel) await session.setModelTemporary(previousModel, previousThinking);
 		session.restoreRoutingState(previousRouting);
 		if (switched) {