@pellux/goodvibes-tui 0.19.53 → 0.19.55

package/src/input/commands/tts-runtime.ts

@@ -1,9 +1,4 @@
-import type { ConfigKey } from '@pellux/goodvibes-sdk/platform/config/schema';
-import type { ModelDefinition } from '@pellux/goodvibes-sdk/platform/providers/registry';
-import type { CommandContext, CommandRegistry } from '../command-registry.ts';
-import type { SelectionItem } from '../selection-modal.ts';
-
-const TTS_CONFIG_KEYS = new Set(['provider', 'voice', 'llm-provider', 'llm-model']);
+import type { CommandRegistry } from '../command-registry.ts';
 
 export function registerTtsRuntimeCommands(registry: CommandRegistry): void {
   registry.register({
@@ -31,387 +26,4 @@ export function registerTtsRuntimeCommands(registry: CommandRegistry): void {
     },
   });
 
-  registry.register({
-    name: 'config-tts',
-    aliases: ['tts-config'],
-    description: 'Configure live TTS provider, voice, and optional spoken-turn LLM overrides',
-    usage: '[show|providers|voices [provider]|provider <id|clear>|voice <id|clear>|llm|llm clear|llm-provider <id|clear>|llm-model <id|clear>]',
-    async handler(args, ctx) {
-      const sub = (args[0] ?? 'show').toLowerCase();
-      if (sub === 'show') {
-        if (args.length === 0 && openTtsConfigModal(ctx)) return;
-        ctx.print(formatTtsConfig(ctx));
-        return;
-      }
-      if (sub === 'providers') {
-        if (openTtsProviderPicker(ctx)) return;
-        printTtsProviders(ctx);
-        return;
-      }
-      if (sub === 'voices') {
-        if (await openTtsVoicePicker(ctx, args[1])) return;
-        await printTtsVoices(ctx, args[1]);
-        return;
-      }
-      if (sub === 'llm' || sub === 'model') {
-        const action = (args[1] ?? '').toLowerCase();
-        if (action === 'clear' || action === 'default') {
-          setTtsConfigValue(ctx, 'tts.llmProvider', '');
-          setTtsConfigValue(ctx, 'tts.llmModel', '');
-          ctx.print('TTS LLM override cleared. /tts will use the current chat model.');
-          return;
-        }
-        if (openTtsLlmPicker(ctx)) return;
-        ctx.print('TTS LLM picker is not available in this runtime. Use /config-tts llm-provider <id> and /config-tts llm-model <model>.');
-        return;
-      }
-      if (TTS_CONFIG_KEYS.has(sub)) {
-        const value = args.slice(1).join(' ').trim();
-        if (!value) {
-          if ((sub === 'llm-provider' || sub === 'llm-model') && openTtsLlmPicker(ctx)) return;
-          ctx.print(`Usage: /config-tts ${sub} <value|clear>`);
-          return;
-        }
-        const key = ttsConfigKeyForSubcommand(sub);
-        const nextValue = value.toLowerCase() === 'clear' ? '' : value;
-        const previousProvider = key === 'tts.provider'
-          ? String(ctx.platform.configManager.get('tts.provider') ?? '').trim()
-          : '';
-        if (key === 'tts.llmProvider') {
-          setTtsLlmProvider(ctx, nextValue);
-          return;
-        }
-        if (key === 'tts.llmModel') {
-          setTtsLlmModel(ctx, nextValue);
-          return;
-        }
-        setTtsConfigValue(ctx, key, nextValue);
-        if (key === 'tts.provider' && previousProvider && previousProvider !== nextValue) {
-          setTtsConfigValue(ctx, 'tts.voice', '');
-        }
-        ctx.print(`${key} ${nextValue ? `set to ${nextValue}` : 'cleared'}.`);
-        return;
-      }
-      ctx.print('Usage: /config-tts [show|providers|voices [provider]|provider <id|clear>|voice <id|clear>|llm|llm clear|llm-provider <id|clear>|llm-model <id|clear>]');
-    },
-  });
-}
-
-function ttsConfigKeyForSubcommand(subcommand: string): ConfigKey {
-  switch (subcommand) {
-    case 'provider': return 'tts.provider';
-    case 'voice': return 'tts.voice';
-    case 'llm-provider': return 'tts.llmProvider';
-    case 'llm-model': return 'tts.llmModel';
-    default: throw new Error(`Unknown TTS config key: ${subcommand}`);
-  }
-}
-
-function formatTtsConfig(ctx: CommandContext): string {
-  const cm = ctx.platform.configManager;
-  const llmProvider = String(cm.get('tts.llmProvider') ?? '').trim();
-  const llmModel = String(cm.get('tts.llmModel') ?? '').trim();
-  return [
-    'TTS Configuration',
-    `  provider: ${formatValue(cm.get('tts.provider'))}`,
-    `  voice: ${formatValue(cm.get('tts.voice'))}`,
-    `  spoken-turn llm provider override: ${llmProvider || '(current chat provider)'}`,
-    `  spoken-turn llm model override: ${llmModel || '(current chat model)'}`,
-    '  playback: live streaming through local mpv or ffplay',
-    '  commands: /tts <prompt>, /tts stop, /config-tts, /config-tts providers, /config-tts voices [provider], /config-tts llm',
-  ].join('\n');
-}
-
-function openTtsConfigModal(ctx: CommandContext): boolean {
-  if (!ctx.openSelection) return false;
-  const cm = ctx.platform.configManager;
-  const provider = String(cm.get('tts.provider') ?? '').trim() || '(default)';
-  const voice = String(cm.get('tts.voice') ?? '').trim() || '(provider default)';
-  const llmProvider = String(cm.get('tts.llmProvider') ?? '').trim();
-  const llmModel = String(cm.get('tts.llmModel') ?? '').trim();
-  const llmProviderLabel = llmProvider || '(current chat provider)';
-  const llmModelLabel = llmModel || '(current chat model)';
-  const items: SelectionItem[] = [
-    {
-      id: 'provider',
-      label: 'TTS provider',
-      detail: provider,
-      category: 'speech output',
-      primaryAction: 'select',
-      actions: '[Enter] choose',
-    },
-    {
-      id: 'voice',
-      label: 'TTS voice',
-      detail: voice,
-      category: 'speech output',
-      primaryAction: 'select',
-      actions: '[Enter] choose',
-    },
-    {
-      id: 'llm-provider',
-      label: 'TTS LLM provider',
-      detail: llmProviderLabel,
-      category: 'response generation',
-      primaryAction: 'select',
-      actions: '[Enter] choose provider and model',
-    },
-    {
-      id: 'llm-model',
-      label: 'TTS LLM model',
-      detail: llmModelLabel,
-      category: 'response generation',
-      primaryAction: 'select',
-      actions: '[Enter] choose provider and model',
-    },
-    {
-      id: 'clear-voice',
-      label: 'Use provider default voice',
-      detail: 'clears tts.voice',
-      category: 'clear values',
-      primaryAction: 'select',
-    },
-    {
-      id: 'clear-llm',
-      label: 'Use current chat model for /tts',
-      detail: 'clears tts.llmProvider and tts.llmModel',
-      category: 'clear values',
-      primaryAction: 'select',
-    },
-  ];
-
-  ctx.openSelection('TTS Configuration', items, { allowSearch: true }, (result) => {
-    if (!result) return;
-    if (result.item.id === 'provider') {
-      openTtsProviderPicker(ctx);
-      return;
-    }
-    if (result.item.id === 'voice') {
-      void openTtsVoicePicker(ctx);
-      return;
-    }
-    if (result.item.id === 'llm-provider') {
-      openTtsLlmPicker(ctx);
-      return;
-    }
-    if (result.item.id === 'llm-model') {
-      openTtsLlmPicker(ctx);
-      return;
-    }
-    if (result.item.id === 'clear-voice') {
-      setTtsConfigValue(ctx, 'tts.voice', '');
-      ctx.print('TTS voice cleared. The provider default voice will be used.');
-      return;
-    }
-    if (result.item.id === 'clear-llm') {
-      setTtsConfigValue(ctx, 'tts.llmProvider', '');
-      setTtsConfigValue(ctx, 'tts.llmModel', '');
-      ctx.print('TTS LLM override cleared. /tts will use the current chat model.');
-    }
-  });
-  return true;
-}
-
-function openTtsLlmPicker(ctx: CommandContext): boolean {
-  if (ctx.openProviderModelPickerWithTarget?.('tts')) return true;
-  return ctx.openModelPickerWithTarget?.('tts') ?? false;
-}
-
-function getStreamingTtsProviders(ctx: CommandContext): Array<{ id: string; label: string; capabilities: readonly string[] }> {
-  const registry = ctx.platform.voiceProviderRegistry;
-  if (!registry) {
-    return [];
-  }
-  return registry.list().filter((provider) => provider.capabilities.includes('tts-stream'));
-}
-
-function openTtsProviderPicker(ctx: CommandContext): boolean {
-  if (!ctx.openSelection) return false;
-  const registry = ctx.platform.voiceProviderRegistry;
-  if (!registry) {
-    ctx.print('Voice provider registry is not available in this runtime.');
-    return true;
-  }
-  const providers = getStreamingTtsProviders(ctx);
-  if (providers.length === 0) {
-    ctx.print('No streaming TTS providers are registered.');
-    return true;
-  }
-  const current = String(ctx.platform.configManager.get('tts.provider') ?? '').trim();
-  const items: SelectionItem[] = providers.map((provider) => ({
-    id: provider.id,
-    label: provider.label,
-    detail: provider.id === current ? `${provider.id}  (current)` : provider.id,
-    category: 'streaming TTS providers',
-    primaryAction: 'select',
-    actions: '[Enter] set provider',
-  }));
-  ctx.openSelection('Choose TTS Provider', items, { preSelectId: current, allowSearch: true }, (result) => {
-    if (!result) return;
-    const previous = String(ctx.platform.configManager.get('tts.provider') ?? '').trim();
-    setTtsConfigValue(ctx, 'tts.provider', result.item.id);
-    if (previous && previous !== result.item.id) {
-      setTtsConfigValue(ctx, 'tts.voice', '');
-      ctx.print(`TTS provider set to ${result.item.id}. TTS voice was cleared because voices are provider-specific.`);
-    } else {
-      ctx.print(`TTS provider set to ${result.item.id}.`);
-    }
-  });
-  return true;
-}
-
-function printTtsProviders(ctx: CommandContext): void {
-  const registry = ctx.platform.voiceProviderRegistry;
-  if (!registry) {
-    ctx.print('Voice provider registry is not available in this runtime.');
-    return;
-  }
-  const providers = getStreamingTtsProviders(ctx);
-  if (providers.length === 0) {
-    ctx.print('No streaming TTS providers are registered.');
-    return;
-  }
-  ctx.print([
-    'Streaming TTS Providers',
-    ...providers.map((provider) => `  ${provider.id}: ${provider.label}`),
-    '',
-    'Set provider: /config-tts provider <provider-id>',
-  ].join('\n'));
-}
-
-function getSelectableLlmModels(ctx: CommandContext): ModelDefinition[] {
-  const registry = ctx.provider.providerRegistry as Partial<Pick<typeof ctx.provider.providerRegistry, 'getSelectableModels' | 'listModels'>>;
-  if (typeof registry.getSelectableModels === 'function') return registry.getSelectableModels();
-  if (typeof registry.listModels === 'function') return registry.listModels().filter((model) => model.selectable !== false);
-  return [];
-}
-
-function setTtsLlmProvider(ctx: CommandContext, nextValue: string): void {
-  if (!nextValue) {
-    setTtsConfigValue(ctx, 'tts.llmProvider', '');
-    setTtsConfigValue(ctx, 'tts.llmModel', '');
-    ctx.print('TTS LLM override cleared. /tts will use the current chat model.');
-    return;
-  }
-  const previousProvider = String(ctx.platform.configManager.get('tts.llmProvider') ?? '').trim();
-  setTtsConfigValue(ctx, 'tts.llmProvider', nextValue);
-  if (previousProvider && previousProvider !== nextValue) {
-    setTtsConfigValue(ctx, 'tts.llmModel', '');
-    ctx.print(`TTS LLM provider set to ${nextValue}. TTS LLM model was cleared because models are provider-specific.`);
-    return;
-  }
-  ctx.print(`TTS LLM provider set to ${nextValue}.`);
-}
-
-function setTtsLlmModel(ctx: CommandContext, nextValue: string): void {
-  if (!nextValue) {
-    setTtsConfigValue(ctx, 'tts.llmModel', '');
-    ctx.print('TTS LLM model override cleared. /tts will use the current chat model unless a model is selected.');
-    return;
-  }
-  const preferredProvider = String(ctx.platform.configManager.get('tts.llmProvider') ?? '').trim() || undefined;
-  const selected = findSelectableLlmModel(ctx, nextValue, preferredProvider);
-  if (selected) {
-    setTtsConfigValue(ctx, 'tts.llmProvider', selected.provider);
-    setTtsConfigValue(ctx, 'tts.llmModel', getModelRegistryKey(selected));
-    ctx.print(`TTS LLM set to ${selected.displayName} (${selected.provider}).`);
-    return;
-  }
-  setTtsConfigValue(ctx, 'tts.llmModel', nextValue);
-  ctx.print(`tts.llmModel set to ${nextValue}.`);
-}
-
-function findSelectableLlmModel(ctx: CommandContext, ref: string, preferredProvider?: string): ModelDefinition | undefined {
-  const matches = getSelectableLlmModels(ctx).filter((model) =>
-    model.registryKey === ref || model.id === ref || model.displayName === ref,
-  );
-  if (preferredProvider) {
-    const providerMatch = matches.find((model) => model.provider === preferredProvider);
-    if (providerMatch) return providerMatch;
-  }
-  return matches[0];
-}
-
-function getModelRegistryKey(model: ModelDefinition): string {
-  return model.registryKey ?? `${model.provider}:${model.id}`;
-}
-
-async function openTtsVoicePicker(ctx: CommandContext, providerArg?: string): Promise<boolean> {
-  if (!ctx.openSelection) return false;
-  const service = ctx.platform.voiceService;
-  if (!service) {
-    ctx.print('Voice service is not available in this runtime.');
-    return true;
-  }
-  const providerId = (providerArg ?? String(ctx.platform.configManager.get('tts.provider') ?? '')).trim() || undefined;
-  try {
-    const voices = await service.listVoices(providerId);
-    if (voices.length === 0) {
-      ctx.print(providerId ? `No voices returned for ${providerId}.` : 'No TTS voices returned.');
-      return true;
-    }
-    const current = String(ctx.platform.configManager.get('tts.voice') ?? '').trim();
-    const items: SelectionItem[] = [
-      {
-        id: '__default__',
-        label: 'Use provider default voice',
-        detail: current ? 'clears tts.voice' : '(current)',
-        category: 'voice',
-        primaryAction: 'select',
-      },
-      ...voices.map((voice) => ({
-        id: voice.id,
-        label: voice.label || voice.id,
-        detail: voice.id === current ? `${voice.id}  (current)` : voice.id,
-        category: providerId ?? 'voices',
-        primaryAction: 'select' as const,
-        actions: '[Enter] set voice',
-      })),
-    ];
-    ctx.openSelection(`Choose TTS Voice${providerId ? ` (${providerId})` : ''}`, items, { preSelectId: current || '__default__', allowSearch: true }, (result) => {
-      if (!result) return;
-      const nextVoice = result.item.id === '__default__' ? '' : result.item.id;
-      setTtsConfigValue(ctx, 'tts.voice', nextVoice);
-      ctx.print(nextVoice ? `TTS voice set to ${nextVoice}.` : 'TTS voice cleared. The provider default voice will be used.');
-    });
-    return true;
-  } catch (error) {
-    ctx.print(`Unable to list TTS voices: ${error instanceof Error ? error.message : String(error)}`);
-    return true;
-  }
-}
-
-async function printTtsVoices(ctx: CommandContext, providerArg?: string): Promise<void> {
-  const service = ctx.platform.voiceService;
-  if (!service) {
-    ctx.print('Voice service is not available in this runtime.');
-    return;
-  }
-  const providerId = (providerArg ?? String(ctx.platform.configManager.get('tts.provider') ?? '')).trim() || undefined;
-  try {
-    const voices = await service.listVoices(providerId);
-    if (voices.length === 0) {
-      ctx.print(providerId ? `No voices returned for ${providerId}.` : 'No TTS voices returned.');
-      return;
-    }
-    ctx.print([
-      `TTS Voices${providerId ? ` (${providerId})` : ''}`,
-      ...voices.slice(0, 60).map((voice) => `  ${voice.id}: ${voice.label}`),
-      ...(voices.length > 60 ? [`  ... ${voices.length - 60} more`] : []),
-      '',
-      'Set voice: /config-tts voice <voice-id>',
-      'Use provider default voice: /config-tts voice clear',
-    ].join('\n'));
-  } catch (error) {
-    ctx.print(`Unable to list TTS voices: ${error instanceof Error ? error.message : String(error)}`);
-  }
-}
-
-function setTtsConfigValue(ctx: CommandContext, key: ConfigKey, value: string): void {
-  ctx.platform.configManager.setDynamic(key, value);
-}
-
-function formatValue(value: unknown): string {
-  const text = String(value ?? '').trim();
-  return text || '(default)';
 }

