feat: Implement Provider Tabs in Settings View

- Added a new `ProviderTabs` component to manage different AI providers (Claude and Cursor) within the settings view.
- Created `ClaudeSettingsTab` and `CursorSettingsTab` components for provider-specific configurations.
- Updated navigation to reflect the new provider structure, replacing the previous Claude-only setup.
- Marked completion of the settings view provider tabs phase in the integration plan.

apps/ui/src/components/views/settings-view.tsx

@@ -1,16 +1,13 @@
 import { useState } from 'react';
 import { useAppStore } from '@/store/app-store';
 
-import { useCliStatus, useSettingsView } from './settings-view/hooks';
+import { useSettingsView } from './settings-view/hooks';
 import { NAV_ITEMS } from './settings-view/config/navigation';
 import { SettingsHeader } from './settings-view/components/settings-header';
 import { KeyboardMapDialog } from './settings-view/components/keyboard-map-dialog';
 import { DeleteProjectDialog } from './settings-view/components/delete-project-dialog';
 import { SettingsNavigation } from './settings-view/components/settings-navigation';
 import { ApiKeysSection } from './settings-view/api-keys/api-keys-section';
-import { ClaudeUsageSection } from './settings-view/api-keys/claude-usage-section';
-import { ClaudeCliStatus } from './settings-view/cli-status/claude-cli-status';
-import { ClaudeMdSettings } from './settings-view/claude/claude-md-settings';
 import { AIEnhancementSection } from './settings-view/ai-enhancement';
 import { AppearanceSection } from './settings-view/appearance/appearance-section';
 import { TerminalSection } from './settings-view/terminal/terminal-section';
@@ -18,6 +15,7 @@ import { AudioSection } from './settings-view/audio/audio-section';
 import { KeyboardShortcutsSection } from './settings-view/keyboard-shortcuts/keyboard-shortcuts-section';
 import { FeatureDefaultsSection } from './settings-view/feature-defaults/feature-defaults-section';
 import { DangerZoneSection } from './settings-view/danger-zone/danger-zone-section';
+import { ProviderTabs } from './settings-view/providers';
 import type { Project as SettingsProject, Theme } from './settings-view/shared/types';
 import type { Project as ElectronProject } from '@/lib/electron';
 
@@ -45,19 +43,10 @@ export function SettingsView() {
     defaultAIProfileId,
     setDefaultAIProfileId,
     aiProfiles,
-    apiKeys,
     validationModel,
     setValidationModel,
-    autoLoadClaudeMd,
-    setAutoLoadClaudeMd,
   } = useAppStore();
 
-  // Hide usage tracking when using API key (only show for Claude Code CLI users)
-  // Also hide on Windows for now (CLI usage command not supported)
-  const isWindows =
-    typeof navigator !== 'undefined' && navigator.platform?.toLowerCase().includes('win');
-  const showUsageTracking = !apiKeys.anthropic && !isWindows;
-
   // Convert electron Project to settings-view Project type
   const convertProject = (project: ElectronProject | null): SettingsProject | null => {
     if (!project) return null;
@@ -85,9 +74,6 @@ export function SettingsView() {
     }
   };
 
-  // Use CLI status hook
-  const { claudeCliStatus, isCheckingClaudeCli, handleRefreshClaudeCli } = useCliStatus();
-
   // Use settings view navigation hook
   const { activeView, navigateTo } = useSettingsView();
 
