Merge v0.8.0rc into feat/cursor-cli

Resolved conflicts:
- sdk-options.ts: kept HEAD (MCP & thinking level features)
- auto-mode-service.ts: kept HEAD (MCP features + fallback code)
- agent-output-modal.tsx: used v0.8.0rc (effectiveViewMode + pr-8 spacing)
- feature-suggestions-dialog.tsx: accepted deletion
- electron.ts: used v0.8.0rc (Ideation types)
- package-lock.json: regenerated

Fixed sdk-options.test.ts to expect 'default' permissionMode for read-only operations.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

apps/ui/src/hooks/index.ts

@@ -1,6 +1,7 @@
 export { useAutoMode } from './use-auto-mode';
 export { useBoardBackgroundSettings } from './use-board-background-settings';
 export { useElectronAgent } from './use-electron-agent';
+export { useGuidedPrompts } from './use-guided-prompts';
 export { useKeyboardShortcuts } from './use-keyboard-shortcuts';
 export { useMessageQueue } from './use-message-queue';
 export { useOSDetection, type OperatingSystem, type OSDetectionResult } from './use-os-detection';

apps/ui/src/hooks/use-guided-prompts.ts

@@ -0,0 +1,86 @@
+/**
+ * Hook for fetching guided prompts from the backend API
+ *
+ * This hook provides the single source of truth for guided prompts,
+ * fetched from the backend /api/ideation/prompts endpoint.
+ */
+
+import { useState, useEffect, useCallback } from 'react';
+import type { IdeationPrompt, PromptCategory, IdeaCategory } from '@automaker/types';
+import { getElectronAPI } from '@/lib/electron';
+
+interface UseGuidedPromptsReturn {
+  prompts: IdeationPrompt[];
+  categories: PromptCategory[];
+  isLoading: boolean;
+  error: string | null;
+  refetch: () => Promise<void>;
+  getPromptsByCategory: (category: IdeaCategory) => IdeationPrompt[];
+  getPromptById: (id: string) => IdeationPrompt | undefined;
+  getCategoryById: (id: IdeaCategory) => PromptCategory | undefined;
+}
+
+export function useGuidedPrompts(): UseGuidedPromptsReturn {
+  const [prompts, setPrompts] = useState<IdeationPrompt[]>([]);
+  const [categories, setCategories] = useState<PromptCategory[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+
+  const fetchPrompts = useCallback(async () => {
+    setIsLoading(true);
+    setError(null);
+
+    try {
+      const api = getElectronAPI();
+      const result = await api.ideation?.getPrompts();
+
+      if (result?.success) {
+        setPrompts(result.prompts || []);
+        setCategories(result.categories || []);
+      } else {
+        setError(result?.error || 'Failed to fetch prompts');
+      }
+    } catch (err) {
+      console.error('Failed to fetch guided prompts:', err);
+      setError(err instanceof Error ? err.message : 'Failed to fetch prompts');
+    } finally {
+      setIsLoading(false);
+    }
+  }, []);
+
+  useEffect(() => {
+    fetchPrompts();
+  }, [fetchPrompts]);
+
+  const getPromptsByCategory = useCallback(
+    (category: IdeaCategory): IdeationPrompt[] => {
+      return prompts.filter((p) => p.category === category);
+    },
+    [prompts]
+  );
+
+  const getPromptById = useCallback(
+    (id: string): IdeationPrompt | undefined => {
+      return prompts.find((p) => p.id === id);
+    },
+    [prompts]
+  );
+
+  const getCategoryById = useCallback(
+    (id: IdeaCategory): PromptCategory | undefined => {
+      return categories.find((c) => c.id === id);
+    },
+    [categories]
+  );
+
+  return {
+    prompts,
+    categories,
+    isLoading,
+    error,
+    refetch: fetchPrompts,
+    getPromptsByCategory,
+    getPromptById,
+    getCategoryById,
+  };
+}

apps/ui/src/hooks/use-keyboard-shortcuts.ts

@@ -1,5 +1,5 @@
-import { useEffect, useCallback } from 'react';
-import { useAppStore, parseShortcut } from '@/store/app-store';
+import { useEffect, useCallback, useMemo } from 'react';
+import { useAppStore, parseShortcut, DEFAULT_KEYBOARD_SHORTCUTS } from '@/store/app-store';
 
 export interface KeyboardShortcut {
   key: string; // Can be simple "K" or with modifiers "Shift+N", "Cmd+K"
@@ -237,8 +237,18 @@ export function useKeyboardShortcuts(shortcuts: KeyboardShortcut[]) {
 /**
  * Hook to get current keyboard shortcuts from store
  * This replaces the static constants and allows customization
+ * Merges with defaults to ensure new shortcuts are always available
  */
 export function useKeyboardShortcutsConfig() {
   const keyboardShortcuts = useAppStore((state) => state.keyboardShortcuts);
-  return keyboardShortcuts;
+
+  // Merge with defaults to ensure new shortcuts are available
+  // even if user's persisted state predates them
+  return useMemo(
+    () => ({
+      ...DEFAULT_KEYBOARD_SHORTCUTS,
+      ...keyboardShortcuts,
+    }),
+    [keyboardShortcuts]
+  );
 }

apps/ui/src/hooks/use-settings-migration.ts

@@ -234,8 +234,6 @@ export async function syncSettingsToServer(): Promise<boolean> {
       keyboardShortcuts: state.keyboardShortcuts,
       aiProfiles: state.aiProfiles,
       mcpServers: state.mcpServers,
-      mcpAutoApproveTools: state.mcpAutoApproveTools,
-      mcpUnrestrictedTools: state.mcpUnrestrictedTools,
       promptCustomization: state.promptCustomization,
       projects: state.projects,
       trashedProjects: state.trashedProjects,
@@ -340,12 +338,10 @@ export async function loadMCPServersFromServer(): Promise<boolean> {
     }
 
     const mcpServers = result.settings.mcpServers || [];
-    const mcpAutoApproveTools = result.settings.mcpAutoApproveTools ?? true;
-    const mcpUnrestrictedTools = result.settings.mcpUnrestrictedTools ?? true;
 
     // Clear existing and add all from server
     // We need to update the store directly since we can't use hooks here
-    useAppStore.setState({ mcpServers, mcpAutoApproveTools, mcpUnrestrictedTools });
+    useAppStore.setState({ mcpServers });
 
     logger.info(`Loaded ${mcpServers.length} MCP servers from server`);
     return true;