Merge branch 'main' into cursor/SOU-193-mcp-undefined-filename-bug-9338

Author: msukkari

.github/workflows/ghcr-publish.yml .github/workflows/_build.yml.github/workflows/ghcr-publish.yml renamed to .github/workflows/_build.yml

@@ -1,27 +1,38 @@
-name: Publish to ghcr
-
-# This workflow is a modification of a example.
+# Internal reusable workflow for building multi-platform Docker images.
+#
+# This workflow builds Docker images for linux/amd64 and linux/arm64 platforms,
+# pushes them by digest to GHCR, signs them with cosign/Sigstore for supply chain
+# security, and uploads build artifacts for subsequent manifest creation.
+#
 # @ see: https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
 
+name: Build Multi-Platform Images
+
 on:
-  push:
-    branches: ["main"]
-    tags: ["v*.*.*"]
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version tag (e.g., v4.10.5)'
-        required: false
-        type: string
   workflow_call:
     inputs:
-      version:
-        description: 'Version tag (e.g., v4.10.5)'
-        required: false
+      git_ref:
+        description: "Git ref to checkout"
+        required: true
         type: string
+      docker_tags:
+        description: "Docker tags configuration (JSON array or raw tags)"
+        required: true
+        type: string
+      use_app_token:
+        description: "Whether to use GitHub App token for checkout"
+        required: false
+        type: boolean
+        default: false
+    secrets:
+      release_app_id:
+        description: "GitHub App ID (required if use_app_token is true)"
+        required: false
+      release_app_private_key:
+        description: "GitHub App private key (required if use_app_token is true)"
+        required: false
 
 env:
-  # Use docker.io for Docker Hub if empty
   REGISTRY_IMAGE: ghcr.io/sourcebot-dev/sourcebot
 
 jobs:
@@ -31,8 +42,8 @@ jobs:
     permissions:
       contents: read
       packages: write
-      # This is used to complete the identity challenge
-      # with sigstore/fulcio when running outside of PRs.
+      # Required for keyless signing with cosign/Sigstore.
+      # Allows workflow to obtain OIDC token for ephemeral certificate from Fulcio.
       id-token: write
     strategy:
       matrix:
@@ -44,6 +55,14 @@ jobs:
             runs-on: ubuntu-24.04-arm
 
     steps:
+      - name: Generate GitHub App token
+        if: inputs.use_app_token
+        id: generate_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.release_app_id }}
+          private-key: ${{ secrets.release_app_private_key }}
+
       - name: Prepare
         run: |
           platform=${{ matrix.platform }}
@@ -52,8 +71,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          ref: ${{ inputs.version || github.ref_name }}
+          ref: ${{ inputs.git_ref }}
           submodules: "true"
+          fetch-depth: 0
+          token: ${{ inputs.use_app_token && steps.generate_token.outputs.token || github.token }}
 
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
@@ -62,6 +83,7 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY_IMAGE }}
+          tags: ${{ inputs.docker_tags }}
 
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer
@@ -118,43 +140,4 @@ jobs:
         # This step uses the identity token to provision an ephemeral certificate
         # against the sigstore community Fulcio instance.
         run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
-  
-  merge:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-    needs:
-      - build
-    steps:
-      - name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: /tmp/digests
-          pattern: digests-*
-          merge-multiple: true
-      
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY_IMAGE }}
 
-      - name: Login to GitHub Packages Docker Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      
-      - name: Create manifest list and push
-        working-directory: /tmp/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
-      
-      - name: Inspect image
-        run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}         

.github/workflows/_merge.yml

@@ -0,0 +1,59 @@
+# Internal reusable workflow for merging platform-specific image digests into a
+# single multi-platform manifest and pushing to GHCR.
+#
+# This workflow takes the individual platform image digests created by _build.yml,
+# combines them into a multi-platform manifest, and pushes the final tagged images.
+
+name: Merge Multi-Platform Manifest
+
+on:
+  workflow_call:
+    inputs:
+      docker_tags:
+        description: "Docker tags configuration (JSON array or raw tags)"
+        required: true
+        type: string
+
+env:
+  REGISTRY_IMAGE: ghcr.io/sourcebot-dev/sourcebot
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: /tmp/digests
+          pattern: digests-*
+          merge-multiple: true
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+          tags: ${{ inputs.docker_tags }}
+
+      - name: Login to GitHub Packages Docker Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+      
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+

.github/workflows/release-dev.yml

@@ -0,0 +1,25 @@
+name: Release Sourcebot (Development)
+
+permissions:
+  contents: read
+  packages: write
+  id-token: write
+
+on:
+  push:
+    branches: ["main"]
+
+jobs:
+  build:
+    uses: ./.github/workflows/_build.yml
+    with:
+      git_ref: ${{ github.ref_name }}
+      docker_tags: type=raw,value=main
+      use_app_token: false
+    secrets: inherit
+
+  publish-to-registry:
+    needs: build
+    uses: ./.github/workflows/_merge.yml
+    with:
+      docker_tags: type=raw,value=main