Merge branch 'main' into feature/mcp-temporal-params

Author: waynesun09

.env.development

@@ -77,9 +77,6 @@ SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
 # Controls the number of concurrent indexing jobs that can run at once
 # INDEX_CONCURRENCY_MULTIPLE=
 
-# Controls the version of the web app
-# NEXT_PUBLIC_SOURCEBOT_VERSION=
-
 # CONFIG_MAX_REPOS_NO_TOKEN=
 NODE_ENV=development
 # SOURCEBOT_TENANCY_MODE=single

.github/workflows/_gcp-deploy.yml

@@ -54,7 +54,6 @@ jobs:
             ${{ env.IMAGE_PATH }}:${{ github.sha }}
             ${{ env.IMAGE_PATH }}:latest
           build-args: |
-            NEXT_PUBLIC_SOURCEBOT_VERSION=${{ github.ref_name }}
             NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=${{ vars.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT }}
             NEXT_PUBLIC_SENTRY_ENVIRONMENT=${{ vars.NEXT_PUBLIC_SENTRY_ENVIRONMENT }}
             NEXT_PUBLIC_SENTRY_WEBAPP_DSN=${{ vars.NEXT_PUBLIC_SENTRY_WEBAPP_DSN }}
@@ -65,6 +64,7 @@ jobs:
             SENTRY_ORG=${{ vars.SENTRY_ORG }}
             SENTRY_WEBAPP_PROJECT=${{ vars.SENTRY_WEBAPP_PROJECT }}
             SENTRY_BACKEND_PROJECT=${{ vars.SENTRY_BACKEND_PROJECT }}
+            SENTRY_RELEASE=${{ github.ref_name }}
 
       
       - name: Deploy to GCP

.github/workflows/ghcr-publish.yml

@@ -7,6 +7,12 @@ on:
   push:
     branches: ["main"]
     tags: ["v*.*.*"]
+  workflow_call:
+    inputs:
+      version:
+        description: 'Version tag (e.g., v4.10.5)'
+        required: false
+        type: string
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -40,6 +46,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
+          ref: ${{ inputs.version || github.ref_name }}
           submodules: "true"
 
       # Extract metadata (tags, labels) for Docker
@@ -77,8 +84,6 @@ jobs:
           cache-to: type=gha,mode=max,scope=${{ env.PLATFORM_PAIR }}
           platforms: ${{ matrix.platform }}
           outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true,annotation.org.opencontainers.image.description=Blazingly fast code search
-          build-args: |
-            NEXT_PUBLIC_SOURCEBOT_VERSION=${{ github.ref_name }}
 
       - name: Export digest
         run: |

.github/workflows/release-sourcebot.yml

