@pellux/goodvibes-tui 0.23.0 → 0.24.1

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

@@ -122,6 +122,14 @@ export function buildSettingGroups(
     ttsEntries.push(buildTtsSpeedSyntheticEntry(configManager));
   }
 
+  // Inject the synthetic behavior.notifyAfterSeconds entry into the behavior
+  // category. This key is TUI-local (not in the SDK ConfigKey union) and
+  // controls the long-task push notification threshold.
+  const behaviorEntries = groups.get('behavior');
+  if (behaviorEntries && !behaviorEntries.some((e) => e.setting.key === ('behavior.notifyAfterSeconds' as ConfigKey))) {
+    behaviorEntries.push(buildNotifyAfterSecondsSyntheticEntry(configManager));
+  }
+
   return groups;
 }
 
@@ -171,6 +179,51 @@ export function buildTtsSpeedSyntheticEntry(configManager: Pick<ConfigManager, '
   };
 }
 
+// ---------------------------------------------------------------------------
+// behavior.notifyAfterSeconds synthetic setting
+// ---------------------------------------------------------------------------
+
+/** Default threshold in seconds for the synthetic notifyAfterSeconds setting. */
+export const NOTIFY_AFTER_SECONDS_DEFAULT_SETTING = 60;
+
+/**
+ * The synthetic ConfigSetting descriptor for behavior.notifyAfterSeconds.
+ *
+ * This key is TUI-local and is not yet in the SDK ConfigKey union. The
+ * descriptor is injected into the behavior settings group so users can
+ * configure the long-task push notification threshold from /config behavior.
+ *
+ * 0 = off (no notifications). Any positive integer = threshold in seconds.
+ * Default 60s matches the default in long-task-notifier.ts.
+ *
+ * The key is cast to ConfigKey because ConfigSetting requires it. The cast
+ * is safe: configManager.get returns undefined for unknown keys rather than
+ * throwing.
+ */
+export const NOTIFY_AFTER_SECONDS_SYNTHETIC_SETTING: ConfigSetting = {
+  key: 'behavior.notifyAfterSeconds' as ConfigKey,
+  type: 'number',
+  default: NOTIFY_AFTER_SECONDS_DEFAULT_SETTING,
+  description: 'Seconds a turn must run before a push notification fires (0 = off). Delivers to desktop (notify-send/osascript) and configured ntfy/webhook URLs.',
+};
+
+/**
+ * Build the synthetic SettingEntry for behavior.notifyAfterSeconds.
+ *
+ * Reads the raw value from configManager using a cast key. Falls back to
+ * NOTIFY_AFTER_SECONDS_DEFAULT_SETTING when absent or invalid.
+ */
+export function buildNotifyAfterSecondsSyntheticEntry(configManager: Pick<ConfigManager, 'get'>): SettingEntry {
+  const raw = configManager.get('behavior.notifyAfterSeconds' as ConfigKey);
+  const parsed = typeof raw === 'number' ? raw : parseFloat(String(raw ?? ''));
+  const currentValue: number = Number.isFinite(parsed) && parsed >= 0 ? Math.round(parsed) : NOTIFY_AFTER_SECONDS_DEFAULT_SETTING;
+  return {
+    setting: NOTIFY_AFTER_SECONDS_SYNTHETIC_SETTING,
+    currentValue,
+    isDefault: currentValue === NOTIFY_AFTER_SECONDS_DEFAULT_SETTING,
+  };
+}
+
 // ---------------------------------------------------------------------------
 // buildFlagEntries — snapshot of current feature flag states
 // ---------------------------------------------------------------------------

package/src/input/settings-modal.ts

@@ -14,23 +14,16 @@
  */
 
 import { type ConfigKey } from '@pellux/goodvibes-sdk/platform/config';
-import { handleConfirmInput } from '../panels/confirm-state.ts';
 import type { ModelPickerTarget } from './model-picker.ts';
 import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
 import type { SubscriptionManager } from '@pellux/goodvibes-sdk/platform/config';
 import type { ServiceInspectionQuery } from '../runtime/ui-service-queries.ts';
 import { isSecretConfigKey } from '../config/secret-config.ts';
-import {
-  getNumericAdjustmentMeta,
-  modelPickerLaunchForKey,
-  roundToPrecision,
-} from './settings-modal-behavior.ts';
 import {
   setSecretBackedSettingValue,
   type SettingsSecretsManager,
 } from './settings-modal-secrets.ts';
 import type { FeatureFlagManager } from '@/runtime/index.ts';
