From e7330fa0158cedf662db448565547d26a227c1e3 Mon Sep 17 00:00:00 2001
From: carole-lavillonniere <carole.lavillonniere@gmail.com>
Date: Mon, 3 Nov 2025 13:25:44 +0100
Subject: [PATCH 01/12] CI workflow to publish extension

---
 .github/workflows/build.yml   | 15 ++-----
 .github/workflows/publish.yml | 82 +++++++++++++++++++++++++++++++++++
 Makefile                      | 42 ++++++++++++++----
 3 files changed, 118 insertions(+), 21 deletions(-)
 create mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b5139a..0dd9795 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,11 +24,8 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Format
-        run: npx biome ci .
-
       - name: Lint
-        run: npx eslint
+        run: make lint
 
   test:
     name: Test
@@ -46,14 +43,8 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Type check
-        run: npx tsc
-
-      - name: Compile
-        run: npx vsce package
+      - name: Test
+        run: make test
         env:
           LOCALSTACK_WEB_AUTH_REDIRECT: https://app.localstack.cloud/redirect?name=VSCode
           NODE_ENV: ci
-      
-      - name: Test
-        run: xvfb-run -a npx vscode-test
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 0000000..86e10e8
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,82 @@
+name: Publish Extension
+
+on:
+  workflow_dispatch:
+    inputs:
+      publish_vs_marketplace:
+        description: 'Publish to VS Marketplace'
+        required: true
+        type: boolean
+        default: false
+      publish_open_vsx:
+        description: 'Publish to Open VSX'
+        required: true
+        type: boolean
+        default: false
+
+permissions:
+  contents: read
+
+jobs:
+  publish:
+    name: Build and Publish
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Lint
+        run: make lint
+
+      - name: Test
+        run: make test
+        env:
+          LOCALSTACK_WEB_AUTH_REDIRECT: https://app.localstack.cloud/redirect?name=VSCode
+          NODE_ENV: ci
+
+      - name: Set version from branch name
+        run: |
+          BRANCH_NAME="${GITHUB_REF#refs/heads/}"
+          # Validate branch name is a valid version (only alphanumeric, dots, and hyphens)
+          if ! echo "$BRANCH_NAME" | grep -Eq '^[a-zA-Z0-9.-]+$'; then
+            echo "Error: Branch name '$BRANCH_NAME' is not a valid version format"
+            echo "Version must contain only letters, numbers, dots, and hyphens"
+            exit 1
+          fi
+          echo "VERSION=$BRANCH_NAME" >> $GITHUB_ENV
+          echo "Using version: $BRANCH_NAME"
+
+      - name: Build VSIX package
+        run: make vsix
+        env:
+          LOCALSTACK_WEB_AUTH_REDIRECT: https://app.localstack.cloud/redirect?name=VSCode
+          NODE_ENV: production
+          ANALYTICS_API_URL: https://analytics.localstack.cloud/v1/events
+
+      - name: Publish to VS Marketplace
+        if: ${{ inputs.publish_vs_marketplace }}
+        run: make publish-marketplace
+        env:
+          VSCE_PAT: ${{ secrets.VSCE_PAT }}
+
+      - name: Publish to Open VSX
+        if: ${{ inputs.publish_open_vsx }}
+        run: make publish-ovsx
+        env:
+          OVSX_PAT: ${{ secrets.OVSX_PAT }}
+
+      - name: Upload VSIX artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: localstack-${{ env.VERSION }}.vsix
+          path: localstack-${{ env.VERSION }}.vsix
+          retention-days: 7
diff --git a/Makefile b/Makefile
index 9d8e737..67ad6a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,35 @@
-.PHONY: vsix publish
+.PHONY: vsix publish publish-ovsx publish-marketplace lint test
+
+# VERSION can be set via environment variable or defaults to the version in package.json
+VERSION ?= $(shell node -p "require('./package.json').version")
+
+lint:
+	@echo "Running format check..."
+	npx biome ci .
+	@echo "Running linter..."
+	npx eslint
+
+test:
+	@echo "Running type check..."
+	npx tsc
+	@echo "Compiling extension..."
+	npx vsce package
+	@echo "Running tests..."
+	xvfb-run -a npx vscode-test
 
 vsix:
