@pellux/goodvibes-tui 0.18.20 → 0.19.0

package/src/panels/session-browser-panel.ts

@@ -26,6 +26,7 @@ import {
   isPanelSearchCommit,
   isPanelSearchPrintable,
 } from './search-focus.ts';
+import { type ConfirmState, handleConfirmInput } from './confirm-state.ts';
 
 const C = {
   headerBg:   '#1a1a2e',
@@ -79,7 +80,7 @@ function formatReturnContextLines(returnContext: SessionInfo['returnContext']):
 // ---------------------------------------------------------------------------
 // Confirmation state for deletion
 // ---------------------------------------------------------------------------
-type ConfirmState = { sessionName: string } | null;
+// ConfirmState<string> — subject holds the session name to delete
 
 export class SessionBrowserPanel extends BasePanel {
   private sessions: SessionInfo[] = [];
@@ -88,10 +89,10 @@ export class SessionBrowserPanel extends BasePanel {
   private searching = false; // true when user is actively typing a search
   private cursorIndex = 0;
   private scrollOffset = 0;
-  private confirm: ConfirmState = null;
+  private confirm: ConfirmState<string> | null = null;
   private deleteError = '';
   private loadError = '';
-  private refreshTimer: ReturnType<typeof setInterval> | null = null;
+  private refreshTimerId: ReturnType<typeof setInterval> | null = null;
 
   constructor(
     private readonly sessionManager: SessionBrowserQuery,
@@ -103,29 +104,29 @@ export class SessionBrowserPanel extends BasePanel {
   override onActivate(): void {
     super.onActivate();
     this._load();
-    this.refreshTimer = setInterval(() => { this._load(); }, 5000);
+    this.refreshTimerId = this.registerTimer(setInterval(() => { this._load(); }, 5000));
   }
 
   override onDeactivate(): void {
-    if (this.refreshTimer) { clearInterval(this.refreshTimer); this.refreshTimer = null; }
+    if (this.refreshTimerId !== null) { this.clearTimer(this.refreshTimerId); this.refreshTimerId = null; }
     this.searching = false;
     this.confirm = null;
     super.onDeactivate();
   }
 
   handleInput(key: string): boolean {
-    // Confirmation dialog
-    if (this.confirm) {
-      if (key === 'y') {
-        this._deleteConfirmed();
-        return true;
-      } else if (key === 'n' || key === 'escape') {
-        this.confirm = null;
-        this.markDirty();
-        return true;
-      }
+    // Confirmation dialog — use shared handleConfirmInput for y/n/Esc UX
+    const confirmResult = handleConfirmInput(this.confirm, key);
+    if (confirmResult === 'confirmed') {
+      this._deleteConfirmed();
+      return true;
+    }
+    if (confirmResult === 'cancelled') {
+      this.confirm = null;
+      this.markDirty();
       return true;
     }
+    if (confirmResult === 'absorbed') return true;
 
     // Search mode
     if (this.searching) {
@@ -200,7 +201,7 @@ export class SessionBrowserPanel extends BasePanel {
           {
             title: 'Confirmation',
             lines: [
-              buildPanelLine(width, [[` Delete "${this.confirm.sessionName}"?`, DEFAULT_PANEL_PALETTE.warn]]),
+              buildPanelLine(width, [[` Delete "${this.confirm.subject}"?`, DEFAULT_PANEL_PALETTE.warn]]),
               buildPanelLine(width, [[' y', DEFAULT_PANEL_PALETTE.info], ['  confirm delete', DEFAULT_PANEL_PALETTE.dim], ['   n / Esc', DEFAULT_PANEL_PALETTE.info], ['  cancel', DEFAULT_PANEL_PALETTE.dim]]),
             ],
           },
@@ -378,13 +379,13 @@ export class SessionBrowserPanel extends BasePanel {
   private _promptDelete(): void {
     const sess = this.filtered[this.cursorIndex];
     if (!sess) return;
-    this.confirm = { sessionName: sess.name };
+    this.confirm = { subject: sess.name, label: sess.name };
     this.markDirty();
   }
 
   private _deleteConfirmed(): void {
     if (!this.confirm) return;
-    const name = this.confirm.sessionName;
+    const name = this.confirm.subject;
     this.confirm = null;
     try {
       this.sessionManager.delete(name);

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

@@ -1,16 +1,14 @@
 import type { Line } from '../types/grid.ts';
-import { createEmptyLine } from '../types/grid.ts';
-import { BasePanel } from './base-panel.ts';
+import { ScrollableListPanel } from './scrollable-list-panel.ts';
 import {
   buildDetailBlock,
   buildGuidanceLine,
   buildPanelListRow,
   buildPanelLine,
-  buildPanelWorkspace,
+  buildStatusPill,
   buildSummaryBlock,
   DEFAULT_PANEL_PALETTE,
-  resolvePrimaryScrollableSection,
-  type PanelWorkspaceSection,
+  type PanelPalette,
 } from './polish.ts';
 import { getSettingsControlPlaneSnapshot } from '@pellux/goodvibes-sdk/platform/runtime/settings/control-plane';
 import type { ConfigManager } from '../config/index.ts';
@@ -24,141 +22,99 @@ const C = {
   error: '#ef4444',
 } as const;
 
-export class SettingsSyncPanel extends BasePanel {
-  private selectedIndex = 0;
-  private scrollOffset = 0;
+type ResolvedEntry = ReturnType<typeof getSettingsControlPlaneSnapshot>['resolvedEntries'][number];
 
+export class SettingsSyncPanel extends ScrollableListPanel<ResolvedEntry> {
   public constructor(private readonly configManager: ConfigManager) {
     super('settings-sync', 'Settings Sync', 'S', 'monitoring');
+    this.showSelectionGutter = true; // I5: non-color selection affordance
   }
 
-  public handleInput(key: string): boolean {
-    const total = getSettingsControlPlaneSnapshot(this.configManager).resolvedEntries.length;
-    if (total <= 0) return false;
-    if (key === 'up' || key === 'k') {
-      this.selectedIndex = Math.max(0, this.selectedIndex - 1);
-      this.markDirty();
-      return true;
-    }
-    if (key === 'down' || key === 'j') {
-      this.selectedIndex = Math.min(total - 1, this.selectedIndex + 1);
-      this.markDirty();
-      return true;
-    }
-    return false;
+  protected override getPalette(): PanelPalette {
+    return C;
+  }
+
+  protected getItems(): readonly ResolvedEntry[] {
+    return getSettingsControlPlaneSnapshot(this.configManager).resolvedEntries;
+  }
+
+  protected renderItem(entry: ResolvedEntry, _index: number, selected: boolean, width: number): Line {
+    return buildPanelListRow(width, [
+      { text: entry.key.padEnd(32), fg: C.value },
+      { text: ` ${entry.effectiveSource}`.padEnd(11), fg: entry.effectiveSource === 'managed' ? C.warn : entry.effectiveSource === 'synced' ? C.ok : entry.effectiveSource === 'local' ? C.info : C.dim },
+      { text: `${String(entry.effectiveValue)}`.slice(0, Math.max(0, width - 47)), fg: entry.locked ? C.warn : C.dim },
+    ], C, { selected });
+  }
+
+  protected override getEmptyStateMessage(): string {
+    return ' No resolved settings entries.';
   }
 
   public render(width: number, height: number): Line[] {
-    this.needsRender = false;
     const snapshot = getSettingsControlPlaneSnapshot(this.configManager);
-    const safeSelectedIndex = Math.max(0, Math.min(this.selectedIndex, Math.max(0, snapshot.resolvedEntries.length - 1)));
-    this.selectedIndex = safeSelectedIndex;
+
     const postureLines: Line[] = [
-      buildPanelLine(width, [[' resolved keys ', C.label], [String(snapshot.resolvedEntries.length), C.value], ['  conflicts ', C.label], [String(snapshot.conflicts.length), snapshot.conflicts.length > 0 ? C.error : C.good], ['  failures ', C.label], [String(snapshot.recentFailures.length), snapshot.recentFailures.length > 0 ? C.warn : C.good]]),
+      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, '/managed review', 'inspect staged managed changes, risk posture, and rollback records', C),
     ];
-    const prefixSections: PanelWorkspaceSection[] = [
-      {
-        lines: buildSummaryBlock(width, 'Settings posture', postureLines, C),
-      },
-      {
-        title: 'Layers',
-        lines: [
-          buildPanelLine(width, [[' local typed config ', C.label], [String(snapshot.liveKeyCount), C.value], ['  saved profiles ', C.label], [String(snapshot.profileCount), C.info], ['  managed locks ', C.label], [String(snapshot.managedLockCount), snapshot.managedLockCount > 0 ? C.warn : C.dim]]),
-          buildPanelLine(width, [[' effective local ', C.label], [String(snapshot.resolvedCounts.local), C.info], ['  synced ', C.label], [String(snapshot.resolvedCounts.synced), snapshot.resolvedCounts.synced > 0 ? C.ok : C.dim], ['  managed ', C.label], [String(snapshot.resolvedCounts.managed), snapshot.resolvedCounts.managed > 0 ? C.warn : C.dim]]),
-          buildPanelLine(width, [[' last sync ', C.label], [snapshot.lastSync ? `${snapshot.lastSync.surface}/${snapshot.lastSync.direction}` : 'none', snapshot.lastSync ? C.ok : C.dim], ['  when ', C.label], [snapshot.lastSync ? new Date(snapshot.lastSync.timestamp).toLocaleString() : 'n/a', C.dim]]),
-        ],
-      },
-      {
-        title: 'Staged Bundle',
-        lines: snapshot.stagedManagedBundle
-          ? [
-              buildPanelLine(width, [[' profile ', C.label], [snapshot.stagedManagedBundle.profileName, C.value], ['  risk ', C.label], [snapshot.stagedManagedBundle.risk, snapshot.stagedManagedBundle.risk === 'high' ? C.error : snapshot.stagedManagedBundle.risk === 'medium' ? C.warn : C.ok], ['  changes ', C.label], [String(snapshot.stagedManagedBundle.changeCount), C.info]]),
-              buildPanelLine(width, [[' path ', C.label], [snapshot.stagedManagedBundle.path.slice(0, Math.max(0, width - 9)), C.dim]]),
-            ]
-          : [buildPanelLine(width, [[' No staged managed settings bundle.', C.dim]])],
-      },
-      {
-        title: 'Recent Events',
-        lines: snapshot.recentEvents.length > 0
-          ? snapshot.recentEvents.map((event) => buildPanelLine(width, [[` ${event.surface}/${event.direction}`.padEnd(18), C.info], [` ${event.detail}`.slice(0, Math.max(0, width - 20)), C.dim]]))
-          : [buildPanelLine(width, [[' No sync or managed-setting events recorded yet.', C.dim]])],
-      },
-      {
-        title: 'Managed Locks',
-        lines: snapshot.managedLocks.length > 0
-          ? snapshot.managedLocks.slice(0, 10).map((lock) => buildPanelLine(width, [[` ${lock.key}`.padEnd(30), C.value], [` source=${lock.source}`.padEnd(24), C.info], [` ${lock.reason}`.slice(0, Math.max(0, width - 56)), C.dim]]))
-          : [buildPanelLine(width, [[' No managed locks are currently active.', C.dim]])],
-      },
-      {
-        title: 'Failures',
-        lines: snapshot.recentFailures.length > 0
-          ? snapshot.recentFailures.map((failure) => buildPanelLine(width, [[` ${failure.surface}`.padEnd(10), C.error], [` ${failure.message}`.slice(0, Math.max(0, width - 12)), C.dim]]))
-          : [buildPanelLine(width, [[' No recent sync or managed-setting failures.', C.dim]])],
-      },
-      {
-        title: 'Conflicts',
-          lines: 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]]))
-          : [buildPanelLine(width, [[' No settings conflicts detected.', C.dim]])],
-      },
-      {
-        title: 'Rollback History',
-        lines: snapshot.rollbackHistory.length > 0
-          ? snapshot.rollbackHistory.map((entry) => buildPanelLine(width, [[` ${entry.token}`.padEnd(18), C.info], [` ${entry.profileName}`.padEnd(18), C.value], [` restored=${String(entry.restoredKeys.length).padEnd(4)}`, C.warn], [` ${new Date(entry.appliedAt).toLocaleString()}`.slice(0, Math.max(0, width - 46)), C.dim]]))
-          : [buildPanelLine(width, [[' No managed rollback records yet.', C.dim]])],
-      },
+
+    const headerLines: Line[] = [
+      ...buildSummaryBlock(width, 'Settings posture', postureLines, C),
+      buildPanelLine(width, [[' local typed config ', C.label], [String(snapshot.liveKeyCount), C.value], ['  saved profiles ', C.label], [String(snapshot.profileCount), C.info], ['  managed locks ', C.label], [String(snapshot.managedLockCount), snapshot.managedLockCount > 0 ? C.warn : C.dim]]),
+      buildPanelLine(width, [[' effective local ', C.label], [String(snapshot.resolvedCounts.local), C.info], ['  synced ', C.label], [String(snapshot.resolvedCounts.synced), snapshot.resolvedCounts.synced > 0 ? C.ok : C.dim], ['  managed ', C.label], [String(snapshot.resolvedCounts.managed), snapshot.resolvedCounts.managed > 0 ? C.warn : C.dim]]),
+      buildPanelLine(width, [[' last sync ', C.label], [snapshot.lastSync ? `${snapshot.lastSync.surface}/${snapshot.lastSync.direction}` : 'none', snapshot.lastSync ? C.ok : C.dim], ['  when ', C.label], [snapshot.lastSync ? new Date(snapshot.lastSync.timestamp).toLocaleString() : 'n/a', C.dim]]),
+      // Staged Bundle
+      ...(snapshot.stagedManagedBundle
+        ? [
+            buildPanelLine(width, [[' profile ', C.label], [snapshot.stagedManagedBundle.profileName, C.value], ['  risk ', C.label], [snapshot.stagedManagedBundle.risk, snapshot.stagedManagedBundle.risk === 'high' ? C.error : snapshot.stagedManagedBundle.risk === 'medium' ? C.warn : C.ok], ['  changes ', C.label], [String(snapshot.stagedManagedBundle.changeCount), C.info]]),
+            buildPanelLine(width, [[' path ', C.label], [snapshot.stagedManagedBundle.path.slice(0, Math.max(0, width - 9)), C.dim]]),
+          ]
+        : [buildPanelLine(width, [[' No staged managed settings bundle.', C.dim]])]),
+      // Recent Events
+      ...(snapshot.recentEvents.length > 0
+        ? snapshot.recentEvents.map((event) => buildPanelLine(width, [[` ${event.surface}/${event.direction}`.padEnd(18), C.info], [` ${event.detail}`.slice(0, Math.max(0, width - 20)), C.dim]]))
+        : [buildPanelLine(width, [[' No sync or managed-setting events recorded yet.', C.dim]])]),
+      // Managed Locks
+      ...(snapshot.managedLocks.length > 0
+        ? snapshot.managedLocks.slice(0, 10).map((lock) => buildPanelLine(width, [[` ${lock.key}`.padEnd(30), C.value], [` source=${lock.source}`.padEnd(24), C.info], [` ${lock.reason}`.slice(0, Math.max(0, width - 56)), C.dim]]))
+        : [buildPanelLine(width, [[' No managed locks are currently active.', C.dim]])]),
+      // Failures
+      ...(snapshot.recentFailures.length > 0
+        ? snapshot.recentFailures.map((failure) => buildPanelLine(width, [[` ${failure.surface}`.padEnd(10), C.error], [` ${failure.message}`.slice(0, Math.max(0, width - 12)), C.dim]]))
+        : [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]]))
+        : [buildPanelLine(width, [[' No settings conflicts detected.', C.dim]])]),
+      // Rollback History
+      ...(snapshot.rollbackHistory.length > 0
+        ? snapshot.rollbackHistory.map((entry) => buildPanelLine(width, [[` ${entry.token}`.padEnd(18), C.info], [` ${entry.profileName}`.padEnd(18), C.value], [` restored=${String(entry.restoredKeys.length).padEnd(4)}`, C.warn], [` ${new Date(entry.appliedAt).toLocaleString()}`.slice(0, Math.max(0, width - 46)), C.dim]]))
+        : [buildPanelLine(width, [[' No managed rollback records yet.', C.dim]])]),
     ];
-    const selected = snapshot.resolvedEntries[this.selectedIndex];
-    const selectedSections = !selected ? [] as PanelWorkspaceSection[] : [{
-      lines: buildDetailBlock(width, 'Selected setting', [
-        buildPanelLine(width, [[' key ', C.label], [selected.key, C.value], ['  category ', C.label], [selected.category, C.info]]),
-        buildPanelLine(width, [[' effective ', C.label], [selected.effectiveSource, selected.effectiveSource === 'managed' ? C.warn : selected.effectiveSource === 'synced' ? C.ok : selected.effectiveSource === 'local' ? C.info : C.dim], ['  locked ', C.label], [selected.locked ? 'yes' : 'no', selected.locked ? C.warn : C.dim], ['  conflict ', C.label], [selected.conflict ? 'yes' : 'no', selected.conflict ? C.error : C.good]]),
-        buildPanelLine(width, [[' source ', C.label], [(selected.sourceLabel ?? 'local/default').slice(0, Math.max(0, width - 10)), C.dim]]),
-        buildPanelLine(width, [[' overrides ', C.label], [(selected.overriddenSources.length > 0 ? selected.overriddenSources.join(', ') : 'none').slice(0, Math.max(0, width - 13)), C.dim]]),
-        buildPanelLine(width, [[' local ', C.label], [String(selected.localValue).slice(0, Math.max(0, width - 9)), C.dim]]),
-        buildPanelLine(width, [[' synced ', C.label], [String(selected.syncedValue ?? '(unset)').slice(0, Math.max(0, width - 10)), C.ok]]),
-        buildPanelLine(width, [[' managed ', C.label], [String(selected.managedValue ?? '(unset)').slice(0, Math.max(0, width - 11)), C.warn]]),
-      ], C),
-    }];
-    const resolvedEntriesSection = resolvePrimaryScrollableSection(width, height, {
-      intro: 'Local typed config, synced and managed layers, staged bundle review, conflicts, and control-plane failures.',
-      footerLines: [buildPanelLine(width, [[' ↑/↓ browse  /settingssync show <key>  /settingssync resolve <key> <local|synced>  /managed apply-staged [key...] ', C.dim]])],
-      palette: C,
-      beforeSections: prefixSections,
-      section: {
-        title: 'Resolved Entries',
-        scrollableLines: snapshot.resolvedEntries.map((entry, absolute) => {
-          return buildPanelListRow(width, [
-            { text: entry.key.padEnd(32), fg: C.value },
-            { text: ` ${entry.effectiveSource}`.padEnd(11), fg: entry.effectiveSource === 'managed' ? C.warn : entry.effectiveSource === 'synced' ? C.ok : entry.effectiveSource === 'local' ? C.info : C.dim },
-            { text: `${String(entry.effectiveValue)}`.slice(0, Math.max(0, width - 47)), fg: entry.locked ? C.warn : C.dim },
-          ], C, { selected: absolute === this.selectedIndex });
-        }),
-        selectedIndex: this.selectedIndex,
-        scrollOffset: this.scrollOffset,
-        guardRows: 1,
-        minRows: 4,
-        appendWindowSummary: { dimColor: C.dim },
-      },
-      afterSections: selectedSections,
-    });
-    this.scrollOffset = resolvedEntriesSection.scrollOffset;
-    const sections: PanelWorkspaceSection[] = [
-      ...prefixSections,
-      resolvedEntriesSection.section,
-      ...selectedSections,
+
+    this.clampSelection();
+    const selectedEntry = snapshot.resolvedEntries[this.selectedIndex];
+    const footerLines: Line[] = [
+      ...(selectedEntry
+        ? buildDetailBlock(width, 'Selected setting', [
+            buildPanelLine(width, [[' key ', C.label], [selectedEntry.key, C.value], ['  category ', C.label], [selectedEntry.category, C.info]]),
+            buildPanelLine(width, [[' effective ', C.label], [selectedEntry.effectiveSource, selectedEntry.effectiveSource === 'managed' ? C.warn : selectedEntry.effectiveSource === 'synced' ? C.ok : selectedEntry.effectiveSource === 'local' ? C.info : C.dim], ['  locked ', C.label], [selectedEntry.locked ? 'yes' : 'no', selectedEntry.locked ? C.warn : C.dim], ['  conflict ', C.label], [selectedEntry.conflict ? 'yes' : 'no', selectedEntry.conflict ? C.error : C.good]]),
+            buildPanelLine(width, [[' source ', C.label], [(selectedEntry.sourceLabel ?? 'local/default').slice(0, Math.max(0, width - 10)), C.dim]]),
+            buildPanelLine(width, [[' overrides ', C.label], [(selectedEntry.overriddenSources.length > 0 ? selectedEntry.overriddenSources.join(', ') : 'none').slice(0, Math.max(0, width - 13)), C.dim]]),
+            buildPanelLine(width, [[' local ', C.label], [String(selectedEntry.localValue).slice(0, Math.max(0, width - 9)), C.dim]]),
+            buildPanelLine(width, [[' synced ', C.label], [String(selectedEntry.syncedValue ?? '(unset)').slice(0, Math.max(0, width - 10)), C.ok]]),
+            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]]),
     ];
-    const lines = buildPanelWorkspace(width, height, {
+
+    return this.renderList(width, height, {
       title: 'Settings Sync',
-      intro: 'Local typed config, synced and managed layers, staged bundle review, conflicts, and control-plane failures.',
-      sections,
-      footerLines: [buildPanelLine(width, [[' ↑/↓ browse  /settingssync show <key>  /settingssync resolve <key> <local|synced>  /managed apply-staged [key...] ', C.dim]])],
-      palette: C,
+      header: headerLines,
+      footer: footerLines,
     });
-    while (lines.length < height) lines.push(createEmptyLine(width));
-    return lines.slice(0, height);
   }
 }