-import type { FlagState } from '@/runtime/index.ts';
 import type { McpRegistry } from '@pellux/goodvibes-sdk/platform/mcp';
 
 import {
@@ -50,16 +43,21 @@ import {
   buildSubscriptionEntries,
   buildNetworkFilteredItems,
   refreshEntryValues,
-  updateEntryForKey,
   searchSettingEntries,
 } from './settings-modal-data.ts';
 import { getSettingLabel } from '../renderer/settings-modal-helpers.ts';
 import {
   applySettingValue,
-  applyFlagState,
-  persistFlagState,
   type SettingAppliedCallback,
 } from './settings-modal-mutations.ts';
+import {
+  activateSelected as _activateSelected,
+  handleSubscriptionLogoutKey as _handleSubscriptionLogoutKey,
+} from './settings-modal-activation.ts';
+import {
+  adjustSelected as _adjustSelected,
+  toggleSelectedFlag as _toggleSelectedFlag,
+} from './settings-modal-adjustment.ts';
 import {
   resetSelected as _resetSelected,
   initiateResetCategory as _initiateResetCategory,
@@ -436,63 +434,21 @@ export class SettingsModal {
    * Toggle boolean or begin cycling enum values, or enter edit mode for string/number.
    */
   activateSelected(): void {
-    if (this.currentCategory === 'mcp') {
-      const entry = this.getSelectedMcp();
-      if (!entry) return;
-      this.editingMode = true;
-      this.editBuffer = entry.trustMode;
-      this.mcpAllowAllConfirmationTarget = null;
-      return;
-    }
-
-    if (this.currentCategory === 'subscriptions') {
-      const entry = this.getSelectedSubscription();
-      if (!entry) return;
-      if (entry.state === 'active' || entry.state === 'pending') {
-        // First press: arm the confirm gate. Subsequent key handling routes
-        // through handleSubscriptionLogoutKey() before normal dispatch.
-        this.subscriptionLogoutConfirmationTarget = entry.provider;
-      }
-      return;
-    }
-
-    const entry = this.getSelected();
-    if (!entry || !this.configManager) return;
-
-    const { setting } = entry;
-
-    // Delegate provider/model picker settings to the model picker UI
-    if (setting.key === 'tts.provider') {
-      this.pendingSettingsPickerAction = 'tts-provider';
-      return;
-    }
-    if (setting.key === 'tts.voice') {
-      this.pendingSettingsPickerAction = 'tts-voice';
-      return;
-    }
-
-    const pickerLaunch = modelPickerLaunchForKey(setting.key);
-    if (pickerLaunch !== null) {
-      if (pickerLaunch.flow === 'providerModel') {
-        this.pendingProviderModelPickerTarget = pickerLaunch.target;
-      } else {
-        this.pendingModelPickerTarget = pickerLaunch.target;
-      }
-      return;
-    }
-
-    if (setting.type === 'boolean') {
-      const newVal = !entry.currentValue;
-      this._setValue(setting.key as ConfigKey, newVal);
-    } else if (setting.type === 'enum' && setting.enumValues) {
-      const idx = setting.enumValues.indexOf(entry.currentValue as string);
-      const nextIdx = (idx + 1) % setting.enumValues.length;
-      this._setValue(setting.key as ConfigKey, setting.enumValues[nextIdx]);
-    } else if (setting.type === 'string' || setting.type === 'number') {
-      // Enter inline edit mode
-      this.editingMode = true;
-      this.editBuffer = String(entry.currentValue ?? '');
-    }
+    _activateSelected({
+      currentCategory: this.currentCategory,
+      configManager: this.configManager,
+      getSelectedMcp: () => this.getSelectedMcp(),
+      getSelectedSubscription: () => this.getSelectedSubscription(),
+      getSelected: () => this.getSelected(),
+      setValue: (key, value) => this._setValue(key, value),
+      setEditingMode: (v) => { this.editingMode = v; },
+      setEditBuffer: (v) => { this.editBuffer = v; },
+      setMcpAllowAllConfirmationTarget: (v) => { this.mcpAllowAllConfirmationTarget = v; },
+      setSubscriptionLogoutConfirmationTarget: (v) => { this.subscriptionLogoutConfirmationTarget = v; },
+      setPendingSettingsPickerAction: (v) => { this.pendingSettingsPickerAction = v; },
+      setPendingModelPickerTarget: (v) => { this.pendingModelPickerTarget = v; },
+      setPendingProviderModelPickerTarget: (v) => { this.pendingProviderModelPickerTarget = v; },
+    });
   }
 
   /**
@@ -505,77 +461,29 @@ export class SettingsModal {
    *   - INACTIVE: no confirm pending   → returns 'inactive' (caller continues)
    */
   handleSubscriptionLogoutKey(key: string): 'confirmed' | 'cancelled' | 'absorbed' | 'inactive' {
-    const target = this.subscriptionLogoutConfirmationTarget;
-    if (!target) return 'inactive';
-    const confirmState = { subject: target, label: target };
-    const result = handleConfirmInput(confirmState, key);
-    if (result === 'confirmed') {
-      this.subscriptionManager?.logout(target);
-      this.subscriptionEntries = buildSubscriptionEntries(this.subscriptionManager, this.serviceRegistry);
-      this.subscriptionLogoutConfirmationTarget = null;
-    } else if (result === 'cancelled') {
-      this.subscriptionLogoutConfirmationTarget = null;
-    }
-    // 'absorbed': confirm remains pending
-    return result;
+    return _handleSubscriptionLogoutKey({
+      subscriptionLogoutConfirmationTarget: this.subscriptionLogoutConfirmationTarget,
+      subscriptionManager: this.subscriptionManager,
+      serviceRegistry: this.serviceRegistry,
+      setSubscriptionEntries: (entries) => { this.subscriptionEntries = entries; },
+      setSubscriptionLogoutConfirmationTarget: (v) => { this.subscriptionLogoutConfirmationTarget = v; },
+    }, key);
   }
 
   adjustSelected(direction: 'left' | 'right', step = 1): void {
-    if (this.editingMode) return;
-
-    if (this.currentCategory === 'flags') {
-      const flagEntry = this.getSelectedFlag();
-      if (!flagEntry || flagEntry.state === 'killed' || !this.featureFlagManager || !this.configManager) return;
-      const targetState: FlagState = direction === 'right' ? 'enabled' : 'disabled';
-      if (flagEntry.state !== targetState) applyFlagState(flagEntry, targetState, this.featureFlagManager, this.configManager);
-      return;
-    }
-
-    if (this.currentCategory === 'mcp') {
-      const entry = this.getSelectedMcp();
-      if (!entry || !this.mcpRegistry) return;
-      const modes: McpEntry['trustMode'][] = ['constrained', 'ask-on-risk', 'allow-all', 'blocked'];
-      const currentIndex = Math.max(0, modes.indexOf(entry.trustMode));
-      const nextIndex = direction === 'right'
-        ? (currentIndex + 1) % modes.length
-        : (currentIndex - 1 + modes.length) % modes.length;
-      this.mcpRegistry.setServerTrustMode(entry.name, modes[nextIndex]!);
-      this.mcpEntries = buildMcpEntries(this.mcpRegistry);
-      this.mcpAllowAllConfirmationTarget = null;
-      return;
-    }
-
-    const entry = this.getSelected();
-    if (!entry || !this.configManager) return;
-    const { setting } = entry;
-
-    if (setting.type === 'boolean') {
-      this._setValue(setting.key as ConfigKey, direction === 'right');
-      return;
-    }
-
-    if (setting.type === 'enum' && setting.enumValues && setting.enumValues.length > 0) {
-      const currentIndex = Math.max(0, setting.enumValues.indexOf(String(entry.currentValue)));
-      const nextIndex = direction === 'right'
-        ? (currentIndex + 1) % setting.enumValues.length
-        : (currentIndex - 1 + setting.enumValues.length) % setting.enumValues.length;
-      this._setValue(setting.key as ConfigKey, setting.enumValues[nextIndex]!);
-      return;
-    }
-
-    if (setting.type === 'number') {
-      const currentNumber = Number(entry.currentValue ?? 0);
-      if (!Number.isFinite(currentNumber)) return;
-      const adjustment = getNumericAdjustmentMeta(setting);
-      const delta = adjustment.step * step;
-      const rounded = roundToPrecision(currentNumber + (direction === 'right' ? delta : -delta), adjustment.precision);
-      const nextValue = Math.min(
-        adjustment.max ?? rounded,
-        Math.max(adjustment.min ?? rounded, rounded),
-      );
-      if (setting.validate && !setting.validate(nextValue)) return;
-      this._setValue(setting.key as ConfigKey, nextValue);
-    }
+    _adjustSelected({
+      editingMode: this.editingMode,
+      currentCategory: this.currentCategory,
+      configManager: this.configManager,
+      featureFlagManager: this.featureFlagManager,
+      mcpRegistry: this.mcpRegistry,
+      getSelectedFlag: () => this.getSelectedFlag(),
+      getSelectedMcp: () => this.getSelectedMcp(),
+      getSelected: () => this.getSelected(),
+      setValue: (key, value) => this._setValue(key, value),
+      setMcpEntries: (entries) => { this.mcpEntries = entries; },
+      setMcpAllowAllConfirmationTarget: (v) => { this.mcpAllowAllConfirmationTarget = v; },
+    }, direction, step);
   }
 
   /**
@@ -585,16 +493,11 @@ export class SettingsModal {
    * only (require restart). runtimeToggleable flags toggle immediately.
    */
   toggleSelectedFlag(): void {
-    const flagEntry = this.getSelectedFlag();
-    if (!flagEntry || !this.featureFlagManager || !this.configManager) return;
-
-    const { state } = flagEntry;
-
-    // Killed flags are blocked
-    if (state === 'killed') return;
-
-    const newState: FlagState = state === 'enabled' ? 'disabled' : 'enabled';
-    applyFlagState(flagEntry, newState, this.featureFlagManager, this.configManager);
+    _toggleSelectedFlag({
+      featureFlagManager: this.featureFlagManager,
+      configManager: this.configManager,
+      getSelectedFlag: () => this.getSelectedFlag(),
+    });
   }
 
   /**

package/src/main.ts

@@ -40,6 +40,7 @@ import {
   writeRecoveryFile,
 } from '@/runtime/index.ts';
 import { handleBlockingShellInput, type PendingPermissionState } from './shell/blocking-input.ts';
+import { createPersistRecoverySnapshot, createReopenRecoveryPanels, handleErrorAffordanceKey } from './shell/recovery-input-helpers.ts';
 import { wireShellUiOpeners } from './shell/ui-openers.ts';
 import { deriveComposerState } from './core/composer-state.ts';
 import { buildPersistedSessionContext, formatReturnContextForDisplay, getReturnContextMode, maybeAssistReturnContextSummary } from '@/runtime/index.ts';
@@ -699,26 +700,37 @@ async function main() {
     gitStatusProvider,
     lastGitInfoRef,
     buildSessionContinuityHints,
-    render,
+    render, webhookNotifier: ctx.services.webhookNotifier,
   });
   unsubs.push(...turnUnsubs);
 
   // Stable turn context for failover retry — set in submitInput, read by retryTurn.
   let retryCtx: { count: number; text: string; content?: ContentPart[]; opts?: Parameters<typeof orchestrator.handleUserInput>[2] } | null = null;
+  // One-key retry affordance: active immediately after a user-visible TURN_ERROR.
+  // While active, 'r' re-submits on the current provider, 'm' opens the model
+  // picker. Any other character clears the affordance and routes normally.
+  let errorAffordanceActive = false;
+  const retryTurn = (): void => {
+    if (!retryCtx) return;
+    const { count, text, content: rContent, opts: rOpts } = retryCtx;
+    // Roll back to pre-submission count, then re-submit. SDK gap — no retry-in-place (see handoff).
+    conversation.removeMessagesAfter(count);
+    orchestrator.handleUserInput(text, rContent, rOpts).catch((e: unknown) => logger.debug('retryTurn', { error: summarizeError(e) }));
+  };
   const streamResult: WireStreamEventMetricsResult = wireStreamEventMetrics({
     events: uiServices.events, orchestrator, providerRegistry,
     systemMessageRouter, render, metrics: streamMetrics,
-    providerOptimizer: ctx.services.providerOptimizer,
-    retryTurn: () => {
-      if (!retryCtx) return;
-      const { count, text, content: rContent, opts: rOpts } = retryCtx;
-      // Roll back to pre-submission count (strips error system messages), then
-      // re-submit. SDK gap — no retry-in-place; see HANDOFF item (Issue 2).
-      conversation.removeMessagesAfter(count);
-      orchestrator.handleUserInput(text, rContent, rOpts).catch((e: unknown) => logger.debug('retryTurn', { error: summarizeError(e) }));
-    },
+    providerOptimizer: ctx.services.providerOptimizer, costLookup: providerRegistry, retryTurn,
   });
   unsubs.push(...streamResult.unsubs);
+  // Activate one-key retry affordance when a user-visible error surfaces.
+  streamResult.onErrorSurfaced((exhausted) => {
+    if (retryCtx) {
+      errorAffordanceActive = true;
+      systemMessageRouter.low(exhausted ? '[Retry] r retry same provider · m switch model' : '[Retry] r retry · m switch model');
+      render();
+    }
+  });
 
   // --- Terminal setup ---
   stdin.setRawMode(true);
@@ -726,35 +738,17 @@ async function main() {
   stdin.setEncoding('utf8');
   allowTerminalWrite(() => stdout.write((cli.flags.noAltScreen ? '' : ALT_SCREEN_ENTER) + CLEAR_SCREEN + CURSOR_HIDE + MOUSE_ENABLE + KEYBOARD_EXT_ENABLE + PASTE_ENABLE));
 
-  applyInitialTuiCliState({
-    cli,
-    input,
-    commandRegistry,
-    commandContext,
-    shellPaths: ctx.services.shellPaths,
-    render,
-  });
+  applyInitialTuiCliState({ cli, input, commandRegistry, commandContext, shellPaths: ctx.services.shellPaths, render });
 
   stdin.on('data', (data: string) => {
     const blocking = handleBlockingShellInput({
-      data,
-      pendingPermission,
-      recoveryPending,
+      data, pendingPermission, recoveryPending, conversation, systemMessageRouter, render,
       abortTurn: () => orchestrator.abort(),
-      conversation,
-      systemMessageRouter,
-      render,
       loadRecoveryConversation: () => loadRecoveryConversation({ homeDirectory }),
       deleteRecoveryFile: () => deleteRecoveryFile({ homeDirectory }),
-      reopenPanels: (snapshot) => {
-        const panels = snapshot.returnContext?.openPanels;
-        if (!panels || panels.length === 0) return;
-        for (const panelId of panels.slice(0, 4)) {
-          try { panelManager.open(panelId); } catch { /* unknown panel id — skip */ }
-        }
-        panelManager.show();
-        render();
-      },
+      homeDirectory, sessionId: runtime.sessionId,
+      persistSnapshot: createPersistRecoverySnapshot({ sessionManager: ctx.services.sessionManager, runtime, conversation }),
+      reopenPanels: createReopenRecoveryPanels({ panelManager, render }),
     });
     pendingPermission = blocking.pendingPermission;
     recoveryPending = blocking.recoveryPending;
