@pellux/goodvibes-agent 0.1.116 → 1.0.0

package/src/panels/panel-list-panel.ts

@@ -1,18 +1,15 @@
 /**
- * PanelListPanel — Shows all registered panels grouped by category.
+ * PanelListPanel — Shows registered panel routes grouped by category.
  *
  * Features:
- * - Arrow keys to navigate, Enter to open the selected panel
+ * - Arrow keys to navigate, Enter to show the matching Agent workspace route
  * - Open/closed indicator (● open, ○ closed)
  * - Search/filter by typing
  * - Grouped by category
- * - `T` / `B` to place a panel in the top/bottom pane
- * - `M` to move an open panel to the other pane
- * - `S` to toggle the split and Tab to switch pane focus
  *
- * Open via /panel list.
+ * Open the current operator workspace via /agent.
  */
-import type { Line, Cell } from '../types/grid.ts';
+import type { Line } from '../types/grid.ts';
 import type { PanelCategory, PanelRegistration } from './types.ts';
 import { BasePanel } from './base-panel.ts';
 import type { PanelManager } from './panel-manager.ts';
@@ -39,7 +36,7 @@ import {
   isPanelSearchCommit,
   isPanelSearchPrintable,
 } from './search-focus.ts';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils';
+import { agentWorkspaceCategoryForPanel, agentWorkspaceCommandForPanel } from '../input/agent-workspace-panel-route.ts';
 
 // ── Colour palette ────────────────────────────────────────────────────────────
 const C = {
@@ -60,8 +57,6 @@ const C = {
   search:      '#f97316',
   searchBg:    '#1e293b',
   dim:         '#334155',
-  paneTop:     '#38bdf8',
-  paneBottom:  '#a78bfa',
   intro:       '#94a3b8',
 } as const;
 
@@ -82,18 +77,6 @@ type ListEntry =
   | { kind: 'header'; category: PanelCategory }
   | { kind: 'panel'; reg: PanelRegistration };
 
-function panelPlacementMarker(options: {
-  isTopOpen: boolean;
-  isBottomOpen: boolean;
-  focusedPane: 'top' | 'bottom';
-}): { text: string; color: string } {
-  const { isTopOpen, isBottomOpen, focusedPane } = options;
-  if (isTopOpen && isBottomOpen) return { text: '◆', color: C.selected };
-  if (isTopOpen) return { text: focusedPane === 'top' ? '▲' : '△', color: C.paneTop };
-  if (isBottomOpen) return { text: focusedPane === 'bottom' ? '▼' : '▽', color: C.paneBottom };
-  return { text: ' ', color: C.dim };
-}
-
 function wrapPanelDescription(text: string, width: number, maxLines = 2): string[] {
   if (width <= 0) return [''];
   const lines = wrapWithHangingIndent(text, width, '', maxLines);
@@ -107,6 +90,7 @@ export class PanelListPanel extends BasePanel {
   private _scrollOffset   = 0;
   private _query          = '';
   private _filterFocused  = false;
+  private _routeMessage   = 'This list is read-only in Agent. Press Enter for the matching Agent workspace route.';
   private _cachedEntries: ListEntry[] | null = null;
   private _entriesDirty   = true;
 
@@ -123,6 +107,7 @@ export class PanelListPanel extends BasePanel {
     this._scrollOffset   = 0;
     this._query          = '';
     this._filterFocused  = false;
+    this._routeMessage   = 'This list is read-only in Agent. Press Enter for the matching Agent workspace route.';
     this._entriesDirty   = true;
   }
 
@@ -160,11 +145,7 @@ export class PanelListPanel extends BasePanel {
         this._filterFocused = false;
         const selectedPanel = this._getSelectedPanelEntry(this._buildEntries());
         if (selectedPanel) {
-          try {
-            this.panelManager.open(selectedPanel.reg.id);
-          } catch (err) {
-            logger.warn(`[panel-list] failed to open panel: ${err}`);
-          }
+          this._setRouteMessage(selectedPanel.reg);
         }
         this.markDirty();
         return true;
@@ -198,57 +179,24 @@ export class PanelListPanel extends BasePanel {
       return true;
     }
 
-    // Open selected panel
+    // Route selected panel through the Agent workspace.
     if (key === 'return' || key === 'enter') {
       const selectedPanel = this._getSelectedPanelEntry(entries);
       if (selectedPanel) {
-        try {
-          this.panelManager.open(selectedPanel.reg.id);
-        } catch (err) {
-          logger.warn(`[panel-list] failed to open panel: ${err}`);
-        }
-        this.markDirty();
-      }
-      return true;
-    }
-
-    if (key === 'T' || key === 'B') {
-      const selectedPanel = this._getSelectedPanelEntry(entries);
-      if (selectedPanel) {
-        const pane = key === 'T' ? 'top' : 'bottom';
-        try {
-          const pm = this.panelManager;
-          pm.open(selectedPanel.reg.id, pane);
-          pm.show();
-        } catch (err) {
-          logger.warn(`[panel-list] failed to place panel: ${err}`);
-        }
+        this._setRouteMessage(selectedPanel.reg);
         this.markDirty();
       }
       return true;
     }
 
-    if (key === 'M') {
+    if (key === 'T' || key === 'B' || key === 'M' || key === 'S' || key === 'tab') {
       const selectedPanel = this._getSelectedPanelEntry(entries);
       if (selectedPanel) {
-        try {
-          this.panelManager.moveToOtherPane(selectedPanel.reg.id);
-        } catch (err) {
-          logger.warn(`[panel-list] failed to move panel: ${err}`);
-        }
-        this.markDirty();
+        const command = agentWorkspaceCommandForPanel(selectedPanel.reg.id);
+        this._routeMessage = `Panel placement keys are inactive in Agent. Use ${command} for ${selectedPanel.reg.name}.`;
+      } else {
+        this._routeMessage = 'Panel placement keys are inactive in Agent. Use /agent for current operator controls.';
       }
-      return true;
-    }
-
-    if (key === 'S') {
-      this.panelManager.toggleBottomPane();
-      this.markDirty();
-      return true;
-    }
-
-    if (key === 'tab') {
-      this.panelManager.togglePaneFocus();
       this.markDirty();
       return true;
     }
@@ -285,12 +233,12 @@ export class PanelListPanel extends BasePanel {
     }
     const start = Date.now();
     this.needsRender = false;
-    const intro = 'Browse, place, split, and move panels without dropping into raw panel-management commands.';
+    const intro = 'Browse registered panel routes and jump to the matching Agent workspace area.';
     const entries = this._buildEntries();
 
     if (entries.length === 0) {
       const lines = buildPanelWorkspace(width, height, {
-        title: 'Panel Workspace',
+        title: 'Agent Panel Routes',
         intro,
         sections: [{
           title: 'Filter',
@@ -305,7 +253,7 @@ export class PanelListPanel extends BasePanel {
             width,
             ' No panels match filter.',
             'Clear the filter or search for another panel by id, name, description, or category.',
-            [{ command: '/panel list', summary: 'reopen the panel workspace from the shell' }],
+            [{ command: '/agent', summary: 'open the Agent workspace' }],
             C,
           ),
         }],
@@ -321,16 +269,18 @@ export class PanelListPanel extends BasePanel {
     const pm = this.panelManager;
     const topIds = new Set(pm.getTopPane().panels.map(p => p.id));
     const bottomIds = new Set(pm.getBottomPane().panels.map(p => p.id));
-    const focusedPane = pm.getFocusedPane();
-    const footerLines = [buildPanelLine(width, [[` [${this._selectedIndex + 1}/${panelEntries.length}] ↑/↓ nav  Enter open  T/B place  M move  S split  Tab focus`.slice(0, width), C.hint]])];
+    const selectedPanel = this._getSelectedPanelEntry(entries);
+    const selectedRoute = selectedPanel ? agentWorkspaceCommandForPanel(selectedPanel.reg.id) : '/agent';
+    const selectedArea = selectedPanel ? agentWorkspaceCategoryForPanel(selectedPanel.reg.id) : 'home';
+    const footerLines = [buildPanelLine(width, [[` [${this._selectedIndex + 1}/${panelEntries.length}] ↑/↓ nav  Enter route  / filter  Esc clear`.slice(0, width), C.hint]])];
     const postureLines: Line[] = [
       buildKeyValueLine(width, [
-        { label: 'visible panels', value: String(pm.getAllOpen().length), valueColor: pm.getAllOpen().length > 0 ? C.name : C.dim },
-        { label: 'focused pane', value: focusedPane, valueColor: focusedPane === 'top' ? C.paneTop : C.paneBottom },
-        { label: 'split', value: pm.isBottomPaneVisible() ? 'dual' : 'single', valueColor: pm.isBottomPaneVisible() ? C.info : C.dim },
+        { label: 'copied open', value: String(pm.getAllOpen().length), valueColor: pm.getAllOpen().length > 0 ? C.name : C.dim },
+        { label: 'agent route', value: selectedRoute, valueColor: C.info },
+        { label: 'area', value: selectedArea, valueColor: C.value },
         { label: 'results', value: String(panelEntries.length), valueColor: C.value },
       ], C),
-      buildPanelLine(width, [[` Filter owns input only when selected. Open and switch operations should land directly in focused panel state.`, C.intro]]),
+      buildPanelLine(width, [[` ${truncateDisplay(this._routeMessage, Math.max(0, width - 1))}`, C.intro]]),
     ];
     const entryLines: Line[] = [
       buildSearchInputLine(width, 'Filter: ', `${this._query}${this._filterFocused ? '_' : ''}`, C, {
@@ -361,11 +311,11 @@ export class PanelListPanel extends BasePanel {
         const descStartCol = PREFIX_WIDTH + NAME_COL_WIDTH + 1;
         const descWidth = Math.max(1, width - descStartCol);
         const descLines = wrapPanelDescription(entry.reg.description, descWidth, 2);
-        const placement = panelPlacementMarker({ isTopOpen, isBottomOpen, focusedPane });
+        const routeCategory = agentWorkspaceCategoryForPanel(entry.reg.id);
         const blockLines: Line[] = [
           buildPanelListRow(width, [
             { text: dot, fg: dotColor },
-            { text: placement.text, fg: placement.color },
+            { text: routeCategory.charAt(0).toUpperCase(), fg: isSelected ? C.selIcon : C.icon },
             { text: ' ', fg: C.dim },
             { text: `${nameStr} `, fg: nameColor },
             { text: descLines[0] ?? '', fg: C.desc },
@@ -390,7 +340,7 @@ export class PanelListPanel extends BasePanel {
     }
     const selectedEntryIndex = renderedBlocks.findIndex((block) => block.panelFlatIndex === this._selectedIndex);
     const selectedRow = selectedEntryIndex >= 0 ? blockStarts[selectedEntryIndex] ?? 0 : 0;
-    const postureSection: PanelWorkspaceSection = { lines: buildSummaryBlock(width, 'Panel posture', postureLines, C) };
+    const postureSection: PanelWorkspaceSection = { lines: buildSummaryBlock(width, 'Route posture', postureLines, C) };
     const resolvedSection = resolvePrimaryScrollableSection(width, height, {
       intro,
       footerLines,
@@ -416,7 +366,7 @@ export class PanelListPanel extends BasePanel {
       resolvedSection.section,
     ];
     const lines = buildPanelWorkspace(width, height, {
-      title: 'Panel Workspace',
+      title: 'Agent Panel Routes',
       intro,
       sections,
       footerLines,
@@ -488,6 +438,12 @@ export class PanelListPanel extends BasePanel {
     return null;
   }
 
+  private _setRouteMessage(reg: PanelRegistration): void {
+    const command = agentWorkspaceCommandForPanel(reg.id);
+    const area = agentWorkspaceCategoryForPanel(reg.id);
+    this._routeMessage = `${reg.name} routes through ${command} (${area}) in Agent workspace.`;
+  }
+
   /** Move selection to the previous panel entry. */
   private _movePrevPanel(): void {
     this._selectedIndex = Math.max(0, this._selectedIndex - 1);

package/src/panels/project-planning-panel.ts

@@ -214,7 +214,7 @@ export class ProjectPlanningPanel extends BasePanel {
 
       const { lines: flattened, selectedIndex } = this.flattenSections(width, sections);
       const scroll = resolveScrollablePanelSection(width, height, {
-        intro: 'Project planning state, readiness gaps, decisions, language, task graph, verification gates, and agent handoff metadata.',
+        intro: 'Project planning state, open gaps, decisions, language, task graph, completion checks, and handoff candidates.',
         footerLines: this.footerLines(width),
         palette: C,
         section: {
@@ -227,22 +227,28 @@ export class ProjectPlanningPanel extends BasePanel {
         },
       });
       this.scrollOffset = scroll.scrollOffset;
+      const sectionLines = [...scroll.section.lines];
+      const footerSummary = flattened.length > sectionLines.length
+        ? `showing ${scroll.window.start + 1}-${scroll.window.end} of ${flattened.length}`
+        : undefined;
 
       return buildPanelWorkspace(width, height, {
         title: this.loading ? 'Project Planning - loading' : 'Project Planning',
         intro: 'SDK-backed planning artifacts for the current Agent workspace. Conversation control stays in the main Agent turn.',
-        sections: [scroll.section],
-        footerLines: this.footerLines(width),
+        sections: [{ ...scroll.section, lines: sectionLines }],
+        footerLines: this.footerLines(width, footerSummary),
         palette: C,
       });
     });
   }
 
-  private footerLines(width: number): Line[] {
+  private footerLines(width: number, scrollSummary?: string): Line[] {
     const hasQuestion = this.getCurrentQuestion() !== null;
+    const summaryParts: Array<[string, string]> = scrollSummary ? [[` ${scrollSummary}  `, C.dim]] : [];
     if (hasQuestion) {
       return [
         buildPanelLine(width, [
+          ...summaryParts,
           [' Up/Down', C.info],
           [' choose answer  ', C.dim],
           ['type', C.info],
@@ -256,12 +262,13 @@ export class ProjectPlanningPanel extends BasePanel {
     }
     return [
       buildPanelLine(width, [
+        ...summaryParts,
         [' Up/Down', C.info],
         [' scroll  ', C.dim],
         ['r', C.info],
         [' refresh  ', C.dim],
         ['a', C.info],
-        [' approve execution-ready plan  Esc prompt focus  Ctrl+X close panel', C.dim],
+        [' mark planning ready  Esc prompt focus  Ctrl+X close panel', C.dim],
       ]),
     ];
   }
@@ -359,12 +366,12 @@ export class ProjectPlanningPanel extends BasePanel {
     const gaps = evaluation?.gaps ?? [];
     if (gaps.length === 0) {
       return {
-        title: 'Readiness Gaps',
-        lines: [buildPanelLine(width, [[' No readiness gaps.', C.good]])],
+        title: 'Open Gaps',
+        lines: [buildPanelLine(width, [[' No open gaps.', C.good]])],
       };
     }
     return {
-      title: 'Readiness Gaps',
+      title: 'Open Gaps',
       lines: gaps.slice(0, 12).flatMap((gap) => buildBodyText(
         width,
         `${gap.severity.toUpperCase()} ${gap.kind}: ${gap.message}`,
@@ -392,7 +399,7 @@ export class ProjectPlanningPanel extends BasePanel {
     }
 
     if (state.verificationGates.length) {
-      lines.push(buildPanelLine(width, [[' Verification gates:', C.label]]));
+      lines.push(buildPanelLine(width, [[' Completion checks:', C.label]]));
       for (const gate of state.verificationGates) {
         lines.push(...buildBodyText(width, `${gate.id}: ${gate.description} [${gate.status ?? 'pending'}]`, C, gate.required === false ? C.dim : C.good));
       }
@@ -527,9 +534,9 @@ export class ProjectPlanningPanel extends BasePanel {
     if (isVerificationQuestion) {
       actions.push({
         id: 'verification-default-gates',
-        label: 'Use standard verification gates',
+        label: 'Use standard completion checks',
         detail: 'Require focused regression coverage, typecheck/build validation, and a runtime smoke where feasible.',
-        answer: 'Use standard verification gates for this goal.',
+        answer: 'Use standard completion checks for this goal.',
       });
     }
     if (question.recommendedAnswer?.trim() && !this.isGenericRecommendation(question.recommendedAnswer)) {
@@ -600,7 +607,7 @@ export class ProjectPlanningPanel extends BasePanel {
       return;
     }
     if (!this.submitAnswer) {
-      this.setError('Planning answer submission is not wired in this runtime.');
+      this.setError('Planning answer submission is unavailable in this Agent runtime. Return to the composer and answer there.');
       this.requestRender();
       return;
     }

package/src/panels/provider-account-snapshot.ts

@@ -78,7 +78,7 @@ function determineFreshness(input: {
   readonly hasSubscription: boolean;
   readonly expiresAt?: number;
   readonly pending: boolean;
-  readonly hasServiceOAuth: boolean;
+  readonly hasUsableServiceOAuth: boolean;
   readonly hasApiKey: boolean;
 }): ProviderAuthFreshness {
   if (input.hasSubscription) {
@@ -87,20 +87,33 @@ function determineFreshness(input: {
     if (input.pending) return 'pending';
     return 'healthy';
   }
-  if (input.hasServiceOAuth || input.hasApiKey) return 'healthy';
+  if (input.hasUsableServiceOAuth || input.hasApiKey) return 'healthy';
   return 'unconfigured';
 }
 
 function builtinWindowsForProvider(providerId: string): readonly ProviderUsageWindow[] {
   if (providerId === 'openai') {
     return [
-      { label: '5-hour window', detail: 'Subscription-backed Codex access may be constrained by rolling 5-hour usage limits.' },
-      { label: '1-week window', detail: 'Subscription-backed Codex access may also be constrained by a rolling weekly limit.' },
+      { label: '5-hour window', detail: 'Subscription-backed OpenAI access may be constrained by rolling 5-hour usage limits.' },
+      { label: '1-week window', detail: 'Subscription-backed OpenAI access may also be constrained by a rolling weekly limit.' },
     ];
   }
   return [];
 }
 
+function readProviderEnvVars(model: unknown): readonly string[] {
+  if (typeof model !== 'object' || model === null) return [];
+  const value = (model as { readonly providerEnvVars?: unknown }).providerEnvVars;
+  if (!Array.isArray(value)) return [];
+  return value.filter((entry): entry is string => typeof entry === 'string' && entry.trim().length > 0);
+}
+
+function defaultProviderEnvKeys(providerId: string): readonly string[] {
+  const normalized = providerId.toUpperCase().replace(/[^A-Z0-9]+/g, '_').replace(/^_+|_+$/g, '');
+  if (normalized.length === 0) return [];
+  return [`${normalized}_API_KEY`, `${normalized}_KEY`];
+}
+
 export async function buildProviderAccountSnapshot(
   deps: ProviderAccountSnapshotDeps,
 ): Promise<ProviderAccountSnapshot> {
@@ -125,20 +138,27 @@ export async function buildProviderAccountSnapshot(
 
   const providerIds = new Set<string>([
     ...models.map((model) => model.provider),
-    ...Object.keys(services),
+    ...Object.values(services).map((service) => service.providerId ?? service.name),
     ...subscriptions.list().map((entry) => entry.provider),
     ...subscriptions.listPending().map((entry) => entry.provider),
     ...builtinSubscriptionProviders,
   ]);
 
   const providers = await Promise.all([...providerIds].sort((a, b) => a.localeCompare(b)).map(async (providerId) => {
+    const providerModels = models.filter((model) => model.provider === providerId);
     const subscription = subscriptions.get(providerId);
     const pending = subscriptions.getPending(providerId);
     const serviceConfig = Object.values(services).find((entry) => (entry.providerId ?? entry.name) === providerId) ?? null;
     const serviceOauth = serviceOauthByProvider.get(providerId);
-    const hasApiKey = Boolean(serviceConfig?.tokenKey && deps.environment.hasEnvironmentVariable(serviceConfig.tokenKey));
+    const apiKeyCandidates = new Set<string>([
+      ...(serviceConfig?.tokenKey ? [serviceConfig.tokenKey] : []),
+      ...providerModels.flatMap((model) => readProviderEnvVars(model)),
+      ...defaultProviderEnvKeys(providerId),
+    ]);
+    const hasApiKey = [...apiKeyCandidates].some((key) => deps.environment.hasEnvironmentVariable(key));
     const hasSubscription = subscription != null;
-    const hasServiceOAuth = Boolean(serviceOauth?.configured);
+    const hasServiceOAuth = Boolean(serviceOauth?.configured || serviceConfig?.authType === 'oauth' || serviceConfig?.oauth);
+    const hasUsableServiceOAuth = Boolean(serviceOauth?.usable);
     const routes: ProviderAuthRoute[] = [];
     if (hasApiKey) routes.push('api-key');
     if (hasSubscription) routes.push('subscription');
@@ -148,15 +168,15 @@ export async function buildProviderAccountSnapshot(
     const usableRoutes: Exclude<ProviderAuthRoute, 'unconfigured'>[] = [];
     if (hasApiKey) usableRoutes.push('api-key');
     if (hasSubscription && !isExpired(subscription.expiresAt)) usableRoutes.push('subscription');
-    if (hasServiceOAuth) usableRoutes.push('service-oauth');
+    if (hasUsableServiceOAuth) usableRoutes.push('service-oauth');
 
-    const activeRoute = determineActiveRoute(usableRoutes.length > 0 ? usableRoutes : routes);
+    const activeRoute = determineActiveRoute(usableRoutes);
     const preferredRoute = determineActiveRoute(routes);
     const freshness = determineFreshness({
       hasSubscription,
       expiresAt: subscription?.expiresAt,
       pending: pending != null,
-      hasServiceOAuth,
+      hasUsableServiceOAuth,
       hasApiKey,
     });
     const usageWindows = builtinWindowsForProvider(providerId);
@@ -185,20 +205,22 @@ export async function buildProviderAccountSnapshot(
     if (hasServiceOAuth) {
       routeRecords.push({
         route: 'service-oauth',
-        usable: true,
-        freshness: 'healthy',
-        detail: 'Service OAuth credential is available for this provider.',
-        issues: [],
+        usable: hasUsableServiceOAuth,
+        freshness: hasUsableServiceOAuth ? 'healthy' : 'unconfigured',
+        detail: hasUsableServiceOAuth
+          ? 'Provider OAuth credential is available for this provider.'
+          : 'Provider OAuth is configured but missing a usable credential.',
+        issues: hasUsableServiceOAuth ? [] : ['Provider OAuth credential is missing or unavailable.'],
       });
     }
 
     const issues: string[] = [];
-    const notes: string[] = [`${models.filter((model) => model.provider === providerId).length} model${models.filter((model) => model.provider === providerId).length === 1 ? '' : 's'} registered`];
-    if (serviceConfig) notes.push(`service config: ${serviceConfig.authType}`);
+    const notes: string[] = [`${providerModels.length} model${providerModels.length === 1 ? '' : 's'} registered`];
+    if (serviceConfig) notes.push(`provider config: ${serviceConfig.authType}`);
     const recommendedActions: string[] = [];
     if (routes.length === 1 && routes[0] === 'unconfigured') {
       issues.push('Provider has no configured auth route.');
-      recommendedActions.push(`Configure API keys, subscriptions, or service OAuth for ${providerId}.`);
+      recommendedActions.push(`Configure API keys, subscriptions, or provider OAuth for ${providerId}.`);
     }
     if (hasSubscription && isExpired(subscription?.expiresAt)) {
       issues.push('Stored subscription session is expired and needs refresh.');
@@ -215,16 +237,16 @@ export async function buildProviderAccountSnapshot(
       issues.push('Provider has both subscription and API-key auth paths; routing must remain explicit.');
       recommendedActions.push('Review provider routing before switching models or auth paths.');
     }
-    if (hasServiceOAuth && !serviceOauth?.usable) {
-      issues.push('Service OAuth is configured but missing a usable credential.');
-      recommendedActions.push(`Repair service OAuth credentials for ${providerId} in /settings or the owning GoodVibes host.`);
+    if (hasServiceOAuth && !hasUsableServiceOAuth) {
+      issues.push('Provider OAuth is configured but missing a usable credential.');
+      recommendedActions.push(`Repair provider OAuth credentials for ${providerId} in /settings or the owning GoodVibes host.`);
     }
 
     return {
       providerId,
       active: activeRoute !== 'unconfigured',
-      modelCount: models.filter((model) => model.provider === providerId).length,
-      configured: hasApiKey || hasSubscription || hasServiceOAuth || models.some((model) => model.provider === providerId),
+      modelCount: providerModels.length,
+      configured: hasApiKey || hasSubscription || hasServiceOAuth || providerModels.length > 0,
       oauthReady: Boolean(serviceConfig?.oauth),
       pendingLogin: Boolean(pending),
       availableRoutes: routes,
@@ -233,13 +255,17 @@ export async function buildProviderAccountSnapshot(
       activeRouteReason: activeRoute === 'subscription'
         ? 'Subscription route is currently preferred.'
         : activeRoute === 'service-oauth'
-          ? 'Service OAuth route is currently preferred.'
+          ? 'Provider OAuth route is currently preferred.'
           : activeRoute === 'api-key'
             ? 'Ambient API-key route is currently preferred.'
             : 'No usable auth route is configured for this provider.',
       authFreshness: freshness,
-      fallbackRoute: activeRoute !== preferredRoute ? preferredRoute : undefined,
-      fallbackRisk: hasSubscription && hasApiKey ? 'Both subscription and API key are present; check route priority.' : undefined,
+      fallbackRoute: activeRoute !== preferredRoute ? activeRoute : undefined,
+      fallbackRisk: hasSubscription && hasApiKey
+        ? (isExpired(subscription?.expiresAt)
+          ? 'preferred subscription path is expired; active route falls back to API key.'
+          : 'Both subscription and API key are present; check route priority.')
+        : undefined,
       expiresAt: subscription?.expiresAt,
       tokenType: subscription?.tokenType,
       notes,

package/src/panels/provider-accounts-panel.ts

@@ -15,10 +15,12 @@ import {
   type PanelWorkspaceSection,
 } from './polish.ts';
 import {
+  type ProviderAuthRoute,
   type ProviderAccountRecord,
   type ProviderAccountSnapshot,
   type ProviderAccountSnapshotQuery,
 } from './provider-account-snapshot.ts';
+import { formatProviderAuthRouteId } from '../provider-auth-route-display.ts';
 
 export interface ProviderAccountsPanelDeps {
   readonly providerAccounts: ProviderAccountSnapshotQuery;
@@ -29,6 +31,18 @@ const C = {
   selectBg: '#1e293b',
 } as const;
 
+function routeColor(route: ProviderAuthRoute): string {
+  if (route === 'subscription') return C.info;
+  if (route === 'api-key') return C.warn;
+  if (route === 'service-oauth') return C.value;
+  if (route === 'unconfigured') return C.bad;
+  return C.dim;
+}
+
+function formatRouteList(routes: readonly ProviderAuthRoute[]): string {
+  return routes.map((route) => formatProviderAuthRouteId(route)).join(', ');
+}
+
 export class ProviderAccountsPanel extends ScrollableListPanel<ProviderAccountRecord> {
   private records: ProviderAccountRecord[] = [];
   private loading = false;
@@ -51,12 +65,13 @@ export class ProviderAccountsPanel extends ScrollableListPanel<ProviderAccountRe
   }
 
   protected renderItem(item: ProviderAccountRecord, _index: number, selected: boolean, width: number): Line {
+    const activeRoute = formatProviderAuthRouteId(item.activeRoute);
     return buildPanelListRow(width, [
       { text: item.providerId.padEnd(16), fg: item.active ? C.good : C.value },
-      { text: ` ${item.activeRoute.padEnd(14)}`, fg: item.activeRoute === 'subscription' ? C.info : item.activeRoute === 'api-key' ? C.warn : item.activeRoute === 'service-oauth' ? C.value : C.dim },
-      { text: ` models=${String(item.modelCount).padEnd(4)}`, fg: C.dim },
+      { text: ` ${activeRoute.padEnd(14)}`, fg: routeColor(item.activeRoute) },
+      { text: ` models ${String(item.modelCount).padEnd(4)}`, fg: C.dim },
       { text: ` ${item.authFreshness.padEnd(10)}`, fg: item.authFreshness === 'expired' ? C.bad : item.authFreshness === 'expiring' || item.authFreshness === 'pending' ? C.warn : C.dim },
-      { text: ` issues=${String(item.issues.length).padEnd(2)}`, fg: item.issues.length > 0 ? C.bad : C.good },
+      { text: ` issues ${String(item.issues.length).padEnd(2)}`, fg: item.issues.length > 0 ? C.bad : C.good },
     ], C, { selected });
   }
 
@@ -118,12 +133,12 @@ export class ProviderAccountsPanel extends ScrollableListPanel<ProviderAccountRe
         { label: 'providers', value: String(this.records.length), valueColor: C.value },
         { label: 'expired auth', value: String(expiredCount), valueColor: expiredCount > 0 ? C.bad : C.good },
         { label: 'pending login', value: String(pendingCount), valueColor: pendingCount > 0 ? C.warn : C.dim },
-        { label: 'fallback risk', value: String(fallbackCount), valueColor: fallbackCount > 0 ? C.warn : C.good },
+        { label: 'routing risk', value: String(fallbackCount), valueColor: fallbackCount > 0 ? C.warn : C.good },
       ], C),
       buildKeyValueLine(width, [
         { label: 'total issues', value: String(issueCount), valueColor: issueCount > 0 ? C.bad : C.good },
         { label: 'selected', value: selected.providerId, valueColor: C.info },
-        { label: 'route', value: selected.activeRoute, valueColor: selected.activeRoute === 'subscription' ? C.info : selected.activeRoute === 'api-key' ? C.warn : C.value },
+        { label: 'route', value: formatProviderAuthRouteId(selected.activeRoute), valueColor: routeColor(selected.activeRoute) },
         { label: 'freshness', value: selected.authFreshness, valueColor: selected.authFreshness === 'expired' ? C.bad : selected.authFreshness === 'expiring' || selected.authFreshness === 'pending' ? C.warn : C.good },
       ], C),
       buildGuidanceLine(width, '/accounts repair <provider>', 'review routing safety, fallback cost, and provider-specific recovery steps', C),
@@ -131,8 +146,8 @@ export class ProviderAccountsPanel extends ScrollableListPanel<ProviderAccountRe
     const detailRows: Line[] = [
       buildKeyValueLine(width, [
         { label: 'provider', value: selected.providerId, valueColor: C.value },
-        { label: 'active route', value: selected.activeRoute, valueColor: selected.activeRoute === 'subscription' ? C.info : selected.activeRoute === 'api-key' ? C.warn : selected.activeRoute === 'service-oauth' ? C.value : C.bad },
-        { label: 'preferred route', value: selected.preferredRoute, valueColor: C.dim },
+        { label: 'active route', value: formatProviderAuthRouteId(selected.activeRoute), valueColor: routeColor(selected.activeRoute) },
+        { label: 'preferred route', value: formatProviderAuthRouteId(selected.preferredRoute), valueColor: C.dim },
         { label: 'freshness', value: selected.authFreshness, valueColor: selected.authFreshness === 'expired' ? C.bad : selected.authFreshness === 'expiring' || selected.authFreshness === 'pending' ? C.warn : C.good },
       ], C),
       buildKeyValueLine(width, [
@@ -140,40 +155,40 @@ export class ProviderAccountsPanel extends ScrollableListPanel<ProviderAccountRe
         { label: 'oauth ready', value: selected.oauthReady ? 'yes' : 'no', valueColor: selected.oauthReady ? C.info : C.dim },
         { label: 'pending login', value: selected.pendingLogin ? 'yes' : 'no', valueColor: selected.pendingLogin ? C.warn : C.dim },
       ], C),
-      buildPanelLine(width, [[`  Active route reason: ${selected.activeRouteReason}`.slice(0, width), C.dim]]),
-      buildPanelLine(width, [[`  Available routes: ${selected.availableRoutes.join(', ') || 'unconfigured'}`.slice(0, width), C.dim]]),
+      buildPanelLine(width, [[`  Route reason ${selected.activeRouteReason}`.slice(0, width), C.dim]]),
+      buildPanelLine(width, [[`  Available routes ${formatRouteList(selected.availableRoutes) || 'unconfigured'}`.slice(0, width), C.dim]]),
     ];
     if (selected.expiresAt) {
       detailRows.push(buildPanelLine(width, [
-        ['  Expires: ', C.label],
+        ['  Expires ', C.label],
         [new Date(selected.expiresAt).toISOString(), C.dim],
-        ['  Token: ', C.label],
+        ['  Token ', C.label],
         [selected.tokenType ?? 'n/a', C.value],
       ]));
     }
     if (selected.fallbackRisk) {
-      detailRows.push(buildPanelLine(width, [[`  fallback: ${selected.fallbackRisk}`.slice(0, width), C.warn]]));
+      detailRows.push(buildPanelLine(width, [[`  routing risk ${selected.fallbackRisk}`.slice(0, width), C.warn]]));
     }
     for (const route of selected.routeRecords) {
       detailRows.push(buildPanelLine(width, [[
-        `  route ${route.route}: ${route.usable ? 'usable' : 'blocked'} • ${route.freshness} • ${route.detail}`.slice(0, width),
+        `  route ${formatProviderAuthRouteId(route.route)} ${route.usable ? 'usable' : 'blocked'} • ${route.freshness} • ${route.detail}`.slice(0, width),
         route.usable ? C.dim : C.bad,
       ]]));
       for (const issue of route.issues) {
-        detailRows.push(buildPanelLine(width, [[`    issue: ${issue}`.slice(0, width), C.bad]]));
+        detailRows.push(buildPanelLine(width, [[`    issue ${issue}`.slice(0, width), C.bad]]));
       }
     }
     for (const windowHint of selected.usageWindows) {
-      detailRows.push(buildPanelLine(width, [[`  ${windowHint.label}: ${windowHint.detail}`.slice(0, width), C.dim]]));
+      detailRows.push(buildPanelLine(width, [[`  ${windowHint.label} ${windowHint.detail}`.slice(0, width), C.dim]]));
     }
     for (const issue of selected.issues) {
-      detailRows.push(buildPanelLine(width, [[`  issue: ${issue}`.slice(0, width), C.bad]]));
+      detailRows.push(buildPanelLine(width, [[`  issue ${issue}`.slice(0, width), C.bad]]));
     }
     for (const note of selected.notes) {
-      detailRows.push(buildPanelLine(width, [[`  note: ${note}`.slice(0, width), C.info]]));
+      detailRows.push(buildPanelLine(width, [[`  note ${note}`.slice(0, width), C.info]]));
     }
     for (const action of selected.recommendedActions) {
-      detailRows.push(buildPanelLine(width, [[`  next: ${action}`.slice(0, width), C.value]]));
+      detailRows.push(buildPanelLine(width, [[`  next ${action}`.slice(0, width), C.value]]));
     }
     if (selected.issues.length === 0 && selected.notes.length === 0 && selected.usageWindows.length === 0 && selected.recommendedActions.length === 0) {
       detailRows.push(buildPanelLine(width, [['  No active account warnings for this provider.', C.dim]]));