From 5d678c2ead765800a52ab0b1eedba4a22f3e6480 Mon Sep 17 00:00:00 2001 From: Will Chen Date: Mon, 23 Jun 2025 23:08:29 -0700 Subject: [PATCH] Smart auto (#476) --- e2e-tests/engine.spec.ts | 31 +- ...-should-send-message-to-engine-1.aria.yml} | 0 ...r-auto-should-send-message-to-engine-1.txt | 376 ++++++++++++++++++ ...o-should-send-message-to-engine-1.aria.yml | 4 + ...-auto-should-send-message-to-engine-1.txt} | 4 +- src/components/ModelPicker.tsx | 38 +- src/ipc/shared/language_model_helpers.ts | 8 +- src/ipc/utils/get_model_client.ts | 65 ++- src/lib/schemas.ts | 7 + src/styles/globals.css | 9 + 10 files changed, 490 insertions(+), 52 deletions(-) rename e2e-tests/snapshots/{engine.spec.ts_auto-should-send-message-to-engine-1.aria.yml => engine.spec.ts_regular-auto-should-send-message-to-engine-1.aria.yml} (100%) create mode 100644 e2e-tests/snapshots/engine.spec.ts_regular-auto-should-send-message-to-engine-1.txt create mode 100644 e2e-tests/snapshots/engine.spec.ts_smart-auto-should-send-message-to-engine-1.aria.yml rename e2e-tests/snapshots/{engine.spec.ts_auto-should-send-message-to-engine-1.txt => engine.spec.ts_smart-auto-should-send-message-to-engine-1.txt} (99%) diff --git a/e2e-tests/engine.spec.ts b/e2e-tests/engine.spec.ts index 615e913..9f9a1d9 100644 --- a/e2e-tests/engine.spec.ts +++ b/e2e-tests/engine.spec.ts @@ -34,10 +34,29 @@ testSkipIfWindows( }, ); -testSkipIfWindows("auto should send message to engine", async ({ po }) => { - await po.setUpDyadPro(); - await po.sendPrompt("[dump] tc=turbo-edits"); +testSkipIfWindows( + "smart auto should send message to engine", + async ({ po }) => { + await po.setUpDyadPro(); + await po.sendPrompt("[dump] tc=turbo-edits"); - await po.snapshotServerDump("request"); - await po.snapshotMessages({ replaceDumpPath: true }); -}); + await po.snapshotServerDump("request"); + await po.snapshotMessages({ replaceDumpPath: true }); + }, +); + +testSkipIfWindows( + "regular auto should send message to engine", + async ({ po }) => { + await po.setUpDyadPro(); + const proModesDialog = await po.openProModesDialog({ + location: "home-chat-input-container", + }); + await proModesDialog.toggleSmartContext(); + await proModesDialog.close(); + await po.sendPrompt("[dump] tc=turbo-edits"); + + await po.snapshotServerDump("request"); + await po.snapshotMessages({ replaceDumpPath: true }); + }, +); diff --git a/e2e-tests/snapshots/engine.spec.ts_auto-should-send-message-to-engine-1.aria.yml b/e2e-tests/snapshots/engine.spec.ts_regular-auto-should-send-message-to-engine-1.aria.yml similarity index 100% rename from e2e-tests/snapshots/engine.spec.ts_auto-should-send-message-to-engine-1.aria.yml rename to e2e-tests/snapshots/engine.spec.ts_regular-auto-should-send-message-to-engine-1.aria.yml diff --git a/e2e-tests/snapshots/engine.spec.ts_regular-auto-should-send-message-to-engine-1.txt b/e2e-tests/snapshots/engine.spec.ts_regular-auto-should-send-message-to-engine-1.txt new file mode 100644 index 0000000..4917551 --- /dev/null +++ b/e2e-tests/snapshots/engine.spec.ts_regular-auto-should-send-message-to-engine-1.txt @@ -0,0 +1,376 @@ +{ + "body": { + "model": "dyad/auto", + "max_tokens": 32000, + "temperature": 0, + "messages": [ + { + "role": "system", + "content": "[[SYSTEM_MESSAGE]]" + }, + { + "role": "user", + "content": "[dump] tc=turbo-edits" + } + ], + "stream": true, + "thinking": { + "type": "enabled", + "include_thoughts": true + }, + "dyad_options": { + "files": [ + { + "path": "AI_RULES.md", + "content": "# Tech Stack\n\n- You are building a React application.\n- Use TypeScript.\n- Use React Router. KEEP the routes in src/App.tsx\n- Always put source code in the src folder.\n- Put pages into src/pages/\n- Put components into src/components/\n- The main page (default page) is src/pages/Index.tsx\n- UPDATE the main page to include the new components. OTHERWISE, the user can NOT see any components!\n- ALWAYS try to use the shadcn/ui library.\n- Tailwind CSS: always use Tailwind CSS for styling components. Utilize Tailwind classes extensively for layout, spacing, colors, and other design aspects.\n\nAvailable packages and libraries:\n\n- The lucide-react package is installed for icons.\n- You ALREADY have ALL the shadcn/ui components and their dependencies installed. So you don't need to install them again.\n- You have ALL the necessary Radix UI components installed.\n- Use prebuilt components from the shadcn/ui library after importing them. Note that these files shouldn't be edited, so make new components if you need to change them.\n", + "force": false + }, + { + "path": "eslint.config.js", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "index.html", + "content": "\n\n \n \n \n dyad-generated-app\n \n\n \n
\n \n \n\n", + "force": false + }, + { + "path": "package.json", + "content": "{\n \"dependencies\": {\n \"@hookform/resolvers\": \"^3.9.0\",\n \"@radix-ui/react-accordion\": \"^1.2.0\",\n \"@radix-ui/react-alert-dialog\": \"^1.1.1\",\n \"@radix-ui/react-aspect-ratio\": \"^1.1.0\",\n \"@radix-ui/react-avatar\": \"^1.1.0\",\n \"@radix-ui/react-checkbox\": \"^1.1.1\",\n \"@radix-ui/react-collapsible\": \"^1.1.0\",\n \"@radix-ui/react-context-menu\": \"^2.2.1\",\n \"@radix-ui/react-dialog\": \"^1.1.2\",\n \"@radix-ui/react-dropdown-menu\": \"^2.1.1\",\n \"@radix-ui/react-hover-card\": \"^1.1.1\",\n \"@radix-ui/react-label\": \"^2.1.0\",\n \"@radix-ui/react-menubar\": \"^1.1.1\",\n \"@radix-ui/react-navigation-menu\": \"^1.2.0\",\n \"@radix-ui/react-popover\": \"^1.1.1\",\n \"@radix-ui/react-progress\": \"^1.1.0\",\n \"@radix-ui/react-radio-group\": \"^1.2.0\",\n \"@radix-ui/react-scroll-area\": \"^1.1.0\",\n \"@radix-ui/react-select\": \"^2.1.1\",\n \"@radix-ui/react-separator\": \"^1.1.0\",\n \"@radix-ui/react-slider\": \"^1.2.0\",\n \"@radix-ui/react-slot\": \"^1.1.0\",\n \"@radix-ui/react-switch\": \"^1.1.0\",\n \"@radix-ui/react-tabs\": \"^1.1.0\",\n \"@radix-ui/react-toast\": \"^1.2.1\",\n \"@radix-ui/react-toggle\": \"^1.1.0\",\n \"@radix-ui/react-toggle-group\": \"^1.1.0\",\n \"@radix-ui/react-tooltip\": \"^1.1.4\",\n \"@tanstack/react-query\": \"^5.56.2\",\n \"class-variance-authority\": \"^0.7.1\",\n \"clsx\": \"^2.1.1\",\n \"cmdk\": \"^1.0.0\",\n \"date-fns\": \"^3.6.0\",\n \"embla-carousel-react\": \"^8.3.0\",\n \"input-otp\": \"^1.2.4\",\n \"lucide-react\": \"^0.462.0\",\n \"next-themes\": \"^0.3.0\",\n \"react\": \"^18.3.1\",\n \"react-day-picker\": \"^8.10.1\",\n \"react-dom\": \"^18.3.1\",\n \"react-hook-form\": \"^7.53.0\",\n \"react-resizable-panels\": \"^2.1.3\",\n \"react-router-dom\": \"^6.26.2\",\n \"recharts\": \"^2.12.7\",\n \"sonner\": \"^1.5.0\",\n \"tailwind-merge\": \"^2.5.2\",\n \"tailwindcss-animate\": \"^1.0.7\",\n \"vaul\": \"^0.9.3\",\n \"zod\": \"^3.23.8\"\n },\n \"devDependencies\": {\n \"@dyad-sh/react-vite-component-tagger\": \"^0.8.0\",\n \"@eslint/js\": \"^9.9.0\",\n \"@tailwindcss/typography\": \"^0.5.15\",\n \"@types/node\": \"^22.5.5\",\n \"@types/react\": \"^18.3.3\",\n \"@types/react-dom\": \"^18.3.0\",\n \"@vitejs/plugin-react-swc\": \"^3.9.0\",\n \"autoprefixer\": \"^10.4.20\",\n \"eslint\": \"^9.9.0\",\n \"eslint-plugin-react-hooks\": \"^5.1.0-rc.0\",\n \"eslint-plugin-react-refresh\": \"^0.4.9\",\n \"globals\": \"^15.9.0\",\n \"postcss\": \"^8.4.47\",\n \"tailwindcss\": \"^3.4.11\",\n \"typescript\": \"^5.5.3\",\n \"typescript-eslint\": \"^8.0.1\",\n \"vite\": \"^6.3.4\"\n }\n}", + "force": false + }, + { + "path": "postcss.config.js", + "content": "export default {\n plugins: {\n tailwindcss: {},\n autoprefixer: {},\n },\n};\n", + "force": false + }, + { + "path": "README.md", + "content": "# Welcome to your Dyad app\n", + "force": false + }, + { + "path": "src/App.css", + "content": "#root {\n max-width: 1280px;\n margin: 0 auto;\n padding: 2rem;\n text-align: center;\n}\n\n.logo {\n height: 6em;\n padding: 1.5em;\n will-change: filter;\n transition: filter 300ms;\n}\n.logo:hover {\n filter: drop-shadow(0 0 2em #646cffaa);\n}\n.logo.react:hover {\n filter: drop-shadow(0 0 2em #61dafbaa);\n}\n\n@keyframes logo-spin {\n from {\n transform: rotate(0deg);\n }\n to {\n transform: rotate(360deg);\n }\n}\n\n@media (prefers-reduced-motion: no-preference) {\n a:nth-of-type(2) .logo {\n animation: logo-spin infinite 20s linear;\n }\n}\n\n.card {\n padding: 2em;\n}\n\n.read-the-docs {\n color: #888;\n}\n", + "force": false + }, + { + "path": "src/App.tsx", + "content": "import { Toaster } from \"@/components/ui/toaster\";\nimport { Toaster as Sonner } from \"@/components/ui/sonner\";\nimport { TooltipProvider } from \"@/components/ui/tooltip\";\nimport { QueryClient, QueryClientProvider } from \"@tanstack/react-query\";\nimport { BrowserRouter, Routes, Route } from \"react-router-dom\";\nimport Index from \"./pages/Index\";\nimport NotFound from \"./pages/NotFound\";\n\nconst queryClient = new QueryClient();\n\nconst App = () => (\n \n \n \n \n \n \n } />\n {/* ADD ALL CUSTOM ROUTES ABOVE THE CATCH-ALL \"*\" ROUTE */}\n } />\n \n \n \n \n);\n\nexport default App;\n", + "force": false + }, + { + "path": "src/components/made-with-dyad.tsx", + "content": "export const MadeWithDyad = () => {\n return (\n
\n \n Made with Dyad\n \n
\n );\n};\n", + "force": false + }, + { + "path": "src/components/ui/accordion.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/alert-dialog.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/alert.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/aspect-ratio.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/avatar.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/badge.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/breadcrumb.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/button.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/calendar.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/card.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/carousel.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/chart.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/checkbox.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/collapsible.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/command.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/context-menu.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/dialog.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/drawer.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/dropdown-menu.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/form.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/hover-card.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/input-otp.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/input.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/label.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/menubar.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/navigation-menu.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/pagination.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/popover.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/progress.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/radio-group.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/resizable.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/scroll-area.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/select.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/separator.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/sheet.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/sidebar.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/skeleton.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/slider.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/sonner.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/switch.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/table.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/tabs.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/textarea.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/toast.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/toaster.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/toggle-group.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/toggle.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/tooltip.tsx", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/components/ui/use-toast.ts", + "content": "// Contents omitted for brevity", + "force": false + }, + { + "path": "src/globals.css", + "content": "@tailwind base;\n@tailwind components;\n@tailwind utilities;\n\n@layer base {\n :root {\n --background: 0 0% 100%;\n --foreground: 222.2 84% 4.9%;\n\n --card: 0 0% 100%;\n --card-foreground: 222.2 84% 4.9%;\n\n --popover: 0 0% 100%;\n --popover-foreground: 222.2 84% 4.9%;\n\n --primary: 222.2 47.4% 11.2%;\n --primary-foreground: 210 40% 98%;\n\n --secondary: 210 40% 96.1%;\n --secondary-foreground: 222.2 47.4% 11.2%;\n\n --muted: 210 40% 96.1%;\n --muted-foreground: 215.4 16.3% 46.9%;\n\n --accent: 210 40% 96.1%;\n --accent-foreground: 222.2 47.4% 11.2%;\n\n --destructive: 0 84.2% 60.2%;\n --destructive-foreground: 210 40% 98%;\n\n --border: 214.3 31.8% 91.4%;\n --input: 214.3 31.8% 91.4%;\n --ring: 222.2 84% 4.9%;\n\n --radius: 0.5rem;\n\n --sidebar-background: 0 0% 98%;\n\n --sidebar-foreground: 240 5.3% 26.1%;\n\n --sidebar-primary: 240 5.9% 10%;\n\n --sidebar-primary-foreground: 0 0% 98%;\n\n --sidebar-accent: 240 4.8% 95.9%;\n\n --sidebar-accent-foreground: 240 5.9% 10%;\n\n --sidebar-border: 220 13% 91%;\n\n --sidebar-ring: 217.2 91.2% 59.8%;\n }\n\n .dark {\n --background: 222.2 84% 4.9%;\n --foreground: 210 40% 98%;\n\n --card: 222.2 84% 4.9%;\n --card-foreground: 210 40% 98%;\n\n --popover: 222.2 84% 4.9%;\n --popover-foreground: 210 40% 98%;\n\n --primary: 210 40% 98%;\n --primary-foreground: 222.2 47.4% 11.2%;\n\n --secondary: 217.2 32.6% 17.5%;\n --secondary-foreground: 210 40% 98%;\n\n --muted: 217.2 32.6% 17.5%;\n --muted-foreground: 215 20.2% 65.1%;\n\n --accent: 217.2 32.6% 17.5%;\n --accent-foreground: 210 40% 98%;\n\n --destructive: 0 62.8% 30.6%;\n --destructive-foreground: 210 40% 98%;\n\n --border: 217.2 32.6% 17.5%;\n --input: 217.2 32.6% 17.5%;\n --ring: 212.7 26.8% 83.9%;\n --sidebar-background: 240 5.9% 10%;\n --sidebar-foreground: 240 4.8% 95.9%;\n --sidebar-primary: 224.3 76.3% 48%;\n --sidebar-primary-foreground: 0 0% 100%;\n --sidebar-accent: 240 3.7% 15.9%;\n --sidebar-accent-foreground: 240 4.8% 95.9%;\n --sidebar-border: 240 3.7% 15.9%;\n --sidebar-ring: 217.2 91.2% 59.8%;\n }\n}\n\n@layer base {\n * {\n @apply border-border;\n }\n\n body {\n @apply bg-background text-foreground;\n }\n}\n", + "force": false + }, + { + "path": "src/hooks/use-mobile.tsx", + "content": "import * as React from \"react\";\n\nconst MOBILE_BREAKPOINT = 768;\n\nexport function useIsMobile() {\n const [isMobile, setIsMobile] = React.useState(\n undefined,\n );\n\n React.useEffect(() => {\n const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`);\n const onChange = () => {\n setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);\n };\n mql.addEventListener(\"change\", onChange);\n setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);\n return () => mql.removeEventListener(\"change\", onChange);\n }, []);\n\n return !!isMobile;\n}\n", + "force": false + }, + { + "path": "src/hooks/use-toast.ts", + "content": "import * as React from \"react\";\n\nimport type { ToastActionElement, ToastProps } from \"@/components/ui/toast\";\n\nconst TOAST_LIMIT = 1;\nconst TOAST_REMOVE_DELAY = 1000000;\n\ntype ToasterToast = ToastProps & {\n id: string;\n title?: React.ReactNode;\n description?: React.ReactNode;\n action?: ToastActionElement;\n};\n\nconst _actionTypes = {\n ADD_TOAST: \"ADD_TOAST\",\n UPDATE_TOAST: \"UPDATE_TOAST\",\n DISMISS_TOAST: \"DISMISS_TOAST\",\n REMOVE_TOAST: \"REMOVE_TOAST\",\n} as const;\n\nlet count = 0;\n\nfunction genId() {\n count = (count + 1) % Number.MAX_SAFE_INTEGER;\n return count.toString();\n}\n\ntype ActionType = typeof _actionTypes;\n\ntype Action =\n | {\n type: ActionType[\"ADD_TOAST\"];\n toast: ToasterToast;\n }\n | {\n type: ActionType[\"UPDATE_TOAST\"];\n toast: Partial;\n }\n | {\n type: ActionType[\"DISMISS_TOAST\"];\n toastId?: ToasterToast[\"id\"];\n }\n | {\n type: ActionType[\"REMOVE_TOAST\"];\n toastId?: ToasterToast[\"id\"];\n };\n\ninterface State {\n toasts: ToasterToast[];\n}\n\nconst toastTimeouts = new Map>();\n\nconst addToRemoveQueue = (toastId: string) => {\n if (toastTimeouts.has(toastId)) {\n return;\n }\n\n const timeout = setTimeout(() => {\n toastTimeouts.delete(toastId);\n dispatch({\n type: \"REMOVE_TOAST\",\n toastId: toastId,\n });\n }, TOAST_REMOVE_DELAY);\n\n toastTimeouts.set(toastId, timeout);\n};\n\nexport const reducer = (state: State, action: Action): State => {\n switch (action.type) {\n case \"ADD_TOAST\":\n return {\n ...state,\n toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT),\n };\n\n case \"UPDATE_TOAST\":\n return {\n ...state,\n toasts: state.toasts.map((t) =>\n t.id === action.toast.id ? { ...t, ...action.toast } : t,\n ),\n };\n\n case \"DISMISS_TOAST\": {\n const { toastId } = action;\n\n // ! Side effects ! - This could be extracted into a dismissToast() action,\n // but I'll keep it here for simplicity\n if (toastId) {\n addToRemoveQueue(toastId);\n } else {\n state.toasts.forEach((toast) => {\n addToRemoveQueue(toast.id);\n });\n }\n\n return {\n ...state,\n toasts: state.toasts.map((t) =>\n t.id === toastId || toastId === undefined\n ? {\n ...t,\n open: false,\n }\n : t,\n ),\n };\n }\n case \"REMOVE_TOAST\":\n if (action.toastId === undefined) {\n return {\n ...state,\n toasts: [],\n };\n }\n return {\n ...state,\n toasts: state.toasts.filter((t) => t.id !== action.toastId),\n };\n }\n};\n\nconst listeners: Array<(state: State) => void> = [];\n\nlet memoryState: State = { toasts: [] };\n\nfunction dispatch(action: Action) {\n memoryState = reducer(memoryState, action);\n listeners.forEach((listener) => {\n listener(memoryState);\n });\n}\n\ntype Toast = Omit;\n\nfunction toast({ ...props }: Toast) {\n const id = genId();\n\n const update = (props: ToasterToast) =>\n dispatch({\n type: \"UPDATE_TOAST\",\n toast: { ...props, id },\n });\n const dismiss = () => dispatch({ type: \"DISMISS_TOAST\", toastId: id });\n\n dispatch({\n type: \"ADD_TOAST\",\n toast: {\n ...props,\n id,\n open: true,\n onOpenChange: (open) => {\n if (!open) dismiss();\n },\n },\n });\n\n return {\n id: id,\n dismiss,\n update,\n };\n}\n\nfunction useToast() {\n const [state, setState] = React.useState(memoryState);\n\n React.useEffect(() => {\n listeners.push(setState);\n return () => {\n const index = listeners.indexOf(setState);\n if (index > -1) {\n listeners.splice(index, 1);\n }\n };\n }, [state]);\n\n return {\n ...state,\n toast,\n dismiss: (toastId?: string) => dispatch({ type: \"DISMISS_TOAST\", toastId }),\n };\n}\n\nexport { useToast, toast };\n", + "force": false + }, + { + "path": "src/lib/utils.ts", + "content": "import { clsx, type ClassValue } from \"clsx\";\nimport { twMerge } from \"tailwind-merge\";\n\nexport function cn(...inputs: ClassValue[]) {\n return twMerge(clsx(inputs));\n}\n", + "force": false + }, + { + "path": "src/main.tsx", + "content": "import { createRoot } from \"react-dom/client\";\nimport App from \"./App.tsx\";\nimport \"./globals.css\";\n\ncreateRoot(document.getElementById(\"root\")!).render();\n", + "force": false + }, + { + "path": "src/pages/Index.tsx", + "content": "// Update this page (the content is just a fallback if you fail to update the page)\n\nimport { MadeWithDyad } from \"@/components/made-with-dyad\";\n\nconst Index = () => {\n return (\n
\n
\n

Welcome to Your Blank App

\n

\n Start building your amazing project here!\n

\n
\n \n
\n );\n};\n\nexport default Index;\n", + "force": false + }, + { + "path": "src/pages/NotFound.tsx", + "content": "import { useLocation } from \"react-router-dom\";\nimport { useEffect } from \"react\";\n\nconst NotFound = () => {\n const location = useLocation();\n\n useEffect(() => {\n console.error(\n \"404 Error: User attempted to access non-existent route:\",\n location.pathname,\n );\n }, [location.pathname]);\n\n return (\n
\n
\n