@@ -97,21 +83,9 @@ export function SettingsView() {
   // Render the active section based on current view
   const renderActiveSection = () => {
     switch (activeView) {
-      case 'claude':
+      case 'providers':
-        return (
+      case 'claude': // Backwards compatibility
-          <div className="space-y-6">
+        return <ProviderTabs defaultTab={activeView === 'claude' ? 'claude' : 'claude'} />;
-            <ClaudeCliStatus
-              status={claudeCliStatus}
-              isChecking={isCheckingClaudeCli}
-              onRefresh={handleRefreshClaudeCli}
-            />
-            <ClaudeMdSettings
-              autoLoadClaudeMd={autoLoadClaudeMd}
-              onAutoLoadClaudeMdChange={setAutoLoadClaudeMd}
-            />
-            {showUsageTracking && <ClaudeUsageSection />}
-          </div>
-        );
       case 'ai-enhancement':
         return <AIEnhancementSection />;
       case 'appearance':

apps/ui/src/components/views/settings-view/config/navigation.ts

@@ -1,7 +1,7 @@
 import type { LucideIcon } from 'lucide-react';
 import {
   Key,
-  Terminal,
+  Bot,
   SquareTerminal,
   Palette,
   Settings2,
@@ -21,7 +21,7 @@ export interface NavigationItem {
 // Navigation items for the settings side panel
 export const NAV_ITEMS: NavigationItem[] = [
   { id: 'api-keys', label: 'API Keys', icon: Key },
-  { id: 'claude', label: 'Claude', icon: Terminal },
+  { id: 'providers', label: 'AI Providers', icon: Bot },
   { id: 'ai-enhancement', label: 'AI Enhancement', icon: Sparkles },
   { id: 'appearance', label: 'Appearance', icon: Palette },
   { id: 'terminal', label: 'Terminal', icon: SquareTerminal },

apps/ui/src/components/views/settings-view/hooks/use-settings-view.ts

@@ -3,6 +3,7 @@ import { useState, useCallback } from 'react';
 export type SettingsViewId =
   | 'api-keys'
   | 'claude'
+  | 'providers'
   | 'ai-enhancement'
   | 'appearance'
   | 'terminal'

apps/ui/src/components/views/settings-view/providers/claude-settings-tab.tsx

@@ -0,0 +1,35 @@
+import { useAppStore } from '@/store/app-store';
+import { useCliStatus } from '../hooks/use-cli-status';
+import { ClaudeCliStatus } from '../cli-status/claude-cli-status';
+import { ClaudeMdSettings } from '../claude/claude-md-settings';
+import { ClaudeUsageSection } from '../api-keys/claude-usage-section';
+
+export function ClaudeSettingsTab() {
+  const { apiKeys, autoLoadClaudeMd, setAutoLoadClaudeMd } = useAppStore();
+
+  // Use CLI status hook
+  const { claudeCliStatus, isCheckingClaudeCli, handleRefreshClaudeCli } = useCliStatus();
+
+  // Hide usage tracking when using API key (only show for Claude Code CLI users)
+  // Also hide on Windows for now (CLI usage command not supported)
+  const isWindows =
+    typeof navigator !== 'undefined' && navigator.platform?.toLowerCase().includes('win');
+  const showUsageTracking = !apiKeys.anthropic && !isWindows;
+
+  return (
+    <div className="space-y-6">
+      <ClaudeCliStatus
+        status={claudeCliStatus}
+        isChecking={isCheckingClaudeCli}
+        onRefresh={handleRefreshClaudeCli}
+      />
+      <ClaudeMdSettings
+        autoLoadClaudeMd={autoLoadClaudeMd}
+        onAutoLoadClaudeMdChange={setAutoLoadClaudeMd}
+      />
+      {showUsageTracking && <ClaudeUsageSection />}
+    </div>
+  );
+}
+
+export default ClaudeSettingsTab;

apps/ui/src/components/views/settings-view/providers/cursor-settings-tab.tsx

@@ -0,0 +1,321 @@
+import { useState, useEffect, useCallback } from 'react';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import { Label } from '@/components/ui/label';
+import { Badge } from '@/components/ui/badge';
+import { Checkbox } from '@/components/ui/checkbox';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select';
+import { Terminal, CheckCircle2, XCircle, Loader2, RefreshCw, ExternalLink } from 'lucide-react';
+import { toast } from 'sonner';
+import { getHttpApiClient } from '@/lib/http-api-client';
+import { useAppStore } from '@/store/app-store';
+import type { CursorModelId, CursorModelConfig, CursorCliConfig } from '@automaker/types';
+import { CURSOR_MODEL_MAP } from '@automaker/types';
+
+interface CursorStatus {
+  installed: boolean;
+  version?: string;
+  authenticated: boolean;
+  method?: string;
+}
+
+export function CursorSettingsTab() {
+  const { currentProject } = useAppStore();
+  const [status, setStatus] = useState<CursorStatus | null>(null);
+  const [config, setConfig] = useState<CursorCliConfig | null>(null);
+  const [availableModels, setAvailableModels] = useState<CursorModelConfig[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
+  const [isSaving, setIsSaving] = useState(false);
+
+  const loadData = useCallback(async () => {
+    setIsLoading(true);
+    try {
+      const api = getHttpApiClient();
+      const statusResult = await api.setup.getCursorStatus();
+
+      if (statusResult.success) {
+        setStatus({
+          installed: statusResult.installed ?? false,
+          version: statusResult.version ?? undefined,
+          authenticated: statusResult.auth?.authenticated ?? false,
+          method: statusResult.auth?.method,
+        });
+      }
+
+      // Only load config if we have a project path
+      if (currentProject?.path) {
+        const configResult = await api.setup.getCursorConfig(currentProject.path);
+        if (configResult.success) {
+          setConfig({
+            defaultModel: configResult.config?.defaultModel as CursorModelId | undefined,
+            models: configResult.config?.models as CursorModelId[] | undefined,
+            mcpServers: configResult.config?.mcpServers,
+            rules: configResult.config?.rules,
+          });
+          if (configResult.availableModels) {
+            setAvailableModels(configResult.availableModels as CursorModelConfig[]);
+          } else {
+            setAvailableModels(Object.values(CURSOR_MODEL_MAP));
+          }
+        } else {
+          // Set defaults if no config
+          setAvailableModels(Object.values(CURSOR_MODEL_MAP));
+        }
+      } else {
+        // No project, just show available models
+        setAvailableModels(Object.values(CURSOR_MODEL_MAP));
+      }
+    } catch (error) {
+      console.error('Failed to load Cursor settings:', error);
+      toast.error('Failed to load Cursor settings');
+    } finally {
+      setIsLoading(false);
+    }
+  }, [currentProject?.path]);
+
+  useEffect(() => {
+    loadData();
+  }, [loadData]);
+
+  const handleDefaultModelChange = async (model: CursorModelId) => {
+    if (!currentProject?.path) {
+      toast.error('No project selected');
+      return;
+    }
+
+    setIsSaving(true);
+    try {
+      const api = getHttpApiClient();
+      const result = await api.setup.setCursorDefaultModel(currentProject.path, model);
+
+      if (result.success) {
+        setConfig((prev) => (prev ? { ...prev, defaultModel: model } : { defaultModel: model }));
+        toast.success('Default model updated');
+      } else {
+        toast.error(result.error || 'Failed to update default model');
+      }
+    } catch (error) {
+      toast.error('Failed to update default model');
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  const handleModelToggle = async (model: CursorModelId, enabled: boolean) => {
+    if (!currentProject?.path) {
+      toast.error('No project selected');
+      return;
+    }
+
+    const currentModels = config?.models || ['auto'];
+    const newModels = enabled
+      ? [...currentModels, model]
+      : currentModels.filter((m) => m !== model);
+
+    setIsSaving(true);
+    try {
+      const api = getHttpApiClient();
+      const result = await api.setup.setCursorModels(currentProject.path, newModels);
+
+      if (result.success) {
+        setConfig((prev) => (prev ? { ...prev, models: newModels } : { models: newModels }));
+      } else {
+        toast.error(result.error || 'Failed to update models');
+      }
+    } catch (error) {
+      toast.error('Failed to update models');
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center justify-center py-12">
+        <Loader2 className="w-6 h-6 animate-spin text-muted-foreground" />
+      </div>
+    );
+  }
+
+  return (
+    <div className="space-y-6">
+      {/* Status Card */}
+      <Card>
+        <CardHeader>
+          <CardTitle className="flex items-center gap-2 text-lg">
+            <Terminal className="w-5 h-5" />
+            Cursor CLI Status
+          </CardTitle>
+        </CardHeader>
+        <CardContent className="space-y-4">
+          {/* Installation */}
+          <div className="flex items-center justify-between">
+            <span className="text-sm">Installation</span>
+            {status?.installed ? (
+              <div className="flex items-center gap-2 text-green-600 dark:text-green-400">
+                <CheckCircle2 className="w-4 h-4" />
+                <span className="text-xs font-mono">v{status.version}</span>
+              </div>
+            ) : (
+              <div className="flex items-center gap-2 text-destructive">
+                <XCircle className="w-4 h-4" />
+                <span className="text-xs">Not installed</span>
+              </div>
+            )}
+          </div>
+
+          {/* Authentication */}
+          <div className="flex items-center justify-between">
+            <span className="text-sm">Authentication</span>
+            {status?.authenticated ? (
+              <div className="flex items-center gap-2 text-green-600 dark:text-green-400">
+                <CheckCircle2 className="w-4 h-4" />
+                <span className="text-xs capitalize">
+                  {status.method === 'api_key' ? 'API Key' : 'Browser Login'}
+                </span>
+              </div>
+            ) : (
+              <div className="flex items-center gap-2 text-amber-600 dark:text-amber-400">
+                <XCircle className="w-4 h-4" />
+                <span className="text-xs">Not authenticated</span>
+              </div>
+            )}
+          </div>
+
+          {/* Actions */}
+          <div className="flex gap-2 pt-2">
+            <Button variant="outline" size="sm" onClick={loadData}>
+              <RefreshCw className="w-4 h-4 mr-2" />
+              Refresh Status
+            </Button>
+            {!status?.installed && (
+              <Button
+                variant="outline"
+                size="sm"
+                onClick={() => window.open('https://cursor.com/docs/cli', '_blank')}
+              >
+                Installation Guide
+                <ExternalLink className="w-4 h-4 ml-2" />
+              </Button>
+            )}
+          </div>
+        </CardContent>
+      </Card>
+
+      {/* Model Configuration */}
+      {status?.installed && currentProject && (
+        <Card>
+          <CardHeader>
+            <CardTitle className="text-lg">Model Configuration</CardTitle>
+            <CardDescription>
+              Configure which Cursor models are available and set the default
+            </CardDescription>
+          </CardHeader>
+          <CardContent className="space-y-6">
+            {/* Default Model */}
+            <div className="space-y-2">
+              <Label>Default Model</Label>
+              <Select
+                value={config?.defaultModel || 'auto'}
+                onValueChange={(v) => handleDefaultModelChange(v as CursorModelId)}
+                disabled={isSaving}
+              >
+                <SelectTrigger className="w-full">
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {(config?.models || ['auto']).map((modelId) => {
+                    const model = CURSOR_MODEL_MAP[modelId as CursorModelId];
+                    if (!model) return null;
+                    return (
+                      <SelectItem key={modelId} value={modelId}>
+                        <div className="flex items-center gap-2">
+                          <span>{model.label}</span>
+                          {model.hasThinking && (
+                            <Badge variant="outline" className="text-xs">
+                              Thinking
+                            </Badge>
+                          )}
+                        </div>
+                      </SelectItem>
+                    );
+                  })}
+                </SelectContent>
+              </Select>
+            </div>
+
+            {/* Enabled Models */}
+            <div className="space-y-3">
+              <Label>Available Models</Label>
+              <div className="grid gap-3">
+                {availableModels.map((model) => {
+                  const isEnabled = config?.models?.includes(model.id) ?? model.id === 'auto';
+                  const isAuto = model.id === 'auto';
+
+                  return (
+                    <div
+                      key={model.id}
+                      className="flex items-center justify-between p-3 rounded-lg border bg-card"
+                    >
+                      <div className="flex items-center gap-3">
+                        <Checkbox
+                          checked={isEnabled}
+                          onCheckedChange={(checked) => handleModelToggle(model.id, !!checked)}
+                          disabled={isSaving || isAuto}
+                        />
+                        <div>
+                          <div className="flex items-center gap-2">
+                            <span className="text-sm font-medium">{model.label}</span>
+                            {model.hasThinking && (
+                              <Badge variant="outline" className="text-xs">
+                                Thinking
+                              </Badge>
+                            )}
+                          </div>
+                          <p className="text-xs text-muted-foreground">{model.description}</p>
+                        </div>
+                      </div>
+                      <Badge variant={model.tier === 'free' ? 'default' : 'secondary'}>
+                        {model.tier}
+                      </Badge>
+                    </div>
+                  );
+                })}
+              </div>
+            </div>
+          </CardContent>
+        </Card>
+      )}
+
+      {/* Not Installed State */}
+      {!status?.installed && (
+        <Card>
+          <CardContent className="py-8 text-center text-muted-foreground">
+            <Terminal className="w-12 h-12 mx-auto mb-4 opacity-50" />
+            <p>Cursor CLI is not installed.</p>
+            <p className="text-sm mt-2">Install it to use Cursor models in AutoMaker.</p>
+          </CardContent>
+        </Card>
+      )}
+
+      {/* No Project Selected */}
+      {status?.installed && !currentProject && (
+        <Card>
+          <CardContent className="py-8 text-center text-muted-foreground">
+            <Terminal className="w-12 h-12 mx-auto mb-4 opacity-50" />
+            <p>No project selected.</p>
+            <p className="text-sm mt-2">Select a project to configure Cursor models.</p>
+          </CardContent>
+        </Card>
+      )}
+    </div>
+  );
+}
+
+export default CursorSettingsTab;

apps/ui/src/components/views/settings-view/providers/index.ts

@@ -0,0 +1,3 @@
+export { ProviderTabs } from './provider-tabs';
+export { ClaudeSettingsTab } from './claude-settings-tab';
+export { CursorSettingsTab } from './cursor-settings-tab';

apps/ui/src/components/views/settings-view/providers/provider-tabs.tsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
+import { Bot, Terminal } from 'lucide-react';
+import { CursorSettingsTab } from './cursor-settings-tab';
+import { ClaudeSettingsTab } from './claude-settings-tab';
+
+interface ProviderTabsProps {
+  defaultTab?: 'claude' | 'cursor';
+}
+
+export function ProviderTabs({ defaultTab = 'claude' }: ProviderTabsProps) {
+  return (
+    <Tabs defaultValue={defaultTab} className="w-full">
+      <TabsList className="grid w-full grid-cols-2 mb-6">
+        <TabsTrigger value="claude" className="flex items-center gap-2">
+          <Bot className="w-4 h-4" />
+          Claude
+        </TabsTrigger>
+        <TabsTrigger value="cursor" className="flex items-center gap-2">
+          <Terminal className="w-4 h-4" />
+          Cursor
+        </TabsTrigger>
+      </TabsList>
+
+      <TabsContent value="claude">
+        <ClaudeSettingsTab />
+      </TabsContent>
+
+      <TabsContent value="cursor">
+        <CursorSettingsTab />
+      </TabsContent>
+    </Tabs>
+  );
+}
+
+export default ProviderTabs;

plan/cursor-cli-integration/README.md

@@ -13,7 +13,7 @@
 | 4     | [Setup Routes & Status Endpoints](phases/phase-4-routes.md)  | `completed` | ✅          |
 | 5     | [Log Parser Integration](phases/phase-5-log-parser.md)       | `completed` | ✅          |
 | 6     | [UI Setup Wizard](phases/phase-6-setup-wizard.md)            | `completed` | ✅          |
-| 7     | [Settings View Provider Tabs](phases/phase-7-settings.md)    | `pending`   | -           |
+| 7     | [Settings View Provider Tabs](phases/phase-7-settings.md)    | `completed` | ✅          |
 | 8     | [AI Profiles Integration](phases/phase-8-profiles.md)        | `pending`   | -           |
 | 9     | [Task Execution Integration](phases/phase-9-execution.md)    | `pending`   | -           |
 | 10    | [Testing & Validation](phases/phase-10-testing.md)           | `pending`   | -           |

plan/cursor-cli-integration/phases/phase-7-settings.md

@@ -1,6 +1,6 @@
 # Phase 7: Settings View Provider Tabs
 
-**Status:** `pending`
+**Status:** `completed`
 **Dependencies:** Phase 4 (Routes)
 **Estimated Effort:** Medium (React components)
 
@@ -16,7 +16,7 @@ Create a tabbed interface in Settings for managing different AI providers (Claud
 
 ### Task 7.1: Create Cursor Settings Tab Component
 
-**Status:** `pending`
+**Status:** `completed`
 
 **File:** `apps/ui/src/components/views/settings-view/providers/cursor-settings-tab.tsx`
 
@@ -311,7 +311,7 @@ export default CursorSettingsTab;
 
 ### Task 7.2: Create Provider Tabs Container
 
-**Status:** `pending`
+**Status:** `completed`
 
 **File:** `apps/ui/src/components/views/settings-view/providers/provider-tabs.tsx`
 
@@ -356,7 +356,7 @@ export default ProviderTabs;
 
 ### Task 7.3: Create Claude Settings Tab (if not exists)
 
-**Status:** `pending`
+**Status:** `completed`
 
 **File:** `apps/ui/src/components/views/settings-view/providers/claude-settings-tab.tsx`
 
@@ -461,7 +461,7 @@ export default ClaudeSettingsTab;
 
 ### Task 7.4: Update Settings View Navigation
 
-**Status:** `pending`
+**Status:** `completed`
 
 **File:** `apps/ui/src/components/views/settings-view/config/navigation.ts`
 
@@ -482,7 +482,7 @@ export const SETTINGS_NAVIGATION = [
 
 ### Task 7.5: Integrate Provider Tabs in Settings
 
-**Status:** `pending`
+**Status:** `completed`
 
 Update the settings view to render ProviderTabs for the providers section.