@@ -0,0 +1,147 @@
+name: Release Sourcebot
+
+on:
+  workflow_dispatch:
+    inputs:
+      bump_type:
+        description: "Type of version bump to apply"
+        required: true
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
+
+concurrency:
+  group: release-sourcebot
+  cancel-in-progress: false
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    outputs:
+      version: ${{ steps.calculate_version.outputs.version }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: 0
+
+      - name: Calculate new version
+        id: calculate_version
+        run: |
+          # Extract current version from CHANGELOG.md
+          CURRENT_VERSION=$(grep -oP '## \[\K[0-9]+\.[0-9]+\.[0-9]+' CHANGELOG.md | head -n 1)
+          
+          if [ -z "$CURRENT_VERSION" ]; then
+              echo "Error: Could not extract current version from CHANGELOG.md"
+              exit 1
+          fi
+          
+          echo "Current version: $CURRENT_VERSION"
+          
+          # Parse version components
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT_VERSION"
+          
+          # Apply bump based on input
+          BUMP_TYPE="${{ inputs.bump_type }}"
+          case "$BUMP_TYPE" in
+            major)
+              MAJOR=$((MAJOR + 1))
+              MINOR=0
+              PATCH=0
+              ;;
+            minor)
+              MINOR=$((MINOR + 1))
+              PATCH=0
+              ;;
+            patch)
+              PATCH=$((PATCH + 1))
+              ;;
+            *)
+              echo "Error: Invalid bump type: $BUMP_TYPE"
+              exit 1
+              ;;
+          esac
+          
+          NEW_VERSION="$MAJOR.$MINOR.$PATCH"
+          echo "New version: $NEW_VERSION"
+          
+          # Export to GITHUB_ENV for use in subsequent steps within this job
+          echo "VERSION=$NEW_VERSION" >> $GITHUB_ENV
+          
+          # Export to GITHUB_OUTPUT for use in other jobs
+          echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
+
+      - name: Check if version already exists
+        run: |
+          if grep -q "## \[$VERSION\]" CHANGELOG.md; then
+              echo "Error: Version $VERSION already exists in CHANGELOG.md"
+              exit 1
+          fi
+          if git tag | grep -q "^v$VERSION$"; then
+              echo "Error: Tag v$VERSION already exists"
+              exit 1
+          fi
+
+      - name: Update CHANGELOG.md and version.ts
+        run: |
+          DATE=$(date +%Y-%m-%d)
+
+          # Insert the new version header after the [Unreleased] line
+          sed -i "/## \[Unreleased\]/a\\
+          \\
+          ## [$VERSION] - $DATE" CHANGELOG.md
+
+          echo "Updated CHANGELOG.md with version $VERSION"
+          cat CHANGELOG.md | head -n 15
+
+          # Update version.ts
+          cat > packages/shared/src/version.ts << EOF
+          // This file is auto-generated by .github/workflows/release-sourcebot.yml
+          export const SOURCEBOT_VERSION = "v$VERSION";
+          EOF
+          echo "Updated version.ts with version v$VERSION"
+          cat packages/shared/src/version.ts
+
+      - name: Configure git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Commit changes
+        run: |
+          git add CHANGELOG.md packages/shared/src/version.ts
+          git commit -m "Release v$VERSION"
+
+      - name: Create annotated tag
+        run: |
+          git tag -a "v$VERSION" -m "sourcebot v$VERSION"
+
+      - name: Push changes
+        run: |
+          git push origin main
+          git push origin --tags
+
+      - name: Create GitHub release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release create "v$VERSION" \
+              --verify-tag \
+              --generate-notes \
+              --latest
+
+  publish:
+    needs: release
+    uses: ./.github/workflows/ghcr-publish.yml
+    with:
+      version: v${{ needs.release.outputs.version }}
+    permissions:
+      contents: read
+      packages: write
+      id-token: write

CHANGELOG.md