404

\n

Oops! Page not found

\n \n Return to Home\n \n
\n
\n );\n};\n\nexport default NotFound;\n", + "force": false + }, + { + "path": "src/utils/toast.ts", + "content": "import { toast } from \"sonner\";\n\nexport const showSuccess = (message: string) => {\n toast.success(message);\n};\n\nexport const showError = (message: string) => {\n toast.error(message);\n};\n\nexport const showLoading = (message: string) => {\n return toast.loading(message);\n};\n\nexport const dismissToast = (toastId: string) => {\n toast.dismiss(toastId);\n};\n", + "force": false + }, + { + "path": "src/vite-env.d.ts", + "content": "/// \n", + "force": false + }, + { + "path": "tailwind.config.ts", + "content": "import type { Config } from \"tailwindcss\";\n\nexport default {\n darkMode: [\"class\"],\n content: [\n \"./pages/**/*.{ts,tsx}\",\n \"./components/**/*.{ts,tsx}\",\n \"./app/**/*.{ts,tsx}\",\n \"./src/**/*.{ts,tsx}\",\n ],\n prefix: \"\",\n theme: {\n container: {\n center: true,\n padding: \"2rem\",\n screens: {\n \"2xl\": \"1400px\",\n },\n },\n extend: {\n colors: {\n border: \"hsl(var(--border))\",\n input: \"hsl(var(--input))\",\n ring: \"hsl(var(--ring))\",\n background: \"hsl(var(--background))\",\n foreground: \"hsl(var(--foreground))\",\n primary: {\n DEFAULT: \"hsl(var(--primary))\",\n foreground: \"hsl(var(--primary-foreground))\",\n },\n secondary: {\n DEFAULT: \"hsl(var(--secondary))\",\n foreground: \"hsl(var(--secondary-foreground))\",\n },\n destructive: {\n DEFAULT: \"hsl(var(--destructive))\",\n foreground: \"hsl(var(--destructive-foreground))\",\n },\n muted: {\n DEFAULT: \"hsl(var(--muted))\",\n foreground: \"hsl(var(--muted-foreground))\",\n },\n accent: {\n DEFAULT: \"hsl(var(--accent))\",\n foreground: \"hsl(var(--accent-foreground))\",\n },\n popover: {\n DEFAULT: \"hsl(var(--popover))\",\n foreground: \"hsl(var(--popover-foreground))\",\n },\n card: {\n DEFAULT: \"hsl(var(--card))\",\n foreground: \"hsl(var(--card-foreground))\",\n },\n sidebar: {\n DEFAULT: \"hsl(var(--sidebar-background))\",\n foreground: \"hsl(var(--sidebar-foreground))\",\n primary: \"hsl(var(--sidebar-primary))\",\n \"primary-foreground\": \"hsl(var(--sidebar-primary-foreground))\",\n accent: \"hsl(var(--sidebar-accent))\",\n \"accent-foreground\": \"hsl(var(--sidebar-accent-foreground))\",\n border: \"hsl(var(--sidebar-border))\",\n ring: \"hsl(var(--sidebar-ring))\",\n },\n },\n borderRadius: {\n lg: \"var(--radius)\",\n md: \"calc(var(--radius) - 2px)\",\n sm: \"calc(var(--radius) - 4px)\",\n },\n keyframes: {\n \"accordion-down\": {\n from: {\n height: \"0\",\n },\n to: {\n height: \"var(--radix-accordion-content-height)\",\n },\n },\n \"accordion-up\": {\n from: {\n height: \"var(--radix-accordion-content-height)\",\n },\n to: {\n height: \"0\",\n },\n },\n },\n animation: {\n \"accordion-down\": \"accordion-down 0.2s ease-out\",\n \"accordion-up\": \"accordion-up 0.2s ease-out\",\n },\n },\n },\n plugins: [require(\"tailwindcss-animate\")],\n} satisfies Config;\n", + "force": false + }, + { + "path": "vite.config.ts", + "content": "import { defineConfig } from \"vite\";\nimport dyadComponentTagger from \"@dyad-sh/react-vite-component-tagger\";\nimport react from \"@vitejs/plugin-react-swc\";\nimport path from \"path\";\n\nexport default defineConfig(() => ({\n server: {\n host: \"::\",\n port: 8080,\n },\n plugins: [dyadComponentTagger(), react()],\n resolve: {\n alias: {\n \"@\": path.resolve(__dirname, \"./src\"),\n },\n },\n}));\n", + "force": false + } + ], + "enable_lazy_edits": true, + "enable_smart_files_context": false + } + }, + "headers": { + "authorization": "Bearer testdyadkey" + } +} \ No newline at end of file diff --git a/e2e-tests/snapshots/engine.spec.ts_smart-auto-should-send-message-to-engine-1.aria.yml b/e2e-tests/snapshots/engine.spec.ts_smart-auto-should-send-message-to-engine-1.aria.yml new file mode 100644 index 0000000..6d4ab6f --- /dev/null +++ b/e2e-tests/snapshots/engine.spec.ts_smart-auto-should-send-message-to-engine-1.aria.yml @@ -0,0 +1,4 @@ +- paragraph: "[dump] tc=turbo-edits" +- paragraph: "[[dyad-dump-path=*]]" +- button "Retry": + - img \ No newline at end of file diff --git a/e2e-tests/snapshots/engine.spec.ts_auto-should-send-message-to-engine-1.txt b/e2e-tests/snapshots/engine.spec.ts_smart-auto-should-send-message-to-engine-1.txt similarity index 99% rename from e2e-tests/snapshots/engine.spec.ts_auto-should-send-message-to-engine-1.txt rename to e2e-tests/snapshots/engine.spec.ts_smart-auto-should-send-message-to-engine-1.txt index 054ea1a..9b7d0a6 100644 --- a/e2e-tests/snapshots/engine.spec.ts_auto-should-send-message-to-engine-1.txt +++ b/e2e-tests/snapshots/engine.spec.ts_smart-auto-should-send-message-to-engine-1.txt @@ -1,7 +1,7 @@ { "body": { - "model": "gemini/gemini-2.5-flash", - "max_tokens": 8000, + "model": "dyad/auto", + "max_tokens": 32000, "temperature": 0, "messages": [ { diff --git a/src/components/ModelPicker.tsx b/src/components/ModelPicker.tsx index a3ad689..b715fa7 100644 --- a/src/components/ModelPicker.tsx +++ b/src/components/ModelPicker.tsx @@ -1,4 +1,4 @@ -import type { LargeLanguageModel } from "@/lib/schemas"; +import { isDyadProEnabled, type LargeLanguageModel } from "@/lib/schemas"; import { Button } from "@/components/ui/button"; import { Tooltip, @@ -119,6 +119,8 @@ export function ModelPicker() { return null; } const selectedModel = settings?.selectedModel; + const isSmartAutoEnabled = + settings.enableProSmartFilesContextMode && isDyadProEnabled(settings); const modelDisplayName = getModelDisplayName(); return ( @@ -190,21 +192,37 @@ export function ModelPicker() { >
- {model.displayName} - - auto + + {isSmartAutoEnabled + ? "Smart Auto" + : model.displayName} - {model.tag && ( - - {model.tag} - - )} +
+ {isSmartAutoEnabled && ( + + Dyad Pro + + )} + {model.tag && ( + + {model.tag} + + )} +
- {model.description} + {isSmartAutoEnabled ? ( +

+ Smart Auto uses a cheaper model for + easier tasks +
and a flagship model for harder tasks +

+ ) : ( + model.description + )} ))} diff --git a/src/ipc/shared/language_model_helpers.ts b/src/ipc/shared/language_model_helpers.ts index 068220f..bd594e6 100644 --- a/src/ipc/shared/language_model_helpers.ts +++ b/src/ipc/shared/language_model_helpers.ts @@ -8,6 +8,7 @@ import { eq } from "drizzle-orm"; export const PROVIDERS_THAT_SUPPORT_THINKING: (keyof typeof MODEL_OPTIONS)[] = [ "google", + "auto", ]; export interface ModelOption { @@ -139,6 +140,11 @@ export const MODEL_OPTIONS: Record = { displayName: "Auto", description: "Automatically selects the best model", tag: "Default", + // These are below Gemini 2.5 Pro & Flash limits + // which are the ones defaulted to for both regular auto + // and smart auto. + maxOutputTokens: 32_000, + contextWindow: 1_000_000, }, ], }; @@ -186,7 +192,7 @@ export const CLOUD_PROVIDERS: Record< auto: { displayName: "Dyad", websiteUrl: "https://academy.dyad.sh/settings", - gatewayPrefix: "", + gatewayPrefix: "dyad/", }, }; diff --git a/src/ipc/utils/get_model_client.ts b/src/ipc/utils/get_model_client.ts index 4d31847..8a94d39 100644 --- a/src/ipc/utils/get_model_client.ts +++ b/src/ipc/utils/get_model_client.ts @@ -54,39 +54,6 @@ export async function getModelClient( const allProviders = await getLanguageModelProviders(); const dyadApiKey = settings.providerSettings?.auto?.apiKey?.value; - // Handle 'auto' provider by trying each model in AUTO_MODELS until one works - if (model.provider === "auto") { - for (const autoModel of AUTO_MODELS) { - const providerInfo = allProviders.find( - (p) => p.id === autoModel.provider, - ); - const envVarName = providerInfo?.envVarName; - - const apiKey = - dyadApiKey || - settings.providerSettings?.[autoModel.provider]?.apiKey?.value || - (envVarName ? getEnvVar(envVarName) : undefined); - - if (apiKey) { - logger.log( - `Using provider: ${autoModel.provider} model: ${autoModel.name}`, - ); - // Recursively call with the specific model found - return await getModelClient( - { - provider: autoModel.provider, - name: autoModel.name, - }, - settings, - files, - ); - } - } - // If no models have API keys, throw an error - throw new Error( - "No API keys available for any model supported by the 'auto' provider.", - ); - } // --- Handle specific provider --- const providerConfig = allProviders.find((p) => p.id === model.provider); @@ -161,6 +128,38 @@ export async function getModelClient( // Fall through to regular provider logic if gateway prefix is missing } } + // Handle 'auto' provider by trying each model in AUTO_MODELS until one works + if (model.provider === "auto") { + for (const autoModel of AUTO_MODELS) { + const providerInfo = allProviders.find( + (p) => p.id === autoModel.provider, + ); + const envVarName = providerInfo?.envVarName; + + const apiKey = + settings.providerSettings?.[autoModel.provider]?.apiKey?.value || + (envVarName ? getEnvVar(envVarName) : undefined); + + if (apiKey) { + logger.log( + `Using provider: ${autoModel.provider} model: ${autoModel.name}`, + ); + // Recursively call with the specific model found + return await getModelClient( + { + provider: autoModel.provider, + name: autoModel.name, + }, + settings, + files, + ); + } + } + // If no models have API keys, throw an error + throw new Error( + "No API keys available for any model supported by the 'auto' provider.", + ); + } return getRegularModelClient(model, settings, providerConfig); } diff --git a/src/lib/schemas.ts b/src/lib/schemas.ts index f9e0a28..9ec2f6d 100644 --- a/src/lib/schemas.ts +++ b/src/lib/schemas.ts @@ -168,6 +168,13 @@ export const UserSettingsSchema = z.object({ */ export type UserSettings = z.infer; +export function isDyadProEnabled(settings: UserSettings): boolean { + return ( + settings.enableDyadPro === true && + !!settings.providerSettings?.auto?.apiKey?.value + ); +} + // Define interfaces for the props export interface SecurityRisk { type: "warning" | "danger"; diff --git a/src/styles/globals.css b/src/styles/globals.css index 46fad13..651ca39 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -290,6 +290,15 @@ } } +@keyframes shimmer { + 0% { + background-position: -200% 0; + } + 100% { + background-position: 200% 0; + } +} + .animate-marquee { animation: marquee 2s linear infinite; }