diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml index 2f194cd..d5db06b 100644 --- a/.github/workflows/commit.yaml +++ b/.github/workflows/commit.yaml @@ -10,6 +10,7 @@ permissions: jobs: update-commit: + if: contains(github.event.head_commit.message, '#release') != true runs-on: ubuntu-latest steps: diff --git a/.github/workflows/pr-release-validation.yaml b/.github/workflows/pr-release-validation.yaml new file mode 100644 index 0000000..99c5703 --- /dev/null +++ b/.github/workflows/pr-release-validation.yaml @@ -0,0 +1,31 @@ +name: PR Validation + +on: + pull_request: + types: [opened, synchronize, reopened, labeled, unlabeled] + branches: + - main + +jobs: + validate: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Validate PR Labels + run: | + if [[ "${{ contains(github.event.pull_request.labels.*.name, 'stable-release') }}" == "true" ]]; then + echo "✓ PR has stable-release label" + + # Check version bump labels + if [[ "${{ contains(github.event.pull_request.labels.*.name, 'major') }}" == "true" ]]; then + echo "✓ Major version bump requested" + elif [[ "${{ contains(github.event.pull_request.labels.*.name, 'minor') }}" == "true" ]]; then + echo "✓ Minor version bump requested" + else + echo "✓ Patch version bump will be applied" + fi + else + echo "This PR doesn't have the stable-release label. No release will be created." + fi \ No newline at end of file diff --git a/.github/workflows/update-stable.yml b/.github/workflows/update-stable.yml index 5a4d5a9..2956f64 100644 --- a/.github/workflows/update-stable.yml +++ b/.github/workflows/update-stable.yml @@ -1,23 +1,45 @@ name: Update Stable Branch on: - pull_request: - types: [closed] + push: branches: - main + permissions: contents: write jobs: - update-stable: - if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'stable-release') + update-commit: + if: contains(github.event.head_commit.message, '#release') + runs-on: ubuntu-latest + + steps: + - name: Checkout the code + uses: actions/checkout@v3 + + - name: Get the latest commit hash + run: echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV + + - name: Update commit file + run: | + echo "{ \"commit\": \"$COMMIT_HASH\" }" > app/commit.json + + - name: Commit and push the update + run: | + git config --global user.name "github-actions[bot]" + git config --global user.email "github-actions[bot]@users.noreply.github.com" + git add app/commit.json + git commit -m "chore: update commit hash to $COMMIT_HASH" + git push + prepare-release: + needs: update-commit + if: contains(github.event.head_commit.message, '#release') runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: read steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Configure Git run: | @@ -49,17 +71,6 @@ jobs: restore-keys: | ${{ runner.os }}-pnpm-store- - - name: Determine Version Bump - id: version_bump - run: | - if [[ "${{ contains(github.event.pull_request.labels.*.name, 'major') }}" == "true" ]]; then - echo "bump=major" >> $GITHUB_OUTPUT - elif [[ "${{ contains(github.event.pull_request.labels.*.name, 'minor') }}" == "true" ]]; then - echo "bump=minor" >> $GITHUB_OUTPUT - else - echo "bump=patch" >> $GITHUB_OUTPUT - fi - - name: Get Current Version id: current_version run: | @@ -69,6 +80,18 @@ jobs: - name: Install semver run: pnpm add -g semver + - name: Determine Version Bump + id: version_bump + run: | + COMMIT_MSG="${{ github.event.head_commit.message }}" + if [[ $COMMIT_MSG =~ "#release:major" ]]; then + echo "bump=major" >> $GITHUB_OUTPUT + elif [[ $COMMIT_MSG =~ "#release:minor" ]]; then + echo "bump=minor" >> $GITHUB_OUTPUT + else + echo "bump=patch" >> $GITHUB_OUTPUT + fi + - name: Bump Version id: bump_version run: | @@ -158,32 +181,30 @@ jobs: echo "$CHANGELOG_CONTENT" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT - - name: Commit Version Update + - name: Commit and Tag Release run: | git pull git add package.json pnpm-lock.yaml changelog.md - git commit -m "chore: bump version to ${{ steps.bump_version.outputs.new_version }}" + git commit -m "chore: release version ${{ steps.bump_version.outputs.new_version }}" + git tag "v${{ steps.bump_version.outputs.new_version }}" git push + git push --tags - name: Update Stable Branch run: | - # Ensure stable branch exists - git checkout stable 2>/dev/null || git checkout -b stable - git merge main --no-ff -m "chore: merge main into stable for version ${{ steps.bump_version.outputs.new_version }}" - git push --set-upstream origin stable + if ! git checkout stable 2>/dev/null; then + echo "Creating new stable branch..." + git checkout -b stable + fi + git merge main --no-ff -m "chore: release version ${{ steps.bump_version.outputs.new_version }}" + git push --set-upstream origin stable --force - - name: Create and Push Tag + - name: Create GitHub Release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | VERSION="v${{ steps.bump_version.outputs.new_version }}" - git tag -a "$VERSION" -m "Release $VERSION" - git push origin "$VERSION" - - # - name: Create GitHub Release - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # run: | - # VERSION="v${{ steps.bump_version.outputs.new_version }}" - # gh release create "$VERSION" \ - # --title "Release $VERSION" \ - # --notes "${{ steps.changelog.outputs.content }}" \ - # --target stable \ No newline at end of file + gh release create "$VERSION" \ + --title "Release $VERSION" \ + --notes "${{ steps.changelog.outputs.content }}" \ + --target stable \ No newline at end of file diff --git a/README.md b/README.md index 3b1d282..5126437 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![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.diy (Previously oTToDev) @@ -56,176 +56,167 @@ https://thinktank.ottomator.ai - ⬜ Perplexity Integration - ⬜ Vertex AI Integration -## Bolt.new: AI-Powered Full-Stack Web Development in the Browser +## Bolt.diy Features -Bolt.new (and by extension Bolt.diy) is an AI-powered web development agent that allows you to prompt, run, edit, and deploy full-stack applications directly from your browser—no local setup required. If you're here to build your own AI-powered web dev agent using the Bolt open source codebase, [click here to get started!](./CONTRIBUTING.md) +- **AI-powered full-stack web development** directly in your browser. +- **Support for multiple LLMs** with an extensible architecture to integrate additional models. +- **Attach images to prompts** for better contextual understanding. +- **Integrated terminal** to view output of LLM-run commands. +- **Revert code to earlier versions** for easier debugging and quicker changes. +- **Download projects as ZIP** for easy portability. +- **Integration-ready Docker support** for a hassle-free setup. -## What Makes Bolt.new Different +## Setup Bolt.diy -Claude, v0, etc are incredible- but you can't install packages, run backends, or edit code. That’s where Bolt.new stands out: +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. -- **Full-Stack in the Browser**: Bolt.new integrates cutting-edge AI models with an in-browser development environment powered by **StackBlitz’s WebContainers**. This allows you to: - - Install and run npm tools and libraries (like Vite, Next.js, and more) - - Run Node.js servers - - Interact with third-party APIs - - Deploy to production from chat - - Share your work via a URL +### Prerequisites -- **AI with Environment Control**: Unlike traditional dev environments where the AI can only assist in code generation, Bolt.new gives AI models **complete control** over the entire environment including the filesystem, node server, package manager, terminal, and browser console. This empowers AI agents to handle the whole app lifecycle—from creation to deployment. +1. **Install Git**: [Download Git](https://git-scm.com/downloads) +2. **Install Node.js**: [Download Node.js](https://nodejs.org/en/download/) -Whether you’re an experienced developer, a PM, or a designer, Bolt.new allows you to easily build production-grade full-stack applications. + - After installation, the Node.js path is usually added to your system automatically. To verify: + - **Windows**: Search for "Edit the system environment variables," click "Environment Variables," and check if `Node.js` is in the `Path` variable. + - **Mac/Linux**: Open a terminal and run: + ```bash + echo $PATH + ``` + Look for `/usr/local/bin` in the output. -For developers interested in building their own AI-powered development tools with WebContainers, check out the open-source Bolt codebase in this repo! +### Clone the Repository -## Setup +Clone the repository using Git: -Many of you are new users to installing software from Github. If you have any installation troubles reach out and submit an "issue" using the links above, or feel free to enhance this documentation by forking, editing the instructions, and doing a pull request. +```bash +git clone -b stable https://github.com/stackblitz-labs/bolt.diy +``` -1. Install Git from https://git-scm.com/downloads +### (Optional) Configure Environment Variables -2. Install Node.js from https://nodejs.org/en/download/ +Most environment variables can be configured directly through the settings menu of the application. However, if you need to manually configure them: -Pay attention to the installer notes after completion. +1. Rename `.env.example` to `.env.local`. +2. Add your LLM API keys. For example: -On all operating systems, the path to Node.js should automatically be added to your system path. But you can check your path if you want to be sure. On Windows, you can search for "edit the system environment variables" in your system, select "Environment Variables..." once you are in the system properties, and then check for a path to Node in your "Path" system variable. On a Mac or Linux machine, it will tell you to check if /usr/local/bin is in your $PATH. To determine if usr/local/bin is included in $PATH open your Terminal and run: +```env +GROQ_API_KEY=YOUR_GROQ_API_KEY +OPENAI_API_KEY=YOUR_OPENAI_API_KEY +ANTHROPIC_API_KEY=YOUR_ANTHROPIC_API_KEY +``` -``` -echo $PATH . -``` +**Note**: Ollama does not require an API key as it runs locally. -If you see usr/local/bin in the output then you're good to go. +3. Optionally, set additional configurations: -3. Clone the repository (if you haven't already) by opening a Terminal window (or CMD with admin permissions) and then typing in this: +```env +# Debugging +VITE_LOG_LEVEL=debug -``` -git clone https://github.com/stackblitz-labs/bolt.diy.git -``` +# Ollama settings (example: 8K context, localhost port 11434) +OLLAMA_API_BASE_URL=http://localhost:11434 +DEFAULT_NUM_CTX=8192 +``` -3. Rename .env.example to .env.local and add your LLM API keys. You will find this file on a Mac at "[your name]/bold.new-any-llm/.env.example". For Windows and Linux the path will be similar. +**Important**: Do not commit your `.env.local` file to version control. This file is already included in `.gitignore`. -![image](https://github.com/user-attachments/assets/7e6a532c-2268-401f-8310-e8d20c731328) +--- -If you can't see the file indicated above, its likely you can't view hidden files. On Mac, open a Terminal window and enter this command below. On Windows, you will see the hidden files option in File Explorer Settings. A quick Google search will help you if you are stuck here. +## Run the Application -``` -defaults write com.apple.finder AppleShowAllFiles YES -``` +### Option 1: Without Docker -**NOTE**: you only have to set the ones you want to use and Ollama doesn't need an API key because it runs locally on your computer: +1. **Install Dependencies**: + ```bash + pnpm install + ``` + If `pnpm` is not installed, install it using: + ```bash + sudo npm install -g pnpm + ``` -Get your GROQ API Key here: https://console.groq.com/keys +2. **Start the Application**: + ```bash + pnpm run dev + ``` + This will start the Remix Vite development server. You will need Google Chrome Canary to run this locally if you use Chrome! It's an easy install and a good browser for web development anyway. -Get your Open AI API Key by following these instructions: https://help.openai.com/en/articles/4936850-where-do-i-find-my-openai-api-key +### Option 2: With Docker -Get your Anthropic API Key in your account settings: https://console.anthropic.com/settings/keys +#### Prerequisites +- Ensure Git, Node.js, and Docker are installed: [Download Docker](https://www.docker.com/) -``` -GROQ_API_KEY=XXX -OPENAI_API_KEY=XXX -ANTHROPIC_API_KEY=XXX -``` +#### Steps -Optionally, you can set the debug level: +1. **Build the Docker Image**: -``` -VITE_LOG_LEVEL=debug -``` + Use the provided NPM scripts: + ```bash + npm run dockerbuild # Development build + npm run dockerbuild:prod # Production build + ``` -And if using Ollama set the DEFAULT_NUM_CTX, the example below uses 8K context and ollama running on localhost port 11434: + Alternatively, use Docker commands directly: + ```bash + docker build . --target bolt-ai-development # Development build + docker build . --target bolt-ai-production # Production build + ``` -``` -OLLAMA_API_BASE_URL=http://localhost:11434 -DEFAULT_NUM_CTX=8192 -``` +2. **Run the Container**: + Use Docker Compose profiles to manage environments: + ```bash + docker-compose --profile development up # Development + docker-compose --profile production up # Production + ``` -**Important**: Never commit your `.env.local` file to version control. It's already included in .gitignore. + - With the development profile, changes to your code will automatically reflect in the running container (hot reloading). -## Run with Docker +--- -Prerequisites: +### Update Your Local Version to the Latest -Git and Node.js as mentioned above, as well as Docker: https://www.docker.com/ +To keep your local version of Bolt.diy up to date with the latest changes, follow these steps for your operating system: -### 1a. Using Helper Scripts +#### 1. **Navigate to your project folder** + Navigate to the directory where you cloned the repository and open a terminal: -NPM scripts are provided for convenient building: +#### 2. **Fetch the Latest Changes** + Use Git to pull the latest changes from the main repository: -```bash -# Development build -npm run dockerbuild + ```bash + git pull origin main + ``` -# Production build -npm run dockerbuild:prod -``` +#### 3. **Update Dependencies** + After pulling the latest changes, update the project dependencies by running the following command: -### 1b. Direct Docker Build Commands (alternative to using NPM scripts) + ```bash + pnpm install + ``` -You can use Docker's target feature to specify the build environment instead of using NPM scripts if you wish: +#### 4. **Run the Application** + Once the updates are complete, you can start the application again with: -```bash -# Development build -docker build . --target bolt-ai-development + ```bash + pnpm run dev + ``` -# Production build -docker build . --target bolt-ai-production -``` +This ensures that you're running the latest version of Bolt.diy and can take advantage of all the newest features and bug fixes. -### 2. Docker Compose with Profiles to Run the Container +--- -Use Docker Compose profiles to manage different environments: +## Available Scripts -```bash -# Development environment -docker-compose --profile development up +Here are the available commands for managing the application: -# Production environment -docker-compose --profile production up -``` - -When you run the Docker Compose command with the development profile, any changes you -make on your machine to the code will automatically be reflected in the site running -on the container (i.e. hot reloading still applies!). - -## Run Without Docker - -1. Install dependencies using Terminal (or CMD in Windows with admin permissions): - -``` -pnpm install -``` - -If you get an error saying "command not found: pnpm" or similar, then that means pnpm isn't installed. You can install it via this: - -``` -sudo npm install -g pnpm -``` - -2. Start the application with the command: - -```bash -pnpm run dev -``` -## Available Scripts - -- `pnpm run dev`: Starts the development server. -- `pnpm run build`: Builds the project. -- `pnpm run start`: Runs the built application locally using Wrangler Pages. This script uses `bindings.sh` to set up necessary bindings so you don't have to duplicate environment variables. -- `pnpm run preview`: Builds the project and then starts it locally, useful for testing the production build. Note, HTTP streaming currently doesn't work as expected with `wrangler pages dev`. -- `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`: Builds the project and deploys it to Cloudflare Pages. -- `pnpm run lint:fix`: Runs the linter and automatically fixes issues according to your ESLint configuration. - -## Development - -To start the development server: - -```bash -pnpm run dev -``` - -This will start the Remix Vite development server. You will need Google Chrome Canary to run this locally if you use Chrome! It's an easy install and a good browser for web development anyway. +- `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? diff --git a/app/commit.json b/app/commit.json index 9a281bc..850911f 100644 --- a/app/commit.json +++ b/app/commit.json @@ -1 +1,2 @@ -{ "commit": "dd296ab00d4d51ea0bc30ebe9aed0e6632feb37a" } +{ "commit": "eeafc12522b184dcbded28c5c6606e4a23e6849f" } + diff --git a/app/components/chat/ModelSelector.tsx b/app/components/chat/ModelSelector.tsx index bd41eb4..7571d63 100644 --- a/app/components/chat/ModelSelector.tsx +++ b/app/components/chat/ModelSelector.tsx @@ -1,7 +1,6 @@ import type { ProviderInfo } from '~/types/model'; import type { ModelInfo } from '~/utils/types'; -import { useEffect, useState } from 'react'; -import Cookies from 'js-cookie'; +import { useEffect } from 'react'; interface ModelSelectorProps { model?: string; @@ -22,62 +21,28 @@ export const ModelSelector = ({ providerList, }: ModelSelectorProps) => { // Load enabled providers from cookies - const [enabledProviders, setEnabledProviders] = useState(() => { - const savedProviders = Cookies.get('providers'); - - if (savedProviders) { - try { - const parsedProviders = JSON.parse(savedProviders); - return providerList.filter((p) => parsedProviders[p.name]); - } catch (error) { - console.error('Failed to parse providers from cookies:', error); - return providerList; - } - } - - return providerList; - }); // Update enabled providers when cookies change useEffect(() => { - // Function to update providers from cookies - const updateProvidersFromCookies = () => { - const savedProviders = Cookies.get('providers'); + // If current provider is disabled, switch to first enabled provider + if (providerList.length == 0) { + return; + } - if (savedProviders) { - try { - const parsedProviders = JSON.parse(savedProviders); - const newEnabledProviders = providerList.filter((p) => parsedProviders[p.name]); - setEnabledProviders(newEnabledProviders); + if (provider && !providerList.map((p) => p.name).includes(provider.name)) { + const firstEnabledProvider = providerList[0]; + setProvider?.(firstEnabledProvider); - // If current provider is disabled, switch to first enabled provider - if (provider && !parsedProviders[provider.name] && newEnabledProviders.length > 0) { - const firstEnabledProvider = newEnabledProviders[0]; - setProvider?.(firstEnabledProvider); + // Also update the model to the first available one for the new provider + const firstModel = modelList.find((m) => m.provider === firstEnabledProvider.name); - // Also update the model to the first available one for the new provider - const firstModel = modelList.find((m) => m.provider === firstEnabledProvider.name); - - if (firstModel) { - setModel?.(firstModel.name); - } - } - } catch (error) { - console.error('Failed to parse providers from cookies:', error); - } + if (firstModel) { + setModel?.(firstModel.name); } - }; - - // Initial update - updateProvidersFromCookies(); - - // Set up an interval to check for cookie changes - const interval = setInterval(updateProvidersFromCookies, 1000); - - return () => clearInterval(interval); + } }, [providerList, provider, setProvider, modelList, setModel]); - if (enabledProviders.length === 0) { + if (providerList.length === 0) { return (

@@ -93,7 +58,7 @@ export const ModelSelector = ({