🤖 feat: add Settings Manager with Providers/Models/General sections

src/browser/App.stories.tsx

@@ -37,6 +37,11 @@ function setupMockAPI(options: {
     },
     providers: {
       setProviderConfig: () => Promise.resolve({ success: true, data: undefined }),
+      setModels: () => Promise.resolve({ success: true, data: undefined }),
+      getConfig: () =>
+        Promise.resolve(
+          {} as Record<string, { apiKeySet: boolean; baseUrl?: string; models?: string[] }>
+        ),
       list: () => Promise.resolve([]),
     },
     workspace: {
@@ -555,6 +560,11 @@ export const ActiveWorkspaceWithChat: Story = {
             },
             providers: {
               setProviderConfig: () => Promise.resolve({ success: true, data: undefined }),
+              setModels: () => Promise.resolve({ success: true, data: undefined }),
+              getConfig: () =>
+                Promise.resolve(
+                  {} as Record<string, { apiKeySet: boolean; baseUrl?: string; models?: string[] }>
+                ),
               list: () => Promise.resolve(["anthropic", "openai", "xai"]),
             },
             workspace: {

src/browser/App.tsx

@@ -34,6 +34,9 @@ import type { BranchListResult } from "@/common/types/ipc";
 import { useTelemetry } from "./hooks/useTelemetry";
 import { useStartWorkspaceCreation, getFirstProjectPath } from "./hooks/useStartWorkspaceCreation";
 
+import { SettingsProvider, useSettings } from "./contexts/SettingsContext";
+import { SettingsModal } from "./components/Settings/SettingsModal";
+
 const THINKING_LEVELS: ThinkingLevel[] = ["off", "low", "medium", "high"];
 
 function AppInner() {
@@ -50,6 +53,7 @@ function AppInner() {
     clearPendingWorkspaceCreation,
   } = useWorkspaceContext();
   const { theme, setTheme, toggleTheme } = useTheme();
+  const { open: openSettings } = useSettings();
   const setThemePreference = useCallback(
     (nextTheme: ThemeMode) => {
       setTheme(nextTheme);
@@ -412,6 +416,7 @@ function AppInner() {
     onOpenWorkspaceInTerminal: openWorkspaceInTerminal,
     onToggleTheme: toggleTheme,
     onSetTheme: setThemePreference,
+    onOpenSettings: openSettings,
   };
 
   useEffect(() => {
@@ -634,6 +639,7 @@ function AppInner() {
           onClose={closeProjectCreateModal}
           onSuccess={addProject}
         />
+        <SettingsModal />
       </div>
     </>
   );
@@ -642,9 +648,11 @@ function AppInner() {
 function App() {
   return (
     <ThemeProvider>
-      <CommandRegistryProvider>
-        <AppInner />
-      </CommandRegistryProvider>
+      <SettingsProvider>
+        <CommandRegistryProvider>
+          <AppInner />
+        </CommandRegistryProvider>
+      </SettingsProvider>
     </ThemeProvider>
   );
 }

src/browser/api.ts

@@ -233,6 +233,8 @@ const webApi: IPCApi = {
   providers: {
     setProviderConfig: (provider, keyPath, value) =>
       invokeIPC(IPC_CHANNELS.PROVIDERS_SET_CONFIG, provider, keyPath, value),
+    setModels: (provider, models) => invokeIPC(IPC_CHANNELS.PROVIDERS_SET_MODELS, provider, models),
+    getConfig: () => invokeIPC(IPC_CHANNELS.PROVIDERS_GET_CONFIG),
     list: () => invokeIPC(IPC_CHANNELS.PROVIDERS_LIST),
   },
   projects: {

src/browser/components/Settings/Settings.stories.tsx

@@ -0,0 +1,295 @@
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import { expect, userEvent, waitFor, within } from "storybook/test";
+import React, { useState } from "react";
+import { SettingsProvider, useSettings } from "@/browser/contexts/SettingsContext";
+import { SettingsModal } from "./SettingsModal";
+import type { IPCApi } from "@/common/types/ipc";
+
+// Mock providers config for stories
+const mockProvidersConfig: Record<
+  string,
+  { apiKeySet: boolean; baseUrl?: string; models?: string[] }
+> = {
+  anthropic: { apiKeySet: true },
+  openai: { apiKeySet: true, baseUrl: "https://custom.openai.com" },
+  google: { apiKeySet: false },
+  xai: { apiKeySet: false },
+  ollama: { apiKeySet: false, models: ["llama3.2", "codestral"] },
+  openrouter: { apiKeySet: true, models: ["mistral/mistral-7b"] },
+};
+
+function setupMockAPI(config = mockProvidersConfig) {
+  const mockProviders: IPCApi["providers"] = {
+    setProviderConfig: () => Promise.resolve({ success: true, data: undefined }),
+    setModels: () => Promise.resolve({ success: true, data: undefined }),
+    getConfig: () => Promise.resolve(config),
+    list: () => Promise.resolve([]),
+  };
+
+  // @ts-expect-error - Assigning mock API to window for Storybook
+  window.api = {
+    providers: mockProviders,
+  };
+}
+
+// Wrapper component that auto-opens the settings modal
+function SettingsStoryWrapper(props: { initialSection?: string }) {
+  return (
+    <SettingsProvider>
+      <SettingsAutoOpen initialSection={props.initialSection} />
+      <SettingsModal />
+    </SettingsProvider>
+  );
+}
+
+function SettingsAutoOpen(props: { initialSection?: string }) {
+  const { open, isOpen } = useSettings();
+  const [hasOpened, setHasOpened] = useState(false);
+
+  React.useEffect(() => {
+    if (!hasOpened && !isOpen) {
+      open(props.initialSection);
+      setHasOpened(true);
+    }
+  }, [hasOpened, isOpen, open, props.initialSection]);
+
+  return null;
+}
+
+// Interactive wrapper for testing close behavior
+function InteractiveSettingsWrapper(props: { initialSection?: string }) {
+  const [reopenCount, setReopenCount] = useState(0);
+
+  return (
+    <SettingsProvider key={reopenCount}>
+      <div className="p-4">
+        <button
+          type="button"
+          onClick={() => setReopenCount((c) => c + 1)}
+          className="bg-accent mb-4 rounded px-4 py-2 text-white"
+        >
+          Reopen Settings
+        </button>
+        <div id="close-indicator" className="text-muted text-sm">
+          Click overlay or press Escape to close
+        </div>
+      </div>
+      <SettingsAutoOpen initialSection={props.initialSection} />
+      <SettingsModal />
+    </SettingsProvider>
+  );
+}
+
+const meta = {
+  title: "Components/Settings",
+  component: SettingsModal,
+  parameters: {
+    layout: "fullscreen",
+  },
+  tags: ["autodocs"],
+  decorators: [
+    (Story) => {
+      setupMockAPI();
+      return <Story />;
+    },
+  ],
+} satisfies Meta<typeof SettingsModal>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+/**
+ * Default settings modal showing the General section.
+ * Contains theme toggle between light/dark modes.
+ */
+export const General: Story = {
+  render: () => <SettingsStoryWrapper initialSection="general" />,
+};
+
+/**
+ * Providers section showing API key configuration.
+ * - Green dot indicates configured providers
+ * - Accordion expands to show API Key and Base URL fields
+ * - Shows masked "••••••••" for set keys
+ */
+export const Providers: Story = {
+  render: () => <SettingsStoryWrapper initialSection="providers" />,
+};
+
+/**
+ * Providers section with expanded Anthropic accordion.
+ */
+export const ProvidersExpanded: Story = {
+  render: () => <SettingsStoryWrapper initialSection="providers" />,
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    // Wait for modal to render
+    await waitFor(async () => {
+      const modal = canvas.getByRole("dialog");
+      await expect(modal).toBeInTheDocument();
+    });
+
+    // Click Anthropic to expand
+    const anthropicButton = canvas.getByRole("button", { name: /Anthropic/i });
+    await userEvent.click(anthropicButton);
+
+    // Verify the accordion expanded (API Key label should be visible)
+    await waitFor(async () => {
+      const apiKeyLabel = canvas.getByText("API Key");
+      await expect(apiKeyLabel).toBeVisible();
+    });
+  },
+};
+
+/**
+ * Models section showing custom model management.
+ * - Form to add new models with provider dropdown
+ * - List of existing custom models with delete buttons
+ */
+export const Models: Story = {
+  render: () => <SettingsStoryWrapper initialSection="models" />,
+};
+
+/**
+ * Models section with no custom models configured.
+ */
+export const ModelsEmpty: Story = {
+  decorators: [
+    (Story) => {
+      setupMockAPI({
+        anthropic: { apiKeySet: true },
+        openai: { apiKeySet: true },
+        google: { apiKeySet: false },
+        xai: { apiKeySet: false },
+        ollama: { apiKeySet: false },
+        openrouter: { apiKeySet: false },
+      });
+      return <Story />;
+    },
+  ],
+  render: () => <SettingsStoryWrapper initialSection="models" />,
+};
+
+/**
+ * Test that clicking overlay closes the modal.
+ */
+export const OverlayClickCloses: Story = {
+  render: () => <InteractiveSettingsWrapper />,
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    // Wait for modal
+    await waitFor(async () => {
+      const modal = canvas.getByRole("dialog");
+      await expect(modal).toBeInTheDocument();
+    });
+
+    // Wait for event listeners to attach
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    // Click overlay
+    const overlay = document.querySelector('[role="presentation"]');
+    await expect(overlay).toBeInTheDocument();
+    await userEvent.click(overlay!);
+
+    // Modal should close
+    await waitFor(async () => {
+      const closedModal = canvas.queryByRole("dialog");
+      await expect(closedModal).not.toBeInTheDocument();
+    });
+  },
+};
+
+/**
+ * Test that pressing Escape closes the modal.
+ */
+export const EscapeKeyCloses: Story = {
+  render: () => <InteractiveSettingsWrapper />,
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    // Wait for modal
+    await waitFor(async () => {
+      const modal = canvas.getByRole("dialog");
+      await expect(modal).toBeInTheDocument();
+    });
+
+    // Wait for event listeners
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    // Press Escape
+    await userEvent.keyboard("{Escape}");
+
+    // Modal should close
+    await waitFor(async () => {
+      const closedModal = canvas.queryByRole("dialog");
+      await expect(closedModal).not.toBeInTheDocument();
+    });
+  },
+};
+
+/**
+ * Test sidebar navigation between sections.
+ */
+export const SidebarNavigation: Story = {
+  render: () => <SettingsStoryWrapper initialSection="general" />,
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    // Wait for modal
+    await waitFor(async () => {
+      const modal = canvas.getByRole("dialog");
+      await expect(modal).toBeInTheDocument();
+    });
+
+    // Should start on General - verify by checking theme toggle presence
+    await expect(canvas.getByText("Theme")).toBeVisible();
+
+    // Click Providers in sidebar
+    const providersNav = canvas.getByRole("button", { name: /Providers/i });
+    await userEvent.click(providersNav);
+
+    // Content should update to show Providers section text
+    await waitFor(async () => {
+      const providersText = canvas.getByText(/Configure API keys/i);
+      await expect(providersText).toBeVisible();
+    });
+
+    // Click Models in sidebar
+    const modelsNav = canvas.getByRole("button", { name: /Models/i });
+    await userEvent.click(modelsNav);
+
+    // Content should update to show Models section text
+    await waitFor(async () => {
+      const modelsText = canvas.getByText(/Add custom models/i);
+      await expect(modelsText).toBeVisible();
+    });
+  },
+};
+
+/**
+ * Test X button closes the modal.
+ */
+export const CloseButtonCloses: Story = {
+  render: () => <InteractiveSettingsWrapper />,
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    // Wait for modal
+    await waitFor(async () => {
+      const modal = canvas.getByRole("dialog");
+      await expect(modal).toBeInTheDocument();
+    });
+
+    // Click close button
+    const closeButton = canvas.getByRole("button", { name: /Close settings/i });
+    await userEvent.click(closeButton);
+
+    // Modal should close
+    await waitFor(async () => {
+      const closedModal = canvas.queryByRole("dialog");
+      await expect(closedModal).not.toBeInTheDocument();
+    });
+  },
+};