@pellux/goodvibes-tui 0.19.32 → 0.19.34

package/src/input/onboarding/onboarding-wizard-steps.ts

@@ -1,4 +1,6 @@
 import { NETWORK_MODE_OPTIONS, REASONING_OPTIONS, HITL_MODE_OPTIONS, GUIDANCE_MODE_OPTIONS, PERMISSION_MODE_OPTIONS, SECRET_POLICY_OPTIONS } from './onboarding-wizard-constants.ts';
+import { shouldShowCloudflareStep } from './onboarding-wizard-cloudflare.ts';
+import { buildCloudflareStep } from './onboarding-wizard-cloudflare-step.ts';
 import {
   EXTERNAL_SURFACE_SPECS,
   getExternalSurfaceAutoStartDefaultValue,
@@ -19,27 +21,25 @@ export function buildOnboardingWizardSteps(controller: OnboardingWizardControlle
   const steps: OnboardingWizardStepDefinition[] = [
     buildCapabilitiesStep(controller),
   ];
-
   if (hasServers) {
     steps.push(buildNetworkStep(controller));
   }
-
   if (hasServers || controller.hasExistingAccessState()) {
     steps.push(buildAccessStep(controller));
   }
-
   if (wantsExternalServices) {
     steps.push(buildExternalServicesStep(controller));
     for (const surface of getSelectedExternalSurfaceSpecs(controller)) {
       steps.push(buildExternalSurfaceStep(controller, surface));
     }
   }
-
+  if (shouldShowCloudflareStep(controller)) {
+    steps.push(buildCloudflareStep(controller));
+  }
   steps.push(buildProviderAccessStep(controller));
   steps.push(buildDefaultModelStep(controller));
   steps.push(buildExperienceStep(controller));
   steps.push(buildReviewStep(controller));
-
   return steps.map(addApplyAndContinueAction);
 }
 
@@ -49,7 +49,7 @@ function buildApplyAndContinueAction(step: OnboardingWizardStepDefinition): Onbo
       id: `${step.id}.apply-and-continue`,
       action: 'apply-and-continue',
       label: 'Apply & Continue To Next Section',
-      hint: 'Persist the current wizard settings, verify them, and move to the next onboarding section.',
+      hint: 'Save the current wizard selections in this onboarding session and move to the next section. Settings are persisted on the final Review apply.',
       defaultValue: 'Apply & next',
       spacerBeforeRows: 2,
     };

package/src/input/onboarding/onboarding-wizard-types.ts

@@ -25,6 +25,7 @@ export type OnboardingWizardStepId =
   | 'access'
   | 'external-services'
   | OnboardingWizardExternalSurfaceStepId
+  | 'cloudflare'
   | 'provider-access'
   | 'default-model'
   | 'experience'
@@ -47,6 +48,13 @@ export type OnboardingWizardAction =
   | 'clear-capabilities'
   | 'select-all-external-surfaces'
   | 'clear-external-surfaces'
+  | 'cloudflare-token-requirements'
+  | 'cloudflare-create-operational-token'
+  | 'cloudflare-discover'
+  | 'cloudflare-validate'
+  | 'cloudflare-provision'
+  | 'cloudflare-verify'
+  | 'cloudflare-disable'
   | 'start-openai-subscription'
   | 'finish-openai-subscription';
 

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

