acryl-cli-linux-x64 0.1.35 → 0.1.36

package/runtime/lib/index.js

@@ -2,6 +2,7 @@ import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
 import { bootAcrylHarnessProfile, createAcrylSessionBridge } from "acryl-harness-runtime";
 import { execFile, spawn } from "node:child_process";
+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, fuzzyFilter, matchesKey, setKeybindings, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
@@ -1121,7 +1122,7 @@ const ACRYL_MARK_ROWS = [
 	"                                    ▀                 "
 ];
 /** ISO timestamp this build was produced at. */
-const BUILD_TIME = "2026-09-08T14:33:49.586Z";
+const BUILD_TIME = "2026-09-08T18:16:12.207Z";
 //#endregion
 //#region src/tui/statsFormat.ts
 /**
@@ -2959,14 +2960,42 @@ function renderMiniTextField(state, cursorVisible, mask) {
 	return `${display.slice(0, state.cursor)}\x1b[7m${display[state.cursor] ?? " "}\x1b[0m${display.slice(state.cursor + 1)}`;
 }
 //#endregion
-//#region src/tui/modelProfile/types.ts
+//#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
+*/
 /**
-* Data shapes for the `/model` provider-profile overlay: the read model that
-* joins `ctx.llm`'s provider directory with `ctx.settings`' stored sections,
-* the raw shape stored at each provider's settings path, and the mutable
-* draft one add/edit form works with before a save round-trips it back.
-* @module @tomowang/dsh-tui/tui/modelProfile/types
+* 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
@@ -3039,32 +3068,6 @@ var ModelProfileOverlay = class {
 	}
 	invalidate() {}
 	/**
-	* 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 here windows around the
-	* current selection instead, so the hint line is always the last line
-	* printed and always fits on screen.
-	*/
-	listWindow(chrome) {
-		return Math.max(3, this.tui.terminal.rows - chrome);
-	}
-	/** The `[start, end)` slice of `count` items to show so `selected` stays visible within `maxVisible` rows, biased to keep it centered. */
-	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
-		};
-	}
-	/**
 	* 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
@@ -3164,8 +3167,8 @@ var ModelProfileOverlay = class {
 		const all = this.pickerItems(mp);
 		const filtered = this.filteredPickerItems(mp);
 		const chrome = lines.length + 2;
-		const maxVisible = this.listWindow(chrome);
-		const { start, end } = this.visibleRange(filtered.length, this.modelPickerCursor, maxVisible);
+		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" : "";
@@ -3224,8 +3227,8 @@ var ModelProfileOverlay = class {
 		if (busy && providers === void 0) lines.push(muted$10("Loading…"));
 		const filtered = this.filteredProviders(mp);
 		const chrome = lines.length + 2;
-		const maxVisible = this.listWindow(chrome);
-		const { start, end } = this.visibleRange(filtered.length, this.providerCursor, maxVisible);
+		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 ? "● " : "○ ";
@@ -3490,13 +3493,10 @@ var LoginOverlay = class {
 	tui;
 	store;
 	actions;
-	step = "authType";
-	authType;
-	authTypeCursor = 0;
-	chooserSkipped = false;
-	autoSkipChecked = false;
-	listCursor = 0;
-	searchQuery = emptyMiniTextField();
+	view = {
+		kind: "authType",
+		cursor: 0
+	};
 	promptField = emptyMiniTextField();
 	promptCursor = 0;
 	constructor(tui, store, actions) {
@@ -3505,22 +3505,6 @@ var LoginOverlay = class {
 		this.actions = actions;
 	}
 	invalidate() {}
-	/** See `ModelProfileOverlay.listWindow` — same overflow bug, same fix: a long provider list (~35 catalog entries) must never push the key-legend hint line past the bottom of the terminal. */
-	listWindow(chrome) {
-		return Math.max(3, this.tui.terminal.rows - chrome);
-	}
-	/** The `[start, end)` slice of `count` items to show so `selected` stays visible within `maxVisible` rows, biased to keep it centered. */
-	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
-		};
-	}
 	/**
 	* The global one-line notice (`store.setNotice`), rendered inline here.
 	* `/login` runs as a full-screen overlay that paints over the whole
@@ -3534,56 +3518,80 @@ var LoginOverlay = class {
 		const notice = this.store.getSnapshot().notice;
 		return notice === void 0 ? [] : [muted$9(notice)];
 	}
-	/** Partition the loaded flows by method type, once, the first time they arrive; auto-advances past the chooser if only one type is on offer. */
-	maybeAutoSkipChooser(login) {
-		if (this.autoSkipChecked || login.flows === void 0) return;
-		this.autoSkipChecked = true;
+	/**
+	* 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"));
-		if (hasOAuth === login.flows.some((flow) => flow.methods.some((method) => method.id === "api-key"))) return;
-		this.authType = hasOAuth ? "oauth" : "api-key";
-		this.step = "list";
-		this.chooserSkipped = true;
+		return hasOAuth === login.flows.some((flow) => flow.methods.some((method) => method.id === "api-key")) ? void 0 : hasOAuth ? "oauth" : "api-key";
 	}
-	filteredFlows(login) {
+	/**
+	* 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 = this.authType === void 0 ? all : all.filter((flow) => flow.methods.some((method) => method.id === this.authType));
-		const query = this.searchQuery.value.trim();
+		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) {
+	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 === this.authTypeCursor ? "› " : "  "}${AUTH_TYPE_LABELS[type]}`;
-			lines.push(index === this.authTypeCursor ? invert$4(text) : text);
+			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) {
+	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(this.searchQuery, true)}`);
+		lines.push(`> ${renderMiniTextField(view.searchQuery, true)}`);
 		if (login.busy && login.flows === void 0) lines.push(muted$9("Loading…"));
-		const flows = this.filteredFlows(login);
+		const flows = this.filteredFlows(login, view);
 		const chrome = lines.length + 2;
-		const maxVisible = this.listWindow(chrome);
-		const { start, end } = this.visibleRange(flows.length, this.listCursor, maxVisible);
+		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 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 === this.listCursor ? "› " : "  "}${marker}${flow.label}${signingIn}${readyNote}`;
-			lines.push(index === this.listCursor ? invert$4(text) : flow.configured ? successColor(text) : text);
+			const text = `${index === view.cursor ? "› " : "  "}${marker}${flow.label}${signingIn}${readyNote}`;
+			lines.push(index === view.cursor ? invert$4(text) : flow.configured ? successColor(text) : text);
 		});
-		if (flows.length > maxVisible) lines.push(muted$9(`(${this.listCursor + 1}/${flows.length})`));
+		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 = this.chooserSkipped ? "esc close" : "esc back";
+		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;
 	}
@@ -3614,8 +3622,8 @@ var LoginOverlay = class {
 		if (overlay.kind !== "login") return [];
 		const { login } = overlay;
 		if (login.prompt !== void 0) return this.renderPrompt(login.prompt);
-		this.maybeAutoSkipChooser(login);
-		return this.step === "authType" ? this.renderAuthTypeChooser(login) : this.renderProviderList(login);
+		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;
@@ -3625,8 +3633,9 @@ var LoginOverlay = class {
 			this.handlePromptInput(data, login.prompt);
 			return;
 		}
-		if (this.step === "authType") this.handleAuthTypeChooserInput(data);
-		else this.handleProviderListInput(data, login);
+		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) || matchesKey(data, Key.ctrl("c"))) {
@@ -3652,65 +3661,79 @@ var LoginOverlay = class {
 		const next = miniTextFieldInput(this.promptField, data);
 		if (next !== void 0) this.promptField = next;
 	}
-	handleAuthTypeChooserInput(data) {
+	handleAuthTypeChooserInput(data, view) {
 		if (matchesKey(data, Key.escape)) {
 			this.actions.closeLogin();
 			return;
 		}
 		if (matchesKey(data, Key.up)) {
-			this.authTypeCursor = Math.max(0, this.authTypeCursor - 1);
+			this.view = {
+				kind: "authType",
+				cursor: Math.max(0, view.cursor - 1)
+			};
 			return;
 		}
 		if (matchesKey(data, Key.down)) {
-			this.authTypeCursor = Math.min(AUTH_TYPES.length - 1, this.authTypeCursor + 1);
+			this.view = {
+				kind: "authType",
+				cursor: Math.min(AUTH_TYPES.length - 1, view.cursor + 1)
+			};
 			return;
 		}
-		if (matchesKey(data, Key.enter)) {
-			this.authType = AUTH_TYPES[this.authTypeCursor];
-			this.step = "list";
-			this.listCursor = 0;
-			this.searchQuery = emptyMiniTextField();
-		}
+		if (matchesKey(data, Key.enter)) this.view = {
+			kind: "list",
+			authType: AUTH_TYPES[view.cursor],
+			chooserSkipped: false,
+			cursor: 0,
+			searchQuery: emptyMiniTextField()
+		};
 	}
-	handleProviderListInput(data, login) {
+	handleProviderListInput(data, login, view) {
 		if (matchesKey(data, Key.escape)) {
-			if (this.chooserSkipped) this.actions.closeLogin();
-			else {
-				this.step = "authType";
-				this.searchQuery = emptyMiniTextField();
-			}
+			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);
+		const flows = this.filteredFlows(login, view);
 		if (matchesKey(data, Key.up)) {
-			this.listCursor = Math.max(0, this.listCursor - 1);
+			this.view = {
+				...view,
+				cursor: Math.max(0, view.cursor - 1)
+			};
 			return;
 		}
 		if (matchesKey(data, Key.down)) {
-			this.listCursor = Math.min(Math.max(0, flows.length - 1), this.listCursor + 1);
+			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[this.listCursor];
+			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[this.listCursor];
+			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, this.authType);
+			else this.actions.beginAuthorization(flow.key, view.authType);
 			return;
 		}
-		const next = miniTextFieldInput(this.searchQuery, data);
-		if (next !== void 0) {
-			this.searchQuery = next;
-			this.listCursor = 0;
-		}
+		const next = miniTextFieldInput(view.searchQuery, data);
+		if (next !== void 0) this.view = {
+			...view,
+			searchQuery: next,
+			cursor: 0
+		};
 	}
 };
 //#endregion
@@ -5037,7 +5060,7 @@ var TuiApp = class {
 			gap: 1,
 			align: "start"
 		});
-		const buildStamp = `build bf7e1ab · ${(/* @__PURE__ */ new Date(BUILD_TIME)).toLocaleTimeString()}`;
+		const buildStamp = `build a980b38 · ${(/* @__PURE__ */ new Date(BUILD_TIME)).toLocaleTimeString()}`;
 		const sessionInfo = new DynamicText(() => {
 			const { provider, model, cwd } = options;
 			return [
@@ -5276,6 +5299,8 @@ async function walkDirectory(cwd) {
 	}
 	return results;
 }
+/** Canonical ACRYL version string used by the CLI and the release smoke checks. */
+const ACRYL_VERSION = createRequire(import.meta.url)("../package.json").version;
 //#endregion
 //#region src/tui-app/session.ts
 /**
@@ -5288,7 +5313,9 @@ async function walkDirectory(cwd) {
 * 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).
 */
-const TUI_VERSION = createRequire(import.meta.url)("../package.json").version;
+/** 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) {
 	return status === "running" ? "running" : "idle";
@@ -5330,14 +5357,16 @@ function getAtPath(value, path) {
 	return current;
 }
 /**
-* `dsh-llm-pi-ai`'s own credential 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 — so a provider's "has credentials" status
-* has to check both places, and this is the address for the first.
+* `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 piAiRecordKey(providerId) {
-	return `llm-pi-ai/${providerId}`;
+function loginRecordKey(providerId) {
+	return `${LOGIN_RECORD_SCOPE}/${providerId}`;
 }
 /**
 * Wait out `ctx.settings`' asynchronous watcher queue after a write.
@@ -5420,46 +5449,45 @@ async function attachSession(host, resumeId) {
 	const agent = host.ctx.agents?.get?.(SessionId(id));
 	const session = agent?.session;
 	const history = [];
-	async function computeProviderRows() {
+	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) return void 0;
-		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);
-			const loginRecord = await credentialsSvc.readRecord?.(piAiRecordKey(entry.provider));
-			const authMethod = loginRecord !== void 0 ? loginRecord.kind === "grant" ? "oauth" : "api-key" : info.configured ? "api-key" : void 0;
-			const isLive = live.has(entry.provider);
-			const models = isLive ? await llmSvc.listModels(entry.provider).catch(() => value?.models ?? []) : value?.models ?? [];
-			rows.push({
-				route: entry.provider,
-				displayName: value?.displayName ?? entry.displayName,
-				settingsNs: entry.settingsNs,
-				settingsPath: entry.settingsPath,
-				configured: userValue !== void 0,
-				live: isLive,
-				api: value?.api,
-				baseURL: value?.baseURL,
-				apiKeyRef,
-				apiKeyConfigured: info.configured || loginRecord !== void 0,
-				authMethod,
-				models,
-				revision: descriptor?.revision
-			});
-		}
-		return rows;
+		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 computeProviderRows();
+		const rows = await credentialRows();
 		if (rows === void 0) {
 			store.updateModelProfile({
 				providers: [],
@@ -5468,8 +5496,9 @@ async function attachSession(host, resumeId) {
 			});
 			return;
 		}
+		const providers = rows.map(toProviderRow);
 		store.updateModelProfile({
-			providers: rows,
+			providers,
 			busy: false,
 			error: void 0,
 			selected: 0
@@ -5513,31 +5542,19 @@ async function attachSession(host, resumeId) {
 			} });
 		})();
 	}
-	async function ensureProviderActivated(providerId, method) {
+	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 false;
+		if (settingsSvc === void 0 || llmSvc === void 0) return;
 		const entry = llmSvc.listConfigurableProviders().find((candidate) => candidate.provider === providerId);
-		if (entry === void 0) return false;
+		if (entry === void 0) return;
 		const descriptor = settingsSvc.describe({ redactSecrets: true }).find((candidate) => candidate.ns === entry.settingsNs);
-		const existing = descriptor === void 0 ? void 0 : getAtPath(descriptor.user, entry.settingsPath);
-		const oauthName = `${entry.displayName.replace(/(?:-oauth)+$/, "")}-oauth`;
-		if (existing !== void 0) {
-			if (method === "oauth" && existing.displayName !== oauthName) {
-				await settingsSvc.update(entry.settingsNs, nestAtPath(entry.settingsPath, { displayName: oauthName }), descriptor?.revision);
-				await flushSettingsWatchers();
-				return true;
-			}
-			return false;
-		}
-		const section = method === "oauth" ? { displayName: oauthName } : {};
-		await settingsSvc.update(entry.settingsNs, nestAtPath(entry.settingsPath, section), descriptor?.revision);
+		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();
-		return true;
-	}
-	async function loadAuthorizationFlows() {
+	} };
+	async function loadLoginFlows() {
 		const authSvc = host.ctx.get("authorization");
-		const credentialsSvc = host.ctx.get("credentials");
 		if (authSvc === void 0) {
 			store.updateLogin({
 				flows: [],
@@ -5548,27 +5565,21 @@ async function attachSession(host, resumeId) {
 		}
 		try {
 			const entries = authSvc.list();
-			const list = await Promise.all(entries.map(async (entry) => {
-				const record = credentialsSvc === void 0 ? void 0 : await credentialsSvc.readRecord?.(entry.key);
+			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: record !== void 0,
-					authMethod: record === void 0 ? void 0 : record.kind === "grant" ? "oauth" : "api-key"
+					configured: row?.hasCredential ?? false,
+					authMethod: row?.authMethod
 				};
-			}));
+			});
 			store.updateLogin({
 				flows: list,
 				busy: false,
 				error: void 0
 			});
-			const toRepair = list.filter((flow) => flow.configured && flow.authMethod === "oauth" && flow.key.startsWith("llm-pi-ai/"));
-			if (toRepair.length > 0) (async () => {
-				let repaired = false;
-				for (const flow of toRepair) try {
-					if (await ensureProviderActivated(flow.key.slice(10), "oauth")) repaired = true;
-				} catch {}
-				if (repaired) refreshCredentialState();
-			})();
 		} catch (error) {
 			store.updateLogin({
 				busy: false,
@@ -5576,9 +5587,9 @@ async function attachSession(host, resumeId) {
 			});
 		}
 	}
-	function refreshCredentialState() {
+	function syncCredentialViews() {
 		loadProviders();
-		loadAuthorizationFlows();
+		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() {
@@ -5763,7 +5774,7 @@ async function attachSession(host, resumeId) {
 		},
 		login() {
 			store.openLogin();
-			loadAuthorizationFlows();
+			loadLoginFlows();
 		},
 		closeLogin() {
 			store.closeOverlay();
@@ -5824,16 +5835,18 @@ 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} — credentials saved, ready to use from /model.`);
-						if (key.startsWith("llm-pi-ai/")) await ensureProviderActivated(key.slice(10), method);
-						refreshCredentialState();
-					} else store.updateLogin({ error: "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.updateLogin({ error: `Sign-in failed: ${error instanceof Error ? error.message : String(error)}` });
 				} finally {
@@ -5878,7 +5891,7 @@ async function attachSession(host, resumeId) {
 		},
 		backToProviderList() {
 			store.updateModelProfile({ view: "list" });
-			refreshCredentialState();
+			syncCredentialViews();
 		},
 		createProvider() {
 			openCustomProviderDraft();
@@ -5898,14 +5911,15 @@ async function attachSession(host, resumeId) {
 		openProviderEditor(route) {
 			(async () => {
 				store.openModelProfile();
-				const rows = await computeProviderRows();
+				const rows = await credentialRows();
+				const providers = rows?.map(toProviderRow);
 				store.updateModelProfile({
-					providers: rows ?? [],
+					providers: providers ?? [],
 					busy: false,
 					error: rows === void 0 ? "Model provider settings are not available in this profile." : void 0,
 					selected: 0
 				});
-				const row = rows?.find((entry) => entry.route === route);
+				const row = providers?.find((entry) => entry.route === route);
 				if (row === void 0) {
 					store.setNotice(`Provider "${route}" not found.`);
 					return;
@@ -5939,7 +5953,7 @@ async function attachSession(host, resumeId) {
 					await flushSettingsWatchers();
 					store.setNotice(`Saved ${draft.displayName || draft.route} — credentials stored, ready to use from /model.`);
 					store.updateModelProfile({ view: "list" });
-					refreshCredentialState();
+					syncCredentialViews();
 				} catch (error) {
 					store.setNotice(`save failed: ${error instanceof Error ? error.message : String(error)}`);
 				}
@@ -5958,7 +5972,7 @@ async function attachSession(host, resumeId) {
 					await settingsSvc.update(row.settingsNs, nestAtPath(row.settingsPath, {}), row.revision);
 					await flushSettingsWatchers();
 					store.setNotice(`Removed ${row.displayName}.`);
-					refreshCredentialState();
+					syncCredentialViews();
 				} catch (error) {
 					store.setNotice(`delete failed: ${error instanceof Error ? error.message : String(error)}`);
 				}
@@ -5973,10 +5987,10 @@ async function attachSession(host, resumeId) {
 				}
 				try {
 					await credentialsSvc.unset(draft.apiKeyRef);
-					await credentialsSvc.deleteRecord?.(piAiRecordKey(draft.route));
+					await credentialsSvc.deleteRecord?.(loginRecordKey(draft.route));
 					store.setNotice(`Removed the API key for ${draft.displayName || draft.route}.`);
 					store.updateModelProfile({ view: "list" });
-					refreshCredentialState();
+					syncCredentialViews();
 				} catch (error) {
 					store.setNotice(`Could not remove the key: ${error instanceof Error ? error.message : String(error)}`);
 				}