acryl-cli-linux-x64 0.1.31 → 0.1.36

package/runtime/lib/bin.js

@@ -6,9 +6,10 @@ import { join, relative, resolve } from "node:path";
 import { execFile, spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { bootAcrylHarnessProfile, createAcrylSessionBridge } from "acryl-harness-runtime";
+import { AuthorizationService, computeCredentialProjection } from "acryl-control";
 import { BlockAssembler, createUserMessage } from "@deepseek-ai/dsh-llm";
 import { diffLines } from "diff";
-import { Container, Editor, HStack, Key, KeybindingsManager, ProcessTerminal, ScrollView, TUI_KEYBINDINGS, Text, TuiAltScreen, VStack, matchesKey, setKeybindings, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
+import { Container, Editor, HStack, Key, KeybindingsManager, ProcessTerminal, ScrollView, TUI_KEYBINDINGS, Text, TuiAltScreen, VStack, fuzzyFilter, matchesKey, setKeybindings, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { readdir } from "node:fs/promises";
 import { ManualCompactionError } from "@deepseek-ai/dsh-compaction";
 import { GoalError } from "@deepseek-ai/dsh-goal";
@@ -750,6 +751,7 @@ var TuiStore = class {
 			title: void 0,
 			stats: EMPTY_STATS,
 			preset: void 0,
+			activeModel: void 0,
 			streaming: void 0,
 			pendingToolCalls: this.pendingToolCallsSnapshot(),
 			shellRun: void 0,
@@ -860,6 +862,10 @@ var TuiStore = class {
 	setPreset(preset) {
 		this.set({ preset });
 	}
+	/** Record a live `/model` switch so the status bar reflects it immediately. */
+	setActiveModel(activeModel) {
+		this.set({ activeModel });
+	}
 	shellRunSeq = 0;
 	/** Begin one local shell-escape run; its output accumulates via `appendShellOutput` until `finishShellRun` settles it into the transcript. */
 	startShellRun(command) {
@@ -916,7 +922,6 @@ var TuiStore = class {
 			kind: "login",
 			login: {
 				flows: void 0,
-				selected: 0,
 				signingIn: void 0,
 				prompt: void 0,
 				busy: true,
@@ -1040,6 +1045,36 @@ var TuiStore = class {
 	}
 };
 //#endregion
+//#region src/tui/acrylMark.ts
+/**
+* The compact ACRYL wordmark shown in the fixed header, next to the pet.
+*
+* This is the real pixelized brand wordmark (`assets/pixelized/`), rendered
+* natively as half-block characters (each terminal row packs 2 pixel rows
+* via \u2580/\u2584/\u2588) instead of downsampled or replaced with a different mark \u2014 54
+* columns wide at the artwork's own resolution, not simplified. Generated
+* from the SVG's rect grid and verified by printing it before wiring into
+* the header \u2014 same proven-before-embedding convention as
+* `yly/compile-sprites.mjs`.
+* @module @tomowave/dsh-tui/tui/acrylMark
+*/
+/** The plain (uncolored) rows of the ACRYL mark \u2014 11 lines, 54 columns. */
+const ACRYL_MARK_ROWS = [
+	"                    ▄▀▀▀▀▀▀▀▀                         ",
+	"                  ▄▀   ▄▄▄▄▄▄▄▄▄                      ",
+	"      ▄▄         ▄             ▀▄                     ",
+	"    ▄█▀█▄      ▄▀         ▄▄▄▄▄█                      ",
+	"  ▄█▀    ▀█▀▀▀▀█▄          ▀▄                ▄▀       ",
+	" █▀       ▀▄    ▀█          ▀▄▄            ▄█         ",
+	"▀▀          ▀    ▀█▄           ▄         ▄██▄▄▄▄▄▄▄▄▄▄",
+	"                   ▀▀▀▀▀▀▀▀▀▀▀  ▀▀▄   ▄▀▀             ",
+	"                                  ▀▄▄▄▀               ",
+	"                                    █                 ",
+	"                                    ▀                 "
+];
+/** ISO timestamp this build was produced at. */
+const BUILD_TIME = "2026-09-08T18:16:12.207Z";
+//#endregion
 //#region src/tui/statsFormat.ts
 /**
 * Compact token count: 517 / 12.2K / 517K / 1.2M (one decimal under three digits).
@@ -1193,7 +1228,7 @@ function stripSessionIdPrefix(id) {
 //#region src/tui/liveText.ts
 const dim = fg(theme.muted);
 const accent = fg(theme.accent);
-const warning$1 = fg(theme.warning);
+const warning$2 = fg(theme.warning);
 function buildStatusBarText(params) {
 	const { sessionId, provider, model, status, queuedCount, presetLabel, eventCount, spinnerChar } = params;
 	const queuedSuffix = queuedCount > 0 ? ` · ${queuedCount} queued` : "";
@@ -1236,7 +1271,7 @@ const PERMISSION_COLORS = {
 */
 function buildUpdateHintText(currentVersion, latestVersion) {
 	if (latestVersion === void 0) return "";
-	return warning$1(`⬆ ACRYL update available: v${currentVersion} → v${latestVersion}`) + dim(" (run `pnpm add -g @acryl/cli` to upgrade)");
+	return warning$2(`⬆ ACRYL update available: v${currentVersion} → v${latestVersion}`) + dim(" (run `pnpm add -g @acryl/cli` to upgrade)");
 }
 function buildPermissionText(permission) {
 	if (permission === void 0) return "";
@@ -2856,27 +2891,120 @@ function miniTextFieldInput(state, data) {
 		cursor: state.cursor + data.length
 	};
 }
+/**
+* Mask a value for display while typing, revealing the first/last couple of
+* characters instead of hiding it entirely — a fully-masked live field looks
+* indistinguishable from an empty one, giving no confirmation that anything
+* was actually typed. Length-preserving (unlike a static preview's `sk-p…9sZ4`
+* ellipsis form) so cursor-position math against the masked string stays
+* correct: every hidden character becomes exactly one `mask` character.
+*/
+function partiallyMask(value, mask) {
+	if (value.length <= 2) return mask.repeat(value.length);
+	if (value.length <= 10) return `${value[0]}${mask.repeat(value.length - 2)}${value.at(-1)}`;
+	return `${value.slice(0, 4)}${mask.repeat(value.length - 8)}${value.slice(-4)}`;
+}
 /** Render the field's text, optionally with an inverse-video cursor block at the cursor position. */
 function renderMiniTextField(state, cursorVisible, mask) {
-	const display = mask === void 0 ? state.value : mask.repeat(state.value.length);
+	const display = mask === void 0 ? state.value : partiallyMask(state.value, mask);
 	if (!cursorVisible) return display;
 	return `${display.slice(0, state.cursor)}\x1b[7m${display[state.cursor] ?? " "}\x1b[0m${display.slice(state.cursor + 1)}`;
 }
 //#endregion
+//#region src/tui/listWindow.ts
+/**
+* Scrollable-list windowing shared by every overlay that paints a
+* selection-following list (`/login`'s provider list, `/model`'s picker and
+* provider list). Previously duplicated verbatim in `LoginOverlay.ts` and
+* `ModelProfileOverlay.ts` (specs/001-acryl-refactor-improvements-and-tech-debt, R7).
+* @module @tomowang/dsh-tui/tui/listWindow
+*/
+/**
+* Rows available for a scrollable list body: terminal height minus the lines
+* every such screen spends on chrome (header/hint/notice/search — `chrome`
+* lines, caller-counted since it varies by screen). Long catalogs (~35
+* providers, matching that many models) previously rendered every row
+* unconditionally, pushing the key-legend hint line — the only place a
+* shortcut is documented — past the bottom of the terminal, invisible
+* without scrolling back. Every list-shaped view windows around the current
+* selection instead, so the hint line is always the last line printed and
+* always fits on screen.
+*/
+function listWindow(terminalRows, chrome) {
+	return Math.max(3, terminalRows - chrome);
+}
+/** The `[start, end)` slice of `count` items to show so `selected` stays visible within `maxVisible` rows, biased to keep it centered. */
+function visibleRange(count, selected, maxVisible) {
+	if (count <= maxVisible) return {
+		start: 0,
+		end: count
+	};
+	const start = Math.max(0, Math.min(selected - Math.floor(maxVisible / 2), count - maxVisible));
+	return {
+		start,
+		end: start + maxVisible
+	};
+}
+//#endregion
+//#region src/tui/modelProfile/types.ts
+/**
+* The `apiKeyEnv` reference a provider route falls back to when its settings
+* profile names none, e.g. `my-proxy` -> `MY_PROXY_API_KEY`. Shared between
+* the overlay (recomputing it for a just-typed custom route before save) and
+* the host wiring (deriving it for every already-configured row), so the
+* naming rule lives in exactly one place.
+*/
+function deriveApiKeyRef(route) {
+	const upper = route.toUpperCase().replace(/[^A-Z0-9]+/g, "_");
+	return `${/^[A-Z_]/.test(upper) ? upper : `P_${upper}`}_API_KEY`;
+}
+/**
+* A short, identifying (never full) preview of a stored secret — first 4 and
+* last 4 characters, so the API-key field isn't blank-looking when a key is
+* already set and the user can tell *which* key it is without ever seeing
+* enough of it to be usable on its own. Short values (<= 10 chars, where that
+* split would show most of the string anyway) mask everything but the first
+* and last single character instead.
+*/
+function maskKeyPreview(value) {
+	if (value.length <= 10) return value.length <= 2 ? "*".repeat(value.length) : `${value[0]}${"*".repeat(value.length - 2)}${value.at(-1)}`;
+	return `${value.slice(0, 4)}…${value.slice(-4)}`;
+}
+//#endregion
 //#region src/tui/modelProfile/ModelProfileOverlay.ts
 const bold$9 = (s) => `\x1b[1m${s}\x1b[0m`;
 const secondary$9 = fg(theme.secondary);
 const muted$10 = fg(theme.muted);
+const warning$1 = fg(theme.warning);
 const errorColor$5 = fg(theme.error);
 const invert$5 = (s) => `\x1b[7m${s}\x1b[0m`;
+/**
+* The only wire protocols `dsh-llm-pi-ai` can speak (`supportedProtocols()`),
+* matching the DSH Desktop GUI's "Custom provider" dialog's own dropdown
+* exactly. Free-text protocol entry let a typo reach `assertServiceable` as a
+* runtime save failure instead of being impossible to enter in the first
+* place, so this is a cycling choice, never a typed field.
+*/
+const PROTOCOLS = [
+	"openai-completions",
+	"openai-responses",
+	"anthropic-messages"
+];
 var ModelProfileOverlay = class {
+	tui;
 	store;
 	actions;
+	mode = "picker";
+	modelSearch = emptyMiniTextField();
+	modelPickerCursor = 0;
+	providerSearch = emptyMiniTextField();
+	providerCursor = 0;
 	confirmDelete;
+	pendingShowModels = false;
 	formKeySeen = -1;
 	route = emptyMiniTextField();
 	displayName = emptyMiniTextField();
-	api = emptyMiniTextField();
+	api = PROTOCOLS[0];
 	baseURL = emptyMiniTextField();
 	apiKeyDraft = emptyMiniTextField();
 	models = [];
@@ -2884,25 +3012,32 @@ var ModelProfileOverlay = class {
 	focused = 0;
 	modelDraftId = emptyMiniTextField();
 	modelSelected = 0;
-	modelInputFocused = false;
-	constructor(store, actions) {
+	constructor(tui, store, actions) {
+		this.tui = tui;
 		this.store = store;
 		this.actions = actions;
 	}
 	invalidate() {}
+	/**
+	* The global one-line notice (`store.setNotice`), rendered inline here.
+	* `/model` runs as a full-screen overlay that paints over the whole
+	* terminal, so the notice dock underneath — where "Saved X."/"Active model
+	* set to X." otherwise lands — is invisible for as long as this overlay
+	* stays open (e.g. right after `saveProvider` returns to the list view
+	* without closing the overlay). Surfacing it here is what makes a save
+	* actually visible as "done" instead of the screen looking unchanged.
+	*/
+	noticeLines() {
+		const notice = this.store.getSnapshot().notice;
+		return notice === void 0 ? [] : [muted$10(notice)];
+	}
 	textFields(draft) {
-		return draft.isNew ? [
+		const base = draft.isNew ? [
 			"route",
 			"displayName",
-			"api",
-			"baseURL",
-			"apiKey"
-		] : [
-			"displayName",
-			"api",
-			"baseURL",
-			"apiKey"
-		];
+			"baseURL"
+		] : ["displayName", "baseURL"];
+		return draft.authMethod === "oauth" ? base : [...base, "apiKey"];
 	}
 	/** Reinitialize form-local state from the store's draft when `formKey` changes — the equivalent of the old `key={formKey}` remount. */
 	syncFormState(mp) {
@@ -2912,24 +3047,29 @@ var ModelProfileOverlay = class {
 			this.formKeySeen = mp.formKey;
 			this.route = emptyMiniTextField(draft.route);
 			this.displayName = emptyMiniTextField(draft.displayName);
-			this.api = emptyMiniTextField(draft.api);
+			this.api = PROTOCOLS.includes(draft.api) ? draft.api : PROTOCOLS[0];
 			this.baseURL = emptyMiniTextField(draft.baseURL);
 			this.apiKeyDraft = emptyMiniTextField("");
 			this.models = [...draft.models];
-			this.showModels = false;
+			this.showModels = this.pendingShowModels;
+			this.pendingShowModels = false;
 			this.focused = 0;
 			this.modelDraftId = emptyMiniTextField();
 			this.modelSelected = 0;
-			this.modelInputFocused = false;
 		}
 		return draft;
 	}
 	buildDraft(draft) {
+		const route = draft.isNew ? this.route.value.trim() : draft.route;
 		return {
 			...draft,
-			route: draft.isNew ? this.route.value.trim() : draft.route,
+			route,
+			...draft.isNew ? {
+				settingsPath: ["providers", route],
+				apiKeyRef: deriveApiKeyRef(route)
+			} : {},
 			displayName: this.displayName.value,
-			api: this.api.value,
+			api: this.api,
 			baseURL: this.baseURL.value,
 			apiKeyDraft: this.apiKeyDraft.value,
 			models: this.models
@@ -2940,111 +3080,223 @@ var ModelProfileOverlay = class {
 		if (overlay.kind !== "modelProfile") return [];
 		const mp = overlay.modelProfile;
 		const draft = this.syncFormState(mp);
-		if (draft !== void 0) return this.showModels ? this.renderModelListEditor(mp) : this.renderForm(draft, mp);
-		return this.renderList(mp);
+		if (draft !== void 0) {
+			if (this.showModels) return this.renderModelListEditor(mp);
+			return this.renderForm(draft, mp);
+		}
+		return this.mode === "picker" ? this.renderModelPicker(mp) : this.renderList(mp);
+	}
+	pickerItems(mp) {
+		const items = [];
+		for (const row of mp.providers ?? []) {
+			if (!row.live) continue;
+			for (const model of row.models) items.push({
+				route: row.route,
+				id: model.id,
+				authMethod: row.authMethod
+			});
+		}
+		return items;
+	}
+	filteredPickerItems(mp) {
+		const items = this.pickerItems(mp);
+		const query = this.modelSearch.value.trim();
+		return query === "" ? items : fuzzyFilter([...items], query, (item) => `${item.id} ${item.route}`);
+	}
+	/**
+	* pi.dev's `/model` picker (see Image #45): a flat, fuzzy-searchable list of
+	* every model on a live (actually usable) route, not a per-provider drill-down.
+	* Provider add/edit/delete moves to a secondary `p` mode instead of being the
+	* default, since picking a model to make active is the far more common action.
+	*/
+	renderModelPicker(mp) {
+		const lines = [warning$1("Only showing models from configured providers. Use /login to add providers.")];
+		lines.push(...this.noticeLines());
+		if (mp.error !== void 0) lines.push(errorColor$5(mp.error));
+		lines.push(`> ${renderMiniTextField(this.modelSearch, true)}`);
+		if (mp.busy && mp.providers === void 0) lines.push(muted$10("Loading…"));
+		const all = this.pickerItems(mp);
+		const filtered = this.filteredPickerItems(mp);
+		const chrome = lines.length + 2;
+		const maxVisible = listWindow(this.tui.terminal.rows, chrome);
+		const { start, end } = visibleRange(filtered.length, this.modelPickerCursor, maxVisible);
+		filtered.slice(start, end).forEach((item, offset) => {
+			const isSelected = start + offset === this.modelPickerCursor;
+			const via = item.authMethod === "oauth" ? " oauth" : item.authMethod === "api-key" ? " api" : "";
+			const text = `${isSelected ? "→ " : "  "}${item.id} [${item.route}${via}]`;
+			lines.push(isSelected ? invert$5(text) : text);
+		});
+		if (filtered.length > maxVisible) lines.push(muted$10(`(${this.modelPickerCursor + 1}/${filtered.length})`));
+		if (all.length === 0 && mp.providers !== void 0) lines.push(muted$10("No models available yet — use /login to sign in to a provider."));
+		else if (filtered.length === 0) lines.push(muted$10("No matching models."));
+		lines.push(muted$10("type to search · ↑↓ select · enter set active · ctrl+p manage providers (add/remove models) · esc close"));
+		return lines;
+	}
+	handleModelPickerInput(data, mp) {
+		if (matchesKey(data, Key.escape)) {
+			this.actions.closeModelProfile();
+			return;
+		}
+		if (matchesKey(data, Key.ctrl("p"))) {
+			this.mode = "providers";
+			return;
+		}
+		const filtered = this.filteredPickerItems(mp);
+		if (matchesKey(data, Key.up)) {
+			this.modelPickerCursor = Math.max(0, this.modelPickerCursor - 1);
+			return;
+		}
+		if (matchesKey(data, Key.down)) {
+			this.modelPickerCursor = Math.min(Math.max(0, filtered.length - 1), this.modelPickerCursor + 1);
+			return;
+		}
+		if (matchesKey(data, Key.enter)) {
+			const item = filtered[this.modelPickerCursor];
+			if (item !== void 0) {
+				this.actions.setActiveModel(item.route, item.id);
+				this.actions.closeModelProfile();
+			}
+			return;
+		}
+		const next = miniTextFieldInput(this.modelSearch, data);
+		if (next !== void 0) {
+			this.modelSearch = next;
+			this.modelPickerCursor = 0;
+		}
+	}
+	filteredProviders(mp) {
+		const providers = mp.providers ?? [];
+		const query = this.providerSearch.value.trim();
+		return query === "" ? providers : fuzzyFilter([...providers], query, (row) => `${row.displayName} ${row.route}`);
 	}
 	renderList(mp) {
-		const { providers, selected, busy, error } = mp;
+		const { providers, busy, error } = mp;
 		const lines = [bold$9(secondary$9("Model providers"))];
+		lines.push(...this.noticeLines());
 		if (error !== void 0) lines.push(errorColor$5(error));
+		lines.push(`> ${renderMiniTextField(this.providerSearch, true)}`);
 		if (busy && providers === void 0) lines.push(muted$10("Loading…"));
-		providers?.forEach((row, index) => {
+		const filtered = this.filteredProviders(mp);
+		const chrome = lines.length + 2;
+		const maxVisible = listWindow(this.tui.terminal.rows, chrome);
+		const { start, end } = visibleRange(filtered.length, this.providerCursor, maxVisible);
+		filtered.slice(start, end).forEach((row, offset) => {
+			const index = start + offset;
 			const marker = row.configured ? "● " : "○ ";
 			const active = row.live ? " (active)" : "";
-			const noKey = row.apiKeyConfigured ? "" : " [no api key]";
-			const confirm = this.confirmDelete === index ? " — press d again to delete" : "";
-			const text = `${index === selected ? "› " : "  "}${marker}${row.displayName}${active}${noKey}${confirm}`;
-			lines.push(index === selected ? invert$5(text) : text);
+			const noKey = row.apiKeyConfigured ? ` [${row.authMethod === "oauth" ? "oauth" : "api key"}]` : " [no api key]";
+			const confirm = this.confirmDelete === index ? " — press ctrl+x again to delete" : "";
+			const text = `${index === this.providerCursor ? "› " : "  "}${marker}${row.displayName}${active}${noKey}${confirm}`;
+			lines.push(index === this.providerCursor ? invert$5(text) : text);
 		});
-		if (providers?.length === 0) lines.push(muted$10("No providers configured yet — press a to add one."));
-		lines.push(muted$10("↑↓ select · enter edit · a add · d delete · s set active model · esc close"));
+		if (filtered.length > maxVisible) lines.push(muted$10(`(${this.providerCursor + 1}/${filtered.length})`));
+		if (providers?.length === 0) lines.push(muted$10("No providers configured yet — ctrl+n to add one."));
+		else if (filtered.length === 0) lines.push(muted$10("No matching providers."));
+		lines.push(muted$10("type to search · ↑↓ select · enter edit · ctrl+n add · ctrl+x delete · ctrl+e edit models · ctrl+a set active model · esc back"));
 		return lines;
 	}
 	handleListInput(data, mp) {
-		const { providers, selected } = mp;
 		if (matchesKey(data, Key.escape)) {
-			this.actions.closeModelProfile();
+			this.mode = "picker";
 			return;
 		}
-		if (providers === void 0 || providers.length === 0) {
-			if (data === "a") this.actions.createProvider();
+		if (matchesKey(data, Key.ctrl("n"))) {
+			this.actions.createProvider();
 			return;
 		}
+		const filtered = this.filteredProviders(mp);
+		if (filtered.length === 0) return;
 		if (matchesKey(data, Key.up)) {
 			this.confirmDelete = void 0;
-			this.actions.selectProvider(Math.max(0, selected - 1));
+			this.providerCursor = Math.max(0, this.providerCursor - 1);
 			return;
 		}
 		if (matchesKey(data, Key.down)) {
 			this.confirmDelete = void 0;
-			this.actions.selectProvider(Math.min(providers.length - 1, selected + 1));
+			this.providerCursor = Math.min(filtered.length - 1, this.providerCursor + 1);
 			return;
 		}
 		if (matchesKey(data, Key.enter)) {
-			this.actions.editProvider(providers[selected].route);
+			this.actions.editProvider(filtered[this.providerCursor].route);
 			return;
 		}
-		if (data === "a") {
-			this.actions.createProvider();
+		if (matchesKey(data, Key.ctrl("e"))) {
+			this.pendingShowModels = true;
+			this.actions.editProvider(filtered[this.providerCursor].route);
 			return;
 		}
-		if (data === "s") {
-			const row = providers[selected];
+		if (matchesKey(data, Key.ctrl("a"))) {
+			const row = filtered[this.providerCursor];
 			const model = row.models[0];
 			if (model !== void 0) this.actions.setActiveModel(row.route, model.id);
 			return;
 		}
-		if (data === "d") {
-			if (this.confirmDelete === selected) {
+		if (matchesKey(data, Key.ctrl("x"))) {
+			if (this.confirmDelete === this.providerCursor) {
 				this.confirmDelete = void 0;
-				this.actions.deleteProvider(providers[selected]);
-			} else this.confirmDelete = selected;
+				this.actions.deleteProvider(filtered[this.providerCursor]);
+			} else this.confirmDelete = this.providerCursor;
 			return;
 		}
 		this.confirmDelete = void 0;
+		const next = miniTextFieldInput(this.providerSearch, data);
+		if (next !== void 0) {
+			this.providerSearch = next;
+			this.providerCursor = 0;
+		}
 	}
 	renderForm(draft, mp) {
 		const textFields = this.textFields(draft);
-		const modelsRow = textFields.length;
-		const saveRow = textFields.length + 1;
+		const protocolRow = textFields.length;
+		const modelsRow = protocolRow + 1;
+		const saveRow = protocolRow + 2;
 		const fieldState = {
 			route: this.route,
 			displayName: this.displayName,
-			api: this.api,
 			baseURL: this.baseURL,
 			apiKey: this.apiKeyDraft
 		};
 		const labels = {
-			route: "Route",
-			displayName: "Name",
-			api: "Protocol",
+			route: "Provider ID",
+			displayName: "Display name",
 			baseURL: "Base URL",
-			apiKey: draft.apiKeyConfigured ? "API key (set — leave blank to keep)" : "API key"
+			apiKey: draft.apiKeyConfigured ? `API key (set${draft.apiKeyPreview === void 0 ? "" : `: ${draft.apiKeyPreview}`} — leave blank to keep)` : "API key"
 		};
-		const lines = [bold$9(secondary$9(draft.isNew ? "Add provider" : `Edit ${draft.displayName || draft.route}`))];
+		const lines = [bold$9(secondary$9(draft.isNew ? "Custom provider" : `Edit ${draft.displayName || draft.route}`))];
+		lines.push(...this.noticeLines());
 		if (mp.error !== void 0) lines.push(errorColor$5(mp.error));
+		if (draft.authMethod === "oauth") lines.push(muted$10("(signed in via OAuth — no separate API key for this route)"));
 		textFields.forEach((field, index) => {
 			const isFocused = this.focused === index;
 			const mask = field === "apiKey" ? "*" : void 0;
 			const prefix = `${isFocused ? "› " : "  "}${labels[field]}: `;
 			lines.push(`${prefix}${renderMiniTextField(fieldState[field], isFocused, mask)}`);
 		});
+		const protocolFocused = this.focused === protocolRow;
+		const protocolText = `${protocolFocused ? "› " : "  "}API protocol: ‹ ${this.api} ›`;
+		lines.push(protocolFocused ? invert$5(protocolText) : protocolText);
 		const modelsText = `${this.focused === modelsRow ? "› " : "  "}Models (${this.models.length}) — enter to edit`;
 		lines.push(this.focused === modelsRow ? invert$5(modelsText) : modelsText);
-		const saveText = `${this.focused === saveRow ? "› " : "  "}${mp.busy ? "Saving…" : "Save"}`;
+		const saveText = `${this.focused === saveRow ? "› " : "  "}${mp.busy ? "Saving…" : draft.isNew ? "Create provider" : "Save changes"}`;
 		lines.push(this.focused === saveRow ? invert$5(saveText) : saveText);
-		lines.push(muted$10("tab/shift+tab move · enter confirm field / activate row · esc cancel"));
+		const removeHint = draft.apiKeyConfigured ? " · ctrl+d sign out (remove key/OAuth grant)" : "";
+		lines.push(muted$10(`tab/shift+tab move · ←→ cycle protocol · enter confirm/activate · esc cancel${removeHint}`));
 		return lines;
 	}
 	handleFormInput(data, draft) {
 		const textFields = this.textFields(draft);
-		const modelsRow = textFields.length;
-		const saveRow = textFields.length + 1;
-		const rowCount = textFields.length + 2;
+		const protocolRow = textFields.length;
+		const modelsRow = protocolRow + 1;
+		const saveRow = protocolRow + 2;
+		const rowCount = protocolRow + 3;
 		if (matchesKey(data, Key.escape)) {
 			this.actions.backToProviderList();
 			return;
 		}
+		if (matchesKey(data, Key.ctrl("d")) && draft.apiKeyConfigured) {
+			this.actions.clearApiKey(draft);
+			return;
+		}
 		if (matchesKey(data, "shift+tab")) {
 			this.focused = (this.focused - 1 + rowCount) % rowCount;
 			return;
@@ -3053,6 +3305,12 @@ var ModelProfileOverlay = class {
 			this.focused = (this.focused + 1) % rowCount;
 			return;
 		}
+		if (this.focused === protocolRow && (matchesKey(data, Key.left) || matchesKey(data, Key.right))) {
+			const direction = matchesKey(data, Key.left) ? -1 : 1;
+			const currentIndex = PROTOCOLS.indexOf(this.api);
+			this.api = PROTOCOLS[(currentIndex + direction + PROTOCOLS.length) % PROTOCOLS.length];
+			return;
+		}
 		if (matchesKey(data, Key.enter) && this.focused === modelsRow) {
 			this.showModels = true;
 			return;
@@ -3061,7 +3319,7 @@ var ModelProfileOverlay = class {
 			this.actions.saveProvider(this.buildDraft(draft));
 			return;
 		}
-		if (matchesKey(data, Key.enter) && this.focused < textFields.length) {
+		if (matchesKey(data, Key.enter) && this.focused <= protocolRow) {
 			this.focused = (this.focused + 1) % rowCount;
 			return;
 		}
@@ -3070,34 +3328,43 @@ var ModelProfileOverlay = class {
 			const next = miniTextFieldInput({
 				route: this.route,
 				displayName: this.displayName,
-				api: this.api,
 				baseURL: this.baseURL,
 				apiKey: this.apiKeyDraft
 			}[field], data);
 			if (next === void 0) return;
 			if (field === "route") this.route = next;
 			else if (field === "displayName") this.displayName = next;
-			else if (field === "api") this.api = next;
 			else if (field === "baseURL") this.baseURL = next;
 			else this.apiKeyDraft = next;
 		}
 	}
+	/**
+	* No Tab-toggled focus, on purpose: a hidden "which of two things am I
+	* typing into right now" mode with no visible indicator (the earlier
+	* design) is exactly the kind of invisible-state bug already fixed
+	* elsewhere in this file. Instead the "Add id" field is *always* live —
+	* every printable key, paste, and left/right/backspace/delete/home/end
+	* goes there, full stop, since ↑/↓ are the only keys `miniTextFieldInput`
+	* never claims. That leaves ↑/↓ free to always drive the list selection
+	* (for removal) at the same time, with no mode switch and no key that can
+	* ever mean two different things depending on invisible state.
+	*/
 	renderModelListEditor(mp) {
 		const lines = [bold$9(secondary$9("Models"))];
 		this.models.forEach((model, index) => {
-			const isSelected = !this.modelInputFocused && index === this.modelSelected;
+			const isSelected = index === this.modelSelected;
 			const text = `${isSelected ? "› " : "  "}${model.id}${model.name === void 0 ? "" : ` — ${model.name}`}`;
 			lines.push(isSelected ? invert$5(text) : text);
 		});
 		if (this.models.length === 0) lines.push(muted$10("No models yet."));
-		lines.push(`${this.modelInputFocused ? "› " : "  "}Add id: ${renderMiniTextField(this.modelDraftId, this.modelInputFocused)}`);
+		lines.push(`Add id: ${renderMiniTextField(this.modelDraftId, true)}`);
 		if (mp.busy) lines.push(muted$10("Discovering…"));
 		if (mp.discovered !== void 0) if (mp.discovered.length === 0) lines.push(muted$10("No models discovered."));
 		else {
-			lines.push(muted$10("Discovered — tab to the id field and type one to adopt it:"));
+			lines.push(muted$10("Discovered — type one into \"Add id\" above to adopt it:"));
 			for (const model of mp.discovered) lines.push(muted$10(`  ${model.id}${model.name === void 0 ? "" : ` — ${model.name}`}`));
 		}
-		lines.push(muted$10("tab toggle list/input · ↑↓ select · x remove · g discover · esc back"));
+		lines.push(muted$10("type + enter add · ↑↓ select · ctrl+x remove · ctrl+g discover · ctrl+s save · esc back (without saving)"));
 		return lines;
 	}
 	addModel(id) {
@@ -3113,36 +3380,34 @@ var ModelProfileOverlay = class {
 			this.showModels = false;
 			return;
 		}
-		if (matchesKey(data, Key.tab)) {
-			this.modelInputFocused = !this.modelInputFocused;
+		if (matchesKey(data, Key.ctrl("s"))) {
+			this.actions.saveProvider(this.buildDraft(draft));
 			return;
 		}
-		if (this.modelInputFocused) {
-			if (matchesKey(data, Key.enter)) {
-				this.addModel(this.modelDraftId.value);
-				return;
-			}
-			const next = miniTextFieldInput(this.modelDraftId, data);
-			if (next !== void 0) this.modelDraftId = next;
+		if (matchesKey(data, Key.ctrl("g"))) {
+			this.actions.discoverModelsForDraft(this.buildDraft(draft));
 			return;
 		}
-		if (data === "g") {
-			this.actions.discoverModelsForDraft(this.buildDraft(draft));
+		if (matchesKey(data, Key.ctrl("x"))) {
+			if (this.models.length === 0) return;
+			this.models = this.models.filter((_, index) => index !== this.modelSelected);
+			this.modelSelected = Math.max(0, Math.min(this.modelSelected, this.models.length - 1));
 			return;
 		}
-		if (this.models.length === 0) return;
 		if (matchesKey(data, Key.up)) {
-			this.modelSelected = Math.max(0, this.modelSelected - 1);
+			if (this.models.length > 0) this.modelSelected = Math.max(0, this.modelSelected - 1);
 			return;
 		}
 		if (matchesKey(data, Key.down)) {
-			this.modelSelected = Math.min(this.models.length - 1, this.modelSelected + 1);
+			if (this.models.length > 0) this.modelSelected = Math.min(this.models.length - 1, this.modelSelected + 1);
 			return;
 		}
-		if (data === "x") {
-			this.models = this.models.filter((_, index) => index !== this.modelSelected);
-			this.modelSelected = Math.max(0, Math.min(this.modelSelected, this.models.length - 1));
+		if (matchesKey(data, Key.enter)) {
+			this.addModel(this.modelDraftId.value);
+			return;
 		}
+		const next = miniTextFieldInput(this.modelDraftId, data);
+		if (next !== void 0) this.modelDraftId = next;
 	}
 	handleInput(data) {
 		const overlay = this.store.getSnapshot().overlay;
@@ -3154,7 +3419,8 @@ var ModelProfileOverlay = class {
 			else this.handleFormInput(data, draft);
 			return;
 		}
-		this.handleListInput(data, mp);
+		if (this.mode === "picker") this.handleModelPickerInput(data, mp);
+		else this.handleListInput(data, mp);
 	}
 };
 //#endregion
@@ -3163,33 +3429,126 @@ const bold$8 = (s) => `\x1b[1m${s}\x1b[0m`;
 const secondary$8 = fg(theme.secondary);
 const muted$9 = fg(theme.muted);
 const errorColor$4 = fg(theme.error);
+const successColor = fg(theme.success);
 const invert$4 = (s) => `\x1b[7m${s}\x1b[0m`;
+/** A non-secret reminder that replacing an API-key prompt will overwrite an existing stored key. */
+function formatStoredApiKeyHint(preview) {
+	return preview === void 0 ? void 0 : `Stored key: ${preview}`;
+}
+const AUTH_TYPES = ["oauth", "api-key"];
+const AUTH_TYPE_LABELS = {
+	oauth: "Sign in with an account",
+	"api-key": "Sign in with an API key"
+};
 var LoginOverlay = class {
+	tui;
 	store;
 	actions;
+	view = {
+		kind: "authType",
+		cursor: 0
+	};
 	promptField = emptyMiniTextField();
 	promptCursor = 0;
-	constructor(store, actions) {
+	constructor(tui, store, actions) {
+		this.tui = tui;
 		this.store = store;
 		this.actions = actions;
 	}
 	invalidate() {}
-	renderList(login) {
-		const lines = [bold$8(secondary$8("Sign in"))];
+	/**
+	* The global one-line notice (`store.setNotice`), rendered inline here.
+	* `/login` runs as a full-screen overlay that paints over the whole
+	* terminal, so the notice dock underneath — where sign-in progress,
+	* success ("Signed in to X."), and failure text otherwise land — is
+	* completely hidden for as long as this overlay stays open. Surfacing it
+	* here is what makes an OAuth callback's result actually visible instead
+	* of the screen appearing to do nothing once the browser redirects back.
+	*/
+	noticeLines() {
+		const notice = this.store.getSnapshot().notice;
+		return notice === void 0 ? [] : [muted$9(notice)];
+	}
+	/**
+	* Pure: given the loaded flows, which single method (if any) they all
+	* share — the chooser has nothing to offer when only one method type is
+	* registered at all. Recomputed fresh every call (no cached/latched
+	* result), so a later-refreshed flow set is always re-evaluated instead of
+	* replaying a stale decision (specs/001-…, R6).
+	*/
+	autoSkipAuthType(login) {
+		if (login.flows === void 0) return void 0;
+		const hasOAuth = login.flows.some((flow) => flow.methods.some((method) => method.id === "oauth"));
+		return hasOAuth === login.flows.some((flow) => flow.methods.some((method) => method.id === "api-key")) ? void 0 : hasOAuth ? "oauth" : "api-key";
+	}
+	/**
+	* Pure: the view to actually render/operate against. `this.view` stays the
+	* untouched `authType` default until the user explicitly chooses (Enter on
+	* the chooser) — until then, this derives the auto-skipped `list` view on
+	* every call instead of mutating `this.view` from inside `render()`. The
+	* first `handleInput` mutation against a derived (not-yet-explicit) `list`
+	* view reassigns `this.view` directly (see `handleProviderListInput`), so
+	* cursor/search state persists across renders once the user interacts.
+	*/
+	effectiveView(login) {
+		if (this.view.kind === "authType") {
+			const auto = this.autoSkipAuthType(login);
+			if (auto !== void 0) return {
+				kind: "list",
+				authType: auto,
+				chooserSkipped: true,
+				cursor: 0,
+				searchQuery: emptyMiniTextField()
+			};
+		}
+		return this.view;
+	}
+	filteredFlows(login, view) {
+		const all = login.flows ?? [];
+		const byType = view.authType === void 0 ? all : all.filter((flow) => flow.methods.some((method) => method.id === view.authType));
+		const query = view.searchQuery.value.trim();
+		return query === "" ? byType : fuzzyFilter([...byType], query, (flow) => flow.label);
+	}
+	renderAuthTypeChooser(login, view) {
+		const lines = [bold$8(secondary$8("Select authentication method"))];
+		lines.push(...this.noticeLines());
+		if (login.error !== void 0) lines.push(errorColor$4(login.error));
+		if (login.busy && login.flows === void 0) lines.push(muted$9("Loading…"));
+		AUTH_TYPES.forEach((type, index) => {
+			const text = `${index === view.cursor ? "› " : "  "}${AUTH_TYPE_LABELS[type]}`;
+			lines.push(index === view.cursor ? invert$4(text) : text);
+		});
+		lines.push(muted$9("↑↓ select · enter continue · esc close"));
+		return lines;
+	}
+	renderProviderList(login, view) {
+		const lines = [bold$8(secondary$8("Select provider to configure:"))];
+		lines.push(...this.noticeLines());
 		if (login.error !== void 0) lines.push(errorColor$4(login.error));
+		lines.push(`> ${renderMiniTextField(view.searchQuery, true)}`);
 		if (login.busy && login.flows === void 0) lines.push(muted$9("Loading…"));
-		login.flows?.forEach((flow, index) => {
-			const marker = flow.inFlight ? "· " : "○ ";
+		const flows = this.filteredFlows(login, view);
+		const chrome = lines.length + 2;
+		const maxVisible = listWindow(this.tui.terminal.rows, chrome);
+		const { start, end } = visibleRange(flows.length, view.cursor, maxVisible);
+		flows.slice(start, end).forEach((flow, offset) => {
+			const index = start + offset;
+			const marker = flow.inFlight ? "· " : flow.configured ? "✓ " : "○ ";
 			const signingIn = login.signingIn === flow.key ? " — signing in…" : "";
-			const text = `${index === login.selected ? "› " : "  "}${marker}${flow.label}${signingIn}`;
-			lines.push(index === login.selected ? invert$4(text) : text);
+			const via = flow.authMethod === "oauth" ? " [oauth]" : flow.authMethod === "api-key" ? " [api]" : "";
+			const readyNote = login.signingIn !== flow.key && flow.configured ? ` — ready to use${via}` : "";
+			const text = `${index === view.cursor ? "› " : "  "}${marker}${flow.label}${signingIn}${readyNote}`;
+			lines.push(index === view.cursor ? invert$4(text) : flow.configured ? successColor(text) : text);
 		});
-		if (login.flows?.length === 0) lines.push(muted$9("No sign-in providers are available in this profile."));
-		lines.push(muted$9("↑↓ select · enter sign in · esc close"));
+		if (flows.length > maxVisible) lines.push(muted$9(`(${view.cursor + 1}/${flows.length})`));
+		if (login.flows !== void 0 && flows.length === 0) lines.push(muted$9("No matching providers."));
+		const back = view.chooserSkipped ? "esc close" : "esc back";
+		lines.push(muted$9(`type to search · ↑↓ select · enter sign in (or edit key/models if already configured) · ctrl+p add custom provider · ${back}`));
 		return lines;
 	}
 	renderPrompt(prompt) {
 		const lines = [bold$8(secondary$8("Sign in"))];
+		lines.push(...this.noticeLines());
 		lines.push(prompt.message);
 		if (prompt.kind === "select") {
 			prompt.options.forEach((option, index) => {
@@ -3202,26 +3561,35 @@ var LoginOverlay = class {
 			const mask = prompt.kind === "secret" ? "•" : void 0;
 			const placeholder = prompt.placeholder ?? (prompt.kind === "secret" ? "API key" : "code");
 			const field = this.promptField.value === "" ? `(${placeholder})` : renderMiniTextField(this.promptField, true, mask);
+			const storedKeyHint = prompt.kind === "secret" ? formatStoredApiKeyHint(prompt.storedApiKeyPreview) : void 0;
+			if (storedKeyHint !== void 0) lines.push(muted$9(storedKeyHint));
 			lines.push(`> ${field}`);
-			lines.push(muted$9("type + enter submit · esc cancel"));
+			lines.push(muted$9("escape/ctrl+c to cancel, enter to submit"));
 		}
 		return lines;
 	}
 	render(_width) {
 		const overlay = this.store.getSnapshot().overlay;
 		if (overlay.kind !== "login") return [];
-		const { prompt } = overlay.login;
-		return prompt === void 0 ? this.renderList(overlay.login) : this.renderPrompt(prompt);
+		const { login } = overlay;
+		if (login.prompt !== void 0) return this.renderPrompt(login.prompt);
+		const view = this.effectiveView(login);
+		return view.kind === "authType" ? this.renderAuthTypeChooser(login, view) : this.renderProviderList(login, view);
 	}
 	handleInput(data) {
 		const overlay = this.store.getSnapshot().overlay;
 		if (overlay.kind !== "login") return;
-		const { prompt } = overlay.login;
-		if (prompt !== void 0) this.handlePromptInput(data, prompt);
-		else this.handleListInput(data, overlay.login);
+		const { login } = overlay;
+		if (login.prompt !== void 0) {
+			this.handlePromptInput(data, login.prompt);
+			return;
+		}
+		const view = this.effectiveView(login);
+		if (view.kind === "authType") this.handleAuthTypeChooserInput(data, view);
+		else this.handleProviderListInput(data, login, view);
 	}
 	handlePromptInput(data, prompt) {
-		if (matchesKey(data, Key.escape)) {
+		if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl("c"))) {
 			this.actions.answerAuthorizationPrompt("");
 			return;
 		}
@@ -3244,22 +3612,79 @@ var LoginOverlay = class {
 		const next = miniTextFieldInput(this.promptField, data);
 		if (next !== void 0) this.promptField = next;
 	}
-	handleListInput(data, login) {
+	handleAuthTypeChooserInput(data, view) {
 		if (matchesKey(data, Key.escape)) {
 			this.actions.closeLogin();
 			return;
 		}
-		const flows = login.flows;
-		if (flows === void 0 || flows.length === 0) return;
 		if (matchesKey(data, Key.up)) {
-			this.actions.selectLoginFlow(Math.max(0, login.selected - 1));
+			this.view = {
+				kind: "authType",
+				cursor: Math.max(0, view.cursor - 1)
+			};
 			return;
 		}
 		if (matchesKey(data, Key.down)) {
-			this.actions.selectLoginFlow(Math.min(flows.length - 1, login.selected + 1));
+			this.view = {
+				kind: "authType",
+				cursor: Math.min(AUTH_TYPES.length - 1, view.cursor + 1)
+			};
 			return;
 		}
-		if (matchesKey(data, Key.enter)) this.actions.beginAuthorization(flows[login.selected].key);
+		if (matchesKey(data, Key.enter)) this.view = {
+			kind: "list",
+			authType: AUTH_TYPES[view.cursor],
+			chooserSkipped: false,
+			cursor: 0,
+			searchQuery: emptyMiniTextField()
+		};
+	}
+	handleProviderListInput(data, login, view) {
+		if (matchesKey(data, Key.escape)) {
+			if (view.chooserSkipped) this.actions.closeLogin();
+			else this.view = {
+				kind: "authType",
+				cursor: 0
+			};
+			return;
+		}
+		if (matchesKey(data, Key.ctrl("p"))) {
+			this.actions.addCustomProvider();
+			return;
+		}
+		const flows = this.filteredFlows(login, view);
+		if (matchesKey(data, Key.up)) {
+			this.view = {
+				...view,
+				cursor: Math.max(0, view.cursor - 1)
+			};
+			return;
+		}
+		if (matchesKey(data, Key.down)) {
+			this.view = {
+				...view,
+				cursor: Math.min(Math.max(0, flows.length - 1), view.cursor + 1)
+			};
+			return;
+		}
+		if (matchesKey(data, Key.ctrl("e"))) {
+			const flow = flows[view.cursor];
+			if (flow !== void 0 && flow.configured && flow.key.startsWith("llm-pi-ai/")) this.actions.openProviderEditor(flow.key.slice(10));
+			return;
+		}
+		if (matchesKey(data, Key.enter)) {
+			const flow = flows[view.cursor];
+			if (flow === void 0) return;
+			if (flow.configured && flow.key.startsWith("llm-pi-ai/")) this.actions.openProviderEditor(flow.key.slice(10));
+			else this.actions.beginAuthorization(flow.key, view.authType);
+			return;
+		}
+		const next = miniTextFieldInput(view.searchQuery, data);
+		if (next !== void 0) this.view = {
+			...view,
+			searchQuery: next,
+			cursor: 0
+		};
 	}
 };
 //#endregion
@@ -4544,8 +4969,8 @@ var TuiApp = class {
 			const state = store.getSnapshot();
 			return buildStatusBarText({
 				sessionId: options.sessionId,
-				provider: options.provider,
-				model: options.model,
+				provider: state.activeModel?.provider ?? options.provider,
+				model: state.activeModel?.model ?? options.model,
 				status: state.status,
 				queuedCount: state.queued.length,
 				presetLabel: state.preset?.current,
@@ -4573,29 +4998,36 @@ var TuiApp = class {
 			updateHintText,
 			statsLineText
 		], { gap: 0 });
-		const headerInfo = new DynamicText(() => {
+		const headerMark = new DynamicText(() => ACRYL_MARK_ROWS.map((row) => fg(theme.primary)(row)).join("\n"));
+		const header = new HStack([{
+			component: this.pet,
+			basis: 34,
+			shrink: 0
+		}, {
+			component: headerMark,
+			basis: "auto",
+			grow: 1
+		}], {
+			gap: 1,
+			align: "start"
+		});
+		const buildStamp = `build a980b38 · ${(/* @__PURE__ */ new Date(BUILD_TIME)).toLocaleTimeString()}`;
+		const sessionInfo = new DynamicText(() => {
 			const { provider, model, cwd } = options;
 			return [
-				fg(theme.primary)("ACRYL"),
-				"",
 				`${provider}/${model}`,
-				cwd
+				cwd,
+				fg(theme.muted)(buildStamp)
 			].join("\n");
 		});
 		const layoutRoot = new VStack([
 			{
-				component: new HStack([{
-					component: this.pet,
-					basis: 34,
-					shrink: 0
-				}, {
-					component: headerInfo,
-					basis: "auto",
-					grow: 1
-				}], {
-					gap: 1,
-					align: "start"
-				}),
+				component: header,
+				basis: "auto",
+				shrink: 0
+			},
+			{
+				component: sessionInfo,
 				basis: "auto",
 				shrink: 0
 			},
@@ -4694,8 +5126,8 @@ var TuiApp = class {
 		const { store, actions, getTool, getToolCall } = this.options;
 		switch (overlay.kind) {
 			case "none": return;
-			case "modelProfile": return new ModelProfileOverlay(store, actions);
-			case "login": return new LoginOverlay(store, actions);
+			case "modelProfile": return new ModelProfileOverlay(this.tui, store, actions);
+			case "login": return new LoginOverlay(this.tui, store, actions);
 			case "trajectory": return new TrajectoryOverlay(this.tui, store, actions, getTool);
 			case "toolCards": return new ToolCardsOverlay(this.tui, store, actions, getTool, getToolCall);
 			case "context": return new ContextOverlay(store, actions);
@@ -4818,14 +5250,6 @@ async function walkDirectory(cwd) {
 	}
 	return results;
 }
-//#endregion
-//#region src/tui/auth-guidance.ts
-function logoutSuccessMessage(provider) {
-	return `Removed stored authentication for ${provider.trim() === "" ? "provider" : provider}.`;
-}
-function logoutNoneMessage() {
-	return "No active provider is selected; nothing to log out.";
-}
 /** Canonical ACRYL version string used by the CLI and the release smoke checks. */
 const ACRYL_VERSION = createRequire(import.meta.url)("../package.json").version;
 //#endregion
@@ -4840,6 +5264,8 @@ const ACRYL_VERSION = createRequire(import.meta.url)("../package.json").version;
 * TUI shows the same capabilities the web surface does. `/clear` flushes the
 * current session and re-attaches a fresh one (durable history stays on disk).
 */
+/** The credential-record scope `dsh-llm-pi-ai` writes a `/login` sign-in under (`credentialKey('llm-pi-ai', providerId)`). */
+const LOGIN_RECORD_SCOPE = "llm-pi-ai";
 const TUI_VERSION = ACRYL_VERSION;
 const PROMPT_HISTORY_LIMIT = 200;
 function failUnknown(status) {
@@ -4881,10 +5307,35 @@ function getAtPath(value, path) {
 	}
 	return current;
 }
-/** Derive a POSIX-identifier credential ref from a provider route, e.g. `my-proxy` -> `MY_PROXY_API_KEY`. */
-function deriveApiKeyRef(route) {
-	const upper = route.toUpperCase().replace(/[^A-Z0-9]+/g, "_");
-	return `${/^[A-Z_]/.test(upper) ? upper : `P_${upper}`}_API_KEY`;
+/**
+* `dsh-llm-pi-ai`'s own credential record key under `LOGIN_RECORD_SCOPE`
+* (`credentialKey('llm-pi-ai', providerId)`, i.e. `"llm-pi-ai/<providerId>"`).
+* A `/login` sign-in (OAuth or API key) writes here through pi-ai's own
+* `CredentialStore`, entirely separate from the `apiKeyEnv` reference a
+* manually configured provider's settings profile points at.
+* `acryl-control`'s `CredentialProjection` computes this internally for the
+* read side; only `clearApiKey`'s explicit delete still needs it directly.
+*/
+function loginRecordKey(providerId) {
+	return `${LOGIN_RECORD_SCOPE}/${providerId}`;
+}
+/**
+* Wait out `ctx.settings`' asynchronous watcher queue after a write.
+*
+* `settingsSvc.update()`'s returned promise resolves once the write commits
+* to the settings document — but `dsh-llm-pi-ai`'s own reactive watcher (the
+* thing that actually rebuilds its live `Models` registry and re-registers
+* routes with `ctx.llm`) runs on a *separate* promise chained off that
+* commit, not before it settles. A caller that reads `ctx.llm.listModels()`
+* or `listProviders()` immediately after `update()` resolves races that
+* watcher and sees the pre-write state. `setImmediate` runs after the
+* Node microtask queue drains, which is exactly where that chained watcher
+* promise settles, so awaiting one flush is enough to see the write reflected.
+*/
+function flushSettingsWatchers() {
+	return new Promise((resolve) => {
+		setImmediate(resolve);
+	});
 }
 /** Open a URL in the platform's default browser (fire-and-forget). */
 function openBrowser(url) {
@@ -4949,11 +5400,46 @@ async function attachSession(host, resumeId) {
 	const agent = host.ctx.agents?.get?.(SessionId(id));
 	const session = agent?.session;
 	const history = [];
-	async function loadProviders() {
+	function credentialProjectionServices() {
 		const settingsSvc = host.ctx.get("settings");
 		const credentialsSvc = host.ctx.get("credentials");
 		const llmSvc = host.ctx.get("llm");
-		if (settingsSvc === void 0 || credentialsSvc === void 0 || llmSvc === void 0) {
+		if (settingsSvc === void 0 || credentialsSvc === void 0 || llmSvc === void 0) return void 0;
+		return {
+			settings: settingsSvc,
+			credentials: credentialsSvc,
+			llm: llmSvc
+		};
+	}
+	async function credentialRows() {
+		const services = credentialProjectionServices();
+		if (services === void 0) return void 0;
+		return computeCredentialProjection(services, {
+			deriveApiKeyRef,
+			loginRecordScope: LOGIN_RECORD_SCOPE
+		});
+	}
+	/** Map the shared `CredentialProjectionRow` onto `/model`'s own `ProviderRow` presentation shape. */
+	function toProviderRow(row) {
+		return {
+			route: row.route,
+			displayName: row.displayName,
+			settingsNs: row.settingsNs,
+			settingsPath: row.settingsPath,
+			configured: row.hasSettingsProfile,
+			live: row.isLive,
+			api: row.api,
+			baseURL: row.baseURL,
+			apiKeyRef: row.apiKeyRef,
+			apiKeyConfigured: row.hasCredential,
+			authMethod: row.authMethod,
+			models: row.models,
+			revision: row.revision
+		};
+	}
+	async function loadProviders() {
+		const rows = await credentialRows();
+		if (rows === void 0) {
 			store.updateModelProfile({
 				providers: [],
 				busy: false,
@@ -4961,40 +5447,64 @@ async function attachSession(host, resumeId) {
 			});
 			return;
 		}
-		const configurable = llmSvc.listConfigurableProviders();
-		const live = new Set(llmSvc.listProviders().map((provider) => provider.id));
-		const descriptors = settingsSvc.describe({ redactSecrets: true });
-		const byNs = new Map(descriptors.map((descriptor) => [descriptor.ns, descriptor]));
-		const rows = [];
-		for (const entry of configurable) {
-			const descriptor = byNs.get(entry.settingsNs);
-			const value = descriptor === void 0 ? void 0 : getAtPath(descriptor.value, entry.settingsPath);
-			const userValue = descriptor === void 0 ? void 0 : getAtPath(descriptor.user, entry.settingsPath);
-			const apiKeyRef = value?.apiKeyEnv ?? deriveApiKeyRef(entry.provider);
-			const info = await credentialsSvc.describe(apiKeyRef);
-			rows.push({
-				route: entry.provider,
-				displayName: value?.displayName ?? entry.displayName,
-				settingsNs: entry.settingsNs,
-				settingsPath: entry.settingsPath,
-				configured: userValue !== void 0,
-				live: live.has(entry.provider),
-				api: value?.api,
-				baseURL: value?.baseURL,
-				apiKeyRef,
-				apiKeyConfigured: info.configured,
-				models: value?.models ?? [],
-				revision: descriptor?.revision
-			});
-		}
+		const providers = rows.map(toProviderRow);
 		store.updateModelProfile({
-			providers: rows,
+			providers,
 			busy: false,
 			error: void 0,
 			selected: 0
 		});
 	}
-	async function loadAuthorizationFlows() {
+	function openEditFormForRow(row) {
+		const overlay = store.getSnapshot().overlay;
+		if (overlay.kind !== "modelProfile") return;
+		const draft = {
+			route: row.route,
+			isNew: false,
+			settingsNs: row.settingsNs,
+			settingsPath: row.settingsPath,
+			displayName: row.displayName,
+			api: row.api ?? "",
+			baseURL: row.baseURL ?? "",
+			apiKeyRef: row.apiKeyRef,
+			apiKeyConfigured: row.apiKeyConfigured,
+			authMethod: row.authMethod,
+			apiKeyDraft: "",
+			apiKeyPreview: void 0,
+			models: row.models,
+			revision: row.revision
+		};
+		const formKey = overlay.modelProfile.formKey + 1;
+		store.updateModelProfile({
+			view: "form",
+			draft,
+			formKey
+		});
+		if (row.authMethod === "api-key") (async () => {
+			const resolved = await host.ctx.get("credentials")?.resolve?.(row.apiKeyRef).catch(() => void 0);
+			if (resolved?.value === void 0) return;
+			const current = store.getSnapshot().overlay;
+			if (current.kind !== "modelProfile" || current.modelProfile.formKey !== formKey) return;
+			const currentDraft = current.modelProfile.draft;
+			if (currentDraft === void 0) return;
+			store.updateModelProfile({ draft: {
+				...currentDraft,
+				apiKeyPreview: maskKeyPreview(resolved.value)
+			} });
+		})();
+	}
+	const routeActivationPort = { async ensureRouteActivated(providerId) {
+		const settingsSvc = host.ctx.get("settings");
+		const llmSvc = host.ctx.get("llm");
+		if (settingsSvc === void 0 || llmSvc === void 0) return;
+		const entry = llmSvc.listConfigurableProviders().find((candidate) => candidate.provider === providerId);
+		if (entry === void 0) return;
+		const descriptor = settingsSvc.describe({ redactSecrets: true }).find((candidate) => candidate.ns === entry.settingsNs);
+		if ((descriptor === void 0 ? void 0 : getAtPath(descriptor.user, entry.settingsPath)) !== void 0) return;
+		await settingsSvc.update(entry.settingsNs, nestAtPath(entry.settingsPath, {}), descriptor?.revision);
+		await flushSettingsWatchers();
+	} };
+	async function loadLoginFlows() {
 		const authSvc = host.ctx.get("authorization");
 		if (authSvc === void 0) {
 			store.updateLogin({
@@ -5005,7 +5515,17 @@ async function attachSession(host, resumeId) {
 			return;
 		}
 		try {
-			const list = authSvc.list();
+			const entries = authSvc.list();
+			const rows = await credentialRows();
+			const byKey = new Map((rows ?? []).map((row) => [loginRecordKey(row.route), row]));
+			const list = entries.map((entry) => {
+				const row = byKey.get(entry.key);
+				return {
+					...entry,
+					configured: row?.hasCredential ?? false,
+					authMethod: row?.authMethod
+				};
+			});
 			store.updateLogin({
 				flows: list,
 				busy: false,
@@ -5018,6 +5538,41 @@ async function attachSession(host, resumeId) {
 			});
 		}
 	}
+	function syncCredentialViews() {
+		loadProviders();
+		loadLoginFlows();
+	}
+	/** Open `/model`'s blank custom-provider draft — assumes `/model` is (or is about to become) the open overlay. Shared by `createProvider` (already there) and `addCustomProvider` (getting there first). */
+	function openCustomProviderDraft() {
+		const settingsNs = host.ctx.get("llm")?.listConfigurableProviders?.()[0]?.settingsNs;
+		if (settingsNs === void 0) {
+			store.setNotice("Adding a custom provider is not available in this profile.");
+			return;
+		}
+		const draft = {
+			route: "",
+			isNew: true,
+			settingsNs,
+			settingsPath: [],
+			displayName: "",
+			api: "",
+			baseURL: "",
+			apiKeyRef: "",
+			apiKeyConfigured: false,
+			authMethod: void 0,
+			apiKeyDraft: "",
+			apiKeyPreview: void 0,
+			models: [],
+			revision: void 0
+		};
+		const overlay = store.getSnapshot().overlay;
+		const formKey = overlay.kind === "modelProfile" ? overlay.modelProfile.formKey + 1 : 1;
+		store.updateModelProfile({
+			view: "form",
+			draft,
+			formKey
+		});
+	}
 	async function loadAgentPresets() {
 		const presetsSvc = host.ctx.get("agentPresets");
 		if (presetsSvc === void 0) {
@@ -5060,7 +5615,9 @@ async function attachSession(host, resumeId) {
 			});
 		},
 		cancel() {
-			bridge.cancel(id).catch(() => {});
+			bridge.cancel(id).catch((error) => {
+				store.setNotice(`Could not cancel: ${error instanceof Error ? error.message : String(error)}`);
+			});
 		},
 		shutdown() {
 			signal("exit");
@@ -5168,17 +5725,15 @@ async function attachSession(host, resumeId) {
 		},
 		login() {
 			store.openLogin();
-			loadAuthorizationFlows();
+			loadLoginFlows();
 		},
 		closeLogin() {
 			store.closeOverlay();
 		},
-		selectLoginFlow(index) {
-			store.updateLogin({ selected: index });
-		},
-		beginAuthorization(key) {
+		beginAuthorization(key, method) {
 			(async () => {
 				const authSvc = host.ctx.get("authorization");
+				const credentialsSvc = host.ctx.get("credentials");
 				if (authSvc === void 0) {
 					store.setNotice("Sign-in is not available in this profile.");
 					return;
@@ -5186,6 +5741,8 @@ async function attachSession(host, resumeId) {
 				const overlay = store.getSnapshot().overlay;
 				const flow = overlay.kind === "login" ? overlay.login.flows?.find((entry) => entry.key === key) : void 0;
 				if (flow === void 0) return;
+				const existingRecord = (method ?? flow.methods[0]?.id) === "api-key" ? await credentialsSvc?.readRecord?.(flow.key) : void 0;
+				const storedApiKeyPreview = typeof existingRecord?.key === "string" ? maskKeyPreview(existingRecord.key) : void 0;
 				store.updateLogin({ signingIn: key });
 				const interaction = {
 					notify(notice) {
@@ -5210,8 +5767,13 @@ async function attachSession(host, resumeId) {
 									label: option.label,
 									description: option.description
 								}))
+							} : prompt.kind === "secret" ? {
+								kind: "secret",
+								message: prompt.message,
+								placeholder: prompt.placeholder,
+								storedApiKeyPreview
 							} : {
-								kind: prompt.kind,
+								kind: "text",
 								message: prompt.message,
 								placeholder: prompt.placeholder
 							};
@@ -5224,16 +5786,20 @@ async function attachSession(host, resumeId) {
 						});
 					}
 				};
+				const authorizationService = new AuthorizationService({
+					authorization: authSvc,
+					routeActivation: routeActivationPort,
+					onCredentialChanged: () => syncCredentialViews()
+				});
 				try {
-					if ((await authSvc.begin({
+					if ((await authorizationService.begin({
 						key,
+						method,
 						interaction
-					})).status === "authorized") {
-						store.setNotice(`Signed in to ${flow.label}.`);
-						loadAuthorizationFlows();
-					} else store.setNotice("Sign-in cancelled.");
+					})).status === "authorized") store.setNotice(`Signed in to ${flow.label} — credentials saved, ready to use from /model.`);
+					else store.updateLogin({ error: "Sign-in cancelled." });
 				} catch (error) {
-					store.setNotice(`Sign-in failed: ${error instanceof Error ? error.message : String(error)}`);
+					store.updateLogin({ error: `Sign-in failed: ${error instanceof Error ? error.message : String(error)}` });
 				} finally {
 					store.updateLogin({ signingIn: void 0 });
 				}
@@ -5246,28 +5812,9 @@ async function attachSession(host, resumeId) {
 			if (resolve !== void 0) resolve(value);
 		},
 		logout() {
-			(async () => {
-				const credentialsSvc = host.ctx.get("credentials");
-				if (credentialsSvc === void 0) {
-					store.setNotice("Credentials are not available in this profile.");
-					return;
-				}
-				const selection = host.ctx.get("agentDefaultModel")?.currentSelection?.();
-				const overlay = store.getSnapshot().overlay;
-				const rows = overlay.kind === "modelProfile" ? overlay.modelProfile.providers : void 0;
-				const row = rows?.find((entry) => entry.route === selection?.provider) ?? (rows !== void 0 && rows.length === 1 ? rows[0] : void 0);
-				if (row === void 0) {
-					store.setNotice(logoutNoneMessage());
-					return;
-				}
-				try {
-					await credentialsSvc.unset(row.apiKeyRef);
-					store.setNotice(logoutSuccessMessage(row.displayName));
-					loadProviders();
-				} catch (error) {
-					store.setNotice(`logout failed: ${error instanceof Error ? error.message : String(error)}`);
-				}
-			})();
+			store.openModelProfile();
+			store.setNotice("Select a provider, then Ctrl+D to sign out.");
+			loadProviders();
 		},
 		openTrajectory() {
 			store.openTrajectory();
@@ -5295,40 +5842,41 @@ async function attachSession(host, resumeId) {
 		},
 		backToProviderList() {
 			store.updateModelProfile({ view: "list" });
-		},
-		selectProvider(index) {
-			store.updateModelProfile({ selected: index });
+			syncCredentialViews();
 		},
 		createProvider() {
-			store.updateModelProfile({
-				view: "form",
-				draft: void 0
-			});
+			openCustomProviderDraft();
+		},
+		addCustomProvider() {
+			store.openModelProfile();
+			loadProviders();
+			openCustomProviderDraft();
 		},
 		editProvider(route) {
 			const overlay = store.getSnapshot().overlay;
 			if (overlay.kind !== "modelProfile") return;
 			const row = overlay.modelProfile.providers?.find((entry) => entry.route === route);
 			if (row === void 0) return;
-			const draft = {
-				route: row.route,
-				isNew: false,
-				settingsNs: row.settingsNs,
-				settingsPath: row.settingsPath,
-				displayName: row.displayName,
-				api: row.api ?? "",
-				baseURL: row.baseURL ?? "",
-				apiKeyRef: row.apiKeyRef,
-				apiKeyConfigured: row.apiKeyConfigured,
-				apiKeyDraft: "",
-				models: row.models,
-				revision: row.revision
-			};
-			store.updateModelProfile({
-				view: "form",
-				draft,
-				formKey: overlay.modelProfile.formKey + 1
-			});
+			openEditFormForRow(row);
+		},
+		openProviderEditor(route) {
+			(async () => {
+				store.openModelProfile();
+				const rows = await credentialRows();
+				const providers = rows?.map(toProviderRow);
+				store.updateModelProfile({
+					providers: providers ?? [],
+					busy: false,
+					error: rows === void 0 ? "Model provider settings are not available in this profile." : void 0,
+					selected: 0
+				});
+				const row = providers?.find((entry) => entry.route === route);
+				if (row === void 0) {
+					store.setNotice(`Provider "${route}" not found.`);
+					return;
+				}
+				openEditFormForRow(row);
+			})();
 		},
 		saveProvider(draft) {
 			(async () => {
@@ -5338,20 +5886,25 @@ async function attachSession(host, resumeId) {
 					store.setNotice("Provider settings are not available in this profile.");
 					return;
 				}
+				if (draft.isNew && draft.route.trim() === "") {
+					store.updateModelProfile({ error: "Provider ID is required." });
+					return;
+				}
 				try {
 					const key = draft.apiKeyDraft.trim();
 					if (key !== "") await credentialsSvc.set(draft.apiKeyRef, key);
 					const section = {
-						displayName: draft.displayName,
-						api: draft.api,
-						baseURL: draft.baseURL,
+						...draft.displayName.trim() === "" ? {} : { displayName: draft.displayName },
+						...draft.api.trim() === "" ? {} : { api: draft.api },
+						...draft.baseURL.trim() === "" ? {} : { baseURL: draft.baseURL },
 						apiKeyEnv: draft.apiKeyRef,
-						models: draft.models
+						...draft.models.length === 0 ? {} : { models: draft.models }
 					};
 					await settingsSvc.update(draft.settingsNs, nestAtPath(draft.settingsPath, section), draft.revision);
-					store.setNotice(`Saved ${draft.displayName || draft.route}.`);
+					await flushSettingsWatchers();
+					store.setNotice(`Saved ${draft.displayName || draft.route} — credentials stored, ready to use from /model.`);
 					store.updateModelProfile({ view: "list" });
-					loadProviders();
+					syncCredentialViews();
 				} catch (error) {
 					store.setNotice(`save failed: ${error instanceof Error ? error.message : String(error)}`);
 				}
@@ -5368,15 +5921,85 @@ async function attachSession(host, resumeId) {
 				try {
 					await credentialsSvc.unset(row.apiKeyRef);
 					await settingsSvc.update(row.settingsNs, nestAtPath(row.settingsPath, {}), row.revision);
+					await flushSettingsWatchers();
 					store.setNotice(`Removed ${row.displayName}.`);
-					loadProviders();
+					syncCredentialViews();
 				} catch (error) {
 					store.setNotice(`delete failed: ${error instanceof Error ? error.message : String(error)}`);
 				}
 			})();
 		},
-		discoverModelsForDraft() {},
-		setActiveModel() {},
+		clearApiKey(draft) {
+			(async () => {
+				const credentialsSvc = host.ctx.get("credentials");
+				if (credentialsSvc === void 0) {
+					store.setNotice("Credentials are not available in this profile.");
+					return;
+				}
+				try {
+					await credentialsSvc.unset(draft.apiKeyRef);
+					await credentialsSvc.deleteRecord?.(loginRecordKey(draft.route));
+					store.setNotice(`Removed the API key for ${draft.displayName || draft.route}.`);
+					store.updateModelProfile({ view: "list" });
+					syncCredentialViews();
+				} catch (error) {
+					store.setNotice(`Could not remove the key: ${error instanceof Error ? error.message : String(error)}`);
+				}
+			})();
+		},
+		discoverModelsForDraft(draft) {
+			(async () => {
+				const llmSvc = host.ctx.get("llm");
+				if (llmSvc === void 0) {
+					store.setNotice("Model discovery is not available in this profile.");
+					return;
+				}
+				store.updateModelProfile({ busy: true });
+				try {
+					const request = {};
+					if (!draft.isNew) request.provider = draft.route;
+					if (draft.baseURL.trim() !== "") request.baseURL = draft.baseURL.trim();
+					if (draft.api.trim() !== "") request.api = draft.api.trim();
+					if (draft.apiKeyDraft.trim() !== "") request.apiKey = draft.apiKeyDraft.trim();
+					const discovered = await llmSvc.discoverModels(draft.settingsNs, request);
+					store.updateModelProfile({
+						busy: false,
+						discovered
+					});
+				} catch (error) {
+					store.updateModelProfile({
+						busy: false,
+						discovered: []
+					});
+					store.setNotice(`Model discovery failed: ${error instanceof Error ? error.message : String(error)}`);
+				}
+			})();
+		},
+		setActiveModel(provider, model) {
+			(async () => {
+				try {
+					await bridge.selectModel({
+						sessionId: id,
+						provider,
+						model
+					});
+					store.setActiveModel({
+						provider,
+						model
+					});
+					try {
+						await host.ctx.get("agentDefaultModel")?.saveSelection({
+							provider,
+							model
+						});
+					} catch {}
+					store.setNotice(`Active model set to ${model} (${provider}).`);
+					loadProviders();
+				} catch (error) {
+					store.setNotice(`Could not set active model: ${error instanceof Error ? error.message : String(error)}`);
+				}
+			})();
+		},
 		closeTrajectory() {
 			store.closeOverlay();
 		},
@@ -5612,7 +6235,7 @@ async function runAcryl(args, supplied = {}) {
 		return;
 	}
 	if (!process.stdin.isTTY || !process.stdout.isTTY) {
-		dependencies.write("acryl-tui: stdin and stdout must both be TTYs; use `acryl tui --json` for a headless probe");
+		dependencies.write("acryl-cli: stdin and stdout must both be TTYs; use `acryl tui --json` for a headless probe");
 		dependencies.exit(1);
 		return;
 	}