-	@echo "Packaging VS Code extension into VSIX file..."
-	LOCALSTACK_WEB_AUTH_REDIRECT=https://app.localstack.cloud/redirect?name=VSCode NODE_ENV=production ANALYTICS_API_URL=https://analytics.localstack.cloud/v1/events npx vsce package
-	@hash=$$(git rev-parse --short HEAD); \
-		mv localstack-1.0.0.vsix localstack-1.0.0-$$hash.vsix
-
-publish:
-	@echo "Publishing VS Code extension..."
-	LOCALSTACK_WEB_AUTH_REDIRECT=https://app.localstack.cloud/redirect?name=VSCode NODE_ENV=production ANALYTICS_API_URL=https://analytics.localstack.cloud/v1/events npx vsce publish
+	@echo "Packaging VS Code extension into VSIX file (version: $(VERSION))..."
+	npx vsce package $(VERSION)
+	@echo "Created: localstack-$(VERSION).vsix"
+
+publish-marketplace:
+	@echo "Publishing VS Code extension to VS Marketplace..."
+	@echo "Verifying PAT..."
+	npx vsce show localstack -p $(VSCE_PAT)
+	npx vsce publish localstack-$(VERSION).vsix -p $(VSCE_PAT)
+
+publish-ovsx:
+	@echo "Publishing VS Code extension to Open VSX..."
+	@echo "Verifying PAT..."
+	npx ovsx verify-pat localstack -p $(OVSX_PAT)
+	npx ovsx publish localstack-$(VERSION).vsix -p $(OVSX_PAT)

From c61943d06af739db8d111c57fc503b39e54eda50 Mon Sep 17 00:00:00 2001
From: carole-lavillonniere <carole.lavillonniere@gmail.com>
Date: Mon, 3 Nov 2025 16:01:04 +0100
Subject: [PATCH 02/12] comment out publishing for now

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 67ad6a9..1d3fae1 100644
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,10 @@ publish-marketplace:
 	@echo "Publishing VS Code extension to VS Marketplace..."
 	@echo "Verifying PAT..."
 	npx vsce show localstack -p $(VSCE_PAT)
-	npx vsce publish localstack-$(VERSION).vsix -p $(VSCE_PAT)
+	# npx vsce publish localstack-$(VERSION).vsix -p $(VSCE_PAT)
 
 publish-ovsx:
 	@echo "Publishing VS Code extension to Open VSX..."
 	@echo "Verifying PAT..."
 	npx ovsx verify-pat localstack -p $(OVSX_PAT)
-	npx ovsx publish localstack-$(VERSION).vsix -p $(OVSX_PAT)
+	# npx ovsx publish localstack-$(VERSION).vsix -p $(OVSX_PAT)

From 45c42487a5cd50619ec0de3b7b3ee9d2b622d797 Mon Sep 17 00:00:00 2001
From: carole-lavillonniere <carole.lavillonniere@gmail.com>
Date: Tue, 4 Nov 2025 08:46:54 +0100
Subject: [PATCH 03/12] execute workflow on push

---
 .github/workflows/publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 86e10e8..6624101 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,6 +1,7 @@
 name: Publish Extension
 
 on:
+  push:
   workflow_dispatch:
     inputs:
       publish_vs_marketplace:

From 2e51574f038b13b2d6cc0fb5bbbf419f08eab9d6 Mon Sep 17 00:00:00 2001
From: carole-lavillonniere <carole.lavillonniere@gmail.com>
Date: Tue, 4 Nov 2025 08:50:45 +0100
Subject: [PATCH 04/12] remove branch name check

---
 .github/workflows/publish.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6624101..acc9c08 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -47,12 +47,6 @@ jobs:
       - name: Set version from branch name
         run: |
           BRANCH_NAME="${GITHUB_REF#refs/heads/}"
-          # Validate branch name is a valid version (only alphanumeric, dots, and hyphens)
-          if ! echo "$BRANCH_NAME" | grep -Eq '^[a-zA-Z0-9.-]+$'; then
-            echo "Error: Branch name '$BRANCH_NAME' is not a valid version format"
-            echo "Version must contain only letters, numbers, dots, and hyphens"
-            exit 1
-          fi
           echo "VERSION=$BRANCH_NAME" >> $GITHUB_ENV
           echo "Using version: $BRANCH_NAME"
 

From 5746fe6c131d650b0e2ca5cc02ec1efbb39afb65 Mon Sep 17 00:00:00 2001
From: carole-lavillonniere <carole.lavillonniere@gmail.com>
Date: Tue, 4 Nov 2025 09:03:30 +0100
Subject: [PATCH 05/12] don't commit version to package.json

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1d3fae1..7344715 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ test:
 
 vsix:
 	@echo "Packaging VS Code extension into VSIX file (version: $(VERSION))..."
