@hoox-sh/hoox-tui 0.3.2 → 0.4.0

package/src/components/views/dashboard.tsx

@@ -37,6 +37,7 @@ import { PyneHealthSection } from "./dashboard/pyne-health-section";
 import { AlertsPanel } from "./dashboard/alerts-panel";
 import { useUIStore } from "@hoox-sh/hoox-shared";
 import { useViewKeyboard } from "../../hooks/shell-overlay";
+import { usePolling } from "../../hooks/use-polling";
 
 // ─── Props ────────────────────────────────────────────────────────────────────
 
@@ -71,42 +72,38 @@ function formatStatNumber(value: number, isPnl = false): string {
 
 /**
  * KillSwitchStatusBadge — Compact trade kill-switch indicator for the dashboard
- * header. Auto-refreshes on mount and shows the engaged/released state with a
- * color-coded status dot. Errors degrade gracefully (badge just shows UNKNOWN).
+ * header. Auto-refreshes on the Settings interval and shows the engaged/released
+ * state with a color-coded status dot. Errors degrade to UNKNOWN.
  */
-/** How often the dashboard kill-switch badge re-probes (ms). */
-const KILL_SWITCH_POLL_MS = 15_000;
-
 function KillSwitchStatusBadge() {
   const [state, setState] = useState<"engaged" | "released" | "unknown">(
     "unknown"
   );
-  useEffect(() => {
-    let cancelled = false;
-    const refresh = async () => {
-      try {
-        const result = await cliBridge.monitorKillSwitch("show");
-        if (cancelled) return;
-        if (result.success && result.data) {
-          setState(result.data.engaged ? "engaged" : "released");
-        } else {
-          setState("unknown");
-        }
-      } catch {
-        if (!cancelled) setState("unknown");
+  const genRef = useRef(0);
+
+  const refresh = useCallback(async () => {
+    const gen = ++genRef.current;
+    try {
+      const result = await cliBridge.monitorKillSwitch("show");
+      if (gen !== genRef.current) return;
+      if (result.success && result.data) {
+        setState(result.data.engaged ? "engaged" : "released");
+      } else {
+        setState("unknown");
       }
-    };
-    void refresh();
-    // Re-probe periodically so engage/release in Service Manager is visible here
-    const timer = setInterval(() => {
-      void refresh();
-    }, KILL_SWITCH_POLL_MS);
-    return () => {
-      cancelled = true;
-      clearInterval(timer);
-    };
+    } catch {
+      if (gen === genRef.current) setState("unknown");
+    }
   }, []);
 
+  useEffect(
+    () => () => {
+      genRef.current += 1;
+    },
+    []
+  );
+  usePolling({ callback: refresh, immediate: true });
+
   const label =
     state === "engaged"
       ? "KILL SWITCH ENGAGED"

package/src/components/views/kv-viewer.test.tsx

@@ -23,9 +23,10 @@ import {
   filterKvKeys,
   sanitizeKvValue,
   MAX_VISIBLE_KEYS,
-  REFRESH_INTERVAL_MS,
 } from "./kv-viewer";
+import { formatPollIntervalLabel } from "../../hooks/use-polling";
 import { Colors, type ViewId } from "@hoox-sh/hoox-shared";
+import { ALL_VIEWS } from "../../types";
 import { useUIStore } from "@hoox-sh/hoox-shared/stores/ui-store";
 import {
   cliBridgeDouble,
@@ -124,8 +125,8 @@ describe("KvViewer", () => {
 
   // ── Pattern contract (mirrors queue-depth subtask 02) ──────────────────
 
-  it("auto-refreshes every 5 seconds while active", () => {
-    expect(REFRESH_INTERVAL_MS).toBe(5_000);
+  it("labels configured poll intervals", () => {
+    expect(formatPollIntervalLabel(5_000)).toBe("5s auto");
   });
 
   it("filters keys case-insensitively by name", () => {
@@ -235,19 +236,6 @@ describe("KvViewer", () => {
   });
 
   it("is included in the local ALL_VIEWS list (tui/src/types.ts)", () => {
-    const ALL_VIEWS: string[] = [
-      "dashboard",
-      "workers",
-      "worker-detail",
-      "trade-monitor",
-      "logs-viewer",
-      "service-manager",
-      "config-editor",
-      "setup-wizard",
-      "settings",
-      "queue-depth",
-      "kv-viewer",
-    ];
     expect(ALL_VIEWS).toContain("kv-viewer");
     // ViewId is derived from ALL_VIEWS so the local type must include it
     // as well. The TypeScript type-check is the real assertion; this

package/src/components/views/kv-viewer.tsx

@@ -49,16 +49,14 @@
  */
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
-import { Colors, useUIStore } from "@hoox-sh/hoox-shared";
+import { Colors, useUIStore, useConfigStore } from "@hoox-sh/hoox-shared";
 import { ErrorBoundary } from "../shared/error-boundary";
 import { Spinner, EmptyState } from "../shared/spinner";
 import { ViewHeader } from "../shared/view-header";
 import { cliBridge } from "../../services/cli-bridge";
 import type { KvKey, KvKeySnapshot } from "../../services/cli-bridge";
 import { useViewKeyboard } from "../../hooks/shell-overlay";
-
-/** Auto-refresh interval in milliseconds. */
-export const REFRESH_INTERVAL_MS = 5_000;
+import { usePolling, formatPollIntervalLabel } from "../../hooks/use-polling";
 
 /** Cap rendered rows so large namespaces stay responsive. */
 export const MAX_VISIBLE_KEYS = 200;
@@ -427,14 +425,12 @@ export function KvViewer() {
     };
   }, [refresh]);
 
-  // Auto-refresh every 5s while the view is the active view (soft = no flicker).
-  useEffect(() => {
-    if (!isActive) return;
-    const handle = setInterval(() => {
-      void refresh({ soft: true });
-    }, REFRESH_INTERVAL_MS);
-    return () => clearInterval(handle);
-  }, [isActive, refresh]);
+  const refreshIntervalMs = useConfigStore((s) => s.refreshIntervalMs);
+  usePolling({
+    callback: () => refresh({ soft: true }),
+    enabled: isActive,
+    immediate: false,
+  });
 
   // ── Derived data ─────────────────────────────────────────────────────
   const allKeys = snapshot?.keys ?? [];
@@ -558,7 +554,7 @@ export function KvViewer() {
                 ⚠ read-only
               </text>
               <text fg={Colors.info} dim>
-                {`◉ ${REFRESH_INTERVAL_MS / 1000}s auto`}
+                {`◉ ${formatPollIntervalLabel(refreshIntervalMs)}`}
               </text>
             </box>
           }

package/src/components/views/logs-viewer.test.tsx

@@ -113,7 +113,7 @@ describe("LogsViewer filter logic", () => {
     });
     // Entries with workerId=w1 (alpha-worker) + entries with no workerId
     expect(result).toHaveLength(1); // only id=5 has workerId=w1
-    expect(result[0].id).toBe("5");
+    expect(result[0]?.id).toBe("5");
   });
 
   it("filters by text search (case-insensitive)", () => {
@@ -125,7 +125,7 @@ describe("LogsViewer filter logic", () => {
       workers,
     });
     expect(result).toHaveLength(1);
-    expect(result[0].message).toBe("Trade executed");
+    expect(result[0]?.message).toBe("Trade executed");
   });
 
   it("combines filters with AND logic", () => {
@@ -138,7 +138,7 @@ describe("LogsViewer filter logic", () => {
     });
     // Must be error OR info, alpha-worker, contains "auth"
     expect(result).toHaveLength(1);
-    expect(result[0].id).toBe("5"); // error + w1 + "Auth failure"
+    expect(result[0]?.id).toBe("5"); // error + w1 + "Auth failure"
   });
 
   it("handles empty text search as pass-through", () => {
@@ -263,7 +263,7 @@ describe("LogsViewer sanitization & caps", () => {
       workers: [],
     });
     expect(result).toHaveLength(1);
-    expect(result[0].id).toBe("1");
+    expect(result[0]?.id).toBe("1");
   });
 
   it("caps visible render window below store ring buffer (1000)", () => {

package/src/components/views/queue-depth.test.tsx

@@ -17,11 +17,8 @@
 import { describe, it, expect, beforeEach, afterEach } from "bun:test";
 import { createRoot } from "@opentui/react";
 import { createCliRenderer } from "@opentui/core";
-import {
-  QueueDepthView,
-  sortQueuesByPressure,
-  REFRESH_INTERVAL_MS,
-} from "./queue-depth";
+import { QueueDepthView, sortQueuesByPressure } from "./queue-depth";
+import { formatPollIntervalLabel } from "../../hooks/use-polling";
 import { Colors } from "@hoox-sh/hoox-shared";
 import { useUIStore } from "@hoox-sh/hoox-shared/stores/ui-store";
 import {
@@ -126,8 +123,9 @@ describe("QueueDepthView", () => {
 
   // ── Refresh interval contract ─────────────────────────────────────────
 
-  it("auto-refreshes every 5 seconds while active", () => {
-    expect(REFRESH_INTERVAL_MS).toBe(5_000);
+  it("labels configured poll intervals", () => {
+    expect(formatPollIntervalLabel(5_000)).toBe("5s auto");
+    expect(formatPollIntervalLabel(500)).toBe("500ms auto");
   });
 
   it("sorts queues by pressure: critical → backlogged → paused → healthy", () => {

package/src/components/views/queue-depth.tsx

@@ -23,7 +23,7 @@
  * Pattern established for the TUI feature-parity batch:
  *   - Pure function component, no props required
  *   - Subscribes to useUIStore (so auto-refresh can pause when not active)
- *   - Calls cliBridge.monitorQueueDepth() on mount + every 5s while active
+ *   - Calls cliBridge.monitorQueueDepth() on mount + config refreshIntervalMs while active
  *   - Wraps content in <ErrorBoundary viewName="Queue Depth">
  *   - Renders an empty/error state without throwing
  *
@@ -44,9 +44,8 @@ import { Panel } from "../shared/panel";
 import { cliBridge } from "../../services/cli-bridge";
 import type { QueueDepth, QueueDepthStatus } from "../../services/cli-bridge";
 import { useViewKeyboard } from "../../hooks/shell-overlay";
-
-/** Auto-refresh interval in milliseconds. */
-export const REFRESH_INTERVAL_MS = 5_000;
+import { usePolling, formatPollIntervalLabel } from "../../hooks/use-polling";
+import { useConfigStore } from "@hoox-sh/hoox-shared";
 
 /** Status severity for sort order (critical first). */
 const STATUS_RANK: Record<QueueDepthStatus, number> = {
@@ -255,15 +254,12 @@ export function QueueDepthView() {
     };
   }, [refresh]);
 
-  // Auto-refresh every 5s while the view is the active view.
-  // Soft poll avoids flicker; interval stops when user navigates away.
-  useEffect(() => {
-    if (!isActive) return;
-    const handle = setInterval(() => {
-      void refresh({ soft: true });
-    }, REFRESH_INTERVAL_MS);
-    return () => clearInterval(handle);
-  }, [isActive, refresh]);
+  const refreshIntervalMs = useConfigStore((s) => s.refreshIntervalMs);
+  usePolling({
+    callback: () => refresh({ soft: true }),
+    enabled: isActive,
+    immediate: false,
+  });
 
   // Keyboard: r / F5 manual refresh while active
   useViewKeyboard((key) => {
@@ -291,7 +287,7 @@ export function QueueDepthView() {
                 {queues.length} queue{queues.length === 1 ? "" : "s"}
               </text>
               <text fg={Colors.info} dim>
-                ◉ {REFRESH_INTERVAL_MS / 1000}s auto
+                ◉ {formatPollIntervalLabel(refreshIntervalMs)}
               </text>
             </box>
           }

package/src/components/views/secrets-viewer.test.tsx

@@ -53,7 +53,7 @@ describe("SecretsViewer", () => {
   it("filters by name only (values never considered)", () => {
     const secrets: SecretMetadata[] = [
       { name: "OPENAI_API_KEY", type: "api_key", source: "config" },
-      { name: "BINANCE_KEY_BINDING", type: "api_key", source: "Cloudflare" },
+      { name: "EXCHANGE_KEY_BINDING", type: "api_key", source: "Cloudflare" },
     ];
     expect(filterSecrets(secrets, "openai")).toHaveLength(1);
     expect(filterSecrets(secrets, "")).toHaveLength(2);

package/src/components/views/secrets-viewer.tsx

@@ -17,7 +17,7 @@
  *   │  [search…]                           Last sampled 12:34:56   │
  *   │───────────────────────────────────────────────────────────────
  *   │  SECRET NAME                   TYPE        SOURCE   STATUS  │
- *   │  BINANCE_KEY_BINDING          api_key     config   OK      │
+ *   │  EXCHANGE_KEY_BINDING         api_key     config   OK      │
  *   │  OPENAI_API_KEY               api_key     config   OK      │
  *   │  TELEGRAM_BOT_TOKEN           token       config   OK      │
  *   │  …                                                         │
@@ -43,7 +43,7 @@
  */
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
-import { Colors, useUIStore } from "@hoox-sh/hoox-shared";
+import { Colors, useUIStore, useConfigStore } from "@hoox-sh/hoox-shared";
 import { ErrorBoundary } from "../shared/error-boundary";
 import { Spinner, EmptyState } from "../shared/spinner";
 import { ViewHeader } from "../shared/view-header";
@@ -53,9 +53,7 @@ import type {
   SecretsSnapshot,
 } from "../../services/cli-bridge";
 import { useViewKeyboard } from "../../hooks/shell-overlay";
-
-/** Auto-refresh interval in milliseconds. */
-export const REFRESH_INTERVAL_MS = 5_000;
+import { usePolling, formatPollIntervalLabel } from "../../hooks/use-polling";
 
 /** Cap rendered secret rows for large worker graphs. */
 export const MAX_VISIBLE_SECRETS = 200;
@@ -117,7 +115,7 @@ function SecretRow({ secret, isSelected, onSelect }: SecretRowProps) {
       onMouseUp={() => onSelect(secret.name)}
     >
       <text fg={fg} bold={isSelected}>
-        {secret.name}
+        {secret.worker ? `${secret.worker}/${secret.name}` : secret.name}
       </text>
       <text fg={Colors.muted}>{formatType(secret.type).padStart(8, " ")}</text>
       <text fg={sourceColor(secret.source)} dim>
@@ -266,14 +264,12 @@ export function SecretsViewer() {
     };
   }, [refresh]);
 
-  // Auto-refresh every 5s while the view is the active view (soft = no flicker).
-  useEffect(() => {
-    if (!isActive) return;
-    const handle = setInterval(() => {
-      void refresh({ soft: true });
-    }, REFRESH_INTERVAL_MS);
-    return () => clearInterval(handle);
-  }, [isActive, refresh]);
+  const refreshIntervalMs = useConfigStore((s) => s.refreshIntervalMs);
+  usePolling({
+    callback: () => refresh({ soft: true }),
+    enabled: isActive,
+    immediate: false,
+  });
 
   // ── Derived data ───────────────────────────────────────────────────────────
   const allSecrets = snapshot?.secrets ?? [];
@@ -349,7 +345,7 @@ export function SecretsViewer() {
                 ⚠ READ-ONLY
               </text>
               <text fg={Colors.info} dim>
-                {`◉ ${REFRESH_INTERVAL_MS / 1000}s auto`}
+                {`◉ ${formatPollIntervalLabel(refreshIntervalMs)}`}
               </text>
             </box>
           }

package/src/components/views/service-manager.tsx

@@ -939,6 +939,7 @@ export function ServiceManager({ dialog }: ServiceManagerProps) {
       }
       return;
     }
+    if (key.ctrl || key.alt || key.meta) return;
     // d → deploy selected · r → restart selected (lowercase)
     if (name === "d" && !key.shift) {
       if (selected) void handleDeploy(selected);

package/src/components/views/settings.test.tsx

@@ -171,13 +171,9 @@ async function renderSettingsWithCheck(
   width = 140,
   height = 60
 ): Promise<string> {
-  // Tell the view to auto-run the check on mount via a useEffect.
-  (
-    globalThis as unknown as { __hooxTestAutoCheckSetup?: boolean }
-  ).__hooxTestAutoCheckSetup = true;
   try {
     const { captureCharFrame, renderOnce } = await testRender(
-      <SettingsView />,
+      <SettingsView autoCheckSetup />,
       {
         width,
         height,
@@ -209,8 +205,7 @@ async function renderSettingsWithCheck(
     // Fallback - return whatever we have
     return captureCharFrame();
   } finally {
-    delete (globalThis as unknown as { __hooxTestAutoCheckSetup?: boolean })
-      .__hooxTestAutoCheckSetup;
+    /* autoCheckSetup is a render prop; nothing to clean up */
   }
 }
 

package/src/components/views/settings.tsx

@@ -37,24 +37,22 @@ import { cliBridge as realCliBridge } from "../../services/cli-bridge";
 import { getSettingsConnectionSnapshot } from "../../services/tui-connection";
 import * as path from "path";
 import * as os from "os";
-import type { ViewId, NotificationPreferences } from "@hoox-sh/hoox-shared";
+import {
+  VIEW_IDS,
+  type ViewId,
+  type NotificationPreferences,
+} from "@hoox-sh/hoox-shared";
 import { useViewKeyboard } from "../../hooks/shell-overlay";
 
-/**
- * Prefer the process-wide CLI bridge test double when test-setup installed it
- * (`globalThis.__hooxCliBridgeDouble`). Resolved at call time so the double is
- * picked up even if this module evaluated before the preload finished.
- */
 function cliBridge(): typeof realCliBridge {
-  const g = globalThis as unknown as {
-    __hooxCliBridgeDouble?: typeof realCliBridge;
-  };
-  return g.__hooxCliBridgeDouble ?? realCliBridge;
+  return realCliBridge;
 }
 
 export interface SettingsViewProps {
   /** Dialog handle for destructive action confirmation. */
   dialog?: DialogHandle;
+  /** Test-only: run Check Setup once on mount. */
+  autoCheckSetup?: boolean;
 }
 
 // ─── Check Setup Types ────────────────────────────────────────────────────────
@@ -172,26 +170,6 @@ function formatRefreshRate(ms: number): string {
   return `${ms}ms`;
 }
 
-/** ViewId options for the default view selector */
-const VIEW_OPTIONS: ViewId[] = [
-  "dashboard",
-  "workers",
-  "worker-detail",
-  "trade-monitor",
-  "logs-viewer",
-  "service-manager",
-  "config-editor",
-  "setup-wizard",
-  "settings",
-  "queue-depth",
-  "kv-viewer",
-  "secrets-viewer",
-  "db-query",
-  "ai-chat",
-  "edge-topology",
-  "worker-settings",
-];
-
 /** Human-readable labels for ViewId values */
 const VIEW_LABELS: Record<ViewId, string> = {
   dashboard: "Dashboard",
@@ -846,7 +824,10 @@ function CheckSetupResultsPanel({
  *
  * Wrapped in ErrorBoundary for crash recovery.
  */
-export function SettingsView({ dialog }: SettingsViewProps = {}) {
+export function SettingsView({
+  dialog,
+  autoCheckSetup = false,
+}: SettingsViewProps = {}) {
   const activeView = useUIStore((s) => s.activeView);
   const isActive = activeView === "settings";
 
@@ -909,7 +890,18 @@ export function SettingsView({ dialog }: SettingsViewProps = {}) {
     try {
       const cachePath = path.join(os.homedir(), ".hoox", "cache");
       const proc = Bun.spawn(["rm", "-rf", cachePath]);
-      await proc.exited;
+      const code = await proc.exited;
+      if (code !== 0) {
+        useServiceStore.getState().addAlert({
+          id: `cache-err-${Date.now()}`,
+          type: "config",
+          severity: "error",
+          message: `Cache clear failed (exit ${code})`,
+          timestamp: Date.now(),
+          acknowledged: false,
+        });
+        return;
+      }
       useServiceStore.getState().addAlert({
         id: `cache-${Date.now()}`,
         type: "config",
@@ -1259,22 +1251,12 @@ export function SettingsView({ dialog }: SettingsViewProps = {}) {
     });
   }, [confirmAction, resetDefaults]);
 
-  /**
-   * Test hook: when `globalThis.__hooxTestAutoCheckSetup` is set, the
-   * Check Setup check runs automatically once on mount. This lets the
-   * test suite populate the results panel without simulating mouse/keyboard
-   * events. Production code never sets this flag.
-   */
   useEffect(() => {
-    const g = globalThis as unknown as {
-      __hooxTestAutoCheckSetup?: boolean;
-    };
-    if (g.__hooxTestAutoCheckSetup) {
+    if (autoCheckSetup) {
       void handleCheckSetup();
     }
-    // Intentionally mount-only — tests set the flag then render, so
-    // re-running on state changes would cause duplicate checks.
-  }, []);
+    // Mount-only: tests pass autoCheckSetup then render once.
+  }, [autoCheckSetup]);
 
   /** Max items per panel */
   const maxItemsPerPanel = useMemo((): Record<number, number> => {
@@ -1293,7 +1275,7 @@ export function SettingsView({ dialog }: SettingsViewProps = {}) {
     // Import mode overrides
     if (importing) {
       if (key.name === "return" || key.name === "enter") {
-        handleImportConfirm();
+        void handleImportConfirm();
         return;
       }
       if (key.name === "escape") {
@@ -1310,9 +1292,11 @@ export function SettingsView({ dialog }: SettingsViewProps = {}) {
       return;
     }
 
-    // Tab: cycle panels
+    // Tab / Shift+Tab: cycle panels
     if (key.name === "tab") {
-      setActivePanel((p) => (p + 1) % PANEL_COUNT);
+      setActivePanel((p) =>
+        key.shift ? (p - 1 + PANEL_COUNT) % PANEL_COUNT : (p + 1) % PANEL_COUNT
+      );
       setActiveItem(0);
       return;
     }
@@ -1351,14 +1335,13 @@ export function SettingsView({ dialog }: SettingsViewProps = {}) {
           }
           case 1: {
             // Default view
-            const currentIdx = VIEW_OPTIONS.indexOf(defaultView);
+            const currentIdx = VIEW_IDS.indexOf(defaultView);
             if (key.name === "left") {
-              const prev =
-                (currentIdx - 1 + VIEW_OPTIONS.length) % VIEW_OPTIONS.length;
-              updateConfig({ defaultView: VIEW_OPTIONS[prev] });
+              const prev = (currentIdx - 1 + VIEW_IDS.length) % VIEW_IDS.length;
+              updateConfig({ defaultView: VIEW_IDS[prev] });
             } else if (key.name === "right") {
-              const next = (currentIdx + 1) % VIEW_OPTIONS.length;
-              updateConfig({ defaultView: VIEW_OPTIONS[next] });
+              const next = (currentIdx + 1) % VIEW_IDS.length;
+              updateConfig({ defaultView: VIEW_IDS[next] });
             }
             break;
           }
@@ -1375,7 +1358,7 @@ export function SettingsView({ dialog }: SettingsViewProps = {}) {
         if (activeItem >= 0 && activeItem < 4) {
           if (key.name === "space") {
             const channel = NOTIFICATION_CHANNELS[activeItem];
-            toggleNotification(channel);
+            if (channel !== undefined) toggleNotification(channel);
           }
         } else if (activeItem === 4) {
           if (key.name === "space")
@@ -1394,19 +1377,19 @@ export function SettingsView({ dialog }: SettingsViewProps = {}) {
         if (key.name === "space" || key.name === "return") {
           switch (activeItem) {
             case 0:
-              handleClearCache();
+              void handleClearCache();
               break;
             case 1:
-              handleExportData();
+              void handleExportData();
               break;
             case 2:
-              handleImportData();
+              void handleImportData();
               break;
             case 3:
-              handleCheckSetup();
+              void handleCheckSetup();
               break;
             case 4:
-              handleRunAutoRepair();
+              void handleRunAutoRepair();
               break;
           }
         }

package/src/components/views/setup-wizard.test.tsx

@@ -32,9 +32,10 @@ describe("redactWizardSecrets", () => {
   it("clears exchange keys, AI key, telegram token, and discord webhook", () => {
     const redacted = redactWizardSecrets({
       apiKeys: {
-        binance: { key: "binance-key-secret-value", secret: "binance-sec" },
-        bybit: { key: "bybit-key", secret: "bybit-sec" },
-        mexc: { key: "mexc-key", secret: "mexc-sec" },
+        exchange: {
+          key: "exchange-key-secret-value",
+          secret: "exchange-sec",
+        },
       },
       exchanges: { binance: true, bybit: false, mexc: false },
       ai: {
@@ -57,9 +58,7 @@ describe("redactWizardSecrets", () => {
       },
     });
 
-    expect(redacted.apiKeys.binance).toEqual({ key: "", secret: "" });
-    expect(redacted.apiKeys.bybit).toEqual({ key: "", secret: "" });
-    expect(redacted.apiKeys.mexc).toEqual({ key: "", secret: "" });
+    expect(redacted.apiKeys.exchange).toEqual({ key: "", secret: "" });
     expect(redacted.ai.apiKey).toBe("");
     expect(redacted.ai.providerUrl).toBe("https://api.example.com");
     expect(redacted.ai.model).toBe("gpt-4");
@@ -74,9 +73,7 @@ describe("redactWizardSecrets", () => {
   it("does not mutate the input object", () => {
     const original = {
       apiKeys: {
-        binance: { key: "keep-me", secret: "keep-me-too" },
-        bybit: { key: "", secret: "" },
-        mexc: { key: "", secret: "" },
+        exchange: { key: "keep-me", secret: "keep-me-too" },
       },
       exchanges: { binance: true, bybit: false, mexc: false },
       ai: { providerUrl: "", apiKey: "secret", model: "default" },
@@ -88,7 +85,7 @@ describe("redactWizardSecrets", () => {
       },
     };
     redactWizardSecrets(original);
-    expect(original.apiKeys.binance.key).toBe("keep-me");
+    expect(original.apiKeys.exchange.key).toBe("keep-me");
     expect(original.ai.apiKey).toBe("secret");
     expect(original.notifications.telegram.botToken).toBe("tok");
   });
@@ -96,9 +93,10 @@ describe("redactWizardSecrets", () => {
   it("session payload is safe to JSON.stringify (no secrets)", () => {
     const redacted = redactWizardSecrets({
       apiKeys: {
-        binance: { key: "binance-key-secret-value", secret: "binance-sec" },
-        bybit: { key: "", secret: "" },
-        mexc: { key: "", secret: "" },
+        exchange: {
+          key: "exchange-key-secret-value",
+          secret: "exchange-sec",
+        },
       },
       exchanges: { binance: true, bybit: false, mexc: false },
       ai: {
@@ -118,7 +116,7 @@ describe("redactWizardSecrets", () => {
     });
     const json = JSON.stringify({ step: 2, data: redacted });
     expect(json).not.toContain("sk-live");
-    expect(json).not.toContain("binance-key");
+    expect(json).not.toContain("exchange-key");
     expect(json).not.toContain("123:ABC");
     expect(json).not.toContain("webhooks/x");
   });