From eb36ec6170bc7c943b57033dfe5a7169db5fb55d Mon Sep 17 00:00:00 2001 From: Rob Koch Date: Sat, 7 Dec 2024 18:11:38 -0800 Subject: [PATCH 01/21] basic context menu for folders --- app/components/workbench/FileTree.tsx | 75 +++++++++++++++++++++------ package.json | 1 + 2 files changed, 60 insertions(+), 16 deletions(-) diff --git a/app/components/workbench/FileTree.tsx b/app/components/workbench/FileTree.tsx index 0882e1f..5b6e7a9 100644 --- a/app/components/workbench/FileTree.tsx +++ b/app/components/workbench/FileTree.tsx @@ -2,6 +2,7 @@ import { memo, useEffect, useMemo, useState, type ReactNode } from 'react'; import type { FileMap } from '~/lib/stores/files'; import { classNames } from '~/utils/classNames'; import { createScopedLogger, renderLogger } from '~/utils/logger'; +import * as ContextMenu from '@radix-ui/react-context-menu'; const logger = createScopedLogger('FileTree'); @@ -159,23 +160,65 @@ interface FolderProps { onClick: () => void; } -function Folder({ folder: { depth, name }, collapsed, selected = false, onClick }: FolderProps) { +interface FolderContextMenuProps { + children: ReactNode; +} + +function ContextMenuItem({ children }: { children: ReactNode }) { return ( - - {name} - + + + {children} + + ); +} + +function FolderContextMenu({ children }: FolderContextMenuProps) { + return ( + + {children} + + + + New file... + New folder... + + + Copy path + Copy relative path + + + Rename... + Delete + + + + + ); +} + +function Folder({ folder, collapsed, selected = false, onClick }: FolderProps) { + return ( + + + {folder.name} + + ); } diff --git a/package.json b/package.json index 15f4d99..6463c96 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "@octokit/rest": "^21.0.2", "@octokit/types": "^13.6.2", "@openrouter/ai-sdk-provider": "^0.0.5", + "@radix-ui/react-context-menu": "^2.2.2", "@radix-ui/react-dialog": "^1.1.2", "@radix-ui/react-dropdown-menu": "^2.1.2", "@radix-ui/react-separator": "^1.1.0", From 13a15e9a3d29597b02d8597898cf9087a9c78d05 Mon Sep 17 00:00:00 2001 From: Rob Koch Date: Sun, 8 Dec 2024 15:22:46 -0800 Subject: [PATCH 02/21] copyPath and copyRelativePath for files and folders --- app/components/workbench/FileTree.tsx | 107 ++++++++++++++++++-------- 1 file changed, 73 insertions(+), 34 deletions(-) diff --git a/app/components/workbench/FileTree.tsx b/app/components/workbench/FileTree.tsx index 5b6e7a9..eb185cb 100644 --- a/app/components/workbench/FileTree.tsx +++ b/app/components/workbench/FileTree.tsx @@ -111,6 +111,22 @@ export const FileTree = memo( }); }; + const onCopyPath = (fileOrFolder: FileNode | FolderNode) => { + try { + navigator.clipboard.writeText(fileOrFolder.fullPath); + } catch (error) { + logger.error(error); + } + }; + + const onCopyRelativePath = (fileOrFolder: FileNode | FolderNode) => { + try { + navigator.clipboard.writeText(fileOrFolder.fullPath.substring((rootFolder || '').length)); + } catch (error) { + logger.error(error); + } + }; + return (
{filteredFileList.map((fileOrFolder) => { @@ -122,6 +138,12 @@ export const FileTree = memo( selected={selectedFile === fileOrFolder.fullPath} file={fileOrFolder} unsavedChanges={unsavedFiles?.has(fileOrFolder.fullPath)} + onCopyPath={() => { + onCopyPath(fileOrFolder); + }} + onCopyRelativePath={() => { + onCopyRelativePath(fileOrFolder); + }} onClick={() => { onFileSelect?.(fileOrFolder.fullPath); }} @@ -135,6 +157,12 @@ export const FileTree = memo( folder={fileOrFolder} selected={allowFolderSelection && selectedFile === fileOrFolder.fullPath} collapsed={collapsedFolders.has(fileOrFolder.fullPath)} + onCopyPath={() => { + onCopyPath(fileOrFolder); + }} + onCopyRelativePath={() => { + onCopyRelativePath(fileOrFolder); + }} onClick={() => { toggleCollapseState(fileOrFolder.fullPath); }} @@ -157,23 +185,30 @@ interface FolderProps { folder: FolderNode; collapsed: boolean; selected?: boolean; + onCopyPath: () => void; + onCopyRelativePath: () => void; onClick: () => void; } interface FolderContextMenuProps { + onCopyPath?: () => void; + onCopyRelativePath?: () => void; children: ReactNode; } -function ContextMenuItem({ children }: { children: ReactNode }) { +function ContextMenuItem({ onSelect, children }: { onSelect?: () => void; children: ReactNode }) { return ( - + {children} ); } -function FolderContextMenu({ children }: FolderContextMenuProps) { +function FileContextMenu({ onCopyPath, onCopyRelativePath, children }: FolderContextMenuProps) { return ( {children} @@ -183,16 +218,8 @@ function FolderContextMenu({ children }: FolderContextMenuProps) { className="border border-bolt-elements-borderColor rounded-md z-context-menu bg-bolt-elements-background-depth-1 dark:bg-bolt-elements-background-depth-2 data-[state=open]:animate-in animate-duration-100 data-[state=open]:fade-in-0 data-[state=open]:zoom-in-98 w-56" > - New file... - New folder... - - - Copy path - Copy relative path - - - Rename... - Delete + Copy path + Copy relative path @@ -200,9 +227,9 @@ function FolderContextMenu({ children }: FolderContextMenuProps) { ); } -function Folder({ folder, collapsed, selected = false, onClick }: FolderProps) { +function Folder({ folder, collapsed, selected = false, onCopyPath, onCopyRelativePath, onClick }: FolderProps) { return ( - + {folder.name} - + ); } @@ -226,31 +253,43 @@ interface FileProps { file: FileNode; selected: boolean; unsavedChanges?: boolean; + onCopyPath: () => void; + onCopyRelativePath: () => void; onClick: () => void; } -function File({ file: { depth, name }, onClick, selected, unsavedChanges = false }: FileProps) { +function File({ + file: { depth, name }, + onClick, + onCopyPath, + onCopyRelativePath, + selected, + unsavedChanges = false, +}: FileProps) { return ( - -
+ -
{name}
- {unsavedChanges && } -
- +
+
{name}
+ {unsavedChanges && } +
+ + ); } From 6eb2d84dfffd9ebada1167a6fef4aec20998b87c Mon Sep 17 00:00:00 2001 From: Rob Koch Date: Sun, 8 Dec 2024 16:31:53 -0800 Subject: [PATCH 03/21] pnpm lock file --- pnpm-lock.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e355d04..17bdc89 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -95,6 +95,9 @@ importers: '@openrouter/ai-sdk-provider': specifier: ^0.0.5 version: 0.0.5(zod@3.23.8) + '@radix-ui/react-context-menu': + specifier: ^2.2.2 + version: 2.2.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-dialog': specifier: ^1.1.2 version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1557,6 +1560,19 @@ packages: '@types/react': optional: true + '@radix-ui/react-context-menu@2.2.2': + resolution: {integrity: sha512-99EatSTpW+hRYHt7m8wdDlLtkmTovEe8Z/hnxUPV+SKuuNL5HWNhQI4QSdjZqNSgXHay2z4M3Dym73j9p2Gx5Q==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc + react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + '@radix-ui/react-context@1.1.0': resolution: {integrity: sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==} peerDependencies: @@ -7032,6 +7048,20 @@ snapshots: optionalDependencies: '@types/react': 18.3.12 + '@radix-ui/react-context-menu@2.2.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@radix-ui/primitive': 1.1.0 + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-menu': 2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + optionalDependencies: + '@types/react': 18.3.12 + '@types/react-dom': 18.3.1 + '@radix-ui/react-context@1.1.0(@types/react@18.3.12)(react@18.3.1)': dependencies: react: 18.3.1 From 8bcd82c9d40f53792a34cf97546ddc15f3e51d51 Mon Sep 17 00:00:00 2001 From: Meet Patel <113581962+meetpateltech@users.noreply.github.com> Date: Sat, 14 Dec 2024 11:59:10 +0530 Subject: [PATCH 04/21] feat: added perplexity model --- .env.example | 5 +++++ app/commit.json | 2 +- app/lib/.server/llm/api-key.ts | 2 ++ app/lib/.server/llm/model.ts | 11 +++++++++++ app/utils/constants.ts | 24 ++++++++++++++++++++++++ worker-configuration.d.ts | 1 + 6 files changed, 44 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 7306f36..5baa3d4 100644 --- a/.env.example +++ b/.env.example @@ -70,6 +70,11 @@ LMSTUDIO_API_BASE_URL= # You only need this environment variable set if you want to use xAI models XAI_API_KEY= +# Get your Perplexity API Key here - +# https://www.perplexity.ai/settings/api +# You only need this environment variable set if you want to use Perplexity models +PERPLEXITY_API_KEY= + # Include this environment variable if you want more logging for debugging locally VITE_LOG_LEVEL=debug diff --git a/app/commit.json b/app/commit.json index beebd2b..ff64112 100644 --- a/app/commit.json +++ b/app/commit.json @@ -1 +1 @@ -{ "commit": "55094392cf4c5bc607aff796680ad50236a4cf20" } +{ "commit": "9666b2ab67d25345542722ab9d870b36ad06252e" } diff --git a/app/lib/.server/llm/api-key.ts b/app/lib/.server/llm/api-key.ts index 30cf2cd..e82d08e 100644 --- a/app/lib/.server/llm/api-key.ts +++ b/app/lib/.server/llm/api-key.ts @@ -39,6 +39,8 @@ export function getAPIKey(cloudflareEnv: Env, provider: string, userApiKeys?: Re return env.TOGETHER_API_KEY || cloudflareEnv.TOGETHER_API_KEY; case 'xAI': return env.XAI_API_KEY || cloudflareEnv.XAI_API_KEY; + case 'Perplexity': + return env.PERPLEXITY_API_KEY || cloudflareEnv.PERPLEXITY_API_KEY; case 'Cohere': return env.COHERE_API_KEY; case 'AzureOpenAI': diff --git a/app/lib/.server/llm/model.ts b/app/lib/.server/llm/model.ts index 2588c2b..1a5aab7 100644 --- a/app/lib/.server/llm/model.ts +++ b/app/lib/.server/llm/model.ts @@ -128,6 +128,15 @@ export function getXAIModel(apiKey: OptionalApiKey, model: string) { return openai(model); } +export function getPerplexityModel(apiKey: OptionalApiKey, model: string) { + const perplexity = createOpenAI({ + baseURL: 'https://api.perplexity.ai/', + apiKey, + }); + + return perplexity(model); +} + export function getModel( provider: string, model: string, @@ -170,6 +179,8 @@ export function getModel( return getXAIModel(apiKey, model); case 'Cohere': return getCohereAIModel(apiKey, model); + case 'Perplexity': + return getPerplexityModel(apiKey, model); default: return getOllamaModel(baseURL, model); } diff --git a/app/utils/constants.ts b/app/utils/constants.ts index 3247fb2..f312c73 100644 --- a/app/utils/constants.ts +++ b/app/utils/constants.ts @@ -292,6 +292,30 @@ const PROVIDER_LIST: ProviderInfo[] = [ ], getApiKeyLink: 'https://api.together.xyz/settings/api-keys', }, + { + name: 'Perplexity', + staticModels: [ + { + name: 'llama-3.1-sonar-small-128k-online', + label: 'Sonar Small Online', + provider: 'Perplexity', + maxTokenAllowed: 8192, + }, + { + name: 'llama-3.1-sonar-large-128k-online', + label: 'Sonar Large Online', + provider: 'Perplexity', + maxTokenAllowed: 8192, + }, + { + name: 'llama-3.1-sonar-huge-128k-online', + label: 'Sonar Huge Online', + provider: 'Perplexity', + maxTokenAllowed: 8192, + }, + ], + getApiKeyLink: 'https://www.perplexity.ai/settings/api', + }, ]; export const DEFAULT_PROVIDER = PROVIDER_LIST[0]; diff --git a/worker-configuration.d.ts b/worker-configuration.d.ts index 4eaf210..ed2afca 100644 --- a/worker-configuration.d.ts +++ b/worker-configuration.d.ts @@ -14,4 +14,5 @@ interface Env { GOOGLE_GENERATIVE_AI_API_KEY: string; MISTRAL_API_KEY: string; XAI_API_KEY: string; + PERPLEXITY_API_KEY: string; } From 1e73e8863a904e95ba21f9ed5b2307a78b6d0ebd Mon Sep 17 00:00:00 2001 From: Dustin Loring Date: Sat, 14 Dec 2024 19:30:36 -0500 Subject: [PATCH 05/21] ui-ux: Setting Modal Changes Enhancement - move the connection tab below chat history in left side of settings Enhancement - on chat tab Delete all chats, should prompt to make sure you want to Enhancement - Debug tab change copy debug info from a popup to a toast notification --- app/components/settings/SettingsWindow.tsx | 2 +- app/components/settings/chat-history/ChatHistoryTab.tsx | 8 +++++--- app/components/settings/debug/DebugTab.tsx | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/components/settings/SettingsWindow.tsx b/app/components/settings/SettingsWindow.tsx index aae0a86..541323f 100644 --- a/app/components/settings/SettingsWindow.tsx +++ b/app/components/settings/SettingsWindow.tsx @@ -27,8 +27,8 @@ export const SettingsWindow = ({ open, onClose }: SettingsProps) => { const tabs: { id: TabType; label: string; icon: string; component?: ReactElement }[] = [ { id: 'chat-history', label: 'Chat History', icon: 'i-ph:book', component: }, { id: 'providers', label: 'Providers', icon: 'i-ph:key', component: }, - { id: 'features', label: 'Features', icon: 'i-ph:star', component: }, { id: 'connection', label: 'Connection', icon: 'i-ph:link', component: }, + { id: 'features', label: 'Features', icon: 'i-ph:star', component: }, ...(debug ? [ { diff --git a/app/components/settings/chat-history/ChatHistoryTab.tsx b/app/components/settings/chat-history/ChatHistoryTab.tsx index 76a0f21..bd98f3d 100644 --- a/app/components/settings/chat-history/ChatHistoryTab.tsx +++ b/app/components/settings/chat-history/ChatHistoryTab.tsx @@ -22,17 +22,20 @@ export default function ChatHistoryTab() { }; const handleDeleteAllChats = async () => { + const confirmDelete = window.confirm("Are you sure you want to delete all chats? This action cannot be undone."); + if (!confirmDelete) { + return; // Exit if the user cancels + } + if (!db) { const error = new Error('Database is not available'); logStore.logError('Failed to delete chats - DB unavailable', error); toast.error('Database is not available'); - return; } try { setIsDeleting(true); - const allChats = await getAll(db); await Promise.all(allChats.map((chat) => deleteById(db!, chat.id))); logStore.logSystem('All chats deleted successfully', { count: allChats.length }); @@ -52,7 +55,6 @@ export default function ChatHistoryTab() { const error = new Error('Database is not available'); logStore.logError('Failed to export chats - DB unavailable', error); toast.error('Database is not available'); - return; } diff --git a/app/components/settings/debug/DebugTab.tsx b/app/components/settings/debug/DebugTab.tsx index e18607d..c5b1661 100644 --- a/app/components/settings/debug/DebugTab.tsx +++ b/app/components/settings/debug/DebugTab.tsx @@ -1,6 +1,7 @@ import React, { useCallback, useEffect, useState } from 'react'; import { useSettings } from '~/lib/hooks/useSettings'; import commit from '~/commit.json'; +import { toast } from 'react-toastify'; interface ProviderStatus { name: string; @@ -308,8 +309,9 @@ export default function DebugTab() { Version: versionHash, Timestamp: new Date().toISOString(), }; + navigator.clipboard.writeText(JSON.stringify(debugInfo, null, 2)).then(() => { - alert('Debug information copied to clipboard!'); + toast.success('Debug information copied to clipboard!'); }); }, [activeProviders, systemInfo]); From d4aa189cee73eab4931f8341f5fcfe48684dd9e0 Mon Sep 17 00:00:00 2001 From: Dustin Loring Date: Sat, 14 Dec 2024 19:40:37 -0500 Subject: [PATCH 06/21] ui-ux: Renamed feature Enhancement - on feature tab Change 'Enable Local Models' to 'Experimental Providers' --- app/components/settings/features/FeaturesTab.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/settings/features/FeaturesTab.tsx b/app/components/settings/features/FeaturesTab.tsx index 9c9e4a0..88dd4d4 100644 --- a/app/components/settings/features/FeaturesTab.tsx +++ b/app/components/settings/features/FeaturesTab.tsx @@ -24,7 +24,7 @@ export default function FeaturesTab() { Disclaimer: Experimental features may be unstable and are subject to change.

- Enable Local Models + Experimental Providers
From 5893629306d1af61d885978aae5fb9ce64ca3ada Mon Sep 17 00:00:00 2001 From: Dustin Loring Date: Sat, 14 Dec 2024 19:43:43 -0500 Subject: [PATCH 07/21] ui-ux: combined optional features on features tab combined (debug info and event logs) into 'Debug Features' --- app/components/settings/features/FeaturesTab.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/components/settings/features/FeaturesTab.tsx b/app/components/settings/features/FeaturesTab.tsx index 88dd4d4..0ef7a5d 100644 --- a/app/components/settings/features/FeaturesTab.tsx +++ b/app/components/settings/features/FeaturesTab.tsx @@ -4,17 +4,19 @@ import { useSettings } from '~/lib/hooks/useSettings'; export default function FeaturesTab() { const { debug, enableDebugMode, isLocalModel, enableLocalModels, eventLogs, enableEventLogs } = useSettings(); + + const handleToggle = (enabled: boolean) => { + enableDebugMode(enabled); + enableEventLogs(enabled); + }; + return (

Optional Features

- Debug Info - -
-
- Event Logs - + Debug Features +
From e0d0c4b697ff4a5d9c02e3c9bf1c2401104024f8 Mon Sep 17 00:00:00 2001 From: Dustin Loring Date: Sat, 14 Dec 2024 20:26:56 -0500 Subject: [PATCH 08/21] Branding updates changed Bolt.diy to bolt.diy reworded the bottom of the README --- CONTRIBUTING.md | 4 ++-- FAQ.md | 29 +++++++++--------------- README.md | 60 +++++++++++++++++++++++++------------------------ 3 files changed, 44 insertions(+), 49 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 304b140..bdb02ff 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ -# Contributing to oTToDev +# Contributing to bolt.diy -First off, thank you for considering contributing to Bolt.diy! This fork aims to expand the capabilities of the original project by integrating multiple LLM providers and enhancing functionality. Every contribution helps make Bolt.diy a better tool for developers worldwide. +First off, thank you for considering contributing to bolt.diy! This fork aims to expand the capabilities of the original project by integrating multiple LLM providers and enhancing functionality. Every contribution helps make bolt.diy a better tool for developers worldwide. ## 📋 Table of Contents - [Code of Conduct](#code-of-conduct) diff --git a/FAQ.md b/FAQ.md index c9467bb..ecd4158 100644 --- a/FAQ.md +++ b/FAQ.md @@ -1,12 +1,12 @@ -[![Bolt.new: AI-Powered Full-Stack Web Development in the Browser](./public/social_preview_index.jpg)](https://bolt.new) +[![bolt.diy: AI-Powered Full-Stack Web Development in the Browser](./public/social_preview_index.jpg)](https://bolt.diy) -# Bolt.new Fork by Cole Medin - Bolt.diy +# bolt.diy ## FAQ -### How do I get the best results with Bolt.diy? +### How do I get the best results with bolt.diy? -- **Be specific about your stack**: If you want to use specific frameworks or libraries (like Astro, Tailwind, ShadCN, or any other popular JavaScript framework), mention them in your initial prompt to ensure Bolt scaffolds the project accordingly. +- **Be specific about your stack**: If you want to use specific frameworks or libraries (like Astro, Tailwind, ShadCN, or any other popular JavaScript framework), mention them in your initial prompt to ensure bolt scaffolds the project accordingly. - **Use the enhance prompt icon**: Before sending your prompt, try clicking the 'enhance' icon to have the AI model help you refine your prompt, then edit the results before submitting. @@ -14,36 +14,29 @@ - **Batch simple instructions**: Save time by combining simple instructions into one message. For example, you can ask Bolt.diy to change the color scheme, add mobile responsiveness, and restart the dev server, all in one go saving you time and reducing API credit consumption significantly. -### Do you plan on merging Bolt.diy back into the official Bolt.new repo? - -More news coming on this coming early next month - stay tuned! - ### Why are there so many open issues/pull requests? -Bolt.diy was started simply to showcase how to edit an open source project and to do something cool with local LLMs on my (@ColeMedin) YouTube channel! However, it quickly -grew into a massive community project that I am working hard to keep up with the demand of by forming a team of maintainers and getting as many people involved as I can. -That effort is going well and all of our maintainers are ABSOLUTE rockstars, but it still takes time to organize everything so we can efficiently get through all -the issues and PRs. But rest assured, we are working hard and even working on some partnerships behind the scenes to really help this project take off! +bolt.diy was started simply to showcase how to edit an open source project and to do something cool with local LLMs on my (@ColeMedin) YouTube channel! However, it quickly grew into a massive community project that I am working hard to keep up with the demand of by forming a team of maintainers and getting as many people involved as I can. That effort is going well and all of our maintainers are ABSOLUTE rockstars, but it still takes time to organize everything so we can efficiently get through all the issues and PRs. But rest assured, we are working hard and even working on some partnerships behind the scenes to really help this project take off! -### How do local LLMs fair compared to larger models like Claude 3.5 Sonnet for Bolt.diy/Bolt.new? +### How do local LLMs fair compared to larger models like Claude 3.5 Sonnet for bolt.diy/bolt.new? As much as the gap is quickly closing between open source and massive close source models, you’re still going to get the best results with the very large models like GPT-4o, Claude 3.5 Sonnet, and DeepSeek Coder V2 236b. This is one of the big tasks we have at hand - figuring out how to prompt better, use agents, and improve the platform as a whole to make it work better for even the smaller local LLMs! ### I'm getting the error: "There was an error processing this request" -If you see this error within Bolt.diy, that is just the application telling you there is a problem at a high level, and this could mean a number of different things. To find the actual error, please check BOTH the terminal where you started the application (with Docker or pnpm) and the developer console in the browser. For most browsers, you can access the developer console by pressing F12 or right clicking anywhere in the browser and selecting “Inspect”. Then go to the “console” tab in the top right. +If you see this error within bolt.diy, that is just the application telling you there is a problem at a high level, and this could mean a number of different things. To find the actual error, please check BOTH the terminal where you started the application (with Docker or pnpm) and the developer console in the browser. For most browsers, you can access the developer console by pressing F12 or right clicking anywhere in the browser and selecting “Inspect”. Then go to the “console” tab in the top right. ### I'm getting the error: "x-api-key header missing" -We have seen this error a couple times and for some reason just restarting the Docker container has fixed it. This seems to be Ollama specific. Another thing to try is try to run Bolt.diy with Docker or pnpm, whichever you didn’t run first. We are still on the hunt for why this happens once and a while! +We have seen this error a couple times and for some reason just restarting the Docker container has fixed it. This seems to be Ollama specific. Another thing to try is try to run bolt.diy with Docker or pnpm, whichever you didn’t run first. We are still on the hunt for why this happens once and a while! -### I'm getting a blank preview when Bolt.diy runs my app! +### I'm getting a blank preview when bolt.diy runs my app! -We promise you that we are constantly testing new PRs coming into Bolt.diy and the preview is core functionality, so the application is not broken! When you get a blank preview or don’t get a preview, this is generally because the LLM hallucinated bad code or incorrect commands. We are working on making this more transparent so it is obvious. Sometimes the error will appear in developer console too so check that as well. +We promise you that we are constantly testing new PRs coming into bolt.diy and the preview is core functionality, so the application is not broken! When you get a blank preview or don’t get a preview, this is generally because the LLM hallucinated bad code or incorrect commands. We are working on making this more transparent so it is obvious. Sometimes the error will appear in developer console too so check that as well. ### How to add a LLM: -To make new LLMs available to use in this version of Bolt.new, head on over to `app/utils/constants.ts` and find the constant MODEL_LIST. Each element in this array is an object that has the model ID for the name (get this from the provider's API documentation), a label for the frontend model dropdown, and the provider. +To make new LLMs available to use in this version of bolt.new, head on over to `app/utils/constants.ts` and find the constant MODEL_LIST. Each element in this array is an object that has the model ID for the name (get this from the provider's API documentation), a label for the frontend model dropdown, and the provider. By default, Anthropic, OpenAI, Groq, and Ollama are implemented as providers, but the YouTube video for this repo covers how to extend this to work with more providers if you wish! diff --git a/README.md b/README.md index 44852f6..dedae4e 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -[![Bolt.diy: AI-Powered Full-Stack Web Development in the Browser](./public/social_preview_index.jpg)](https://bolt.diy) +[![bolt.diy: AI-Powered Full-Stack Web Development in the Browser](./public/social_preview_index.jpg)](https://bolt.diy) -# Bolt.diy (Previously oTToDev) +# bolt.diy (Previously oTToDev) -Welcome to Bolt.diy, the official open source version of Bolt.new (previously known as oTToDev and Bolt.new ANY LLM), which allows you to choose the LLM that you use for each prompt! Currently, you can use OpenAI, Anthropic, Ollama, OpenRouter, Gemini, LMStudio, Mistral, xAI, HuggingFace, DeepSeek, or Groq models - and it is easily extended to use any other model supported by the Vercel AI SDK! See the instructions below for running this locally and extending it to include more models. +Welcome to bolt.diy, the official open source version of Bolt.new (previously known as oTToDev and bolt.new ANY LLM), which allows you to choose the LLM that you use for each prompt! Currently, you can use OpenAI, Anthropic, Ollama, OpenRouter, Gemini, LMStudio, Mistral, xAI, HuggingFace, DeepSeek, or Groq models - and it is easily extended to use any other model supported by the Vercel AI SDK! See the instructions below for running this locally and extending it to include more models. -Check the [Bolt.diy Docs](https://stackblitz-labs.github.io/bolt.diy/) for more information. This documentation is still being updated after the transfer. +Check the [bolt.diy Docs](https://stackblitz-labs.github.io/bolt.diy/) for more information. This documentation is still being updated after the transfer. -Bolt.diy was originally started by [Cole Medin](https://www.youtube.com/@ColeMedin) but has quickly grown into a massive community effort to build the BEST open source AI coding assistant! +bolt.diy was originally started by [Cole Medin](https://www.youtube.com/@ColeMedin) but has quickly grown into a massive community effort to build the BEST open source AI coding assistant! -## Join the community for Bolt.diy! +## Join the community for bolt.diy! https://thinktank.ottomator.ai @@ -20,7 +20,7 @@ https://thinktank.ottomator.ai - ✅ Autogenerate Ollama models from what is downloaded (@yunatamos) - ✅ Filter models by provider (@jasonm23) - ✅ Download project as ZIP (@fabwaseem) -- ✅ Improvements to the main Bolt.new prompt in `app\lib\.server\llm\prompts.ts` (@kofi-bhr) +- ✅ Improvements to the main bolt.new prompt in `app\lib\.server\llm\prompts.ts` (@kofi-bhr) - ✅ DeepSeek API Integration (@zenith110) - ✅ Mistral API Integration (@ArulGandhi) - ✅ "Open AI Like" API Integration (@ZerxZ) @@ -45,7 +45,7 @@ https://thinktank.ottomator.ai - ✅ Attach images to prompts (@atrokhym) - ✅ Detect package.json and commands to auto install and run preview for folder and git import (@wonderwhy-er) - ✅ Selection tool to target changes visually (@emcconnell) -- ⬜ **HIGH PRIORITY** - Prevent Bolt from rewriting files as often (file locking and diffs) +- ⬜ **HIGH PRIORITY** - Prevent bolt from rewriting files as often (file locking and diffs) - ⬜ **HIGH PRIORITY** - Better prompting for smaller LLMs (code window sometimes doesn't start) - ⬜ **HIGH PRIORITY** - Run agents in the backend as opposed to a single model call - ⬜ Deploy directly to Vercel/Netlify/other similar platforms @@ -57,7 +57,7 @@ https://thinktank.ottomator.ai - ⬜ Perplexity Integration - ⬜ Vertex AI Integration -## Bolt.diy Features +## bolt.diy Features - **AI-powered full-stack web development** directly in your browser. - **Support for multiple LLMs** with an extensible architecture to integrate additional models. @@ -67,7 +67,7 @@ https://thinktank.ottomator.ai - **Download projects as ZIP** for easy portability. - **Integration-ready Docker support** for a hassle-free setup. -## Setup Bolt.diy +## Setup bolt.diy If you're new to installing software from GitHub, don't worry! If you encounter any issues, feel free to submit an "issue" using the provided links or improve this documentation by forking the repository, editing the instructions, and submitting a pull request. The following instruction will help you get the stable branch up and running on your local machine in no time. @@ -175,7 +175,7 @@ DEFAULT_NUM_CTX=8192 ### Update Your Local Version to the Latest -To keep your local version of Bolt.diy up to date with the latest changes, follow these steps for your operating system: +To keep your local version of bolt.diy up to date with the latest changes, follow these steps for your operating system: #### 1. **Navigate to your project folder** Navigate to the directory where you cloned the repository and open a terminal: @@ -201,34 +201,36 @@ To keep your local version of Bolt.diy up to date with the latest changes, follo pnpm run dev ``` -This ensures that you're running the latest version of Bolt.diy and can take advantage of all the newest features and bug fixes. +This ensures that you're running the latest version of bolt.diy and can take advantage of all the newest features and bug fixes. --- -## Available Scripts +## Available Scripts -Here are the available commands for managing the application: +- **`pnpm run dev`**: Starts the development server. +- **`pnpm run build`**: Builds the project. +- **`pnpm run start`**: Runs the built application locally using Wrangler Pages. +- **`pnpm run preview`**: Builds and runs the production build locally. +- **`pnpm test`**: Runs the test suite using Vitest. +- **`pnpm run typecheck`**: Runs TypeScript type checking. +- **`pnpm run typegen`**: Generates TypeScript types using Wrangler. +- **`pnpm run deploy`**: Deploys the project to Cloudflare Pages. +- **`pnpm run lint:fix`**: Automatically fixes linting issues. -- `pnpm run dev`: Start the development server. -- `pnpm run build`: Build the project. -- `pnpm run start`: Run the built application locally (uses Wrangler Pages). -- `pnpm run preview`: Build and start the application locally for production testing. -- `pnpm test`: Run the test suite using Vitest. -- `pnpm run typecheck`: Perform TypeScript type checking. -- `pnpm run typegen`: Generate TypeScript types using Wrangler. -- `pnpm run deploy`: Build and deploy the project to Cloudflare Pages. -- `pnpm lint:fix`: Run the linter and automatically fix issues. +--- -## How do I contribute to Bolt.diy? +## Contributing -[Please check out our dedicated page for contributing to Bolt.diy here!](CONTRIBUTING.md) +We welcome contributions! Check out our [Contributing Guide](CONTRIBUTING.md) to get started. -## What are the future plans for Bolt.diy? +--- -[Check out our Roadmap here!](https://roadmap.sh/r/ottodev-roadmap-2ovzo) +## Roadmap -Lot more updates to this roadmap coming soon! +Explore upcoming features and priorities on our [Roadmap](https://roadmap.sh/r/ottodev-roadmap-2ovzo). + +--- ## FAQ -[Please check out our dedicated page for FAQ's related to Bolt.diy here!](FAQ.md) +For answers to common questions, visit our [FAQ Page](FAQ.md). From 2cb8c825d077c08b209e8aa11e897db772ce7850 Mon Sep 17 00:00:00 2001 From: Dustin Loring Date: Sat, 14 Dec 2024 22:25:28 -0500 Subject: [PATCH 09/21] ui-ux: prompt enhanced toast notification changed prompt enhanced to give a toast notification instead of changing the ui. --- app/components/chat/BaseChat.tsx | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/app/components/chat/BaseChat.tsx b/app/components/chat/BaseChat.tsx index 09f3c16..162241d 100644 --- a/app/components/chat/BaseChat.tsx +++ b/app/components/chat/BaseChat.tsx @@ -27,6 +27,7 @@ import { ModelSelector } from '~/components/chat/ModelSelector'; import { SpeechRecognitionButton } from '~/components/chat/SpeechRecognition'; import type { IProviderSetting, ProviderInfo } from '~/types/model'; import { ScreenshotStateManager } from './ScreenshotStateManager'; +import { toast } from 'react-toastify'; const TEXTAREA_MIN_HEIGHT = 76; @@ -492,22 +493,16 @@ export const BaseChat = React.forwardRef( className={classNames( 'transition-all', enhancingPrompt ? 'opacity-100' : '', - promptEnhanced ? 'text-bolt-elements-item-contentAccent' : '', - promptEnhanced ? 'pr-1.5' : '', - promptEnhanced ? 'enabled:hover:bg-bolt-elements-item-backgroundAccent' : '', )} - onClick={() => enhancePrompt?.()} + onClick={() => { + enhancePrompt?.(); + toast.success('Prompt enhanced!'); + }} > {enhancingPrompt ? ( - <> -
-
Enhancing prompt...
- +
) : ( - <> -
- {promptEnhanced &&
Prompt enhanced
} - +
)} From b8e457eeb7fa5c07cfa320e3d115357210c58606 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 15 Dec 2024 09:45:21 +0000 Subject: [PATCH 10/21] chore: update commit hash to b06f6e3a3e7e5b2b5f8d9b13a761422993559f3e --- app/commit.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/commit.json b/app/commit.json index 1636c99..f5eca82 100644 --- a/app/commit.json +++ b/app/commit.json @@ -1 +1 @@ -{ "commit": "ece0213500a94a6b29e29512c5040baf57884014" } +{ "commit": "b06f6e3a3e7e5b2b5f8d9b13a761422993559f3e" } From 4ea38e8766324751cf6af0442d9a9bcd490e6492 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 15 Dec 2024 09:52:57 +0000 Subject: [PATCH 11/21] chore: update commit hash to 25fe15232fcd6cee83f179adbd1d3e7d6a90acca --- app/commit.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/commit.json b/app/commit.json index f5eca82..cad0f3e 100644 --- a/app/commit.json +++ b/app/commit.json @@ -1 +1 @@ -{ "commit": "b06f6e3a3e7e5b2b5f8d9b13a761422993559f3e" } +{ "commit": "25fe15232fcd6cee83f179adbd1d3e7d6a90acca" } From ecbf2f3bcd9832045c669ce5074e5f5e556481f5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 15 Dec 2024 12:21:08 +0000 Subject: [PATCH 12/21] chore: update commit hash to a87cfd79503a62db2be00656f4874ec747d76a09 --- app/commit.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/commit.json b/app/commit.json index cad0f3e..71ef89e 100644 --- a/app/commit.json +++ b/app/commit.json @@ -1 +1 @@ -{ "commit": "25fe15232fcd6cee83f179adbd1d3e7d6a90acca" } +{ "commit": "a87cfd79503a62db2be00656f4874ec747d76a09" } From 4541a3e9dd6797d13eb5928053639f49a985f65a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 15 Dec 2024 13:08:52 +0000 Subject: [PATCH 13/21] chore: update commit hash to 7c3a3bbde6c61f374a6d37c888c6900a335e3d33 --- app/commit.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/commit.json b/app/commit.json index 71ef89e..43e2b5a 100644 --- a/app/commit.json +++ b/app/commit.json @@ -1 +1 @@ -{ "commit": "a87cfd79503a62db2be00656f4874ec747d76a09" } +{ "commit": "7c3a3bbde6c61f374a6d37c888c6900a335e3d33" } From 61ac8f9808135bc47042373a8906ef61632a621b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 15 Dec 2024 13:09:26 +0000 Subject: [PATCH 14/21] chore: update commit hash to d936c012bdeb210ee876be1941ef8e370ea0b2e3 --- app/commit.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/commit.json b/app/commit.json index 43e2b5a..6404e85 100644 --- a/app/commit.json +++ b/app/commit.json @@ -1 +1 @@ -{ "commit": "7c3a3bbde6c61f374a6d37c888c6900a335e3d33" } +{ "commit": "d936c012bdeb210ee876be1941ef8e370ea0b2e3" } From fc13754788686fa55128c531bf09e27e5ddd4770 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 15 Dec 2024 13:22:09 +0000 Subject: [PATCH 15/21] chore: update commit hash to b3f7a5c3785060c7937dcd681b38f17b5396fc84 --- app/commit.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/commit.json b/app/commit.json index 6404e85..853bd90 100644 --- a/app/commit.json +++ b/app/commit.json @@ -1 +1 @@ -{ "commit": "d936c012bdeb210ee876be1941ef8e370ea0b2e3" } +{ "commit": "b3f7a5c3785060c7937dcd681b38f17b5396fc84" } From 558d4b2e10dd9db2e923a44c093ba1962ee8a470 Mon Sep 17 00:00:00 2001 From: Dustin Loring Date: Sun, 15 Dec 2024 08:44:57 -0500 Subject: [PATCH 16/21] ui: fallback icon for provider Added a fallback icon for providers --- app/components/settings/providers/ProvidersTab.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/components/settings/providers/ProvidersTab.tsx b/app/components/settings/providers/ProvidersTab.tsx index 0efbc66..1c6e87d 100644 --- a/app/components/settings/providers/ProvidersTab.tsx +++ b/app/components/settings/providers/ProvidersTab.tsx @@ -5,6 +5,9 @@ import { LOCAL_PROVIDERS, URL_CONFIGURABLE_PROVIDERS } from '~/lib/stores/settin import type { IProviderConfig } from '~/types/model'; import { logStore } from '~/lib/stores/logs'; +// Import a default fallback icon +import DefaultIcon from '/icons/Ollama.svg'; // Adjust the path as necessary + export default function ProvidersTab() { const { providers, updateProviderSettings, isLocalModel } = useSettings(); const [filteredProviders, setFilteredProviders] = useState([]); @@ -51,7 +54,14 @@ export default function ProvidersTab() { >
- {`${provider.name} + { // Fallback to default icon on error + e.currentTarget.src = DefaultIcon; + }} + alt={`${provider.name} icon`} + className="w-6 h-6 dark:invert" + /> {provider.name}
Date: Sun, 15 Dec 2024 13:48:21 +0000 Subject: [PATCH 17/21] chore: update commit hash to 23346f6271bf2f438489660357e6ffee803befb1 --- app/commit.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/commit.json b/app/commit.json index 853bd90..053efc0 100644 --- a/app/commit.json +++ b/app/commit.json @@ -1 +1 @@ -{ "commit": "b3f7a5c3785060c7937dcd681b38f17b5396fc84" } +{ "commit": "23346f6271bf2f438489660357e6ffee803befb1" } From c54e6e588e06572feb8009b4c1bc4f2cf1bd5f01 Mon Sep 17 00:00:00 2001 From: Dustin Loring Date: Sun, 15 Dec 2024 09:04:44 -0500 Subject: [PATCH 18/21] Update README.md changed 'and' to '&' so that it would fit on one line --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dedae4e..405e388 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ https://thinktank.ottomator.ai - ✅ Mobile friendly (@qwikode) - ✅ Better prompt enhancing (@SujalXplores) - ✅ Attach images to prompts (@atrokhym) -- ✅ Detect package.json and commands to auto install and run preview for folder and git import (@wonderwhy-er) +- ✅ Detect package.json and commands to auto install & run preview for folder and git import (@wonderwhy-er) - ✅ Selection tool to target changes visually (@emcconnell) - ⬜ **HIGH PRIORITY** - Prevent bolt from rewriting files as often (file locking and diffs) - ⬜ **HIGH PRIORITY** - Better prompting for smaller LLMs (code window sometimes doesn't start) From 2bb9f609dce1f39adb0afeaecbc4a956aa77742e Mon Sep 17 00:00:00 2001 From: Dustin Loring Date: Sun, 15 Dec 2024 10:19:31 -0500 Subject: [PATCH 19/21] add: Perplexity Provider Icon added the provider icon for Perplexity --- public/icons/Perplexity.svg | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 public/icons/Perplexity.svg diff --git a/public/icons/Perplexity.svg b/public/icons/Perplexity.svg new file mode 100644 index 0000000..950b09e --- /dev/null +++ b/public/icons/Perplexity.svg @@ -0,0 +1,4 @@ + + + + From 825137a44774425ac20c2717de9a4e4a9eebd228 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 15 Dec 2024 15:25:48 +0000 Subject: [PATCH 20/21] chore: update commit hash to 9cd9ee9088467882e1e4efdf491959619307cc9d --- app/commit.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/commit.json b/app/commit.json index 053efc0..30a055c 100644 --- a/app/commit.json +++ b/app/commit.json @@ -1 +1 @@ -{ "commit": "23346f6271bf2f438489660357e6ffee803befb1" } +{ "commit": "9cd9ee9088467882e1e4efdf491959619307cc9d" } From ed6433e8cd4acf1e5c742745e33d1a071f8f70b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 15 Dec 2024 15:27:46 +0000 Subject: [PATCH 21/21] chore: update commit hash to 87a90718d31bd8ec501cb32f863efd26156fb1e2 --- app/commit.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/commit.json b/app/commit.json index 30a055c..5311377 100644 --- a/app/commit.json +++ b/app/commit.json @@ -1 +1 @@ -{ "commit": "9cd9ee9088467882e1e4efdf491959619307cc9d" } +{ "commit": "87a90718d31bd8ec501cb32f863efd26156fb1e2" }