-	npx vsce package $(VERSION)
+	npx vsce package $(VERSION) --no-update-package-json
 	@echo "Created: localstack-$(VERSION).vsix"
 
 publish-marketplace:

From 7513e482b8ba47949a6816c03eee2f2fa76565d8 Mon Sep 17 00:00:00 2001
From: carole-lavillonniere <carole.lavillonniere@gmail.com>
Date: Tue, 4 Nov 2025 09:14:51 +0100
Subject: [PATCH 06/12] split into 2 publish workflows

---
 .github/workflows/build.yml                  | 37 ++++++++++
 .github/workflows/publish-ovsx.yml           | 40 ++++++++++
 .github/workflows/publish-vs-marketplace.yml | 40 ++++++++++
 .github/workflows/publish.yml                | 77 --------------------
 4 files changed, 117 insertions(+), 77 deletions(-)
 create mode 100644 .github/workflows/publish-ovsx.yml
 create mode 100644 .github/workflows/publish-vs-marketplace.yml
 delete mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0dd9795..4527f1c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,3 +48,40 @@ jobs:
         env:
           LOCALSTACK_WEB_AUTH_REDIRECT: https://app.localstack.cloud/redirect?name=VSCode
           NODE_ENV: ci
+
+  build:
+    name: Build VSIX
+    runs-on: ubuntu-latest
+    needs: [lint, test]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Set version from branch name
+        run: |
+          BRANCH_NAME="${GITHUB_REF#refs/heads/}"
+          echo "VERSION=$BRANCH_NAME" >> $GITHUB_ENV
+          echo "Using version: $BRANCH_NAME"
+
+      - name: Build VSIX package
+        run: make vsix
+        env:
+          LOCALSTACK_WEB_AUTH_REDIRECT: https://app.localstack.cloud/redirect?name=VSCode
+          NODE_ENV: production
+          ANALYTICS_API_URL: https://analytics.localstack.cloud/v1/events
+
+      - name: Upload VSIX artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: vsix-${{ env.VERSION }}
+          path: localstack-${{ env.VERSION }}.vsix
+          retention-days: 3
diff --git a/.github/workflows/publish-ovsx.yml b/.github/workflows/publish-ovsx.yml
new file mode 100644
index 0000000..26c9b97
--- /dev/null
+++ b/.github/workflows/publish-ovsx.yml
@@ -0,0 +1,40 @@
+name: Publish to Open VSX
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to publish (must match a build artifact)'
+        required: true
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  publish:
+    name: Publish to Open VSX
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Download VSIX artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: vsix-${{ inputs.version }}
+
+      - name: Publish to Open VSX
+        run: make publish-ovsx
+        env:
+          VERSION: ${{ inputs.version }}
+          OVSX_PAT: ${{ secrets.OVSX_PAT }}
diff --git a/.github/workflows/publish-vs-marketplace.yml b/.github/workflows/publish-vs-marketplace.yml
new file mode 100644
index 0000000..a77301e
--- /dev/null
+++ b/.github/workflows/publish-vs-marketplace.yml
@@ -0,0 +1,40 @@
+name: Publish to Visual Studio Marketplace
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to publish (must match a build artifact)'
+        required: true
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  publish:
+    name: Publish to VS Marketplace
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Download VSIX artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: vsix-${{ inputs.version }}
+
+      - name: Publish to VS Marketplace
+        run: make publish-marketplace
+        env:
+          VERSION: ${{ inputs.version }}
+          VSCE_PAT: ${{ secrets.VSCE_PAT }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index acc9c08..0000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-name: Publish Extension
-
-on:
-  push:
-  workflow_dispatch:
-    inputs:
-      publish_vs_marketplace:
-        description: 'Publish to VS Marketplace'
-        required: true
-        type: boolean
-        default: false
-      publish_open_vsx:
-        description: 'Publish to Open VSX'
-        required: true
-        type: boolean
-        default: false
-
-permissions:
-  contents: read
-
-jobs:
-  publish:
-    name: Build and Publish
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          cache: npm
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Lint
-        run: make lint
-
-      - name: Test
-        run: make test
-        env:
-          LOCALSTACK_WEB_AUTH_REDIRECT: https://app.localstack.cloud/redirect?name=VSCode
-          NODE_ENV: ci
-
-      - name: Set version from branch name
-        run: |
-          BRANCH_NAME="${GITHUB_REF#refs/heads/}"
-          echo "VERSION=$BRANCH_NAME" >> $GITHUB_ENV
-          echo "Using version: $BRANCH_NAME"
-
-      - name: Build VSIX package
-        run: make vsix
-        env:
-          LOCALSTACK_WEB_AUTH_REDIRECT: https://app.localstack.cloud/redirect?name=VSCode
-          NODE_ENV: production
-          ANALYTICS_API_URL: https://analytics.localstack.cloud/v1/events
-
-      - name: Publish to VS Marketplace
-        if: ${{ inputs.publish_vs_marketplace }}
-        run: make publish-marketplace
-        env:
-          VSCE_PAT: ${{ secrets.VSCE_PAT }}
-
-      - name: Publish to Open VSX
-        if: ${{ inputs.publish_open_vsx }}
-        run: make publish-ovsx
-        env:
-          OVSX_PAT: ${{ secrets.OVSX_PAT }}
-
-      - name: Upload VSIX artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: localstack-${{ env.VERSION }}.vsix
-          path: localstack-${{ env.VERSION }}.vsix
-          retention-days: 7

From 980556bbbcf07bd9ae4b0fe08c08934d98af762c Mon Sep 17 00:00:00 2001
From: carole-lavillonniere <carole.lavillonniere@gmail.com>
Date: Tue, 4 Nov 2025 09:21:16 +0100
Subject: [PATCH 07/12] fix version

---
 .github/actions/set-version/action.yml       | 17 +++++++++++++++++
 .github/workflows/build.yml                  |  5 +----
 .github/workflows/publish-ovsx.yml           | 12 +++++-------
 .github/workflows/publish-vs-marketplace.yml | 12 +++++-------
 4 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 .github/actions/set-version/action.yml

diff --git a/.github/actions/set-version/action.yml b/.github/actions/set-version/action.yml
new file mode 100644
index 0000000..9515fc1
--- /dev/null
+++ b/.github/actions/set-version/action.yml
@@ -0,0 +1,17 @@
+name: 'Set Version from Branch'
+description: 'Sets VERSION environment variable from the current branch name'
+
+runs:
+  using: composite
+  steps:
+    - name: Set version from branch name
+      shell: bash
+      run: |
+        # Use GITHUB_HEAD_REF for PRs, GITHUB_REF_NAME for direct pushes
+        if [ -n "$GITHUB_HEAD_REF" ]; then
+          BRANCH_NAME="$GITHUB_HEAD_REF"
+        else
+          BRANCH_NAME="$GITHUB_REF_NAME"
+        fi
+        echo "VERSION=$BRANCH_NAME" >> $GITHUB_ENV
+        echo "Using version: $BRANCH_NAME"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4527f1c..126e393 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -67,10 +67,7 @@ jobs:
         run: npm ci
 
       - name: Set version from branch name
-        run: |
-          BRANCH_NAME="${GITHUB_REF#refs/heads/}"
-          echo "VERSION=$BRANCH_NAME" >> $GITHUB_ENV
-          echo "Using version: $BRANCH_NAME"
+        uses: ./.github/actions/set-version
 
       - name: Build VSIX package
         run: make vsix
diff --git a/.github/workflows/publish-ovsx.yml b/.github/workflows/publish-ovsx.yml
index 26c9b97..90622f1 100644
--- a/.github/workflows/publish-ovsx.yml
+++ b/.github/workflows/publish-ovsx.yml
@@ -1,12 +1,8 @@
 name: Publish to Open VSX
 
 on:
+  push:
   workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version to publish (must match a build artifact)'
-        required: true
-        type: string
 
 permissions:
   contents: read
@@ -28,13 +24,15 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      - name: Set version from branch name
+        uses: ./.github/actions/set-version
+
       - name: Download VSIX artifact
         uses: actions/download-artifact@v4
         with:
-          name: vsix-${{ inputs.version }}
+          name: vsix-${{ env.VERSION }}
 
       - name: Publish to Open VSX
         run: make publish-ovsx
         env:
-          VERSION: ${{ inputs.version }}
           OVSX_PAT: ${{ secrets.OVSX_PAT }}
diff --git a/.github/workflows/publish-vs-marketplace.yml b/.github/workflows/publish-vs-marketplace.yml
index a77301e..351adb2 100644
--- a/.github/workflows/publish-vs-marketplace.yml
+++ b/.github/workflows/publish-vs-marketplace.yml
@@ -1,12 +1,8 @@
 name: Publish to Visual Studio Marketplace
 
 on:
+  push:
   workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version to publish (must match a build artifact)'
-        required: true
-        type: string
 
 permissions:
   contents: read
@@ -28,13 +24,15 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      - name: Set version from branch name
+        uses: ./.github/actions/set-version
+
       - name: Download VSIX artifact
         uses: actions/download-artifact@v4
         with:
-          name: vsix-${{ inputs.version }}
+          name: vsix-${{ env.VERSION }}
 
       - name: Publish to VS Marketplace
         run: make publish-marketplace
         env:
-          VERSION: ${{ inputs.version }}
           VSCE_PAT: ${{ secrets.VSCE_PAT }}

From 5eb206b742dc47c89649ef88beef31ddf2b1513d Mon Sep 17 00:00:00 2001
From: carole-lavillonniere <carole.lavillonniere@gmail.com>
Date: Tue, 4 Nov 2025 09:26:22 +0100
Subject: [PATCH 08/12] build in publish workflows

---
 .github/actions/build-vsix/action.yml        | 19 +++++++++++
 .github/workflows/build.yml                  | 34 --------------------
 .github/workflows/publish-ovsx.yml           |  7 ++--
 .github/workflows/publish-vs-marketplace.yml |  7 ++--
 4 files changed, 27 insertions(+), 40 deletions(-)
 create mode 100644 .github/actions/build-vsix/action.yml

diff --git a/.github/actions/build-vsix/action.yml b/.github/actions/build-vsix/action.yml
new file mode 100644
index 0000000..1bf6b48
--- /dev/null
+++ b/.github/actions/build-vsix/action.yml
@@ -0,0 +1,19 @@
+name: 'Build VSIX Package'
+description: 'Builds the VS Code extension VSIX package'
+
+inputs:
+  version:
+    description: 'Version to build'
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Build VSIX package
+      shell: bash
+      run: make vsix
+      env:
+        VERSION: ${{ inputs.version }}
+        LOCALSTACK_WEB_AUTH_REDIRECT: https://app.localstack.cloud/redirect?name=VSCode
+        NODE_ENV: production
+        ANALYTICS_API_URL: https://analytics.localstack.cloud/v1/events
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 126e393..0dd9795 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,37 +48,3 @@ jobs:
         env:
           LOCALSTACK_WEB_AUTH_REDIRECT: https://app.localstack.cloud/redirect?name=VSCode
           NODE_ENV: ci
-
-  build:
-    name: Build VSIX
-    runs-on: ubuntu-latest
-    needs: [lint, test]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          cache: npm
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Set version from branch name
-        uses: ./.github/actions/set-version
-
-      - name: Build VSIX package
-        run: make vsix
-        env:
-          LOCALSTACK_WEB_AUTH_REDIRECT: https://app.localstack.cloud/redirect?name=VSCode
-          NODE_ENV: production
-          ANALYTICS_API_URL: https://analytics.localstack.cloud/v1/events
-
-      - name: Upload VSIX artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: vsix-${{ env.VERSION }}
-          path: localstack-${{ env.VERSION }}.vsix
-          retention-days: 3
diff --git a/.github/workflows/publish-ovsx.yml b/.github/workflows/publish-ovsx.yml
index 90622f1..fff8c35 100644
--- a/.github/workflows/publish-ovsx.yml
+++ b/.github/workflows/publish-ovsx.yml
@@ -27,12 +27,13 @@ jobs:
       - name: Set version from branch name
         uses: ./.github/actions/set-version
 
-      - name: Download VSIX artifact
-        uses: actions/download-artifact@v4
+      - name: Build VSIX package
+        uses: ./.github/actions/build-vsix
         with:
-          name: vsix-${{ env.VERSION }}
+          version: ${{ env.VERSION }}
 
       - name: Publish to Open VSX
         run: make publish-ovsx
         env:
+          VERSION: ${{ env.VERSION }}
           OVSX_PAT: ${{ secrets.OVSX_PAT }}
diff --git a/.github/workflows/publish-vs-marketplace.yml b/.github/workflows/publish-vs-marketplace.yml
index 351adb2..c58a575 100644
--- a/.github/workflows/publish-vs-marketplace.yml
+++ b/.github/workflows/publish-vs-marketplace.yml
@@ -27,12 +27,13 @@ jobs:
       - name: Set version from branch name
         uses: ./.github/actions/set-version
 
-      - name: Download VSIX artifact
-        uses: actions/download-artifact@v4
+      - name: Build VSIX package
+        uses: ./.github/actions/build-vsix
         with:
-          name: vsix-${{ env.VERSION }}
+          version: ${{ env.VERSION }}
 
       - name: Publish to VS Marketplace
         run: make publish-marketplace
         env:
+          VERSION: ${{ env.VERSION }}
           VSCE_PAT: ${{ secrets.VSCE_PAT }}

From 9d60466a05aa159e87ce9632e5c524b98059e9f2 Mon Sep 17 00:00:00 2001
From: carole-lavillonniere <carole.lavillonniere@gmail.com>
Date: Tue, 4 Nov 2025 09:30:24 +0100
Subject: [PATCH 09/12] fix verify PAT for VS marketplace

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7344715..f8b8fc9 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ vsix:
 publish-marketplace:
 	@echo "Publishing VS Code extension to VS Marketplace..."
 	@echo "Verifying PAT..."
-	npx vsce show localstack -p $(VSCE_PAT)
+	npx vsce verify-pat localstack -p $(VSCE_PAT)
 	# npx vsce publish localstack-$(VERSION).vsix -p $(VSCE_PAT)
 
 publish-ovsx:

From d6492930b3b1c014a41d6f6d6e94bca6aa4fc6a0 Mon Sep 17 00:00:00 2001
From: carole-lavillonniere <carole.lavillonniere@gmail.com>
Date: Tue, 4 Nov 2025 09:36:01 +0100
Subject: [PATCH 10/12] enable publishing

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f8b8fc9..835475f 100644
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,10 @@ publish-marketplace:
 	@echo "Publishing VS Code extension to VS Marketplace..."
 	@echo "Verifying PAT..."
 	npx vsce verify-pat localstack -p $(VSCE_PAT)
-	# npx vsce publish localstack-$(VERSION).vsix -p $(VSCE_PAT)
+	npx vsce publish localstack-$(VERSION).vsix -p $(VSCE_PAT)
 
 publish-ovsx:
 	@echo "Publishing VS Code extension to Open VSX..."
 	@echo "Verifying PAT..."
 	npx ovsx verify-pat localstack -p $(OVSX_PAT)
-	# npx ovsx publish localstack-$(VERSION).vsix -p $(OVSX_PAT)
+	npx ovsx publish localstack-$(VERSION).vsix -p $(OVSX_PAT)

From 7bf67e5f6acebd6b59894a5de4da26a268197859 Mon Sep 17 00:00:00 2001
From: carole-lavillonniere <carole.lavillonniere@gmail.com>
Date: Tue, 4 Nov 2025 09:36:14 +0100
Subject: [PATCH 11/12] remove exec on push

---
 .github/workflows/publish-ovsx.yml           | 1 -
 .github/workflows/publish-vs-marketplace.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/publish-ovsx.yml b/.github/workflows/publish-ovsx.yml
index fff8c35..869e428 100644
--- a/.github/workflows/publish-ovsx.yml
+++ b/.github/workflows/publish-ovsx.yml
@@ -1,7 +1,6 @@
 name: Publish to Open VSX
 
 on:
-  push:
   workflow_dispatch:
 
 permissions:
diff --git a/.github/workflows/publish-vs-marketplace.yml b/.github/workflows/publish-vs-marketplace.yml
index c58a575..d976cdf 100644
--- a/.github/workflows/publish-vs-marketplace.yml
+++ b/.github/workflows/publish-vs-marketplace.yml
@@ -1,7 +1,6 @@
 name: Publish to Visual Studio Marketplace
 
 on:
-  push:
   workflow_dispatch:
 
 permissions:

From 2089c87391916ac0690245c3416a5769fa554232 Mon Sep 17 00:00:00 2001
From: carole-lavillonniere <carole.lavillonniere@gmail.com>
Date: Tue, 4 Nov 2025 09:45:06 +0100
Subject: [PATCH 12/12] fix version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 835475f..92eabe0 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ publish-marketplace:
 	@echo "Publishing VS Code extension to VS Marketplace..."
 	@echo "Verifying PAT..."
 	npx vsce verify-pat localstack -p $(VSCE_PAT)
-	npx vsce publish localstack-$(VERSION).vsix -p $(VSCE_PAT)
+	npx vsce publish --pre-release $(VERSION) -p $(VSCE_PAT) --no-update-package-json
 
 publish-ovsx:
 	@echo "Publishing VS Code extension to Open VSX..."