@pellux/goodvibes-tui 0.19.53 → 0.19.55

package/src/input/model-picker-provider-filter.ts

@@ -0,0 +1,28 @@
+import { POPULAR_PROVIDERS } from './model-picker-types.ts';
+
+export function groupProviders(providers: readonly string[]): { popular: string[]; all: string[] } {
+  const popular: string[] = [];
+  const all: string[] = [];
+
+  for (const provider of providers) {
+    if (POPULAR_PROVIDERS.has(provider.toLowerCase())) {
+      popular.push(provider);
+    } else {
+      all.push(provider);
+    }
+  }
+
+  popular.sort((a, b) => a.localeCompare(b));
+  all.sort((a, b) => a.localeCompare(b));
+
+  return { popular, all };
+}
+
+export function filterProviders(providers: readonly string[], query: string): string[] {
+  const { popular, all } = groupProviders(providers);
+  const ordered = [...popular, ...all];
+  const normalized = query.trim().toLowerCase();
+  return normalized.length === 0
+    ? ordered
+    : ordered.filter((provider) => provider.toLowerCase().includes(normalized));
+}

package/src/input/model-picker-types.ts

@@ -11,6 +11,18 @@ export type PickerMode = 'model' | 'provider' | 'effort' | 'contextCap';
  */
 export type ModelPickerTarget = 'main' | 'helper' | 'tool' | 'tts';
 
+export type ModelPickerFocusPane = 'targets' | 'items';
+
+export interface ModelPickerTargetInfo {
+  readonly target: ModelPickerTarget;
+  readonly label: string;
+  readonly description: string;
+  readonly provider: string;
+  readonly model: string;
+  readonly enabled: boolean;
+  readonly inherited: boolean;
+}
+
 /**
  * Pricing tier filter.
  * 'paid' matches ModelDefinition tiers 'standard' and 'premium' for forward-compat

package/src/input/model-picker.ts

@@ -5,10 +5,11 @@ import { getQualityTier, getQualityTierFromScore, compositeScore, A_TIER_THRESHO
 import type { BenchmarkStore } from '@pellux/goodvibes-sdk/platform/providers/model-benchmarks';
 import type { ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers/registry';
 import { detectFamily, POPULAR_PROVIDERS, tierToCategoryFilter } from './model-picker-types.ts';
-import type { BenchmarkSort, CapabilityFilter, CategoryFilter, FilteredModelsCache, FilteredProvidersCache, GroupByMode, ModelItemsCache, ModelPickerTarget, PickerItem, PickerMode, ProviderItemsCache } from './model-picker-types.ts';
+import type { BenchmarkSort, CapabilityFilter, CategoryFilter, FilteredModelsCache, FilteredProvidersCache, GroupByMode, ModelItemsCache, ModelPickerFocusPane, ModelPickerTarget, ModelPickerTargetInfo, PickerItem, PickerMode, ProviderItemsCache } from './model-picker-types.ts';
+import { filterProviders, groupProviders } from './model-picker-provider-filter.ts';
 
 export { detectFamily, POPULAR_PROVIDERS, tierToCategoryFilter } from './model-picker-types.ts';
-export type { BenchmarkSort, CapabilityFilter, CategoryFilter, GroupByMode, ModelFamily, ModelPickerTarget, PickerItem, PickerMode } from './model-picker-types.ts';
+export type { BenchmarkSort, CapabilityFilter, CategoryFilter, GroupByMode, ModelFamily, ModelPickerFocusPane, ModelPickerTarget, ModelPickerTargetInfo, PickerItem, PickerMode } from './model-picker-types.ts';
 
 /**
  * ModelPickerModal - Multi-step interactive picker for model, provider, and effort.
@@ -35,6 +36,9 @@ export class ModelPickerModal {
   public mode: PickerMode = 'model';
   /** Which config target this picker session will write to on commit. */
   public target: ModelPickerTarget = 'main';
+  public focusPane: ModelPickerFocusPane = 'items';
+  public targetInfos: ModelPickerTargetInfo[] = [];
+  public targetIndex = 0;
   public searchFocused = false;
   /** Tracks the mode we came from, for back-navigation. */
   public previousMode: PickerMode | null = null;
