gentle-pi 4.4.0 → 4.5.0

package/tests/gentle-ai.test.ts

@@ -7,6 +7,7 @@ import { dirname, join } from "node:path";
 import test from "node:test";
 import { gzipSync } from "node:zlib";
 import { initTheme } from "@earendil-works/pi-coding-agent";
+import { visibleWidth } from "@earendil-works/pi-tui";
 import { validateToolArguments } from "@earendil-works/pi-ai";
 import type {
 	ExtensionAPI,
@@ -15,9 +16,9 @@ import type {
 	ToolCallEventResult,
 } from "@earendil-works/pi-coding-agent";
 import { __testing, applyModelConfig, applyModelConfigAsync, createGentleAiExtension } from "../extensions/gentle-ai.ts";
-import { PROFILES_KIND, PROFILES_VERSION, readProfilesFileResult } from "../lib/agent-profiles.ts";
+import { PROFILES_KIND, PROFILES_VERSION, bootstrapProfilesFile, readProfilesFileResult, type AgentProfilesFile } from "../lib/agent-profiles.ts";
 import { bindSessionProfile, readSessionProfileBinding, resetSessionProfileBindingsForTesting } from "../lib/session-profile-binding.ts";
-import type { AgentRoutingEntry, ThinkingLevel } from "../lib/model-routing-authority.ts";
+import type { AgentModelConfig, AgentRoutingEntry, ThinkingLevel } from "../lib/model-routing-authority.ts";
 type LiveSession = Pick<ExtensionAPI, "setModel" | "setThinkingLevel" | "getThinkingLevel">;
 import { PROFILE_PIN_KIND, PROFILE_PIN_VERSION, setProfilePinWorktreeResolverForTesting, writeProfilePinSync } from "../lib/agent-profile-pin.ts";
 import { NATIVE_REVIEW_ERROR_CODE, NativeReviewCliError, type NativeReviewCli } from "../lib/native-review-cli.ts";
@@ -367,6 +368,17 @@ test("registered Gentle Review tools preserve result envelopes and preview usefu
 interface RoutingConsumerPanel {
 	render(width: number): string[];
 	handleInput(data: string): void;
+	handleMouse?(event: {
+		type: "move" | "click" | "press" | "wheel";
+		x: number;
+		y: number;
+		button?: string;
+		wheelDelta?: number;
+		screenX?: number;
+		screenY?: number;
+		width?: number;
+		height?: number;
+	}): { handled?: boolean; render?: boolean } | undefined;
 }
 
 function routingConsumerFixture(t: test.TestContext, agents = ["worker"]) {
@@ -436,6 +448,9 @@ function routingConsumerFixture(t: test.TestContext, agents = ["worker"]) {
 	// untouched field returns, and undefined is Esc.
 	const inputAnswers: Array<string | undefined> = [];
 	const inputPrompts: Array<{ title: string; placeholder: string | undefined }> = [];
+	// The models screen binds the session profile through the parent session id; a
+	// test can point it at another session (or none) without rebuilding the context.
+	let sessionId: string | undefined = "session-panel";
 	// The orchestrator model is looked up in the registry before switching.
 	const registryModels = [
 		{ provider: "openai", id: "alpha" },
@@ -449,7 +464,7 @@ function routingConsumerFixture(t: test.TestContext, agents = ["worker"]) {
 		hasUI: true,
 		// A real Pi session always has an id; the profiles panel resolves the
 		// session binding through it, so the fixture models one stable session.
-		sessionManager: { getSessionId: () => "session-panel" },
+		sessionManager: { getSessionId: () => sessionId },
 		modelRegistry: {
 			getAvailable: async () => registryModels.filter((model) => model.provider === "openai"),
 			find: (provider: string, id: string) => registryModels.find((model) => model.provider === provider && model.id === id),
@@ -496,11 +511,18 @@ function routingConsumerFixture(t: test.TestContext, agents = ["worker"]) {
 		onInput(action: (panel: RoutingConsumerPanel) => void) { onInput = action; },
 		answerInputs(...answers: Array<string | undefined>) { inputAnswers.push(...answers); },
 		inputPrompts,
-		run: (name: string) => commands.get(name)!.handler("", ctx),
+		setSessionId(next: string | undefined) { sessionId = next; },
+		run: (name: string, args = "") => commands.get(name)!.handler(args, ctx),
 	};
 }
 
-test("models saves and clears independent provider review roles without local artifacts", async (t) => {
+const RIGHT_KEY = "\x1b[C";
+
+function typeInto(panel: { handleInput(data: string): void }, text: string): void {
+	for (const character of text) panel.handleInput(character);
+}
+
+test("models screen saves and clears provider review roles into the profile store without local artifacts", async (t) => {
 	const fixture = routingConsumerFixture(t, []);
 	const roles = ["review-refuter", "review-validator"];
 	assert.deepEqual(
@@ -509,6 +531,7 @@ test("models saves and clears independent provider review roles without local ar
 		"requires zero discovered agents; check package-sibling legacy agent directories",
 	);
 
+	const storePath = join(fixture.configHome, "profiles.json");
 	const assertNoLocalArtifacts = () => {
 		for (const base of [join(fixture.root, ".pi"), fixture.agentHome]) {
 			assert.equal(existsSync(join(base, "subagents.json")), false);
@@ -518,59 +541,63 @@ test("models saves and clears independent provider review roles without local ar
 				}
 			}
 		}
+		assert.equal(existsSync(fixture.globalPath), false, "routing edits stay in the profile store until an explicit apply");
 	};
+
+	let visits = 0;
 	fixture.onInput((panel) => {
-		const initial = renderComponent(panel);
-		for (const role of roles) {
-			assert.equal(initial.split(role).length - 1, 1);
-		}
-		assert.match(initial, /Pi persisted default model/);
-		assert.match(initial, /Pi persisted default effort/);
-		panel.handleInput("j"); // Skip the snapshot-only orchestrator row.
-		for (const [index, model] of ["alpha", "beta"].entries()) {
+		visits += 1;
+		if (visits === 1) {
+			// Rows: orchestrator, set-every-agent header, then the two roles.
 			panel.handleInput("j");
-			panel.handleInput("\r");
-			assert.match(renderComponent(panel), /Pi persisted default model/);
-			assert.doesNotMatch(renderComponent(panel), /Inherit active\/default model/);
-			for (const character of model) panel.handleInput(character);
-			panel.handleInput("\r");
-			panel.handleInput("e");
-			assert.match(renderComponent(panel), /Pi persisted default effort/);
-			assert.doesNotMatch(renderComponent(panel), /Inherit effort/);
-			for (let step = 0; step <= index; step++) panel.handleInput("j");
-			panel.handleInput("\r");
+			panel.handleInput("j");
+			for (const [index, model] of ["alpha", "beta"].entries()) {
+				if (index > 0) panel.handleInput("j");
+				panel.handleInput("\r"); // model card for the role
+				assert.match(renderComponent(panel), /Pi persisted default model/);
+				assert.doesNotMatch(renderComponent(panel), /Inherit active\/default model/);
+				typeInto(panel, model);
+				panel.handleInput("\r");
+				panel.handleInput("e"); // effort strip for the same role
+				assert.match(renderComponent(panel), /Pi persisted default effort/);
+				for (let step = 0; step <= index; step++) panel.handleInput(RIGHT_KEY);
+				panel.handleInput("\r");
+			}
+			panel.handleInput("\x13"); // save the draft into the profile
+			return;
 		}
-		panel.handleInput("\x13");
+		panel.handleInput("\x1b");
 	});
-	await fixture.run("gentle:models");
-	assert.deepEqual(JSON.parse(readFileSync(fixture.globalPath, "utf8")), {
+	await fixture.run("gentle:profiles");
+	assert.equal(visits, 2);
+	assert.deepEqual(JSON.parse(readFileSync(storePath, "utf8")).profiles.current, {
 		"review-refuter": { model: "openai/alpha", thinking: "off" },
 		"review-validator": { model: "openai/beta", thinking: "minimal" },
 	});
 	assertNoLocalArtifacts();
 
+	// Clearing entries stays in the store, too.
+	visits = 0;
 	fixture.onInput((panel) => {
-		panel.handleInput("j");
-		panel.handleInput("j");
-		panel.handleInput("i");
-		panel.handleInput("\x13");
-	});
-	await fixture.run("gentle:models");
-	assert.deepEqual(JSON.parse(readFileSync(fixture.globalPath, "utf8")), {
-		"review-refuter": {},
-		"review-validator": { model: "openai/beta", thinking: "minimal" },
-	});
-	assertNoLocalArtifacts();
-
-	fixture.onInput((panel) => {
-		panel.handleInput("j");
-		panel.handleInput("j");
-		panel.handleInput("j");
-		panel.handleInput("i");
-		panel.handleInput("\x13");
+		visits += 1;
+		if (visits === 1) {
+			panel.handleInput("j");
+			panel.handleInput("j");
+			for (const role of roles) {
+				if (role !== "review-refuter") panel.handleInput("j");
+				panel.handleInput("\r"); // model card; the cursor starts on the current value
+				for (let step = 0; step < 10; step++) panel.handleInput("\x1b[A"); // up to the inherit label, first in the list
+				assert.match(renderComponent(panel), /▸ Pi persisted default model/);
+				panel.handleInput("\r");
+				panel.handleInput("e");
+				for (let step = 0; step < 10; step++) panel.handleInput("\x1b[D"); // back to inherit, first in the row
+				panel.handleInput("\r");
+			}
+			panel.handleInput("\x13");
+		} else panel.handleInput("\x1b");
 	});
-	await fixture.run("gentle:models");
-	assert.deepEqual(JSON.parse(readFileSync(fixture.globalPath, "utf8")), {
+	await fixture.run("gentle:profiles");
+	assert.deepEqual(JSON.parse(readFileSync(storePath, "utf8")).profiles.current, {
 		"review-refuter": {},
 		"review-validator": {},
 	});
@@ -608,10 +635,22 @@ test("provider review roles skip migration and both projection paths even when d
 		rolePaths.forEach((path, index) => assert.equal(readFileSync(path, "utf8"), originals[index]));
 		for (const path of profilePaths) assert.equal(readFileSync(path, "utf8"), profile);
 	};
-	await fixture.run("gentle:models");
+	let visits = 0;
+	fixture.onInput((panel) => {
+		visits += 1;
+		if (visits === 1) {
+			// Rows: orchestrator, set-every-agent header, then the roles and worker.
+			const table = renderComponent(panel);
+			for (const role of roles) assert.equal(table.split(role).length - 1, 1);
+			assert.match(table, /worker\s+inherit/, "a discoverable agent with no profile entry reads as inherit");
+			panel.handleInput("\x1b");
+			return;
+		}
+		panel.handleInput("\x1b");
+	});
+	await fixture.run("gentle:profiles");
+	assert.equal(visits, 1);
 	assertReservedUnchanged();
-	for (const role of roles) assert.equal(fixture.panels[0].split(role).length - 1, 1);
-	assert.match(fixture.panels[0], /worker\s+model=inherit, effort=inherit/);
 	for (const apply of [applyModelConfig, applyModelConfigAsync]) {
 		await apply(fixture.root, assignments);
 		assertReservedUnchanged();
@@ -623,28 +662,23 @@ test("provider review roles skip migration and both projection paths even when d
 	assert.ok(JSON.parse(readFileSync(profilePaths[0], "utf8")).model_profiles.worker);
 });
 
-test("models rejects invalid project routing with its selected source path", async (t) => {
+test("an invalid saved routing file does not block the models screen", async (t) => {
 	const fixture = routingConsumerFixture(t);
 	writeFileSync(fixture.projectPath, "[]");
-	await fixture.run("gentle:models");
-	assert.equal(fixture.notifications[0]?.severity, "warning");
-	assert.ok(fixture.notifications[0]?.message.includes(fixture.projectPath));
-	assert.equal(fixture.panelVisits(), 0);
+	fixture.onInput((panel) => panel.handleInput("\x1b"));
+	await fixture.run("gentle:profiles");
+	assert.equal(fixture.panelVisits(), 1, "Make default discloses the unreadable routing instead");
 });
 
-test("export re-reads saved routing and rejects invalid project before creating its destination parent", async (t) => {
+test("models export re-reads saved routing and rejects invalid project before creating its destination parent", async (t) => {
 	const fixture = routingConsumerFixture(t);
-	writeFileSync(fixture.projectPath, '{"worker":"openai/gpt-5"}');
-	fixture.onPanel(() => {
-		if (fixture.panelVisits() > 1) return { type: "cancel", config: {} };
-		writeFileSync(fixture.projectPath, "[]");
-		return { type: "export", config: {} };
-	});
-	await fixture.run("gentle:models");
-	assert.equal(fixture.notifications[0]?.severity, "warning");
-	assert.ok(fixture.notifications[0]?.message.includes(`Invalid model config: ${fixture.projectPath}`));
+	writeFileSync(fixture.projectPath, "[]");
+	await fixture.run("gentle:profiles", "export-routing");
+	assert.equal(fixture.panelVisits(), 0, "export is a subcommand: no screen opens");
+	const exportWarning = fixture.notifications.find((entry) => entry.severity === "warning");
+	assert.equal(exportWarning?.severity, "warning");
+	assert.ok(exportWarning?.message.includes(`Invalid model config: ${fixture.projectPath}`));
 	assert.equal(existsSync(fixture.exportPath), false);
-	assert.equal(existsSync(fixture.configHome), false);
 });
 
 test("status reports invalid saved routing path instead of default agent routing", async (t) => {
@@ -664,15 +698,14 @@ test("models exports missing, normalized project, and global-precedence saved ro
 			const fixture = routingConsumerFixture(t);
 			if (source !== "missing") writeFileSync(fixture.projectPath, '{"worker":" openai/gpt-5 ","ignored":null}');
 			if (source === "global") writeMarkdown(fixture.globalPath, '{"worker":{"model":" anthropic/opus ","thinking":"high"}}');
-			fixture.onPanel(() => ({ type: fixture.panelVisits() === 1 ? "export" : "cancel", config: {} }));
-			await fixture.run("gentle:models");
+			await fixture.run("gentle:profiles", "export-routing");
 			const agents = source === "missing" ? {} : source === "project"
 				? { worker: { model: "openai/gpt-5" } }
 				: { worker: { model: "anthropic/opus", thinking: "high" } };
 			assert.deepEqual(JSON.parse(readFileSync(fixture.exportPath, "utf8")).agents, agents);
-			assert.equal(fixture.notifications[0]?.severity, "info");
-			assert.match(fixture.notifications[0]!.message, /exported/);
-			assert.equal(fixture.panelVisits(), 2);
+			const exported = fixture.notifications.find((entry) => /exported/.test(entry.message));
+			assert.equal(exported?.severity, "info");
+			assert.equal(fixture.panelVisits(), 0);
 			await fixture.run("gentle:status");
 			const report = fixture.notifications.at(-1)!.message;
 			assert.ok(report.includes(`Saved model routing: ${source === "missing" ? "missing" : "valid"}`));
@@ -680,27 +713,25 @@ test("models exports missing, normalized project, and global-precedence saved ro
 			const expectedRouting = source === "missing" ? "inherit, effort=inherit"
 				: source === "project" ? "openai/gpt-5, effort=inherit" : "anthropic/opus, effort=high";
 			assert.ok(report.includes(`worker: model=${expectedRouting}`), report);
-			assert.ok(fixture.panels[0].includes(`model=${expectedRouting}`), fixture.panels[0]);
 		});
 	}
 });
 
 test("invalid global routing overrides valid project in models, status, and export re-read", async (t) => {
 	for (const atExport of [false, true]) {
-		await t.test(atExport ? "invalidated during panel" : "invalid before panel", async (t) => {
+		await t.test(atExport ? "export" : "screen", async (t) => {
 			const fixture = routingConsumerFixture(t);
 			writeFileSync(fixture.projectPath, '{"worker":"openai/gpt-5"}');
-			if (!atExport) writeMarkdown(fixture.globalPath, "[]");
-			fixture.onPanel(() => {
-				if (fixture.panelVisits() > 1) return { type: "cancel", config: {} };
-				writeMarkdown(fixture.globalPath, "[]");
-				return { type: "export", config: {} };
-			});
-			await fixture.run("gentle:models");
-			assert.equal(fixture.notifications[0]?.severity, "warning");
-			assert.ok(fixture.notifications[0]?.message.includes(fixture.globalPath));
-			assert.match(fixture.notifications[0]!.message, atExport ? /export failed/ : /cannot open model config/);
-			assert.equal(fixture.panelVisits(), atExport ? 2 : 0);
+			writeMarkdown(fixture.globalPath, "[]");
+			fixture.onInput((panel) => panel.handleInput("\x1b"));
+			await fixture.run("gentle:profiles", atExport ? "export-routing" : "");
+			if (atExport) {
+				const routingWarning = fixture.notifications.find((entry) => entry.severity === "warning");
+				assert.equal(routingWarning?.severity, "warning");
+				assert.ok(routingWarning?.message.includes(fixture.globalPath));
+				assert.match(routingWarning!.message, /export failed/);
+			}
+			assert.equal(fixture.panelVisits(), atExport ? 0 : 1, "export opens no screen; the screen opens and Make default discloses the unreadable routing");
 			assert.equal(existsSync(fixture.exportPath), false);
 			await fixture.run("gentle:status");
 			const report = fixture.notifications.at(-1)!;
@@ -1267,64 +1298,252 @@ test("per-JD-agent model assignment keeps judge-a and judge-b profiles divergent
 	);
 });
 
-test("model panel render does not auto-apply the Gentle theme and sanitizes agent labels", () => {
-	const lines = __testing.renderSddModelPanel(
-		{},
-		["openai/gpt-5.5"],
-		["safe-agent\x1b[31m"],
-		72,
+// ---------------------------------------------------------------------------
+// Models screen (/gentle:profiles): one table, profiles as tabs.
+// ---------------------------------------------------------------------------
+
+const SCREEN_AGENTS = ["gentle-ai-explore", "gentle-ai-verify", "gentle-ai-worker"];
+const SCREEN_MODELS = ["nan/deepseek-v4-flash", "nan/glm5.3", "openai/gpt-5.5"];
+
+function screenConfig(): AgentModelConfig {
+	const config: AgentModelConfig = { orchestrator: { model: "openai-codex/gpt-6.1-sol", thinking: "max" } };
+	for (const agent of SCREEN_AGENTS) config[agent] = { model: "nan/deepseek-v4-flash", thinking: "high" };
+	return config;
+}
+
+function screenFile(): AgentProfilesFile {
+	const file = bootstrapProfilesFile(screenConfig());
+	return { ...file, profiles: { ...file.profiles, nan: { orchestrator: { model: "nan/glm5.3", thinking: "high" } } }, active: "current" };
+}
+
+type ScreenEvent = { type: "move" | "click" | "wheel"; x: number; y: number; wheelDelta?: number };
+
+function renderScreen(
+	inputs: string[] = [],
+	mouse: ScreenEvent[] = [],
+	results: unknown[] = [],
+	options: { width?: number; rows?: number; theme?: Theme; thinkingSupport?: Record<string, ThinkingLevel[]>; notices?: string[] } = {},
+): string[] {
+	return __testing.routingTablePanel(
+		screenConfig(),
+		SCREEN_MODELS,
+		SCREEN_AGENTS,
+		options.width ?? 100,
+		options.theme,
+		options.rows ?? 24,
+		inputs,
+		mouse,
+		results as never[],
+		{ file: screenFile(), sessionBoundName: "current", thinkingSupport: options.thinkingSupport, notices: options.notices },
 	);
+}
+
+/** Where a piece of text is on a rendered screen, as pointer coordinates. */
+function screenAt(lines: string[], needle: string): { x: number; y: number } {
+	const plain = lines.map(stripAnsi);
+	const y = plain.findIndex((line) => line.includes(needle));
+	assert.ok(y >= 0, `not on screen: ${needle}`);
+	return { x: plain[y].indexOf(needle) + 1, y };
+}
+
+test("models screen render does not auto-apply the Gentle theme and sanitizes agent labels", () => {
+	const lines = __testing.routingTablePanel({}, ["openai/gpt-5.5"], ["safe-agent\x1b[31m"], 72);
 	const rendered = lines.join("\n");
 	const plain = stripAnsi(rendered);
-
 	assert.doesNotMatch(cardBody(rendered), /\x1b\[38;2;71;85;105m/);
 	assert.doesNotMatch(cardBody(rendered), /\x1b\[38;2;125;211;252m/);
-	assert.match(plain, /Assign Models and Effort to Agents/);
-	assert.match(plain, /safe-agent\s+model=inherit, effort=inherit/);
+	assert.match(plain, /current/);
+	assert.match(plain, /safe-agent\s+inherit\s+inherit/);
 	assert.doesNotMatch(plain, /\[31m/);
 });
 
-test("model panel fills the terminal height like the profiles panel", () => {
-	const lines = __testing.renderSddModelPanel({}, ["openai/gpt-5.5"], ["safe-agent"], 72, undefined, 40);
+test("models screen fills the terminal height and keeps every line inside the frame", () => {
+	const lines = renderScreen([], [], [], { width: 72, rows: 40 });
 	assert.equal(lines.length, 40);
 	const plain = lines.map(stripAnsi);
 	assert.match(plain[0] ?? "", /^╭─+╮$/);
 	assert.match(plain[39] ?? "", /^╰─+╯$/);
-	for (const line of plain) assert.equal(line.length, 72);
+	for (const line of plain) assert.equal(visibleWidth(line), 72);
 });
 
-test("model panel lists grow with the terminal height instead of a fixed window", () => {
+test("models screen shows profiles as tabs with their scope, the orchestrator first, and three buttons", () => {
+	const plain = renderScreen().map(stripAnsi);
+	assert.match(plain[1] ?? "", /current ◉★ ▾\s+nan\s+\+ New/, "tabs carry ◉ session and ★ default; ▾ opens the profile menu");
+	assert.match(plain[3] ?? "", /current\s+Used in this session\. Default for new sessions\./);
+	assert.match(plain[5] ?? "", /▸ Orchestrator\s+openai-codex\/gpt-6\.1-sol\s+max/);
+	assert.match(plain.join("\n"), /Agent\s+Model ▾\s+Effort ▾\s+set every agent/);
+	assert.match(plain.join("\n"), /\[ Use in this session \]  \[ Make default \]  \[ Save \]\s+Saved/);
+	assert.match(plain.join("\n"), /←→ profile {2}↑↓ agent {2}enter model {2}e effort {2}s save {2}u use {2}d default {2}n new {2}m menu {2}esc close/);
+	assert.doesNotMatch(plain.join("\n"), /⋯/, "no ellipsis-like glyph: it reads as cut text");
+});
+
+test("models screen agent rows grow with the terminal height", () => {
 	const agents = Array.from({ length: 40 }, (_, i) => `agent-${String(i).padStart(2, "0")}`);
 	const models = Array.from({ length: 60 }, (_, i) => `provider/model-${String(i).padStart(2, "0")}`);
-	const agentLines = __testing
-		.renderSddModelPanel({}, models, agents, 100, undefined, 40)
-		.map(stripAnsi);
-	assert.equal(agentLines.length, 40);
-	// 40 rows minus 15 rows of chrome: agents, "Set all", and the orchestrator share the space.
-	assert.equal(agentLines.filter((line) => /(agent-\d\d|Set all agents)\s+model=|orchestrator\s+leave untouched/.test(line)).length, 25);
-	assert.ok(agentLines.some((line) => /x export/.test(line)));
-
-	const pickerLines = __testing
-		.renderSddModelPanel({}, models, agents, 100, undefined, 40, ["\r"])
-		.map(stripAnsi);
-	assert.equal(pickerLines.length, 40);
-	// 40 rows minus 8 rows of chrome.
-	assert.equal(pickerLines.filter((line) => /provider\/model-\d\d/.test(line)).length, 32);
+	const table = __testing.routingTablePanel({}, models, agents, 100, undefined, 40).map(stripAnsi);
+	assert.equal(table.length, 40);
+	// 40 rows minus the frame, 12 fixed body rows, and two scroll indicators.
+	assert.equal(table.filter((line) => /agent-\d\d\s/.test(line)).length, 24);
+	assert.ok(table.some((line) => /↓ \d+ more/.test(line)));
+	const card = __testing.routingTablePanel({}, models, agents, 100, undefined, 40, ["\r"]).map(stripAnsi);
+	// The model card windows its options to the terminal height minus its chrome.
+	assert.equal(card.filter((line) => /provider\/model-\d\d/.test(line)).length, 28);
 });
 
-test("model panel render uses the Pi-provided current theme when supplied", () => {
-	const currentTheme = {
-		fg(_color: string, text: string): string {
-			return `\x1b[35m${text}\x1b[39m`;
-		},
-	} as unknown as Theme;
+test("models screen uses the Pi-provided theme when supplied", () => {
+	const theme = { fg: (_color: string, text: string) => `\x1b[35m${text}\x1b[39m`, bg: (_color: string, text: string) => text } as unknown as Theme;
+	assert.match(renderScreen([], [], [], { theme }).join("\n"), /\x1b\[35m/);
+});
 
-	const rendered = __testing
-		.renderSddModelPanel({}, ["openai/gpt-5.5"], ["safe-agent"], 72, currentTheme)
-		.join("\n");
+test("models screen pointer: hover uses selectedBg, and one click runs exactly one action", () => {
+	const base = renderScreen();
+	const hoverTheme = { fg: (_color: string, text: string) => text, bg: (color: string, text: string) => `<${color}>${text}</${color}>` } as unknown as Theme;
+	const worker = screenAt(base, "gentle-ai-worker");
+	const hovered = renderScreen([], [{ type: "move", ...worker }], [], { theme: hoverTheme }).join("\n");
+	assert.match(hovered, /<selectedBg>\s*gentle-ai-worker/, "row hover fills with the selection background");
+	assert.doesNotMatch(hovered, /toolPendingBg/, "the pending background is a shade off the terminal background");
+
+	const model = screenAt(base, "nan/deepseek-v4-flash");
+	const card = renderScreen([], [{ type: "click", x: model.x, y: worker.y }]).map(stripAnsi);
+	assert.ok(card.some((line) => line.includes("Model for gentle-ai-worker")), "a click on a model opens that agent's card");
+	assert.match(card[1] ?? "", /current ◉★ ▾\s+nan/, "the screen stays behind the card");
+	const option = screenAt(card, "openai/gpt-5.5");
+	const picked = renderScreen([], [{ type: "click", x: model.x, y: worker.y }, { type: "click", ...option }]).map(stripAnsi);
+	assert.ok(picked.some((line) => /gentle-ai-worker\s+openai\/gpt-5\.5/.test(line)));
+	assert.ok(picked.some((line) => /gentle-ai-explore\s+nan\/deepseek-v4-flash/.test(line)), "other agents are untouched");
+	assert.ok(picked.some((line) => line.includes("● 1 unsaved")), "press and click of one click change one value once");
+
+	const effort = screenAt(base, "high");
+	const strip = renderScreen([], [{ type: "click", x: effort.x, y: worker.y }]);
+	const chip = screenAt(strip, " low ");
+	const efforted = renderScreen([], [{ type: "click", x: effort.x, y: worker.y }, { type: "click", ...chip }]).map(stripAnsi);
+	assert.ok(efforted.some((line) => /gentle-ai-worker\s+nan\/deepseek-v4-flash\s+low/.test(line)));
+
+	const header = screenAt(base, "Model ▾");
+	const all = renderScreen([], [{ type: "click", ...header }]);
+	const glm = screenAt(all, "nan/glm5.3");
+	const allSet = renderScreen([], [{ type: "click", ...header }, { type: "click", ...glm }]).map(stripAnsi);
+	assert.equal(allSet.filter((line) => /gentle-ai-\w+\s+nan\/glm5\.3\s/.test(line)).length, 3, "Model ▾ sets every agent");
+	assert.ok(allSet.some((line) => /Orchestrator\s+openai-codex/.test(line)), "and never the orchestrator");
+
+	const outside = renderScreen([], [{ type: "click", x: model.x, y: worker.y }, { type: "click", x: 3, y: 21 }]).map(stripAnsi);
+	assert.ok(!outside.some((line) => line.includes("Model for")), "a click outside a card closes it");
+
+	const results: Array<{ type: string; name?: string; saveFirst?: AgentModelConfig }> = [];
+	renderScreen([], [{ type: "click", ...screenAt(base, "[ Use in this session ]") }], results);
+	renderScreen([], [{ type: "click", ...screenAt(base, "[ Make default ]") }], results);
+	renderScreen([], [{ type: "click", ...screenAt(base, " nan ") }], results);
+	assert.deepEqual(results.map((result) => result.type), ["use-session", "apply-global", "load"]);
+
+	const menu = renderScreen([], [{ type: "click", ...screenAt(base, "▾") }]);
+	const renamed: Array<{ type: string }> = [];
+	renderScreen([], [{ type: "click", ...screenAt(base, "▾") }, { type: "click", ...screenAt(menu, "Rename") }], renamed);
+	assert.equal(renamed[0]?.type, "rename");
+
+	const newMenu = renderScreen([], [{ type: "click", ...screenAt(base, "+ New") }]);
+	const created: Array<{ type: string }> = [];
+	renderScreen([], [{ type: "click", ...screenAt(base, "+ New") }, { type: "click", ...screenAt(newMenu, "From what's running now") }], created);
+	assert.deepEqual(created.map((result) => result.type), ["create-live"]);
+});
 
-	assert.match(rendered, /\x1b\[35m/);
-	assert.match(stripAnsi(rendered), /Assign Models and Effort to Agents/);
+test("models screen asks before leaving a profile with unsaved changes", () => {
+	const base = renderScreen();
+	const worker = screenAt(base, "gentle-ai-worker");
+	const model = screenAt(base, "nan/deepseek-v4-flash");
+	const card = renderScreen([], [{ type: "click", x: model.x, y: worker.y }]);
+	const option = screenAt(card, "openai/gpt-5.5");
+	const edit = [{ type: "click" as const, x: model.x, y: worker.y }, { type: "click" as const, ...option }];
+	const confirm = renderScreen([], [...edit, { type: "click", ...screenAt(base, " nan ") }]);
+	assert.ok(confirm.map(stripAnsi).some((line) => line.includes("current has 1 unsaved change.")));
+	for (const [button, expected] of [
+		["[ Save and switch ]", { type: "load", name: "nan", saved: "openai/gpt-5.5" }],
+		["[ Discard ]", { type: "load", name: "nan", saved: undefined }],
+		["[ Stay ]", undefined],
+	] as const) {
+		const results: Array<{ type: string; name?: string; saveFirst?: AgentModelConfig }> = [];
+		renderScreen([], [...edit, { type: "click", ...screenAt(base, " nan ") }, { type: "click", ...screenAt(confirm, button) }], results);
+		if (expected === undefined) {
+			assert.deepEqual(results, [], "Stay keeps the screen and the edits");
+			continue;
+		}
+		assert.equal(results[0]?.type, expected.type);
+		assert.equal(results[0]?.name, expected.name);
+		assert.equal(results[0]?.saveFirst?.["gentle-ai-worker"]?.model, expected.saved);
+	}
+});
+
+test("models screen keys: esc twice discards unsaved edits, and each key means one thing", () => {
+	const armed: unknown[] = [];
+	const lines = renderScreen(["j", "j", "j", "\r", "g", "l", "m", "\r", "\x1b"], [], armed).map(stripAnsi);
+	assert.deepEqual(armed, [], "the first esc with unsaved edits only warns");
+	assert.match(profilesPanelFooter(lines.join("\n")), /Unsaved changes\. Press esc again to close without saving\./);
+	const closed: Array<{ type: string }> = [];
+	renderScreen(["j", "j", "j", "\r", "g", "l", "m", "\r", "\x1b", "\x1b"], [], closed);
+	assert.deepEqual(closed.map((result) => result.type), ["close"]);
+
+	const saved: Array<{ type: string }> = [];
+	renderScreen(["s"], [], saved);
+	assert.deepEqual(saved, [], "s with nothing to save is a no-op");
+	assert.match(profilesPanelFooter(renderScreen(["s"]).map(stripAnsi).join("\n")), /Nothing to save\./);
+	const keyed: Array<{ type: string }> = [];
+	for (const key of ["u", "d", "\x1b[C"]) renderScreen([key], [], keyed);
+	assert.deepEqual(keyed.map((result) => result.type), ["use-session", "apply-global", "load"]);
+
+	// Terminals using the kitty keyboard protocol send letters as escape
+	// sequences: "e" arrives as \x1b[101u and must still open the effort row.
+	assert.ok(renderScreen(["\x1b[101u"]).map(stripAnsi).some((line) => line.includes("Effort for the orchestrator")));
+	const kittyKeyed: Array<{ type: string }> = [];
+	renderScreen(["\x1b[117u"], [], kittyKeyed); // u
+	assert.deepEqual(kittyKeyed.map((result) => result.type), ["use-session"]);
+});
+
+test("models screen fits narrow terminals without cutting text", () => {
+	for (const width of [60, 70, 80, 90]) {
+		for (const keys of [[], ["e"], ["\r"], ["m"], ["n"]]) {
+			const plain = renderScreen(keys, [], [], { width, rows: 24 }).map(stripAnsi);
+			assert.equal(plain.filter((line) => visibleWidth(line) !== width).length, 0, `${width} ${keys}`);
+			const cut = plain.filter((line) => line.replace("Custom model id…", "").includes("…") && !/openai-codex|deepseek|glm/.test(line));
+			assert.deepEqual(cut, [], `${width} ${keys}`);
+		}
+	}
+	const narrow = renderScreen([], [], [], { width: 60 }).map(stripAnsi).join("\n");
+	assert.match(narrow, /\[ Use here \]  \[ Default \]  \[ Save \]/, "short labels when the full ones do not fit");
+});
+
+test("models screen offers only the effort levels each model supports and shows where Pi lands the rest", async () => {
+	const thinkingSupport = {
+		"nan/deepseek-v4-flash": ["off", "minimal", "low", "medium", "high"],
+		"openai-codex/gpt-6.1-sol": ["off", "minimal", "low", "medium", "high", "xhigh"],
+	} satisfies Record<string, ThinkingLevel[]>;
+	const table = renderScreen([], [], [], { thinkingSupport }).map(stripAnsi);
+	assert.ok(table.some((line) => /Orchestrator\s+openai-codex\/gpt-6\.1-sol\s+max → xhigh/.test(line)));
+	const card = renderScreen(["j", "j", "e"], [], [], { thinkingSupport }).map(stripAnsi);
+	assert.ok(card.some((line) => line.includes("Levels nan/deepseek-v4-flash supports.")));
+	const chips = card.find((line) => line.includes("inherit") && line.includes("off")) ?? "";
+	assert.match(chips, /\[high\]/);
+	assert.doesNotMatch(chips, /xhigh|max/);
+
+	const ctx = { modelRegistry: { getAvailable: async () => [
+		{ provider: "openai", id: "alpha" },
+		{ provider: "nan", id: "chat", reasoning: false },
+		{ provider: "nan", id: "think", reasoning: true },
+		{ provider: "openai", id: "deep", reasoning: true, thinkingLevelMap: { xhigh: "xhigh", max: null } },
+	] } } as unknown as ExtensionContext;
+	const support = await __testing.piThinkingSupport(ctx);
+	assert.equal(support["openai/alpha"], undefined, "no reasoning flag: unknown, every level offered");
+	assert.deepEqual(support["nan/chat"], ["off"]);
+	assert.deepEqual(support["nan/think"], ["off", "minimal", "low", "medium", "high"]);
+	assert.deepEqual(support["openai/deep"], ["off", "minimal", "low", "medium", "high", "xhigh"]);
+});
+
+test("models screen lists configuration problems under the profile name without cutting them", () => {
+	const notices = [
+		"The local pin file /home/user/project/.git/gentle-ai/profile-pin.json is not a valid pin and is ignored. Fix or remove it.",
+		'No agent matches "sdd-design" in this profile, so it is ignored at launch.',
+	];
+	const plain = renderScreen([], [], [], { width: 80, notices }).map(stripAnsi);
+	assert.ok(plain.some((line) => line.includes('⚠ No agent matches "sdd-design"')));
+	assert.ok(!plain.some((line) => line.includes("…")));
 });
 
 test("delivery commands bypass RDD under every mode outcome while command safety remains independent", async () => {
@@ -2022,18 +2241,59 @@ test("bash tool_call confirms every compound action and centers a long git -C pu
 // /gentle:profiles reopens its panel after actions that finish the interaction,
 // so a test that applies once must confirm on the first visit and close on the
 // next, or the panel and the action loop feed each other forever.
-function applyOnce(
-	fixture: { onInput(action: (panel: { handleInput(data: string): void }) => void): void },
+type ScreenPanel = { handleInput(data: string): void; render(width: number): string[] };
+
+/** The profile the models screen shows, read from the line under the tabs. */
+function shownProfile(panel: ScreenPanel): string {
+	const line = stripAnsi(renderComponent(panel)).split("\n")[3] ?? "";
+	return line.replace(/^│\s*/, "").split(/\s{3}|\s*│/)[0]?.trim() ?? "";
+}
+
+/** The profile names on the tab line, in order. */
+function tabNames(panel: ScreenPanel): string[] {
+	const line = stripAnsi(renderComponent(panel)).split("\n")[1] ?? "";
+	return line
+		.replace(/^│/, "")
+		.replace(/│\s*$/, "")
+		.split(/\s{2,}/)
+		.map((token) => token.trim())
+		.filter((token) => token !== "" && token !== "+ New" && token !== "‹" && token !== "›")
+		.map((token) => token.split(" ")[0] ?? "");
+}
+
+/**
+ * Drives the models screen to a profile (a clean tab switch redraws the open
+ * screen in place), presses `key` on it, and closes the screen on every later
+ * visit. Without a name it acts on the first tab, the profile the old list
+ * opened on.
+ */
+function actOnProfile(
+	fixture: { onInput(action: (panel: ScreenPanel) => void): void },
+	key: string | readonly string[],
+	name?: string,
 ): void {
-	let visits = 0;
-	// gentle-shell#1064: Enter now binds the parent session, so the legacy global
-	// apply these tests exercise is the explicit `a` key.
+	let acted = false;
 	fixture.onInput((panel) => {
-		visits += 1;
-		panel.handleInput(visits === 1 ? "a" : "\x1b");
+		if (acted) {
+			panel.handleInput("\x1b");
+			return;
+		}
+		const tabs = tabNames(panel);
+		const target = name ?? tabs[0];
+		for (let step = 0; step < tabs.length && shownProfile(panel) !== target; step++) {
+			panel.handleInput(tabs.indexOf(target) < tabs.indexOf(shownProfile(panel)) ? "\x1b[D" : "\x1b[C");
+		}
+		assert.equal(shownProfile(panel), target);
+		acted = true;
+		for (const data of typeof key === "string" ? [key] : key) panel.handleInput(data);
 	});
 }
 
+/** The guarded global apply: Make default (`d`) on a profile, then close. */
+function applyOnce(fixture: { onInput(action: (panel: ScreenPanel) => void): void }, name?: string): void {
+	actOnProfile(fixture, "d", name);
+}
+
 function profilesStoreFixture(t: test.TestContext) {
 	const fixture = routingConsumerFixture(t, ["worker"]);
 	const storePath = join(fixture.configHome, "profiles.json");
@@ -2806,7 +3066,7 @@ test("applying a populated profile with explicit confirmation applies the routin
 test("applying a profile replaces materialized routing for agents the profile omits", async (t) => {
 	const { fixture, writeStore, writeSettings } = profilesStoreFixture(t);
 	writeSettings();
-	// Routing materialized earlier (a previous profile, /gentle:models, or a
+	// Routing materialized earlier (a previous profile, the models screen, or a
 	// migration) for an agent the new profile does not mention.
 	const helperPath = join(fixture.root, ".pi", "agents", "helper.md");
 	writeMarkdown(helperPath, "---\nname: helper\ndescription: Helper\nmodel: openai/beta\nthinking: high\n---\nbody\n");
@@ -2858,7 +3118,7 @@ test("a failed apply restores the previous profile's routing with the same repla
 	assert.equal(store.active, "old");
 });
 
-test("s snapshots current routing in place without applying or reopening the profiles panel", async (t) => {
+test("From what's running now creates a profile from the routing in effect without applying it", async (t) => {
 	const { fixture, settingsPath, writeStore, writeSettings } = profilesStoreFixture(t);
 	writeSettings();
 	mkdirSync(fixture.configHome, { recursive: true });
@@ -2872,119 +3132,105 @@ test("s snapshots current routing in place without applying or reopening the pro
 		worker: readFileSync(workerPath, "utf8"),
 		settings: readFileSync(settingsPath, "utf8"),
 	};
-	writeStore({
-		"a-target": {},
-		"z-active": { worker: { model: "openai/beta" } },
-	}, "z-active");
-
-	let firstPanel: RoutingConsumerPanel | undefined;
-	fixture.onInput((panel) => {
-		if (firstPanel === undefined) {
-			firstPanel = panel;
-			panel.handleInput("s");
-			panel.handleInput("\x1b");
-		} else {
-			panel.handleInput("\x1b");
-		}
-	});
-	await fixture.run("gentle:profiles");
+	writeStore({ "a-target": {}, "z-active": { worker: { model: "openai/beta" } } }, "z-active");
+	const reopened = await runProfilesNameAction(fixture, SCREEN_KEYS.newFromLive, "captured");
 
 	const store = JSON.parse(readFileSync(join(fixture.configHome, "profiles.json"), "utf8"));
-	assert.deepEqual(store.profiles["a-target"], {
+	assert.deepEqual(store.profiles.captured, {
 		worker: { model: "openai/alpha", thinking: "minimal" },
 		orchestrator: { model: "nan/deepseek-v4-flash", thinking: "high" },
 	});
+	assert.deepEqual(store.profiles["a-target"], {}, "no existing profile is overwritten");
 	assert.deepEqual(store.profiles["z-active"], { worker: { model: "openai/beta" } });
 	assert.equal(store.active, "z-active");
-	assert.match(fixture.panels[0] ?? "", /enter use in this session · a set as global default · c create · s snapshot/);
 	assert.equal(readFileSync(fixture.globalPath, "utf8"), before.models);
 	assert.equal(readFileSync(subagentsPath, "utf8"), before.subagents);
 	assert.equal(readFileSync(workerPath, "utf8"), before.worker);
 	assert.equal(readFileSync(settingsPath, "utf8"), before.settings);
-	assert.equal(fixture.panelVisits(), 1, "snapshot keeps the same panel open");
-	assert.ok(firstPanel);
-	const targetRow = renderComponent(firstPanel!).split("\n");
-	const targetIndex = targetRow.findIndex((line) => line.includes("a-target"));
-	assert.ok(targetIndex >= 0, "selected profile remains in the list");
-	assert.match(targetRow[targetIndex + 1] ?? "", /1 role/);
-	assert.match(renderComponent(firstPanel!), /Snapshot saved; live routing unchanged\. Profile "a-target" saved from current routing\./);
+	assert.equal(selectedProfileTitle(reopened), "captured", "the screen shows the new profile");
+	assert.match(profilesPanelFooter(reopened), /Created "captured" from what's running now\./);
 });
 
-test("s snapshots the live session's orchestrator over the settings defaults", async (t) => {
+test("From what's running now captures the live session's orchestrator over the settings defaults", async (t) => {
 	const { fixture, settingsPath, writeStore, writeSettings } = profilesStoreFixture(t);
 	writeSettings();
-	writeStore({
-		"a-target": {},
-		"z-active": { worker: { model: "openai/beta" } },
-	}, "z-active");
+	writeStore({ "z-active": { worker: { model: "openai/beta" } } }, "z-active");
 	// The session runs live on openai/omega at low effort while settings.json still
-	// defaults to nan/deepseek-v4-flash at high: the snapshot must capture the
-	// session the user is actually in, not the default new sessions would get.
+	// defaults to nan/deepseek-v4-flash at high: the capture must be the session the
+	// user is actually in, not the default new sessions would get.
 	fixture.setLiveModel("openai", "omega", "low");
 	const settingsBefore = readFileSync(settingsPath, "utf8");
-	fixture.onInput((panel) => {
-		panel.handleInput("s");
-		panel.handleInput("\x1b");
-	});
-	await fixture.run("gentle:profiles");
+	await runProfilesNameAction(fixture, SCREEN_KEYS.newFromLive, "captured");
 	const store = JSON.parse(readFileSync(join(fixture.configHome, "profiles.json"), "utf8"));
-	assert.deepEqual(
-		store.profiles["a-target"].orchestrator,
-		{ model: "openai/omega", thinking: "low" },
-		"the orchestrator entry comes from the live session, not settings.json",
-	);
+	assert.deepEqual(store.profiles.captured.orchestrator, { model: "openai/omega", thinking: "low" });
 	assert.equal(readFileSync(settingsPath, "utf8"), settingsBefore, "settings are untouched");
 });
 
+/** Moves the cursor to the orchestrator row, the first row of the table. */
 function chooseOrchestrator(panel: RoutingConsumerPanel): void {
-	panel.handleInput("g");
-	panel.handleInput("j");
-	assert.match(renderComponent(panel), /▸ orchestrator/);
+	for (let step = 0; step < 4; step++) panel.handleInput("\x1b[A");
+	assert.match(renderComponent(panel), /▸ Orchestrator/);
 }
 
+/** Opens the model card on the cursor row, types a search, and picks the first match. */
 function chooseModel(panel: RoutingConsumerPanel, query: string): void {
 	panel.handleInput("\r");
 	for (const character of query) panel.handleInput(character);
 	panel.handleInput("\r");
 }
 
+/** Opens the effort row on the cursor row and picks a level by moving the bracket to it. */
 function chooseEffort(panel: RoutingConsumerPanel, effort: string): void {
 	panel.handleInput("e");
-	for (let step = 0; step < 10 && !renderComponent(panel).includes(`▸ ${effort}`); step++) panel.handleInput("j");
-	assert.ok(renderComponent(panel).includes(`▸ ${effort}`));
+	for (let step = 0; step < 10; step++) panel.handleInput("\x1b[D");
+	for (let step = 0; step < 10 && !renderComponent(panel).includes(`[${effort}]`); step++) panel.handleInput("\x1b[C");
+	assert.ok(renderComponent(panel).includes(`[${effort}]`), `effort ${effort} is offered`);
 	panel.handleInput("\r");
 }
 
-test("models explicit orchestrator choice wins over live/defaults and agent bulk edits", async (t) => {
+/** Moves the cursor to an agent row by name. */
+function chooseAgent(panel: RoutingConsumerPanel, agent: string): void {
+	for (let step = 0; step < 20 && !new RegExp(`▸ ${agent}\\s`).test(renderComponent(panel)); step++) panel.handleInput("j");
+	assert.match(renderComponent(panel), new RegExp(`▸ ${agent}\\s`));
+}
+
+test("models screen saves the explicit orchestrator choice into the profile", async (t) => {
 	const { fixture, storePath, settingsPath, writeStore, writeSettings } = profilesStoreFixture(t);
-	// Enter in /gentle:profiles binds the fixture session in a process-wide store.
+	// Use in this session binds the fixture session in a process-wide store.
 	t.after(() => resetSessionProfileBindingsForTesting());
 	writeSettings();
 	const settingsBefore = readFileSync(settingsPath, "utf8");
 	fixture.setLiveModel("openai", "alpha", "high");
 	writeStore({ team: { orchestrator: { model: "nan/glm5.3", thinking: "max" } } }, "team");
+	let visits = 0;
 	fixture.onInput((panel) => {
-		assert.match(renderComponent(panel), /orchestrator\s+model=nan\/glm5.3, effort=max/);
-		chooseOrchestrator(panel);
-		chooseModel(panel, "beta");
-		chooseEffort(panel, "low");
-		panel.handleInput("g");
-		chooseModel(panel, "alpha");
-		chooseEffort(panel, "high");
-		assert.match(renderComponent(panel), /orchestrator\s+model=openai\/beta, effort=low/);
-		panel.handleInput("u");
+		visits += 1;
+		if (visits === 1) {
+			assert.match(renderComponent(panel), /Orchestrator\s+nan\/glm5\.3\s+max/);
+			chooseOrchestrator(panel);
+			chooseModel(panel, "beta");
+			chooseEffort(panel, "low");
+			chooseAgent(panel, "worker");
+			chooseModel(panel, "alpha");
+			chooseEffort(panel, "high");
+			assert.match(renderComponent(panel), /Orchestrator\s+openai\/beta\s+low/);
+			panel.handleInput("\x13");
+			return;
+		}
+		panel.handleInput("\x1b");
 	});
-	await fixture.run("gentle:models");
+	await fixture.run("gentle:profiles");
 	const snapshot = JSON.parse(readFileSync(storePath, "utf8")).profiles.team;
 	assert.deepEqual(snapshot.orchestrator, { model: "openai/beta", thinking: "low" });
 	assert.deepEqual(snapshot.worker, { model: "openai/alpha", thinking: "high" });
-	assert.equal("orchestrator" in JSON.parse(readFileSync(fixture.globalPath, "utf8")), false);
-	assert.equal("orchestrator" in JSON.parse(readFileSync(join(fixture.root, ".pi", "subagents.json"), "utf8")).model_profiles, false);
+	assert.equal(existsSync(fixture.globalPath), false, "Save never writes global routing");
+	assert.equal(existsSync(join(fixture.root, ".pi", "subagents.json")), false, "Save never materializes agent routing");
 	assert.equal(readFileSync(settingsPath, "utf8"), settingsBefore);
 	assert.deepEqual(fixture.liveSwitches, [], "saving never switches the live model or effort");
 	assert.equal(fixture.notifications.some((entry) => entry.severity === "warning"), false);
-	let profileVisits = 0;
-	fixture.onInput((panel) => { panel.handleInput(profileVisits++ === 0 ? "\r" : "\x1b"); });
+
+	// Use in this session still drives the live session.
+	actOnProfile(fixture, "u");
 	await fixture.run("gentle:profiles");
 	assert.deepEqual(fixture.liveSwitches, [
 		{ kind: "model", provider: "openai", id: "beta" },
@@ -2993,137 +3239,130 @@ test("models explicit orchestrator choice wins over live/defaults and agent bulk
 	assert.equal(readFileSync(settingsPath, "utf8"), settingsBefore);
 });
 
-test("models leave untouched removes stale orchestrator and preserves live model/effort on apply", async (t) => {
+test("models screen leave untouched removes a stale profile orchestrator and keeps the live model on use", async (t) => {
 	const { fixture, storePath, settingsPath, writeStore, writeSettings } = profilesStoreFixture(t);
-	// Enter in /gentle:profiles binds the fixture session in a process-wide store.
 	t.after(() => resetSessionProfileBindingsForTesting());
 	writeSettings();
 	const settingsBefore = readFileSync(settingsPath, "utf8");
 	fixture.setLiveModel("openai", "alpha", "low");
 	writeStore({ team: { orchestrator: { model: "openai/beta", thinking: "high" } } }, "team");
 	writeFileSync(fixture.globalPath, JSON.stringify({ orchestrator: { model: "openai/beta", thinking: "high" }, worker: { model: "openai/alpha" } }));
-	fixture.answerInputs("");
+	const globalBefore = readFileSync(fixture.globalPath, "utf8");
 	let visits = 0;
 	fixture.onInput((panel) => {
-		if (visits++ === 0) {
+		visits += 1;
+		if (visits === 1) {
 			chooseOrchestrator(panel);
 			chooseModel(panel, "leave untouched");
-			panel.handleInput("e");
-			assert.match(renderComponent(panel), /orchestrator\s+leave untouched/);
-			panel.handleInput("j");
-			panel.handleInput("c");
-		} else {
-			assert.match(renderComponent(panel), /orchestrator\s+leave untouched/);
-			panel.handleInput("u");
+			assert.match(renderComponent(panel), /Orchestrator\s+leave untouched/);
+			panel.handleInput("\x13");
+			return;
 		}
+		panel.handleInput("\x1b");
 	});
-	await fixture.run("gentle:models");
+	await fixture.run("gentle:profiles");
 	assert.equal(Object.hasOwn(JSON.parse(readFileSync(storePath, "utf8")).profiles.team, "orchestrator"), false);
-	assert.equal(Object.hasOwn(JSON.parse(readFileSync(fixture.globalPath, "utf8")), "orchestrator"), false);
+	assert.equal(readFileSync(fixture.globalPath, "utf8"), globalBefore, "Save never writes global routing");
 	assert.equal(readFileSync(settingsPath, "utf8"), settingsBefore);
 	assert.deepEqual(fixture.liveSwitches, []);
-	let profileVisits = 0;
-	fixture.onInput((panel) => {
-		assert.match(renderComponent(panel), /orchestrator\s+inherit/);
-		panel.handleInput(profileVisits++ === 0 ? "\r" : "\x1b");
-	});
+	actOnProfile(fixture, "u");
 	await fixture.run("gentle:profiles");
-	assert.deepEqual(fixture.liveSwitches, [], "Enter preserves both live model and effort without the key");
+	assert.deepEqual(fixture.liveSwitches, [], "a profile without an orchestrator keeps the live model and effort");
 	assert.equal(readFileSync(settingsPath, "utf8"), settingsBefore);
 });
 
-for (const [name, key] of [["ctrl+s", "\x13"], ["cancel", "\x1b"]]) {
-	test(`models ${name} never snapshots or applies the chosen orchestrator`, async (t) => {
+for (const [name, keys] of [["ctrl+s", ["\x13"]], ["esc twice", ["\x1b", "\x1b"]]] as const) {
+	test(`models screen ${name} ${name === "ctrl+s" ? "persists the profile without touching global state" : "persists nothing"}`, async (t) => {
 		const { fixture, storePath, settingsPath, writeStore, writeSettings } = profilesStoreFixture(t);
 		writeSettings();
 		fixture.setLiveModel("openai", "alpha", "high");
 		writeStore({ team: { orchestrator: { model: "openai/alpha", thinking: "high" } } }, "team");
-		const before = [readFileSync(storePath, "utf8"), readFileSync(settingsPath, "utf8")];
+		const storeBefore = readFileSync(storePath, "utf8");
+		const settingsBefore = readFileSync(settingsPath, "utf8");
+		let visits = 0;
 		fixture.onInput((panel) => {
-			chooseOrchestrator(panel);
-			chooseModel(panel, "beta");
-			chooseEffort(panel, "low");
-			panel.handleInput(key!);
+			visits += 1;
+			if (visits === 1) {
+				chooseOrchestrator(panel);
+				chooseModel(panel, "beta");
+				chooseEffort(panel, "low");
+				for (const key of keys) panel.handleInput(key);
+				return;
+			}
+			panel.handleInput("\x1b");
 		});
-		await fixture.run("gentle:models");
-		assert.deepEqual([readFileSync(storePath, "utf8"), readFileSync(settingsPath, "utf8")], before);
+		await fixture.run("gentle:profiles");
 		assert.deepEqual(fixture.liveSwitches, []);
-		if (name === "ctrl+s") assert.deepEqual(JSON.parse(readFileSync(fixture.globalPath, "utf8")), {});
-		else assert.equal(existsSync(fixture.globalPath), false);
+		assert.equal(readFileSync(settingsPath, "utf8"), settingsBefore);
+		if (name === "ctrl+s") {
+			assert.deepEqual(JSON.parse(readFileSync(storePath, "utf8")).profiles.team.orchestrator, { model: "openai/beta", thinking: "low" });
+			assert.equal(existsSync(fixture.globalPath), false);
+		} else {
+			assert.equal(readFileSync(storePath, "utf8"), storeBefore);
+			assert.equal(visits, 1, "the second esc closes the screen");
+		}
 	});
 }
 
-for (const action of ["bulk inherit", "custom", "export/restore"]) {
-	for (const leaveUntouched of [false, true]) {
-		test(`models choice survives ${action} with ${leaveUntouched ? "no key" : "explicit pair"}`, async (t) => {
-			const { fixture, storePath, settingsPath, writeStore, writeSettings } = profilesStoreFixture(t);
-			writeSettings();
-			fixture.setLiveModel("openai", "alpha", "high");
-			writeStore({ team: { orchestrator: { model: "openai/alpha", thinking: "high" } } }, "team");
-			writeFileSync(fixture.globalPath, JSON.stringify({ worker: { model: "openai/alpha" } }));
-			const settingsBefore = readFileSync(settingsPath, "utf8");
-			if (action === "custom") fixture.answerInputs("openai/alpha");
+test("models screen Model ▾ and Effort ▾ set every agent to inherit and leave the orchestrator alone", async (t) => {
+	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
+	writeStore({ team: { orchestrator: { model: "openai/alpha", thinking: "high" }, worker: { model: "openai/beta", thinking: "low" } } }, "team");
+	let visits = 0;
+	fixture.onInput((panel) => {
+		visits += 1;
+		if (visits === 1) {
+			chooseOrchestrator(panel);
+			panel.handleInput("j"); // the header row: every agent
+			assert.match(renderComponent(panel), /▸ Agent\s+Model ▾/);
+			chooseModel(panel, "inherit");
+			panel.handleInput("e");
+			for (let step = 0; step < 10; step++) panel.handleInput("\x1b[D");
+			panel.handleInput("\r");
+			panel.handleInput("\x13");
+			return;
+		}
+		panel.handleInput("\x1b");
+	});
+	await fixture.run("gentle:profiles");
+	const profile = JSON.parse(readFileSync(storePath, "utf8")).profiles.team;
+	assert.deepEqual(profile.worker, {});
+	assert.deepEqual(profile.orchestrator, { model: "openai/alpha", thinking: "high" });
+});
+
+test("models screen custom model id: a valid id lands in the draft, an invalid one changes nothing", async (t) => {
+	for (const [answer, expected] of [["openai/custom-1", "openai/custom-1"], ["bad\nmodel: injected", "openai/beta"]] as const) {
+		await t.test(answer.includes("\n") ? "invalid" : "valid", async (t) => {
+			const { fixture, storePath, writeStore } = profilesStoreFixture(t);
+			writeStore({ team: { worker: { model: "openai/beta" } } }, "team");
+			fixture.answerInputs(answer);
 			let visits = 0;
-			const assertChoice = (panel: RoutingConsumerPanel) => {
-				assert.match(renderComponent(panel), leaveUntouched
-					? /orchestrator\s+leave untouched/
-					: /orchestrator\s+model=openai\/beta, effort=low/);
-			};
 			fixture.onInput((panel) => {
-				visits++;
-				assert.ok(visits <= 3, "reopens must be bounded");
+				visits += 1;
 				if (visits === 1) {
-					chooseOrchestrator(panel);
-					if (leaveUntouched) panel.handleInput("i");
-					else {
-						chooseModel(panel, "beta");
-						chooseEffort(panel, "low");
-					}
-					assertChoice(panel);
-					if (action === "bulk inherit") {
-						panel.handleInput("g");
-						panel.handleInput("i");
-						assertChoice(panel);
-						panel.handleInput("u");
-					} else if (action === "custom") {
-						panel.handleInput("g");
-						for (let step = 0; step < 4; step++) panel.handleInput("j");
-						assert.match(renderComponent(panel), /▸ worker/);
-						panel.handleInput("c");
-					} else panel.handleInput("x");
-				} else {
-					assertChoice(panel);
-					panel.handleInput(action === "export/restore" && visits === 2 ? "r" : "u");
+					chooseAgent(panel, "worker");
+					panel.handleInput("\r");
+					for (const character of "zzz") panel.handleInput(character); // no catalog match: only Custom model id… is left
+					assert.match(renderComponent(panel), /▸ Custom model id…/);
+					panel.handleInput("\r");
+					return;
 				}
+				if (visits === 2) {
+					assert.match(renderComponent(panel), new RegExp(`worker\\s+${expected.replace("/", "\\/")}`));
+					// A rejected id leaves nothing to save, so the screen just closes.
+					panel.handleInput(expected === "openai/beta" ? "\x1b" : "\x13");
+					return;
+				}
+				panel.handleInput("\x1b");
 			});
-			await fixture.run("gentle:models");
-			const profile = JSON.parse(readFileSync(storePath, "utf8")).profiles.team;
-			assert.equal(Object.hasOwn(profile, "orchestrator"), !leaveUntouched);
-			if (!leaveUntouched) assert.deepEqual(profile.orchestrator, { model: "openai/beta", thinking: "low" });
-			assert.deepEqual(profile.worker, action === "bulk inherit" ? {} : { model: "openai/alpha" });
-			assert.equal(Object.hasOwn(JSON.parse(readFileSync(fixture.globalPath, "utf8")), "orchestrator"), false);
-			assert.equal(readFileSync(settingsPath, "utf8"), settingsBefore);
-			assert.deepEqual(fixture.liveSwitches, []);
-			assert.equal(fixture.notifications.some((entry) => entry.severity === "warning"), false);
-			assert.equal(visits, action === "bulk inherit" ? 1 : action === "custom" ? 2 : 3);
-			assert.equal(fixture.confirmCalls.length, action === "export/restore" ? 1 : 0);
+			await fixture.run("gentle:profiles");
+			assert.match(fixture.inputPrompts[0]?.title ?? "", /Custom model id for worker/);
+			assert.equal(JSON.parse(readFileSync(storePath, "utf8")).profiles.team.worker.model, expected);
+			if (expected === "openai/beta") assert.match(fixture.panels[1] ?? "", /Custom model id must be one provider\/model line/);
 		});
 	}
-}
-
-// /gentle:models can finish with `u`: the global save `ctrl+s` performs, followed
-// by a snapshot of saved agent routing and the explicitly chosen orchestrator.
-function pickWorkerModelThenUpdateProfile(panel: RoutingConsumerPanel): void {
-	// Rows: "Set all agents", "orchestrator", two provider review roles, then "worker".
-	for (let step = 0; step < 4; step += 1) panel.handleInput("j");
-	assert.match(renderComponent(panel), /▸ worker/);
-	panel.handleInput("\r");
-	for (const character of "alpha") panel.handleInput(character);
-	panel.handleInput("\r");
-	panel.handleInput("u");
-}
+});
 
-test("u preserves an active profile's absent orchestrator when editing agents", async (t) => {
+test("models screen Save preserves an absent orchestrator and sibling profiles", async (t) => {
 	const { fixture, storePath, settingsPath, writeStore, writeSettings } = profilesStoreFixture(t);
 	writeSettings();
 	const settingsBefore = readFileSync(settingsPath, "utf8");
@@ -3132,35 +3371,30 @@ test("u preserves an active profile's absent orchestrator when editing agents",
 		team: { worker: { model: "openai/beta" } },
 		other: { worker: { model: "openai/beta", thinking: "high" } },
 	}, "team");
+	let visits = 0;
 	fixture.onInput((panel) => {
-		assert.match(renderComponent(panel), /Current profile: team/);
-		assert.match(renderComponent(panel), /orchestrator\s+leave untouched/);
-		assert.match(renderComponent(panel), /u save choice in "team"/);
-		pickWorkerModelThenUpdateProfile(panel);
+		visits += 1;
+		if (visits === 1) {
+			assert.match(renderComponent(panel), /Orchestrator\s+leave untouched/);
+			chooseAgent(panel, "worker");
+			chooseModel(panel, "alpha");
+			panel.handleInput("\x13");
+			return;
+		}
+		panel.handleInput("\x1b");
 	});
-	await fixture.run("gentle:models");
-
-	assert.deepEqual(JSON.parse(readFileSync(fixture.globalPath, "utf8")), { worker: { model: "openai/alpha" } });
+	await fixture.run("gentle:profiles");
+	assert.equal(existsSync(fixture.globalPath), false, "Save never writes global routing");
 	const store = JSON.parse(readFileSync(storePath, "utf8"));
-	assert.deepEqual(store.profiles.team, {
-		worker: { model: "openai/alpha" },
-	});
+	assert.deepEqual(store.profiles.team, { worker: { model: "openai/alpha" } });
 	assert.deepEqual(fixture.liveSwitches, []);
 	assert.equal(readFileSync(settingsPath, "utf8"), settingsBefore, "global defaults remain unchanged");
 	assert.deepEqual(store.profiles.other, { worker: { model: "openai/beta", thinking: "high" } });
 	assert.equal(store.active, "team");
-	assert.equal(fixture.panelVisits(), 1, "u finishes the interaction");
-	assert.ok(
-		fixture.notifications.some((entry) => entry.severity === "info" && /global model config saved/.test(entry.message)),
-		"the global save is still reported",
-	);
-	assert.ok(
-		fixture.notifications.some((entry) => entry.severity === "info" && /Profile "team" updated from the routing just saved/.test(entry.message)),
-		`profile update is reported: ${JSON.stringify(fixture.notifications)}`,
-	);
+	assert.equal(visits, 2);
 });
 
-test("u preserves the pinned profile's stored orchestrator instead of live or active values", async (t) => {
+test("gentle:profiles opens on the pinned profile and Save preserves its stored orchestrator", async (t) => {
 	const { fixture, storePath, settingsPath, writeStore, writeSettings, writePin, localPinPath } = profilesStoreFixture(t);
 	writeSettings();
 	const settingsBefore = readFileSync(settingsPath, "utf8");
@@ -3170,97 +3404,55 @@ test("u preserves the pinned profile's stored orchestrator instead of live or ac
 		other: { worker: { model: "openai/beta", thinking: "high" }, orchestrator: { model: "openai/beta", thinking: "high" } },
 	}, "team");
 	writePin(localPinPath, "other");
+	let visits = 0;
 	fixture.onInput((panel) => {
-		assert.match(renderComponent(panel), /Current profile: other \(pinned\)/);
-		assert.match(renderComponent(panel), /orchestrator\s+model=openai\/beta, effort=high/);
-		pickWorkerModelThenUpdateProfile(panel);
+		visits += 1;
+		if (visits === 1) {
+			assert.equal(shownProfile(panel), "other", "the pin preselects its profile");
+			assert.match(renderComponent(panel), /Orchestrator\s+openai\/beta\s+high/);
+			chooseAgent(panel, "worker");
+			chooseModel(panel, "alpha");
+			panel.handleInput("\x13");
+			return;
+		}
+		panel.handleInput("\x1b");
 	});
-	await fixture.run("gentle:models");
-
-	assert.deepEqual(JSON.parse(readFileSync(fixture.globalPath, "utf8")), { worker: { model: "openai/alpha" } });
+	await fixture.run("gentle:profiles");
 	const store = JSON.parse(readFileSync(storePath, "utf8"));
 	assert.deepEqual(store.profiles.other, {
-		worker: { model: "openai/alpha" },
+		worker: { model: "openai/alpha", thinking: "high" },
 		orchestrator: { model: "openai/beta", thinking: "high" },
 	});
 	assert.deepEqual(fixture.liveSwitches, []);
 	assert.equal(readFileSync(settingsPath, "utf8"), settingsBefore);
 	assert.deepEqual(store.profiles.team, { worker: { model: "openai/beta" } });
 	assert.equal(store.active, "team");
-	assert.ok(
-		fixture.notifications.some((entry) => entry.severity === "info" && /Profile "other" updated from the routing just saved/.test(entry.message)),
-		`pinned profile update is reported: ${JSON.stringify(fixture.notifications)}`,
-	);
+	assert.equal(visits, 2);
 });
 
-test("u keeps the global save and reports when no profile is current", async (t) => {
-	const { fixture, storePath, writeStore, writeSettings } = profilesStoreFixture(t);
-	writeSettings();
-	fixture.setLiveModel("openai", "alpha", "low");
-	writeStore({ team: { worker: { model: "openai/beta" } } });
-	const before = readFileSync(storePath, "utf8");
-	fixture.onInput((panel) => {
-		assert.match(renderComponent(panel), /Current profile: none/);
-		assert.match(renderComponent(panel), /orchestrator\s+model=openai\/alpha, effort=low/);
-		pickWorkerModelThenUpdateProfile(panel);
-	});
-	await fixture.run("gentle:models");
-
-	assert.deepEqual(JSON.parse(readFileSync(fixture.globalPath, "utf8")), { worker: { model: "openai/alpha" } });
-	assert.equal(readFileSync(storePath, "utf8"), before, "the store is untouched");
-	assert.ok(
-		fixture.notifications.some((entry) => entry.severity === "warning" && /no profile is current/.test(entry.message) && /\/gentle:profiles/.test(entry.message)),
-		`missing current profile is reported: ${JSON.stringify(fixture.notifications)}`,
-	);
-});
-
-test("u seeds the profiles store the way /gentle:profiles does when it is missing", async (t) => {
+test("gentle:profiles seeds the profiles store when it is missing", async (t) => {
 	const { fixture, storePath, writeSettings } = profilesStoreFixture(t);
 	writeSettings();
 	assert.equal(existsSync(storePath), false);
+	let visits = 0;
 	fixture.onInput((panel) => {
-		assert.match(renderComponent(panel), /Current profile: none/);
-		assert.match(renderComponent(panel), /orchestrator\s+model=nan\/deepseek-v4-flash, effort=high/);
-		pickWorkerModelThenUpdateProfile(panel);
+		visits += 1;
+		if (visits === 1) {
+			assert.equal(shownProfile(panel), "current");
+			assert.match(renderComponent(panel), /Orchestrator\s+leave untouched/, "the seed captures agent routing only");
+		}
+		panel.handleInput("\x1b");
 	});
-	await fixture.run("gentle:models");
-
+	await fixture.run("gentle:profiles");
 	const store = JSON.parse(readFileSync(storePath, "utf8"));
 	assert.equal(store.kind, PROFILES_KIND);
-	assert.deepEqual(store.profiles.current, {
-		worker: { model: "openai/alpha" },
-		orchestrator: { model: "nan/deepseek-v4-flash", thinking: "high" },
-	});
-	assert.equal(store.active, "current");
+	assert.deepEqual(store.profiles.current, {});
+	assert.equal(store.active, undefined);
 	assert.ok(
 		fixture.notifications.some((entry) => entry.severity === "info" && /seeded the "current" profile/.test(entry.message)),
 		`seeding is reported: ${JSON.stringify(fixture.notifications)}`,
 	);
-});
-
-test("snapshot feedback keeps both outcomes visible for long profile names at narrow widths", async (t) => {
-	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
-	const longName = `a${"x".repeat(63)}`;
-	writeStore({ [longName]: {} });
-	let firstPanel: RoutingConsumerPanel | undefined;
-	fixture.onInput((panel) => {
-		if (firstPanel === undefined) {
-			firstPanel = panel;
-			panel.handleInput("s");
-			const success = stripAnsi(panel.render(60).join("\n"));
-			assert.match(success, /Snapshot saved; live routing unchanged\./);
-			rmSync(storePath);
-			mkdirSync(storePath);
-			panel.handleInput("s");
-			panel.handleInput("\x1b");
-		} else {
-			panel.handleInput("\x1b");
-		}
-	});
-	await fixture.run("gentle:profiles");
-	assert.ok(firstPanel);
-	const constrained = stripAnsi(firstPanel!.render(60).join("\n"));
-	assert.match(constrained, /Snapshot failed; live routing unchanged\./);
+	assert.equal(visits, 1);
 });
 
 test("the profiles command seeds and shows the routing the runtime uses when models.json is sparse", async (t) => {
@@ -3283,10 +3475,8 @@ test("the profiles command seeds and shows the routing the runtime uses when mod
 		helper: { model: "openai/beta" },
 	});
 	assert.ok(rendered);
-	assert.match(rendered, /Current routing \(effective\)/);
-	assert.match(rendered, /worker\s+openai\/alpha\s+high/);
+	assert.match(rendered, /worker\s+openai\/alpha\s+high/, "the seeded profile shows the routing in effect");
 	assert.match(rendered, /helper\s+openai\/beta/);
-	assert.doesNotMatch(rendered, /No routing entries/);
 });
 
 for (const reader of ["readEffectiveModelConfig", "readEffectiveModelConfigAsync"] as const) {
@@ -3320,7 +3510,10 @@ test("effective routing prefers models.json over the materialized stores", (t) =
 	assert.equal(existsSync(join(fixture.root, ".pi", "gentle-ai", "models.json")), false, "reading never writes");
 });
 
-test("the profiles panel fills the terminal, lists routing per agent, and scrolls", async (t) => {
+// Issue #2196: a profile key that names no discovered agent was silently
+// ignored at launch. gentle-pi#2271: provider review roles are routed by key
+// and never have an agent file, so they are never flagged.
+test("the models screen flags profile keys no agent matches and never flags provider review roles", async (t) => {
 	const { fixture, writeStore } = profilesStoreFixture(t);
 	writeStore({
 		team: {
@@ -3330,55 +3523,22 @@ test("the profiles panel fills the terminal, lists routing per agent, and scroll
 			"review-refuter": { model: "nan/glm5.3", thinking: "high" },
 		},
 	}, "team");
-	let rendered: string | undefined;
-	let panel: { render(width: number): string[] } | undefined;
+	let rendered = "";
 	fixture.onInput((visited) => {
-		panel = visited;
-		rendered = renderComponent(visited);
+		rendered = stripAnsi(renderComponent(visited));
 		visited.handleInput("\x1b");
 	});
 	await fixture.run("gentle:profiles");
-
-	assert.ok(rendered);
-	const lines = rendered.split("\n");
-	// The frame spans the terminal height the fake TUI reports.
-	assert.equal(lines.length, 24, `expected 24 rows, got ${lines.length}`);
-	assert.match(lines[0], /^╭/);
-	assert.match(lines.at(-1)!, /^╰/);
-	const text = rendered;
-	// Routing is listed one agent per line, aligned in columns, never collapsed
-	// into "N agents → model: a, b, …" summaries.
-	assert.match(text, /Profile routing/);
-	assert.match(text, /Current routing \(effective\)/);
-	assert.match(text, /orchestrator\s+nan\/glm5\.3 · high/);
-	assert.match(text, /worker\s+openai\/alpha\s+high/);
-	assert.match(text, /sdd-design\s+nan\/glm5\.3\s+high\s+← no matching agent/);
-	// A matched key stays a plain row: the note is reserved for keys that name
-	// no discovered agent (issue #2196).
-	assert.doesNotMatch(text, /worker\s+openai\/alpha\s+high\s+←/);
-	// gentle-pi#2271: review-refuter and review-validator are provider review
-	// roles the relay routes by key; they never have an agent file, so the
-	// panel must not flag them as unmatched.
-	assert.match(text, /review-refuter\s+nan\/glm5\.3\s+high/);
-	assert.doesNotMatch(text, /review-refuter[^\n]*(←|↳)/);
-	assert.match(text, /sdd-design\s+nan\/glm5\.3\s+high/);
-	assert.doesNotMatch(text, /agents? → /);
-
-	// A taller terminal renders a taller frame with the same content.
-	fixture.tui.terminal.rows = 40;
-	const taller = renderComponent(panel);
-	assert.equal(taller.split("\n").length, 40);
-
-	// A short terminal clamps instead of crashing, and keeps both borders.
-	fixture.tui.terminal.rows = 9;
-	const short = stripAnsi(panel.render(120).map((line) => line.replace(/[ \t]+$/g, "")).join("\n"));
-	const shortLines = short.split("\n");
-	assert.equal(shortLines.length, 9);
-	assert.match(shortLines[0], /^╭/);
-	assert.match(shortLines.at(-1)!, /^╰/);
+	const flat = (rendered: string) => rendered.replace(/\s*│\s*/g, " ").replace(/\s+/g, " ");
+	assert.equal(rendered.split("\n").length, 24, "the frame spans the terminal height");
+	assert.match(flat(rendered), /⚠ No agent matches "sdd-design" in this profile, so it is ignored at launch\./);
+	assert.doesNotMatch(flat(rendered), /review-refuter"/, "provider review roles are never flagged");
+	assert.match(rendered, /Orchestrator\s+nan\/glm5\.3\s+high/);
+	assert.match(rendered, /worker\s+openai\/alpha\s+high/);
+	assert.match(rendered, /review-refuter\s+nan\/glm5\.3\s+high/);
 });
 
-test("a narrow detail pane keeps the unmatched-key note visible", async (t) => {
+test("at 60 columns the unmatched-key notice wraps instead of being cut", async (t) => {
 	const { fixture, writeStore } = profilesStoreFixture(t);
 	writeStore({
 		team: {
@@ -3391,21 +3551,18 @@ test("a narrow detail pane keeps the unmatched-key note visible", async (t) => {
 		panel = visited;
 		visited.handleInput("\x1b");
 	});
-	fixture.tui.terminal.rows = 40;
 	await fixture.run("gentle:profiles");
-
 	assert.ok(panel);
-	// At 60 columns the routing row fills the detail pane, so the note wraps
-	// onto its own line instead of being truncated away (issue #2196).
 	const narrow = stripAnsi(panel.render(60).join("\n"));
-	assert.match(narrow, /↳ no matching agent/);
+	const flat = (rendered: string) => rendered.replace(/\s*│\s*/g, " ").replace(/\s+/g, " ");
+	assert.match(flat(narrow), /⚠ No agent matches "sdd-design" in this profile, so it is ignored at launch\./);
+	assert.ok(!narrow.split("\n").some((line) => line.includes("…")), "nothing is cut");
 });
 
-// Issue #2400: a model_profiles key that matches no discovered agent and has
-// no suggestion never became a "Current routing (effective)" row, because that
-// table is built per discovered agent. The panel now lists those keys under
-// their own heading; a key with a suggestion is left to the launch warning.
-test("the profiles panel lists model_profiles keys that match no agent and suggest none", async (t) => {
+// Issue #2400: a subagents.json model_profiles key that matches no discovered
+// agent and suggests none is ignored at launch; the screen names it. A key with
+// a suggestion is left to the launch warning.
+test("the models screen names subagents.json keys that match no agent and suggest none", async (t) => {
 	const { fixture, writeStore } = profilesStoreFixture(t);
 	writeStore({ team: { worker: { model: "openai/alpha", thinking: "high" } } }, "team");
 	writeFileSync(join(fixture.root, ".pi", "subagents.json"), `${JSON.stringify({
@@ -3423,102 +3580,97 @@ test("the profiles panel lists model_profiles keys that match no agent and sugge
 	});
 	fixture.tui.terminal.rows = 40;
 	await fixture.run("gentle:profiles");
-
 	assert.ok(panel);
-	const wide = stripAnsi(panel.render(120).join("\n"));
-	assert.match(wide, /Unmatched keys \(ignored\)/);
-	assert.match(wide, /explor\s+← no matching agent/);
-	assert.match(wide, /sdd-orchestratr-x\s+← no matching agent/);
-	assert.doesNotMatch(wide, /gentle-ai-worker/, "a key with a suggestion is not listed as unmatched");
-
-	// At 60 columns the detail pane is 32 wide: the heading and the key stay
-	// whole, and a note that does not fit moves to its own line.
-	const narrow = stripAnsi(panel.render(60).join("\n"));
-	assert.match(narrow, /Unmatched keys \(ignored\)/);
-	assert.match(narrow, /explor\s+← no matching agent/);
-	assert.match(narrow, /sdd-orchestratr-x[^\n]*\n[^\n]*↳ no matching agent/);
+	const flat = (rendered: string) => rendered.replace(/\s*│\s*/g, " ").replace(/\s+/g, " ");
+	for (const width of [120, 60]) {
+		const text = stripAnsi(panel.render(width).join("\n"));
+		assert.match(flat(text), /⚠ subagents\.json routes "explor", "sdd-orchestratr-x", which no agent matches, so they are ignored\./);
+		assert.doesNotMatch(text, /gentle-ai-worker/, "a key with a suggestion is not listed");
+		assert.ok(!text.split("\n").some((line) => line.includes("…")), `nothing is cut at ${width}`);
+	}
 });
 
-// Issue #2400: when a pin wins, launches route from the pinned snapshot, whose
-// keys are already current rows with their own notes, so the subagents.json
-// keys are not listed as the routing in effect.
-test("the unmatched-keys list stays out of the panel while a pin wins", async (t) => {
+// Issue #2400: when a pin wins, launches route from the pinned snapshot, so the
+// subagents.json keys are not the routing in effect and are not listed.
+test("the subagents.json notice stays off the screen while a pin wins", async (t) => {
 	const { fixture, writeStore, writePin, localPinPath } = profilesStoreFixture(t);
 	writeStore({ team: { worker: { model: "openai/alpha", thinking: "high" } } }, "team");
 	writePin(localPinPath, "team");
 	writeFileSync(join(fixture.root, ".pi", "subagents.json"), `${JSON.stringify({ model_profiles: { explor: { model: "openai/beta" } } }, null, 2)}\n`);
-	let panel: { render(width: number): string[] } | undefined;
+	let text = "";
 	fixture.onInput((visited) => {
-		panel = visited;
+		text = stripAnsi(renderComponent(visited));
 		visited.handleInput("\x1b");
 	});
-	fixture.tui.terminal.rows = 40;
 	await fixture.run("gentle:profiles");
-
-	assert.ok(panel);
-	const text = stripAnsi(panel.render(120).join("\n"));
-	assert.match(text, /Current routing \(effective\)/);
-	assert.doesNotMatch(text, /Unmatched keys/);
-});
-
-test("j and k scroll the detail pane one line at a time, like the agents view", async (t) => {
-	const { fixture, writeStore } = profilesStoreFixture(t);
-	const routing: Record<string, { model: string; thinking: string }> = {};
-	for (let index = 1; index <= 25; index += 1) {
-		routing[`agent-${String(index).padStart(2, "0")}`] = { model: "openai/alpha", thinking: "high" };
-	}
-	writeStore({ team: routing }, "team");
-	let panel: { handleInput(data: string): void; render(width: number): string[] } | undefined;
-	fixture.onInput((visited) => {
-		panel = visited;
-		visited.handleInput("\x1b");
-	});
-	await fixture.run("gentle:profiles");
-	assert.ok(panel, "the panel must open");
-	const body = () => panel!.render(120).slice(1, -2).map((line) => line.replace(/[ \t]+$/, "")).join("\n");
-	const firstAgentRow = (text: string) => text.split("\n").findIndex((line) => line.includes("agent-01"));
-	const before = body();
-	assert.ok(firstAgentRow(before) >= 0, "the first routing row must be visible before scrolling");
-	panel!.handleInput("j");
-	const afterJ = body();
-	assert.notEqual(firstAgentRow(afterJ), firstAgentRow(before), "j must scroll the detail down by one line");
-	panel!.handleInput("k");
-	assert.equal(firstAgentRow(body()), firstAgentRow(before), "k must scroll the detail back up");
+	assert.match(text, /Used in this repo\./);
+	assert.doesNotMatch(text, /subagents\.json routes/);
 });
 
 // The name prompt behind c, d, and r: the Pi host starts the field empty and
 // ignores the placeholder, and every outcome must show in the reopened panel,
 // because the fullscreen overlay hides notifications until it closes.
+/** The keys that reach each profile action on the models screen. */
+const SCREEN_KEYS = {
+	rename: ["m", "\r"],
+	duplicate: ["m", "j", "\r"],
+	useInRepo: ["m", "j", "j", "\r"],
+	delete: ["m", "j", "j", "j", "\r"],
+	newCopy: ["n", "\r"],
+	newFromLive: ["n", "j", "\r"],
+	newEmpty: ["n", "j", "j", "\r"],
+} as const;
+
+/**
+ * Runs one screen action on a profile (the shown one by default) with scripted
+ * name-prompt answers, then returns the screen the loop reopened with.
+ */
 async function runProfilesNameAction(
 	fixture: ReturnType<typeof routingConsumerFixture>,
-	keys: string | string[],
+	keys: readonly string[],
+	...answers: Array<string | undefined>
+): Promise<string> {
+	return runProfilesNameActionOn(fixture, undefined, keys, ...answers);
+}
+
+async function runProfilesNameActionOn(
+	fixture: ReturnType<typeof routingConsumerFixture>,
+	name: string | undefined,
+	keys: readonly string[],
 	...answers: Array<string | undefined>
 ): Promise<string> {
 	fixture.answerInputs(...answers);
-	let visits = 0;
+	let acted = false;
 	fixture.onInput((panel) => {
-		visits += 1;
-		if (visits > 1) return panel.handleInput("\x1b");
-		for (const key of [keys].flat()) panel.handleInput(key);
+		if (acted) return panel.handleInput("\x1b");
+		const tabs = tabNames(panel);
+		for (let step = 0; name !== undefined && step < tabs.length && shownProfile(panel) !== name; step++) {
+			panel.handleInput(tabs.indexOf(name) < tabs.indexOf(shownProfile(panel)) ? "\x1b[D" : "\x1b[C");
+		}
+		if (name !== undefined) assert.equal(shownProfile(panel), name);
+		acted = true;
+		for (const key of keys) panel.handleInput(key);
 	});
 	await fixture.run("gentle:profiles");
-	assert.equal(fixture.panels.length, 2, "the panel reopens once after the action");
-	return fixture.panels[1];
+	return fixture.panels.at(-1) ?? "";
 }
 
-/** The selected profile, read from the detail pane title of a rendered panel. */
+/** The profile a rendered screen shows. */
 function selectedProfileTitle(rendered: string): string {
-	return (rendered.split("\n")[1]?.split("│")[2] ?? "").replace("(active)", "").trim();
+	return (rendered.split("\n")[3] ?? "").replace(/^│\s*/, "").split(/\s{3}|\s*│/)[0]?.trim() ?? "";
 }
 
+/** The feedback lines under the key hints of a rendered screen. */
 function profilesPanelFooter(rendered: string): string {
-	return rendered.split("\n").at(-2) ?? "";
+	const lines = rendered.split("\n");
+	const hints = lines.findIndex((line) => line.includes("enter model"));
+	return lines.slice(hints + 1, hints + 3).map((line) => line.replace(/^│\s*/, "").replace(/\s*│$/, "")).join(" ").trim();
 }
 
 test("c creates the named profile, selects it, and reports it in the reopened panel", async (t) => {
 	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
 	writeStore({ team: { worker: { model: "openai/alpha" } } }, "team");
-	const reopened = await runProfilesNameAction(fixture, "c", " deep-work ");
+	const reopened = await runProfilesNameAction(fixture, SCREEN_KEYS.newEmpty, " deep-work ");
 
 	const store = JSON.parse(readFileSync(storePath, "utf8"));
 	assert.deepEqual(Object.keys(store.profiles), ["team", "deep-work"]);
@@ -3530,7 +3682,7 @@ test("c with an empty name creates nothing and says so in the reopened panel", a
 	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
 	writeStore({ team: { worker: { model: "openai/alpha" } } }, "team");
 	const before = readFileSync(storePath, "utf8");
-	const reopened = await runProfilesNameAction(fixture, "c", "  ");
+	const reopened = await runProfilesNameAction(fixture, SCREEN_KEYS.newEmpty, "  ");
 
 	assert.equal(readFileSync(storePath, "utf8"), before, "nothing is written");
 	assert.equal(selectedProfileTitle(reopened), "team");
@@ -3540,7 +3692,7 @@ test("c with an empty name creates nothing and says so in the reopened panel", a
 test("d with an empty name duplicates to the suggested <name>-copy and selects it", async (t) => {
 	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
 	writeStore({ team: { worker: { model: "openai/alpha" } } }, "team");
-	const reopened = await runProfilesNameAction(fixture, "d", "");
+	const reopened = await runProfilesNameAction(fixture, SCREEN_KEYS.duplicate, "");
 
 	// The host never shows the placeholder, so the suggestion lives in the title.
 	assert.match(fixture.inputPrompts[0]?.title ?? "", /Duplicate profile "team" as \(empty = team-copy\)/);
@@ -3554,7 +3706,7 @@ test("d onto an existing name writes nothing and shows the conflict in the reope
 	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
 	writeStore({ team: { worker: { model: "openai/alpha" } }, other: {} }, "team");
 	const before = readFileSync(storePath, "utf8");
-	const reopened = await runProfilesNameAction(fixture, "d", "other");
+	const reopened = await runProfilesNameAction(fixture, SCREEN_KEYS.duplicate, "other");
 
 	assert.equal(readFileSync(storePath, "utf8"), before, "nothing is written");
 	assert.equal(selectedProfileTitle(reopened), "team");
@@ -3565,7 +3717,7 @@ test("r with an empty name leaves the profile unchanged and says so in the reope
 	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
 	writeStore({ team: { worker: { model: "openai/alpha" } } }, "team");
 	const before = readFileSync(storePath, "utf8");
-	const reopened = await runProfilesNameAction(fixture, "r", "");
+	const reopened = await runProfilesNameAction(fixture, SCREEN_KEYS.rename, "");
 
 	assert.match(fixture.inputPrompts[0]?.title ?? "", /Rename profile "team" to \(empty = keep team\)/);
 	assert.equal(readFileSync(storePath, "utf8"), before, "nothing is written");
@@ -3576,8 +3728,8 @@ test("r with an empty name leaves the profile unchanged and says so in the reope
 test("r renames the profile, keeps it selected under the new name, and reports it", async (t) => {
 	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
 	writeStore({ team: { worker: { model: "openai/alpha" } }, other: {} }, "team");
-	// Rename the second row, so the reopened selection cannot land on it by default.
-	const reopened = await runProfilesNameAction(fixture, ["\x1b[B", "r"], "focus");
+	// Rename the second tab, so the reopened screen cannot land on it by default.
+	const reopened = await runProfilesNameActionOn(fixture, "other", SCREEN_KEYS.rename, "focus");
 
 	const store = JSON.parse(readFileSync(storePath, "utf8"));
 	assert.deepEqual(Object.keys(store.profiles), ["team", "focus"]);
@@ -3590,16 +3742,17 @@ test("escape on the name prompt cancels without writing and says so in the reope
 	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
 	writeStore({ team: { worker: { model: "openai/alpha" } } }, "team");
 	const before = readFileSync(storePath, "utf8");
-	const reopened = await runProfilesNameAction(fixture, "d", undefined);
+	const reopened = await runProfilesNameAction(fixture, SCREEN_KEYS.duplicate, undefined);
 
 	assert.equal(readFileSync(storePath, "utf8"), before, "nothing is written");
 	assert.match(profilesPanelFooter(reopened), /Duplicate cancelled\./);
 });
 
-// The pin is the per-repository layer of the profiles command: `p` writes the
-// clone-scoped pin inside the Git common directory, `P` writes the committable
-// per-worktree declaration. Neither writes routing.
-test("p pins the selected profile for the clone without touching the global routing", async (t) => {
+// The pin is the per-repository layer of the profiles command: Use in this repo
+// (profile menu) writes the clone-scoped pin inside the Git common directory,
+// `/gentle:profiles publish <name>` writes the committable per-worktree
+// declaration. Neither writes routing.
+test("Use in this repo pins the shown profile for the clone without touching the global routing", async (t) => {
 	const { fixture, storePath, localPinPath, repoPinPath, writeStore } = profilesStoreFixture(t);
 	writeStore({ team: { worker: { model: "openai/alpha" } } }, "team");
 	const storeBefore = readFileSync(storePath, "utf8");
@@ -3608,7 +3761,7 @@ test("p pins the selected profile for the clone without touching the global rout
 	fixture.onInput((panel) => {
 		if (firstPanel === undefined) {
 			firstPanel = panel;
-			panel.handleInput("p");
+			for (const key of SCREEN_KEYS.useInRepo) panel.handleInput(key);
 		} else {
 			reopenedPanel = panel;
 			panel.handleInput("\x1b");
@@ -3620,18 +3773,18 @@ test("p pins the selected profile for the clone without touching the global rout
 		readFileSync(localPinPath, "utf8"),
 		`${JSON.stringify({ kind: PROFILE_PIN_KIND, version: PROFILE_PIN_VERSION, profile: "team" }, null, 2)}\n`,
 	);
-	assert.equal(existsSync(repoPinPath), false, "p writes the clone-scoped layer only");
+	assert.equal(existsSync(repoPinPath), false, "Use in this repo writes the clone-scoped layer only");
 	assert.equal(readFileSync(storePath, "utf8"), storeBefore, "a pin stores a name, never routing");
 	assert.match(fixture.notifications.at(-1)?.message ?? "", /pinned profile "team" for this clone in /);
 	assert.ok(firstPanel);
-	// The panel reports the layer that would win, next to the orchestrator lines it
-	// deliberately does not move.
+	// The reopened screen marks the profile used in this repo (⌂) and says so.
 	assert.ok(reopenedPanel);
-	assert.match(stripAnsi(renderComponent(reopenedPanel)), /pin\s+local: team/);
-	// Rendering an existing panel must not resolve Git or read the pin again.
+	assert.match(stripAnsi(renderComponent(reopenedPanel)), /team ★⌂/);
+	assert.match(stripAnsi(renderComponent(reopenedPanel)), /Used in this repo\./);
+	// Rendering an existing screen must not resolve Git or read the pin again.
 	setProfilePinWorktreeResolverForTesting(() => { throw new Error("unexpected pin read during render"); });
-	assert.doesNotMatch(stripAnsi(renderComponent(firstPanel!)), /pin\s+local: team/);
-	assert.match(stripAnsi(renderComponent(reopenedPanel)), /pin\s+local: team/);
+	assert.doesNotMatch(stripAnsi(renderComponent(firstPanel!)), /Used in this repo\./);
+	assert.match(stripAnsi(renderComponent(reopenedPanel)), /Used in this repo\./);
 });
 
 test("the profile pin scope note sanitizes its worktree-derived path", (t) => {
@@ -3649,26 +3802,17 @@ test("the profile pin scope note sanitizes its worktree-derived path", (t) => {
 	assert.match(note, /profile-pin\.json/);
 });
 
-test("P declares the profile in the worktree so the routing can be committed", async (t) => {
+test("publish declares the profile in the worktree so the routing can be committed", async (t) => {
 	const { fixture, localPinPath, repoPinPath, writeStore } = profilesStoreFixture(t);
 	writeStore({ team: { worker: { model: "openai/alpha" } } }, "team");
-	let firstPanel: RoutingConsumerPanel | undefined;
-	fixture.onInput((panel) => {
-		if (firstPanel === undefined) {
-			firstPanel = panel;
-			panel.handleInput("P");
-			panel.handleInput("\x1b");
-		} else {
-			panel.handleInput("\x1b");
-		}
-	});
-	await fixture.run("gentle:profiles");
+	await fixture.run("gentle:profiles", "publish team");
+	assert.equal(fixture.panelVisits(), 0, "publish is a subcommand: no screen opens");
 
 	assert.equal(
 		readFileSync(repoPinPath, "utf8"),
 		`${JSON.stringify({ kind: PROFILE_PIN_KIND, version: PROFILE_PIN_VERSION, profile: "team" }, null, 2)}\n`,
 	);
-	assert.equal(existsSync(localPinPath), false, "P writes the worktree declaration only");
+	assert.equal(existsSync(localPinPath), false, "publish writes the worktree declaration only");
 	assert.match(fixture.notifications.at(-1)?.message ?? "", /declared profile "team" for this worktree in /);
 });
 
@@ -3682,7 +3826,7 @@ test("a stale pin is named as missing instead of silently changing nothing", asy
 		panel.handleInput("\x1b");
 	});
 	await fixture.run("gentle:profiles");
-	assert.match(rendered ?? "", /pin\s+local: deleted-profile \(missing from this store\)/);
+	assert.match(rendered ?? "", /⚠ The local pin names "deleted-profile", which no profile defines, so it is\s+(│\s+)?ignored/);
 });
 
 test("pinning outside a Git worktree warns and writes nothing", async (t) => {
@@ -3694,15 +3838,17 @@ test("pinning outside a Git worktree warns and writes nothing", async (t) => {
 	fixture.onInput((panel) => {
 		assert.ok(++visits <= 2, "outside-worktree fixture repeatedly reopens and pins the panel");
 		// A completed panel ignores Escape; close the next visit instead.
-		panel.handleInput(visits === 1 ? "p" : "\x1b");
+		if (visits === 1) for (const key of SCREEN_KEYS.useInRepo) panel.handleInput(key);
+		else panel.handleInput("\x1b");
 	});
 	await fixture.run("gentle:profiles");
 	assert.equal(existsSync(localPinPath), false);
 	assert.equal(existsSync(repoPinPath), false);
 	assert.match(fixture.notifications.at(-1)?.message ?? "", /not inside a Git worktree/);
+	assert.match(profilesPanelFooter(fixture.panels.at(-1) ?? ""), /not inside a Git worktree, so nothing was pinned/);
 });
 
-test("pressing p again on the pinned profile removes the clone pin", async (t) => {
+test("Stop using in this repo removes the clone pin", async (t) => {
 	const { fixture, localPinPath, writeStore, writePin } = profilesStoreFixture(t);
 	writeStore({ team: { worker: { model: "openai/alpha" } } }, "team");
 	writePin(localPinPath, "team");
@@ -3710,18 +3856,19 @@ test("pressing p again on the pinned profile removes the clone pin", async (t) =
 	fixture.onInput((panel) => {
 		if (firstPanel === undefined) {
 			firstPanel = panel;
-			panel.handleInput("p");
-			panel.handleInput("\x1b");
+			panel.handleInput("m");
+			assert.match(stripAnsi(renderComponent(panel)), /Stop using in this repo/, "the menu names the toggle by its effect");
+			for (const key of SCREEN_KEYS.useInRepo.slice(1)) panel.handleInput(key);
 		} else {
 			panel.handleInput("\x1b");
 		}
 	});
 	await fixture.run("gentle:profiles");
-	assert.equal(existsSync(localPinPath), false, "a second p removes the layer instead of rewriting it");
+	assert.equal(existsSync(localPinPath), false, "using it again removes the layer instead of rewriting it");
 	assert.match(fixture.notifications.at(-1)?.message ?? "", /removed the local pin for this clone/);
 });
 
-test("the profile list marks the layer that wins with (pinned)", async (t) => {
+test("the tab of the pinned profile carries ⌂ and the screen opens on it", async (t) => {
 	const { fixture, localPinPath, writeStore, writePin } = profilesStoreFixture(t);
 	writeStore({
 		team: { worker: { model: "openai/alpha" } },
@@ -3734,8 +3881,10 @@ test("the profile list marks the layer that wins with (pinned)", async (t) => {
 		panel.handleInput("\x1b");
 	});
 	await fixture.run("gentle:profiles");
-	assert.match(rendered ?? "", /other \(pinned\)/);
-	assert.doesNotMatch(rendered ?? "", /team \(pinned\)/);
+	const tabLine = (rendered ?? "").split("\n")[1] ?? "";
+	assert.match(tabLine, /other ⌂/);
+	assert.doesNotMatch(tabLine, /team ★⌂/);
+	assert.equal(selectedProfileTitle(rendered ?? ""), "other", "a winning pin is the profile the screen opens on");
 });
 
 test("an invalid pin file is surfaced by the panel instead of reading as no pin", async (t) => {
@@ -3749,8 +3898,9 @@ test("an invalid pin file is surfaced by the panel instead of reading as no pin"
 		panel.handleInput("\x1b");
 	});
 	await fixture.run("gentle:profiles");
-	assert.match(rendered ?? "", /invalid pin file/);
-	assert.doesNotMatch(rendered ?? "", /\(missing from this store\)/);
+	// The notice wraps between words; the frame's border columns sit between the lines.
+	assert.match((rendered ?? "").replace(/\s*│\s*/g, " ").replace(/\s+/g, " "), /⚠ The local pin file .* is not a valid pin and is ignored\./);
+	assert.doesNotMatch(rendered ?? "", /which no profile defines/);
 	assert.equal(readFileSync(localPinPath, "utf8"), "{ not json\n", "reading never rewrites a broken pin");
 });
 
@@ -3794,16 +3944,8 @@ test("deleting a profile is refused when a non-winning pin layer names it", asyn
 	// does not win but still names a live profile for this repository.
 	writePin(localPinPath, "other");
 	writePin(repoPinPath, "team");
-	let firstPanel: RoutingConsumerPanel | undefined;
-	fixture.onInput((panel) => {
-		if (firstPanel === undefined) {
-			firstPanel = panel;
-			panel.handleInput("x");
-			panel.handleInput("\x1b");
-		} else {
-			panel.handleInput("\x1b");
-		}
-	});
+	// The screen opens on "other" (the winning pin); go to "team" and delete it.
+	actOnProfile(fixture, SCREEN_KEYS.delete, "team");
 	await fixture.run("gentle:profiles");
 	assert.equal(existsSync(repoPinPath), true, "the declaration survives the refused delete");
 	assert.match(fixture.notifications.at(-1)?.message ?? "", /is pinned for this repository/);
@@ -4009,7 +4151,7 @@ test("Enter switches the live orchestrator, binds the profile, and writes nothin
 		getThinkingLevel(): ThinkingLevel { return "medium"; },
 	};
 	const file = readValidProfilesStore(storePath);
-	await __testing.runProfilesPanelAction(ctx, live, storePath, file, { type: "apply", name: "team" }, {});
+	await __testing.runProfilesPanelAction(ctx, live, storePath, file, { type: "use-session", name: "team" }, {});
 	assert.deepEqual(models, [{ provider: "openai", id: "beta" }]);
 	assert.deepEqual(thinking, ["high"]);
 	const binding = readSessionProfileBinding("session-panel");
@@ -4021,7 +4163,7 @@ test("Enter switches the live orchestrator, binds the profile, and writes nothin
 	assert.equal(existsSync(join(fixture.root, ".pi", "subagents.json")), false, "no materialized store is written");
 	const applied = notifications.at(-1)?.message ?? "";
 	assert.match(applied, /bound profile "team" to this session/);
-	assert.match(applied, /shown as "team \(session\)"/);
+	assert.match(applied, /its tab shows ◉/);
 	assert.match(applied, /This session now runs on openai\/beta · high/);
 	assert.match(applied, /Subagents and reviewers use this session's routing snapshot/);
 	assert.match(applied, /global routing, pins, and materialized stores are untouched/);
@@ -4051,7 +4193,7 @@ test("Enter switches only the selecting session's orchestrator and leaves shared
 		setThinkingLevel: (level: ThinkingLevel) => { thinking.push(level); },
 		getThinkingLevel: (): ThinkingLevel => "medium",
 	} as unknown as LiveSession;
-	await __testing.runProfilesPanelAction(ctx, live, storePath, readValidProfilesStore(storePath), { type: "apply", name: "team" });
+	await __testing.runProfilesPanelAction(ctx, live, storePath, readValidProfilesStore(storePath), { type: "use-session", name: "team" });
 	assert.deepEqual(switches, ["openai/alpha"]);
 	assert.deepEqual(thinking, ["high"]);
 	assert.equal(readSessionProfileBinding("selecting-session")?.name, "team");
@@ -4105,7 +4247,7 @@ test("Enter preserves session-only routing when the orchestrator is absent or ca
 			setThinkingLevel() { thinkingCalls++; },
 			getThinkingLevel(): ThinkingLevel { return "medium"; },
 		};
-		await __testing.runProfilesPanelAction(ctx, live, storePath, readValidProfilesStore(storePath), { type: "apply", name: "team" }, {});
+		await __testing.runProfilesPanelAction(ctx, live, storePath, readValidProfilesStore(storePath), { type: "use-session", name: "team" }, {});
 		assert.equal(modelCalls, rejected ? 1 : 0);
 		assert.equal(thinkingCalls, 0);
 		assert.equal(readSessionProfileBinding("session-panel")?.modelProfiles.worker?.model, "openai/alpha");
@@ -4129,7 +4271,7 @@ test("a keeps the legacy global apply semantics", async (t) => {
 	} as unknown as ExtensionContext;
 	const live = { setModel: async () => true, setThinkingLevel() {}, getThinkingLevel(): ThinkingLevel { return "medium"; } };
 	const file = readValidProfilesStore(storePath);
-	await __testing.runProfilesPanelAction(ctx, live, storePath, file, { type: "apply-global", name: "team" }, {});
+	await __testing.runProfilesPanelAction(ctx, live, storePath, file, { type: "apply-global", name: "team", config: file.profiles["team"] }, {});
 	assert.equal(JSON.parse(readFileSync(storePath, "utf8")).active, "team", "the global store claims the profile");
 	assert.ok(existsSync(fixture.globalPath), "the global routing is materialized");
 	resetSessionProfileBindingsForTesting();
@@ -4150,7 +4292,7 @@ test("Enter with a winning pin binds the session and never touches the pin layer
 	} as unknown as ExtensionContext;
 	const live = { setModel: async () => true, setThinkingLevel() {}, getThinkingLevel(): ThinkingLevel { return "medium"; } };
 	const file = readValidProfilesStore(storePath);
-	await __testing.runProfilesPanelAction(ctx, live, storePath, file, { type: "apply", name: "team" }, {});
+	await __testing.runProfilesPanelAction(ctx, live, storePath, file, { type: "use-session", name: "team" }, {});
 	assert.equal(readSessionProfileBinding("session-panel")?.name, "team");
 	assert.equal(readFileSync(localPinPath, "utf8"), pinBefore, "the clone pin is untouched");
 	assert.equal(readFileSync(storePath, "utf8"), storeBefore, "the store is untouched");
@@ -4158,69 +4300,22 @@ test("Enter with a winning pin binds the session and never touches the pin layer
 	resetSessionProfileBindingsForTesting();
 });
 
-test("a session-bound panel renders the binding snapshot as the current routing", async (t) => {
-	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
-	writeStore({ team: { worker: { model: "openai/beta" } } }, "team");
-	mkdirSync(fixture.configHome, { recursive: true });
-	writeFileSync(fixture.globalPath, `${JSON.stringify({ worker: { model: "openai/alpha" } }, null, 2)}\n`);
-	t.after(() => resetSessionProfileBindingsForTesting());
-	bindSessionProfile("session-panel", "team", { worker: { model: "openai/gamma" } });
-	fixture.onInput((panel) => {
-		const rendered = renderComponent(panel);
-		assert.match(rendered, /Current routing \(effective\)/);
-		assert.match(rendered, /openai\/gamma/, "the current routing is the session binding's snapshot");
-		assert.doesNotMatch(rendered, /openai\/alpha/, "the global routing stays out of a bound session's panel");
-		assert.match(
-			rendered,
-			/team \(session\) — launches resolve it ahead of pins/,
-			"the session line states what the binding governs post-#1558 (the panel truncates long lines)",
-		);
-		assert.doesNotMatch(rendered, /launch routing is unchanged/, "no stale slice-1 claim survives in the panel");
-		panel.handleInput("\x1b");
-	});
-	await fixture.run("gentle:profiles");
-	resetSessionProfileBindingsForTesting();
-});
-
-test("the now line reports the live session's orchestrator over the settings defaults", async (t) => {
-	const { fixture, writeStore, writeSettings } = profilesStoreFixture(t);
-	writeSettings();
-	writeStore({ team: { worker: { model: "openai/beta" } } }, "team");
-	// The session runs live on openai/omega at low effort while settings.json still
-	// defaults to nan/deepseek-v4-flash at high: the panel's now line must report
-	// what this session actually runs, not the default new sessions would get.
-	fixture.setLiveModel("openai", "omega", "low");
-	fixture.onInput((panel) => {
-		const rendered = renderComponent(panel);
-		assert.match(rendered, /now\s+openai\/omega/, "the now line shows the live session's orchestrator");
-		assert.doesNotMatch(rendered, /now\s+nan\//, "the settings default stays off the now line when a live model runs");
-		panel.handleInput("\x1b");
-	});
-	await fixture.run("gentle:profiles");
-});
-
-test("the (session) marker survives a snapshot refresh of the panel list", async (t) => {
-	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
-	writeStore({ team: { worker: { model: "openai/beta" } } }, "team");
-	mkdirSync(fixture.configHome, { recursive: true });
-	writeFileSync(fixture.globalPath, `${JSON.stringify({ worker: { model: "openai/alpha" } }, null, 2)}\n`);
+test("a session-bound profile carries ◉ and says it is used in this session", async (t) => {
+	const { fixture, writeStore } = profilesStoreFixture(t);
+	writeStore({ team: { worker: { model: "openai/beta" } }, other: {} }, "team");
 	t.after(() => resetSessionProfileBindingsForTesting());
 	bindSessionProfile("session-panel", "team", { worker: { model: "openai/gamma" } });
+	let rendered = "";
 	fixture.onInput((panel) => {
-		assert.match(renderComponent(panel), /team \(active\) \(session\)/);
-		panel.handleInput("s");
-		assert.match(renderComponent(panel), /Snapshot saved; live routing unchanged\./);
-		assert.match(renderComponent(panel), /team \(active\) \(session\)/, "the refreshed list keeps the session marker");
+		rendered = stripAnsi(renderComponent(panel));
 		panel.handleInput("\x1b");
 	});
 	await fixture.run("gentle:profiles");
-	// The snapshot must capture the routing the panel showed as current, so the
-	// saved team profile carries the session binding's model, never the global
-	// layer underneath it.
-	const saved = readValidProfilesStore(storePath);
-	assert.equal(saved.profiles.team?.worker?.model, "openai/gamma", "the saved profile carries the session-bound routing");
-	assert.notEqual(saved.profiles.team?.worker?.model, "openai/alpha", "the global routing never leaks into the saved snapshot");
-	resetSessionProfileBindingsForTesting();
+	const tabLine = rendered.split("\n")[1] ?? "";
+	assert.match(tabLine, /team ◉★/);
+	assert.doesNotMatch(tabLine, /other ◉/);
+	assert.match(rendered, /Used in this session\. Default for new sessions\./);
+	assert.doesNotMatch(rendered, /launch routing is unchanged/, "no stale slice-1 claim survives on the screen");
 });
 
 test("Enter without a parent session id fails loud and writes nothing", async (t) => {
@@ -4235,10 +4330,116 @@ test("Enter without a parent session id fails loud and writes nothing", async (t
 	} as unknown as ExtensionContext;
 	const live = { setModel: async () => true, setThinkingLevel() {}, getThinkingLevel(): ThinkingLevel { return "medium"; } };
 	const file = readValidProfilesStore(storePath);
-	await __testing.runProfilesPanelAction(ctx, live, storePath, file, { type: "apply", name: "team" }, {});
+	await __testing.runProfilesPanelAction(ctx, live, storePath, file, { type: "use-session", name: "team" }, {});
 	assert.equal(readSessionProfileBinding(undefined), undefined);
 	assert.equal(readFileSync(storePath, "utf8"), before);
 	assert.equal(existsSync(fixture.globalPath), false);
 	assert.equal(notifications.at(-1)?.severity, "warning");
 	resetSessionProfileBindingsForTesting();
 });
+
+test("file operations are subcommands: profiles restore-routing, export and import, and usage for anything else", async (t) => {
+	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
+	writeStore({ team: { worker: { model: "openai/alpha", thinking: "high" } } }, "team");
+
+	// /gentle:profiles restore-routing: confirm, then write models.json and materialize it.
+	writeMarkdown(fixture.exportPath, `${JSON.stringify({ kind: "gentle-pi.agent_model_routing", version: 1, agents: { worker: { model: "openai/beta", thinking: "low" } } }, null, 2)}\n`);
+	fixture.onConfirm(async () => false);
+	await fixture.run("gentle:profiles", "restore-routing");
+	assert.equal(existsSync(fixture.globalPath), false, "a declined restore writes nothing");
+	fixture.onConfirm(async () => true);
+	await fixture.run("gentle:profiles", "restore-routing");
+	assert.deepEqual(JSON.parse(readFileSync(fixture.globalPath, "utf8")).worker, { model: "openai/beta", thinking: "low" });
+	assert.match(fixture.notifications.at(-1)?.message ?? "", /restored global model config/);
+	assert.match(readFileSync(join(fixture.root, ".pi", "agents", "worker.md"), "utf8"), /model: openai\/beta/);
+
+	// /gentle:profiles export-routing writes the saved routing, not a profile.
+	await fixture.run("gentle:profiles", "export-routing");
+	assert.deepEqual(JSON.parse(readFileSync(fixture.exportPath, "utf8")).agents, { worker: { model: "openai/beta", thinking: "low" } });
+	assert.match(fixture.notifications.at(-1)?.message ?? "", /exported 1 saved model routing entry/);
+
+	// /gentle:profiles export <name> then import it back over a changed store.
+	await fixture.run("gentle:profiles", "export team");
+	const exportFile = join(fixture.configHome, "profiles.export.json");
+	assert.ok(existsSync(exportFile));
+	assert.match(fixture.notifications.at(-1)?.message ?? "", /exported profile "team"/);
+	writeStore({ team: { worker: { model: "openai/gamma" } } }, "team");
+	await fixture.run("gentle:profiles", "import");
+	assert.deepEqual(JSON.parse(readFileSync(storePath, "utf8")).profiles.team, { worker: { model: "openai/alpha", thinking: "high" } }, "import replaces after confirmation");
+
+	for (const args of ["export", "export ghost", "publish", "frobnicate", "restore", "export-routing extra"]) {
+		await fixture.run("gentle:profiles", args);
+		assert.match(fixture.notifications.at(-1)?.message ?? "", /Usage: \/gentle:profiles \[export <name> \| import \| publish <name> \| export-routing \| restore-routing\]/, args);
+	}
+	assert.equal(fixture.panelVisits(), 0, "no subcommand opens the screen");
+});
+
+test("gentle:models is gone: gentle:profiles is the only models and profiles command", () => {
+	const commands = new Map<string, { description?: string }>();
+	createGentleAiExtension({ nativeReviewCli: null })({
+		on() {},
+		registerTool() {},
+		registerCommand(name: string, command: { description?: string }) { commands.set(name, command); },
+	} as unknown as ExtensionAPI);
+	assert.equal(commands.has("gentle:models"), false);
+	assert.match(commands.get("gentle:profiles")?.description ?? "", /export-routing, restore-routing/);
+	for (const [name, command] of commands) {
+		assert.doesNotMatch(command.description ?? "", /gentle:models/, name);
+	}
+});
+
+test("gentle:profiles still opens the screen and keeps export <name>, import, and publish <name>", async (t) => {
+	const { fixture, storePath, repoPinPath, writeStore } = profilesStoreFixture(t);
+	writeStore({ team: { worker: { model: "openai/alpha" } } }, "team");
+	fixture.onInput((panel) => {
+		assert.equal(shownProfile(panel), "team");
+		panel.handleInput("\x1b");
+	});
+	await fixture.run("gentle:profiles");
+	assert.equal(fixture.panelVisits(), 1);
+	await fixture.run("gentle:profiles", "export team");
+	assert.match(fixture.notifications.at(-1)?.message ?? "", /exported profile "team"/);
+	writeStore({ team: { worker: { model: "openai/gamma" } } }, "team");
+	await fixture.run("gentle:profiles", "import");
+	assert.deepEqual(JSON.parse(readFileSync(storePath, "utf8")).profiles.team, { worker: { model: "openai/alpha" } });
+	await fixture.run("gentle:profiles", "publish team");
+	assert.equal(JSON.parse(readFileSync(repoPinPath, "utf8")).profile, "team");
+	assert.equal(fixture.panelVisits(), 1, "subcommands open no screen");
+});
+
+test("switching profile tabs redraws in place: the overlay never closes and reopens", async (t) => {
+	const { fixture, storePath, writeStore } = profilesStoreFixture(t);
+	writeStore({
+		team: { worker: { model: "openai/alpha" } },
+		other: { worker: { model: "openai/beta", thinking: "high" } },
+	}, "team");
+	const frames: string[] = [];
+	let visits = 0;
+	fixture.onInput((panel) => {
+		visits += 1;
+		if (visits > 1) {
+			panel.handleInput("\x1b");
+			return;
+		}
+		frames.push(stripAnsi(renderComponent(panel)));
+		panel.handleInput(RIGHT_KEY); // clean switch to "other"
+		frames.push(stripAnsi(renderComponent(panel)));
+		chooseAgent(panel, "worker");
+		chooseModel(panel, "alpha");
+		panel.handleInput("\x1b[D"); // back to "team" with an unsaved edit: asks first
+		frames.push(stripAnsi(renderComponent(panel)));
+		panel.handleInput("s"); // Save and switch
+		frames.push(stripAnsi(renderComponent(panel)));
+		panel.handleInput("\x1b");
+	});
+	await fixture.run("gentle:profiles");
+	assert.equal(fixture.panelVisits(), 1, "a tab switch keeps the one overlay on screen");
+	const [first, switched, asking, saved] = frames;
+	assert.match(first ?? "", /worker\s+openai\/alpha/);
+	assert.match(switched ?? "", /worker\s+openai\/beta\s+high/, "the switched frame is already the new profile");
+	assert.match(profilesPanelFooter(switched ?? ""), /Showing "other"\./);
+	assert.match(asking ?? "", /other has 1 unsaved change\./);
+	assert.match(saved ?? "", /worker\s+openai\/alpha/);
+	assert.match(profilesPanelFooter(saved ?? ""), /Saved "other"\. Showing "team"\./);
+	assert.deepEqual(JSON.parse(readFileSync(storePath, "utf8")).profiles.other, { worker: { model: "openai/alpha", thinking: "high" } });
+});