@@ -2,7 +2,7 @@ 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' | 'danger' | 'tools' | 'flags' | 'network';
+export type SettingsCategory = 'display' | 'ui' | 'provider' | 'subscriptions' | 'behavior' | 'storage' | 'permissions' | 'mcp' | 'sandbox' | 'surfaces' | 'cloudflare' | 'danger' | 'tools' | 'flags' | 'network';
 
 export const SETTINGS_CATEGORIES: SettingsCategory[] = [
   'display',
@@ -15,6 +15,7 @@ export const SETTINGS_CATEGORIES: SettingsCategory[] = [
   'mcp',
   'sandbox',
   'surfaces',
+  'cloudflare',
   'danger',
   'tools',
   'flags',

package/src/input/settings-modal.ts

@@ -41,13 +41,21 @@ export {
   type SubscriptionEntry,
 } from './settings-modal-types.ts';
 
+type ModelPickerLaunch =
+  | { readonly flow: 'providerModel'; readonly target: ModelPickerTarget }
+  | { readonly flow: 'model'; readonly target: ModelPickerTarget };
+
 /**
- * Map a config key to the model picker target it should open, or null if the
- * setting should use the normal inline text-edit flow.
+ * Map config keys to the shared provider/model picker flows. Provider rows open
+ * provider first; model rows open directly to models for the same target.
  */
-function _modelPickerTargetForKey(key: string): ModelPickerTarget | null {
-  if (key === 'helper.globalProvider' || key === 'helper.globalModel') return 'helper';
-  if (key === 'tools.llmProvider' || key === 'tools.llmModel') return 'tool';
+function _modelPickerLaunchForKey(key: string): ModelPickerLaunch | null {
+  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' };
+  if (key === 'tools.llmModel') return { flow: 'model', target: 'tool' };
+  if (key === 'tts.llmProvider') return { flow: 'providerModel', target: 'tts' };
+  if (key === 'tts.llmModel') return { flow: 'model', target: 'tts' };
   return null;
 }
 
@@ -94,6 +102,8 @@ export class SettingsModal {
    * Consumed and cleared by the route handler after each Enter/Space action.
    */
   public pendingModelPickerTarget: ModelPickerTarget | null = null;
+  /** Set when the highlighted setting should open provider selection before model selection. */
+  public pendingProviderModelPickerTarget: ModelPickerTarget | null = null;
   /** Provider awaiting explicit logout confirmation, if any. */
   public subscriptionLogoutConfirmationTarget: string | null = null;
 
@@ -146,6 +156,8 @@ export class SettingsModal {
     this.selectedIndex = 0;
     this.editingMode = false;
     this.editBuffer = '';
+    this.pendingModelPickerTarget = null;
+    this.pendingProviderModelPickerTarget = null;
     this.mcpAllowAllConfirmationTarget = null;
     this.subscriptionLogoutConfirmationTarget = null;
     this.lastSaveTriggeredRestart = null;
@@ -156,6 +168,8 @@ export class SettingsModal {
     this.active = false;
     this.editingMode = false;
     this.editBuffer = '';
+    this.pendingModelPickerTarget = null;
+    this.pendingProviderModelPickerTarget = null;
     this.mcpAllowAllConfirmationTarget = null;
     this.subscriptionLogoutConfirmationTarget = null;
     this.lastSaveTriggeredRestart = null;
@@ -290,9 +304,13 @@ export class SettingsModal {
     const { setting } = entry;
 
     // Delegate provider/model picker settings to the model picker UI
-    const pickerTarget = _modelPickerTargetForKey(setting.key);
-    if (pickerTarget !== null) {
-      this.pendingModelPickerTarget = pickerTarget;
+    const pickerLaunch = _modelPickerLaunchForKey(setting.key);
+    if (pickerLaunch !== null) {
+      if (pickerLaunch.flow === 'providerModel') {
+        this.pendingProviderModelPickerTarget = pickerLaunch.target;
+      } else {
+        this.pendingModelPickerTarget = pickerLaunch.target;
+      }
       return;
     }
 
@@ -521,6 +539,8 @@ export class SettingsModal {
         cat = 'network';
       } else if (rawCat === 'surfaces') {
         cat = 'surfaces';
+      } else if (rawCat === 'cloudflare' || rawCat === 'batch') {
+        cat = 'cloudflare';
       } else {
         cat = rawCat as SettingsCategory;
       }
@@ -750,6 +770,8 @@ export class SettingsModal {
         }
       } else if (rawCat === 'surfaces') {
         cat = 'surfaces';
+      } else if (rawCat === 'cloudflare' || rawCat === 'batch') {
+        cat = 'cloudflare';
       } else {
         cat = rawCat as SettingsCategory;
       }

package/src/main.ts

@@ -52,6 +52,10 @@ import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-displ
 import { prepareShellCliRuntime } from './cli/entrypoint.ts';
 import { applyInitialTuiCliState } from './cli/tui-startup.ts';
 import { wireSpokenTurnRuntime } from './audio/spoken-turn-wiring.ts';
+import {
+  attachSpokenTurnModelRouting,
+  createSpokenTurnInputOptions,
+} from './audio/spoken-turn-model-routing.ts';
 
 const ALT_SCREEN_ENTER = '\x1b[?1049h';
 const ALT_SCREEN_EXIT  = '\x1b[?1049l';
@@ -251,6 +255,12 @@ async function main() {
   });
   stopSpokenOutputForExit = () => spokenTurns.stop();
   unsubs.push(...spokenTurns.unsubs);
+  unsubs.push(attachSpokenTurnModelRouting({
+    orchestrator,
+    providerRegistry,
+    configManager,
+    notify: (message) => { systemMessageRouter.high(message); render(); },
+  }));
 
   const submitInput = (text: string, content?: ContentPart[], options: { readonly spokenOutput?: boolean } = {}) => {
     input.clearModalStack();
@@ -289,7 +299,8 @@ async function main() {
       if (options.spokenOutput && processedText) {
         spokenTurns.submitNextTurn(processedText);
       }
-      orchestrator.handleUserInput(processedText, content).catch((err: unknown) => {
+      const inputOptions = options.spokenOutput ? createSpokenTurnInputOptions() : undefined;
+      orchestrator.handleUserInput(processedText, content, inputOptions).catch((err: unknown) => {
         logger.debug('handleUserInput safety catch (already handled by runTurn)', { error: summarizeError(err) });
       });
     } else {

package/src/renderer/buffer.ts

@@ -39,7 +39,13 @@ export class TerminalBuffer {
 
   public blitLine(row: number, line: Line): void {
     if (row >= 0 && row < this.height) {
-      this.cells[row] = [...line];
+      const current = this.cells[row]!;
+      const next = createEmptyLine(this.width);
+      for (let x = 0; x < Math.min(line.length, this.width); x++) {
+        next[x] = { ...line[x]! };
+      }
+      if (linesEqual(current, next, this.width)) return;
+      this.cells[row] = next;
       this.dirtyRows[row] = true;
     }
   }
@@ -56,12 +62,17 @@ export class TerminalBuffer {
    * If dimensions changed, reallocates cells array.
    * Always clears the dirty bitmap.
    */
-  public reset(width: number, height: number): void {
+  public reset(width: number, height: number, source?: TerminalBuffer | null): void {
     if (width !== this.width || height !== this.height) {
       this.width = width;
       this.height = height;
       this.cells = Array.from({ length: height }, () => createEmptyLine(width));
       this.dirtyRows = new Array(height).fill(false);
+    } else if (source && source.width === width && source.height === height) {
+      for (let y = 0; y < this.height; y++) {
+        this.cells[y] = source.cells[y]!.map(cell => ({ ...cell }));
+        this.dirtyRows[y] = false;
+      }
     } else {
       for (let y = 0; y < this.height; y++) {
         const row = this.cells[y]!;
@@ -72,4 +83,31 @@ export class TerminalBuffer {
       }
     }
   }
+
+  public clearDirty(): void {
+    this.dirtyRows.fill(false);
+  }
+}
+
+function linesEqual(left: Line, right: Line, width: number): boolean {
+  for (let x = 0; x < width; x++) {
+    const a = left[x];
+    const b = right[x];
+    if (!a && !b) continue;
+    if (!a || !b) return false;
+    if (
+      a.char !== b.char
+      || a.fg !== b.fg
+      || a.bg !== b.bg
+      || a.bold !== b.bold
+      || a.dim !== b.dim
+      || a.underline !== b.underline
+      || a.italic !== b.italic
+      || a.strikethrough !== b.strikethrough
+      || (a.link ?? '') !== (b.link ?? '')
+    ) {
+      return false;
+    }
+  }
+  return true;
 }

package/src/renderer/compositor.ts

@@ -1,6 +1,6 @@
 import { TerminalBuffer } from './buffer.ts';
 import { DiffEngine } from './diff.ts';
-import { type Line, createStyledCell } from '../types/grid.ts';
+import { type Line, createEmptyCell, createStyledCell } from '../types/grid.ts';
 import { getDisplayWidth } from '../utils/terminal-width.ts';
 import type { SearchManager } from '../input/search.ts';
 
@@ -78,7 +78,7 @@ export class Compositor {
     if (!this.backBuffer) {
       this.backBuffer = new TerminalBuffer(width, height);
     } else {
-      this.backBuffer.reset(width, height);
+      this.backBuffer.reset(width, height, this.frontBuffer);
     }
     const newBuffer = this.backBuffer;
 
@@ -154,19 +154,31 @@ export class Compositor {
         }
 
         const panelStartX = sepX + 1;
+        const clearPanelRemainder = (fromX = 0) => {
+          for (let x = Math.max(0, fromX); x < panelWidth; x++) {
+            newBuffer.setCell(panelStartX + x, screenY, createEmptyCell());
+          }
+        };
+        const drawPanelLine = (panelLine: Line | undefined) => {
+          if (panelLine === undefined) {
+            clearPanelRemainder();
+            return;
+          }
+          const limit = Math.min(panelLine.length, panelWidth);
+          for (let x = 0; x < limit; x++) {
+            const cell = panelLine[x];
+            if (cell !== undefined) {
+              newBuffer.setCell(panelStartX + x, screenY, cell);
+            }
+          }
+          clearPanelRemainder(limit);
+        };
 
         if (!hasBottomPane) {
           // --- Single pane mode ---
           // viewport row 0 → workspace bar, viewport rows 1+ → panel content
           const panelLine = i === 0 ? p.workspaceBar : p.topContent[i - 1];
-          if (panelLine !== undefined) {
-            for (let x = 0; x < panelWidth; x++) {
-              const cell = panelLine[x];
-              if (cell !== undefined) {
-                newBuffer.setCell(panelStartX + x, screenY, cell);
-              }
-            }
-          }
+          drawPanelLine(panelLine);
         } else {
           // --- Two pane mode ---
           // Row layout (by viewport row i):
@@ -203,13 +215,8 @@ export class Compositor {
             panelLine = p.bottomContent?.[i - (hSepRow + 2)];
           }
 
-          if (panelLine !== undefined) {
-            for (let x = 0; x < panelWidth; x++) {
-              const cell = panelLine[x];
-              if (cell !== undefined) {
-                newBuffer.setCell(panelStartX + x, screenY, cell);
-              }
-            }
+          if (i !== hSepRow) {
+            drawPanelLine(panelLine);
           }
         }
       }
@@ -269,6 +276,7 @@ export class Compositor {
     // Swap: back (just written) becomes the new front reference; old front becomes the next back
     const swap = this.frontBuffer;
     this.frontBuffer = this.backBuffer;
+    this.frontBuffer.clearDirty();
     this.backBuffer = swap;
   }
 }

package/src/renderer/model-picker-overlay.ts

@@ -34,6 +34,10 @@ const MODE_TITLES: Record<string, string> = {
  */
 export const MODEL_PICKER_CHROME_LINES = 7;
 
+const renderCache = new WeakMap<ModelPickerModal, { key: string; lines: Line[] }>();
+const objectIds = new WeakMap<object, number>();
+let nextObjectId = 1;
+
 function putRowText(line: Line, startX: number, maxWidth: number, text: string, fg: string, bg = '', bold = false, dim = false): void {
   putOverlayText(line, startX, maxWidth, text, { fg, bg, bold, dim });
 }
@@ -51,6 +55,10 @@ export function renderModelPickerOverlay(
   maxVisible = 20,
   viewportHeight?: number,
 ): Line[] {
+  const cacheKey = getRenderCacheKey(picker, width, maxVisible, viewportHeight);
+  const cached = renderCache.get(picker);
+  if (cached?.key === cacheKey) return cached.lines;
+
   const lines: Line[] = [];
   const metrics = getOverlaySurfaceMetrics(width, viewportHeight ?? 24, {
     chromeRows: MODEL_PICKER_CHROME_LINES,
@@ -399,5 +407,67 @@ export function renderModelPickerOverlay(
   putRowText(footerLine, layout.margin + 2, contentW, fitDisplay(truncateDisplay(hints, contentW), contentW), mutedFg, '', false, true);
   lines.push(footerLine);
 
+  renderCache.set(picker, { key: cacheKey, lines });
   return lines;
 }
+
+function getRenderCacheKey(
+  picker: ModelPickerModal,
+  width: number,
+  maxVisible: number,
+  viewportHeight: number | undefined,
+): string {
+  const base = [
+    width,
+    maxVisible,
+    viewportHeight ?? '',
+    picker.mode,
+    picker.target,
+    picker.query,
+    picker.searchFocused ? 1 : 0,
+    picker.selectedIndex,
+    picker.scrollOffset,
+    picker.categoryFilter,
+    picker.capabilityFilter,
+    picker.availableOnly ? 1 : 0,
+    picker.benchmarkSort,
+    picker.groupBy,
+    keyForSet(picker.pinnedIds),
+    keyForSet(picker.configuredProviders),
+  ];
+
+  if (picker.mode === 'model') {
+    const filtered = picker.getFilteredModels();
+    const selected = filtered[picker.selectedIndex];
+    base.push(objectId(picker.models), objectId(filtered), filtered.length, selected?.registryKey ?? selected?.id ?? '');
+  } else if (picker.mode === 'provider') {
+    const filteredProviders = picker.getFilteredProviders();
+    base.push(objectId(picker.providers), objectId(filteredProviders), filteredProviders.length, keyForMap(picker.configuredViaMap));
+  } else if (picker.mode === 'effort') {
+    base.push(objectId(picker.effortLevels), picker.effortLevels.join('\u001f'), picker.pendingModel?.registryKey ?? picker.pendingModel?.id ?? '');
+  } else if (picker.mode === 'contextCap') {
+    base.push(picker.contextCapQuery, picker.contextCapPendingModel?.registryKey ?? picker.contextCapPendingModel?.id ?? '');
+  }
+
+  return base.join('\u001e');
+}
+
+function objectId(value: object): number {
+  const existing = objectIds.get(value);
+  if (existing !== undefined) return existing;
+  const next = nextObjectId++;
+  objectIds.set(value, next);
+  return next;
+}
+
+function keyForSet(values: ReadonlySet<string>): string {
+  return values.size === 0 ? '' : [...values].sort().join('\u001f');
+}
+
+function keyForMap(values: ReadonlyMap<string, string | undefined>): string {
+  if (values.size === 0) return '';
+  return [...values.entries()]
+    .sort(([left], [right]) => left.localeCompare(right))
+    .map(([key, value]) => `${key}\u001d${value ?? ''}`)
+    .join('\u001f');
+}

package/src/renderer/settings-modal-helpers.ts

@@ -76,6 +76,7 @@ export const CATEGORY_LABELS: Record<(typeof SETTINGS_CATEGORIES)[number], strin
   mcp: 'MCP',
   sandbox: 'Sandbox',
   surfaces: 'Surfaces',
+  cloudflare: 'Cloudflare',
   danger: 'Danger',
   tools: 'Tools',
   flags: 'Flags',

package/src/runtime/bootstrap-command-parts.ts

@@ -203,6 +203,10 @@ export function createBootstrapCommandActions(
           configManager.set('tools.llmModel', key);
           configManager.setDynamic('tools.llmEnabled' as never, true);
           conversation.log(`Tool LLM set to: ${def.displayName} (${def.provider})`, { fg: '135' });
+        } else if (resolvedTarget === 'tts') {
+          configManager.set('tts.llmProvider', def.provider);
+          configManager.set('tts.llmModel', key);
+          conversation.log(`TTS LLM set to: ${def.displayName} (${def.provider})`, { fg: '135' });
         } else {
           // Default: main provider/model
           if (contextCap != null && contextCap > 0) {