@@ -78,6 +82,58 @@ export class ModelPickerModal {
   private modelItemsCache: ModelItemsCache | null = null;
   private providerItemsCache: ProviderItemsCache | null = null;
 
+  setTargetInfos(infos: ModelPickerTargetInfo[]): void {
+    this.targetInfos = infos;
+    const idx = infos.findIndex((entry) => entry.target === this.target);
+    this.targetIndex = idx >= 0 ? idx : 0;
+  }
+
+  getSelectedTargetInfo(): ModelPickerTargetInfo | null {
+    return this.targetInfos[this.targetIndex] ?? null;
+  }
+
+  focusTargets(): void {
+    this.focusPane = 'targets';
+    this.searchFocused = false;
+  }
+
+  focusItems(): void {
+    this.focusPane = 'items';
+  }
+
+  moveTarget(delta: number): void {
+    if (this.targetInfos.length === 0) return;
+    const nextIndex = (this.targetIndex + delta + this.targetInfos.length) % this.targetInfos.length;
+    this.setTarget(this.targetInfos[nextIndex]!.target);
+  }
+
+  setTarget(target: ModelPickerTarget): void {
+    this.target = target;
+    const idx = this.targetInfos.findIndex((entry) => entry.target === target);
+    this.targetIndex = idx >= 0 ? idx : this.targetIndex;
+    this.alignSelectionToTarget();
+  }
+
+  alignSelectionToTarget(): void {
+    const info = this.getSelectedTargetInfo();
+    if (!info) return;
+    if (this.mode === 'provider') {
+      const providers = this.getFilteredProviders();
+      const providerIdx = providers.findIndex((provider) => provider === info.provider);
+      this.selectedIndex = providerIdx >= 0 ? providerIdx : 0;
+      this.scrollOffset = 0;
+      this._scrollToSelection(20);
+      return;
+    }
+    if (this.mode === 'model') {
+      const models = this.getFilteredModels();
+      const modelIdx = models.findIndex((model) => model.registryKey === info.model || model.id === info.model);
+      this.selectedIndex = modelIdx >= 0 ? modelIdx : 0;
+      this.scrollOffset = 0;
+      this._scrollToSelection(20);
+    }
+  }
+
   // ── Category filter cycling ───────────────────────────────────────────────
   private static readonly CATEGORY_CYCLE: CategoryFilter[] = ['all', 'free', 'paid', 'subscription'];
   /** Cycle to next pricing tier filter. */
@@ -146,6 +202,7 @@ export class ModelPickerModal {
     this.mode = 'model';
     this.active = true;
     this.pendingModel = null;
+    this.focusPane = 'items';
     this.searchFocused = false;
     this.query = '';
     this.categoryFilter = 'all';
@@ -163,6 +220,7 @@ export class ModelPickerModal {
     this.mode = 'provider';
     this.active = true;
     this.pendingModel = null;
+    this.focusPane = 'items';
     this.searchFocused = false;
     this.query = '';
     this.categoryFilter = 'all';
@@ -206,6 +264,9 @@ export class ModelPickerModal {
     this.active = false;
     this.mode = 'model';
     this.target = 'main';
+    this.focusPane = 'items';
+    this.targetInfos = [];
+    this.targetIndex = 0;
     this.models = [];
     this.providers = [];
     this.pendingModel = null;
@@ -285,22 +346,7 @@ export class ModelPickerModal {
    * renderer and does not affect grouping.
    */
   getGroupedProviders(): { popular: string[]; all: string[] } {
-    const popular: string[] = [];
-    const all: string[] = [];
-
-    for (const p of this.providers) {
-      const pLower = p.toLowerCase();
-      if (POPULAR_PROVIDERS.has(pLower)) {
-        popular.push(p);
-      } else {
-        all.push(p);
-      }
-    }
-
-    popular.sort((a, b) => a.localeCompare(b));
-    all.sort((a, b) => a.localeCompare(b));
-
-    return { popular, all };
+    return groupProviders(this.providers);
   }
 
   /** Return providers matching the current query (case-insensitive substring), in grouped order. */
@@ -314,11 +360,7 @@ export class ModelPickerModal {
       return cached.result;
     }
 
-    const { popular, all } = this.getGroupedProviders();
-    const ordered = [...popular, ...all];
-    const result = this.query.trim().length === 0
-      ? ordered
-      : ordered.filter(p => p.toLowerCase().includes(this.query.toLowerCase()));
+    const result = filterProviders(this.providers, this.query);
     this.filteredProvidersCache = {
       providersRef: this.providers,
       query: this.query,

package/src/input/selection-modal.ts

@@ -1,6 +1,6 @@
 /**
  * SelectionModal - Generic reusable selection modal with fuzzy search.
- * Used by /config, /template, /sessions, /bookmarks, /tools, /permissions.
+ * Used by /template, /sessions, /bookmarks, /tools, and focused pickers.
  */
 
 export interface SelectionItem {

package/src/input/settings-modal-behavior.ts

@@ -10,6 +10,8 @@ export type ModelPickerLaunch =
  * provider first; model rows open directly to models for the same target.
  */
 export function modelPickerLaunchForKey(key: string): ModelPickerLaunch | null {
+  if (key === 'provider.provider') return { flow: 'providerModel', target: 'main' };
+  if (key === 'provider.model') return { flow: 'model', target: 'main' };
   if (key === 'helper.globalProvider') return { flow: 'providerModel', target: 'helper' };
   if (key === 'helper.globalModel') return { flow: 'model', target: 'helper' };
   if (key === 'tools.llmProvider') return { flow: 'providerModel', target: 'tool' };

package/src/input/settings-modal-subscriptions.ts

@@ -0,0 +1,95 @@
+import type { ProviderAuthFreshness } from '@pellux/goodvibes-sdk/platform/runtime/provider-accounts/registry';
+import { listBuiltinSubscriptionProviders } from '@pellux/goodvibes-sdk/platform/config/subscription-providers';
+import type { SubscriptionManager } from '@pellux/goodvibes-sdk/platform/config/subscriptions';
+import type { ServiceInspectionQuery } from '../runtime/ui-service-queries.ts';
+import type { SubscriptionEntry } from './settings-modal-types.ts';
+
+export function buildSubscriptionEntries(
+  manager: SubscriptionManager | null,
+  serviceRegistry: Pick<ServiceInspectionQuery, 'getAll'> | null,
+): SubscriptionEntry[] {
+  if (!manager) return [];
+
+  const services = serviceRegistry?.getAll() ?? {};
+  const providers = new Map<string, SubscriptionEntry>();
+  const builtinProviders = new Set(listBuiltinSubscriptionProviders().map((builtin) => builtin.provider));
+
+  for (const provider of builtinProviders) {
+    providers.set(provider, {
+      provider,
+      state: 'available',
+      oauthConfigured: true,
+      preferredRoute: 'subscription',
+      activeRoute: 'unconfigured',
+      authFreshness: 'unconfigured',
+      routeReason: 'Built-in subscription adapter is available, but no active subscription session is stored yet.',
+      nextActions: [`Use /subscription login ${provider} start to begin browser sign-in.`],
+    });
+  }
+
+  for (const service of Object.values(services)) {
+    if (service.authType !== 'oauth' || !service.oauth) continue;
+    const provider = service.providerId ?? service.name;
+    providers.set(provider, {
+      provider,
+      state: 'available',
+      oauthConfigured: true,
+      preferredRoute: 'subscription',
+      activeRoute: providers.get(provider)?.activeRoute ?? 'unconfigured',
+      authFreshness: providers.get(provider)?.authFreshness ?? 'unconfigured',
+      routeReason: providers.get(provider)?.routeReason ?? 'OAuth metadata is configured for this provider.',
+      nextActions: providers.get(provider)?.nextActions ?? [`Use /subscription login ${provider} start to begin browser sign-in.`],
+    });
+  }
+
+  for (const pending of manager.listPending()) {
+    providers.set(pending.provider, {
+      provider: pending.provider,
+      state: 'pending',
+      oauthConfigured: providers.get(pending.provider)?.oauthConfigured ?? false,
+      preferredRoute: 'subscription',
+      activeRoute: 'unconfigured',
+      authFreshness: 'pending',
+      routeReason: 'OAuth login is pending completion for this provider.',
+      nextActions: [`Finish /subscription login ${pending.provider} finish <code> to activate this session.`],
+    });
+  }
+
+  for (const subscription of manager.list()) {
+    const freshness = determineFreshness(subscription.expiresAt);
+    const issues = freshness === 'expired'
+      ? ['Stored subscription session is expired and needs refresh.']
+      : freshness === 'expiring'
+        ? ['Stored subscription session expires within 24 hours.']
+        : [];
+    const nextActions = freshness === 'expired'
+      ? [`Refresh or replace the ${subscription.provider} subscription session.`]
+      : freshness === 'expiring'
+        ? [`Verify or renew the ${subscription.provider} subscription session soon.`]
+        : [];
+    providers.set(subscription.provider, {
+      provider: subscription.provider,
+      state: 'active',
+      tokenType: subscription.tokenType,
+      expiresAt: subscription.expiresAt,
+      oauthConfigured: providers.get(subscription.provider)?.oauthConfigured ?? builtinProviders.has(subscription.provider),
+      activeRoute: freshness === 'expired' ? 'unconfigured' : 'subscription',
+      preferredRoute: 'subscription',
+      authFreshness: freshness,
+      routeReason: subscription.overrideAmbientApiKeys
+        ? 'Subscription route overrides ambient API-key resolution for this provider.'
+        : 'Subscription route is stored for supported flows without automatically replacing ambient API-key resolution.',
+      issues,
+      nextActions,
+    });
+  }
+
+  return [...providers.values()].sort((a, b) => a.provider.localeCompare(b.provider));
+}
+
+function determineFreshness(expiresAt?: number): ProviderAuthFreshness {
+  if (typeof expiresAt !== 'number' || !Number.isFinite(expiresAt)) return 'healthy';
+  if (expiresAt <= Date.now()) return 'expired';
+  if (expiresAt <= Date.now() + 24 * 60 * 60 * 1000) return 'expiring';
+  return 'healthy';
+}

package/src/input/settings-modal-types.ts

@@ -2,7 +2,39 @@ import type { ConfigSetting } from '@pellux/goodvibes-sdk/platform/config/schema
 import type { ProviderAuthFreshness, ProviderAuthRoute } from '@pellux/goodvibes-sdk/platform/runtime/provider-accounts/registry';
 import type { FeatureFlag, FlagState } from '@pellux/goodvibes-sdk/platform/runtime/feature-flags/types';
 
-export type SettingsCategory = 'display' | 'ui' | 'provider' | 'subscriptions' | 'behavior' | 'storage' | 'permissions' | 'mcp' | 'sandbox' | 'surfaces' | 'cloudflare' | 'danger' | 'tools' | 'flags' | 'network';
+export type SettingsCategory =
+  | 'display'
+  | 'ui'
+  | 'provider'
+  | 'subscriptions'
+  | 'behavior'
+  | 'storage'
+  | 'permissions'
+  | 'orchestration'
+  | 'wrfc'
+  | 'tools'
+  | 'helper'
+  | 'tts'
+  | 'service'
+  | 'controlPlane'
+  | 'httpListener'
+  | 'web'
+  | 'network'
+  | 'surfaces'
+  | 'cloudflare'
+  | 'batch'
+  | 'automation'
+  | 'watchers'
+  | 'runtime'
+  | 'telemetry'
+  | 'cache'
+  | 'sandbox'
+  | 'mcp'
+  | 'flags'
+  | 'release'
+  | 'danger';
+
+export type SettingsFocusPane = 'categories' | 'settings';
 
 export const SETTINGS_CATEGORIES: SettingsCategory[] = [
   'display',
@@ -12,14 +44,29 @@ export const SETTINGS_CATEGORIES: SettingsCategory[] = [
   'behavior',
   'storage',
   'permissions',
+  'orchestration',
+  'wrfc',
+  'tools',
+  'helper',
+  'tts',
+  'service',
+  'controlPlane',
+  'httpListener',
+  'web',
+  'network',
   'mcp',
   'sandbox',
   'surfaces',
   'cloudflare',
+  'batch',
+  'automation',
+  'watchers',
+  'runtime',
+  'telemetry',
+  'cache',
   'danger',
-  'tools',
   'flags',
-  'network',
+  'release',
 ];
 
 export interface SettingEntry {