@@ -7,8 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Bake Sourcebot version into code rather than relying on build arg. [#680](https://github.com/sourcebot-dev/sourcebot/pull/680)
+
+## [4.10.4] - 2025-12-18
+
 ### Fixed
 - Fixed issue where parenthesis in query params were not being encoded, resulting in a poor experience when embedding links in Markdown. [#674](https://github.com/sourcebot-dev/sourcebot/pull/674)
+- Gitlab clone respects host protocol setting in environment variable. [#676](https://github.com/sourcebot-dev/sourcebot/pull/676)
+- Fixed performance issues with `/repos` page. [#677](https://github.com/sourcebot-dev/sourcebot/pull/677)
 
 ## [4.10.3] - 2025-12-12
 

Dockerfile

@@ -8,7 +8,6 @@
 # in the webapp.
 # @see: https://docs.docker.com/build/building/variables/#scoping
 
-ARG NEXT_PUBLIC_SOURCEBOT_VERSION
 ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
 ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
 ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
@@ -51,8 +50,6 @@ RUN yarn workspace @sourcebot/query-language install
 FROM node-alpine AS web-builder
 ENV SKIP_ENV_VALIDATION=1
 # -----------
-ARG NEXT_PUBLIC_SOURCEBOT_VERSION
-ENV NEXT_PUBLIC_SOURCEBOT_VERSION=$NEXT_PUBLIC_SOURCEBOT_VERSION
 ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
 ENV NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT
 ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
@@ -72,7 +69,8 @@ ARG SENTRY_ORG
 ENV SENTRY_ORG=$SENTRY_ORG
 ARG SENTRY_WEBAPP_PROJECT
 ENV SENTRY_WEBAPP_PROJECT=$SENTRY_WEBAPP_PROJECT
-ENV SENTRY_RELEASE=$NEXT_PUBLIC_SOURCEBOT_VERSION
+ARG SENTRY_RELEASE
+ENV SENTRY_RELEASE=$SENTRY_RELEASE
 # SMUAT = Source Map Upload Auth Token
 ARG SENTRY_SMUAT
 ENV SENTRY_SMUAT=$SENTRY_SMUAT
@@ -102,8 +100,6 @@ ENV SKIP_ENV_VALIDATION=0
 FROM node-alpine AS backend-builder
 ENV SKIP_ENV_VALIDATION=1
 # -----------
-ARG NEXT_PUBLIC_SOURCEBOT_VERSION
-ENV NEXT_PUBLIC_SOURCEBOT_VERSION=$NEXT_PUBLIC_SOURCEBOT_VERSION
 
 # To upload source maps to Sentry, we need to set the following build-time args.
 # It's important that we don't set these for oss builds, otherwise the Sentry
@@ -115,6 +111,8 @@ ENV SENTRY_BACKEND_PROJECT=$SENTRY_BACKEND_PROJECT
 # SMUAT = Source Map Upload Auth Token
 ARG SENTRY_SMUAT
 ENV SENTRY_SMUAT=$SENTRY_SMUAT
+ARG SENTRY_RELEASE
+ENV SENTRY_RELEASE=$SENTRY_RELEASE
 # -----------
 
 WORKDIR /app
@@ -132,12 +130,12 @@ RUN yarn workspace @sourcebot/backend install
 RUN yarn workspace @sourcebot/backend build
 
 # Upload source maps to Sentry if we have the necessary build-time args.
-RUN if [ -n "$SENTRY_SMUAT" ] && [ -n "$SENTRY_ORG" ] && [ -n "$SENTRY_BACKEND_PROJECT" ] && [ -n "$NEXT_PUBLIC_SOURCEBOT_VERSION" ]; then \
+RUN if [ -n "$SENTRY_SMUAT" ] && [ -n "$SENTRY_ORG" ] && [ -n "$SENTRY_BACKEND_PROJECT" ] && [ -n "$SENTRY_RELEASE" ]; then \
     apk add --no-cache curl; \
     curl -sL https://sentry.io/get-cli/ | sh; \
     sentry-cli login --auth-token $SENTRY_SMUAT; \
-    sentry-cli sourcemaps inject --org $SENTRY_ORG --project $SENTRY_BACKEND_PROJECT --release $NEXT_PUBLIC_SOURCEBOT_VERSION ./packages/backend/dist; \
-    sentry-cli sourcemaps upload --org $SENTRY_ORG --project $SENTRY_BACKEND_PROJECT --release $NEXT_PUBLIC_SOURCEBOT_VERSION ./packages/backend/dist; \
+    sentry-cli sourcemaps inject --org $SENTRY_ORG --project $SENTRY_BACKEND_PROJECT --release $SENTRY_RELEASE ./packages/backend/dist; \
+    sentry-cli sourcemaps upload --org $SENTRY_ORG --project $SENTRY_BACKEND_PROJECT --release $SENTRY_RELEASE ./packages/backend/dist; \
 fi
 
 ENV SKIP_ENV_VALIDATION=0
@@ -146,8 +144,6 @@ ENV SKIP_ENV_VALIDATION=0
 # ------ Runner ------
 FROM node-alpine AS runner
 # -----------
-ARG NEXT_PUBLIC_SOURCEBOT_VERSION
-ENV NEXT_PUBLIC_SOURCEBOT_VERSION=$NEXT_PUBLIC_SOURCEBOT_VERSION
 ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
 ENV NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT
 ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
@@ -160,8 +156,6 @@ ARG NEXT_PUBLIC_LANGFUSE_BASE_URL
 ENV NEXT_PUBLIC_LANGFUSE_BASE_URL=$NEXT_PUBLIC_LANGFUSE_BASE_URL
 # -----------
 
-RUN echo "Sourcebot Version: $NEXT_PUBLIC_SOURCEBOT_VERSION"
-
 WORKDIR /app
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1

entrypoint.sh

@@ -63,8 +63,20 @@ else
     export REDIS_EMBEDDED="false"
 fi
 
+# Extract version from version.ts
+VERSION_FILE="/app/packages/shared/src/version.ts"
+if [ -f "$VERSION_FILE" ]; then
+    SOURCEBOT_VERSION=$(grep -o '"v[^"]*"' "$VERSION_FILE" | tr -d '"')
+    # Validate extraction succeeded
+    if [ -z "$SOURCEBOT_VERSION" ]; then
+        echo -e "\e[33m[Warning] Failed to extract version from $VERSION_FILE. Setting to 'unknown'.\e[0m" >&2
+        SOURCEBOT_VERSION="unknown"
+    fi
+else
+    SOURCEBOT_VERSION="unknown"
+fi
 
-echo -e "\e[34m[Info] Sourcebot version: $NEXT_PUBLIC_SOURCEBOT_VERSION\e[0m"
+echo -e "\e[34m[Info] Sourcebot version: $SOURCEBOT_VERSION\e[0m"
 
 if [ -n "$SOURCEBOT_TELEMETRY_DISABLED" ]; then
     # Validate that SOURCEBOT_TELEMETRY_DISABLED is either "true" or "false"
@@ -157,7 +169,7 @@ if [ ! -f "$FIRST_RUN_FILE" ]; then
             "event": "install",
             "distinct_id": "'"$SOURCEBOT_INSTALL_ID"'",
             "properties": {
-                "sourcebot_version": "'"$NEXT_PUBLIC_SOURCEBOT_VERSION"'"
+                "sourcebot_version": "'"$SOURCEBOT_VERSION"'"
             }
         }' https://us.i.posthog.com/capture/ ) then
             echo -e "\e[33m[Warning] Failed to send install event.\e[0m"
@@ -168,8 +180,8 @@ else
     PREVIOUS_VERSION=$(cat "$FIRST_RUN_FILE" | jq -r '.version')
 
     # If the version has changed, we assume an upgrade has occurred.
-    if [ "$PREVIOUS_VERSION" != "$NEXT_PUBLIC_SOURCEBOT_VERSION" ]; then
-        echo -e "\e[34m[Info] Upgraded from version $PREVIOUS_VERSION to $NEXT_PUBLIC_SOURCEBOT_VERSION\e[0m"
+    if [ "$PREVIOUS_VERSION" != "$SOURCEBOT_VERSION" ]; then
+        echo -e "\e[34m[Info] Upgraded from version $PREVIOUS_VERSION to $SOURCEBOT_VERSION\e[0m"
 
         if [ "$SOURCEBOT_TELEMETRY_DISABLED" = "false" ]; then
             if ! ( curl -L --output /dev/null --silent --fail --header "Content-Type: application/json" -d '{
@@ -178,7 +190,7 @@ else
                 "distinct_id": "'"$SOURCEBOT_INSTALL_ID"'",
                 "properties": {
                     "from_version": "'"$PREVIOUS_VERSION"'",
-                    "to_version": "'"$NEXT_PUBLIC_SOURCEBOT_VERSION"'"
+                    "to_version": "'"$SOURCEBOT_VERSION"'"
                 }
             }' https://us.i.posthog.com/capture/ ) then
                 echo -e "\e[33m[Warning] Failed to send upgrade event.\e[0m"
@@ -187,7 +199,7 @@ else
     fi
 fi
 
-echo "{\"version\": \"$NEXT_PUBLIC_SOURCEBOT_VERSION\", \"install_id\": \"$SOURCEBOT_INSTALL_ID\"}" > "$FIRST_RUN_FILE"
+echo "{\"version\": \"$SOURCEBOT_VERSION\", \"install_id\": \"$SOURCEBOT_INSTALL_ID\"}" > "$FIRST_RUN_FILE"
 
 # Start the database and wait for it to be ready before starting any other service
 if [ "$DATABASE_EMBEDDED" = "true" ]; then

packages/backend/package.json

@@ -44,13 +44,13 @@
         "fast-deep-equal": "^3.1.3",
         "git-url-parse": "^16.1.0",
         "gitea-js": "^1.22.0",
-        "glob": "^11.0.0",
+        "glob": "^11.1.0",
         "groupmq": "^1.0.0",
         "ioredis": "^5.4.2",
         "lowdb": "^7.0.1",
         "micromatch": "^4.0.8",
         "p-limit": "^7.2.0",
-        "posthog-node": "^4.2.1",
+        "posthog-node": "^5.17.4",
         "prom-client": "^15.1.3",
         "simple-git": "^3.27.0",
         "zod": "^3.25.74"

packages/backend/src/instrument.ts

@@ -1,13 +1,13 @@
 import * as Sentry from "@sentry/node";
-import { createLogger } from "@sourcebot/shared";
+import { createLogger, SOURCEBOT_VERSION } from "@sourcebot/shared";
 import { env } from "@sourcebot/shared/client";
 
 const logger = createLogger('instrument');
 
 if (!!env.NEXT_PUBLIC_SENTRY_BACKEND_DSN && !!env.NEXT_PUBLIC_SENTRY_ENVIRONMENT) {
     Sentry.init({
         dsn: env.NEXT_PUBLIC_SENTRY_BACKEND_DSN,
-        release: env.NEXT_PUBLIC_SOURCEBOT_VERSION,
+        release: SOURCEBOT_VERSION,
         environment: env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
     });
 } else {