@@ -762,6 +756,12 @@ async function main() {
       return;
     }
 
+    // One-key retry affordance: armed after a user-visible TURN_ERROR; any key other than r/m dismisses it and routes normally.
+    if (errorAffordanceActive) {
+      errorAffordanceActive = false;
+      if (handleErrorAffordanceKey(data, { retryArmed: retryCtx !== null, retry: retryTurn, openModelPicker: () => commandContext.openModelPicker?.(), render })) return;
+    }
+
     input.feed(data);
   });
   process.on('SIGINT', sigintHandler);

package/src/panels/base-panel.ts

@@ -4,6 +4,7 @@ import type { ComponentResourceContract, ComponentHealthState } from '../runtime
 import type { ComponentHealthMonitor } from '../runtime/perf/panel-health-monitor.ts';
 import { UIFactory } from '../renderer/ui-factory.ts';
 import { SPINNER_FRAMES } from '../renderer/progress.ts';
+import { fitDisplay } from '../utils/terminal-width.ts';
 
 export abstract class BasePanel implements Panel {
   public needsRender = true;
@@ -143,7 +144,7 @@ export abstract class BasePanel implements Panel {
     if (this.loadingState !== 'loading') return null;
     const spinner = SPINNER_FRAMES[frame % SPINNER_FRAMES.length] ?? SPINNER_FRAMES[0]!;
     const text = ` ${spinner} ${this._loadingLabel}`;
-    return UIFactory.stringToLine(text.padEnd(width).slice(0, width), width, { fg: '135', bold: true });
+    return UIFactory.stringToLine(fitDisplay(text, width), width, { fg: '135', bold: true });
   }
 
   /**

package/src/panels/provider-health-domains.ts

@@ -73,7 +73,7 @@ export function buildProviderHealthDomainSummaries(
       : settingIssueCount > 0
         ? `${settings.conflictCount} conflicts / ${settings.recentFailureCount} failures${settings.hasStagedManagedBundle ? ' / staged bundle' : ''}`
         : 'settings control plane clean',
-    next: settingIssueCount > 0 ? '/settingssync panel' : '/settingssync show <key>',
+    next: settingIssueCount > 0 ? '/settings-sync panel' : '/settings-sync show <key>',
     details: [
       settings.conflictCount > 0 ? `${settings.conflictCount} unresolved import conflict(s)` : '',
       settings.recentFailureCount > 0 ? `${settings.recentFailureCount} recent sync or managed failure(s)` : '',
@@ -81,8 +81,8 @@ export function buildProviderHealthDomainSummaries(
       settings.managedLockCount > 0 ? `${settings.managedLockCount} managed lock(s) enforced` : '',
     ].filter(Boolean),
     nextSteps: settingIssueCount > 0
-      ? ['/settingssync panel', '/settingssync show <key>', '/managed staged']
-      : ['/settingssync show <key>'],
+      ? ['/settings-sync panel', '/settings-sync show <key>', '/managed staged']
+      : ['/settings-sync show <key>'],
   });
 
   summaries.push({

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

@@ -88,18 +88,22 @@ const LATENCY_BAD_MS  = 5_000;
 
 function statusDot(status: ProviderStatus): { char: string; color: string } {
   switch (status) {
-    case 'online':       return { char: '●', color: C.online };
-    case 'rate-limited': return { char: '◐', color: C.rateLimit };
-    case 'error':        return { char: '✕', color: C.error };
+    case 'healthy':      return { char: '●', color: C.online };
+    case 'degraded':     return { char: '◑', color: C.rateLimit };
+    case 'rate_limited': return { char: '◐', color: C.rateLimit };
+    case 'auth_error':   return { char: '✕', color: C.error };
+    case 'unavailable':  return { char: '✕', color: C.error };
     default:             return { char: '○', color: C.unknown };
   }
 }
 
 function statusLabel(status: ProviderStatus): string {
   switch (status) {
-    case 'online':       return 'online';
-    case 'rate-limited': return 'rate-limited';
-    case 'error':        return 'error';
+    case 'healthy':      return 'online';
+    case 'degraded':     return 'degraded';
+    case 'rate_limited': return 'rate-limited';
+    case 'auth_error':   return 'auth error';
+    case 'unavailable':  return 'unavailable';
     default:             return 'unknown';
   }
 }
@@ -562,9 +566,9 @@ export class ProviderHealthPanel extends BasePanel {
     let expiringAuth = 0;
     for (const name of providers) {
       const status = this.providerHealthTracker.get(name)?.status ?? 'unknown';
-      if (status === 'online') online++;
-      else if (status === 'rate-limited') rateLimited++;
-      else if (status === 'error') errored++;
+      if (status === 'healthy') online++;
+      else if (status === 'rate_limited') rateLimited++;
+      else if (status === 'degraded' || status === 'auth_error' || status === 'unavailable') errored++;
       const account = this._accountRecords.get(name);
       if (account) {
         accountIssues += account.issues.length;

package/src/panels/provider-health-tracker.ts

@@ -1,4 +1,7 @@
-export type ProviderStatus = 'online' | 'rate-limited' | 'error' | 'unknown';
+// ProviderStatus is the shared SDK type — imported from the runtime barrel
+// to eliminate the duplicate local definition that diverged from the SDK shape.
+import type { ProviderStatus } from '@/runtime/index.ts';
+export type { ProviderStatus };
 
 export interface ProviderHealth {
   name: string;
@@ -81,7 +84,7 @@ export class ProviderHealthTracker {
 
   private recordSuccess(name: string, latencyMs?: number): void {
     const record = this.ensureRecord(name);
-    record.status = 'online';
+    record.status = 'healthy';
     record.lastSuccessAt = Date.now();
     record.lastErrorMessage = undefined;
     if (latencyMs !== undefined) {
@@ -97,11 +100,11 @@ export class ProviderHealthTracker {
     record.lastErrorAt = Date.now();
     record.lastErrorMessage = message.slice(0, 120);
     if (isRateLimit) {
-      record.status = 'rate-limited';
+      record.status = 'rate_limited';
       record.rateLimitExpiresAt = Date.now() + ProviderHealthTracker.DEFAULT_COOLDOWN_MS;
       return;
     }
-    record.status = 'error';
+    record.status = 'degraded';
   }
 
   private isRateLimitMessage(message: string): boolean {

package/src/panels/settings-sync-panel.ts

@@ -56,7 +56,7 @@ export class SettingsSyncPanel extends ScrollableListPanel<ResolvedEntry> {
     const postureLines: Line[] = [
       buildPanelLine(width, [[' resolved keys ', C.label], [String(snapshot.resolvedEntries.length), C.value], ['  conflicts ', C.label], ...buildStatusPill(snapshot.conflicts.length > 0 ? 'bad' : 'good', String(snapshot.conflicts.length)), ['  failures ', C.label], ...buildStatusPill(snapshot.recentFailures.length > 0 ? 'warn' : 'good', String(snapshot.recentFailures.length))]),
       buildPanelLine(width, [[' managed locks ', C.label], [String(snapshot.managedLockCount), snapshot.managedLockCount > 0 ? C.warn : C.dim], ['  staged bundle ', C.label], [snapshot.stagedManagedBundle ? snapshot.stagedManagedBundle.profileName : 'none', snapshot.stagedManagedBundle ? C.info : C.dim]]),
-      buildGuidanceLine(width, '/settingssync conflicts', 'review conflicting synced values before they silently shape effective configuration', C),
+      buildGuidanceLine(width, '/settings-sync conflicts', 'review conflicting synced values before they silently shape effective configuration', C),
       buildGuidanceLine(width, '/managed review', 'inspect staged managed changes, risk posture, and rollback records', C),
     ];
 
@@ -86,7 +86,7 @@ export class SettingsSyncPanel extends ScrollableListPanel<ResolvedEntry> {
         : [buildPanelLine(width, [[' No recent sync or managed-setting failures.', C.dim]])]),
       // Conflicts
       ...(snapshot.conflicts.length > 0
-        ? snapshot.conflicts.map((conflict) => buildPanelLine(width, [[` ${conflict.key}`.padEnd(30), C.value], [` ${conflict.source}`.padEnd(10), C.warn], [` resolve: /settingssync resolve ${conflict.key} local|synced`.slice(0, Math.max(0, width - 42)), C.dim]]))
+        ? snapshot.conflicts.map((conflict) => buildPanelLine(width, [[` ${conflict.key}`.padEnd(30), C.value], [` ${conflict.source}`.padEnd(10), C.warn], [` resolve: /settings-sync resolve ${conflict.key} local|synced`.slice(0, Math.max(0, width - 42)), C.dim]]))
         : [buildPanelLine(width, [[' No settings conflicts detected.', C.dim]])]),
       // Rollback History
       ...(snapshot.rollbackHistory.length > 0
@@ -108,7 +108,7 @@ export class SettingsSyncPanel extends ScrollableListPanel<ResolvedEntry> {
             buildPanelLine(width, [[' managed ', C.label], [String(selectedEntry.managedValue ?? '(unset)').slice(0, Math.max(0, width - 11)), C.warn]]),
           ], C)
         : []),
-      buildPanelLine(width, [[' ↑/↓ browse  /settingssync show <key>  /settingssync resolve <key> <local|synced>  /managed apply-staged [key...] ', C.dim]]),
+      buildPanelLine(width, [[' ↑/↓ browse  /settings-sync show <key>  /settings-sync resolve <key> <local|synced>  /managed apply-staged [key...] ', C.dim]]),
     ];
 
     return this.renderList(width, height, {

package/src/panels/work-plan-panel.ts

@@ -109,8 +109,8 @@ export class WorkPlanPanel extends ScrollableListPanel<WorkPlanItem> {
 
   protected getEmptyStateActions(): Array<{ command: string; summary: string }> {
     return [
-      { command: '/workplan add <title>', summary: 'add a persistent item' },
-      { command: '/workplan list', summary: 'print the current plan' },
+      { command: '/work-plan add <title>', summary: 'add a persistent item' },
+      { command: '/work-plan list', summary: 'print the current plan' },
     ];
   }
 

package/src/renderer/diff-view.ts

@@ -1,6 +1,6 @@
 import { type Line, type Cell, createStyledCell } from '../types/grid.ts';
 import { UIFactory } from './ui-factory.ts';
-import { getDisplayWidth } from '../utils/terminal-width.ts';
+import { getDisplayWidth, padDisplayEnd } from '../utils/terminal-width.ts';
 
 /**
  * renderDiffView - Render a unified diff string as styled Line[].
@@ -13,7 +13,7 @@ export function renderDiffView(diffText: string, width: number, filename?: strin
   // Filename header
   if (filename) {
     const header = ` ≡ ${filename} `;
-    lines.push(UIFactory.stringToLine(header.padEnd(width), width, { fg: '#1a1a1a', bg: '#569cd6', bold: true }));
+    lines.push(UIFactory.stringToLine(padDisplayEnd(header, width), width, { fg: '#1a1a1a', bg: '#569cd6', bold: true }));
   }
 
   const diffLines = diffText.split('\n');

package/src/renderer/help-overlay.ts

@@ -202,6 +202,7 @@ export function renderShortcutsOverlay(
     row('PageUp / PageDn', 'Scroll by full page'),
     row('Home / End', 'Jump to start / end of line'),
     row(kb('search'), 'Search conversation'),
+    row('n / N (search)', 'Next / previous match'),
     row('Mouse wheel', 'Scroll conversation or hovered panel'),
     '',
     '  Editing',

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

@@ -234,17 +234,29 @@ export function renderModelPickerOverlay(
       putRowText(providerLine, layout.margin + 2, contentW, fitDisplay(`Provider: ${selected.provider}`, contentW), '244');
       lines.push(providerLine);
 
-      const caps = selected.capabilities ?? { reasoning: false, multimodal: false, toolCalling: false, codeEditing: false };
-      const ctxStr = `Context: ${fmtContext(selected.contextWindow)}`;
-      const capParts: string[] = [ctxStr];
-      if (caps.reasoning)  capParts.push('Reasoning: \u2713');
-      if (caps.multimodal) capParts.push('Vision: \u2713');
-      if (caps.toolCalling) capParts.push('Tools: \u2713');
-      if (caps.codeEditing) capParts.push('Code: \u2713');
-      const capText = capParts.join('  ');
-      const capLine = createOverlayContentLine(width, layout, borderFg, DEFAULT_OVERLAY_PALETTE.bodyBg);
-      putRowText(capLine, layout.margin + 2, contentW, fitDisplay(truncateDisplay(capText, contentW), contentW), '244');
-      lines.push(capLine);
+      // Synthetic models show fallback ladder rungs instead of capabilities.
+      const syntheticChain = selected.provider === 'synthetic' ? picker.getSyntheticChain(selected.id) : null;
+      if (syntheticChain !== null && syntheticChain.length > 0) {
+        const rung0 = syntheticChain[0];
+        const rest = syntheticChain.length - 1;
+        const rung0Base = `  0. ${rung0.provider}/${rung0.model}`;
+        const rung0Label = rest > 0 ? `${rung0Base}  (+${rest} more)` : rung0Base;
+        const chainLine0 = createOverlayContentLine(width, layout, borderFg, DEFAULT_OVERLAY_PALETTE.bodyBg);
+        putRowText(chainLine0, layout.margin + 2, contentW, fitDisplay(truncateDisplay(rung0Label, contentW), contentW), '244');
+        lines.push(chainLine0);
+      } else {
+        const caps = selected.capabilities ?? { reasoning: false, multimodal: false, toolCalling: false, codeEditing: false };
+        const ctxStr = `Context: ${fmtContext(selected.contextWindow)}`;
+        const capParts: string[] = [ctxStr];
+        if (caps.reasoning)  capParts.push('Reasoning: \u2713');
+        if (caps.multimodal) capParts.push('Vision: \u2713');
+        if (caps.toolCalling) capParts.push('Tools: \u2713');
+        if (caps.codeEditing) capParts.push('Code: \u2713');
+        const capText = capParts.join('  ');
+        const capLine = createOverlayContentLine(width, layout, borderFg, DEFAULT_OVERLAY_PALETTE.bodyBg);
+        putRowText(capLine, layout.margin + 2, contentW, fitDisplay(truncateDisplay(capText, contentW), contentW), '244');
+        lines.push(capLine);
+      }
     } else {
       lines.push(createOverlayContentLine(width, layout, borderFg, DEFAULT_OVERLAY_PALETTE.bodyBg));
       lines.push(createOverlayContentLine(width, layout, borderFg, DEFAULT_OVERLAY_PALETTE.bodyBg));