package/src/input/commands.ts

@@ -43,7 +43,6 @@ import { registerMemoryProductRuntimeCommands } from './commands/memory-product-
 import { registerSkillsRuntimeCommands } from './commands/skills-runtime.ts';
 import { registerServicesRuntimeCommands } from './commands/services-runtime.ts';
 import { registerTasksRuntimeCommands } from './commands/tasks-runtime.ts';
-import { registerPermissionsRuntimeCommands } from './commands/permissions-runtime.ts';
 import { registerLocalProviderRuntimeCommands } from './commands/local-provider-runtime.ts';
 import { registerHealthRuntimeCommands } from './commands/health-runtime.ts';
 import { registerSettingsSyncRuntimeCommands } from './commands/settings-sync-runtime.ts';
@@ -93,7 +92,6 @@ export function registerBuiltinCommands(registry: CommandRegistry): void {
   registerExperienceRuntimeCommands(registry);
   registerServicesRuntimeCommands(registry);
   registerTasksRuntimeCommands(registry);
-  registerPermissionsRuntimeCommands(registry);
   registerLocalProviderRuntimeCommands(registry);
   registerHealthRuntimeCommands(registry);
   registerSettingsSyncRuntimeCommands(registry);

package/src/input/handler-modal-routes.ts

@@ -1,6 +1,7 @@
 import type { InputToken } from '@pellux/goodvibes-sdk/platform/core/tokenizer';
 import type { SelectionResult, SelectionAction } from './selection-modal.ts';
 import type { CommandContext } from './command-registry.ts';
+import { openTtsProviderPicker, openTtsVoicePicker } from './tts-settings-actions.ts';
 
 type SelectionRouteState = {
   selectionModal: {
@@ -210,18 +211,28 @@ type SettingsRouteState = {
     active: boolean;
     editingMode: boolean;
     currentCategory: string;
+    focusPane?: 'categories' | 'settings';
     commitEdit: () => void;
     toggleSelectedFlag: () => void;
     activateSelected: () => void;
     adjustSelected: (direction: 'left' | 'right', step?: number) => void;
-    moveUp: () => void;
-    moveDown: () => void;
+    moveFocusedUp?: () => void;
+    moveFocusedDown?: () => void;
+    moveUp?: () => void;
+    moveDown?: () => void;
+    focusCategories?: () => void;
+    focusSettings?: () => void;
+    toggleFocusPane?: () => void;
     nextCategory: () => void;
+    prevCategory?: () => void;
     editBackspace: () => void;
     editChar: (char: string) => void;
     pendingModelPickerTarget: import('./model-picker.ts').ModelPickerTarget | null;
     pendingProviderModelPickerTarget?: import('./model-picker.ts').ModelPickerTarget | null;
+    pendingSettingsPickerAction?: 'tts-provider' | 'tts-voice' | null;
+    resetSelected?: () => { key: string; value: unknown } | null;
   };
+  commandContext?: CommandContext;
   /** Called when the settings modal requests the model picker for a non-main target. */
   openModelPickerWithTarget?: (target: import('./model-picker.ts').ModelPickerTarget) => void;
   /** Called when the settings modal requests provider selection before model selection. */
@@ -230,7 +241,29 @@ type SettingsRouteState = {
   handleEscape: () => void;
 };
 
+function syncRuntimeAfterSettingReset(ctx: CommandContext | undefined, key: string, value: unknown): void {
+  if (!ctx) return;
+  if (key === 'provider.model') ctx.session.runtime.model = String(value);
+  if (key === 'provider.provider') ctx.session.runtime.provider = String(value);
+  if (key === 'provider.reasoningEffort') ctx.session.runtime.reasoningEffort = String(value);
+}
+
 function consumeSettingsPickerRequest(state: SettingsRouteState): void {
+  const settingsAction = state.settingsModal.pendingSettingsPickerAction ?? null;
+  if (settingsAction !== null) {
+    state.settingsModal.pendingSettingsPickerAction = null;
+    if (!state.commandContext) return;
+    if (settingsAction === 'tts-provider') {
+      openTtsProviderPicker(state.commandContext);
+      return;
+    }
+    void openTtsVoicePicker(state.commandContext).catch((error: unknown) => {
+      state.commandContext?.print(`Unable to list TTS voices: ${error instanceof Error ? error.message : String(error)}`);
+      state.requestRender();
+    });
+    return;
+  }
+
   const providerModelTarget = state.settingsModal.pendingProviderModelPickerTarget ?? null;
   if (providerModelTarget !== null) {
     state.settingsModal.pendingProviderModelPickerTarget = null;
@@ -248,32 +281,53 @@ export function handleSettingsModalToken(state: SettingsRouteState, token: Input
   if (!state.settingsModal.active) return false;
 
   if (token.type === 'key') {
+    const focusPane = state.settingsModal.focusPane ?? 'settings';
     if (token.logicalName === 'escape') {
       state.handleEscape();
       return true;
     }
     if (token.logicalName === 'enter' || (token.logicalName === 'space' && !state.settingsModal.editingMode)) {
       if (state.settingsModal.editingMode) state.settingsModal.commitEdit();
+      else if (focusPane === 'categories') state.settingsModal.focusSettings?.();
       else if (state.settingsModal.currentCategory === 'flags') state.settingsModal.toggleSelectedFlag();
       else {
         state.settingsModal.activateSelected();
         consumeSettingsPickerRequest(state);
       }
     } else if ((token.logicalName === 'left' || token.logicalName === 'right') && !state.settingsModal.editingMode) {
-      state.settingsModal.adjustSelected(token.logicalName, token.shift ? 10 : 1);
-    } else if (token.logicalName === 'up') state.settingsModal.moveUp();
-    else if (token.logicalName === 'down') state.settingsModal.moveDown();
-    else if (token.logicalName === 'tab') state.settingsModal.nextCategory();
+      if (token.logicalName === 'left') state.settingsModal.focusCategories?.();
+      else state.settingsModal.focusSettings?.();
+    } else if (token.logicalName === 'up') {
+      if (state.settingsModal.moveFocusedUp) state.settingsModal.moveFocusedUp();
+      else state.settingsModal.moveUp?.();
+    } else if (token.logicalName === 'down') {
+      if (state.settingsModal.moveFocusedDown) state.settingsModal.moveFocusedDown();
+      else state.settingsModal.moveDown?.();
+    }
+    else if (token.logicalName === 'r' && !state.settingsModal.editingMode) {
+      const reset = state.settingsModal.resetSelected?.();
+      if (reset) syncRuntimeAfterSettingReset(state.commandContext, reset.key, reset.value);
+    }
+    else if (token.logicalName === 'tab') {
+      if (state.settingsModal.toggleFocusPane) state.settingsModal.toggleFocusPane();
+      else if (focusPane === 'categories') state.settingsModal.focusSettings?.();
+      else state.settingsModal.focusCategories?.();
+    }
     else if (token.logicalName === 'backspace' && state.settingsModal.editingMode) state.settingsModal.editBackspace();
   } else if (token.type === 'text') {
     if (token.value === ' ' && !state.settingsModal.editingMode) {
-      if (state.settingsModal.currentCategory === 'flags') state.settingsModal.toggleSelectedFlag();
+      const focusPane = state.settingsModal.focusPane ?? 'settings';
+      if (focusPane === 'categories') state.settingsModal.focusSettings?.();
+      else if (state.settingsModal.currentCategory === 'flags') state.settingsModal.toggleSelectedFlag();
       else {
         state.settingsModal.activateSelected();
         consumeSettingsPickerRequest(state);
       }
     } else if (state.settingsModal.editingMode) {
       state.settingsModal.editChar(token.value);
+    } else if (token.value === 'r') {
+      const reset = state.settingsModal.resetSelected?.();
+      if (reset) syncRuntimeAfterSettingReset(state.commandContext, reset.key, reset.value);
     }
   }
 

package/src/input/handler-modal-token-routes.ts

@@ -137,6 +137,7 @@ export function handleModalTokenRoutes(state: ModalTokenRouteState, token: Input
 
   if (handleSettingsModalToken({
     settingsModal: state.settingsModal,
+    commandContext: state.commandContext,
     openModelPickerWithTarget: state.openModelPickerWithTarget,
     openProviderModelPickerWithTarget: state.openProviderModelPickerWithTarget,
     requestRender: state.requestRender,

package/src/input/handler-picker-routes.ts

@@ -1,7 +1,7 @@
 import { readFileSync } from 'node:fs';
 import type { InputToken } from '@pellux/goodvibes-sdk/platform/core/tokenizer';
 import type { CommandContext } from './command-registry.ts';
-import type { CategoryFilter, ModelPickerModal } from './model-picker.ts';
+import type { CapabilityFilter, CategoryFilter, ModelPickerModal } from './model-picker.ts';
 import { MODEL_PICKER_CHROME_LINES } from '../renderer/model-picker-overlay.ts';
 import { resolveAndValidatePath } from '@pellux/goodvibes-sdk/platform/utils/path-safety';
 import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
@@ -49,6 +49,11 @@ export function handleModelPickerToken(state: ModelPickerRouteState, token: Inpu
       if (state.modelPicker.mode === 'contextCap') state.modelPicker.deleteContextCapChar();
       else if (state.modelPicker.searchFocused && (state.modelPicker.mode === 'model' || state.modelPicker.mode === 'provider')) state.modelPicker.deleteChar();
     } else if (token.logicalName === 'enter') {
+      if (state.modelPicker.focusPane === 'targets') {
+        state.modelPicker.focusItems();
+        state.requestRender();
+        return true;
+      }
       const mode = state.modelPicker.mode;
       const idx = state.modelPicker.selectedIndex;
       if (mode === 'model') {
@@ -102,6 +107,11 @@ export function handleModelPickerToken(state: ModelPickerRouteState, token: Inpu
         if (state.modalStack[state.modalStack.length - 1] === 'modelPicker') state.modalStack.pop();
       }
     } else if (token.logicalName === 'up') {
+      if (state.modelPicker.focusPane === 'targets') {
+        state.modelPicker.moveTarget(-1);
+        state.requestRender();
+        return true;
+      }
       if (state.modelPicker.canFocusSearch() && !state.modelPicker.searchFocused && state.modelPicker.selectedIndex === 0) {
         state.modelPicker.focusSearch();
       } else if (!state.modelPicker.searchFocused) {
@@ -109,19 +119,39 @@ export function handleModelPickerToken(state: ModelPickerRouteState, token: Inpu
         state.modelPicker.moveUp(maxVis);
       }
     } else if (token.logicalName === 'down') {
+      if (state.modelPicker.focusPane === 'targets') {
+        state.modelPicker.moveTarget(1);
+        state.requestRender();
+        return true;
+      }
       if (state.modelPicker.searchFocused) {
         state.modelPicker.blurSearch();
       } else {
         const maxVis = Math.max(5, state.getViewportHeight() - MODEL_PICKER_CHROME_LINES - 4);
         state.modelPicker.moveDown(maxVis);
       }
+    } else if (token.logicalName === 'left' && !state.modelPicker.searchFocused && state.modelPicker.mode !== 'contextCap') {
+      state.modelPicker.focusTargets();
+    } else if (token.logicalName === 'right' && !state.modelPicker.searchFocused && state.modelPicker.mode !== 'contextCap') {
+      state.modelPicker.focusItems();
     } else if (token.logicalName === 'tab' && state.modelPicker.mode === 'model') {
-      const cycle: CategoryFilter[] = ['all', 'free', 'paid', 'subscription'];
-      const cur = cycle.indexOf(state.modelPicker.categoryFilter);
-      state.modelPicker.setCategoryFilter(cycle[(cur + 1) % cycle.length]!);
+      if (state.modelPicker.focusPane === 'targets') {
+        state.modelPicker.focusItems();
+      } else {
+        const cycle: CategoryFilter[] = ['all', 'free', 'paid', 'subscription'];
+        const cur = cycle.indexOf(state.modelPicker.categoryFilter);
+        state.modelPicker.setCategoryFilter(cycle[(cur + 1) % cycle.length]!);
+      }
     } else if (!state.modelPicker.searchFocused && token.logicalName === 'g' && state.modelPicker.mode === 'model') {
       state.modelPicker.cycleGroupBy();
+    } else if (!state.modelPicker.searchFocused && token.logicalName === 'c' && state.modelPicker.mode === 'model') {
+      cycleCapabilityFilter(state.modelPicker);
+    } else if (!state.modelPicker.searchFocused && token.logicalName === 'a' && state.modelPicker.mode === 'model') {
+      state.modelPicker.toggleAvailableOnly();
+    } else if (!state.modelPicker.searchFocused && token.logicalName === 'b' && state.modelPicker.mode === 'model') {
+      state.modelPicker.cycleBenchmarkSort();
     } else if (!state.modelPicker.searchFocused && token.logicalName === '/' && state.modelPicker.canFocusSearch()) {
+      state.modelPicker.focusItems();
       state.modelPicker.focusSearch();
     }
   } else if (token.type === 'text') {
@@ -139,9 +169,19 @@ export function handleModelPickerToken(state: ModelPickerRouteState, token: Inpu
     } else if (token.value === ' ' && state.modelPicker.mode === 'model') {
       const selected = state.modelPicker.getSelected();
       if (selected && state.modelPicker.isLocalModel(selected)) state.modelPicker.enterContextCapMode(selected);
+    } else if (token.value === '\t') {
+      if (state.modelPicker.focusPane === 'targets') state.modelPicker.focusItems();
+      else state.modelPicker.focusTargets();
     } else if (token.value === 'g' && state.modelPicker.mode === 'model') {
       state.modelPicker.cycleGroupBy();
+    } else if (token.value === 'c' && state.modelPicker.mode === 'model') {
+      cycleCapabilityFilter(state.modelPicker);
+    } else if (token.value === 'a' && state.modelPicker.mode === 'model') {
+      state.modelPicker.toggleAvailableOnly();
+    } else if (token.value === 'b' && state.modelPicker.mode === 'model') {
+      state.modelPicker.cycleBenchmarkSort();
     } else if (token.value === '/' && state.modelPicker.canFocusSearch()) {
+      state.modelPicker.focusItems();
       state.modelPicker.focusSearch();
     }
   }
@@ -150,6 +190,12 @@ export function handleModelPickerToken(state: ModelPickerRouteState, token: Inpu
   return true;
 }
 
+function cycleCapabilityFilter(modelPicker: ModelPickerModal): void {
+  const cycle: CapabilityFilter[] = ['none', 'reasoning', 'toolUse', 'multimodal'];
+  const cur = cycle.indexOf(modelPicker.capabilityFilter);
+  modelPicker.setCapabilityFilter(cycle[(cur + 1) % cycle.length]!);
+}
+
 type ProcessRouteState = {
   processModal: {
     active: boolean;